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/common | |
| parent | d98a23eb7c164b8e464907391cde0b95d2c4d8a3 (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/common')
| -rw-r--r-- | mkspecs/common/linux.conf | 4 | ||||
| -rw-r--r-- | mkspecs/common/mac.conf | 4 | ||||
| -rw-r--r-- | mkspecs/common/qcc-base-qnx-armle-v7.conf | 3 | ||||
| -rw-r--r-- | mkspecs/common/qcc-base-qnx-x86.conf | 3 |
4 files changed, 8 insertions, 6 deletions
diff --git a/mkspecs/common/linux.conf b/mkspecs/common/linux.conf index 8d6fb6fe17..b98d9bdf2d 100644 --- a/mkspecs/common/linux.conf +++ b/mkspecs/common/linux.conf @@ -4,6 +4,8 @@ QMAKE_PLATFORM += linux +include(unix.conf) + QMAKE_CFLAGS_THREAD += -D_REENTRANT QMAKE_CXXFLAGS_THREAD += $$QMAKE_CFLAGS_THREAD QMAKE_LFLAGS_GCSECTIONS = -Wl,--gc-sections @@ -51,5 +53,3 @@ QMAKE_RANLIB = QMAKE_STRIP = strip QMAKE_STRIPFLAGS_LIB += --strip-unneeded - -include(unix.conf) diff --git a/mkspecs/common/mac.conf b/mkspecs/common/mac.conf index 91639ddb50..d80b41c74b 100644 --- a/mkspecs/common/mac.conf +++ b/mkspecs/common/mac.conf @@ -6,6 +6,8 @@ QMAKE_PLATFORM += mac darwin +include(unix.conf) + QMAKE_RESOURCE = /Developer/Tools/Rez QMAKE_EXTENSION_SHLIB = dylib QMAKE_LIBDIR = @@ -27,5 +29,3 @@ QMAKE_LIBS_THREAD = QMAKE_AR = ar cq QMAKE_RANLIB = ranlib -s QMAKE_NM = nm -P - -include(unix.conf) diff --git a/mkspecs/common/qcc-base-qnx-armle-v7.conf b/mkspecs/common/qcc-base-qnx-armle-v7.conf index 12d393f070..ad3bb33da4 100644 --- a/mkspecs/common/qcc-base-qnx-armle-v7.conf +++ b/mkspecs/common/qcc-base-qnx-armle-v7.conf @@ -4,9 +4,10 @@ MAKEFILE_GENERATOR = UNIX -include(g++-unix.conf) include(unix.conf) +include(g++-unix.conf) + QMAKE_CC = qcc -Vgcc_ntoarmv7le QMAKE_CXX = qcc -Vgcc_ntoarmv7le QNX_CPUDIR = armle-v7 diff --git a/mkspecs/common/qcc-base-qnx-x86.conf b/mkspecs/common/qcc-base-qnx-x86.conf index b49075086d..37a5d9ce70 100644 --- a/mkspecs/common/qcc-base-qnx-x86.conf +++ b/mkspecs/common/qcc-base-qnx-x86.conf @@ -4,9 +4,10 @@ MAKEFILE_GENERATOR = UNIX -include(g++-unix.conf) include(unix.conf) +include(g++-unix.conf) + QMAKE_CC = qcc -Vgcc_ntox86 QMAKE_CXX = qcc -Vgcc_ntox86 QNX_CPUDIR = x86 |