diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-10-20 00:36:47 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-10-20 00:36:47 (GMT) |
| commit | 4673878256262802c07303fce1e1f8cc1b7e652b (patch) | |
| tree | b740f82d2ecfdfaab9726c0bdf35df80681396ba /qmake/qmake.pri | |
| parent | 6c27b3bb33a522633a9d8d29729a22a16d93e082 (diff) | |
| parent | 8051a73be276995adfc4508a0cb5ad6451e8ab45 (diff) | |
| download | Qt-4673878256262802c07303fce1e1f8cc1b7e652b.zip Qt-4673878256262802c07303fce1e1f8cc1b7e652b.tar.gz Qt-4673878256262802c07303fce1e1f8cc1b7e652b.tar.bz2 | |
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team: (116 commits)
Update Japanese translations.
Updated Russian translation
Update Korean translations to 4.8
qmake: fix writing of incremental linker option for vcxproj files
support the obj-c #import statement in the dependency generator
runonphone timestamps nanosecond formating set to 9 chars, 0 padded
Put Qt translation files to rom on Symbian.
Add -nn for .cpp MOC preprocessing for INTEGRITY
Remove commented out code.
Update Polish translations for 4.8
Fix QDeclarativeEngine::setOfflineStoragePath() for Symbian
Fixes: libpng symbols exported from QtGui.dll on Windows
Converting from double to qreal in gui
Doc updates to installation, platform notes and symbian introduction.
Fix XML schema validation failure.
purge "Translation Rules for Plurals"
add -list-languages option to lupdate
Fix construction races in QtNetwork
Removing accidental use of double instead of qreal from QLine
Fix incorrect QFileInfo permissions on windows
...
Diffstat (limited to 'qmake/qmake.pri')
| -rw-r--r-- | qmake/qmake.pri | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/qmake/qmake.pri b/qmake/qmake.pri index 87735d6..c2fc1d5 100644 --- a/qmake/qmake.pri +++ b/qmake/qmake.pri @@ -20,6 +20,7 @@ SOURCES += project.cpp property.cpp main.cpp generators/makefile.cpp \ generators/symbian/symmake_abld.cpp \ generators/symbian/symmake_sbsv2.cpp \ generators/symbian/initprojectdeploy_symbian.cpp \ + generators/integrity/gbuild.cpp \ windows/registry.cpp \ symbian/epocroot.cpp @@ -36,6 +37,7 @@ HEADERS += project.h property.h generators/makefile.h \ generators/symbian/symmake_abld.h \ generators/symbian/symmake_sbsv2.h \ generators/symbian/initprojectdeploy_symbian.h \ + generators/integrity/gbuild.h \ windows/registry_p.h \ symbian/epocroot_p.h |