diff options
author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-09-29 12:39:08 +0200 |
---|---|---|
committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-10-01 16:19:27 +0000 |
commit | 3e6d1726380326c0faba9029e2a68886595a2ebc (patch) | |
tree | 508486ad2d5902a18c3ac3e7e493c29683bdd2e3 /mkspecs/linux-g++-64 | |
parent | remove references to $$QMAKE_CYGWIN_EXE (diff) | |
download | qtbase-3e6d1726380326c0faba9029e2a68886595a2ebc.tar.xz qtbase-3e6d1726380326c0faba9029e2a68886595a2ebc.zip |
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/linux-g++-64')
-rw-r--r-- | mkspecs/linux-g++-64/qmake.conf | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mkspecs/linux-g++-64/qmake.conf b/mkspecs/linux-g++-64/qmake.conf index 36fb6a83eb..a79b69ff31 100644 --- a/mkspecs/linux-g++-64/qmake.conf +++ b/mkspecs/linux-g++-64/qmake.conf @@ -9,10 +9,11 @@ MAKEFILE_GENERATOR = UNIX CONFIG += incremental QMAKE_INCREMENTAL_STYLE = sublib +include(../common/linux.conf) + QMAKE_CFLAGS = -m64 QMAKE_LFLAGS = -m64 -include(../common/linux.conf) include(../common/gcc-base-unix.conf) include(../common/g++-unix.conf) |