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/linux-cxx/qmake.conf | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'mkspecs/linux-cxx')

diff --git a/mkspecs/linux-cxx/qmake.conf b/mkspecs/linux-cxx/qmake.conf
index 1c7cafc6f2..b156bea084 100644
--- a/mkspecs/linux-cxx/qmake.conf
+++ b/mkspecs/linux-cxx/qmake.conf
@@ -7,6 +7,8 @@
 MAKEFILE_GENERATOR      = UNIX
 QMAKE_PLATFORM          = linux
 
+include(../common/unix.conf)
+
 QMAKE_COMPILER          = compaq_cc
 
 QMAKE_CC                = ccc
@@ -61,5 +63,4 @@ QMAKE_LIBS_OPENGL       = -lGL
 QMAKE_AR                = ar cqs
 QMAKE_RANLIB            =
 
-include(../common/unix.conf)
 load(qt_config)
-- 
cgit v1.2.3