summaryrefslogtreecommitdiffstats
path: root/mkspecs/unsupported
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-10-29 16:06:02 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-10-29 16:06:02 (GMT)
commit1cb7e3503a907719aebb98096c302a8327e9804d (patch)
tree451df6118fc8155793ecf32051eb7e2562f94826 /mkspecs/unsupported
parent0af9699f95bed1d5bd66c2f3e787622674ca22a8 (diff)
parent8cd4b7622ea425f8fef316ae4ae91133f29f53c5 (diff)
downloadQt-1cb7e3503a907719aebb98096c302a8327e9804d.zip
Qt-1cb7e3503a907719aebb98096c302a8327e9804d.tar.gz
Qt-1cb7e3503a907719aebb98096c302a8327e9804d.tar.bz2
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Add autotest for QScriptExtensionPlugin Improve QtScript test coverage Don't crash when null-pointer is passed to qScriptValueFromValue() Simplify object lifetime management when moving objects to a QThread samegame: white space Move list of trusted benchmarks out of QA dungeon and into Qt Don't put Objective-C sources in SOURCES mkspecs: Emit warning when including g++.conf directly
Diffstat (limited to 'mkspecs/unsupported')
-rw-r--r--mkspecs/unsupported/macx-clang/qmake.conf2
-rw-r--r--mkspecs/unsupported/qws/qnx-generic-g++/qmake.conf1
2 files changed, 1 insertions, 2 deletions
diff --git a/mkspecs/unsupported/macx-clang/qmake.conf b/mkspecs/unsupported/macx-clang/qmake.conf
index 17892e8..aaabf27 100644
--- a/mkspecs/unsupported/macx-clang/qmake.conf
+++ b/mkspecs/unsupported/macx-clang/qmake.conf
@@ -11,7 +11,7 @@ QMAKE_INCREMENTAL_STYLE = sublib
include(../../common/mac.conf)
include(../../common/clang.conf)
-include(../../common/gcc-base-mac.conf)
+include(../../common/gcc-base-macx.conf)
QMAKE_OBJCFLAGS_PRECOMPILE = -x objective-c-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT}
QMAKE_OBJCFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE
diff --git a/mkspecs/unsupported/qws/qnx-generic-g++/qmake.conf b/mkspecs/unsupported/qws/qnx-generic-g++/qmake.conf
index 26de9b7..bb760b2 100644
--- a/mkspecs/unsupported/qws/qnx-generic-g++/qmake.conf
+++ b/mkspecs/unsupported/qws/qnx-generic-g++/qmake.conf
@@ -61,7 +61,6 @@ QMAKE_PCH_OUTPUT_EXT = .gch
QMAKE_LFLAGS_BSYMBOLIC_FUNC = -Wl,-Bsymbolic-functions
QMAKE_LFLAGS_DYNAMIC_LIST = -Wl,--dynamic-list,
-#include(../../common/g++.conf)
include(../../common/unix.conf)
QMAKE_CFLAGS_THREAD = -D_REENTRANT