diff options
| author | Kent Hansen <kent.hansen@nokia.com> | 2012-03-23 14:31:28 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-03-23 14:31:28 +0100 |
| commit | 425b38ef95f6f4478ffbd4ada0d3046fae2c95e7 (patch) | |
| tree | 0347dd701ace8ab022cf6c86edbb61be9795a668 /mkspecs | |
| parent | 2f2b78321427daa8c7f0702140c297d22b0bf3c8 (diff) | |
| parent | 3b512ae142017f105f297467f74dc28d3cb9030a (diff) | |
Merge "Merge master into api_changes" into refs/staging/api_changes
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/common/qcc-base.conf | 2 | ||||
| -rw-r--r-- | mkspecs/features/designer.prf | 2 | ||||
| -rw-r--r-- | mkspecs/features/testcase.prf | 2 | ||||
| -rw-r--r-- | mkspecs/linux-g++-maemo/qplatformdefs.h | 2 | ||||
| -rw-r--r-- | mkspecs/linux-icc/qmake.conf | 10 |
5 files changed, 5 insertions, 13 deletions
diff --git a/mkspecs/common/qcc-base.conf b/mkspecs/common/qcc-base.conf index 5aa09cf21d..a9e86efb75 100644 --- a/mkspecs/common/qcc-base.conf +++ b/mkspecs/common/qcc-base.conf @@ -7,7 +7,7 @@ # as it's on by default in qcc (and has an analogous -nopipe option) # -QMAKE_CFLAGS += +QMAKE_CFLAGS += -Wno-psabi QMAKE_CFLAGS_DEPS += -M QMAKE_CFLAGS_WARN_ON += -Wall -W QMAKE_CFLAGS_WARN_OFF += -w diff --git a/mkspecs/features/designer.prf b/mkspecs/features/designer.prf index 843a118a9a..a03f14640e 100644 --- a/mkspecs/features/designer.prf +++ b/mkspecs/features/designer.prf @@ -1,4 +1,4 @@ -QT += xml uilib +QT += xml !isEmpty(QT.script.name): QT += script !isEmpty(QT.designer.name): QT += designer qt:load(qt) diff --git a/mkspecs/features/testcase.prf b/mkspecs/features/testcase.prf index b00d15579f..ea7b5200c5 100644 --- a/mkspecs/features/testcase.prf +++ b/mkspecs/features/testcase.prf @@ -144,7 +144,7 @@ defineTest(installTestHelperApp) { subPath = $${subInstall}.path win32: extension = .exe $$subTarget = $${2}/$${3}$${extension} - $$subFiles = $${1}$${extension} + $$subFiles = $${OUT_PWD}/$${1}$${extension} $$subPath = $${target.path}/$${2} $$subConfig += no_check_exist executable INSTALLS += $${subInstall} diff --git a/mkspecs/linux-g++-maemo/qplatformdefs.h b/mkspecs/linux-g++-maemo/qplatformdefs.h index de2a70c2bf..c57f3f1015 100644 --- a/mkspecs/linux-g++-maemo/qplatformdefs.h +++ b/mkspecs/linux-g++-maemo/qplatformdefs.h @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include "../linux-g++/qplatformdefs.h" +#include "../linux-arm-gnueabi-g++/qplatformdefs.h" #define QT_GUI_DOUBLE_CLICK_RADIUS 20 #define QT_GUI_DRAG_DISTANCE 16 diff --git a/mkspecs/linux-icc/qmake.conf b/mkspecs/linux-icc/qmake.conf index 49a3306538..36c3d5611b 100644 --- a/mkspecs/linux-icc/qmake.conf +++ b/mkspecs/linux-icc/qmake.conf @@ -1,14 +1,6 @@ # # qmake configuration for linux-icc # -# Written for Intel C++ Compiler versions 10.x for GNU/Linux -# -# Note: Some of the remarks from the Intel compiler are disabled (even -# with 'warn_on' specified): -# -# warning #654: overloaded virtual function "T::f" is only partially overridden in class "U" -# warning #1572: floating-point equality and inequality comparisons are unreliable -# MAKEFILE_GENERATOR = UNIX TARGET_PLATFORM = unix @@ -104,5 +96,5 @@ QMAKE_LFLAGS_DYNAMIC_LIST = -Wl,--dynamic-list, QMAKE_CFLAGS_HIDESYMS += -fvisibility=hidden QMAKE_CXXFLAGS_HIDESYMS += $$QMAKE_CFLAGS_HIDESYMS -fvisibility-inlines-hidden -include(../common/unix.conf) +include(../common/linux.conf) load(qt_config) |