diff options
| author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2010-06-22 09:54:18 (GMT) |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2010-06-22 09:54:18 (GMT) |
| commit | c2f0e79f36ddd9c157ee795825c862687957941d (patch) | |
| tree | 828854b74818a30f52240b8badb930578294a97e | |
| parent | bc3c9ed2c7a65f976138584298085f79ed85d255 (diff) | |
| download | Qt-c2f0e79f36ddd9c157ee795825c862687957941d.zip Qt-c2f0e79f36ddd9c157ee795825c862687957941d.tar.gz Qt-c2f0e79f36ddd9c157ee795825c862687957941d.tar.bz2 | |
Moved QT_PLUGINS_BASE_DIR and QT_IMPORTS_BASE_DIR to symbian.conf
These definitions are not platform dependent as they must be exactly
what configure sets for plugins and imports paths, so moved them
out of data_caging_paths.prf into symbian.conf.
Task-number: QTBUG-11619
Reviewed-by: axis
| -rw-r--r-- | mkspecs/common/symbian/symbian.conf | 5 | ||||
| -rw-r--r-- | mkspecs/features/symbian/data_caging_paths.prf | 2 |
2 files changed, 5 insertions, 2 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/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 |