diff options
author | axis <qt-info@nokia.com> | 2010-07-21 14:23:43 (GMT) |
---|---|---|
committer | axis <qt-info@nokia.com> | 2010-07-21 14:23:43 (GMT) |
commit | ccfb67704285f60ce31bb05538f08ca6f32c6f1d (patch) | |
tree | 1b90180dfe6900b8d36c7f33bf8bbc2b10bf33fb /mkspecs | |
parent | 11d626de5fd87fc8cbd9d685bde8217c7ad7fae6 (diff) | |
parent | ae64f51f092d7ffb20cb50b0e9cd9b019c0e8831 (diff) | |
download | Qt-ccfb67704285f60ce31bb05538f08ca6f32c6f1d.zip Qt-ccfb67704285f60ce31bb05538f08ca6f32c6f1d.tar.gz Qt-ccfb67704285f60ce31bb05538f08ca6f32c6f1d.tar.bz2 |
Merge branch 'raptorConfigurePatches' into 4.7-s60
Conflicts:
configure
src/sql/drivers/drivers.pri
Diffstat (limited to 'mkspecs')
-rw-r--r-- | mkspecs/common/symbian/symbian.conf | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/mkspecs/common/symbian/symbian.conf b/mkspecs/common/symbian/symbian.conf index c1b31e5..7ec5c6c 100644 --- a/mkspecs/common/symbian/symbian.conf +++ b/mkspecs/common/symbian/symbian.conf @@ -105,6 +105,7 @@ QMAKE_IDL = midl QMAKE_LIB = ar -ru QMAKE_RC = windres QMAKE_ZIP = zip -r -9 +QMAKE_UNZIP = unzip -o QMAKE_TAR = tar -cf QMAKE_GZIP = gzip -9f |