summaryrefslogtreecommitdiffstats
path: root/mkspecs
diff options
context:
space:
mode:
authorPulse Build System <qt-info@nokia.com>2010-01-25 09:51:05 (GMT)
committerPulse Build System <qt-info@nokia.com>2010-01-25 09:51:05 (GMT)
commitede20ecdb0ddef7ef239900eb3bfa92ca859e010 (patch)
tree954d59a751dab21f695333a23a5ce53f845bd951 /mkspecs
parent5a850d6acbbd7cdd813c4babfedf39a9df44b9aa (diff)
parent0858fed8ee3b28d17b4bc7c84a30fcda700585ab (diff)
downloadQt-ede20ecdb0ddef7ef239900eb3bfa92ca859e010.zip
Qt-ede20ecdb0ddef7ef239900eb3bfa92ca859e010.tar.gz
Qt-ede20ecdb0ddef7ef239900eb3bfa92ca859e010.tar.bz2
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into master-integration
* 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public: Fixed the host detection in qmake profiles. Improving parts of commit 2d8d855d. qmake: add Linux host support to Symbian generator Fixed indentation. Add Linux host support to Symbian mkspecs. Linux support for platform specific commands in .pro files. Add createpackage.bat equivalent for Unix systems. Make all Symbian #includes lower case. mkspecs: fix warning when calling qmake Fix portability problems in bin/createpackage.pl.
Diffstat (limited to 'mkspecs')
-rw-r--r--mkspecs/common/symbian/symbian.conf20
-rw-r--r--mkspecs/features/symbian/application_icon.prf3
2 files changed, 14 insertions, 9 deletions
diff --git a/mkspecs/common/symbian/symbian.conf b/mkspecs/common/symbian/symbian.conf
index 0f06b92..95f7dc3 100644
--- a/mkspecs/common/symbian/symbian.conf
+++ b/mkspecs/common/symbian/symbian.conf
@@ -74,7 +74,7 @@ QMAKE_LIBS_COMPAT =
QMAKE_LIBS_QT_ENTRY = -llibcrt0.lib
QMAKE_LIBS_S60 = -lavkon
-!isEmpty(QMAKE_SH) {
+contains(QMAKE_HOST.os, "Windows"):!isEmpty(QMAKE_SH) | unix {
QMAKE_COPY = cp
QMAKE_COPY_DIR = cp -r
QMAKE_MOVE = mv
@@ -92,9 +92,15 @@ QMAKE_LIBS_S60 = -lavkon
QMAKE_CHK_DIR_EXISTS = if not exist
}
-QMAKE_MOC = $$[QT_INSTALL_BINS]$${DIR_SEPARATOR}moc.exe
-QMAKE_UIC = $$[QT_INSTALL_BINS]$${DIR_SEPARATOR}uic.exe
-QMAKE_IDC = $$[QT_INSTALL_BINS]$${DIR_SEPARATOR}idc.exe
+contains(QMAKE_HOST.os, "Windows") {
+ QMAKE_MOC = $$[QT_INSTALL_BINS]$${DIR_SEPARATOR}moc.exe
+ QMAKE_UIC = $$[QT_INSTALL_BINS]$${DIR_SEPARATOR}uic.exe
+ QMAKE_IDC = $$[QT_INSTALL_BINS]$${DIR_SEPARATOR}idc.exe
+} else {
+ QMAKE_MOC = $$[QT_INSTALL_BINS]$${DIR_SEPARATOR}moc
+ QMAKE_UIC = $$[QT_INSTALL_BINS]$${DIR_SEPARATOR}uic
+ QMAKE_IDC = $$[QT_INSTALL_BINS]$${DIR_SEPARATOR}idc
+}
QMAKE_IDL = midl
QMAKE_LIB = ar -ru
@@ -105,7 +111,7 @@ QMAKE_STRIP = strip
QMAKE_STRIPFLAGS_LIB += --strip-unneeded
load(qt_config)
-load(platform_paths)
+load(symbian/platform_paths)
symbian-abld {
# Versions of abld prior to Symbian^3 have a bug where you cannot remove something from the command line without replacing it
@@ -137,10 +143,10 @@ default_deployment.pkg_prerules = \
DEPLOYMENT += default_deployment
-exists($${EPOCROOT}epoc32/release/winscw/udeb/z/system/install/Series60v5.0.sis )|exists($${EPOCROOT}epoc32/data/z/system/install/Series60v5.0.sis) {
+exists($${EPOCROOT}epoc32/release/winscw/udeb/z/system/install/series60v5.0.sis )|exists($${EPOCROOT}epoc32/data/z/system/install/series60v5.0.sis) {
S60_VERSION = 5.0
} else {
- exists($${EPOCROOT}epoc32/release/winscw/udeb/z/system/install/Series60v3.2.sis )|exists($${EPOCROOT}epoc32/data/z/system/install/Series60v3.2.sis) {
+ exists($${EPOCROOT}epoc32/release/winscw/udeb/z/system/install/series60v3.2.sis )|exists($${EPOCROOT}epoc32/data/z/system/install/series60v3.2.sis) {
S60_VERSION = 3.2
} else {
S60_VERSION = 3.1
diff --git a/mkspecs/features/symbian/application_icon.prf b/mkspecs/features/symbian/application_icon.prf
index 1edbe14..b790463 100644
--- a/mkspecs/features/symbian/application_icon.prf
+++ b/mkspecs/features/symbian/application_icon.prf
@@ -30,7 +30,7 @@ contains( CONFIG, no_icon ) {
# Note: symbian-sbsv2 builds can't utilize extra compiler for mifconv, so ICON handling is done in code
symbian-abld {
#Makefile: requires paths with backslash
- ICON = $$replace( ICON, /, \\)
+ contains(QMAKE_HOST.os, "Windows"):ICON = $$replace(ICON, /, \\)
# Extra compiler rules for mifconv
mifconv.output = ${ZDIR}$$APP_RESOURCE_DIR/$${baseTarget}.mif
@@ -48,4 +48,3 @@ contains( CONFIG, no_icon ) {
RSS_RULES.icon_file = $$APP_RESOURCE_DIR/$${baseTarget}.mif
}
}
-