From d28f454a677d3f0a168b80aadfc97a20aeaa70ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Sat, 2 Mar 2013 15:46:37 +0100 Subject: Rename gcc-base-macx.conf to gcc-base-mac.conf and use it for iOS as well The only difference between the two is that iOS append @executable_path/ to QMAKE_LFLAGS_SONAME, but since shared libraries are not supported on iOS anyways, this is not really something we have to care about. Change-Id: I4797a4dfb94d9b3af03af22618351b98b48f8255 Reviewed-by: Oswald Buddenhagen Reviewed-by: Richard Moe Gustavsen --- mkspecs/macx-g++/qmake.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mkspecs/macx-g++/qmake.conf') diff --git a/mkspecs/macx-g++/qmake.conf b/mkspecs/macx-g++/qmake.conf index 222fcbbed4..c7aa9752d1 100644 --- a/mkspecs/macx-g++/qmake.conf +++ b/mkspecs/macx-g++/qmake.conf @@ -11,7 +11,7 @@ CONFIG += app_bundle incremental global_init_link_order lib_version_first plugin QMAKE_INCREMENTAL_STYLE = sublib include(../common/macx.conf) -include(../common/gcc-base-macx.conf) +include(../common/gcc-base-mac.conf) include(../common/g++-macx.conf) QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.6 -- cgit v1.2.3