From 3e6d1726380326c0faba9029e2a68886595a2ebc Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Date: Tue, 29 Sep 2015 12:39:08 +0200
Subject: 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>
---
 mkspecs/darwin-g++/qmake.conf | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'mkspecs/darwin-g++')

diff --git a/mkspecs/darwin-g++/qmake.conf b/mkspecs/darwin-g++/qmake.conf
index ab333b1684..79f81a990f 100644
--- a/mkspecs/darwin-g++/qmake.conf
+++ b/mkspecs/darwin-g++/qmake.conf
@@ -9,6 +9,8 @@ QMAKE_PLATFORM          = osx macx mac darwin
 CONFIG                 += native_precompiled_headers
 DEFINES                += __USE_WS_X11__
 
+include(../common/unix.conf)
+
 QMAKE_COMPILER          = gcc
 
 QMAKE_CC                = cc
@@ -84,5 +86,4 @@ QMAKE_PCH_OUTPUT_EXT    = .gch
 QMAKE_CXXFLAGS_PRECOMPILE += -x objective-c++-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT}
 QMAKE_CXXFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE
 
-include(../common/unix.conf)
 load(qt_config)
-- 
cgit v1.2.3