Changes: unify usage of mmoc and mgen in the different .pro files

RevBy: Max Waterman
Details: there was quite some code duplication in the usage
of mmoc and mgen in the project. this is now all simplified
and unified. all unit tests still pass.

10 files changed, 30 insertions, 180 deletions

diff --git a/tests/common_top.pri b/tests/common_top.pri
index bf18d3cc..1e1da6d6 100644
--- a/tests/common_top.pri
+++ b/tests/common_top.pri
@@ -3,6 +3,11 @@ include(check.pri)
 # for defines
 include(../mkspecs/common.pri)
 
+# for mmoc and mgen settings
+include(../src/predeps.pri)
+include(../mkspecs/features/meegotouch_mmoc.prf)
+include(../mkspecs/features/meegotouch_mgen.prf)
+
 MSRCDIR = ../../src
 STUBSDIR = ../stubs
 INCLUDEPATH += \
diff --git a/tests/ft_mstylesheet/ft_mstylesheet.pro b/tests/ft_mstylesheet/ft_mstylesheet.pro
index eb5431c7..9280a741 100644
--- a/tests/ft_mstylesheet/ft_mstylesheet.pro
+++ b/tests/ft_mstylesheet/ft_mstylesheet.pro
@@ -3,30 +3,6 @@ TARGET = ft_mstylesheet
 QT += dbus svg network
 LIBRARYPATH += $$MSRCDIR
 
-win32 {
-    QMAKE_MOC = $${OUT_PWD}\..\..\mmoc\mmoc
-    contains(DEFINES, IS_ARMEL) {
-        QMAKE_MOC = perl.exe $${OUT_PWD}\..\..\mmoc\mmoc.pl
-    }
-} else {
-    PRE_TARGETDEPS += ../../mgen/mgen
-    QMAKE_MOC = PATH=../../mgen:$$(PATH) $${OUT_PWD}/../../mmoc/mmoc
-    contains(DEFINES, IS_ARMEL) {
-        QMAKE_MOC = PATH=../../mgen:$$(PATH) perl $${OUT_PWD}/../../mmoc/mmoc.pl
-    }
-}
-
-MGEN_OUTDIR = .
-mgenerator_style.name = mgenerator style
-mgenerator_style.input = STYLE_HEADERS
-mgenerator_style.depends = ../../mgen/mgen
-mgenerator_style.output = $$MGEN_OUTDIR/gen_${QMAKE_FILE_BASE}data.cpp
-mgenerator_style.commands += ../../mgen/mgen --style ${QMAKE_FILE_NAME} $$MGEN_OUTDIR
-mgenerator_style.clean += $$MGEN_OUTDIR/gen_*
-mgenerator_style.CONFIG = target_predeps no_link
-mgenerator_style.variable_out = GENERATED_SOURCES
-QMAKE_EXTRA_COMPILERS += mgenerator_style
-
 STYLE_HEADERS += testobjectstyle.h testobject2style.h testobject3style.h
 
 SOURCES += \
@@ -43,7 +19,8 @@ HEADERS += \
     testwidget2.h \
     testwidget3.h \
     ../../src/corelib/theme/mlogicalvalues.h \
-    ../../src/corelib/style/mstylesheetattribute.h
+    ../../src/corelib/style/mstylesheetattribute.h \
+    $$STYLE_HEADERS
 
 support_files.files += \
         *.css
diff --git a/tests/ut_mapplethandle/ut_mapplethandle.pro b/tests/ut_mapplethandle/ut_mapplethandle.pro
index 6e2e820b..23870d5c 100644
--- a/tests/ut_mapplethandle/ut_mapplethandle.pro
+++ b/tests/ut_mapplethandle/ut_mapplethandle.pro
@@ -6,38 +6,6 @@ INCLUDEPATH += \
     $$MSRCDIR/corelib/style
 QT += xml
 
