diff options
| author | Tomas Junnonen <tomas.junnonen@nokia.com> | 2010-06-03 17:06:04 +0300 |
|---|---|---|
| committer | Tomas Junnonen <tomas.junnonen@nokia.com> | 2010-06-03 17:10:32 +0300 |
| commit | e134e50a20ee9a599b0b17bcc1633e7242fd09f3 (patch) | |
| tree | f39cc7893c2440d4ed825e0ed7bc687b96e7894d /mkspecs | |
| parent | 5e79c18dabe5d140de21cce7c3aecfc3b84a7d0c (diff) | |
Fixes: NB#171747 - mmoc native binary does not work with qemu - causes build failures
RevBy: Tomas Junnonen
Details: Main configure file, mmoc releated files, src/common_top.pri
src/predeps.pri and some tst project files were modified
to use Qt/C++ mmoc script for i486 target and perl for
armel target
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/features/meegotouch.prf | 3 | ||||
| -rw-r--r-- | mkspecs/features/meegotouch_defines.prf.in | 9 |
2 files changed, 11 insertions, 1 deletions
diff --git a/mkspecs/features/meegotouch.prf b/mkspecs/features/meegotouch.prf index c433ac9d..6714408f 100644 --- a/mkspecs/features/meegotouch.prf +++ b/mkspecs/features/meegotouch.prf @@ -31,7 +31,8 @@ macx { unix: QMAKE_LFLAGS += $${QMAKE_RPATH}$${M_LIB_DIR} LIBS += -L$${M_LIB_DIR} -lmeegotouchcore -lmeegotouchviews -lmeegotouchsettings -lmeegotouchextensions - QMAKE_MOC = mmoc + + QMAKE_MOC = $${M_MMOC_EXECUTABLE} isEmpty(MGEN_OUTDIR) { MGEN_OUTDIR = . diff --git a/mkspecs/features/meegotouch_defines.prf.in b/mkspecs/features/meegotouch_defines.prf.in index 6863ebf3..c1c30bc4 100644 --- a/mkspecs/features/meegotouch_defines.prf.in +++ b/mkspecs/features/meegotouch_defines.prf.in @@ -27,6 +27,8 @@ win32 { M_PREFIX = / } +M_MMOC_EXECUTABLE = @@M_MMOC_EXECUTABLE@@ + # Directories unix|win32 { M_INSTALL_BIN = $$M_PREFIX/bin @@ -100,3 +102,10 @@ win32 { M_DBUS_INTERFACES_DIR = /usr/share/dbus-1/interfaces M_DBUS_SERVICES_DIR = $$M_INSTALL_DATA/dbus-1/services } + +#mmoc execatable +contains (M_MMOC_EXECUTABLE, mmoc.pl) { + M_MMOC_EXECUTABLE = perl $$M_INSTALL_BIN/$$M_MMOC_EXECUTABLE +} else { + M_MMOC_EXECUTABLE = $$M_INSTALL_BIN/$$M_MMOC_EXECUTABLE +} |