diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-06-20 10:34:13 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-06-20 12:38:32 +0200 |
| commit | 6d9c545d2b83305c3c30a0e917e6c3a474dfe66a (patch) | |
| tree | 54a003c6db32c85f80c5fbb46dbf9322855966e6 /mkspecs/macx-xlc/qmake.conf | |
| parent | 86f953a6d40666a3355e76b3ab2c8a2cf5452ec6 (diff) | |
| parent | b652bffea7a0a1bf209c21d9b73f509226f031bd (diff) | |
Merge "Merge branch 'buildsystem'" into refs/staging/master
Diffstat (limited to 'mkspecs/macx-xlc/qmake.conf')
| -rw-r--r-- | mkspecs/macx-xlc/qmake.conf | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/mkspecs/macx-xlc/qmake.conf b/mkspecs/macx-xlc/qmake.conf index 77c300a4ae..6e3639caa6 100644 --- a/mkspecs/macx-xlc/qmake.conf +++ b/mkspecs/macx-xlc/qmake.conf @@ -45,8 +45,6 @@ QMAKE_INCDIR = QMAKE_LIBDIR = QMAKE_INCDIR_X11 = QMAKE_LIBDIR_X11 = -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/ QMAKE_LIBDIR_OPENGL = @@ -81,16 +79,5 @@ QMAKE_AR = ar cq QMAKE_OBJCOPY = objcopy 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(../common/unix.conf) load(qt_config) |