-win32 {
-    QMAKE_MOC = $${OUT_PWD}\..\..\mmoc\mmoc
-    contains(DEFINES, IS_ARMEL) {
-        QMAKE_MOC = perl.exe $${OUT_PWD}\..\..\mmoc\mmoc.pl
-    }
-} else {
-    PRE_TARGETDEPS += ../../mgen/mgen
-    QMAKE_MOC = PATH=../../mgen:$$(PATH) $${OUT_PWD}/../../mmoc/mmoc
-    contains(DEFINES, IS_ARMEL) {
-        QMAKE_MOC = PATH=../../mgen:$$(PATH) perl $${OUT_PWD}/../../mmoc/mmoc.pl
-    }
-}
-
-MGEN_OUTDIR = .
-mgenerator_model.name = mgenerator model
-mgenerator_model.input = MODEL_HEADERS
-mgenerator_model.depends = ../../mgen/mgen
-mgenerator_model.output = $$MGEN_OUTDIR/gen_${QMAKE_FILE_BASE}data.cpp
-mgenerator_model.commands += ../../mgen/mgen --model ${QMAKE_FILE_NAME} $$MGEN_OUTDIR
-mgenerator_model.clean += $$MGEN_OUTDIR/gen_*
-mgenerator_model.CONFIG = target_predeps no_link
-mgenerator_model.variable_out = GENERATED_SOURCES
-mgenerator_style.name = mgenerator style
-mgenerator_style.input = STYLE_HEADERS
-mgenerator_style.depends = ../../mgen/mgen
-mgenerator_style.output = $$MGEN_OUTDIR/gen_${QMAKE_FILE_BASE}data.cpp
-mgenerator_style.commands += ../../mgen/mgen --style ${QMAKE_FILE_NAME} $$MGEN_OUTDIR
-mgenerator_style.clean += $$MGEN_OUTDIR/gen_*
-mgenerator_style.CONFIG = target_predeps no_link
-mgenerator_style.variable_out = GENERATED_SOURCES
-QMAKE_EXTRA_COMPILERS += mgenerator_model mgenerator_style
-
 MODEL_HEADERS += \
     $$MSRCDIR/corelib/widgets/mwidgetmodel.h \
     $$MSRCDIR/extensions/applicationextension/mextensionhandlemodel.h \
@@ -70,6 +38,7 @@ HEADERS += \
     $$MSRCDIR/corelib/widgets/core/mwidget_p.h \
     $$MSRCDIR/corelib/widgets/mwidgetmodel_p.h \
     $$MSRCDIR/corelib/widgets/mobjectmenu.h \
+    $$MODEL_HEADERS \
     $$STYLE_HEADERS
 
 include(../common_bot.pri)
diff --git a/tests/ut_mapplethandleview/ut_mapplethandleview.pro b/tests/ut_mapplethandleview/ut_mapplethandleview.pro
index ea18a18e..dd4c2c13 100644
--- a/tests/ut_mapplethandleview/ut_mapplethandleview.pro
+++ b/tests/ut_mapplethandleview/ut_mapplethandleview.pro
@@ -7,25 +7,6 @@ INCLUDEPATH += \
     $$MSRCDIR/corelib/core \
     $$MSRCDIR/corelib/style
 
-MGEN_OUTDIR = .
-mgenerator_model.name = mgenerator model
-mgenerator_model.input = MODEL_HEADERS
-mgenerator_model.depends = ../../mgen/mgen
-mgenerator_model.output = $$MGEN_OUTDIR/gen_${QMAKE_FILE_BASE}data.cpp
-mgenerator_model.commands += ../../mgen/mgen --model ${QMAKE_FILE_NAME} $$MGEN_OUTDIR
-mgenerator_model.clean += $$MGEN_OUTDIR/gen_*
-mgenerator_model.CONFIG = target_predeps no_link
-mgenerator_model.variable_out = GENERATED_SOURCES
-mgenerator_style.name = mgenerator style
-mgenerator_style.input = STYLE_HEADERS
-mgenerator_style.depends = ../../mgen/mgen
-mgenerator_style.output = $$MGEN_OUTDIR/gen_${QMAKE_FILE_BASE}data.cpp
-mgenerator_style.commands += ../../mgen/mgen --style ${QMAKE_FILE_NAME} $$MGEN_OUTDIR
-mgenerator_style.clean += $$MGEN_OUTDIR/gen_*
-mgenerator_style.CONFIG = target_predeps no_link
-mgenerator_style.variable_out = GENERATED_SOURCES
-QMAKE_EXTRA_COMPILERS += mgenerator_model mgenerator_style
-
 MODEL_HEADERS += \
     $$MSRCDIR/corelib/widgets/mwidgetmodel.h \
     $$MSRCDIR/extensions/applicationextension/mextensionhandlemodel.h \
