OSDN Git Service

Work around uiLanguages crash on Windows with 4.8.0
authorEike Ziller <eike.ziller@nokia.com>
Thu, 5 Apr 2012 06:51:33 +0000 (08:51 +0200)
committerEike Ziller <eike.ziller@nokia.com>
Thu, 5 Apr 2012 14:59:26 +0000 (16:59 +0200)
Task-number: QTCREATORBUG-721
Change-Id: I159c4ef85eba1eda9f3b7e3a001dd6991d578ffe
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
src/app/main.cpp

index 0fbbc5e..d22cccd 100644 (file)
@@ -272,7 +272,8 @@ int main(int argc, char **argv)
     QTranslator translator;
     QTranslator qtTranslator;
     QStringList uiLanguages;
-#if QT_VERSION >= 0x040800
+// uiLanguages crashes on Windows with 4.8.0 release builds
+#if (QT_VERSION >= 0x040801) || (QT_VERSION >= 0x040800 && !defined(Q_OS_WIN))
     uiLanguages = QLocale::system().uiLanguages();
 #else
     uiLanguages << QLocale::system().name();