[PATCH 3/5] qt-gui.cpp: add another QT_VERSION check

Lubomir I. Ivanov neolit123 at gmail.com
Mon Jun 9 14:05:58 PDT 2014

From: "Lubomir I. Ivanov" <neolit123 at gmail.com>

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 at gmail.com>
 qt-gui.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/qt-gui.cpp b/qt-gui.cpp
index 70acd04..ba7fb49 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();

More information about the subsurface mailing list