aboutsummaryrefslogtreecommitdiffstats
path: root/settingsdialog.cpp
diff options
context:
space:
mode:
authorubbo <ubbo@34ebc366-c3a9-4b3c-9f84-69acf7962910>2012-01-09 00:14:07 +0000
committerubbo <ubbo@34ebc366-c3a9-4b3c-9f84-69acf7962910>2012-01-09 00:14:07 +0000
commitb4c12649e9ea0ba6e967d24de1b1ec33a43520d1 (patch)
treecd3625749fcab7b406db87cdec6ed7d2c5d57a0b /settingsdialog.cpp
parentsome code for preventing remove spacing from signatures. not yet finished. (diff)
downloadgpg4usb-b4c12649e9ea0ba6e967d24de1b1ec33a43520d1.tar.gz
gpg4usb-b4c12649e9ea0ba6e967d24de1b1ec33a43520d1.zip
fix build on qt < 4.8
git-svn-id: http://cpunk.de/svn/src/gpg4usb/trunk@735 34ebc366-c3a9-4b3c-9f84-69acf7962910
Diffstat (limited to 'settingsdialog.cpp')
-rwxr-xr-xsettingsdialog.cpp7
1 files 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<QString, QString> 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",