summaryrefslogtreecommitdiffstats
path: root/mkspecs/unsupported/linux-host-g++
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/linux-host-g++
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/linux-host-g++')
-rw-r--r--mkspecs/unsupported/linux-host-g++/qmake.conf3
1 files changed, 2 insertions, 1 deletions
diff --git a/mkspecs/unsupported/linux-host-g++/qmake.conf b/mkspecs/unsupported/linux-host-g++/qmake.conf
index 546ff21349..3aa7520776 100644
--- a/mkspecs/unsupported/linux-host-g++/qmake.conf
+++ b/mkspecs/unsupported/linux-host-g++/qmake.conf
@@ -17,6 +17,8 @@ QMAKE_PLATFORM = linux
CONFIG += incremental
QMAKE_INCREMENTAL_STYLE = sublib
+include(../common/unix.conf)
+
#
# qmake configuration for common gcc
#
@@ -111,5 +113,4 @@ QMAKE_RANLIB =
QMAKE_STRIP = host-strip
QMAKE_STRIPFLAGS_LIB += --strip-unneeded
-include(../../common/unix.conf)
load(qt_config)