@@ -52,6 +33,7 @@ HEADERS += ut_mapplethandleview.h \
     $$MSRCDIR/extensions/mashup/mashup/mappletid.h \
     $$MSRCDIR/corelib/widgets/mwidgetmodel_p.h \
     $$MSRCDIR/corelib/widgets/core/mwidgetview_p.h \
+    $$MODEL_HEADERS \
     $$STYLE_HEADERS
 
 include(../common_bot.pri)
diff --git a/tests/ut_mappletinstancemanager/ut_mappletinstancemanager.pro b/tests/ut_mappletinstancemanager/ut_mappletinstancemanager.pro
index 41bf6ae3..f11d2c9f 100644
--- a/tests/ut_mappletinstancemanager/ut_mappletinstancemanager.pro
+++ b/tests/ut_mappletinstancemanager/ut_mappletinstancemanager.pro
@@ -18,7 +18,7 @@ SOURCES += \
     ../stubs/stubbase.cpp
 
 # unit test and unit classes
-MGEN_MODEL_HEADERS += \
+MODEL_HEADERS += \
     $$MSRCDIR/extensions/mashup/mashup/mapplethandlemodel.h \
     $$MSRCDIR/extensions/applicationextension/mextensionhandlemodel.h \
 
@@ -31,6 +31,6 @@ HEADERS += \
     $$MSRCDIR/extensions/mashup/mashup/mappletinstancemanagerdbusadaptor.h \
     $$MSRCDIR/extensions/applicationextension/mextensionhandle.h \
     $$MSRCDIR/extensions/mextensionwatcher.h \
-    $$MGEN_MODEL_HEADERS
+    $$MODEL_HEADERS
 
 include(../common_bot.pri)
diff --git a/tests/ut_mappletinventory/ut_mappletinventory.pro b/tests/ut_mappletinventory/ut_mappletinventory.pro
index 70b7b390..808f0640 100644
--- a/tests/ut_mappletinventory/ut_mappletinventory.pro
+++ b/tests/ut_mappletinventory/ut_mappletinventory.pro
@@ -6,30 +6,6 @@ INCLUDEPATH += \
     $$MSRCDIR/corelib/widgets \
     $$MSRCDIR/events
 
-win32 {
-    QMAKE_MOC = $${OUT_PWD}\..\..\mmoc\mmoc
-    contains(DEFINES, IS_ARMEL) {
-        QMAKE_MOC = perl.exe $${OUT_PWD}\..\..\mmoc\mmoc.pl
-    }
-} else {
-    PRE_TARGETDEPS += ../../mgen/mgen
-    QMAKE_MOC = PATH=../../mgen:$$(PATH) $${OUT_PWD}/../../mmoc/mmoc
-    contains(DEFINES, IS_ARMEL) {
-        QMAKE_MOC = PATH=../../mgen:$$(PATH) perl $${OUT_PWD}/../../mmoc/mmoc.pl
-    }
-}
-
-MGEN_OUTDIR = .
-mgenerator_model.name = mgenerator model
-mgenerator_model.input = MODEL_HEADERS
-mgenerator_model.depends = ../../mgen/mgen
-mgenerator_model.output = $$MGEN_OUTDIR/gen_${QMAKE_FILE_BASE}data.cpp
-mgenerator_model.commands += ../../mgen/mgen --model ${QMAKE_FILE_NAME} $$MGEN_OUTDIR
-mgenerator_model.clean += $$MGEN_OUTDIR/gen_*
-mgenerator_model.CONFIG = target_predeps no_link
-mgenerator_model.variable_out = GENERATED_SOURCES
-QMAKE_EXTRA_COMPILERS += mgenerator_model
-
 MODEL_HEADERS += \
     $$MSRCDIR/corelib/widgets/mwidgetmodel.h \
     $$MSRCDIR/extensions/mashup/mashup/mappletinventorymodel.h
