From b4c12649e9ea0ba6e967d24de1b1ec33a43520d1 Mon Sep 17 00:00:00 2001 From: ubbo Date: Mon, 9 Jan 2012 00:14:07 +0000 Subject: fix build on qt < 4.8 git-svn-id: http://cpunk.de/svn/src/gpg4usb/trunk@735 34ebc366-c3a9-4b3c-9f84-69acf7962910 --- settingsdialog.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/settingsdialog.cpp b/settingsdialog.cpp index e1aaa4c..088b351 100755 --- a/settingsdialog.cpp +++ b/settingsdialog.cpp @@ -186,8 +186,11 @@ QHash GeneralTab::listLanguages() // this works in qt 4.8 QLocale qloc(locale); - QString language = qloc.nativeLanguageName() +" (" + locale + ")"; //+ " (" + QLocale::languageToString(qloc.language()) + ")"; - + #if QT_VERSION < 0x040800 + QString language = QLocale::languageToString(qloc.language()) +" (" + locale + ")"; //+ " (" + QLocale::languageToString(qloc.language()) + ")"; + #else + QString language = qloc.nativeLanguageName() +" (" + locale + ")"; //+ " (" + QLocale::languageToString(qloc.language()) + ")"; + #endif /*QTranslator translator; translator.load(fileNames[i], qmDir.absolutePath()); QString language = translator.translate("SettingsDialog", -- cgit v1.2.3