summaryrefslogtreecommitdiffstats
path: root/mkspecs
diff options
context:
space:
mode:
authorAaron McCarthy <aaron.mccarthy@nokia.com>2010-06-11 02:09:02 (GMT)
committerAaron McCarthy <aaron.mccarthy@nokia.com>2010-06-11 02:09:02 (GMT)
commit6ecb66ef888fd4c1f3e92ca6de8a227a96da3ec1 (patch)
tree731d8c8521a5f859a183fc9443fbf6c286b39389 /mkspecs
parent6de46501e508fd8d1bbf3d73903f2a3d50218f6b (diff)
downloadQt-6ecb66ef888fd4c1f3e92ca6de8a227a96da3ec1.zip
Qt-6ecb66ef888fd4c1f3e92ca6de8a227a96da3ec1.tar.gz
Qt-6ecb66ef888fd4c1f3e92ca6de8a227a96da3ec1.tar.bz2
Revert "Attempt to fix build failure on Symbian."
This reverts commit 6de46501e508fd8d1bbf3d73903f2a3d50218f6b.
Diffstat (limited to 'mkspecs')
-rw-r--r--mkspecs/features/symbian/data_caging_paths.prf4
1 files changed, 2 insertions, 2 deletions
diff --git a/mkspecs/features/symbian/data_caging_paths.prf b/mkspecs/features/symbian/data_caging_paths.prf
index a3fe7e7..6b709cc 100644
--- a/mkspecs/features/symbian/data_caging_paths.prf
+++ b/mkspecs/features/symbian/data_caging_paths.prf
@@ -74,8 +74,8 @@ exists($${EPOCROOT}epoc32/include/data_caging_paths.prf) {
BOOTDATA_DIR = /resource/bootdata
}
-QT_PLUGINS_BASE_DIR = $$RESOURCE_FILES_DIR/qt$${QT_LIBINFIX}/plugins
+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
+isEmpty(REG_RESOURCE_IMPORT_DIR): REG_RESOURCE_IMPORT_DIR = /private/10003a3f/import/apps \ No newline at end of file