summaryrefslogtreecommitdiffstats
path: root/mkspecs/win32-g++
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@nokia.com>2012-05-18 20:22:42 +0200
committerOswald Buddenhagen <oswald.buddenhagen@nokia.com>2012-06-19 16:46:07 +0200
commit45a201b6a3658c3575f1c44d80a0408ef918afe2 (patch)
tree1fb05cd71bd5aec525a831ffeb312b8b7dd04a03 /mkspecs/win32-g++
parent3c144b54cfe93463cf4e8ce9ca3b9d550f5d72bc (diff)
centralize definitions of shell commands
there are only two types. everything else is duplication. Change-Id: I87f2bdd3d56b94bb2ecdb60e8861afeb9af3666f Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Diffstat (limited to 'mkspecs/win32-g++')
-rw-r--r--mkspecs/win32-g++/qmake.conf18
1 files changed, 2 insertions, 16 deletions
diff --git a/mkspecs/win32-g++/qmake.conf b/mkspecs/win32-g++/qmake.conf
index 2740e6d353..de50a15e3a 100644
--- a/mkspecs/win32-g++/qmake.conf
+++ b/mkspecs/win32-g++/qmake.conf
@@ -83,28 +83,14 @@ QMAKE_LIBS_QT_ENTRY = -lmingw32 -lqtmain
!isEmpty(QMAKE_SH) {
MINGW_IN_SHELL = 1
QMAKE_DIR_SEP = /
- QMAKE_COPY = cp
- QMAKE_STREAM_EDITOR = sed
- QMAKE_COPY_DIR = cp -r
- QMAKE_MOVE = mv
- QMAKE_DEL_FILE = rm
- QMAKE_MKDIR = mkdir -p
- QMAKE_DEL_DIR = rmdir
- QMAKE_CHK_DIR_EXISTS = test -d
+ include(../common/shell-unix.conf)
} else {
- QMAKE_COPY = copy /y
- QMAKE_COPY_DIR = xcopy /s /q /y /i
- QMAKE_MOVE = move
- QMAKE_DEL_FILE = del
- QMAKE_MKDIR = mkdir
- QMAKE_DEL_DIR = rmdir
- QMAKE_CHK_DIR_EXISTS = if not exist
+ include(../common/shell-win32.conf)
}
QMAKE_IDL = midl
QMAKE_LIB = ar -ru
QMAKE_RC = windres
-QMAKE_ZIP = zip -r -9
QMAKE_STRIP = strip
QMAKE_STRIPFLAGS_LIB += --strip-unneeded