diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-21 19:27:22 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-21 19:27:22 (GMT) |
| commit | 2ca4e77f0a29bc6d7571ca614a6101d9e1bd83e0 (patch) | |
| tree | 0cee14719cb93e8a3929a6f3e4c6f7e7d4a6e184 /mkspecs/common/symbian/symbian.conf | |
| parent | 8e53d9f5992277fe1729d3310458c6391f204eb9 (diff) | |
| parent | 2fd2858f2e12ea50c02d48d8af29e5540f8095a2 (diff) | |
| download | Qt-2ca4e77f0a29bc6d7571ca614a6101d9e1bd83e0.zip Qt-2ca4e77f0a29bc6d7571ca614a6101d9e1bd83e0.tar.gz Qt-2ca4e77f0a29bc6d7571ca614a6101d9e1bd83e0.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Add (correct) .pro files to INSTALLs.
Assign UID3, install example files, remove redundant code.
Make tst_qdialog::throwInExec work with symbian exception policy
Use a compile time constant for the C epoch as a julian day.
Fix test failures for qdatetime on symbian and wince
Fix compile error in QFileDialog autotest
Fix to collections autotest
Fixed vendor info in fluidlauncher sis package.
Fix default_deployment.pkg_prerules
Fix crash on startup on Symbian OS
Diffstat (limited to 'mkspecs/common/symbian/symbian.conf')
| -rw-r--r-- | mkspecs/common/symbian/symbian.conf | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/mkspecs/common/symbian/symbian.conf b/mkspecs/common/symbian/symbian.conf index 1df3671..0bd0bf2 100644 --- a/mkspecs/common/symbian/symbian.conf +++ b/mkspecs/common/symbian/symbian.conf @@ -112,3 +112,21 @@ QMAKE_GZIP = gzip -9f QT_ARCH = symbian load(qt_config) load(symbian/platform_paths) + +# pkg_depends_webkit, pkg_depends_core, and pkg_platform_dependencies can be removed by developer +# if multiple languages need to be supported by pkg file. In that case the developer should declare +# multiple language compatible dependency statements him/herself. + +default_deployment.pkg_prerules += pkg_depends_webkit pkg_depends_qt pkg_platform_dependencies + +# Supports S60 3.0, 3.1, 3.2 and 5.0 by default +pkg_platform_dependencies = \ + "; Default HW/platform dependencies" \ + "[0x101F7961],0,0,0,{\"S60ProductID\"}" \ + "[0x102032BE],0,0,0,{\"S60ProductID\"}" \ + "[0x102752AE],0,0,0,{\"S60ProductID\"}" \ + "[0x1028315F],0,0,0,{\"S60ProductID\"}" \ + " " + +DEPLOYMENT += default_deployment + |