diff options
| author |  Lubomir I. Ivanov <neolit123@gmail.com> | 2014-06-10 00:05:58 +0300 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2014-06-09 16:55:18 -0700 |
| commit | 16dd110a09414e129364296c61228729c2b1c8ec (patch) | |
| tree | fc285580693a0be9aea9785138f3c1206d50bc9a | |
| parent | 7451790660243bc237da7f971ff3ebae40b92b98 (diff) | |
| download | subsurface-16dd110a09414e129364296c61228729c2b1c8ec.tar.gz | |
qt-gui.cpp: add another QT_VERSION check
encodeUtf8() and decodeUtf8() are only used for Q_OS_WIN in init_ui(),
but also that branch is wrapped in a "#if QT_VERSION < 0x050000"
we do the same for the actual function declarations.
Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
| -rw-r--r-- | qt-gui.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/qt-gui.cpp b/qt-gui.cpp index 70acd0463..ba7fb4994 100644 --- a/qt-gui.cpp +++ b/qt-gui.cpp @@ -59,7 +59,7 @@ const char *getSetting(QSettings &s, QString name) return NULL; } -#ifdef Q_OS_WIN +#if defined(Q_OS_WIN) && QT_VERSION < 0x050000 static QByteArray encodeUtf8(const QString &fname) { return fname.toUtf8(); |