diff options
| author | axis <qt-info@nokia.com> | 2010-01-05 15:46:15 (GMT) |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2010-01-05 15:46:15 (GMT) |
| commit | a4de5dc69634b90b2fc6c8bd65d936fe80a5afd9 (patch) | |
| tree | 09123d43823968a0c6bcba56dc2ba816bdcb0591 /mkspecs | |
| parent | 0d92fc13baac9d354a7d3a2665ca3bb4127bd606 (diff) | |
| download | Qt-a4de5dc69634b90b2fc6c8bd65d936fe80a5afd9.zip Qt-a4de5dc69634b90b2fc6c8bd65d936fe80a5afd9.tar.gz Qt-a4de5dc69634b90b2fc6c8bd65d936fe80a5afd9.tar.bz2 | |
Fixed the host detection in qmake profiles.
The previous tests were checking the target platform, but we need to
check the host.
RevBy: Trust me
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/common/symbian/symbian.conf | 4 | ||||
| -rw-r--r-- | mkspecs/features/symbian/application_icon.prf | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/mkspecs/common/symbian/symbian.conf b/mkspecs/common/symbian/symbian.conf index 40f8424..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 -win32:!isEmpty(QMAKE_SH) | unix { +contains(QMAKE_HOST.os, "Windows"):!isEmpty(QMAKE_SH) | unix { QMAKE_COPY = cp QMAKE_COPY_DIR = cp -r QMAKE_MOVE = mv @@ -92,7 +92,7 @@ win32:!isEmpty(QMAKE_SH) | unix { QMAKE_CHK_DIR_EXISTS = if not exist } -win32 { +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 diff --git a/mkspecs/features/symbian/application_icon.prf b/mkspecs/features/symbian/application_icon.prf index 8849ea0..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 - win32:ICON = $$replace(ICON, /, \\) + contains(QMAKE_HOST.os, "Windows"):ICON = $$replace(ICON, /, \\) # Extra compiler rules for mifconv mifconv.output = ${ZDIR}$$APP_RESOURCE_DIR/$${baseTarget}.mif |