diff options
27 files changed, 149 insertions, 309 deletions
@@ -608,11 +608,6 @@ else mv -f "$M_QMAKE_CACHE.tmp" "$M_QMAKE_CACHE" fi -M_MMOC_EXECUTABLE="mmoc" -if [ "$IS_ARMEL" = "yes" ]; then - M_MMOC_EXECUTABLE="mmoc.pl" -fi - MEEGOTOUCH_DEFINES_PRF="$outpath/mkspecs/features/meegotouch_defines.prf" # and now we generate a meegotouch_defines.prf that will contain the right @@ -621,7 +616,7 @@ cat "$relpath/mkspecs/features/meegotouch_defines.prf.in" \ | sed -e "s,@@M_UNIX_INSTALL_PREFIX@@,$M_INSTALL_PREFIX,g" \ | sed -e "s,@@M_UNIX_INSTALL_SYSCONFDIR@@,$M_INSTALL_SYSCONFDIR,g" \ | sed -e "s,@@M_UNIX_INSTALL_LIBDIR@@,$M_INSTALL_LIBDIR,g" \ -| sed -e "s,@@M_MMOC_EXECUTABLE@@,$M_MMOC_EXECUTABLE,g" > "$MEEGOTOUCH_DEFINES_PRF.tmp" +> "$MEEGOTOUCH_DEFINES_PRF.tmp" # replace meegotouch_defines.prf if it differs from the newly created temp file if cmp -s "$MEEGOTOUCH_DEFINES_PRF.tmp" "$MEEGOTOUCH_DEFINES_PRF"; then diff --git a/mkspecs/features/meegotouch_common.prf b/mkspecs/features/meegotouch_common.prf index ea324b22..ce9add7f 100644 --- a/mkspecs/features/meegotouch_common.prf +++ b/mkspecs/features/meegotouch_common.prf @@ -1,52 +1,32 @@ include(meegotouch_defines.prf) +include(meegotouch_mgen.prf) + macx { INCLUDEPATH += /Library/Frameworks/m.framework/Headers -} else { +} - contains(TEMPLATE, app) { - DEFINES += M_APPLICATION_NAME=\\\"${QMAKE_TARGET}\\\" +contains(TEMPLATE, app) { + DEFINES += M_APPLICATION_NAME=\\\"${QMAKE_TARGET}\\\" +} else { + contains(TEMPLATE, lib) { + DEFINES += M_LIBRARY_NAME=\\\"lib${QMAKE_TARGET}\\\" } else { - contains(TEMPLATE, lib) { - DEFINES += M_LIBRARY_NAME=\\\"lib${QMAKE_TARGET}\\\" - } else { - # error(Unknown template) - } + # error(Unknown template) } +} - !contains(DEFINES, BUILD_M) { - M_INC_DIR = $$M_PREFIX/include/meegotouch - M_LIB_DIR = $$M_LIBDIR - - GSTREAMER_INC = /usr/include/gstreamer-0.10 /usr/include/glib-2.0 /usr/lib/glib-2.0/include /usr/include/libxml2 - - INCLUDEPATH += $${M_INC_DIR} $${GSTREAMER_INC} - DEPENDPATH += $${M_INC_DIR} - - unix: QMAKE_LFLAGS += $${QMAKE_LFLAGS_RPATH}$${M_LIB_DIR} - LIBS += -L$${M_LIB_DIR} - - QMAKE_MOC = $${M_MMOC_EXECUTABLE} - - isEmpty(MGEN_OUTDIR) { - MGEN_OUTDIR = . - } - - mgenerator_model.name = mgenerator model - mgenerator_model.input = MODEL_HEADERS - mgenerator_model.output = $$MGEN_OUTDIR/gen_${QMAKE_FILE_BASE}data.cpp - mgenerator_model.commands += 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 - - mgenerator_style.name = mgenerator style - mgenerator_style.input = STYLE_HEADERS - mgenerator_style.output = $$MGEN_OUTDIR/gen_${QMAKE_FILE_BASE}data.cpp - mgenerator_style.commands += 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 - } +!contains(DEFINES, BUILD_M) { + M_INC_DIR = $$M_PREFIX/include/meegotouch + M_LIB_DIR = $$M_LIBDIR + + GSTREAMER_INC = /usr/include/gstreamer-0.10 /usr/include/glib-2.0 /usr/lib/glib-2.0/include /usr/include/libxml2 + + INCLUDEPATH += $${M_INC_DIR} $${GSTREAMER_INC} + DEPENDPATH += $${M_INC_DIR} + + 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_defines.prf.in b/mkspecs/features/meegotouch_defines.prf.in index 4283c847..849fabfd 100644 --- a/mkspecs/features/meegotouch_defines.prf.in +++ b/mkspecs/features/meegotouch_defines.prf.in @@ -27,8 +27,6 @@ win32 { M_PREFIX = / } -M_MMOC_EXECUTABLE = @@M_MMOC_EXECUTABLE@@ - # Directories unix|win32 { M_INSTALL_BIN = $$M_PREFIX/bin @@ -102,10 +100,3 @@ 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 -} diff --git a/mkspecs/features/meegotouch_mgen.prf b/mkspecs/features/meegotouch_mgen.prf new file mode 100644 index 00000000..23b2a8e6 --- /dev/null +++ b/mkspecs/features/meegotouch_mgen.prf @@ -0,0 +1,25 @@ +isEmpty(M_MGEN_OUTDIR) { + M_MGEN_OUTDIR = . +} + +isEmpty(M_MGEN_EXECUTABLE) { + M_MGEN_EXECUTABLE = mgen +} + +mgenerator_model.name = mgenerator model +mgenerator_model.input = MODEL_HEADERS +mgenerator_model.output = $$M_MGEN_OUTDIR/gen_${QMAKE_FILE_BASE}data.cpp +mgenerator_model.commands += $$M_MGEN_EXECUTABLE --model ${QMAKE_FILE_NAME} $$M_MGEN_OUTDIR +mgenerator_model.clean += $$M_MGEN_OUTDIR/gen_* +mgenerator_model.CONFIG = target_predeps no_link +mgenerator_model.variable_out = GENERATED_SOURCES +QMAKE_EXTRA_COMPILERS += mgenerator_model + +mgenerator_style.name = mgenerator style +mgenerator_style.input = STYLE_HEADERS +mgenerator_style.output = $$M_MGEN_OUTDIR/gen_${QMAKE_FILE_BASE}data.cpp +mgenerator_style.commands += $$M_MGEN_EXECUTABLE --style ${QMAKE_FILE_NAME} $$M_MGEN_OUTDIR +mgenerator_style.clean += $$M_MGEN_OUTDIR/gen_* +mgenerator_style.CONFIG = target_predeps no_link +mgenerator_style.variable_out = GENERATED_SOURCES +QMAKE_EXTRA_COMPILERS += mgenerator_style diff --git a/mkspecs/features/meegotouch_mmoc.prf b/mkspecs/features/meegotouch_mmoc.prf new file mode 100644 index 00000000..69c48145 --- /dev/null +++ b/mkspecs/features/meegotouch_mmoc.prf @@ -0,0 +1,21 @@ +# settings for meegotouch mmoc + +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 { + contains(DEFINES, IS_ARMEL) { + M_MMOC_EXECUTABLE = perl $$M_SOURCE_TREE/mmoc/mmoc.pl + } else { + M_MMOC_EXECUTABLE = $$M_BUILD_TREE/mmoc/mmoc + } +} + +QMAKE_MOC = $$M_MMOC_EXECUTABLE diff --git a/src/common_top.pri b/src/common_top.pri index c0666261..a7430982 100644 --- a/src/common_top.pri +++ b/src/common_top.pri @@ -1,14 +1,15 @@ # this file contains the parts that are common to all libs MOC_DIR = .moc -GEN_DIR = .gen +M_MGEN_OUTDIR = .gen OBJECTS_DIR = .obj DESTDIR = $$M_BUILD_TREE/lib TEMPLATE = lib include(../mkspecs/common.pri) include(predeps.pri) -include(mgen.pri) +include(../mkspecs/features/meegotouch_mmoc.prf) +include(../mkspecs/features/meegotouch_mgen.prf) VERSION = $${M_VERSION} DEFINES += M_VERSION=\\\"$${M_VERSION}\\\" @@ -19,17 +20,10 @@ INCLUDEPATH += $${OUT_PWD}/.gen QMAKE_STRIP = echo -PRE_TARGETDEPS += $$MGEN_EXECUTABLE $$MMOC_EXECUTABLE - CONFIG += qt warn_on depend_includepath qmake_cache target_qt dll create_prl !win32:CONFIG += link_pkgconfig macx:CONFIG += lib_bundle -QMAKE_MOC = $$MMOC_EXECUTABLE -contains(DEFINES, IS_ARMEL) { - QMAKE_MOC = $$MMOC_PERL -} - QMAKE_CFLAGS += -Werror QMAKE_CXXFLAGS += -DM_EXPORTS @@ -144,4 +138,3 @@ QMAKE_CLEAN += \ ./.obj/*.gcda \ target.path = $$M_INSTALL_LIBS - diff --git a/src/corelib/style/style.pri b/src/corelib/style/style.pri index 8a56e509..2ca70b6a 100644 --- a/src/corelib/style/style.pri +++ b/src/corelib/style/style.pri @@ -17,7 +17,7 @@ PRIVATE_HEADERS += \ $$STYLE_SRC_DIR/mstylesheet_p.h \ $$STYLE_SRC_DIR/mstylesheetselector_p.h -MGEN_STYLE_HEADERS += \ +STYLE_HEADERS += \ $$STYLE_SRC_DIR/mstyle.h \ $$STYLE_SRC_DIR/mwidgetstyle.h \ $$STYLE_SRC_DIR/mabstractlayoutpolicystyle.h \ @@ -37,7 +37,7 @@ MGEN_STYLE_HEADERS += \ PUBLIC_HEADERS += \ - $$MGEN_STYLE_HEADERS \ + $$STYLE_HEADERS \ SOURCES += \ $$STYLE_SRC_DIR/mstyle.cpp \ diff --git a/src/corelib/video/video.pri b/src/corelib/video/video.pri index 7499aaa7..1205fd80 100644 --- a/src/corelib/video/video.pri +++ b/src/corelib/video/video.pri @@ -5,15 +5,16 @@ VIDEO_SRC_DIR = ./video INCLUDEPATH +=./video contains( DEFINES, HAVE_GSTREAMER) { + MODEL_HEADERS += \ + $$VIDEO_SRC_DIR/mvideowidgetmodel.h + PUBLIC_HEADERS += \ $$VIDEO_SRC_DIR/mvideowidget.h \ $$VIDEO_SRC_DIR/mvideo.h \ - $$VIDEO_SRC_DIR/mvideowidgetmodel.h \ + $$MODEL_HEADERS \ SOURCES += \ $$VIDEO_SRC_DIR/mvideowidget.cpp \ - MGEN_MODEL_HEADERS += \ - $$VIDEO_SRC_DIR/mvideowidgetmodel.h } diff --git a/src/corelib/widgets/widgets.pri b/src/corelib/widgets/widgets.pri index f44e83dc..d1249c68 100644 --- a/src/corelib/widgets/widgets.pri +++ b/src/corelib/widgets/widgets.pri @@ -65,7 +65,7 @@ PUBLIC_HEADERS += \ $$WIDGETS_SRC_DIR/mdetailedlistitem.h \ $$WIDGETS_SRC_DIR/madvancedlistitem.h \ -MGEN_MODEL_HEADERS += \ +MODEL_HEADERS += \ $$WIDGETS_SRC_DIR/mwidgetmodel.h \ $$WIDGETS_SRC_DIR/mbuttonmodel.h \ $$WIDGETS_SRC_DIR/mcomboboxmodel.h \ @@ -102,7 +102,7 @@ MGEN_MODEL_HEADERS += \ $$WIDGETS_SRC_DIR/mbubbleitemmodel.h \ PUBLIC_HEADERS += \ - $$MGEN_MODEL_HEADERS \ + $$MODEL_HEADERS \ PRIVATE_HEADERS += \ $$WIDGETS_SRC_DIR/mpannableviewportlayout.h \ diff --git a/src/extensions/applicationextension/applicationextension.pri b/src/extensions/applicationextension/applicationextension.pri index cde50f29..70794ef1 100644 --- a/src/extensions/applicationextension/applicationextension.pri +++ b/src/extensions/applicationextension/applicationextension.pri @@ -42,9 +42,9 @@ SOURCES += $$EXTENSION_DIR/mextensionarea.cpp \ $$EXTENSION_DIR/mapplicationextensionhandleview.cpp -MGEN_MODEL_HEADERS += $$EXTENSION_DIR/mextensionareamodel.h \ +MODEL_HEADERS += $$EXTENSION_DIR/mextensionareamodel.h \ $$EXTENSION_DIR/mapplicationextensionareamodel.h \ $$EXTENSION_DIR/mextensionhandlemodel.h -PUBLIC_HEADERS += $$MGEN_MODEL_HEADERS +PUBLIC_HEADERS += $$MODEL_HEADERS diff --git a/src/extensions/mashup/mashup/mashup.pri b/src/extensions/mashup/mashup/mashup.pri index 7051b6ee..2c2c2782 100644 --- a/src/extensions/mashup/mashup/mashup.pri +++ b/src/extensions/mashup/mashup/mashup.pri @@ -54,8 +54,8 @@ SOURCES += $$MASHUP_MASHUP_SRC_DIR/mappletbutton.cpp \ $$MASHUP_MASHUP_SRC_DIR/mgconfdatastore.cpp \ $$MASHUP_MASHUP_SRC_DIR/mappletinstancemanagerdbusadaptor.cpp -MGEN_MODEL_HEADERS += $$MASHUP_MASHUP_SRC_DIR/mapplethandlemodel.h \ +MODEL_HEADERS += $$MASHUP_MASHUP_SRC_DIR/mapplethandlemodel.h \ $$MASHUP_MASHUP_SRC_DIR/mmashupcanvasmodel.h \ $$MASHUP_MASHUP_SRC_DIR/mappletinventorymodel.h -PUBLIC_HEADERS += $$MGEN_MODEL_HEADERS +PUBLIC_HEADERS += $$MODEL_HEADERS diff --git a/src/extensions/style/style.pri b/src/extensions/style/style.pri index e5a01f10..3e2222a9 100644 --- a/src/extensions/style/style.pri +++ b/src/extensions/style/style.pri @@ -1,4 +1,4 @@ -MGEN_STYLE_HEADERS += \ +STYLE_HEADERS += \ style/mapplethandlestyle.h \ style/mappletinventorystyle.h \ style/mapplicationextensionareastyle.h \ @@ -7,4 +7,4 @@ MGEN_STYLE_HEADERS += \ style/mmashupcanvasstyle.h \ PUBLIC_HEADERS += \ - $$MGEN_STYLE_HEADERS + $$STYLE_HEADERS diff --git a/src/mgen.pri b/src/mgen.pri deleted file mode 100644 index 1c622931..00000000 --- a/src/mgen.pri +++ /dev/null @@ -1,23 +0,0 @@ -# definition of the mgen "compiler" - -mgen_model.name = mgenerator model -mgen_model.input = MGEN_MODEL_HEADERS -mgen_model.output = $$GEN_DIR/gen_${QMAKE_FILE_BASE}data.cpp -mgen_model.depends = $$MGEN_EXECUTABLE -mgen_model.commands += $$MGEN_EXECUTABLE --model ${QMAKE_FILE_NAME} $$GEN_DIR -mgen_model.clean += $$GEN_DIR/gen_* -mgen_model.CONFIG = target_predeps no_link -mgen_model.variable_out = GENERATED_SOURCES - -QMAKE_EXTRA_COMPILERS += mgen_model - -mgen_style.name = mgenerator style -mgen_style.input = MGEN_STYLE_HEADERS -mgen_style.depends = $$MGEN_EXECUTABLE -mgen_style.output = $$GEN_DIR/gen_${QMAKE_FILE_BASE}data.cpp -mgen_style.commands += $$MGEN_EXECUTABLE --style ${QMAKE_FILE_NAME} $$GEN_DIR -mgen_style.clean += $$GEN_DIR/gen_* -mgen_style.CONFIG = target_predeps no_link -mgen_style.variable_out = GENERATED_SOURCES - -QMAKE_EXTRA_COMPILERS += mgen_style diff --git a/src/predeps.pri b/src/predeps.pri index 8838b301..b23b56f3 100644 --- a/src/predeps.pri +++ b/src/predeps.pri @@ -1,36 +1,43 @@ QMAKE_EXTRA_TARGETS += build_mgen build_mmoc +build_moc.target = ../mmoc/mmoc build_gen.target = ../mgen/mgen win32 { + build_mmoc.commands = \ + cd $$M_BUILD_TREE/mmmoc && mingw32-make + build_mgen.commands = \ cd $$M_BUILD_TREE/mgen && mingw32-make - - # FIXME make it work for release build too - MGEN_EXECUTABLE = $$M_BUILD_TREE/mgen/debug/mgen.exe } else { + build_mmoc.commands = \ + cd $$M_BUILD_TREE/mmoc && qmake && make + build_mgen.commands = \ cd $$M_BUILD_TREE/mgen && qmake && make - - MGEN_EXECUTABLE = $$M_BUILD_TREE/mgen/mgen } -build_moc.target = ../mmoc/mmoc -win32 { - build_mmmoc.commands = \ - cd $$M_BUILD_TREE/mmmoc && mingw32-make - # FIXME make it work for release build too - MMOC_EXECUTABLE = $$M_BUILD_TREE/mgen/debug/mmoc.exe +# make sure mmoc executable is found +win32 { + M_MMOC_EXECUTABLE = perl.exe $$M_SOURCE_TREE/mmoc/mmoc.pl } else { - build_mmoc.commands = \ - cd $$M_BUILD_TREE/mmoc && qmake && make - - MMOC_EXECUTABLE = $$M_BUILD_TREE/mmoc/mmoc + contains(DEFINES, IS_ARMEL) { + M_MMOC_EXECUTABLE = perl $$M_SOURCE_TREE/mmoc/mmoc.pl + } else { + M_MMOC_EXECUTABLE = $$M_BUILD_TREE/mmoc/mmoc + } } -MMOC_PERL_SCRIPT = $$M_BUILD_TREE/mmoc/mmoc.pl -MMOC_PERL = perl $$MMOC_PERL_SCRIPT +# make sure mgen executable is found win32 { - MMOC_PERL = perl.exe $$MMOC_PERL_SCRIPT + debug { + M_MGEN_EXECUTABLE = $$M_BUILD_TREE/mgen/debug/mgen.exe + } else { + M_MGEN_EXECUTABLE = $$M_BUILD_TREE/mgen/release/mgen.exe + } +} else { + M_MGEN_EXECUTABLE = $$M_BUILD_TREE/mgen/mgen } + +PRE_TARGETDEPS += $$M_MGEN_EXECUTABLE $$M_MMOC_EXECUTABLE diff --git a/src/settings/settingslanguage/settingslanguage.pri b/src/settings/settingslanguage/settingslanguage.pri index c8c6a714..852e6ecb 100644 --- a/src/settings/settingslanguage/settingslanguage.pri +++ b/src/settings/settingslanguage/settingslanguage.pri @@ -1,8 +1,8 @@ -MGEN_STYLE_HEADERS += \ +STYLE_HEADERS += \ settingslanguage/msettingslanguagesettingsfactorystyle.h PUBLIC_HEADERS += \ - $$MGEN_STYLE_HEADERS \ + $$STYLE_HEADERS \ settingslanguage/msettingslanguageparser.h \ settingslanguage/msettingslanguagebinary.h \ settingslanguage/msettingslanguagewidget.h \ diff --git a/src/views/style/style.pri b/src/views/style/style.pri index 51d9b04f..7f348520 100644 --- a/src/views/style/style.pri +++ b/src/views/style/style.pri @@ -1,7 +1,7 @@ STYLE_SRC_DIR=./style INCLUDEPATH+=./style -MGEN_STYLE_HEADERS += \ +STYLE_HEADERS += \ $$STYLE_SRC_DIR/mapplicationpagestyle.h \ $$STYLE_SRC_DIR/mbuttonstyle.h \ $$STYLE_SRC_DIR/mbuttoniconstyle.h \ @@ -54,4 +54,4 @@ MGEN_STYLE_HEADERS += \ $$STYLE_SRC_DIR/mbubbleitemstyle.h \ PUBLIC_HEADERS += \ - $$MGEN_STYLE_HEADERS \ + $$STYLE_HEADERS \ diff --git a/src/views/widgets/widgets.pri b/src/views/widgets/widgets.pri index 87f615ad..02df24d5 100644 --- a/src/views/widgets/widgets.pri +++ b/src/views/widgets/widgets.pri @@ -5,12 +5,12 @@ PUBLIC_HEADERS += \ $$WIDGETS_SRC_DIR/mapplicationmenubutton.h \ $$WIDGETS_SRC_DIR/mlistindex.h \ -MGEN_MODEL_HEADERS += \ +MODEL_HEADERS += \ $$WIDGETS_SRC_DIR/mapplicationmenubuttonmodel.h \ $$WIDGETS_SRC_DIR/mlistindexmodel.h \ PRIVATE_HEADERS += \ - $$MGEN_MODEL_HEADERS \ + $$MODEL_HEADERS \ $$WIDGETS_SRC_DIR/mcontainerheader_p.h \ $$WIDGETS_SRC_DIR/mbubbleitembackground_p.h \ 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) |