summaryrefslogtreecommitdiffstats
path: root/mkspecs/macx-clang/qmake.conf
diff options
context:
space:
mode:
authorTor Arne Vestbø <tor.arne.vestbo@digia.com>2013-03-02 15:13:38 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-03-05 18:40:03 +0100
commit26b260c0c18a50080ac75081b60671e4b1f04438 (patch)
tree5836fe754ceda653fca25e116becc7dd692154b4 /mkspecs/macx-clang/qmake.conf
parent71252ac222246ef7dff728b7957356593c6d7fa2 (diff)
Rename common/mac.conf to common/macx.conf
This is a step towards making mac a shared scope for both Mac OS X and iOS, while macx is Mac OS X specific and ios is iOS specific. We'll then move iOS to not include macx.conf, once we make the change to not have iOS imply macx. Change-Id: Ic9ce4d597873aa3cf2c981598354733e07db644d Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
Diffstat (limited to 'mkspecs/macx-clang/qmake.conf')
-rw-r--r--mkspecs/macx-clang/qmake.conf2
1 files changed, 1 insertions, 1 deletions
diff --git a/mkspecs/macx-clang/qmake.conf b/mkspecs/macx-clang/qmake.conf
index d56b7e6f5b..10ee15c953 100644
--- a/mkspecs/macx-clang/qmake.conf
+++ b/mkspecs/macx-clang/qmake.conf
@@ -6,7 +6,7 @@ MAKEFILE_GENERATOR = UNIX
CONFIG += app_bundle incremental global_init_link_order lib_version_first plugin_no_soname
QMAKE_INCREMENTAL_STYLE = sublib
-include(../common/mac.conf)
+include(../common/macx.conf)
include(../common/gcc-base-macx.conf)
include(../common/clang.conf)
include(../common/clang-mac.conf)