From de2b626b348e5e5c65efb234fe607ee1c5f8cda6 Mon Sep 17 00:00:00 2001 From: Jake Petroules Date: Fri, 19 Aug 2016 18:28:38 -0700 Subject: Reorder directives in macOS mkspecs to match iOS, tvOS, and watchOS MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Ic365f66908b97a18c72b732b73b65d77a28e91be Reviewed-by: Oswald Buddenhagen Reviewed-by: Morten Johan Sørvig --- mkspecs/macx-g++42/qmake.conf | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'mkspecs/macx-g++42') diff --git a/mkspecs/macx-g++42/qmake.conf b/mkspecs/macx-g++42/qmake.conf index b24cb7f3f3..4aaeaf55e1 100644 --- a/mkspecs/macx-g++42/qmake.conf +++ b/mkspecs/macx-g++42/qmake.conf @@ -10,10 +10,6 @@ MAKEFILE_GENERATOR = UNIX CONFIG += app_bundle incremental global_init_link_order lib_version_first QMAKE_INCREMENTAL_STYLE = sublib -include(../common/macx.conf) -include(../common/gcc-base-mac.conf) -include(../common/g++-macx.conf) - QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.9 QMAKE_CC = gcc-4.2 @@ -24,4 +20,8 @@ QMAKE_LINK_SHLIB = $$QMAKE_CXX QMAKE_LINK_C = $$QMAKE_CC QMAKE_LINK_C_SHLIB = $$QMAKE_CC +include(../common/macx.conf) +include(../common/gcc-base-mac.conf) +include(../common/g++-macx.conf) + load(qt_config) -- cgit v1.2.3