diff options
| author | Michal Kubecek <mkubecek@suse.cz> | 2015-06-05 10:42:44 +0200 |
|---|---|---|
| committer | Michal Kubecek <mkubecek@suse.cz> | 2015-06-05 10:42:44 +0200 |
| commit | c6ccba027abeedbbc60c3222cf1de6c5aec1225b (patch) | |
| tree | 3a771f6215a07c4998662fe947cb9344b66dba11 | |
| parent | d2f58e93e31a288f47fa084b16325f985c92e4d1 (diff) | |
| download | twinkle-c6ccba027abeedbbc60c3222cf1de6c5aec1225b.tar twinkle-c6ccba027abeedbbc60c3222cf1de6c5aec1225b.tar.gz twinkle-c6ccba027abeedbbc60c3222cf1de6c5aec1225b.tar.lz twinkle-c6ccba027abeedbbc60c3222cf1de6c5aec1225b.tar.xz twinkle-c6ccba027abeedbbc60c3222cf1de6c5aec1225b.zip | |
fix Qt4 build
The Qt5 version of TextBrowserNoAutoLink::setSource() is actually
correct for Qt4 as well (unlike the one inherited from old codebase).
| -rw-r--r-- | src/gui/textbrowsernoautolink.cpp | 8 | ||||
| -rw-r--r-- | src/gui/textbrowsernoautolink.h | 6 |
2 files changed, 1 insertions, 13 deletions
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 |