@@ -59,6 +35,9 @@ HEADERS += \
     $$MSRCDIR/corelib/widgets/core/mwidgetcontroller_p.h \
     $$MSRCDIR/corelib/widgets/core/mwidget_p.h \
     $$MSRCDIR/corelib/widgets/mwidgetmodel_p.h \
-    $$MSRCDIR/corelib/widgets/mobjectmenu.h
+    $$MSRCDIR/corelib/widgets/mobjectmenu.h \
+    $$MSRCDIR/corelib/widgets/mscenewindow_p.h \
+    $$MSRCDIR/corelib/widgets/mobjectmenu.h \
+    $$MODEL_HEADERS
 
 include(../common_bot.pri)
diff --git a/tests/ut_mappletinventoryview/ut_mappletinventoryview.pro b/tests/ut_mappletinventoryview/ut_mappletinventoryview.pro
index 5c9aae77..f040318a 100644
--- a/tests/ut_mappletinventoryview/ut_mappletinventoryview.pro
+++ b/tests/ut_mappletinventoryview/ut_mappletinventoryview.pro
@@ -8,26 +8,6 @@ INCLUDEPATH += $$MSRCDIR/corelib/widgets
 INCLUDEPATH += $$MSRCDIR/corelib/widgets/core
 INCLUDEPATH += $$MSRCDIR/corelib/core
 
-MGEN_OUTDIR = .
-mgenerator_model.name = mgenerator model
-mgenerator_model.input = MODEL_HEADERS
-mgenerator_model.depends = ../../mgen/mgen
-mgenerator_model.output = $$MGEN_OUTDIR/gen_${QMAKE_FILE_BASE}data.cpp
-mgenerator_model.commands += ../../mgen/mgen --model ${QMAKE_FILE_NAME} $$MGEN_OUTDIR
-mgenerator_model.clean += $$MGEN_OUTDIR/gen_*
-mgenerator_model.CONFIG = target_predeps no_link
-mgenerator_model.variable_out = GENERATED_SOURCES
-mgenerator_style.name = mgenerator style
-mgenerator_style.input = STYLE_HEADERS
-mgenerator_style.depends = ../../mgen/mgen
-mgenerator_style.output = $$MGEN_OUTDIR/gen_${QMAKE_FILE_BASE}data.cpp
-mgenerator_style.commands += ../../mgen/mgen --style ${QMAKE_FILE_NAME} $$MGEN_OUTDIR
-mgenerator_style.clean += $$MGEN_OUTDIR/gen_*
-mgenerator_style.CONFIG = target_predeps no_link
-mgenerator_style.variable_out = GENERATED_SOURCES
-
-QMAKE_EXTRA_COMPILERS += mgenerator_model mgenerator_style
-
 STYLE_HEADERS += $$MSRCDIR/extensions/style/mappletinventorystyle.h
 MODEL_HEADERS += $$MSRCDIR/corelib/widgets/mwidgetmodel.h \
     $$MSRCDIR/extensions/mashup/mashup/mappletinventorymodel.h
@@ -61,6 +41,10 @@ HEADERS += \
     $$MSRCDIR/extensions/mashup/mashup/mappletinventorymodel.h \
     $$MSRCDIR/extensions/style/mappletinventorystyle.h \
     $$MSRCDIR/corelib/widgets/mwidgetmodel_p.h \
