diff options
| author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2010-03-19 13:06:10 (GMT) |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2010-03-19 13:33:33 (GMT) |
| commit | aea135e1b1dad919229c9bfde248f8bb615c3c5d (patch) | |
| tree | 6c55ee5d1785f5beb23a5aed58db42359f829b41 /mkspecs | |
| parent | be2f020ada5cc52f91208d82b701958582b109b2 (diff) | |
| download | Qt-aea135e1b1dad919229c9bfde248f8bb615c3c5d.zip Qt-aea135e1b1dad919229c9bfde248f8bb615c3c5d.tar.gz Qt-aea135e1b1dad919229c9bfde248f8bb615c3c5d.tar.bz2 | |
Moved QMAKE_MOC etc. variable declarations after symbian.conf inclusion
$${DIR_SEPARATOR} wasn't yet declared in the previous place.
This was only a problem for projects built outside Qt tree, as
.qmake.cache also redefined these variables.
Reviewed-by: axis
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/common/symbian/symbian-mmp.conf | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/mkspecs/common/symbian/symbian-mmp.conf b/mkspecs/common/symbian/symbian-mmp.conf index e54e878..507b60c 100644 --- a/mkspecs/common/symbian/symbian-mmp.conf +++ b/mkspecs/common/symbian/symbian-mmp.conf @@ -2,17 +2,18 @@ # qmake configuration for symbian-* # +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 + 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_MOC = $$[QT_INSTALL_BINS]$${DIR_SEPARATOR}moc + QMAKE_UIC = $$[QT_INSTALL_BINS]$${DIR_SEPARATOR}uic + QMAKE_IDC = $$[QT_INSTALL_BINS]$${DIR_SEPARATOR}idc } -include(symbian.conf) load(symbian/add_mmp_rules) symbian-abld { |