diff options
| author | con <qtc-committer@nokia.com> | 2009-09-14 16:38:50 +0200 |
|---|---|---|
| committer | con <qtc-committer@nokia.com> | 2009-09-15 14:22:12 +0200 |
| commit | 96b938e3fa1dd9aefab0069b435f29496fdfdc8a (patch) | |
| tree | 32780578164b7981e8e4c32d8a65145644655ee2 | |
| parent | 1be85e1af5d9c8ff99b31b1d06ba67d92d9997be (diff) | |
| download | qt-creator-96b938e3fa1dd9aefab0069b435f29496fdfdc8a.tar.gz | |
Remove the "grab system language" hack for the Mac.
It's now fixed in Qt, adb6eea3a135707a220c0b1c1cf8266321af9309.
| -rw-r--r-- | dist/changes-1.3.0 | 5 | ||||
| -rw-r--r-- | src/app/main.cpp | 16 |
2 files changed, 5 insertions, 16 deletions
diff --git a/dist/changes-1.3.0 b/dist/changes-1.3.0 index 51b48427ba..574971bb15 100644 --- a/dist/changes-1.3.0 +++ b/dist/changes-1.3.0 @@ -81,5 +81,10 @@ Wizards * Added a wizard for Qt Designer custom widgets * Added a gitorious clone wizard +Platform Specific + +Mac + * Make use of system's language settings + Additional credits go to: * Christian Hoenig (Locator filter for symbols in current document) diff --git a/src/app/main.cpp b/src/app/main.cpp index 4f6e8090dc..ae31aaf378 100644 --- a/src/app/main.cpp +++ b/src/app/main.cpp @@ -231,22 +231,6 @@ int main(int argc, char **argv) QTranslator translator; QTranslator qtTranslator; QString locale = QLocale::system().name(); -#ifdef Q_OS_MAC - // because QLocale's system locale is basically useless on the Mac. - // Try to get the real system setting via core foundation - CFArrayRef languages = (CFArrayRef)CFPreferencesCopyValue( - CFSTR("AppleLanguages"), - kCFPreferencesAnyApplication, - kCFPreferencesCurrentUser, - kCFPreferencesAnyHost); -// CFShow(languages); - if (CFArrayGetCount(languages) > 0) { - QString preferredLanguage = stringFromCFString(CFStringRef(CFArrayGetValueAtIndex(languages, 0))); - if (!preferredLanguage.isEmpty()) - locale = preferredLanguage; - } - CFRelease(languages); -#endif const QString &creatorTrPath = QCoreApplication::applicationDirPath() + QLatin1String(SHARE_PATH "/translations"); if (translator.load(QLatin1String("qtcreator_") + locale, creatorTrPath)) { |