summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Zander <t.zander@nokia.com>2010-04-29 09:02:35 (GMT)
committerThomas Zander <t.zander@nokia.com>2010-04-29 09:10:13 (GMT)
commit66595764620c82ed525de86b7dabcec7a9314355 (patch)
tree0732c35d62b2c48008574c05d8f6447aa5d5ae78
parent07050130386f0f0e05197f852cd49f964e6486a8 (diff)
downloadQt-66595764620c82ed525de86b7dabcec7a9314355.zip
Qt-66595764620c82ed525de86b7dabcec7a9314355.tar.gz
Qt-66595764620c82ed525de86b7dabcec7a9314355.tar.bz2
Make symbian-resource files aware of libInfix configure feature
-rw-r--r--mkspecs/features/symbian/symbian_building.prf6
1 files changed, 3 insertions, 3 deletions
diff --git a/mkspecs/features/symbian/symbian_building.prf b/mkspecs/features/symbian/symbian_building.prf
index a097771..c21b4c9 100644
--- a/mkspecs/features/symbian/symbian_building.prf
+++ b/mkspecs/features/symbian/symbian_building.prf
@@ -208,7 +208,7 @@ for(symbian_resource, SYMBIAN_RESOURCES) {
}
symbianresources.input = SYMBIAN_RESOURCES
-symbianresources.output = $$symbian_resources_RCC_DIR/${QMAKE_FILE_BASE}.rsg
+symbianresources.output = $$symbian_resources_RCC_DIR/${QMAKE_FILE_BASE}$${QT_LIBINFIX}.rsg
symbianresources.commands = cpp -nostdinc -undef \
$$symbian_resources_INCLUDES \
$$symbian_resources_DEFINES \
@@ -216,8 +216,8 @@ symbianresources.commands = cpp -nostdinc -undef \
-o $${symbian_resources_RCC_DIR}/${QMAKE_FILE_BASE}.rpp \
&& rcomp -u -m045,046,047 \
-s$${symbian_resources_RCC_DIR}/${QMAKE_FILE_BASE}.rpp \
- -o$${symbianDestdir}/${QMAKE_FILE_BASE}.rsc \
- -h$${symbian_resources_RCC_DIR}/${QMAKE_FILE_BASE}.rsg \
+ -o$${symbianDestdir}/${QMAKE_FILE_BASE}$${QT_LIBINFIX}.rsc \
+ -h$${symbian_resources_RCC_DIR}/${QMAKE_FILE_BASE}$${QT_LIBINFIX}.rsg \
-i${QMAKE_FILE_NAME}
symbianresources.dependency_type = TYPE_C
symbianresources.CONFIG = no_link target_predeps