diff options
| author | Lubos Dolezel <lubos@dolezel.info> | 2015-06-05 13:30:49 +0200 |
|---|---|---|
| committer | Lubos Dolezel <lubos@dolezel.info> | 2015-06-05 13:30:49 +0200 |
| commit | a06855c047e322bbf2ad1beb571b3239bde71b38 (patch) | |
| tree | b1d2dd46418d7ba34d1eaa2f939b2adc9e071484 /src/gui | |
| parent | 5daafc03aefdb111919859167a93228995ff8366 (diff) | |
| parent | 3edfd3d42bdcdb99e206694073d5832fc42088ef (diff) | |
| download | twinkle-a06855c047e322bbf2ad1beb571b3239bde71b38.tar twinkle-a06855c047e322bbf2ad1beb571b3239bde71b38.tar.gz twinkle-a06855c047e322bbf2ad1beb571b3239bde71b38.tar.lz twinkle-a06855c047e322bbf2ad1beb571b3239bde71b38.tar.xz twinkle-a06855c047e322bbf2ad1beb571b3239bde71b38.zip | |
Merge branch 'master' of github.com:LubosD/twinkle
Diffstat (limited to 'src/gui')
| -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 |