summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTor Arne Vestbø <tor.arne.vestbo@nokia.com>2010-11-05 14:53:24 (GMT)
committerTor Arne Vestbø <tor.arne.vestbo@nokia.com>2010-11-05 14:59:00 (GMT)
commit722f4c34bdd4a2f2fa067b7c4c84b2dbe2f2033c (patch)
treeef00f067a416da7148edbe17872b25a53301ed7b
parent9ffa8e5585bb7469034149c28f8d4f639f58f1f4 (diff)
downloadQt-722f4c34bdd4a2f2fa067b7c4c84b2dbe2f2033c.zip
Qt-722f4c34bdd4a2f2fa067b7c4c84b2dbe2f2033c.tar.gz
Qt-722f4c34bdd4a2f2fa067b7c4c84b2dbe2f2033c.tar.bz2
mkspecs: Make linux-x86-openkode-g++ not include g++.conf directly
Reviewed-by: ossi
-rw-r--r--mkspecs/unsupported/qws/linux-x86-openkode-g++/qmake.conf3
1 files changed, 2 insertions, 1 deletions
diff --git a/mkspecs/unsupported/qws/linux-x86-openkode-g++/qmake.conf b/mkspecs/unsupported/qws/linux-x86-openkode-g++/qmake.conf
index 36ad503..b891c5e 100644
--- a/mkspecs/unsupported/qws/linux-x86-openkode-g++/qmake.conf
+++ b/mkspecs/unsupported/qws/linux-x86-openkode-g++/qmake.conf
@@ -2,7 +2,8 @@
# qmake configuration for building with linux-g++
#
-include(../../../common/g++.conf)
+include(../../../common/gcc-base-unix.conf)
+include(../../../common/g++-unix.conf)
include(../../../common/linux.conf)
include(../../../common/qws.conf)