diff options
| author | axis <qt-info@nokia.com> | 2010-10-07 13:26:47 (GMT) |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2010-10-08 13:00:38 (GMT) |
| commit | 7ca4e9622c4b2e4142d401fa10d50a0a45906615 (patch) | |
| tree | 686874d6663aecd02998ddcff1a9340bde8c3090 /mkspecs | |
| parent | 978416807b7e92d9317036cb4348ee172dde7d4e (diff) | |
| download | Qt-7ca4e9622c4b2e4142d401fa10d50a0a45906615.zip Qt-7ca4e9622c4b2e4142d401fa10d50a0a45906615.tar.gz Qt-7ca4e9622c4b2e4142d401fa10d50a0a45906615.tar.bz2 | |
Fixed missing QMAKE_MOC definition in certain mkspecs.
Also removed the use of DIR_SEPARATOR. It does not get defined until
after symbian.conf has finished parsing.
RevBy: Miikka Heikkinen
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/common/symbian/symbian-mmp.conf | 10 | ||||
| -rw-r--r-- | mkspecs/common/symbian/symbian.conf | 8 |
2 files changed, 8 insertions, 10 deletions
diff --git a/mkspecs/common/symbian/symbian-mmp.conf b/mkspecs/common/symbian/symbian-mmp.conf index 5292781..1fbd302 100644 --- a/mkspecs/common/symbian/symbian-mmp.conf +++ b/mkspecs/common/symbian/symbian-mmp.conf @@ -4,16 +4,6 @@ include(symbian.conf) -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 -} - load(symbian/add_mmp_rules) symbian-abld { diff --git a/mkspecs/common/symbian/symbian.conf b/mkspecs/common/symbian/symbian.conf index cc5b788..d8c38f4 100644 --- a/mkspecs/common/symbian/symbian.conf +++ b/mkspecs/common/symbian/symbian.conf @@ -95,6 +95,10 @@ contains(QMAKE_HOST.os,Windows) { QMAKE_DEL_DIR = rmdir QMAKE_DEL_TREE = rmdir /s /q QMAKE_CHK_DIR_EXISTS = if not exist + + QMAKE_MOC = $$[QT_INSTALL_BINS]\\moc.exe + QMAKE_UIC = $$[QT_INSTALL_BINS]\\uic.exe + QMAKE_IDC = $$[QT_INSTALL_BINS]\\idc.exe } else { QMAKE_COPY = cp QMAKE_COPY_DIR = cp -r @@ -104,6 +108,10 @@ contains(QMAKE_HOST.os,Windows) { QMAKE_DEL_DIR = rmdir QMAKE_DEL_TREE = rm -rf QMAKE_CHK_DIR_EXISTS = test -d + + QMAKE_MOC = $$[QT_INSTALL_BINS]/moc + QMAKE_UIC = $$[QT_INSTALL_BINS]/uic + QMAKE_IDC = $$[QT_INSTALL_BINS]/idc } QMAKE_IDL = midl |