diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-10 10:54:03 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-10 10:54:03 (GMT) |
| commit | afd6dbb4f0cdf5ea5b008351537c5d377af89c91 (patch) | |
| tree | efeec78dfd2f548a5b27659c96a210962f8221e1 /tools | |
| parent | 389930090c938d3aeaae7f23bf6a07aeeaed9edf (diff) | |
| parent | 7e78d2668e508f929243fe2169e1d9937b8d2b67 (diff) | |
| download | Qt-afd6dbb4f0cdf5ea5b008351537c5d377af89c91.zip Qt-afd6dbb4f0cdf5ea5b008351537c5d377af89c91.tar.gz Qt-afd6dbb4f0cdf5ea5b008351537c5d377af89c91.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Fixed paint crash in Symbian for trasnclucent dialogs.
Implemented QLibraryInfo::TranslationsPath for Symbian.
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/configure/configureapp.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index 153df10..2555015 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -1484,6 +1484,7 @@ void Configure::applySpecSpecifics() dictionary[ "QT_HOST_PREFIX" ] = dictionary[ "QT_INSTALL_PREFIX" ]; dictionary[ "QT_INSTALL_PREFIX" ] = ""; dictionary[ "QT_INSTALL_PLUGINS" ] = "\\resource\\qt\\plugins"; + dictionary[ "QT_INSTALL_TRANSLATIONS" ] = "\\resource\\qt\\translations"; dictionary[ "ARM_FPU_TYPE" ] = "softvfp"; dictionary[ "SQL_SQLITE" ] = "yes"; dictionary[ "SQL_SQLITE_LIB" ] = "system"; |