diff options
| author | Jørgen Lind <jorgen.lind@nokia.com> | 2010-06-24 13:18:58 (GMT) |
|---|---|---|
| committer | Jørgen Lind <jorgen.lind@nokia.com> | 2010-06-24 13:18:58 (GMT) |
| commit | 9ecd67ee21ededfbd262279ebdb73324540f5df4 (patch) | |
| tree | 5387e993b3befdf6255b9cf2b724189f11e73738 /mkspecs | |
| parent | bd337d251a3ff54c6845f1c4469ec7c99068971e (diff) | |
| parent | 3555687f5ff270c61499a5597444895bec0d70fb (diff) | |
| download | Qt-9ecd67ee21ededfbd262279ebdb73324540f5df4.zip Qt-9ecd67ee21ededfbd262279ebdb73324540f5df4.tar.gz Qt-9ecd67ee21ededfbd262279ebdb73324540f5df4.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into lighthouse
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/common/symbian/symbian.conf | 5 | ||||
| -rw-r--r-- | mkspecs/features/qt_functions.prf | 3 | ||||
| -rw-r--r-- | mkspecs/features/sis_targets.prf | 6 | ||||
| -rw-r--r-- | mkspecs/features/symbian/data_caging_paths.prf | 2 |
4 files changed, 13 insertions, 3 deletions
diff --git a/mkspecs/common/symbian/symbian.conf b/mkspecs/common/symbian/symbian.conf index b037d3c..baa519f 100644 --- a/mkspecs/common/symbian/symbian.conf +++ b/mkspecs/common/symbian/symbian.conf @@ -110,6 +110,11 @@ QMAKE_TAR = tar -cf QMAKE_GZIP = gzip -9f QT_ARCH = symbian + +# These directories must match what configure uses for QT_INSTALL_PLUGINS and QT_INSTALL_IMPORTS +QT_PLUGINS_BASE_DIR = /resource/qt$${QT_LIBINFIX}/plugins +QT_IMPORTS_BASE_DIR = /resource/qt/imports + load(qt_config) load(symbian/platform_paths) diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf index a49c1a6..afc708a 100644 --- a/mkspecs/features/qt_functions.prf +++ b/mkspecs/features/qt_functions.prf @@ -51,8 +51,9 @@ defineTest(qtAddLibrary) { INCLUDEPATH *= $$MW_LAYER_SYSTEMINCLUDE } isEqual(LIB_NAME, QtWebKit) { - # Needed for #include <QtXmlPatterns/QtXmlPatterns> because relative inclusion problem in toolchain + # Needed for because relative inclusion problem in toolchain INCLUDEPATH *= $$QMAKE_INCDIR_QT/QtXmlPatterns + INCLUDEPATH *= $$QMAKE_INCDIR_QT/QtNetwork } isEqual(LIB_NAME, QtXmlPatterns) { # Needed for #include <QtXmlPatterns/QtXmlPatterns> because relative inclusion problem in toolchain diff --git a/mkspecs/features/sis_targets.prf b/mkspecs/features/sis_targets.prf index 37b758b..4207e0b 100644 --- a/mkspecs/features/sis_targets.prf +++ b/mkspecs/features/sis_targets.prf @@ -170,6 +170,12 @@ equals(GENERATE_SIS_TARGETS, true) { sis_target.commands = sis_target.target = sis QMAKE_EXTRA_TARGETS += sis_target + + symbian-abld { + # Create dummy store_build target to avoid errors from .mk callbacks during build + store_build_target.target = store_build + QMAKE_EXTRA_TARGETS += store_build_target + } } QMAKE_DISTCLEAN += $${sis_destdir}$${TARGET}.sis diff --git a/mkspecs/features/symbian/data_caging_paths.prf b/mkspecs/features/symbian/data_caging_paths.prf index 6b709cc..6b38d4d 100644 --- a/mkspecs/features/symbian/data_caging_paths.prf +++ b/mkspecs/features/symbian/data_caging_paths.prf @@ -74,8 +74,6 @@ exists($${EPOCROOT}epoc32/include/data_caging_paths.prf) { BOOTDATA_DIR = /resource/bootdata } -isEmpty(QT_PLUGINS_BASE_DIR): QT_PLUGINS_BASE_DIR = $$RESOURCE_FILES_DIR/qt$${QT_LIBINFIX}/plugins -isEmpty(QT_IMPORTS_BASE_DIR): QT_IMPORTS_BASE_DIR = $$RESOURCE_FILES_DIR/qt/imports isEmpty(HW_ZDIR): HW_ZDIR = epoc32/data/z isEmpty(REG_RESOURCE_DIR): REG_RESOURCE_DIR = /private/10003a3f/apps isEmpty(REG_RESOURCE_IMPORT_DIR): REG_RESOURCE_IMPORT_DIR = /private/10003a3f/import/apps
\ No newline at end of file |