From 035c3cfb4bb039444ec26145b620255d72eefd1d Mon Sep 17 00:00:00 2001 From: wang-bin Date: Sat, 18 Jun 2016 00:56:02 +0800 Subject: [PATCH] qmake: fix osx strip path --- common.pri | 2 +- examples/common/libcommon.pri | 2 +- qml/libQmlAV.pri | 2 +- src/libQtAV.pri | 2 +- widgets/libQtAVWidgets.pri | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/common.pri b/common.pri index 86ccc60c0..65cf3ab1d 100644 --- a/common.pri +++ b/common.pri @@ -484,7 +484,7 @@ defineTest(preparePaths) { # TARGET = $$qtLongName($$TARGET) EXE_EXT = win32: EXE_EXT = .exe - CONFIG(release, debug|release): !isEmpty(QMAKE_STRIP): QMAKE_POST_LINK = -$$QMAKE_STRIP $$DESTDIR/$${TARGET}$${EXE_EXT} #.exe in win + CONFIG(release, debug|release): !isEmpty(QMAKE_STRIP):!mac_framework: QMAKE_POST_LINK = -$$QMAKE_STRIP $$DESTDIR/$${TARGET}$${EXE_EXT} #.exe in win } else: DESTDIR = $$qtLongName($$BUILD_DIR/lib) !build_pass { message(target: $$DESTDIR/$$TARGET) diff --git a/examples/common/libcommon.pri b/examples/common/libcommon.pri index 229731cfd..bb4850c8b 100644 --- a/examples/common/libcommon.pri +++ b/examples/common/libcommon.pri @@ -118,7 +118,7 @@ DEPENDPATH *= $$PROJECT_SRCPATH !CONFIG(plugin) { !isEqual(DESTDIR, $$BUILD_DIR/bin): DLLDESTDIR = $$BUILD_DIR/bin #copy shared lib there } - CONFIG(release, debug|release): !isEmpty(QMAKE_STRIP): QMAKE_POST_LINK = -$$QMAKE_STRIP $$PROJECT_LIBDIR/$$qtSharedLib($$NAME) + CONFIG(release, debug|release): !isEmpty(QMAKE_STRIP):!mac_framework: QMAKE_POST_LINK = -$$QMAKE_STRIP $$PROJECT_LIBDIR/$$qtSharedLib($$NAME) #copy from the pro creator creates. symbian { MMP_RULES += EXPORTUNFROZEN diff --git a/qml/libQmlAV.pri b/qml/libQmlAV.pri index eae51865f..15fde7b8f 100644 --- a/qml/libQmlAV.pri +++ b/qml/libQmlAV.pri @@ -114,7 +114,7 @@ DEPENDPATH *= $$PROJECT_SRCPATH !isEqual(DESTDIR, $$BUILD_DIR/bin): DLLDESTDIR = $$BUILD_DIR/bin #copy shared lib there } #QMAKE_POST_LINK+=: just append as a string to previous QMAKE_POST_LINK - CONFIG(release, debug|release): !isEmpty(QMAKE_STRIP): QMAKE_POST_LINK = $$quote(-$$QMAKE_STRIP $$shell_path($$DESTDIR/$$qtSharedLib($$NAME))) + CONFIG(release, debug|release): !isEmpty(QMAKE_STRIP):!mac_framework: QMAKE_POST_LINK = $$quote(-$$QMAKE_STRIP $$shell_path($$DESTDIR/$$qtSharedLib($$NAME))) #copy from the pro creator creates. symbian { MMP_RULES += EXPORTUNFROZEN diff --git a/src/libQtAV.pri b/src/libQtAV.pri index 3cd2906a0..7f5c762ae 100644 --- a/src/libQtAV.pri +++ b/src/libQtAV.pri @@ -119,7 +119,7 @@ DEPENDPATH *= $$PROJECT_SRCPATH !CONFIG(plugin) { !isEqual(DESTDIR, $$BUILD_DIR/bin): DLLDESTDIR = $$BUILD_DIR/bin #copy shared lib there } - CONFIG(release, debug|release): !isEmpty(QMAKE_STRIP): QMAKE_POST_LINK = -$$QMAKE_STRIP $$PROJECT_LIBDIR/$$qtSharedLib($$NAME) + CONFIG(release, debug|release): !isEmpty(QMAKE_STRIP):!mac_framework: QMAKE_POST_LINK = -$$QMAKE_STRIP $$PROJECT_LIBDIR/$$qtSharedLib($$NAME) #copy from the pro creator creates. symbian { MMP_RULES += EXPORTUNFROZEN diff --git a/widgets/libQtAVWidgets.pri b/widgets/libQtAVWidgets.pri index f763c12f1..68a5ce978 100644 --- a/widgets/libQtAVWidgets.pri +++ b/widgets/libQtAVWidgets.pri @@ -117,7 +117,7 @@ DEPENDPATH *= $$PROJECT_SRCPATH !CONFIG(plugin) { !isEqual(DESTDIR, $$BUILD_DIR/bin): DLLDESTDIR = $$BUILD_DIR/bin #copy shared lib there } - CONFIG(release, debug|release): !isEmpty(QMAKE_STRIP): QMAKE_POST_LINK = -$$QMAKE_STRIP $$PROJECT_LIBDIR/$$qtSharedLib($$NAME) + CONFIG(release, debug|release): !isEmpty(QMAKE_STRIP):!mac_framework: QMAKE_POST_LINK = -$$QMAKE_STRIP $$PROJECT_LIBDIR/$$qtSharedLib($$NAME) #copy from the pro creator creates. symbian { MMP_RULES += EXPORTUNFROZEN