From 3e6d1726380326c0faba9029e2a68886595a2ebc Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen 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 --- mkspecs/common/mac.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'mkspecs/common/mac.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) -- cgit v1.2.3