summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSean Harmer <sean.harmer.qnx@kdab.com>2012-08-31 13:59:54 (GMT)
committerQt by Nokia <qt-info@nokia.com>2012-09-04 10:24:23 (GMT)
commitd5d0ecab7806640f34bdb855ea2a8bc684eb5aa9 (patch)
tree7b9959d8eebc26436d8a532821c4fa48b8c43af2
parent9e658e82c9df52db2b0c39caa1e4e4ad3e5afe88 (diff)
downloadQt-d5d0ecab7806640f34bdb855ea2a8bc684eb5aa9.zip
Qt-d5d0ecab7806640f34bdb855ea2a8bc684eb5aa9.tar.gz
Qt-d5d0ecab7806640f34bdb855ea2a8bc684eb5aa9.tar.bz2
QNX: Enable pre-compiled header support for QNX
Backport of bc80ee36f8ffe18f8362b2328ca29f92291df132 Change-Id: I76453dadc24c9bf7ff34d972214c057b82143c77 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
-rwxr-xr-xconfig.tests/unix/precomp.test2
-rw-r--r--mkspecs/common/qcc-base.conf5
2 files changed, 6 insertions, 1 deletions
diff --git a/config.tests/unix/precomp.test b/config.tests/unix/precomp.test
index f7c5a02..9ffea20 100755
--- a/config.tests/unix/precomp.test
+++ b/config.tests/unix/precomp.test
@@ -27,7 +27,7 @@ EOF
rm -f header.pchi header.o source.o
;;
-*g++*|c++)
+*g++*|c++|*qcc*)
case `"$COMPILER" -dumpversion 2>/dev/null` in
3.*)
;;
diff --git a/mkspecs/common/qcc-base.conf b/mkspecs/common/qcc-base.conf
index db396bd..6f8d336 100644
--- a/mkspecs/common/qcc-base.conf
+++ b/mkspecs/common/qcc-base.conf
@@ -30,6 +30,11 @@ QMAKE_CXXFLAGS_STATIC_LIB += $$QMAKE_CFLAGS_STATIC_LIB
QMAKE_CXXFLAGS_YACC += $$QMAKE_CFLAGS_YACC
QMAKE_CXXFLAGS_HIDESYMS += $$QMAKE_CFLAGS_HIDESYMS -fvisibility-inlines-hidden
+QMAKE_CFLAGS_PRECOMPILE = -x c-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT}
+QMAKE_CFLAGS_USE_PRECOMPILE = -Wc,-include -Wc,${QMAKE_PCH_OUTPUT_BASE}
+QMAKE_CXXFLAGS_PRECOMPILE = -x c++-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT}
+QMAKE_CXXFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE
+
QMAKE_LFLAGS += -lang-c++
DEFINES += QT_NO_IMPORT_QT47_QML