diff options
| author | Olivier Goffart <olivier.goffart@nokia.com> | 2010-09-28 11:14:23 (GMT) |
|---|---|---|
| committer | Olivier Goffart <olivier.goffart@nokia.com> | 2010-09-28 11:14:23 (GMT) |
| commit | 38d7fb497eec5491e2d845e7eb5522dafc6ab42b (patch) | |
| tree | 9b51ec779b10296ce1cc8ebae29d069c1d2edd55 /mkspecs/features | |
| parent | 2868302626b8a31f44df1068514485a89ec27171 (diff) | |
| parent | 7b796b4dcdebfba55c4754d241edb334217fc550 (diff) | |
| download | Qt-38d7fb497eec5491e2d845e7eb5522dafc6ab42b.zip Qt-38d7fb497eec5491e2d845e7eb5522dafc6ab42b.tar.gz Qt-38d7fb497eec5491e2d845e7eb5522dafc6ab42b.tar.bz2 | |
Merge remote branch 'origin/4.7' into qt-master-from-4.7
Conflicts:
src/gui/painting/qrasterizer.cpp
src/network/access/qnetworkaccessmanager.cpp
tests/auto/qpainter/tst_qpainter.cpp
tools/assistant/tools/assistant/mainwindow.cpp
Diffstat (limited to 'mkspecs/features')
| -rw-r--r-- | mkspecs/features/default_post.prf | 19 |
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) |