-    $$MSRCDIR/corelib/widgets/mobjectmenu.h
+    $$MSRCDIR/corelib/widgets/mobjectmenu.h \
+    $$MSRCDIR/corelib/widgets/mscenewindow_p.h \
+    $$MSRCDIR/corelib/widgets/mobjectmenu.h \
+    $$MODEL_HEADERS \
+    $$STYLE_HEADERS
 
 include(../common_bot.pri)
diff --git a/tests/ut_mapplicationextensionmanager/ut_mapplicationextensionmanager.pro b/tests/ut_mapplicationextensionmanager/ut_mapplicationextensionmanager.pro
index a4d63d40..4f98ad0d 100644
--- a/tests/ut_mapplicationextensionmanager/ut_mapplicationextensionmanager.pro
+++ b/tests/ut_mapplicationextensionmanager/ut_mapplicationextensionmanager.pro
@@ -33,7 +33,7 @@ SOURCES += \
 
 # unit test and unit classes
 
-MGEN_MODEL_HEADERS += \
+MODEL_HEADERS += \
     $$MSRCDIR/extensions/applicationextension/mextensionhandlemodel.h \
     $$MSRCDIR/corelib/widgets/mwidgetmodel.h
 
@@ -51,6 +51,6 @@ HEADERS += \
     $$MSRCDIR/corelib/core/mfiledatastore.h \
     $$MSRCDIR/corelib/core/mdatastore.h \
     $$MSRCDIR/corelib/core/mdataaccess.h \
-    $$MGEN_MODEL_HEADERS
+    $$MODEL_HEADERS
 
 include(../common_bot.pri)
diff --git a/tests/ut_mextensionhandle/ut_mextensionhandle.pro b/tests/ut_mextensionhandle/ut_mextensionhandle.pro
index 5b84979e..39f42455 100644
--- a/tests/ut_mextensionhandle/ut_mextensionhandle.pro
+++ b/tests/ut_mextensionhandle/ut_mextensionhandle.pro
@@ -6,39 +6,8 @@ INCLUDEPATH += \
     $$MSRCDIR/corelib/style
 QT += xml
 
-win32 {
-    QMAKE_MOC = $${OUT_PWD}\..\..\mmoc\mmoc
-    contains(DEFINES, IS_ARMEL) {
-        QMAKE_MOC = perl.exe $${OUT_PWD}\..\..\mmoc\mmoc.pl
-    }
-} else {
-    PRE_TARGETDEPS += ../../mgen/mgen
-    QMAKE_MOC = PATH=../../mgen:$$(PATH) $${OUT_PWD}/../../mmoc/mmoc
-    contains(DEFINES, IS_ARMEL) {
-        QMAKE_MOC = PATH=../../mgen:$$(PATH) perl $${OUT_PWD}/../../mmoc/mmoc.pl
-    }
-}
-
-MGEN_OUTDIR = .
-mgenerator_model.name = mgenerator model
-mgenerator_model.input = MODEL_HEADERS
-mgenerator_model.depends = ../../mgen/mgen
-mgenerator_model.output = $$MGEN_OUTDIR/gen_${QMAKE_FILE_BASE}data.cpp
-mgenerator_model.commands += ../../mgen/mgen --model ${QMAKE_FILE_NAME} $$MGEN_OUTDIR
-mgenerator_model.clean += $$MGEN_OUTDIR/gen_*
-mgenerator_model.CONFIG = target_predeps no_link
-mgenerator_model.variable_out = GENERATED_SOURCES
-mgenerator_style.name = mgenerator style
-mgenerator_style.input = STYLE_HEADERS
-mgenerator_style.depends = ../../mgen/mgen
-mgenerator_style.output = $$MGEN_OUTDIR/gen_${QMAKE_FILE_BASE}data.cpp
-mgenerator_style.commands += ../../mgen/mgen --style ${QMAKE_FILE_NAME} $$MGEN_OUTDIR
-mgenerator_style.clean += $$MGEN_OUTDIR/gen_*
-mgenerator_style.CONFIG = target_predeps no_link
-mgenerator_style.variable_out = GENERATED_SOURCES
-QMAKE_EXTRA_COMPILERS += mgenerator_model mgenerator_style
-
-MODEL_HEADERS += $$MSRCDIR/corelib/widgets/mwidgetmodel.h \
+MODEL_HEADERS += \
+    $$MSRCDIR/corelib/widgets/mwidgetmodel.h \
     $$MSRCDIR/extensions/applicationextension/mextensionhandlemodel.h
 
 STYLE_HEADERS += $$MSRCDIR/extensions/style/mextensionhandlestyle.h
