diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@digia.com> | 2013-03-02 15:13:38 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-03-05 18:40:03 +0100 |
| commit | 26b260c0c18a50080ac75081b60671e4b1f04438 (patch) | |
| tree | 5836fe754ceda653fca25e116becc7dd692154b4 /mkspecs/common/mac.conf | |
| parent | 71252ac222246ef7dff728b7957356593c6d7fa2 (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/common/mac.conf')
| -rw-r--r-- | mkspecs/common/mac.conf | 34 |
1 files changed, 0 insertions, 34 deletions
diff --git a/mkspecs/common/mac.conf b/mkspecs/common/mac.conf deleted file mode 100644 index 5f5ed80e4d..0000000000 --- a/mkspecs/common/mac.conf +++ /dev/null @@ -1,34 +0,0 @@ -# -# qmake configuration for common Mac OS X -# -!load(device_config) { - error(Could not successfully load device configuration) -} - -QMAKE_PLATFORM += macx mac - -isEmpty(QMAKE_MAC_SDK): QMAKE_MAC_SDK = macosx - -QMAKE_RESOURCE = /Developer/Tools/Rez - -QMAKE_EXTENSION_SHLIB = dylib - -QMAKE_LIBDIR = - -# sdk.prf will prefix the proper SDK sysroot -QMAKE_INCDIR_OPENGL = \ - /System/Library/Frameworks/OpenGL.framework/Headers \ - /System/Library/Frameworks/AGL.framework/Headers/ - -QMAKE_FIX_RPATH = install_name_tool -id - -QMAKE_LFLAGS_RPATH = - -QMAKE_LIBS_DYNLOAD = -QMAKE_LIBS_OPENGL = -framework OpenGL -framework AGL -QMAKE_LIBS_THREAD = - -QMAKE_AR = ar cq -QMAKE_RANLIB = ranlib -s - -include(unix.conf) |