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/unsupported/macx-ios-clang/qmake.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mkspecs/unsupported/macx-ios-clang/qmake.conf') diff --git a/mkspecs/unsupported/macx-ios-clang/qmake.conf b/mkspecs/unsupported/macx-ios-clang/qmake.conf index 5213d4e555..47aeff8139 100644 --- a/mkspecs/unsupported/macx-ios-clang/qmake.conf +++ b/mkspecs/unsupported/macx-ios-clang/qmake.conf @@ -10,7 +10,7 @@ isEmpty(QMAKE_MAC_SDK): QMAKE_MAC_SDK = iphoneos # keep things simple, e.g. by defining Q_OS_MAC _and_ Q_OS_IOS. include(../../common/macx.conf) -include(../../common/gcc-base-ios.conf) +include(../../common/gcc-base-mac.conf) include(../../common/xcode.conf) include(../../common/clang.conf) include(../../common/clang-mac.conf) -- cgit v1.2.3