From 16dd110a09414e129364296c61228729c2b1c8ec Mon Sep 17 00:00:00 2001 From: "Lubomir I. Ivanov" Date: Tue, 10 Jun 2014 00:05:58 +0300 Subject: 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 Signed-off-by: Dirk Hohndel --- qt-gui.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'qt-gui.cpp') 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(); -- cgit v1.2.3-70-g09d2