diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2010-03-15 12:11:08 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2010-03-15 12:11:08 (GMT) |
| commit | 90d7b8dd7968c3e63cd3d9b7e8e1b5d83b20b475 (patch) | |
| tree | a519424035cdbd92d665c748ffa6ecfa8d553f3b /tools/configure/configureapp.cpp | |
| parent | 065f26ef3996368ba67ff5d8e34b20106c359a95 (diff) | |
| parent | 02d1a0422c42889813bb2586503aff43a3509e09 (diff) | |
| download | Qt-90d7b8dd7968c3e63cd3d9b7e8e1b5d83b20b475.zip Qt-90d7b8dd7968c3e63cd3d9b7e8e1b5d83b20b475.tar.gz Qt-90d7b8dd7968c3e63cd3d9b7e8e1b5d83b20b475.tar.bz2 | |
Merge remote branch 'origin/4.6' into qt-4.7-from-4.6
Conflicts:
src/gui/styles/qs60style_s60.cpp
Diffstat (limited to 'tools/configure/configureapp.cpp')
| -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 6b7740e..dd68fcd 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -1495,6 +1495,7 @@ void Configure::applySpecSpecifics() dictionary[ "QT_INSTALL_PREFIX" ] = ""; dictionary[ "QT_INSTALL_PLUGINS" ] = "\\resource\\qt\\plugins"; dictionary[ "QT_INSTALL_IMPORTS" ] = "\\resource\\qt\\imports"; + dictionary[ "QT_INSTALL_TRANSLATIONS" ] = "\\resource\\qt\\translations"; dictionary[ "ARM_FPU_TYPE" ] = "softvfp"; dictionary[ "SQL_SQLITE" ] = "yes"; dictionary[ "SQL_SQLITE_LIB" ] = "system"; |