summaryrefslogtreecommitdiffstats
path: root/mkspecs
diff options
context:
space:
mode:
authorMiikka Heikkinen <miikka.heikkinen@digia.com>2011-08-23 09:18:54 (GMT)
committerMiikka Heikkinen <miikka.heikkinen@digia.com>2011-08-24 13:09:03 (GMT)
commit8cd5df01478f59fd62786fce032ab7ce04656ca4 (patch)
treeaf498fb89bd34167983ad94094ee20b39dbf8cc6 /mkspecs
parentac10a99e642c9005efc7639583fcb726acc169fd (diff)
downloadQt-8cd5df01478f59fd62786fce032ab7ce04656ca4.zip
Qt-8cd5df01478f59fd62786fce032ab7ce04656ca4.tar.gz
Qt-8cd5df01478f59fd62786fce032ab7ce04656ca4.tar.bz2
Fix def file paths for Symbian shadow builds
Def file paths are now generated absolute Task-number: QTBUG-10703 Reviewed-by: Sami Merila
Diffstat (limited to 'mkspecs')
-rw-r--r--mkspecs/features/symbian/def_files.prf16
1 files changed, 10 insertions, 6 deletions
diff --git a/mkspecs/features/symbian/def_files.prf b/mkspecs/features/symbian/def_files.prf
index 746de6a..a78c74e 100644
--- a/mkspecs/features/symbian/def_files.prf
+++ b/mkspecs/features/symbian/def_files.prf
@@ -30,28 +30,32 @@ symbian-abld|symbian-sbsv2 {
# statements - they use the qmake generated statements instead
# Static libraries obviously don't have DEF files, as they don't take part in dynamic linkage
!contains(TEMPLATE, app):!contains(CONFIG, plugin):!contains(CONFIG, staticlib): {
+ # Symbian DEFFILE statements do not like drive letters, so remove it from the pro path.
+ FIXED_PRO_PATH = $$replace(_PRO_FILE_PWD_, "^.:", "")/
!isEmpty(DEF_FILE) {
+ contains(DEF_FILE,"^/.*"): FIXED_PRO_PATH =
defBlock = \
"$${LITERAL_HASH}ifdef WINSCW" \
- "DEFFILE $$DEF_FILE/bwins/$${clean_TARGET}.def" \
+ "DEFFILE $$FIXED_PRO_PATH$$DEF_FILE/bwins/$${clean_TARGET}.def" \
"$${LITERAL_HASH}elif defined EABI" \
- "DEFFILE $$DEF_FILE/eabi/$${clean_TARGET}.def" \
+ "DEFFILE $$FIXED_PRO_PATH$$DEF_FILE/eabi/$${clean_TARGET}.def" \
"$${LITERAL_HASH}endif"
} else:!isEmpty(defFilePath) {
+ contains(defFilePath,"^/.*"): FIXED_PRO_PATH =
defBlock = \
"$${LITERAL_HASH}ifdef WINSCW" \
- "DEFFILE $$defFilePath/bwins/$${clean_TARGET}.def" \
+ "DEFFILE $$FIXED_PRO_PATH$$defFilePath/bwins/$${clean_TARGET}.def" \
"$${LITERAL_HASH}elif defined EABI" \
- "DEFFILE $$defFilePath/eabi/$${clean_TARGET}.def" \
+ "DEFFILE $$FIXED_PRO_PATH$$defFilePath/eabi/$${clean_TARGET}.def" \
"$${LITERAL_HASH}endif"
} else {
# If defFilePath is not defined, then put the folders containing the DEF files at the
# same level as the .pro (and generated MMP) file(s)
defBlock = \
"$${LITERAL_HASH}ifdef WINSCW" \
- "DEFFILE ./bwins/$${clean_TARGET}.def" \
+ "DEFFILE $${FIXED_PRO_PATH}bwins/$${clean_TARGET}.def" \
"$${LITERAL_HASH}elif defined EABI" \
- "DEFFILE ./eabi/$${clean_TARGET}.def" \
+ "DEFFILE $${FIXED_PRO_PATH}eabi/$${clean_TARGET}.def" \
"$${LITERAL_HASH}endif"
}
MMP_RULES += defBlock