summaryrefslogtreecommitdiffstats
path: root/mkspecs/unsupported/qnx-X11-g++/qmake.conf
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>2015-09-29 12:39:08 +0200
committerOswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>2015-10-01 16:19:27 +0000
commit3e6d1726380326c0faba9029e2a68886595a2ebc (patch)
tree508486ad2d5902a18c3ac3e7e493c29683bdd2e3 /mkspecs/unsupported/qnx-X11-g++/qmake.conf
parentd98a23eb7c164b8e464907391cde0b95d2c4d8a3 (diff)
move inclusions of unix.conf (and related files) near the top
that way we can override the values defined there. Change-Id: Ib9bce596d9fd43875b26a97c5489ee9d0d46b77c Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
Diffstat (limited to 'mkspecs/unsupported/qnx-X11-g++/qmake.conf')
-rw-r--r--mkspecs/unsupported/qnx-X11-g++/qmake.conf2
1 files changed, 1 insertions, 1 deletions
diff --git a/mkspecs/unsupported/qnx-X11-g++/qmake.conf b/mkspecs/unsupported/qnx-X11-g++/qmake.conf
index 8d2c63f330..79a5609dbf 100644
--- a/mkspecs/unsupported/qnx-X11-g++/qmake.conf
+++ b/mkspecs/unsupported/qnx-X11-g++/qmake.conf
@@ -7,9 +7,9 @@
MAKEFILE_GENERATOR = UNIX
QMAKE_PLATFORM = qnx
+include(../common/unix.conf)
include(../common/gcc-base-unix.conf)
include(../common/g++-unix.conf)
-include(../common/unix.conf)
QMAKE_CFLAGS_THREAD = -D_REENTRANT
QMAKE_CXXFLAGS_THREAD = $$QMAKE_CLFAGS_THREAD