summaryrefslogtreecommitdiffstats
path: root/mkspecs
diff options
context:
space:
mode:
authorMarco Bubke <marco.bubke@nokia.com>2010-09-22 17:58:18 (GMT)
committerMarco Bubke <marco.bubke@nokia.com>2010-09-22 17:58:18 (GMT)
commit7412ac5b38d83b627a372a525f271c225f9c1f70 (patch)
tree535d869282e578afa2ae13e291e23e811dbb4dce /mkspecs
parentbb878bb1ee9a5272359e88d44806971e13c31486 (diff)
downloadQt-7412ac5b38d83b627a372a525f271c225f9c1f70.zip
Qt-7412ac5b38d83b627a372a525f271c225f9c1f70.tar.gz
Qt-7412ac5b38d83b627a372a525f271c225f9c1f70.tar.bz2
Qmake: Fix wrong path in the breakpad post link step
Reviewed-By: Oswald Buddenhagen
Diffstat (limited to 'mkspecs')
-rw-r--r--mkspecs/features/default_post.prf19
1 files changed, 9 insertions, 10 deletions
diff --git a/mkspecs/features/default_post.prf b/mkspecs/features/default_post.prf
index 59a5e86..09c6587 100644
--- a/mkspecs/features/default_post.prf
+++ b/mkspecs/features/default_post.prf
@@ -45,32 +45,32 @@ breakpad {
macx {
equals(TEMPLATE, lib) {
lib_bundle {
- TARGET_FILENAME = $${TARGET_BASEPATH}$${TARGET}.framework/$${TARGET}
+ TARGET_BASEPATH = $${TARGET_BASEPATH}$${TARGET}.framework/$${TARGET}
} else {
- TARGET_FILENAME = $${TARGET_BASEPATH}$${LIBPREFIX}$${TARGET}
+ TARGET_BASEPATH = $${TARGET_BASEPATH}$${LIBPREFIX}$${TARGET}
!plugin {
TEMP_VERSION = $$section(VERSION, ., 0, 0)
isEmpty(TEMP_VERSION):TEMP_VERSION = 1
- TARGET_FILENAME = $${TARGET_FILENAME}.$${TEMP_VERSION}
+ TARGET_BASEPATH = $${TARGET_BASEPATH}.$${TEMP_VERSION}
}
- TARGET_FILENAME = $${TARGET_FILENAME}.$${QMAKE_EXTENSION_SHLIB}
+ TARGET_BASEPATH = $${TARGET_BASEPATH}.$${QMAKE_EXTENSION_SHLIB}
}
} else {
app_bundle {
- TARGET_FILENAME = $${TARGET_BASEPATH}$${TARGET}.app/Contents/MacOS/$${TARGET}
+ TARGET_BASEPATH = $${TARGET_BASEPATH}$${TARGET}.app/Contents/MacOS/$${TARGET}
} else {
- TARGET_FILENAME = $${TARGET_BASEPATH}$${TARGET}
+ TARGET_BASEPATH = $${TARGET_BASEPATH}$${TARGET}
}
}
- DEBUGFILENAME = $$TARGET_FILENAME
+ DEBUGFILENAME = $$TARGET_BASEPATH
} else {
equals(TEMPLATE, lib) {
plugin {
- TARGET_FILENAME = $${TARGET_BASEPATH}$${LIBPREFIX}$${TARGET}.so
+ TARGET_BASEPATH = $${TARGET_BASEPATH}$${LIBPREFIX}$${TARGET}.so
} else {
TEMP_VERSION = $$VERSION
isEmpty(TEMP_VERSION):TEMP_VERSION = 1.0.0
- TARGET_FILENAME = $${TARGET_BASEPATH}$${LIBPREFIX}$${TARGET}.so.$${TEMP_VERSION}
+ TARGET_BASEPATH = $${TARGET_BASEPATH}$${LIBPREFIX}$${TARGET}.so.$${TEMP_VERSION}
}
} else {
TARGET_BASEPATH = $${TARGET_BASEPATH}$${TARGET}
@@ -87,7 +87,6 @@ breakpad {
!isEmpty(QMAKE_STRIP):QMAKE_POST_LINK = $$quote($$QMAKE_POST_LINK$$escape_expand(\\n\\t)$$QMAKE_STRIP \"$$DEBUGFILENAME\")
unset(TARGET_BASEPATH)
- unset(TARGET_FILENAME)
unset(SYMBOLFILENAME)
unset(TARGET_EXT)
unset(TARGET_VERSION_EXT)