diff options
| author | axis <qt-info@nokia.com> | 2010-10-08 13:27:44 (GMT) |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2010-10-08 13:27:44 (GMT) |
| commit | a7eab236ca29a06180faa43f982365ae646bb9a3 (patch) | |
| tree | 82fe55a8aa3932f4f64700a12ff4bb1e13eaafea /mkspecs/common/symbian | |
| parent | f8596b2269631b9522e51bb0a68d86588d4696c7 (diff) | |
| parent | 4ee912a752a4b7f129e98e180328f1f46f053d4f (diff) | |
| download | Qt-a7eab236ca29a06180faa43f982365ae646bb9a3.zip Qt-a7eab236ca29a06180faa43f982365ae646bb9a3.tar.gz Qt-a7eab236ca29a06180faa43f982365ae646bb9a3.tar.bz2 | |
Merge branch '4.7-s60' into master-s60
Conflicts:
src/openvg/qvg_symbian.cpp
Diffstat (limited to 'mkspecs/common/symbian')
| -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 0bdc8e5..e5038df 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 |