diff options
| author | Holger Schroeder <holger.schroeder.ext@basyskom.de> | 2010-06-30 16:54:31 +0200 |
|---|---|---|
| committer | Torsten Rahn <Torsten.Rahn@basyskom.de> | 2010-06-30 18:04:50 +0200 |
| commit | 358efd113184c8f26ac1e9bd24eace52e47ddb92 (patch) | |
| tree | 659b4d21e63167ece0d9bb5895f3b8be3f942dda | |
| parent | 906ea5e1754116c6a102b145dcdecd7994fd85de (diff) | |
Changes: make setting of QMAKE_MOC work
RevBy: Torsten Rahn
Details: for some reason the setting of the QMAKE_MOC
in some application using CONFIG += meegotouch was not working.
This fixes it.
| -rw-r--r-- | mkspecs/features/meegotouch_common.prf | 3 | ||||
| -rw-r--r-- | mkspecs/features/meegotouch_mmoc.prf | 32 |
2 files changed, 23 insertions, 12 deletions
diff --git a/mkspecs/features/meegotouch_common.prf b/mkspecs/features/meegotouch_common.prf index ce9add7f..5724da4f 100644 --- a/mkspecs/features/meegotouch_common.prf +++ b/mkspecs/features/meegotouch_common.prf @@ -1,5 +1,6 @@ include(meegotouch_defines.prf) include(meegotouch_mgen.prf) +include(meegotouch_mmoc.prf) macx { INCLUDEPATH += /Library/Frameworks/m.framework/Headers @@ -27,6 +28,4 @@ contains(TEMPLATE, app) { unix: QMAKE_LFLAGS += $${QMAKE_LFLAGS_RPATH}$${M_LIB_DIR} LIBS += -L$${M_LIB_DIR} - - QMAKE_MOC = $${M_MMOC_EXECUTABLE} } diff --git a/mkspecs/features/meegotouch_mmoc.prf b/mkspecs/features/meegotouch_mmoc.prf index 69c48145..f13ebb93 100644 --- a/mkspecs/features/meegotouch_mmoc.prf +++ b/mkspecs/features/meegotouch_mmoc.prf @@ -1,20 +1,32 @@ # settings for meegotouch mmoc -win32 { - contains(DEFINES, IS_ARMEL) { - M_MMOC_EXECUTABLE = perl.exe $$M_SOURCE_TREE/mmoc/mmoc.pl +contains(DEFINES, BUILD_M) { + win32 { + contains(DEFINES, IS_ARMEL) { + M_MMOC_EXECUTABLE = perl.exe $$M_SOURCE_TREE/mmoc/mmoc.pl + } else { + debug { + M_MMOC_EXECUTABLE = $$M_BUILD_TREE/mmoc/debug/mmoc.exe + } else { + M_MMOC_EXECUTABLE = $$M_BUILD_TREE/mmoc/release/mmoc.exe + } + } } else { - debug { - M_MMOC_EXECUTABLE = $$M_BUILD_TREE/mmoc/debug/mmoc.exe + contains(DEFINES, IS_ARMEL) { + M_MMOC_EXECUTABLE = perl $$M_SOURCE_TREE/mmoc/mmoc.pl } else { - M_MMOC_EXECUTABLE = $$M_BUILD_TREE/mmoc/release/mmoc.exe - } + M_MMOC_EXECUTABLE = $$M_BUILD_TREE/mmoc/mmoc + } } } else { - contains(DEFINES, IS_ARMEL) { - M_MMOC_EXECUTABLE = perl $$M_SOURCE_TREE/mmoc/mmoc.pl + win32 { + M_MMOC_EXECUTABLE = perl.exe $$M_SOURCE_TREE/mmoc/mmoc.pl } else { - M_MMOC_EXECUTABLE = $$M_BUILD_TREE/mmoc/mmoc + contains(DEFINES, IS_ARMEL) { + M_MMOC_EXECUTABLE = mmoc.pl + } else { + M_MMOC_EXECUTABLE = mmoc + } } } |