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/win32-msvc11/qmake.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/win32-msvc11/qmake.conf')
| -rw-r--r-- | mkspecs/win32-msvc11/qmake.conf | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/mkspecs/win32-msvc11/qmake.conf b/mkspecs/win32-msvc11/qmake.conf index 0603c10f0c..2f663c69ab 100644 --- a/mkspecs/win32-msvc11/qmake.conf +++ b/mkspecs/win32-msvc11/qmake.conf @@ -85,15 +85,7 @@ QMAKE_IDL = midl QMAKE_LIB = lib /NOLOGO QMAKE_RC = rc -QMAKE_ZIP = zip -r -9 - -QMAKE_COPY = copy /y -QMAKE_COPY_DIR = xcopy /s /q /y /i -QMAKE_MOVE = move -QMAKE_DEL_FILE = del -QMAKE_DEL_DIR = rmdir -QMAKE_CHK_DIR_EXISTS = if not exist -QMAKE_MKDIR = mkdir +include(../common/shell-win32.conf) VCPROJ_EXTENSION = .vcxproj VCSOLUTION_EXTENSION = .sln |