@@ -59,6 +28,8 @@ HEADERS += ut_mextensionhandle.h \
     $$MSRCDIR/corelib/widgets/core/mwidget_p.h \
     $$MSRCDIR/corelib/widgets/mwidgetmodel_p.h \
     $$MSRCDIR/corelib/widgets/mobjectmenu.h \
-    $$MSRCDIR/extensions/style/mextensionhandlestyle.h
+    $$MSRCDIR/extensions/style/mextensionhandlestyle.h \
+    $$MODEL_HEADERS \
+    $$STYLE_HEADERS
 
 include(../common_bot.pri)
diff --git a/tests/ut_mextensionhandleview/ut_mextensionhandleview.pro b/tests/ut_mextensionhandleview/ut_mextensionhandleview.pro
index 385f2884..4b939d0d 100644
--- a/tests/ut_mextensionhandleview/ut_mextensionhandleview.pro
+++ b/tests/ut_mextensionhandleview/ut_mextensionhandleview.pro
@@ -7,25 +7,6 @@ INCLUDEPATH += \
     $$MSRCDIR/corelib/core \
     $$MSRCDIR/corelib/style
 
-MGEN_OUTDIR = .
-mgenerator_model.name = mgenerator model
-mgenerator_model.input = MODEL_HEADERS
-mgenerator_model.depends = ../../mgen/mgen
-mgenerator_model.output = $$MGEN_OUTDIR/gen_${QMAKE_FILE_BASE}data.cpp
-mgenerator_model.commands += ../../mgen/mgen --model ${QMAKE_FILE_NAME} $$MGEN_OUTDIR
-mgenerator_model.clean += $$MGEN_OUTDIR/gen_*
-mgenerator_model.CONFIG = target_predeps no_link
-mgenerator_model.variable_out = GENERATED_SOURCES
-mgenerator_style.name = mgenerator style
-mgenerator_style.input = STYLE_HEADERS
-mgenerator_style.depends = ../../mgen/mgen
-mgenerator_style.output = $$MGEN_OUTDIR/gen_${QMAKE_FILE_BASE}data.cpp
-mgenerator_style.commands += ../../mgen/mgen --style ${QMAKE_FILE_NAME} $$MGEN_OUTDIR
-mgenerator_style.clean += $$MGEN_OUTDIR/gen_*
-mgenerator_style.CONFIG = target_predeps no_link
-mgenerator_style.variable_out = GENERATED_SOURCES
-QMAKE_EXTRA_COMPILERS += mgenerator_model mgenerator_style
-
 MODEL_HEADERS += $$MSRCDIR/corelib/widgets/mwidgetmodel.h \
     $$MSRCDIR/extensions/applicationextension/mextensionhandlemodel.h
 
@@ -43,6 +24,8 @@ HEADERS += ut_mextensionhandleview.h \
     $$MSRCDIR/extensions/applicationextension/mextensionhandlemodel.h \
     $$MSRCDIR/corelib/widgets/mwidgetmodel_p.h \
     $$MSRCDIR/corelib/widgets/core/mwidgetview_p.h \
-    $$MSRCDIR/extensions/style/mextensionhandlestyle.h
+    $$MSRCDIR/extensions/style/mextensionhandlestyle.h \
+    $$MODEL_HEADERS \
+    $$STYLE_HEADERS
 
 include(../common_bot.pri)