Changes: make ut_mapplicationextensionmanager work with mmoc

RevBy: Max Waterman
Details: here the problem was that some header files in this
test do contain M_MODEL_PROPERTY lines, but only qt moc
was used to build this test instead of mmoc. and so some
function declarations were not created. when i switched to
mmoc, the function declarations were created, and as the
cpp files were missing from the .pro file, the linker
was complaining about missing symbols.

2 files changed, 13 insertions, 11 deletions

diff --git a/tests/ut_mapplicationextensionmanager/ut_mapplicationextensionmanager.cpp b/tests/ut_mapplicationextensionmanager/ut_mapplicationextensionmanager.cpp
index 59dd6c3a..3cb8b655 100644
--- a/tests/ut_mapplicationextensionmanager/ut_mapplicationextensionmanager.cpp
+++ b/tests/ut_mapplicationextensionmanager/ut_mapplicationextensionmanager.cpp
@@ -30,13 +30,7 @@
 
 #include <QtTest/QtTest>
 
-MWidgetModel::~MWidgetModel()
-{
-}
-
-MExtensionHandleModel::~MExtensionHandleModel()
-{
-}
+const MTheme::ViewType MWidgetController::defaultType = "default";
 
 bool fileExists = false;
 bool QFile::exists(const QString &fileName)
diff --git a/tests/ut_mapplicationextensionmanager/ut_mapplicationextensionmanager.pro b/tests/ut_mapplicationextensionmanager/ut_mapplicationextensionmanager.pro
index 3bebda38..a4d63d40 100644
--- a/tests/ut_mapplicationextensionmanager/ut_mapplicationextensionmanager.pro
+++ b/tests/ut_mapplicationextensionmanager/ut_mapplicationextensionmanager.pro
@@ -14,14 +14,17 @@ INCLUDEPATH += \
     $$MSRCDIR/extensions/applicationextension \
     $$MSRCDIR/extensions/mashup/appletcommunication \
     $$MSRCDIR/extensions/mashup/mashup \
-    $$MSRCDIR/extensions
+    $$MSRCDIR/extensions \
+    $$MSRCDIR/corelib/widgets \
+    $$MSRCDIR/corelib/.gen
 
 # unit test and unit classes
 SOURCES += \
     ut_mapplicationextensionmanager.cpp \
     $$MSRCDIR/extensions/applicationextension/mapplicationextensionmanager.cpp \
     $$MSRCDIR/extensions/mextensionwatcher.cpp \
-    $$MSRCDIR/extensions/mashup/mashup/msubdatastore.cpp
+    $$MSRCDIR/extensions/mashup/mashup/msubdatastore.cpp \
+    $$MSRCDIR/corelib/widgets/mwidgetmodel.cpp
 
 # service classes
 SOURCES += \
@@ -29,12 +32,16 @@ SOURCES += \
     dummy.cpp
 
 # unit test and unit classes
+
+MGEN_MODEL_HEADERS += \
+    $$MSRCDIR/extensions/applicationextension/mextensionhandlemodel.h \
+    $$MSRCDIR/corelib/widgets/mwidgetmodel.h
+
 HEADERS += \
     ut_mapplicationextensionmanager.h \
     $$MSRCDIR/extensions/applicationextension/mapplicationextensionmanager.h \
     $$MSRCDIR/extensions/mextensionwatcher.h \
     $$MSRCDIR/extensions/applicationextension/mextensionhandle.h \
-    $$MSRCDIR/extensions/applicationextension/mextensionhandlemodel.h \
     $$MSRCDIR/extensions/mashup/mashup/msubdatastore.h \
     $$MSRCDIR/corelib/widgets/mwidgetmodel.h \
     $$MSRCDIR/corelib/widgets/core/mwidget.h \
@@ -43,6 +50,7 @@ HEADERS += \
     $$MSRCDIR/corelib/theme/mtheme.h \
     $$MSRCDIR/corelib/core/mfiledatastore.h \
     $$MSRCDIR/corelib/core/mdatastore.h \
-    $$MSRCDIR/corelib/core/mdataaccess.h
+    $$MSRCDIR/corelib/core/mdataaccess.h \
+    $$MGEN_MODEL_HEADERS
 
 include(../common_bot.pri)