diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-06-12 19:17:07 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-06-12 19:17:07 +0200 |
| commit | e2776b44a0e0e34e5a1d851916a94f7db5e7bb7b (patch) | |
| tree | 7c428c524aa1b8cc42d3a581a8c13378ebd341b5 /mkspecs/common | |
| parent | 5c8aa27111fd51c8dff78fd0a276648aea08d4c1 (diff) | |
| parent | af2f1e14f61ee8d3a4ade723aed9618d1707f975 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
src/plugins/platforms/cocoa/qcocoamenubar.mm
Change-Id: I4a699fc8a7f30b2af9de8e496c3d5f027b7495bb
Diffstat (limited to 'mkspecs/common')
| -rw-r--r-- | mkspecs/common/linux-android.conf | 1 | ||||
| -rw-r--r-- | mkspecs/common/linux.conf | 1 | ||||
| -rw-r--r-- | mkspecs/common/mac.conf | 1 | ||||
| -rw-r--r-- | mkspecs/common/nacl/g++-nacl32.conf | 1 | ||||
| -rw-r--r-- | mkspecs/common/nacl/g++-nacl64.conf | 1 | ||||
| -rw-r--r-- | mkspecs/common/qcc-base-qnx-armv7le.conf | 1 | ||||
| -rw-r--r-- | mkspecs/common/qcc-base-qnx-x86.conf | 1 |
7 files changed, 7 insertions, 0 deletions
diff --git a/mkspecs/common/linux-android.conf b/mkspecs/common/linux-android.conf index 363dac3a34..b90a22ebef 100644 --- a/mkspecs/common/linux-android.conf +++ b/mkspecs/common/linux-android.conf @@ -65,6 +65,7 @@ QMAKE_LINK_SHLIB = $$QMAKE_LINK # modifications to linux.conf QMAKE_AR = $$NDK_TOOLCHAIN_PATH/bin/$$ANDROID_NDK_TOOLS_PREFIX-ar cqs QMAKE_OBJCOPY = $$NDK_TOOLCHAIN_PATH/bin/$$ANDROID_NDK_TOOLS_PREFIX-objcopy +QMAKE_NM = $$NDK_TOOLCHAIN_PATH/bin/$$ANDROID_NDK_TOOLS_PREFIX-nm -P QMAKE_STRIP = $$NDK_TOOLCHAIN_PATH/bin/$$ANDROID_NDK_TOOLS_PREFIX-strip QMAKE_RANLIB = $$NDK_TOOLCHAIN_PATH/bin/$$ANDROID_NDK_TOOLS_PREFIX-ranlib diff --git a/mkspecs/common/linux.conf b/mkspecs/common/linux.conf index 1c46ab7c21..c727bd9aef 100644 --- a/mkspecs/common/linux.conf +++ b/mkspecs/common/linux.conf @@ -48,6 +48,7 @@ QMAKE_DEFINES_XCB = QMAKE_AR = ar cqs QMAKE_OBJCOPY = objcopy +QMAKE_NM = nm -P QMAKE_RANLIB = QMAKE_STRIP = strip diff --git a/mkspecs/common/mac.conf b/mkspecs/common/mac.conf index cf54f3f580..341c74657a 100644 --- a/mkspecs/common/mac.conf +++ b/mkspecs/common/mac.conf @@ -25,5 +25,6 @@ QMAKE_LIBS_THREAD = QMAKE_AR = ar cq QMAKE_RANLIB = ranlib -s +QMAKE_NM = nm -P include(unix.conf) diff --git a/mkspecs/common/nacl/g++-nacl32.conf b/mkspecs/common/nacl/g++-nacl32.conf index 7ab48dba3a..319d3ca475 100644 --- a/mkspecs/common/nacl/g++-nacl32.conf +++ b/mkspecs/common/nacl/g++-nacl32.conf @@ -7,5 +7,6 @@ QMAKE_LINK = i686-nacl-g++ QMAKE_LINK_SHLIB = i686-nacl-g++ QMAKE_AR = i686-nacl-ar q QMAKE_OBJCOPY = i686-nacl-objcopy +QMAKE_NM = i686-nacl-nm -P QMAKE_STRIP = i686-nacl-strip diff --git a/mkspecs/common/nacl/g++-nacl64.conf b/mkspecs/common/nacl/g++-nacl64.conf index 91ffcc2310..8a20535775 100644 --- a/mkspecs/common/nacl/g++-nacl64.conf +++ b/mkspecs/common/nacl/g++-nacl64.conf @@ -7,5 +7,6 @@ QMAKE_LINK = x86_64-nacl-g++ QMAKE_LINK_SHLIB = x86_64-nacl-g++ QMAKE_AR = x86_64-nacl-ar q QMAKE_OBJCOPY = x86_64-nacl-objcopy +QMAKE_NM = x86_64-nacl-nm -P QMAKE_STRIP = x86_64-nacl-strip diff --git a/mkspecs/common/qcc-base-qnx-armv7le.conf b/mkspecs/common/qcc-base-qnx-armv7le.conf index 9bd9e288d3..331a65b2bf 100644 --- a/mkspecs/common/qcc-base-qnx-armv7le.conf +++ b/mkspecs/common/qcc-base-qnx-armv7le.conf @@ -15,6 +15,7 @@ include(qcc-base-qnx.conf) QMAKE_AR = ntoarmv7-ar cqs QMAKE_OBJCOPY = ntoarmv7-objcopy +QMAKE_NM = ntoarmv7-nm -P QMAKE_RANLIB = ntoarmv7-ranlib QMAKE_STRIP = ntoarmv7-strip diff --git a/mkspecs/common/qcc-base-qnx-x86.conf b/mkspecs/common/qcc-base-qnx-x86.conf index a2803a5c5a..b49075086d 100644 --- a/mkspecs/common/qcc-base-qnx-x86.conf +++ b/mkspecs/common/qcc-base-qnx-x86.conf @@ -15,6 +15,7 @@ include(qcc-base-qnx.conf) QMAKE_AR = ntox86-ar cqs QMAKE_OBJCOPY = ntox86-objcopy +QMAKE_NM = ntox86-nm -P QMAKE_RANLIB = ntox86-ranlib QMAKE_STRIP = ntox86-strip |