diff options
| author | Olivier Goffart <olivier.goffart@nokia.com> | 2010-12-06 15:43:57 (GMT) |
|---|---|---|
| committer | Olivier Goffart <olivier.goffart@nokia.com> | 2010-12-06 15:43:57 (GMT) |
| commit | 9888fa259875d82bf08a28cac134fe6f71f371f0 (patch) | |
| tree | a58a6ab673888d5c352d2cfe98b22fb1c11c40e9 /mkspecs/common | |
| parent | a70ccc4aaad74dbf28569c78479d4668781bb0fe (diff) | |
| parent | 9327490ad51b737211c26cae53a095a8485e2dad (diff) | |
| download | Qt-9888fa259875d82bf08a28cac134fe6f71f371f0.zip Qt-9888fa259875d82bf08a28cac134fe6f71f371f0.tar.gz Qt-9888fa259875d82bf08a28cac134fe6f71f371f0.tar.bz2 | |
Merge remote branch 'origin/4.7' into qt-master-from-4.7
Conflicts:
configure
qmake/generators/win32/msbuild_objectmodel.cpp
src/gui/image/qpnghandler.cpp
src/network/access/qnetworkaccessdatabackend.cpp
src/opengl/qgl_x11egl.cpp
tests/auto/qnetworkreply/tst_qnetworkreply.cpp
Diffstat (limited to 'mkspecs/common')
| -rw-r--r-- | mkspecs/common/symbian/symbian.conf | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/mkspecs/common/symbian/symbian.conf b/mkspecs/common/symbian/symbian.conf index 0b5c573..bc5ea45 100644 --- a/mkspecs/common/symbian/symbian.conf +++ b/mkspecs/common/symbian/symbian.conf @@ -139,7 +139,11 @@ SYMBIAN_SUPPORTED_LANGUAGES = \ mr mo mn nb pl pt pa ro ru sr \ si sk sl so es sw sv tl ta te \ th bo ti tr tk uk ur vi cy zu \ - nn + nn eu zh gl fa st en_US fr_BE \ + pt_BR en_CA fr_CA el_CY tr_CY \ + en_TW en_HK en_CN en_JP en_TH \ + sv_FI zh_HK es_419 en_ZA fr_CH \ + de_CH it_CH zh_TW # These directories must match what configure uses for QT_INSTALL_PLUGINS and QT_INSTALL_IMPORTS QT_PLUGINS_BASE_DIR = /resource/qt$${QT_LIBINFIX}/plugins |