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/linux-icc | |
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/linux-icc')
-rw-r--r-- | mkspecs/linux-icc/qmake.conf | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/mkspecs/linux-icc/qmake.conf b/mkspecs/linux-icc/qmake.conf index 5eb0650fbf..d29d4a5b73 100644 --- a/mkspecs/linux-icc/qmake.conf +++ b/mkspecs/linux-icc/qmake.conf @@ -49,8 +49,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 = QMAKE_LIBDIR_OPENGL = @@ -81,16 +79,6 @@ QMAKE_RANLIB = QMAKE_CLEAN = -r $(OBJECTS_DIR)/ti_files -QMAKE_TAR = tar -cf -QMAKE_GZIP = gzip -9f - -QMAKE_COPY = cp -f -QMAKE_MOVE = mv -f -QMAKE_DEL_FILE = rm -f -QMAKE_DEL_DIR = rmdir -QMAKE_CHK_DIR_EXISTS = test -d -QMAKE_MKDIR = mkdir -p - # pch support CONFIG += icc_pch_style QMAKE_PCH_OUTPUT_EXT = .pchi |