diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-06-19 16:48:23 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-06-19 16:48:23 +0200 |
| commit | b652bffea7a0a1bf209c21d9b73f509226f031bd (patch) | |
| tree | 0770567f64ad51b58f55726ae6eac276a4f71d0e /mkspecs/common/mac.conf | |
| parent | a0cf2119a74b7f17d3c417bd7364376dd1e0652d (diff) | |
| parent | 00f9ac93c248b019e72757da9c5d8121a5fd1bf5 (diff) | |
Merge branch 'buildsystem'
This appears to be fully backwards-compatible with all tested modules,
as far as CI is concerned.
Change-Id: I53f979d06d0a264c5aab1193bab181a38ab837d6
Diffstat (limited to 'mkspecs/common/mac.conf')
| -rw-r--r-- | mkspecs/common/mac.conf | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/mkspecs/common/mac.conf b/mkspecs/common/mac.conf index 6ba55325e8..cb67462b53 100644 --- a/mkspecs/common/mac.conf +++ b/mkspecs/common/mac.conf @@ -7,8 +7,6 @@ QMAKE_RESOURCE = /Developer/Tools/Rez QMAKE_EXTENSION_SHLIB = dylib QMAKE_LIBDIR = -QMAKE_INCDIR_QT = $$[QT_INSTALL_HEADERS] -QMAKE_LIBDIR_QT = $$[QT_INSTALL_LIBS] QMAKE_INCDIR_OPENGL = /System/Library/Frameworks/OpenGL.framework/Headers \ /System/Library/Frameworks/AGL.framework/Headers/ @@ -24,17 +22,4 @@ QMAKE_LIBS_THREAD = QMAKE_AR = ar cq QMAKE_RANLIB = ranlib -s -QMAKE_TAR = tar -cf -QMAKE_GZIP = gzip -9f - -QMAKE_COPY = cp -f -QMAKE_COPY_FILE = $$QMAKE_COPY -QMAKE_COPY_DIR = $$QMAKE_COPY -R -QMAKE_MOVE = mv -f -QMAKE_DEL_FILE = rm -f -QMAKE_DEL_DIR = rmdir -QMAKE_CHK_DIR_EXISTS = test -d -QMAKE_MKDIR = mkdir -p - - include(unix.conf) |