From c6ccba027abeedbbc60c3222cf1de6c5aec1225b Mon Sep 17 00:00:00 2001
From: Michal Kubecek <mkubecek@suse.cz>
Date: Fri, 5 Jun 2015 10:42:44 +0200
Subject: fix Qt4 build

The Qt5 version of TextBrowserNoAutoLink::setSource() is actually
correct for Qt4 as well (unlike the one inherited from old codebase).
---
 src/gui/textbrowsernoautolink.cpp | 8 --------
 src/gui/textbrowsernoautolink.h   | 6 +-----
 2 files changed, 1 insertion(+), 13 deletions(-)

(limited to 'src/gui')

diff --git a/src/gui/textbrowsernoautolink.cpp b/src/gui/textbrowsernoautolink.cpp
index 07f694b..9ee1251 100644
--- a/src/gui/textbrowsernoautolink.cpp
+++ b/src/gui/textbrowsernoautolink.cpp
@@ -5,14 +5,6 @@ TextBrowserNoAutoLink::TextBrowserNoAutoLink (QWidget* parent) :
 {
 }
 
-#if QT_VERSION >= 0x050000
 void TextBrowserNoAutoLink::setSource(const QUrl & name)
 {
 }
-#else
-
-void TextBrowserNoAutoLink::setSource ( const QString & name )
-{
-}
-
-#endif
diff --git a/src/gui/textbrowsernoautolink.h b/src/gui/textbrowsernoautolink.h
index 78c0dbd..58f105e 100644
--- a/src/gui/textbrowsernoautolink.h
+++ b/src/gui/textbrowsernoautolink.h
@@ -41,11 +41,7 @@ class TextBrowserNoAutoLink : public QTextBrowser {
 	Q_OBJECT
 public:
 	TextBrowserNoAutoLink ( QWidget * parent = 0 );
-#if QT_VERSION >= 0x050000
-	virtual void setSource(const QUrl & name) override;
-#else
-	virtual void setSource ( const QString & name ) override;
-#endif
+	virtual void setSource(const QUrl& name) override;
 };
 
 #endif
-- 
cgit v1.2.3