diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-13 07:05:22 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-13 07:05:22 (GMT) |
| commit | 6944a72cd26a5e3611ebd305ec665bc4c0fcee12 (patch) | |
| tree | 3b19b6ec15e884617f8e27a067d87de97d5cf54c /mkspecs/common | |
| parent | 40e277aa622e74c18fb1b16214a2c1fe40870315 (diff) | |
| parent | 0ff252da26185709cbeeabddd07e6d9ab83de4a4 (diff) | |
| download | Qt-6944a72cd26a5e3611ebd305ec665bc4c0fcee12.zip Qt-6944a72cd26a5e3611ebd305ec665bc4c0fcee12.tar.gz Qt-6944a72cd26a5e3611ebd305ec665bc4c0fcee12.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1:
Refactor font and zoom handling, reduces clutter in central widget.
Some more refactoring.
Move the QWebView based help viewer into it's own source files.
add QMAKE_DEL_TREE (aka. rm -rf) to avoid more hard-coded platform ifdefs
use variables from the spec instead of hard-coding platform ifdefs
move $(DEL_FILE) 2> NUL redirection into .conf file
fix host platform conditional
purge msvc.net and msvc2002 makespecs. unsupported for a while now.
purge msvc6 suppport from qmake. qt doesn't support it for quite a while now.
remove weird -tp ce matching line nobody can say anything about
remove remainder of mac9 mode
remove the most blatant tmake compat paths
simplify
add qt5 todo
Diffstat (limited to 'mkspecs/common')
| -rw-r--r-- | mkspecs/common/symbian/symbian.conf | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/mkspecs/common/symbian/symbian.conf b/mkspecs/common/symbian/symbian.conf index 6913dc9..aab766d 100644 --- a/mkspecs/common/symbian/symbian.conf +++ b/mkspecs/common/symbian/symbian.conf @@ -75,21 +75,23 @@ QMAKE_LIBS_COMPAT = QMAKE_LIBS_QT_ENTRY = -llibcrt0.lib QMAKE_LIBS_S60 = -lavkon -contains(QMAKE_HOST.os, "Windows"):!isEmpty(QMAKE_SH) | unix { +!contains(QMAKE_HOST.os, "Windows")|!isEmpty(QMAKE_SH) { QMAKE_COPY = cp QMAKE_COPY_DIR = cp -r QMAKE_MOVE = mv QMAKE_DEL_FILE = rm -f QMAKE_MKDIR = mkdir QMAKE_DEL_DIR = rmdir + QMAKE_DEL_TREE = rmdir /s /q QMAKE_CHK_DIR_EXISTS = test -d } else { QMAKE_COPY = copy /y QMAKE_COPY_DIR = xcopy /s /q /y /i QMAKE_MOVE = move - QMAKE_DEL_FILE = del + QMAKE_DEL_FILE = del 2> NUL QMAKE_MKDIR = mkdir QMAKE_DEL_DIR = rmdir + QMAKE_DEL_TREE = rm -rf QMAKE_CHK_DIR_EXISTS = if not exist } |