r24494 by craig - Remove QT5_WRAP function usage and rely on autogeneration of ui and moc related files, another step towards Qt6

scribus-commit scribus-commit at lists.scribus.net
Wed Feb 17 10:11:25 UTC 2021


Author: craig
Date: Wed Feb 17 10:11:25 2021
New Revision: 24494

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=24494
Log:
Remove QT5_WRAP function usage and rely on autogeneration of ui and moc related files, another step towards Qt6

Added:
    trunk/Scribus/scribus/scprintengine.cpp   (with props)
    trunk/Scribus/scribus/ui/markinsert.cpp   (with props)
    trunk/Scribus/scribus/ui/prefs_pane.cpp   (with props)
Modified:
    trunk/Scribus/CMakeLists.txt
    trunk/Scribus/CMakeLists_Dependencies.cmake
    trunk/Scribus/scribus/CMakeLists.txt
    trunk/Scribus/scribus/plugins/barcodegenerator/CMakeLists.txt
    trunk/Scribus/scribus/plugins/colorwheel/CMakeLists.txt
    trunk/Scribus/scribus/plugins/export/pixmapexport/CMakeLists.txt
    trunk/Scribus/scribus/plugins/export/svgexplugin/CMakeLists.txt
    trunk/Scribus/scribus/plugins/export/xpsexport/CMakeLists.txt
    trunk/Scribus/scribus/plugins/fileloader/scribus12format/CMakeLists.txt
    trunk/Scribus/scribus/plugins/fileloader/scribus134format/CMakeLists.txt
    trunk/Scribus/scribus/plugins/fileloader/scribus13format/CMakeLists.txt
    trunk/Scribus/scribus/plugins/fileloader/scribus150format/CMakeLists.txt
    trunk/Scribus/scribus/plugins/fontpreview/CMakeLists.txt
    trunk/Scribus/scribus/plugins/gettext/csvim/CMakeLists.txt
    trunk/Scribus/scribus/plugins/gettext/docim/CMakeLists.txt
    trunk/Scribus/scribus/plugins/gettext/docxim/CMakeLists.txt
    trunk/Scribus/scribus/plugins/gettext/htmlim/CMakeLists.txt
    trunk/Scribus/scribus/plugins/gettext/odt2im/CMakeLists.txt
    trunk/Scribus/scribus/plugins/gettext/pdbim/CMakeLists.txt
    trunk/Scribus/scribus/plugins/gettext/rtfim/CMakeLists.txt
    trunk/Scribus/scribus/plugins/gettext/sxwim/CMakeLists.txt
    trunk/Scribus/scribus/plugins/gettext/textfilter/CMakeLists.txt
    trunk/Scribus/scribus/plugins/import/ai/CMakeLists.txt
    trunk/Scribus/scribus/plugins/import/cdr/CMakeLists.txt
    trunk/Scribus/scribus/plugins/import/cgm/CMakeLists.txt
    trunk/Scribus/scribus/plugins/import/cvg/CMakeLists.txt
    trunk/Scribus/scribus/plugins/import/drw/CMakeLists.txt
    trunk/Scribus/scribus/plugins/import/emf/CMakeLists.txt
    trunk/Scribus/scribus/plugins/import/fh/CMakeLists.txt
    trunk/Scribus/scribus/plugins/import/idml/CMakeLists.txt
    trunk/Scribus/scribus/plugins/import/odg/CMakeLists.txt
    trunk/Scribus/scribus/plugins/import/oodraw/CMakeLists.txt
    trunk/Scribus/scribus/plugins/import/pages/CMakeLists.txt
    trunk/Scribus/scribus/plugins/import/pct/CMakeLists.txt
    trunk/Scribus/scribus/plugins/import/pdf/CMakeLists.txt
    trunk/Scribus/scribus/plugins/import/pm/CMakeLists.txt
    trunk/Scribus/scribus/plugins/import/ps/CMakeLists.txt
    trunk/Scribus/scribus/plugins/import/pub/CMakeLists.txt
    trunk/Scribus/scribus/plugins/import/qxp/CMakeLists.txt
    trunk/Scribus/scribus/plugins/import/shape/CMakeLists.txt
    trunk/Scribus/scribus/plugins/import/sml/CMakeLists.txt
    trunk/Scribus/scribus/plugins/import/svg/CMakeLists.txt
    trunk/Scribus/scribus/plugins/import/svm/CMakeLists.txt
    trunk/Scribus/scribus/plugins/import/uniconvertor/CMakeLists.txt
    trunk/Scribus/scribus/plugins/import/viva/CMakeLists.txt
    trunk/Scribus/scribus/plugins/import/vsd/CMakeLists.txt
    trunk/Scribus/scribus/plugins/import/wmf/CMakeLists.txt
    trunk/Scribus/scribus/plugins/import/wpg/CMakeLists.txt
    trunk/Scribus/scribus/plugins/import/xar/CMakeLists.txt
    trunk/Scribus/scribus/plugins/import/xfig/CMakeLists.txt
    trunk/Scribus/scribus/plugins/import/xps/CMakeLists.txt
    trunk/Scribus/scribus/plugins/import/zmf/CMakeLists.txt
    trunk/Scribus/scribus/plugins/picbrowser/CMakeLists.txt
    trunk/Scribus/scribus/plugins/saveastemplateplugin/CMakeLists.txt
    trunk/Scribus/scribus/plugins/scripter/CMakeLists.txt
    trunk/Scribus/scribus/plugins/scriptplugin/CMakeLists.txt
    trunk/Scribus/scribus/plugins/scriptplugin_py2x/CMakeLists.txt
    trunk/Scribus/scribus/plugins/shapes/CMakeLists.txt
    trunk/Scribus/scribus/plugins/short-words/CMakeLists.txt
    trunk/Scribus/scribus/plugins/tools/2geomtools/meshdistortion/CMakeLists.txt
    trunk/Scribus/scribus/plugins/tools/2geomtools/pathalongpath/CMakeLists.txt
    trunk/Scribus/scribus/plugins/tools/flattenpath/CMakeLists.txt
    trunk/Scribus/scribus/plugins/tools/hunspellcheck/CMakeLists.txt
    trunk/Scribus/scribus/plugins/tools/lenseffects/CMakeLists.txt
    trunk/Scribus/scribus/plugins/tools/pathconnect/CMakeLists.txt
    trunk/Scribus/scribus/plugins/tools/pathcut/CMakeLists.txt
    trunk/Scribus/scribus/plugins/tools/pathfinder/CMakeLists.txt
    trunk/Scribus/scribus/plugins/tools/pathstroker/CMakeLists.txt
    trunk/Scribus/scribus/plugins/tools/smoothpath/CMakeLists.txt
    trunk/Scribus/scribus/plugins/tools/subdivide/CMakeLists.txt
    trunk/Scribus/scribus/plugins/tools/transform/CMakeLists.txt
    trunk/Scribus/scribus/tests/CMakeLists.txt
    trunk/Scribus/scribus/third_party/rtf-qt/CMakeLists.txt
    trunk/Scribus/scribus/third_party/zip/CMakeLists.txt
    trunk/Scribus/scribus/third_party/zip/unzip.h
    trunk/Scribus/scribus/third_party/zip/zip.h
    trunk/Scribus/scribus/third_party/zip/zipglobal.h
    trunk/Scribus/scribus/ui/markinsert.h
    trunk/Scribus/scribus/ui/prefs_pane.h

Modified: trunk/Scribus/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24494&path=/trunk/Scribus/CMakeLists.txt
==============================================================================
--- trunk/Scribus/CMakeLists.txt	(original)
+++ trunk/Scribus/CMakeLists.txt	Wed Feb 17 10:11:25 2021
@@ -44,11 +44,14 @@
 #Project Setup
 #Do this now, prior to adding the suffix for SVN
 project(scribus VERSION ${VERSION}) # LANGUAGES CXX C)
-
 if (VERSION_SUFFIX)
 	set (VERSION ${VERSION}.${VERSION_SUFFIX})
 endif()
 message(STATUS "Scribus ${VERSION} will be built and installed into ${CMAKE_INSTALL_PREFIX}")
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTOUIC ON)
+
 
 # Configure CCache if available and wanted
 if (WANT_CCACHE)

Modified: trunk/Scribus/CMakeLists_Dependencies.cmake
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24494&path=/trunk/Scribus/CMakeLists_Dependencies.cmake
==============================================================================
--- trunk/Scribus/CMakeLists_Dependencies.cmake	(original)
+++ trunk/Scribus/CMakeLists_Dependencies.cmake	Wed Feb 17 10:11:25 2021
@@ -66,7 +66,26 @@
 else()
 #WANT QT6
     message(STATUS "Qt6 Requested")
+	find_package(Qt6 COMPONENTS Core REQUIRED)
+	find_package(Qt6 COMPONENTS Core5Compat REQUIRED)
+	find_package(Qt6 COMPONENTS Gui REQUIRED)
 	find_package(Qt6 COMPONENTS Widgets REQUIRED)
+	include_directories(${Qt6Core_INCLUDE_DIRS})
+	add_definitions(${Qt6Core_DEFINITIONS})
+	include_directories(${Qt6Core5Compat_INCLUDE_DIRS})
+	add_definitions(${Qt6Core5Compat_DEFINITIONS})
+	include_directories(${Qt6Widgets_INCLUDE_DIRS})
+	add_definitions(${Qt6Widgets_DEFINITIONS})
+	include_directories(${Qt6Gui_INCLUDE_DIRS})
+	add_definitions(${Qt6Gui_DEFINITIONS})
+#	include_directories(${Qt5Xml_INCLUDE_DIRS})
+#	add_definitions(${Qt5Xml_DEFINITIONS})
+#	include_directories(${Qt5Network_INCLUDE_DIRS})
+#	add_definitions(${Qt5Network_DEFINITIONS})
+#	include_directories(${Qt5OpenGL_INCLUDE_DIRS})
+#	add_definitions(${Qt5OpenGL_DEFINITIONS})
+#	include_directories(${Qt5PrintSupport_INCLUDE_DIRS})
+#	add_definitions(${Qt5PrintSupport_DEFINITIONS})
 	message(STATUS "Qt Version Found: ${Qt6Widgets_VERSION}")
 endif()
 
@@ -301,4 +320,4 @@
 if (HARFBUZZ_SUBSET_FOUND)
 	message("Harfbuzz subset library Found OK")
 	set (HAVE_HARFBUZZ_SUBSET ON)
-endif()
+endif()

Modified: trunk/Scribus/scribus/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24494&path=/trunk/Scribus/scribus/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/CMakeLists.txt	(original)
+++ trunk/Scribus/scribus/CMakeLists.txt	Wed Feb 17 10:11:25 2021
@@ -49,9 +49,6 @@
 add_subdirectory(third_party)
 
 if(HAVE_OSG)
-	set(SCRIBUS_OSG_UI_SRC
-		ui/osgeditor.ui
-	)
 	set(SCRIBUS_OSG_CLASS
 		ui/AdapterWidget.h
 		ui/osgeditor.h
@@ -72,20 +69,6 @@
 
 # We setup something like a group to gather setter related stuff
 # because it could expand into a huge amount of files at some point.
-set(SCRIBUS_ITEMSETTERS_UI_SRC
-	ui/positionsetter.ui
-	ui/rotationsetter.ui
-)
-
-set(SCRIBUS_ITEMSETTERS_CLASS
-	openpalettemanager.h
-	openpalettemodel.h
-	pageitemsettersmanager.h
-	ui/openpalette.h
-	ui/openpaletteview.h
-	ui/pageitempositionsetter.h
-	ui/pageitemrotationsetter.h
-)
 
 set(SCRIBUS_ITEMSETTERS_SRC
 	openpalettemanager.cpp
@@ -98,496 +81,6 @@
 	ui/pageitemrotationsetter.cpp
 )
 
-set(SCRIBUS_UI_SRC
-	ui/aboutplugins.ui
-	ui/actionsearchdialog.ui
-	ui/aligndistribute.ui
-	ui/annot.ui
-	ui/arcvectorbase.ui
-	ui/arcwidgetbase.ui
-	ui/charselect.ui
-	ui/charselectenhanced.ui
-	ui/cmsprefsbase.ui
-	ui/cmykfwbase.ui
-	ui/colorpalette.ui
-	ui/colorsandfillsbase.ui
-	ui/contentpalette_defaultbase.ui
-	ui/contentpalette_pagebase.ui
-	ui/cxfimportdialogbase.ui
-	ui/downloadspalettebase.ui
-	ui/gradientaddedit.ui
-	ui/gradienteditor.ui
-	ui/gradientvectorbase.ui
-	ui/gtfiledialog.ui
-	ui/guidemanager.ui
-	ui/insertaframe.ui
-	ui/inserttablecolumnsdialog.ui
-	ui/inserttablerowsdialog.ui
-	ui/latexeditor.ui
-	ui/newmarginwidgetbase.ui
-	ui/mark2item.ui
-	ui/mark2mark.ui
-	ui/markanchor.ui
-	ui/marknote.ui
-	ui/marksmanager.ui
-	ui/markvariabletext.ui
-	ui/measurementsbase.ui
-	ui/multipleduplicate.ui
-	ui/multiprogressdialog.ui
-	ui/nftdialog.ui
-	ui/nftwidget.ui
-	ui/notesstyleseditor.ui
-	ui/outputpreview_pdf.ui
-	ui/outputpreview_ps.ui
-	ui/outputpreviewbase.ui
-	ui/pageitemattributes.ui
-	ui/pagepalette_pagesbase.ui
-	ui/pagepalette_masterpagesbase.ui
-	ui/picsearch.ui
-	ui/picsearchoptions.ui
-	ui/picstatus.ui
-	ui/polygonwidgetbase.ui
-	ui/preferencesdialogbase.ui
-	ui/prefs_colormanagementbase.ui
-	ui/prefs_displaybase.ui
-	ui/prefs_documentinformationbase.ui
-	ui/prefs_documentsectionsbase.ui
-	ui/prefs_documentsetupbase.ui
-	ui/prefs_externaltoolsbase.ui
-	ui/prefs_fontsbase.ui
-	ui/prefs_guidesbase.ui
-	ui/prefs_hyphenatorbase.ui
-	ui/prefs_imagecachebase.ui
-	ui/prefs_keyboardshortcutsbase.ui
-	ui/prefs_miscellaneousbase.ui
-	ui/prefs_pathsbase.ui
-	ui/prefs_pagesizesbase.ui
-	ui/prefs_pluginsbase.ui
-	ui/prefs_preflightverifierbase.ui
-	ui/prefs_printerbase.ui
-	ui/prefs_scrapbookbase.ui
-	ui/prefs_spellingbase.ui
-	ui/prefs_typographybase.ui
-	ui/prefs_userinterfacebase.ui
-	ui/prefs_itemtoolsbase.ui
-	ui/prefs_operatortoolsbase.ui
-	ui/prefs_pdfexportbase.ui
-	ui/prefs_tableofcontentsbase.ui
-	ui/prefs_documentitemattributesbase.ui
-	ui/printdialogbase.ui
-	ui/printpreviewbase.ui
-	ui/propertiespalette_groupbase.ui
-	ui/propertiespalette_imagebase.ui
-	ui/propertiespalette_linebase.ui
-	ui/propertiespalette_shapebase.ui
-	ui/propertiespalette_tablebase.ui
-	ui/propertiespalette_textbase.ui
-	ui/propertiespalette_xyzbase.ui
-	ui/propertywidget_advancedbase.ui
-	ui/propertywidget_distancebase.ui
-	ui/propertywidget_pareffectbase.ui
-	ui/propertywidget_flopbase.ui
-	ui/propertywidget_fontfeaturesbase.ui
-	ui/propertywidget_hyphenationbase.ui
-	ui/propertywidget_optmarginsbase.ui
-	ui/propertywidget_orphansbase.ui
-	ui/propertywidget_pathtextbase.ui
-	ui/propertywidget_textcolorbase.ui
-	ui/recoverdialog.ui
-	ui/replacecolors.ui
-	ui/replaceonecolor.ui
-	ui/resourcemanagerbase.ui
-	ui/resourcemanagerlicensebase.ui
-	ui/selectobjects.ui
-	ui/shortcutwidget.ui
-	ui/smcellstylewidget.ui
-	ui/smcstylewidget.ui
-	ui/smfontfeaturesbase.ui
-	ui/smlinestylewidget.ui
-	ui/smtablestylewidget.ui
-	ui/smpstylewidget.ui
-	ui/smreplacedia.ui
-	ui/smstyleimport.ui
-	ui/spiralvectorbase.ui
-	ui/spiralwidgetbase.ui
-	ui/stylemanager.ui
-	ui/tablecolumnwidthsdialog.ui
-	ui/tablerowheightsdialog.ui
-	ui/tabpdfoptions.ui
-	ui/transformdialogbase.ui
-	ui/transparencypalette.ui
-	ui/copypagetomasterpage.ui
-	ui/createrange.ui
-	ui/helpbrowser.ui
-	ui/helpbrowsernavigation.ui
-	ui/unicodesearch.ui
-	ui/useprintermarginsdialog.ui
-	ui/weldeditbase.ui
-#	#{SCRIBUS_ITEMSETTERS_UI_SRC}
-	${SCRIBUS_OSG_UI_SRC}
-)
-
-set(SCRIBUS_MOC_CLASSES
-	actionmanager.h
-	appmodehelper.h
-	canvas.h
-	canvasgesture.h
-	canvasgesture_cellselect.h
-	canvasgesture_columnresize.h
-	canvasgesture_rowresize.h
-	canvasgesture_rulermove.h
-	canvasgesture_table.h
-	canvasgesture_tableresize.h
-	canvasmode.h
-	canvasmode_create.h
-	canvasmode_edit.h
-	canvasmode_editarc.h
-	canvasmode_editpolygon.h
-	canvasmode_editspiral.h
-	canvasmode_edittable.h
-	canvasmode_editweldpoint.h
-	canvasmode_eyedropper.h
-	canvasmode_framelinks.h
-	canvasmode_imageimport.h
-	canvasmode_measurements.h
-	canvasmode_normal.h
-	canvasmode_objimport.h
-	chartablemodel.h
-	chartableview.h
-	collect4output.h
-	colorblind.h
-	commonstrings.h
-	deferredtask.h
-	docinfo.h
-	downloadmanager/scdlmgr.h
-	downloadmanager/scdlthread.h
-	fileloader.h
-	filesearch.h
-	filewatcher.h
-	fontlistmodel.h
-	guidesdelegate.h
-	guidesmodel.h
-	guidesview.h
-	hyphenator.h
-	iconmanager.h
-	latexhelpers.h
-	loadsaveplugin.h
-	menumanager.h
-	navigator.h
-	notesstyles.h
-	observable.h
-	pageitem.h
-	pageitem_arc.h
-	pageitem_group.h
-	pageitem_imageframe.h
-	pageitem_latexframe.h
-	pageitem_line.h
-	pageitem_pathtext.h
-	pageitem_polygon.h
-	pageitem_polyline.h
-	pageitem_regularpolygon.h
-	pageitem_spiral.h
-	pageitem_symbol.h
-	pageitem_table.h
-	pageitem_textframe.h
-	pageitem_noteframe.h
-	pageitempointer.h
-	pdf_analyzer.h
-	pdflib.h
-	pdflib_core.h
-	pluginmanager.h
-	pp_proxy.h
-	prefsmanager.h
-	pslib.h
-	qtiocompressor.h
-	sampleitem.h
-	scgtplugin.h
-	schelptreemodel.h
-	scimagecachedir.h
-	scimagecachefile.h
-	scimagecachemanager.h
-	scmimedata.h
-	scplugin.h
-	scprintengine.h
-	scraction.h
-	scribus.h
-	scribusapp.h
-	scribuscore.h
-	scribusdoc.h
-	scribusview.h
-	scribuswin.h
-	selection.h
-	selectionrubberband.h
-	storyloader.h
-	styleitem.h
-	tocgenerator.h
-	undogui.h
-	undomanager.h
-	upgradechecker.h
-	urllauncher.h
-	ui/about.h
-	ui/aboutplugins.h
-	ui/actionsearchdialog.h
-	ui/adjustcmsdialog.h
-	ui/aligndistribute.h
-	ui/alignselect.h
-	ui/directionselect.h
-	ui/annot.h
-	ui/annota.h
-	ui/applytemplatedialog.h
-	ui/arcwidget.h
-	ui/arcvectordialog.h
-	ui/arrowchooser.h
-	ui/autoform.h
-	ui/autoformbuttongroup.h
-	ui/basepointwidget.h
-	ui/bookmarkpalette.h
-	ui/bookmwin.h
-	ui/buttonicon.h
-	ui/charselect.h
-	ui/charselectenhanced.h
-	ui/charzoom.h
-	ui/checkDocument.h
-	ui/clockwidget.h
-	ui/cmsprefs.h
-	ui/cmykfw.h
-	ui/collectforoutput_ui.h
-	ui/colorchart.h
-	ui/colorcombo.h
-	ui/colorlistbox.h
-	ui/colorlistmodel.h
-	ui/colorsandfills.h
-	ui/contentpalette.h
-	ui/contentpalette_default.h
-	ui/contentpalette_page.h
-	ui/contextmenu.h
-	ui/cpalette.h
-	ui/cupsoptions.h
-	ui/curvewidget.h
-	ui/customfdialog.h
-	ui/cxfimportdialog.h
-	ui/dasheditor.h
-	ui/dcolor.h
-	ui/delpages.h
-	ui/downloadspalette.h
-	ui/editor.h
-	ui/effectsdialog.h
-	ui/extimageprops.h
-	ui/filedialogeventcatcher.h
-	ui/fontcombo.h
-	ui/fontembeddingcombo.h
-	ui/fontembeddingmodel.h
-	ui/fontlistview.h
-	ui/fontreplacedialog.h
-	ui/gradientaddedit.h
-	ui/gradienteditor.h
-	ui/gradientvectordialog.h
-	ui/gradientpreview.h
-	ui/gtdialogs.h
-	ui/gtfiledialog.h
-	ui/guidemanager.h
-	ui/helpbrowser.h
-	ui/helpnavigation.h
-	ui/hruler.h
-	ui/hyask.h
-	ui/imageinfodialog.h
-	ui/inlinepalette.h
-	ui/insertTable.h
-	ui/insertaframe.h
-	ui/inserttablecolumnsdialog.h
-	ui/inserttablerowsdialog.h
-	ui/inspage.h
-	ui/javadocs.h
-	ui/latexeditor.h
-	ui/layers.h
-	ui/linecombo.h
-	ui/linkbutton.h
-	ui/loremipsum.h
-	ui/markinsert.h
-	ui/mark2item.h
-	ui/mark2mark.h
-	ui/markanchor.h
-	ui/marknote.h
-	ui/marksmanager.h
-	ui/markvariabletext.h
-	ui/marginpresetlayout.h
-	ui/marginwidget.h
-	ui/newmarginwidget.h
-	ui/measurements.h
-	ui/mergedoc.h
-	ui/missing.h
-	ui/movepage.h
-	ui/multipleduplicate.h
-	ui/multiprogressdialog.h
-	ui/newdocdialog.h
-	ui/newtemp.h
-	ui/nftdialog.h
-	ui/nftwidget.h
-	ui/nodeeditpalette.h
-	ui/notesstyleseditor.h
-	ui/numformatcombo.h
-	ui/outlinepalette.h
-	ui/outputpreview_pdf.h
-	ui/outputpreview_ps.h
-	ui/outputpreviewbase.h
-	ui/pageitemattributes.h
-	ui/pagelayout.h
-	ui/pagepalette.h
-	ui/pagepalette_pages.h
-	ui/pagepalette_masterpages.h
-	ui/pagepalette_widgets.h
-	ui/pagepropertiesdialog.h
-	ui/pageselector.h
-	ui/patternpropsdialog.h
-	ui/pdfexportdialog.h
-	ui/pdfversioncombo.h
-	ui/pdfversionmodel.h
-	ui/picsearch.h
-	ui/picsearchoptions.h
-	ui/picstatus.h
-	ui/polygonwidget.h
-	ui/polyprops.h
-	ui/preferencesdialog.h
-	ui/prefs_colormanagement.h
-	ui/prefs_display.h
-	ui/prefs_documentinformation.h
-	ui/prefs_documentsections.h
-	ui/prefs_documentsetup.h
-	ui/prefs_externaltools.h
-	ui/prefs_fonts.h
-	ui/prefs_guides.h
-	ui/prefs_hyphenator.h
-	ui/prefs_imagecache.h
-	ui/prefs_keyboardshortcuts.h
-	ui/prefs_miscellaneous.h
-	ui/prefs_pagesizes.h
-	ui/prefs_paths.h
-	ui/prefs_pane.h
-	ui/prefs_plugins.h
-	ui/prefs_preflightverifier.h
-	ui/prefs_printer.h
-	ui/prefs_scrapbook.h
-	ui/prefs_spelling.h
-	ui/prefs_typography.h
-	ui/prefs_userinterface.h
-	ui/prefs_itemtools.h
-	ui/prefs_operatortools.h
-	ui/prefs_pdfexport.h
-	ui/prefs_tableofcontents.h
-	ui/prefs_documentitemattributes.h
-	ui/printdialog.h
-	ui/printlanguagecombo.h
-	ui/printpreview.h
-	ui/propertiespalette.h
-	ui/propertiespalette_group.h
-	ui/propertiespalette_image.h
-	ui/propertiespalette_line.h
-	ui/propertiespalette_shadow.h
-	ui/propertiespalette_shape.h
-	ui/propertiespalette_table.h
-	ui/propertiespalette_text.h
-	ui/propertiespalette_utils.h
-	ui/propertiespalette_xyz.h
-	ui/propertywidget_advanced.h
-	ui/propertywidget_distance.h
-	ui/propertywidget_pareffect.h
-	ui/propertywidget_flop.h
-	ui/propertywidget_hyphenation.h
-	ui/propertywidget_optmargins.h
-	ui/propertywidget_orphans.h
-	ui/propertywidget_pathtext.h
-	ui/propertywidget_textcolor.h
-	ui/propertywidget_fontfeatures.h
-	ui/proptree.h
-	ui/query.h
-	ui/recoverdialog.h
-	ui/replacecolors.h
-	ui/replaceonecolor.h
-	ui/resourcemanager.h
-	ui/resourcemanagerlicense.h
-	ui/rulermover.h
-	ui/sccolorslider.h
-	ui/scdockpalette.h
-	ui/scescapecatcher.h
-	ui/scfilewidget.h
-	ui/scinputdialog.h
-	ui/sclistwidgetdelegate.h
-	ui/scmenu.h
-	ui/scmessagebox.h
-	ui/scmwmenumanager.h
-	ui/scrapbookpalette.h
-	ui/scrpalettebase.h
-	ui/scrspinbox.h
-	ui/sctablewidget.h
-	ui/sctextbrowser.h
-	ui/sctoolbar.h
-	ui/sctreewidget.h
-	ui/search.h
-	ui/selectobjects.h
-	ui/selfield.h
-	ui/shadebutton.h
-	ui/shortcutwidget.h
-	ui/smalignselect.h
-	ui/smcellstylewidget.h
-	ui/smcellstyle.h
-	ui/smcheckbox.h
-	ui/smcolorcombo.h
-	ui/smcstylewidget.h
-	ui/smdirectionselect.h
-	ui/smfontfeatures.h
-	ui/smtablestylewidget.h
-	ui/smfontcomboh.h
-	ui/smlinestyle.h
-	ui/smlinestylewidget.h
-	ui/smnumformatcombo.h
-	ui/smpstylewidget.h
-	ui/smradiobutton.h
-	ui/smreplacedia.h
-	ui/smsccombobox.h
-	ui/smscrspinbox.h
-	ui/smshadebutton.h
-	ui/smspinbox.h
-	ui/smlineedit.h
-	ui/smstyleimport.h
-	ui/smstyleselect.h
-	ui/smtablestyle.h
-	ui/smtabruler.h
-	ui/smtextstyles.h
-	ui/spiralvectordialog.h
-	ui/spiralwidget.h
-	ui/splash.h
-	ui/storyeditor.h
-	ui/stylecombos.h
-	ui/stylemanager.h
-	ui/styleselect.h
-	ui/styleview.h
-	ui/swatchcombo.h
-	ui/symbolpalette.h
-	ui/tablecolumnwidthsdialog.h
-	ui/tablesideselector.h
-	ui/tablerowheightsdialog.h
-	ui/tabmanager.h
-	ui/tabpdfoptions.h
-	ui/tabruler.h
-	ui/transformdialog.h
-	ui/transparencypalette.h
-	tt/simpletreemodel/treemodel.h
-	ui/copypagetomasterpagedialog.h
-	ui/createrange.h
-	ui/edittoolbar.h
-	ui/filetoolbar.h
-	ui/modetoolbar.h
-	ui/pdftoolbar.h
-	ui/viewtoolbar.h
-	ui/unicodesearch.h
-	ui/useprintermarginsdialog.h
-	ui/vruler.h
-	ui/weldedit.h
-#	#{SCRIBUS_ITEMSETTERS_CLASS}
-	${SCRIBUS_OSG_CLASS}
-	${SCRIBUS_STYLES_MOC_CLASSES}
-	${SCRIBUS_TEXT_MOC_CLASSES}
-)
 
 set(SCRIBUS_SOURCES
 	actionmanager.cpp
@@ -755,6 +248,7 @@
 	scpattern.cpp
 	scplugin.cpp
 	scpreview.cpp
+	scprintengine.cpp
 	scprintengine_pdf.cpp
 	scprintengine_ps.cpp
 	scraction.cpp
@@ -922,6 +416,7 @@
 	ui/mark2item.cpp
 	ui/mark2mark.cpp
 	ui/markanchor.cpp
+	ui/markinsert.cpp
 	ui/marknote.cpp
 	ui/marksmanager.cpp
 	ui/markvariabletext.cpp
@@ -976,6 +471,7 @@
 	ui/prefs_keyboardshortcuts.cpp
 	ui/prefs_miscellaneous.cpp
 	ui/prefs_pagesizes.cpp
+	ui/prefs_pane.cpp
 	ui/prefs_paths.cpp
 	ui/prefs_plugins.cpp
 	ui/prefs_preflightverifier.cpp
@@ -1118,7 +614,6 @@
 
 
 if(WIN32)
-	set(SCRIBUS_MOC_WIN32_ONLY_CLASSES scprintengine_gdi.h)
 	set(SCRIBUS_WIN32_ONLY_SOURCES
 		printpreviewcreator_gdi.cpp
 		scpainterex_cairo.cpp
@@ -1126,17 +621,14 @@
 		)
 	set(SCRIBUS_MAIN_CPP main_win32.cpp)
 else()
-	set(SCRIBUS_MOC_WIN32_ONLY_CLASSES)
 	set(SCRIBUS_WIN32_ONLY_SOURCES)
 	set(SCRIBUS_MAIN_CPP main.cpp)
 endif()
 
-QT5_WRAP_UI(SCRIBUS_UI_SOURCES ${SCRIBUS_UI_SRC} )
-
-QT5_WRAP_CPP(SCRIBUS_MOC_SOURCES
-	${SCRIBUS_MOC_CLASSES}
-	${SCRIBUS_MOC_WIN32_ONLY_CLASSES}
-	)
+set(CMAKE_AUTOUIC_SEARCH_PATHS ui/)
+
+set_property(SOURCE third_party/fparser/file.hh PROPERTY SKIP_AUTOGEN ON)
+set_property(SOURCE third_party/fparser/fparser.hh PROPERTY SKIP_AUTOGEN ON)
 
 link_directories(
 	${CMAKE_CURRENT_BINARY_DIR}/third_party/wpg
@@ -1224,9 +716,17 @@
 #	cmake_policy(SET CMP0003 OLD)
 #endif()
 
+
+if (NOT DEFINED CMAKE_GLOBAL_AUTOGEN_TARGET_NAME)
+	set(SCRIBUS_AUTOGEN_INCLUDE_PATH "${CMAKE_CURRENT_BINARY_DIR}/${EXE_NAME}_autogen/include")
+else()
+	set(SCRIBUS_AUTOGEN_INCLUDE_PATH "${CMAKE_CURRENT_BINARY_DIR}/${EXE_NAME}_${CMAKE_GLOBAL_AUTOGEN_TARGET_NAME}/include")
+endif()
+message(STATUS "Autogen Include Path: ${SCRIBUS_AUTOGEN_INCLUDE_PATH}")
+#set(CMAKE_AUTOUIC_SEARCH_PATHS ${SCRIBUS_AUTOGEN_INCLUDE_PATH})
+
 if(HAVE_OSG)
 	add_executable(${EXE_NAME}
-		${SCRIBUS_MOC_SOURCES}
 		${SCRIBUS_MAIN_CPP}
 		${SCRIBUS_SOURCES}
 		${SCRIBUS_API_SOURCES}
@@ -1235,14 +735,12 @@
 		${SCRIBUS_FONTS_SOURCES}
 		${SCRIBUS_STYLES_SOURCES}
 		${SCRIBUS_TEXT_SOURCES}
-		${SCRIBUS_UI_SOURCES}
 		${SCRIBUS_WIN32_ONLY_SOURCES}
 		${GESTURE_FRAME_PREVIEW_SOURCES}
 		${SCRIBUS_PRC_SOURCES}
 	)
 else()
 	add_executable(${EXE_NAME}
-		${SCRIBUS_MOC_SOURCES}
 		${SCRIBUS_MAIN_CPP}
 		${SCRIBUS_SOURCES}
 		${SCRIBUS_API_SOURCES}
@@ -1251,7 +749,6 @@
 		${SCRIBUS_FONTS_SOURCES}
 		${SCRIBUS_STYLES_SOURCES}
 		${SCRIBUS_TEXT_SOURCES}
-		${SCRIBUS_UI_SOURCES}
 		${SCRIBUS_WIN32_ONLY_SOURCES}
 		${GESTURE_FRAME_PREVIEW_SOURCES}
 	)
@@ -1310,6 +807,9 @@
 	)
 else()
 	target_link_libraries(${EXE_NAME}
+		Qt6::Core
+		Qt6::Core5Compat
+		Qt6::Gui
 		Qt6::Widgets
 		)
 endif()
@@ -1414,17 +914,27 @@
 endif()
 
 # Now build plugins
-
-set(PLUGIN_LIBRARIES
-	${Qt5Core_LIBRARIES}
-	${Qt5Widgets_LIBRARIES}
-	${Qt5Gui_LIBRARIES}
-	${Qt5Xml_LIBRARIES}
-	${Qt5Network_LIBRARIES}
-	${Qt5OpenGL_LIBRARIES}
-	${LIBXML2_LIBRARIES}
-	${ZLIB_LIBRARIES}
-)
+IF(NOT WANT_QT6)
+    set(PLUGIN_LIBRARIES
+		${Qt5Core_LIBRARIES}
+		${Qt5Widgets_LIBRARIES}
+		${Qt5Gui_LIBRARIES}
+		${Qt5Xml_LIBRARIES}
+		${Qt5Network_LIBRARIES}
+		${Qt5OpenGL_LIBRARIES}
+		${LIBXML2_LIBRARIES}
+		${ZLIB_LIBRARIES}
+	)
+else()
+	set(PLUGIN_LIBRARIES
+		${Qt6Core_LIBRARIES}
+		${Qt6Core5Compat_LIBRARIES}
+		${Qt6Widgets_LIBRARIES}
+		${Qt6Gui_LIBRARIES}
+		${LIBXML2_LIBRARIES}
+		${ZLIB_LIBRARIES}
+	)
+endif()
 
 if(WIN32)
 	# IF your plugin needs more than this, please link them privately

Modified: trunk/Scribus/scribus/plugins/barcodegenerator/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24494&path=/trunk/Scribus/scribus/plugins/barcodegenerator/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/barcodegenerator/CMakeLists.txt	(original)
+++ trunk/Scribus/scribus/plugins/barcodegenerator/CMakeLists.txt	Wed Feb 17 10:11:25 2021
@@ -1,16 +1,7 @@
 include_directories(
 	${CMAKE_SOURCE_DIR}
 	${CMAKE_SOURCE_DIR}/scribus
-)
-
-set(BARCODEGENERATOR_PLUGIN_UI_SRC
-	barcodegenerator.ui
-)
-
-set(BARCODEGENERATOR_PLUGIN_MOC_CLASSES
-	barcode.h
-	barcodegenerator.h
-	barcodegeneratorrenderthread.h
+	${SCRIBUS_AUTOGEN_INCLUDE_PATH}
 )
 
 set(BARCODEGENERATOR_PLUGIN_SOURCES
@@ -21,10 +12,7 @@
 
 set(SCRIBUS_BARCODEGENERATOR_PLUGIN "barcodegenerator")
 
-QT5_WRAP_UI(BARCODEGENERATOR_PLUGIN_UI_SOURCES ${BARCODEGENERATOR_PLUGIN_UI_SRC} )
-QT5_WRAP_CPP(BARCODEGENERATOR_PLUGIN_MOC_SOURCES ${BARCODEGENERATOR_PLUGIN_MOC_CLASSES})
-
-add_library(${SCRIBUS_BARCODEGENERATOR_PLUGIN} MODULE ${BARCODEGENERATOR_PLUGIN_SOURCES} ${BARCODEGENERATOR_PLUGIN_MOC_SOURCES} ${BARCODEGENERATOR_PLUGIN_UI_SOURCES})
+add_library(${SCRIBUS_BARCODEGENERATOR_PLUGIN} MODULE ${BARCODEGENERATOR_PLUGIN_SOURCES})
 
 target_link_libraries(${SCRIBUS_BARCODEGENERATOR_PLUGIN} ${PLUGIN_LIBRARIES})
 

Modified: trunk/Scribus/scribus/plugins/colorwheel/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24494&path=/trunk/Scribus/scribus/plugins/colorwheel/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/colorwheel/CMakeLists.txt	(original)
+++ trunk/Scribus/scribus/plugins/colorwheel/CMakeLists.txt	Wed Feb 17 10:11:25 2021
@@ -1,16 +1,7 @@
 include_directories(
 	${CMAKE_SOURCE_DIR}
 	${CMAKE_SOURCE_DIR}/scribus
-)
-
-set(COLORWHEEL_PLUGIN_UI_SRC
-	cwdialog.ui
-)
-
-set(COLORWHEEL_PLUGIN_MOC_CLASSES
-	colorwheel.h
-	colorwheelwidget.h
-	cwdialog.h
+	${SCRIBUS_AUTOGEN_INCLUDE_PATH}
 )
 
 set(COLORWHEEL_PLUGIN_SOURCES
@@ -21,10 +12,7 @@
 
 set(SCRIBUS_COLORWHEEL_PLUGIN "colorwheel")
 
-QT5_WRAP_UI(COLORWHEEL_PLUGIN_UI_SOURCES ${COLORWHEEL_PLUGIN_UI_SRC} )
-QT5_WRAP_CPP(COLORWHEEL_PLUGIN_MOC_SOURCES ${COLORWHEEL_PLUGIN_MOC_CLASSES})
-
-add_library(${SCRIBUS_COLORWHEEL_PLUGIN} MODULE ${COLORWHEEL_PLUGIN_SOURCES} ${COLORWHEEL_PLUGIN_MOC_SOURCES} ${COLORWHEEL_PLUGIN_UI_CPP} ${COLORWHEEL_PLUGIN_UI_SOURCES})
+add_library(${SCRIBUS_COLORWHEEL_PLUGIN} MODULE ${COLORWHEEL_PLUGIN_SOURCES})
 
 target_link_libraries(${SCRIBUS_COLORWHEEL_PLUGIN} ${PLUGIN_LIBRARIES})
 

Modified: trunk/Scribus/scribus/plugins/export/pixmapexport/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24494&path=/trunk/Scribus/scribus/plugins/export/pixmapexport/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/export/pixmapexport/CMakeLists.txt	(original)
+++ trunk/Scribus/scribus/plugins/export/pixmapexport/CMakeLists.txt	Wed Feb 17 10:11:25 2021
@@ -1,15 +1,7 @@
 include_directories(
 	${CMAKE_SOURCE_DIR}
 	${CMAKE_SOURCE_DIR}/scribus
-)
-
-set(SCRIBUS_PIXMAPEXPORT_PLUGIN_UI_SRC
-	exportform.ui
-)
-
-set(SCRIBUS_PIXMAPEXPORT_PLUGIN_MOC_CLASSES
-	dialog.h
-	export.h
+	${SCRIBUS_AUTOGEN_INCLUDE_PATH}
 )
 
 set(SCRIBUS_PIXMAPEXPORT_PLUGIN_SOURCES
@@ -19,10 +11,7 @@
 
 set(SCRIBUS_PIXMAPEXPORT_PLUGIN "scribusexportpixmap")
 
-QT5_WRAP_UI(SCRIBUS_PIXMAPEXPORT_PLUGIN_UI_SOURCES ${SCRIBUS_PIXMAPEXPORT_PLUGIN_UI_SRC} )
-QT5_WRAP_CPP(SCRIBUS_PIXMAPEXPORT_PLUGIN_MOC_SOURCES ${SCRIBUS_PIXMAPEXPORT_PLUGIN_MOC_CLASSES})
-
-add_library(${SCRIBUS_PIXMAPEXPORT_PLUGIN} MODULE ${SCRIBUS_PIXMAPEXPORT_PLUGIN_SOURCES} ${SCRIBUS_PIXMAPEXPORT_PLUGIN_MOC_SOURCES} ${SCRIBUS_PIXMAPEXPORT_PLUGIN_UI_SOURCES})
+add_library(${SCRIBUS_PIXMAPEXPORT_PLUGIN} MODULE ${SCRIBUS_PIXMAPEXPORT_PLUGIN_SOURCES})
 
 target_link_libraries(${SCRIBUS_PIXMAPEXPORT_PLUGIN} ${PLUGIN_LIBRARIES})
 

Modified: trunk/Scribus/scribus/plugins/export/svgexplugin/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24494&path=/trunk/Scribus/scribus/plugins/export/svgexplugin/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/export/svgexplugin/CMakeLists.txt	(original)
+++ trunk/Scribus/scribus/plugins/export/svgexplugin/CMakeLists.txt	Wed Feb 17 10:11:25 2021
@@ -1,10 +1,7 @@
 include_directories(
 	${CMAKE_SOURCE_DIR}
 	${CMAKE_SOURCE_DIR}/scribus
-)
-
-set(EXPORTSVG_PLUGIN_MOC_CLASSES
-	svgexplugin.h
+	${SCRIBUS_AUTOGEN_INCLUDE_PATH}
 )
 
 set(EXPORTSVG_PLUGIN_SOURCES
@@ -13,9 +10,7 @@
 
 set(SCRIBUS_EXPORTSVG_PLUGIN "svgexplugin")
 
-QT5_WRAP_CPP(EXPORTSVG_PLUGIN_MOC_SOURCES ${EXPORTSVG_PLUGIN_MOC_CLASSES})
-
-add_library(${SCRIBUS_EXPORTSVG_PLUGIN} MODULE ${EXPORTSVG_PLUGIN_SOURCES} ${EXPORTSVG_PLUGIN_MOC_SOURCES})
+add_library(${SCRIBUS_EXPORTSVG_PLUGIN} MODULE ${EXPORTSVG_PLUGIN_SOURCES})
 
 target_link_libraries(${SCRIBUS_EXPORTSVG_PLUGIN} ${PLUGIN_LIBRARIES})
 

Modified: trunk/Scribus/scribus/plugins/export/xpsexport/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24494&path=/trunk/Scribus/scribus/plugins/export/xpsexport/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/export/xpsexport/CMakeLists.txt	(original)
+++ trunk/Scribus/scribus/plugins/export/xpsexport/CMakeLists.txt	Wed Feb 17 10:11:25 2021
@@ -1,10 +1,7 @@
 include_directories(
 	${CMAKE_SOURCE_DIR}
 	${CMAKE_SOURCE_DIR}/scribus
-)
-
-set(EXPORTXPS_PLUGIN_MOC_CLASSES
-	xpsexplugin.h
+	${SCRIBUS_AUTOGEN_INCLUDE_PATH}
 )
 
 set(EXPORTXPS_PLUGIN_SOURCES
@@ -13,9 +10,10 @@
 
 set(SCRIBUS_EXPORTXPS_PLUGIN "xpsexplugin")
 
-QT5_WRAP_CPP(EXPORTXPS_PLUGIN_MOC_SOURCES ${EXPORTXPS_PLUGIN_MOC_CLASSES})
 
-add_library(${SCRIBUS_EXPORTXPS_PLUGIN} MODULE ${EXPORTXPS_PLUGIN_SOURCES} ${EXPORTXPS_PLUGIN_MOC_SOURCES})
+#set(CMAKE_AUTOUIC_SEARCH_PATHS ${CMAKE_SOURCE_DIR}/scribus/ui/)
+
+add_library(${SCRIBUS_EXPORTXPS_PLUGIN} MODULE ${EXPORTXPS_PLUGIN_SOURCES})
 
 target_link_libraries(${SCRIBUS_EXPORTXPS_PLUGIN} ${PLUGIN_LIBRARIES} ${SCRIBUS_ZIP_LIB})
 
@@ -30,5 +28,3 @@
 )
 
 add_dependencies(${SCRIBUS_EXPORTXPS_PLUGIN} ${EXE_NAME})
-
-# set_target_properties(${SCRIBUS_FONTPREVIEW_PLUGIN} PROPERTIES VERSION "0.0.0")

Modified: trunk/Scribus/scribus/plugins/fileloader/scribus12format/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24494&path=/trunk/Scribus/scribus/plugins/fileloader/scribus12format/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/fileloader/scribus12format/CMakeLists.txt	(original)
+++ trunk/Scribus/scribus/plugins/fileloader/scribus12format/CMakeLists.txt	Wed Feb 17 10:11:25 2021
@@ -1,11 +1,6 @@
 include_directories(
 	${CMAKE_SOURCE_DIR}
 	${CMAKE_SOURCE_DIR}/scribus
-)
-
-set(SCR12FORMAT_FL_PLUGIN_MOC_CLASSES
-	scribus12format.h
-	scribus12formatimpl.h
 )
 
 set(SCR12FORMAT_FL_PLUGIN_SOURCES
@@ -15,9 +10,7 @@
 
 set(SCRIBUS_SCR12FORMAT_FL_PLUGIN "scribus12format")
 
-QT5_WRAP_CPP(SCR12FORMAT_FL_PLUGIN_MOC_SOURCES ${SCR12FORMAT_FL_PLUGIN_MOC_CLASSES})
-
-add_library(${SCRIBUS_SCR12FORMAT_FL_PLUGIN} MODULE ${SCR12FORMAT_FL_PLUGIN_SOURCES} ${SCR12FORMAT_FL_PLUGIN_MOC_SOURCES})
+add_library(${SCRIBUS_SCR12FORMAT_FL_PLUGIN} MODULE ${SCR12FORMAT_FL_PLUGIN_SOURCES})
 
 target_link_libraries(${SCRIBUS_SCR12FORMAT_FL_PLUGIN} ${PLUGIN_LIBRARIES})
 
@@ -31,5 +24,3 @@
 	DESTINATION ${PLUGINDIR}
 	PERMISSIONS ${PLUGIN_PERMISSIONS}
 )
-
-# set_target_properties(${SCRIBUS_FONTPREVIEW_PLUGIN} PROPERTIES VERSION "0.0.0")

Modified: trunk/Scribus/scribus/plugins/fileloader/scribus134format/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24494&path=/trunk/Scribus/scribus/plugins/fileloader/scribus134format/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/fileloader/scribus134format/CMakeLists.txt	(original)
+++ trunk/Scribus/scribus/plugins/fileloader/scribus134format/CMakeLists.txt	Wed Feb 17 10:11:25 2021
@@ -1,11 +1,6 @@
 include_directories(
 	${CMAKE_SOURCE_DIR}
 	${CMAKE_SOURCE_DIR}/scribus
-)
-
-set(SCR134FORMAT_FL_PLUGIN_MOC_CLASSES
-	scribus134format.h
-	scribus134formatimpl.h
 )
 
 set(SCR134FORMAT_FL_PLUGIN_SOURCES
@@ -15,9 +10,9 @@
 
 set(SCRIBUS_SCR134FORMAT_FL_PLUGIN "scribus134format")
 
-QT5_WRAP_CPP(SCR134FORMAT_FL_PLUGIN_MOC_SOURCES ${SCR134FORMAT_FL_PLUGIN_MOC_CLASSES})
 
-add_library(${SCRIBUS_SCR134FORMAT_FL_PLUGIN} MODULE ${SCR134FORMAT_FL_PLUGIN_SOURCES} ${SCR134FORMAT_FL_PLUGIN_MOC_SOURCES})
+
+add_library(${SCRIBUS_SCR134FORMAT_FL_PLUGIN} MODULE ${SCR134FORMAT_FL_PLUGIN_SOURCES})
 
 if(WANT_PCH)
 	target_precompile_headers(${SCRIBUS_SCR134FORMAT_FL_PLUGIN} PRIVATE "../../plugins_pch.h")
@@ -30,5 +25,3 @@
 	DESTINATION ${PLUGINDIR}
 	PERMISSIONS ${PLUGIN_PERMISSIONS}
 )
-
-# set_target_properties(${SCRIBUS_FONTPREVIEW_PLUGIN} PROPERTIES VERSION "0.0.0")

Modified: trunk/Scribus/scribus/plugins/fileloader/scribus13format/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24494&path=/trunk/Scribus/scribus/plugins/fileloader/scribus13format/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/fileloader/scribus13format/CMakeLists.txt	(original)
+++ trunk/Scribus/scribus/plugins/fileloader/scribus13format/CMakeLists.txt	Wed Feb 17 10:11:25 2021
@@ -1,11 +1,6 @@
 include_directories(
 	${CMAKE_SOURCE_DIR}
 	${CMAKE_SOURCE_DIR}/scribus
-)
-
-set(SCR13FORMAT_FL_PLUGIN_MOC_CLASSES
-	scribus13format.h
-	scribus13formatimpl.h
 )
 
 set(SCR13FORMAT_FL_PLUGIN_SOURCES
@@ -15,9 +10,9 @@
 
 set(SCRIBUS_SCR13FORMAT_FL_PLUGIN "scribus13format")
 
-QT5_WRAP_CPP(SCR13FORMAT_FL_PLUGIN_MOC_SOURCES ${SCR13FORMAT_FL_PLUGIN_MOC_CLASSES})
 
-add_library(${SCRIBUS_SCR13FORMAT_FL_PLUGIN} MODULE ${SCR13FORMAT_FL_PLUGIN_SOURCES} ${SCR13FORMAT_FL_PLUGIN_MOC_SOURCES})
+
+add_library(${SCRIBUS_SCR13FORMAT_FL_PLUGIN} MODULE ${SCR13FORMAT_FL_PLUGIN_SOURCES})
 
 target_link_libraries(${SCRIBUS_SCR13FORMAT_FL_PLUGIN} ${PLUGIN_LIBRARIES})
 
@@ -30,5 +25,3 @@
 	DESTINATION ${PLUGINDIR}
 	PERMISSIONS ${PLUGIN_PERMISSIONS}
 )
-
-# set_target_properties(${SCRIBUS_FONTPREVIEW_PLUGIN} PROPERTIES VERSION "0.0.0")

Modified: trunk/Scribus/scribus/plugins/fileloader/scribus150format/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24494&path=/trunk/Scribus/scribus/plugins/fileloader/scribus150format/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/fileloader/scribus150format/CMakeLists.txt	(original)
+++ trunk/Scribus/scribus/plugins/fileloader/scribus150format/CMakeLists.txt	Wed Feb 17 10:11:25 2021
@@ -1,11 +1,6 @@
 include_directories(
 	${CMAKE_SOURCE_DIR}
 	${CMAKE_SOURCE_DIR}/scribus
-)
-
-set(SCR150FORMAT_FL_PLUGIN_MOC_CLASSES
-	scribus150format.h
-	scribus150formatimpl.h
 )
 
 set(SCR150FORMAT_FL_PLUGIN_SOURCES
@@ -16,9 +11,9 @@
 
 set(SCRIBUS_SCR150FORMAT_FL_PLUGIN "scribus150format")
 
-QT5_WRAP_CPP(SCR150FORMAT_FL_PLUGIN_MOC_SOURCES ${SCR150FORMAT_FL_PLUGIN_MOC_CLASSES})
 
-add_library(${SCRIBUS_SCR150FORMAT_FL_PLUGIN} MODULE ${SCR150FORMAT_FL_PLUGIN_SOURCES} ${SCR150FORMAT_FL_PLUGIN_MOC_SOURCES})
+
+add_library(${SCRIBUS_SCR150FORMAT_FL_PLUGIN} MODULE ${SCR150FORMAT_FL_PLUGIN_SOURCES})
 
 target_link_libraries(${SCRIBUS_SCR150FORMAT_FL_PLUGIN} ${PLUGIN_LIBRARIES})
 
@@ -31,5 +26,3 @@
 	DESTINATION ${PLUGINDIR}
 	PERMISSIONS ${PLUGIN_PERMISSIONS}
 )
-
-# set_target_properties(${SCRIBUS_FONTPREVIEW_PLUGIN} PROPERTIES VERSION "0.0.0")

Modified: trunk/Scribus/scribus/plugins/fontpreview/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24494&path=/trunk/Scribus/scribus/plugins/fontpreview/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/fontpreview/CMakeLists.txt	(original)
+++ trunk/Scribus/scribus/plugins/fontpreview/CMakeLists.txt	Wed Feb 17 10:11:25 2021
@@ -1,15 +1,6 @@
 include_directories(
 ${CMAKE_SOURCE_DIR}
 ${CMAKE_SOURCE_DIR}/scribus
-)
-
-set(FONTPREVIEW_PLUGIN_UI_SRC
-	fontpreview.ui
-)
-
-set(FONTPREVIEW_PLUGIN_MOC_CLASSES
-	fontpreview.h
-	fontpreviewplugin.h
 )
 
 set(FONTPREVIEW_PLUGIN_SOURCES
@@ -19,10 +10,7 @@
 
 set(SCRIBUS_FONTPREVIEW_PLUGIN "fontpreview")
 
-QT5_WRAP_UI(FONTPREVIEW_PLUGIN_UI_SOURCES ${FONTPREVIEW_PLUGIN_UI_SRC} )
-QT5_WRAP_CPP(FONTPREVIEW_PLUGIN_MOC_SOURCES ${FONTPREVIEW_PLUGIN_MOC_CLASSES})
-
-add_library(${SCRIBUS_FONTPREVIEW_PLUGIN} MODULE ${FONTPREVIEW_PLUGIN_SOURCES} ${FONTPREVIEW_PLUGIN_MOC_SOURCES} ${FONTPREVIEW_PLUGIN_UI_CPP} ${FONTPREVIEW_PLUGIN_UI_SOURCES})
+add_library(${SCRIBUS_FONTPREVIEW_PLUGIN} MODULE ${FONTPREVIEW_PLUGIN_SOURCES})
 
 target_link_libraries(${SCRIBUS_FONTPREVIEW_PLUGIN} ${PLUGIN_LIBRARIES})
 
@@ -35,5 +23,3 @@
 	DESTINATION ${PLUGINDIR}
 	PERMISSIONS ${PLUGIN_PERMISSIONS}
 )
-
-# set_target_properties(${SCRIBUS_FONTPREVIEW_PLUGIN} PROPERTIES VERSION "0.0.0")

Modified: trunk/Scribus/scribus/plugins/gettext/csvim/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24494&path=/trunk/Scribus/scribus/plugins/gettext/csvim/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/gettext/csvim/CMakeLists.txt	(original)
+++ trunk/Scribus/scribus/plugins/gettext/csvim/CMakeLists.txt	Wed Feb 17 10:11:25 2021
@@ -1,11 +1,6 @@
 include_directories(
 	${CMAKE_SOURCE_DIR}
 	${CMAKE_SOURCE_DIR}/scribus
-)
-
-
-set(CSV_GT_PLUGIN_MOC_CLASSES
-	csvdia.h
 )
 
 set(CSV_GT_PLUGIN_SOURCES
@@ -15,9 +10,9 @@
 
 set(SCRIBUS_CSV_GT_PLUGIN "csvim")
 
-QT5_WRAP_CPP(CSV_GT_PLUGIN_MOC_SOURCES ${CSV_GT_PLUGIN_MOC_CLASSES})
 
-add_library(${SCRIBUS_CSV_GT_PLUGIN} MODULE ${CSV_GT_PLUGIN_SOURCES} ${CSV_GT_PLUGIN_MOC_SOURCES})
+
+add_library(${SCRIBUS_CSV_GT_PLUGIN} MODULE ${CSV_GT_PLUGIN_SOURCES})
 
 target_link_libraries(${SCRIBUS_CSV_GT_PLUGIN} ${PLUGIN_LIBRARIES})
 
@@ -30,5 +25,3 @@
 	DESTINATION ${PLUGINDIR}gettext
 	PERMISSIONS ${PLUGIN_PERMISSIONS}
 )
-
-# set_target_properties(${SCRIBUS_FONTPREVIEW_PLUGIN} PROPERTIES VERSION "0.0.0")

Modified: trunk/Scribus/scribus/plugins/gettext/docim/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24494&path=/trunk/Scribus/scribus/plugins/gettext/docim/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/gettext/docim/CMakeLists.txt	(original)
+++ trunk/Scribus/scribus/plugins/gettext/docim/CMakeLists.txt	Wed Feb 17 10:11:25 2021
@@ -1,10 +1,6 @@
 include_directories(
 	${CMAKE_SOURCE_DIR}
 	${CMAKE_SOURCE_DIR}/scribus
-)
-
-set(DOC_GT_PLUGIN_MOC_CLASSES
-	docim.h
 )
 
 set(DOC_GT_PLUGIN_SOURCES
@@ -13,9 +9,7 @@
 
 set(SCRIBUS_DOC_GT_PLUGIN "docim")
 
-QT5_WRAP_CPP(DOC_GT_PLUGIN_MOC_SOURCES ${DOC_GT_PLUGIN_MOC_CLASSES})
-
-add_library(${SCRIBUS_DOC_GT_PLUGIN} MODULE ${DOC_GT_PLUGIN_SOURCES} ${DOC_GT_PLUGIN_MOC_SOURCES})
+add_library(${SCRIBUS_DOC_GT_PLUGIN} MODULE ${DOC_GT_PLUGIN_SOURCES})
 
 target_link_libraries(${SCRIBUS_DOC_GT_PLUGIN} ${PLUGIN_LIBRARIES})
 
@@ -28,5 +22,3 @@
 	DESTINATION ${PLUGINDIR}gettext
 	PERMISSIONS ${PLUGIN_PERMISSIONS}
 )
-
-# set_target_properties(${SCRIBUS_FONTPREVIEW_PLUGIN} PROPERTIES VERSION "0.0.0")

Modified: trunk/Scribus/scribus/plugins/gettext/docxim/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24494&path=/trunk/Scribus/scribus/plugins/gettext/docxim/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/gettext/docxim/CMakeLists.txt	(original)
+++ trunk/Scribus/scribus/plugins/gettext/docxim/CMakeLists.txt	Wed Feb 17 10:11:25 2021
@@ -22,5 +22,3 @@
 	DESTINATION ${PLUGINDIR}gettext
 	PERMISSIONS ${PLUGIN_PERMISSIONS}
 )
-
-# set_target_properties(${SCRIBUS_FONTPREVIEW_PLUGIN} PROPERTIES VERSION "0.0.0")

Modified: trunk/Scribus/scribus/plugins/gettext/htmlim/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24494&path=/trunk/Scribus/scribus/plugins/gettext/htmlim/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/gettext/htmlim/CMakeLists.txt	(original)
+++ trunk/Scribus/scribus/plugins/gettext/htmlim/CMakeLists.txt	Wed Feb 17 10:11:25 2021
@@ -1,10 +1,6 @@
 include_directories(
 	${CMAKE_SOURCE_DIR}
 	${CMAKE_SOURCE_DIR}/scribus
-)
-
-set(HTML_GT_PLUGIN_MOC_CLASSES
-#	htmlim.h
 )
 
 set(HTML_GT_PLUGIN_SOURCES
@@ -14,9 +10,9 @@
 
 set(SCRIBUS_HTML_GT_PLUGIN "htmlim")
 
-QT5_WRAP_CPP(HTML_GT_PLUGIN_MOC_SOURCES ${HTML_GT_PLUGIN_MOC_CLASSES})
 
-add_library(${SCRIBUS_HTML_GT_PLUGIN} MODULE ${HTML_GT_PLUGIN_SOURCES} ${HTML_GT_PLUGIN_MOC_SOURCES})
+
+add_library(${SCRIBUS_HTML_GT_PLUGIN} MODULE ${HTML_GT_PLUGIN_SOURCES})
 
 target_link_libraries(${SCRIBUS_HTML_GT_PLUGIN} ${PLUGIN_LIBRARIES})
 
@@ -29,5 +25,3 @@
 	DESTINATION ${PLUGINDIR}gettext
 	PERMISSIONS ${PLUGIN_PERMISSIONS}
 )
-
-# set_target_properties(${SCRIBUS_FONTPREVIEW_PLUGIN} PROPERTIES VERSION "0.0.0")

Modified: trunk/Scribus/scribus/plugins/gettext/odt2im/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24494&path=/trunk/Scribus/scribus/plugins/gettext/odt2im/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/gettext/odt2im/CMakeLists.txt	(original)
+++ trunk/Scribus/scribus/plugins/gettext/odt2im/CMakeLists.txt	Wed Feb 17 10:11:25 2021
@@ -23,4 +23,3 @@
 	PERMISSIONS ${PLUGIN_PERMISSIONS}
 )
 
-# set_target_properties(${SCRIBUS_FONTPREVIEW_PLUGIN} PROPERTIES VERSION "0.0.0")

Modified: trunk/Scribus/scribus/plugins/gettext/pdbim/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24494&path=/trunk/Scribus/scribus/plugins/gettext/pdbim/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/gettext/pdbim/CMakeLists.txt	(original)
+++ trunk/Scribus/scribus/plugins/gettext/pdbim/CMakeLists.txt	Wed Feb 17 10:11:25 2021
@@ -4,7 +4,7 @@
 )
 
 set(PDB_GT_PLUGIN_SOURCES
-pdbim.cpp
+	pdbim.cpp
 )
 
 set(SCRIBUS_PDB_GT_PLUGIN "pdbim")
@@ -23,4 +23,3 @@
 	PERMISSIONS ${PLUGIN_PERMISSIONS}
 )
 
-# set_target_properties(${SCRIBUS_FONTPREVIEW_PLUGIN} PROPERTIES VERSION "0.0.0")

Modified: trunk/Scribus/scribus/plugins/gettext/rtfim/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24494&path=/trunk/Scribus/scribus/plugins/gettext/rtfim/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/gettext/rtfim/CMakeLists.txt	(original)
+++ trunk/Scribus/scribus/plugins/gettext/rtfim/CMakeLists.txt	Wed Feb 17 10:11:25 2021
@@ -22,5 +22,3 @@
 	DESTINATION ${PLUGINDIR}gettext
 	PERMISSIONS ${PLUGIN_PERMISSIONS}
 )
-
-# set_target_properties(${SCRIBUS_FONTPREVIEW_PLUGIN} PROPERTIES VERSION "0.0.0")

Modified: trunk/Scribus/scribus/plugins/gettext/sxwim/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24494&path=/trunk/Scribus/scribus/plugins/gettext/sxwim/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/gettext/sxwim/CMakeLists.txt	(original)
+++ trunk/Scribus/scribus/plugins/gettext/sxwim/CMakeLists.txt	Wed Feb 17 10:11:25 2021
@@ -1,10 +1,6 @@
 include_directories(
 	${CMAKE_SOURCE_DIR}
 	${CMAKE_SOURCE_DIR}/scribus
-)
-
-set(SXW_IM_PLUGIN_MOC_CLASSES
-	sxwdia.h
 )
 
 set(SXW_IM_PLUGIN_SOURCES
@@ -16,9 +12,7 @@
 
 set(SCRIBUS_SXW_IM_PLUGIN "sxwimplugin")
 
-QT5_WRAP_CPP(SXW_IM_PLUGIN_MOC_SOURCES ${SXW_IM_PLUGIN_MOC_CLASSES})
-
-add_library(${SCRIBUS_SXW_IM_PLUGIN} MODULE ${SXW_IM_PLUGIN_SOURCES} ${SXW_IM_PLUGIN_MOC_SOURCES})
+add_library(${SCRIBUS_SXW_IM_PLUGIN} MODULE ${SXW_IM_PLUGIN_SOURCES})
 
 target_link_libraries(${SCRIBUS_SXW_IM_PLUGIN} ${PLUGIN_LIBRARIES})
 
@@ -31,5 +25,3 @@
 	DESTINATION ${PLUGINDIR}gettext
 	PERMISSIONS ${PLUGIN_PERMISSIONS}
 )
-
-# set_target_properties(${SCRIBUS_FONTPREVIEW_PLUGIN} PROPERTIES VERSION "0.0.0")

Modified: trunk/Scribus/scribus/plugins/gettext/textfilter/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24494&path=/trunk/Scribus/scribus/plugins/gettext/textfilter/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/gettext/textfilter/CMakeLists.txt	(original)
+++ trunk/Scribus/scribus/plugins/gettext/textfilter/CMakeLists.txt	Wed Feb 17 10:11:25 2021
@@ -1,11 +1,6 @@
 include_directories(
 	${CMAKE_SOURCE_DIR}
 	${CMAKE_SOURCE_DIR}/scribus
-)
-
-set(TEXTFILTER_GT_PLUGIN_MOC_CLASSES
-	tffilter.h
-	tfdia.h
 )
 
 set(TEXTFILTER_GT_PLUGIN_SOURCES
@@ -16,9 +11,7 @@
 
 set(SCRIBUS_TEXTFILTER_GT_PLUGIN "textfilterplugin")
 
-QT5_WRAP_CPP(TEXTFILTER_GT_PLUGIN_MOC_SOURCES ${TEXTFILTER_GT_PLUGIN_MOC_CLASSES})
-
-add_library(${SCRIBUS_TEXTFILTER_GT_PLUGIN} MODULE ${TEXTFILTER_GT_PLUGIN_SOURCES} ${TEXTFILTER_GT_PLUGIN_MOC_SOURCES})
+add_library(${SCRIBUS_TEXTFILTER_GT_PLUGIN} MODULE ${TEXTFILTER_GT_PLUGIN_SOURCES})
 
 target_link_libraries(${SCRIBUS_TEXTFILTER_GT_PLUGIN} ${PLUGIN_LIBRARIES})
 
@@ -31,5 +24,3 @@
 DESTINATION ${PLUGINDIR}gettext
 PERMISSIONS ${PLUGIN_PERMISSIONS}
 )
-
-# set_target_properties(${SCRIBUS_FONTPREVIEW_PLUGIN} PROPERTIES VERSION "0.0.0")

Modified: trunk/Scribus/scribus/plugins/import/ai/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24494&path=/trunk/Scribus/scribus/plugins/import/ai/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/import/ai/CMakeLists.txt	(original)
+++ trunk/Scribus/scribus/plugins/import/ai/CMakeLists.txt	Wed Feb 17 10:11:25 2021
@@ -2,6 +2,7 @@
 	${CMAKE_SOURCE_DIR}
 	${CMAKE_SOURCE_DIR}/scribus
 	${PODOFO_INCLUDES}
+	${SCRIBUS_AUTOGEN_INCLUDE_PATH}
 )
 
 if(HAVE_PODOFO)
@@ -10,11 +11,6 @@
 	)
 endif()
 
-set(IMPORTAI_PLUGIN_MOC_CLASSES
-	importai.h
-	importaiplugin.h
-)
-
 set(IMPORTAI_PLUGIN_SOURCES
 	importai.cpp
 	importaiplugin.cpp
@@ -22,9 +18,7 @@
 
 set(SCRIBUS_IMPORTAI_PLUGIN "importai")
 
-QT5_WRAP_CPP(IMPORTAI_PLUGIN_MOC_SOURCES ${IMPORTAI_PLUGIN_MOC_CLASSES})
-
-add_library(${SCRIBUS_IMPORTAI_PLUGIN} MODULE ${IMPORTAI_PLUGIN_SOURCES} ${IMPORTAI_PLUGIN_MOC_SOURCES})
+add_library(${SCRIBUS_IMPORTAI_PLUGIN} MODULE ${IMPORTAI_PLUGIN_SOURCES})
 
 if(WIN32)
 	target_link_libraries(${SCRIBUS_IMPORTAI_PLUGIN}
@@ -54,5 +48,3 @@
 )
 
 add_dependencies(${SCRIBUS_IMPORTAI_PLUGIN} ${EXE_NAME})
-
-# set_target_properties(${SCRIBUS_FONTPREVIEW_PLUGIN} PROPERTIES VERSION "0.0.0")

Modified: trunk/Scribus/scribus/plugins/import/cdr/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24494&path=/trunk/Scribus/scribus/plugins/import/cdr/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/import/cdr/CMakeLists.txt	(original)
+++ trunk/Scribus/scribus/plugins/import/cdr/CMakeLists.txt	Wed Feb 17 10:11:25 2021
@@ -3,12 +3,19 @@
 	pkg_check_modules(LIBCDR libcdr-0.1>=0.1)
 	if (LIBCDR_FOUND)
 		message("Building Corel Draw Importer with librevenge")
-		include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/scribus ${LIBREVENGE_INCLUDE_DIRS} ${LIBREVENGE_GENERATORS_INCLUDE_DIRS} ${LIBREVENGE_STREAM_INCLUDE_DIRS} ${LIBCDR_INCLUDE_DIRS})
-		set(IMPORTCDR_PLUGIN_MOC_CLASSES importcdr.h importcdrplugin.h)
+		include_directories(
+			${CMAKE_SOURCE_DIR}
+			${CMAKE_SOURCE_DIR}/scribus
+			${LIBREVENGE_INCLUDE_DIRS}
+			${LIBREVENGE_GENERATORS_INCLUDE_DIRS}
+			${LIBREVENGE_STREAM_INCLUDE_DIRS}
+			${LIBCDR_INCLUDE_DIRS}
+			${SCRIBUS_AUTOGEN_INCLUDE_PATH}
+			)
 		set(IMPORTCDR_PLUGIN_SOURCES ../revenge/rawpainter.cpp importcdr.cpp importcdrplugin.cpp)
 		set(SCRIBUS_IMPORTCDR_PLUGIN "importcdr")
-		QT5_WRAP_CPP(IMPORTCDR_PLUGIN_MOC_SOURCES ${IMPORTCDR_PLUGIN_MOC_CLASSES})
-		add_library(${SCRIBUS_IMPORTCDR_PLUGIN} MODULE ${IMPORTCDR_PLUGIN_SOURCES} ${IMPORTCDR_PLUGIN_MOC_SOURCES})
+
+		add_library(${SCRIBUS_IMPORTCDR_PLUGIN} MODULE ${IMPORTCDR_PLUGIN_SOURCES})
 		target_link_libraries(${SCRIBUS_IMPORTCDR_PLUGIN} ${PLUGIN_LIBRARIES} ${LIBREVENGE_LDFLAGS} ${LIBREVENGE_GENERATORS_LDFLAGS} ${LIBREVENGE_STREAM_LDFLAGS} ${LIBCDR_LDFLAGS})
 		if(WANT_PCH)
 			target_precompile_headers(${SCRIBUS_IMPORTCDR_PLUGIN} PRIVATE "../../plugins_pch.h")
@@ -25,12 +32,19 @@
 			if (LIBWPD_STREAM_FOUND)
 				pkg_check_modules(LIBCDR libcdr-0.0<=0.1)
 				if (LIBCDR_FOUND)
-					include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/scribus ${LIBWPG_INCLUDE_DIRS} ${LIBWPD_INCLUDE_DIRS} ${LIBWPD_STREAM_INCLUDE_DIRS} ${LIBCDR_INCLUDE_DIRS})
-					set(IMPORTCDR_PLUGIN_MOC_CLASSES importcdr.h importcdrplugin.h)
+					include_directories(
+						${CMAKE_SOURCE_DIR}
+						${CMAKE_SOURCE_DIR}/scribus
+						${LIBWPG_INCLUDE_DIRS}
+						${LIBWPD_INCLUDE_DIRS}
+						${LIBWPD_STREAM_INCLUDE_DIRS}
+						${LIBCDR_INCLUDE_DIRS}
+						${SCRIBUS_AUTOGEN_INCLUDE_PATH}
+						)
 					set(IMPORTCDR_PLUGIN_SOURCES importcdr.cpp importcdrplugin.cpp)
 					set(SCRIBUS_IMPORTCDR_PLUGIN "importcdr")
-					QT5_WRAP_CPP(IMPORTCDR_PLUGIN_MOC_SOURCES ${IMPORTCDR_PLUGIN_MOC_CLASSES})
-					add_library(${SCRIBUS_IMPORTCDR_PLUGIN} MODULE ${IMPORTCDR_PLUGIN_SOURCES} ${IMPORTCDR_PLUGIN_MOC_SOURCES})
+
+					add_library(${SCRIBUS_IMPORTCDR_PLUGIN} MODULE ${IMPORTCDR_PLUGIN_SOURCES})
 					target_link_libraries(${SCRIBUS_IMPORTCDR_PLUGIN} ${PLUGIN_LIBRARIES} ${LIBWPG_LDFLAGS} ${LIBWPD_LDFLAGS} ${LIBWPD_STREAM_LDFLAGS} ${LIBCDR_LDFLAGS})
 					if(WANT_PCH)
 						target_precompile_headers(${SCRIBUS_IMPORTCDR_PLUGIN} PRIVATE "../../plugins_pch.h")

Modified: trunk/Scribus/scribus/plugins/import/cgm/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24494&path=/trunk/Scribus/scribus/plugins/import/cgm/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/import/cgm/CMakeLists.txt	(original)
+++ trunk/Scribus/scribus/plugins/import/cgm/CMakeLists.txt	Wed Feb 17 10:11:25 2021
@@ -1,11 +1,7 @@
 include_directories(
 	${CMAKE_SOURCE_DIR}
 	${CMAKE_SOURCE_DIR}/scribus
-)
-
-set(IMPORTCGM_PLUGIN_MOC_CLASSES
-	importcgm.h
-	importcgmplugin.h
+	${SCRIBUS_AUTOGEN_INCLUDE_PATH}
 )
 
 set(IMPORTCGM_PLUGIN_SOURCES
@@ -15,9 +11,7 @@
 
 set(SCRIBUS_IMPORTCGM_PLUGIN "importcgm")
 
-QT5_WRAP_CPP(IMPORTCGM_PLUGIN_MOC_SOURCES ${IMPORTCGM_PLUGIN_MOC_CLASSES})
-
-add_library(${SCRIBUS_IMPORTCGM_PLUGIN} MODULE ${IMPORTCGM_PLUGIN_SOURCES} ${IMPORTCGM_PLUGIN_MOC_SOURCES})
+add_library(${SCRIBUS_IMPORTCGM_PLUGIN} MODULE ${IMPORTCGM_PLUGIN_SOURCES})
 
 target_link_libraries(${SCRIBUS_IMPORTCGM_PLUGIN} ${PLUGIN_LIBRARIES})
 
@@ -32,5 +26,3 @@
 )
 
 add_dependencies(${SCRIBUS_IMPORTCGM_PLUGIN} ${EXE_NAME})
-
-# set_target_properties(${SCRIBUS_FONTPREVIEW_PLUGIN} PROPERTIES VERSION "0.0.0")

Modified: trunk/Scribus/scribus/plugins/import/cvg/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24494&path=/trunk/Scribus/scribus/plugins/import/cvg/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/import/cvg/CMakeLists.txt	(original)
+++ trunk/Scribus/scribus/plugins/import/cvg/CMakeLists.txt	Wed Feb 17 10:11:25 2021
@@ -1,11 +1,7 @@
 include_directories(
 	${CMAKE_SOURCE_DIR}
 	${CMAKE_SOURCE_DIR}/scribus
-)
-
-set(IMPORTCVG_PLUGIN_MOC_CLASSES
-	importcvg.h
-	importcvgplugin.h
+	${SCRIBUS_AUTOGEN_INCLUDE_PATH}
 )
 
 set(IMPORTCVG_PLUGIN_SOURCES
@@ -15,9 +11,7 @@
 
 set(SCRIBUS_IMPORTCVG_PLUGIN "importcvg")
 
-QT5_WRAP_CPP(IMPORTCVG_PLUGIN_MOC_SOURCES ${IMPORTCVG_PLUGIN_MOC_CLASSES})
-
-add_library(${SCRIBUS_IMPORTCVG_PLUGIN} MODULE ${IMPORTCVG_PLUGIN_SOURCES} ${IMPORTCVG_PLUGIN_MOC_SOURCES})
+add_library(${SCRIBUS_IMPORTCVG_PLUGIN} MODULE ${IMPORTCVG_PLUGIN_SOURCES})
 
 target_link_libraries(${SCRIBUS_IMPORTCVG_PLUGIN} ${PLUGIN_LIBRARIES})
 
@@ -33,4 +27,3 @@
 
 add_dependencies(${SCRIBUS_IMPORTCVG_PLUGIN} ${EXE_NAME})
 
-# set_target_properties(${SCRIBUS_FONTPREVIEW_PLUGIN} PROPERTIES VERSION "0.0.0")

Modified: trunk/Scribus/scribus/plugins/import/drw/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24494&path=/trunk/Scribus/scribus/plugins/import/drw/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/import/drw/CMakeLists.txt	(original)
+++ trunk/Scribus/scribus/plugins/import/drw/CMakeLists.txt	Wed Feb 17 10:11:25 2021
@@ -1,11 +1,7 @@
 include_directories(
 	${CMAKE_SOURCE_DIR}
 	${CMAKE_SOURCE_DIR}/scribus
-)
-
-set(IMPORTDRW_PLUGIN_MOC_CLASSES
-	importdrw.h
-	importdrwplugin.h
+	${SCRIBUS_AUTOGEN_INCLUDE_PATH}
 )
 
 set(IMPORTDRW_PLUGIN_SOURCES
@@ -15,9 +11,7 @@
 
 set(SCRIBUS_IMPORTDRW_PLUGIN "importdrw")
 
-QT5_WRAP_CPP(IMPORTDRW_PLUGIN_MOC_SOURCES ${IMPORTDRW_PLUGIN_MOC_CLASSES})
-
-add_library(${SCRIBUS_IMPORTDRW_PLUGIN} MODULE ${IMPORTDRW_PLUGIN_SOURCES} ${IMPORTDRW_PLUGIN_MOC_SOURCES})
+add_library(${SCRIBUS_IMPORTDRW_PLUGIN} MODULE ${IMPORTDRW_PLUGIN_SOURCES})
 
 target_link_libraries(${SCRIBUS_IMPORTDRW_PLUGIN} ${PLUGIN_LIBRARIES})
 
@@ -33,4 +27,3 @@
 
 add_dependencies(${SCRIBUS_IMPORTDRW_PLUGIN} ${EXE_NAME})
 
-# set_target_properties(${SCRIBUS_FONTPREVIEW_PLUGIN} PROPERTIES VERSION "0.0.0")

Modified: trunk/Scribus/scribus/plugins/import/emf/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24494&path=/trunk/Scribus/scribus/plugins/import/emf/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/import/emf/CMakeLists.txt	(original)
+++ trunk/Scribus/scribus/plugins/import/emf/CMakeLists.txt	Wed Feb 17 10:11:25 2021
@@ -1,11 +1,7 @@
 include_directories(
 	${CMAKE_SOURCE_DIR}
 	${CMAKE_SOURCE_DIR}/scribus
-)
-
-set(IMPORTEMF_PLUGIN_MOC_CLASSES
-	importemf.h
-	importemfplugin.h
+	${SCRIBUS_AUTOGEN_INCLUDE_PATH}
 )
 
 set(IMPORTEMF_PLUGIN_SOURCES
@@ -15,9 +11,7 @@
 
 set(SCRIBUS_IMPORTEMF_PLUGIN "importemf")
 
-QT5_WRAP_CPP(IMPORTEMF_PLUGIN_MOC_SOURCES ${IMPORTEMF_PLUGIN_MOC_CLASSES})
-
-add_library(${SCRIBUS_IMPORTEMF_PLUGIN} MODULE ${IMPORTEMF_PLUGIN_SOURCES} ${IMPORTEMF_PLUGIN_MOC_SOURCES})
+add_library(${SCRIBUS_IMPORTEMF_PLUGIN} MODULE ${IMPORTEMF_PLUGIN_SOURCES})
 
 target_link_libraries(${SCRIBUS_IMPORTEMF_PLUGIN} ${PLUGIN_LIBRARIES})
 

Modified: trunk/Scribus/scribus/plugins/import/fh/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24494&path=/trunk/Scribus/scribus/plugins/import/fh/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/import/fh/CMakeLists.txt	(original)
+++ trunk/Scribus/scribus/plugins/import/fh/CMakeLists.txt	Wed Feb 17 10:11:25 2021
@@ -3,12 +3,19 @@
 	pkg_check_modules(LIBFREEHAND libfreehand-0.1)
 	if (LIBFREEHAND_FOUND)
 		message("Building Freehand Importer with librevenge")
-		include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/scribus ${LIBREVENGE_INCLUDE_DIRS} ${LIBREVENGE_GENERATORS_INCLUDE_DIRS} ${LIBREVENGE_STREAM_INCLUDE_DIRS} ${LIBFREEHAND_INCLUDE_DIRS})
-		set(IMPORTFH_PLUGIN_MOC_CLASSES importfh.h importfhplugin.h)
+		include_directories(
+			${CMAKE_SOURCE_DIR}
+			${CMAKE_SOURCE_DIR}/scribus
+			${LIBREVENGE_INCLUDE_DIRS}
+			${LIBREVENGE_GENERATORS_INCLUDE_DIRS}
+			${LIBREVENGE_STREAM_INCLUDE_DIRS}
+			${LIBFREEHAND_INCLUDE_DIRS}
+			${SCRIBUS_AUTOGEN_INCLUDE_PATH}
+			)
 		set(IMPORTFH_PLUGIN_SOURCES ../revenge/rawpainter.cpp importfh.cpp importfhplugin.cpp)
 		set(SCRIBUS_IMPORTFH_PLUGIN "importfh")
-		QT5_WRAP_CPP(IMPORTFH_PLUGIN_MOC_SOURCES ${IMPORTFH_PLUGIN_MOC_CLASSES})
-		add_library(${SCRIBUS_IMPORTFH_PLUGIN} MODULE ${IMPORTFH_PLUGIN_SOURCES} ${IMPORTFH_PLUGIN_MOC_SOURCES})
+
+		add_library(${SCRIBUS_IMPORTFH_PLUGIN} MODULE ${IMPORTFH_PLUGIN_SOURCES})
 		target_link_libraries(${SCRIBUS_IMPORTFH_PLUGIN} ${PLUGIN_LIBRARIES} ${LIBREVENGE_LDFLAGS} ${LIBREVENGE_GENERATORS_LDFLAGS} ${LIBREVENGE_STREAM_LDFLAGS} ${LIBFREEHAND_LDFLAGS})
 		if(WANT_PCH)
 			target_precompile_headers(${SCRIBUS_IMPORTFH_PLUGIN} PRIVATE "../../plugins_pch.h")

Modified: trunk/Scribus/scribus/plugins/import/idml/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24494&path=/trunk/Scribus/scribus/plugins/import/idml/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/import/idml/CMakeLists.txt	(original)
+++ trunk/Scribus/scribus/plugins/import/idml/CMakeLists.txt	Wed Feb 17 10:11:25 2021
@@ -1,11 +1,7 @@
 include_directories(
 	${CMAKE_SOURCE_DIR}
 	${CMAKE_SOURCE_DIR}/scribus
-)
-
-set(IMPORTIDML_PLUGIN_MOC_CLASSES
-	importidml.h
-	importidmlplugin.h
+	${SCRIBUS_AUTOGEN_INCLUDE_PATH}
 )
 
 set(IMPORTIDML_PLUGIN_SOURCES
@@ -15,9 +11,9 @@
 
 set(SCRIBUS_IMPORTIDML_PLUGIN "importidml")
 
-QT5_WRAP_CPP(IMPORTIDML_PLUGIN_MOC_SOURCES ${IMPORTIDML_PLUGIN_MOC_CLASSES})
 
-add_library(${SCRIBUS_IMPORTIDML_PLUGIN} MODULE ${IMPORTIDML_PLUGIN_SOURCES} ${IMPORTIDML_PLUGIN_MOC_SOURCES})
+
+add_library(${SCRIBUS_IMPORTIDML_PLUGIN} MODULE ${IMPORTIDML_PLUGIN_SOURCES})
 
 target_link_libraries(${SCRIBUS_IMPORTIDML_PLUGIN} ${PLUGIN_LIBRARIES})
 
@@ -32,5 +28,3 @@
 )
 
 add_dependencies(${SCRIBUS_IMPORTIDML_PLUGIN} ${EXE_NAME})
-
-# set_target_properties(${SCRIBUS_FONTPREVIEW_PLUGIN} PROPERTIES VERSION "0.0.0")

Modified: trunk/Scribus/scribus/plugins/import/odg/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24494&path=/trunk/Scribus/scribus/plugins/import/odg/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/import/odg/CMakeLists.txt	(original)
+++ trunk/Scribus/scribus/plugins/import/odg/CMakeLists.txt	Wed Feb 17 10:11:25 2021
@@ -2,11 +2,7 @@
 	${CMAKE_SOURCE_DIR}
 	${CMAKE_SOURCE_DIR}/scribus
 	${ZLIB_INCLUDE_DIR}
-)
-
-set(IMPORTODG_PLUGIN_MOC_CLASSES
-	importodg.h
-	importodgplugin.h
+	${SCRIBUS_AUTOGEN_INCLUDE_PATH}
 )
 
 set(IMPORTODG_PLUGIN_SOURCES
@@ -16,9 +12,7 @@
 
 set(SCRIBUS_IMPORTODG_PLUGIN "importodg")
 
-QT5_WRAP_CPP(IMPORTODG_PLUGIN_MOC_SOURCES ${IMPORTODG_PLUGIN_MOC_CLASSES})
-
-add_library(${SCRIBUS_IMPORTODG_PLUGIN} MODULE ${IMPORTODG_PLUGIN_SOURCES} ${IMPORTODG_PLUGIN_MOC_SOURCES})
+add_library(${SCRIBUS_IMPORTODG_PLUGIN} MODULE ${IMPORTODG_PLUGIN_SOURCES})
 
 link_directories( /usr/local/lib )
 target_link_libraries(${SCRIBUS_IMPORTODG_PLUGIN} ${PLUGIN_LIBRARIES} ${SCRIBUS_ZIP_LIB})
@@ -35,4 +29,3 @@
 
 add_dependencies(${SCRIBUS_IMPORTODG_PLUGIN} ${EXE_NAME})
 
-# set_target_properties(${SCRIBUS_FONTPREVIEW_PLUGIN} PROPERTIES VERSION "0.0.0")

Modified: trunk/Scribus/scribus/plugins/import/oodraw/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24494&path=/trunk/Scribus/scribus/plugins/import/oodraw/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/import/oodraw/CMakeLists.txt	(original)
+++ trunk/Scribus/scribus/plugins/import/oodraw/CMakeLists.txt	Wed Feb 17 10:11:25 2021
@@ -1,10 +1,6 @@
 include_directories(
 	${CMAKE_SOURCE_DIR}
 	${CMAKE_SOURCE_DIR}/scribus
-)
-
-set(OODRAW_FL_PLUGIN_MOC_CLASSES
-	oodrawimp.h
 )
 
 set(OODRAW_FL_PLUGIN_SOURCES
@@ -14,9 +10,7 @@
 
 set(SCRIBUS_OODRAW_FL_PLUGIN "oodrawimp")
 
-QT5_WRAP_CPP(OODRAW_FL_PLUGIN_MOC_SOURCES ${OODRAW_FL_PLUGIN_MOC_CLASSES})
-
-add_library(${SCRIBUS_OODRAW_FL_PLUGIN} MODULE ${OODRAW_FL_PLUGIN_SOURCES} ${OODRAW_FL_PLUGIN_MOC_SOURCES})
+add_library(${SCRIBUS_OODRAW_FL_PLUGIN} MODULE ${OODRAW_FL_PLUGIN_SOURCES})
 
 target_link_libraries(${SCRIBUS_OODRAW_FL_PLUGIN} ${PLUGIN_LIBRARIES})
 
@@ -29,5 +23,3 @@
 	DESTINATION ${PLUGINDIR}
 	PERMISSIONS ${PLUGIN_PERMISSIONS}
 )
-
-# set_target_properties(${SCRIBUS_FONTPREVIEW_PLUGIN} PROPERTIES VERSION "0.0.0")

Modified: trunk/Scribus/scribus/plugins/import/pages/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24494&path=/trunk/Scribus/scribus/plugins/import/pages/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/import/pages/CMakeLists.txt	(original)
+++ trunk/Scribus/scribus/plugins/import/pages/CMakeLists.txt	Wed Feb 17 10:11:25 2021
@@ -7,7 +7,7 @@
 #		set(IMPORTPAGES_PLUGIN_MOC_CLASSES importpages.h importpagesplugin.h)
 #		set(IMPORTPAGES_PLUGIN_SOURCES ../revenge/rawpainter.cpp importpages.cpp importpagesplugin.cpp)
 #		set(IMPORTPAGES_PLUGIN "importpages")
-#		QT5_WRAP_CPP(IMPORTPAGES_PLUGIN_MOC_SOURCES ${IMPORTPAGES_PLUGIN_MOC_CLASSES})
+
 #		add_library(${IMPORTPAGES_PLUGIN} MODULE ${IMPORTPAGES_PLUGIN_SOURCES} ${IMPORTPAGES_PLUGIN_MOC_SOURCES})
 #		target_link_libraries(${IMPORTPAGES_PLUGIN} ${PLUGIN_LIBRARIES} ${LIBREVENGE_LDFLAGS} ${LIBREVENGE_GENERATORS_LDFLAGS} ${LIBREVENGE_STREAM_LDFLAGS} ${LIBETONYEK_LDFLAGS})
 #		install(TARGETS ${IMPORTPAGES_PLUGIN} LIBRARY DESTINATION ${PLUGINDIR} PERMISSIONS ${PLUGIN_PERMISSIONS})
@@ -19,11 +19,7 @@
 	${CMAKE_SOURCE_DIR}
 	${CMAKE_SOURCE_DIR}/scribus
 	${ZLIB_INCLUDE_DIR}
-)
-
-set(IMPORTPAGES_PLUGIN_MOC_CLASSES
-	importpages.h
-	importpagesplugin.h
+	${SCRIBUS_AUTOGEN_INCLUDE_PATH}
 )
 
 set(IMPORTPAGES_PLUGIN_SOURCES
@@ -33,9 +29,7 @@
 
 set(SCRIBUS_IMPORTPAGES_PLUGIN "importpages")
 
-QT5_WRAP_CPP(IMPORTPAGES_PLUGIN_MOC_SOURCES ${IMPORTPAGES_PLUGIN_MOC_CLASSES})
-
-add_library(${SCRIBUS_IMPORTPAGES_PLUGIN} MODULE ${IMPORTPAGES_PLUGIN_SOURCES} ${IMPORTPAGES_PLUGIN_MOC_SOURCES})
+add_library(${SCRIBUS_IMPORTPAGES_PLUGIN} MODULE ${IMPORTPAGES_PLUGIN_SOURCES})
 
 link_directories( /usr/local/lib )
 target_link_libraries(${SCRIBUS_IMPORTPAGES_PLUGIN} ${PLUGIN_LIBRARIES} ${SCRIBUS_ZIP_LIB})

Modified: trunk/Scribus/scribus/plugins/import/pct/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24494&path=/trunk/Scribus/scribus/plugins/import/pct/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/import/pct/CMakeLists.txt	(original)
+++ trunk/Scribus/scribus/plugins/import/pct/CMakeLists.txt	Wed Feb 17 10:11:25 2021
@@ -1,11 +1,7 @@
 include_directories(
 	${CMAKE_SOURCE_DIR}
 	${CMAKE_SOURCE_DIR}/scribus
-)
-
-set(IMPORTPCT_PLUGIN_MOC_CLASSES
-	importpct.h
-	importpctplugin.h
+	${SCRIBUS_AUTOGEN_INCLUDE_PATH}
 )
 
 set(IMPORTPCT_PLUGIN_SOURCES
@@ -15,9 +11,7 @@
 
 set(SCRIBUS_IMPORTPCT_PLUGIN "importpct")
 
-QT5_WRAP_CPP(IMPORTPCT_PLUGIN_MOC_SOURCES ${IMPORTPCT_PLUGIN_MOC_CLASSES})
-
-add_library(${SCRIBUS_IMPORTPCT_PLUGIN} MODULE ${IMPORTPCT_PLUGIN_SOURCES} ${IMPORTPCT_PLUGIN_MOC_SOURCES})
+add_library(${SCRIBUS_IMPORTPCT_PLUGIN} MODULE ${IMPORTPCT_PLUGIN_SOURCES})
 
 target_link_libraries(${SCRIBUS_IMPORTPCT_PLUGIN} ${PLUGIN_LIBRARIES})
 

Modified: trunk/Scribus/scribus/plugins/import/pdf/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24494&path=/trunk/Scribus/scribus/plugins/import/pdf/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/import/pdf/CMakeLists.txt	(original)
+++ trunk/Scribus/scribus/plugins/import/pdf/CMakeLists.txt	Wed Feb 17 10:11:25 2021
@@ -3,27 +3,18 @@
 	${CMAKE_SOURCE_DIR}/scribus
 	${poppler_INCLUDE_DIR}
 	${poppler_CPP_INCLUDE_DIR}
-)
-
-set(IMPORTPDF_PLUGIN_UI_SRC
-	pdfimportoptions.ui
-)
-
-set(IMPORTPDF_PLUGIN_MOC_CLASSES
-	importpdf.h
-	importpdfplugin.h
-	pdfimportoptions.h
+	${SCRIBUS_AUTOGEN_INCLUDE_PATH}
 )
 
 set(IMPORTPDF_PLUGIN_SOURCES
 	importpdf.cpp
-	importpdfplugin.cpp
+	importpdfplugin.cpp
 	pdfimportoptions.cpp
-	pdftextrecognition.cpp
-	slaoutput.cpp
-)
-
-if(HAVE_POPPLER)
+	pdftextrecognition.cpp
+	slaoutput.cpp
+)
+
+if(HAVE_POPPLER)
 	if(HAVE_LCMS1)
 		add_definitions(-DUSE_CMS)
 	endif()
@@ -32,10 +23,7 @@
 
 set(SCRIBUS_IMPORTPDF_PLUGIN "importpdf")
 
-QT5_WRAP_UI(IMPORTPDF_PLUGIN_UI_SOURCES ${IMPORTPDF_PLUGIN_UI_SRC} )
-QT5_WRAP_CPP(IMPORTPDF_PLUGIN_MOC_SOURCES ${IMPORTPDF_PLUGIN_MOC_CLASSES})
-
-add_library(${SCRIBUS_IMPORTPDF_PLUGIN} MODULE ${IMPORTPDF_PLUGIN_SOURCES} ${IMPORTPDF_PLUGIN_MOC_SOURCES} ${IMPORTPDF_PLUGIN_UI_SOURCES})
+add_library(${SCRIBUS_IMPORTPDF_PLUGIN} MODULE ${IMPORTPDF_PLUGIN_SOURCES})
 
 link_directories( /usr/local/lib )
 target_link_libraries(${SCRIBUS_IMPORTPDF_PLUGIN} ${PLUGIN_LIBRARIES} ${poppler_LIBRARY})
@@ -51,5 +39,3 @@
 )
 
 add_dependencies(${SCRIBUS_IMPORTPDF_PLUGIN} ${EXE_NAME})
-
-# set_target_properties(${SCRIBUS_FONTPREVIEW_PLUGIN} PROPERTIES VERSION "0.0.0")

Modified: trunk/Scribus/scribus/plugins/import/pm/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24494&path=/trunk/Scribus/scribus/plugins/import/pm/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/import/pm/CMakeLists.txt	(original)
+++ trunk/Scribus/scribus/plugins/import/pm/CMakeLists.txt	Wed Feb 17 10:11:25 2021
@@ -3,12 +3,19 @@
 	pkg_check_modules(LIBPAGEMAKER libpagemaker-0.0)
 	if (LIBPAGEMAKER_FOUND)
 		message("Building Pagemaker Importer with librevenge")
-		include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/scribus ${LIBREVENGE_INCLUDE_DIRS} ${LIBREVENGE_GENERATORS_INCLUDE_DIRS} ${LIBREVENGE_STREAM_INCLUDE_DIRS} ${LIBPAGEMAKER_INCLUDE_DIRS})
-		set(IMPORTPM_PLUGIN_MOC_CLASSES importpm.h importpmplugin.h)
+		include_directories(
+			${CMAKE_SOURCE_DIR}
+			${CMAKE_SOURCE_DIR}/scribus
+			${LIBREVENGE_INCLUDE_DIRS}
+			${LIBREVENGE_GENERATORS_INCLUDE_DIRS}
+			${LIBREVENGE_STREAM_INCLUDE_DIRS}
+			${LIBPAGEMAKER_INCLUDE_DIRS}
+			${SCRIBUS_AUTOGEN_INCLUDE_PATH}
+			)
 		set(IMPORTPM_PLUGIN_SOURCES ../revenge/rawpainter.cpp importpm.cpp importpmplugin.cpp)
 		set(SCRIBUS_IMPORTPM_PLUGIN "importpm")
-		QT5_WRAP_CPP(IMPORTPM_PLUGIN_MOC_SOURCES ${IMPORTPM_PLUGIN_MOC_CLASSES})
-		add_library(${SCRIBUS_IMPORTPM_PLUGIN} MODULE ${IMPORTPM_PLUGIN_SOURCES} ${IMPORTPM_PLUGIN_MOC_SOURCES})
+
+		add_library(${SCRIBUS_IMPORTPM_PLUGIN} MODULE ${IMPORTPM_PLUGIN_SOURCES})
 		target_link_libraries(${SCRIBUS_IMPORTPM_PLUGIN} ${PLUGIN_LIBRARIES} ${LIBREVENGE_LDFLAGS} ${LIBREVENGE_GENERATORS_LDFLAGS} ${LIBREVENGE_STREAM_LDFLAGS} ${LIBPAGEMAKER_LDFLAGS})
 		if(WANT_PCH)
 			target_precompile_headers(${SCRIBUS_IMPORTPM_PLUGIN} PRIVATE "../../plugins_pch.h")

Modified: trunk/Scribus/scribus/plugins/import/ps/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24494&path=/trunk/Scribus/scribus/plugins/import/ps/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/import/ps/CMakeLists.txt	(original)
+++ trunk/Scribus/scribus/plugins/import/ps/CMakeLists.txt	Wed Feb 17 10:11:25 2021
@@ -10,11 +10,6 @@
 	)
 endif()
 
-set(IMPORTPS_PLUGIN_MOC_CLASSES
-	importps.h
-	importpsplugin.h
-)
-
 set(IMPORTPS_PLUGIN_SOURCES
 	importps.cpp
 	importpsplugin.cpp
@@ -22,9 +17,7 @@
 
 set(SCRIBUS_IMPORTPS_PLUGIN "importps")
 
-QT5_WRAP_CPP(IMPORTPS_PLUGIN_MOC_SOURCES ${IMPORTPS_PLUGIN_MOC_CLASSES})
-
-add_library(${SCRIBUS_IMPORTPS_PLUGIN} MODULE ${IMPORTPS_PLUGIN_SOURCES} ${IMPORTPS_PLUGIN_MOC_SOURCES})
+add_library(${SCRIBUS_IMPORTPS_PLUGIN} MODULE ${IMPORTPS_PLUGIN_SOURCES})
 
 target_link_libraries(${SCRIBUS_IMPORTPS_PLUGIN} ${PLUGIN_LIBRARIES})
 
@@ -50,5 +43,3 @@
 )
 
 add_dependencies(${SCRIBUS_IMPORTPS_PLUGIN} ${EXE_NAME})
-
-# set_target_properties(${SCRIBUS_FONTPREVIEW_PLUGIN} PROPERTIES VERSION "0.0.0")

Modified: trunk/Scribus/scribus/plugins/import/pub/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24494&path=/trunk/Scribus/scribus/plugins/import/pub/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/import/pub/CMakeLists.txt	(original)
+++ trunk/Scribus/scribus/plugins/import/pub/CMakeLists.txt	Wed Feb 17 10:11:25 2021
@@ -3,12 +3,19 @@
 	pkg_check_modules(LIBMSPUB libmspub-0.1>=0.1)
 	if (LIBMSPUB_FOUND)
 		message("Building MS Publisher Importer with librevenge")
-		include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/scribus ${LIBREVENGE_INCLUDE_DIRS} ${LIBREVENGE_GENERATORS_INCLUDE_DIRS} ${LIBREVENGE_STREAM_INCLUDE_DIRS} ${LIBMSPUB_INCLUDE_DIRS})
-		set(IMPORTPUB_PLUGIN_MOC_CLASSES importpub.h importpubplugin.h)
+		include_directories(
+			${CMAKE_SOURCE_DIR}
+			${CMAKE_SOURCE_DIR}/scribus
+			${LIBREVENGE_INCLUDE_DIRS}
+			${LIBREVENGE_GENERATORS_INCLUDE_DIRS}
+			${LIBREVENGE_STREAM_INCLUDE_DIRS}
+			${LIBMSPUB_INCLUDE_DIRS}
+			${SCRIBUS_AUTOGEN_INCLUDE_PATH}
+			)
 		set(IMPORTPUB_PLUGIN_SOURCES ../revenge/rawpainter.cpp importpub.cpp importpubplugin.cpp)
 		set(SCRIBUS_IMPORTPUB_PLUGIN "importpub")
-		QT5_WRAP_CPP(IMPORTPUB_PLUGIN_MOC_SOURCES ${IMPORTPUB_PLUGIN_MOC_CLASSES})
-		add_library(${SCRIBUS_IMPORTPUB_PLUGIN} MODULE ${IMPORTPUB_PLUGIN_SOURCES} ${IMPORTPUB_PLUGIN_MOC_SOURCES})
+
+		add_library(${SCRIBUS_IMPORTPUB_PLUGIN} MODULE ${IMPORTPUB_PLUGIN_SOURCES})
 		target_link_libraries(${SCRIBUS_IMPORTPUB_PLUGIN} ${PLUGIN_LIBRARIES} ${LIBREVENGE_LDFLAGS} ${LIBREVENGE_GENERATORS_LDFLAGS} ${LIBREVENGE_STREAM_LDFLAGS} ${LIBMSPUB_LDFLAGS})
 		if(WANT_PCH)
 			target_precompile_headers(${SCRIBUS_IMPORTPUB_PLUGIN} PRIVATE "../../plugins_pch.h")
@@ -26,12 +33,19 @@
 				pkg_check_modules(LIBWPD_STREAM libwpd-stream-0.9)
 				if (LIBWPD_STREAM_FOUND)
 					message("Building MS Publisher Importer without librevenge")
-					include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/scribus ${LIBWPG_INCLUDE_DIRS} ${LIBWPD_INCLUDE_DIRS} ${LIBWPD_STREAM_INCLUDE_DIRS} ${LIBMSPUB_INCLUDE_DIRS})
-					set(IMPORTPUB_PLUGIN_MOC_CLASSES importpub.h importpubplugin.h)
+					include_directories(
+						${CMAKE_SOURCE_DIR}
+						${CMAKE_SOURCE_DIR}/scribus
+						${LIBWPG_INCLUDE_DIRS}
+						${LIBWPD_INCLUDE_DIRS}
+						${LIBWPD_STREAM_INCLUDE_DIRS}
+						${LIBMSPUB_INCLUDE_DIRS}
+						${SCRIBUS_AUTOGEN_INCLUDE_PATH}
+						)
 					set(IMPORTPUB_PLUGIN_SOURCES ../revenge/rawpainter.cpp importpub.cpp importpubplugin.cpp)
 					set(SCRIBUS_IMPORTPUB_PLUGIN "importpub")
-					QT5_WRAP_CPP(IMPORTPUB_PLUGIN_MOC_SOURCES ${IMPORTPUB_PLUGIN_MOC_CLASSES})
-					add_library(${SCRIBUS_IMPORTPUB_PLUGIN} MODULE ${IMPORTPUB_PLUGIN_SOURCES} ${IMPORTPUB_PLUGIN_MOC_SOURCES})
+
+					add_library(${SCRIBUS_IMPORTPUB_PLUGIN} MODULE ${IMPORTPUB_PLUGIN_SOURCES})
 					target_link_libraries(${SCRIBUS_IMPORTPUB_PLUGIN} ${PLUGIN_LIBRARIES} ${LIBWPG_LDFLAGS} ${LIBWPD_LDFLAGS} ${LIBWPD_STREAM_LDFLAGS} ${LIBMSPUB_LDFLAGS})
 					if(WANT_PCH)
 						target_precompile_headers(${SCRIBUS_IMPORTPUB_PLUGIN} PRIVATE "../../plugins_pch.h")

Modified: trunk/Scribus/scribus/plugins/import/qxp/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24494&path=/trunk/Scribus/scribus/plugins/import/qxp/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/import/qxp/CMakeLists.txt	(original)
+++ trunk/Scribus/scribus/plugins/import/qxp/CMakeLists.txt	Wed Feb 17 10:11:25 2021
@@ -4,11 +4,10 @@
 	if (LIBQXP_FOUND)
 		message("Building QuarkXPress Importer")
 		include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/scribus ${LIBREVENGE_INCLUDE_DIRS} ${LIBREVENGE_GENERATORS_INCLUDE_DIRS} ${LIBREVENGE_STREAM_INCLUDE_DIRS} ${LIBQXP_INCLUDE_DIRS})
-		set(IMPORTQXP_PLUGIN_MOC_CLASSES importqxp.h importqxpplugin.h)
 		set(IMPORTQXP_PLUGIN_SOURCES ../revenge/rawpainter.cpp importqxp.cpp importqxpplugin.cpp)
 		set(SCRIBUS_IMPORTQXP_PLUGIN "importqxp")
-		QT5_WRAP_CPP(IMPORTQXP_PLUGIN_MOC_SOURCES ${IMPORTQXP_PLUGIN_MOC_CLASSES})
-		add_library(${SCRIBUS_IMPORTQXP_PLUGIN} MODULE ${IMPORTQXP_PLUGIN_SOURCES} ${IMPORTQXP_PLUGIN_MOC_SOURCES})
+
+		add_library(${SCRIBUS_IMPORTQXP_PLUGIN} MODULE ${IMPORTQXP_PLUGIN_SOURCES})
 		target_link_libraries(${SCRIBUS_IMPORTQXP_PLUGIN} ${PLUGIN_LIBRARIES} ${LIBREVENGE_LDFLAGS} ${LIBREVENGE_GENERATORS_LDFLAGS} ${LIBREVENGE_STREAM_LDFLAGS} ${LIBQXP_LDFLAGS})
 		if(WANT_PCH)
 			target_precompile_headers(${SCRIBUS_IMPORTQXP_PLUGIN} PRIVATE "../../plugins_pch.h")

Modified: trunk/Scribus/scribus/plugins/import/shape/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24494&path=/trunk/Scribus/scribus/plugins/import/shape/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/import/shape/CMakeLists.txt	(original)
+++ trunk/Scribus/scribus/plugins/import/shape/CMakeLists.txt	Wed Feb 17 10:11:25 2021
@@ -1,11 +1,7 @@
 include_directories(
 	${CMAKE_SOURCE_DIR}
 	${CMAKE_SOURCE_DIR}/scribus
-)
-
-set(IMPORTSHAPE_PLUGIN_MOC_CLASSES
-	importshape.h
-	importshapeplugin.h
+	${SCRIBUS_AUTOGEN_INCLUDE_PATH}
 )
 
 set(IMPORTSHAPE_PLUGIN_SOURCES
@@ -15,9 +11,7 @@
 
 set(SCRIBUS_IMPORTSHAPE_PLUGIN "importshape")
 
-QT5_WRAP_CPP(IMPORTSHAPE_PLUGIN_MOC_SOURCES ${IMPORTSHAPE_PLUGIN_MOC_CLASSES})
-
-add_library(${SCRIBUS_IMPORTSHAPE_PLUGIN} MODULE ${IMPORTSHAPE_PLUGIN_SOURCES} ${IMPORTSHAPE_PLUGIN_MOC_SOURCES})
+add_library(${SCRIBUS_IMPORTSHAPE_PLUGIN} MODULE ${IMPORTSHAPE_PLUGIN_SOURCES})
 
 target_link_libraries(${SCRIBUS_IMPORTSHAPE_PLUGIN} ${PLUGIN_LIBRARIES})
 
@@ -32,5 +26,3 @@
 )
 
 add_dependencies(${SCRIBUS_IMPORTSHAPE_PLUGIN} ${EXE_NAME})
-
-# set_target_properties(${SCRIBUS_FONTPREVIEW_PLUGIN} PROPERTIES VERSION "0.0.0")

Modified: trunk/Scribus/scribus/plugins/import/sml/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24494&path=/trunk/Scribus/scribus/plugins/import/sml/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/import/sml/CMakeLists.txt	(original)
+++ trunk/Scribus/scribus/plugins/import/sml/CMakeLists.txt	Wed Feb 17 10:11:25 2021
@@ -1,11 +1,7 @@
 include_directories(
 	${CMAKE_SOURCE_DIR}
 	${CMAKE_SOURCE_DIR}/scribus
-)
-
-set(IMPORTSML_PLUGIN_MOC_CLASSES
-	importsml.h
-	importsmlplugin.h
+	${SCRIBUS_AUTOGEN_INCLUDE_PATH}
 )
 
 set(IMPORTSML_PLUGIN_SOURCES
@@ -15,9 +11,7 @@
 
 set(SCRIBUS_IMPORTSML_PLUGIN "importsml")
 
-QT5_WRAP_CPP(IMPORTSML_PLUGIN_MOC_SOURCES ${IMPORTSML_PLUGIN_MOC_CLASSES})
-
-add_library(${SCRIBUS_IMPORTSML_PLUGIN} MODULE ${IMPORTSML_PLUGIN_SOURCES} ${IMPORTSML_PLUGIN_MOC_SOURCES})
+add_library(${SCRIBUS_IMPORTSML_PLUGIN} MODULE ${IMPORTSML_PLUGIN_SOURCES})
 
 target_link_libraries(${SCRIBUS_IMPORTSML_PLUGIN} ${PLUGIN_LIBRARIES})
 
@@ -32,5 +26,3 @@
 )
 
 add_dependencies(${SCRIBUS_IMPORTSML_PLUGIN} ${EXE_NAME})
-
-# set_target_properties(${SCRIBUS_FONTPREVIEW_PLUGIN} PROPERTIES VERSION "0.0.0")

Modified: trunk/Scribus/scribus/plugins/import/svg/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24494&path=/trunk/Scribus/scribus/plugins/import/svg/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/import/svg/CMakeLists.txt	(original)
+++ trunk/Scribus/scribus/plugins/import/svg/CMakeLists.txt	Wed Feb 17 10:11:25 2021
@@ -1,11 +1,8 @@
 include_directories(
-${CMAKE_SOURCE_DIR}
+	${CMAKE_SOURCE_DIR}
 	${CMAKE_SOURCE_DIR}/scribus
 	)
 
-set(IMPORTSVG_PLUGIN_MOC_CLASSES
-	svgplugin.h
-)
 
 set(IMPORTSVG_PLUGIN_SOURCES
 	svgplugin.cpp
@@ -13,9 +10,7 @@
 
 set(SCRIBUS_IMPORTSVG_PLUGIN "svgimplugin")
 
-QT5_WRAP_CPP(IMPORTSVG_PLUGIN_MOC_SOURCES ${IMPORTSVG_PLUGIN_MOC_CLASSES})
-
-add_library(${SCRIBUS_IMPORTSVG_PLUGIN} MODULE ${IMPORTSVG_PLUGIN_SOURCES} ${IMPORTSVG_PLUGIN_MOC_SOURCES})
+add_library(${SCRIBUS_IMPORTSVG_PLUGIN} MODULE ${IMPORTSVG_PLUGIN_SOURCES})
 
 target_link_libraries(${SCRIBUS_IMPORTSVG_PLUGIN} ${PLUGIN_LIBRARIES})
 
@@ -30,5 +25,3 @@
 )
 
 add_dependencies(${SCRIBUS_IMPORTSVG_PLUGIN} ${EXE_NAME})
-
-# set_target_properties(${SCRIBUS_FONTPREVIEW_PLUGIN} PROPERTIES VERSION "0.0.0")

Modified: trunk/Scribus/scribus/plugins/import/svm/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24494&path=/trunk/Scribus/scribus/plugins/import/svm/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/import/svm/CMakeLists.txt	(original)
+++ trunk/Scribus/scribus/plugins/import/svm/CMakeLists.txt	Wed Feb 17 10:11:25 2021
@@ -1,11 +1,7 @@
 include_directories(
 	${CMAKE_SOURCE_DIR}
 	${CMAKE_SOURCE_DIR}/scribus
-)
-
-set(IMPORTSVM_PLUGIN_MOC_CLASSES
-	importsvm.h
-	importsvmplugin.h
+	${SCRIBUS_AUTOGEN_INCLUDE_PATH}
 )
 
 set(IMPORTSVM_PLUGIN_SOURCES
@@ -15,9 +11,7 @@
 
 set(SCRIBUS_IMPORTSVM_PLUGIN "importsvm")
 
-QT5_WRAP_CPP(IMPORTSVM_PLUGIN_MOC_SOURCES ${IMPORTSVM_PLUGIN_MOC_CLASSES})
-
-add_library(${SCRIBUS_IMPORTSVM_PLUGIN} MODULE ${IMPORTSVM_PLUGIN_SOURCES} ${IMPORTSVM_PLUGIN_MOC_SOURCES})
+add_library(${SCRIBUS_IMPORTSVM_PLUGIN} MODULE ${IMPORTSVM_PLUGIN_SOURCES})
 
 target_link_libraries(${SCRIBUS_IMPORTSVM_PLUGIN} ${PLUGIN_LIBRARIES})
 

Modified: trunk/Scribus/scribus/plugins/import/uniconvertor/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24494&path=/trunk/Scribus/scribus/plugins/import/uniconvertor/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/import/uniconvertor/CMakeLists.txt	(original)
+++ trunk/Scribus/scribus/plugins/import/uniconvertor/CMakeLists.txt	Wed Feb 17 10:11:25 2021
@@ -1,10 +1,6 @@
 include_directories(
 	${CMAKE_SOURCE_DIR}
 	${CMAKE_SOURCE_DIR}/scribus
-)
-
-set(IMPORTUNICONVERTOR_PLUGIN_MOC_CLASSES
-	uniconvplugin.h
 )
 
 set(IMPORTUNICONVERTOR_PLUGIN_SOURCES
@@ -13,9 +9,7 @@
 
 set(SCRIBUS_IMPORTUNICONVERTOR_PLUGIN "uniconvertorplugin")
 
-QT5_WRAP_CPP(IMPORTUNICONVERTOR_PLUGIN_MOC_SOURCES ${IMPORTUNICONVERTOR_PLUGIN_MOC_CLASSES})
-
-add_library(${SCRIBUS_IMPORTUNICONVERTOR_PLUGIN} MODULE ${IMPORTUNICONVERTOR_PLUGIN_SOURCES} ${IMPORTUNICONVERTOR_PLUGIN_MOC_SOURCES})
+add_library(${SCRIBUS_IMPORTUNICONVERTOR_PLUGIN} MODULE ${IMPORTUNICONVERTOR_PLUGIN_SOURCES})
 
 target_link_libraries(${SCRIBUS_IMPORTUNICONVERTOR_PLUGIN} ${PLUGIN_LIBRARIES})
 
@@ -31,4 +25,3 @@
 
 add_dependencies(${SCRIBUS_IMPORTUNICONVERTOR_PLUGIN} ${EXE_NAME})
 
-# set_target_properties(${SCRIBUS_FONTPREVIEW_PLUGIN} PROPERTIES VERSION "0.0.0")

Modified: trunk/Scribus/scribus/plugins/import/viva/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24494&path=/trunk/Scribus/scribus/plugins/import/viva/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/import/viva/CMakeLists.txt	(original)
+++ trunk/Scribus/scribus/plugins/import/viva/CMakeLists.txt	Wed Feb 17 10:11:25 2021
@@ -1,11 +1,7 @@
 include_directories(
 	${CMAKE_SOURCE_DIR}
 	${CMAKE_SOURCE_DIR}/scribus
-)
-
-set(IMPORTVIVA_PLUGIN_MOC_CLASSES
-	importviva.h
-	importvivaplugin.h
+	${SCRIBUS_AUTOGEN_INCLUDE_PATH}
 )
 
 set(IMPORTVIVA_PLUGIN_SOURCES
@@ -15,9 +11,9 @@
 
 set(SCRIBUS_IMPORTVIVA_PLUGIN "importviva")
 
-QT5_WRAP_CPP(IMPORTVIVA_PLUGIN_MOC_SOURCES ${IMPORTVIVA_PLUGIN_MOC_CLASSES})
 
-add_library(${SCRIBUS_IMPORTVIVA_PLUGIN} MODULE ${IMPORTVIVA_PLUGIN_SOURCES} ${IMPORTVIVA_PLUGIN_MOC_SOURCES})
+
+add_library(${SCRIBUS_IMPORTVIVA_PLUGIN} MODULE ${IMPORTVIVA_PLUGIN_SOURCES})
 
 target_link_libraries(${SCRIBUS_IMPORTVIVA_PLUGIN} ${PLUGIN_LIBRARIES})
 
@@ -32,5 +28,3 @@
 )
 
 add_dependencies(${SCRIBUS_IMPORTVIVA_PLUGIN} ${EXE_NAME})
-
-# set_target_properties(${SCRIBUS_FONTPREVIEW_PLUGIN} PROPERTIES VERSION "0.0.0")

Modified: trunk/Scribus/scribus/plugins/import/vsd/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24494&path=/trunk/Scribus/scribus/plugins/import/vsd/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/import/vsd/CMakeLists.txt	(original)
+++ trunk/Scribus/scribus/plugins/import/vsd/CMakeLists.txt	Wed Feb 17 10:11:25 2021
@@ -3,12 +3,19 @@
 	pkg_check_modules(LIBVISIO libvisio-0.1>=0.1)
 	if (LIBVISIO_FOUND)
 		message("Building MS-Visio Importer with librevenge")
-		include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/scribus ${LIBREVENGE_INCLUDE_DIRS} ${LIBREVENGE_GENERATORS_INCLUDE_DIRS} ${LIBREVENGE_STREAM_INCLUDE_DIRS} ${LIBVISIO_INCLUDE_DIRS})
-		set(IMPORTVSD_PLUGIN_MOC_CLASSES importvsd.h importvsdplugin.h)
+		include_directories(
+			${CMAKE_SOURCE_DIR}
+			${CMAKE_SOURCE_DIR}/scribus
+			${LIBREVENGE_INCLUDE_DIRS}
+			${LIBREVENGE_GENERATORS_INCLUDE_DIRS}
+			${LIBREVENGE_STREAM_INCLUDE_DIRS}
+			${LIBVISIO_INCLUDE_DIRS}
+			${SCRIBUS_AUTOGEN_INCLUDE_PATH}
+			)
 		set(IMPORTVSD_PLUGIN_SOURCES ../revenge/rawpainter.cpp importvsd.cpp importvsdplugin.cpp)
 		set(SCRIBUS_IMPORTVSD_PLUGIN "importvsd")
-		QT5_WRAP_CPP(IMPORTVSD_PLUGIN_MOC_SOURCES ${IMPORTVSD_PLUGIN_MOC_CLASSES})
-		add_library(${SCRIBUS_IMPORTVSD_PLUGIN} MODULE ${IMPORTVSD_PLUGIN_SOURCES} ${IMPORTVSD_PLUGIN_MOC_SOURCES})
+
+		add_library(${SCRIBUS_IMPORTVSD_PLUGIN} MODULE ${IMPORTVSD_PLUGIN_SOURCES})
 		target_link_libraries(${SCRIBUS_IMPORTVSD_PLUGIN} ${PLUGIN_LIBRARIES} ${LIBREVENGE_LDFLAGS} ${LIBREVENGE_GENERATORS_LDFLAGS} ${LIBREVENGE_STREAM_LDFLAGS} ${LIBVISIO_LDFLAGS})
 		if(WANT_PCH)
 			target_precompile_headers(${SCRIBUS_IMPORTVSD_PLUGIN} PRIVATE "../../plugins_pch.h")
@@ -25,12 +32,19 @@
 			if (LIBWPD_STREAM_FOUND)
 				pkg_check_modules(LIBVISIO libvisio-0.0<=0.1)
 				if (LIBVISIO_FOUND)
-					include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/scribus ${LIBWPG_INCLUDE_DIRS} ${LIBWPD_INCLUDE_DIRS} ${LIBWPD_STREAM_INCLUDE_DIRS} ${LIBVISIO_INCLUDE_DIRS})
-					set(IMPORTVSD_PLUGIN_MOC_CLASSES importvsd.h importvsdplugin.h)
+					include_directories(
+						${CMAKE_SOURCE_DIR}
+						${CMAKE_SOURCE_DIR}/scribus
+						${LIBWPG_INCLUDE_DIRS}
+						${LIBWPD_INCLUDE_DIRS}
+						${LIBWPD_STREAM_INCLUDE_DIRS}
+						${LIBVISIO_INCLUDE_DIRS}
+						${SCRIBUS_AUTOGEN_INCLUDE_PATH}
+						)
 					set(IMPORTVSD_PLUGIN_SOURCES ../revenge/rawpainter.cpp importvsd.cpp importvsdplugin.cpp)
 					set(SCRIBUS_IMPORTVSD_PLUGIN "importvsd")
-					QT5_WRAP_CPP(IMPORTVSD_PLUGIN_MOC_SOURCES ${IMPORTVSD_PLUGIN_MOC_CLASSES})
-					add_library(${SCRIBUS_IMPORTVSD_PLUGIN} MODULE ${IMPORTVSD_PLUGIN_SOURCES} ${IMPORTVSD_PLUGIN_MOC_SOURCES})
+
+					add_library(${SCRIBUS_IMPORTVSD_PLUGIN} MODULE ${IMPORTVSD_PLUGIN_SOURCES})
 					target_link_libraries(${SCRIBUS_IMPORTVSD_PLUGIN} ${PLUGIN_LIBRARIES} ${LIBWPG_LDFLAGS} ${LIBWPD_LDFLAGS} ${LIBWPD_STREAM_LDFLAGS} ${LIBVISIO_LDFLAGS})
 					if(WANT_PCH)
 						target_precompile_headers(${SCRIBUS_IMPORTVSD_PLUGIN} PRIVATE "../../plugins_pch.h")

Modified: trunk/Scribus/scribus/plugins/import/wmf/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24494&path=/trunk/Scribus/scribus/plugins/import/wmf/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/import/wmf/CMakeLists.txt	(original)
+++ trunk/Scribus/scribus/plugins/import/wmf/CMakeLists.txt	Wed Feb 17 10:11:25 2021
@@ -1,11 +1,6 @@
 include_directories(
 	${CMAKE_SOURCE_DIR}
 	${CMAKE_SOURCE_DIR}/scribus
-)
-
-set(IMPORTWMF_PLUGIN_MOC_CLASSES
-	wmfimport.h
-	wmfimportplugin.h
 )
 
 set(IMPORTWMF_PLUGIN_SOURCES
@@ -16,9 +11,7 @@
 
 set(SCRIBUS_IMPORTWMF_PLUGIN "wmfimplugin")
 
-QT5_WRAP_CPP(IMPORTWMF_PLUGIN_MOC_SOURCES ${IMPORTWMF_PLUGIN_MOC_CLASSES})
-
-add_library(${SCRIBUS_IMPORTWMF_PLUGIN} MODULE ${IMPORTWMF_PLUGIN_SOURCES} ${IMPORTWMF_PLUGIN_MOC_SOURCES})
+add_library(${SCRIBUS_IMPORTWMF_PLUGIN} MODULE ${IMPORTWMF_PLUGIN_SOURCES})
 
 target_link_libraries(${SCRIBUS_IMPORTWMF_PLUGIN} ${PLUGIN_LIBRARIES})
 

Modified: trunk/Scribus/scribus/plugins/import/wpg/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24494&path=/trunk/Scribus/scribus/plugins/import/wpg/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/import/wpg/CMakeLists.txt	(original)
+++ trunk/Scribus/scribus/plugins/import/wpg/CMakeLists.txt	Wed Feb 17 10:11:25 2021
@@ -1,11 +1,7 @@
 include_directories(
 	${CMAKE_SOURCE_DIR}
 	${CMAKE_SOURCE_DIR}/scribus
-)
-
-set(IMPORTWPG_PLUGIN_MOC_CLASSES
-	importwpg.h
-	importwpgplugin.h
+	${SCRIBUS_AUTOGEN_INCLUDE_PATH}
 )
 
 set(IMPORTWPG_PLUGIN_SOURCES
@@ -13,9 +9,8 @@
 	importwpgplugin.cpp
 )
 set(SCRIBUS_IMPORTWPG_PLUGIN "importwpg")
-QT5_WRAP_CPP(IMPORTWPG_PLUGIN_MOC_SOURCES ${IMPORTWPG_PLUGIN_MOC_CLASSES})
 
-add_library(${SCRIBUS_IMPORTWPG_PLUGIN} MODULE ${IMPORTWPG_PLUGIN_SOURCES} ${IMPORTWPG_PLUGIN_MOC_SOURCES})
+add_library(${SCRIBUS_IMPORTWPG_PLUGIN} MODULE ${IMPORTWPG_PLUGIN_SOURCES})
 target_link_libraries(${SCRIBUS_IMPORTWPG_PLUGIN} ${PLUGIN_LIBRARIES})
 if(WANT_PCH)
 	target_precompile_headers(${SCRIBUS_IMPORTWPG_PLUGIN} PRIVATE "../../plugins_pch.h")

Modified: trunk/Scribus/scribus/plugins/import/xar/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24494&path=/trunk/Scribus/scribus/plugins/import/xar/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/import/xar/CMakeLists.txt	(original)
+++ trunk/Scribus/scribus/plugins/import/xar/CMakeLists.txt	Wed Feb 17 10:11:25 2021
@@ -1,25 +1,17 @@
 include_directories(
 	${CMAKE_SOURCE_DIR}
 	${CMAKE_SOURCE_DIR}/scribus
-)
-
-set(IMPORTXAR_PLUGIN_MOC_CLASSES
-#	qtiocompressor.h
-	importxar.h
-	importxarplugin.h
+	${SCRIBUS_AUTOGEN_INCLUDE_PATH}
 )
 
 set(IMPORTXAR_PLUGIN_SOURCES
-#	qtiocompressor.cpp
 	importxar.cpp
 	importxarplugin.cpp
 )
 
 set(SCRIBUS_IMPORTXAR_PLUGIN "importxar")
 
-QT5_WRAP_CPP(IMPORTXAR_PLUGIN_MOC_SOURCES ${IMPORTXAR_PLUGIN_MOC_CLASSES})
-
-add_library(${SCRIBUS_IMPORTXAR_PLUGIN} MODULE ${IMPORTXAR_PLUGIN_SOURCES} ${IMPORTXAR_PLUGIN_MOC_SOURCES})
+add_library(${SCRIBUS_IMPORTXAR_PLUGIN} MODULE ${IMPORTXAR_PLUGIN_SOURCES})
 
 target_link_libraries(${SCRIBUS_IMPORTXAR_PLUGIN} ${PLUGIN_LIBRARIES})
 

Modified: trunk/Scribus/scribus/plugins/import/xfig/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24494&path=/trunk/Scribus/scribus/plugins/import/xfig/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/import/xfig/CMakeLists.txt	(original)
+++ trunk/Scribus/scribus/plugins/import/xfig/CMakeLists.txt	Wed Feb 17 10:11:25 2021
@@ -1,11 +1,7 @@
 include_directories(
 	${CMAKE_SOURCE_DIR}
 	${CMAKE_SOURCE_DIR}/scribus
-)
-
-set(IMPORTXFIG_PLUGIN_MOC_CLASSES
-	importxfig.h
-	importxfigplugin.h
+	${SCRIBUS_AUTOGEN_INCLUDE_PATH}
 )
 
 set(IMPORTXFIG_PLUGIN_SOURCES
@@ -15,9 +11,7 @@
 
 set(SCRIBUS_IMPORTXFIG_PLUGIN "importxfig")
 
-QT5_WRAP_CPP(IMPORTXFIG_PLUGIN_MOC_SOURCES ${IMPORTXFIG_PLUGIN_MOC_CLASSES})
-
-add_library(${SCRIBUS_IMPORTXFIG_PLUGIN} MODULE ${IMPORTXFIG_PLUGIN_SOURCES} ${IMPORTXFIG_PLUGIN_MOC_SOURCES})
+add_library(${SCRIBUS_IMPORTXFIG_PLUGIN} MODULE ${IMPORTXFIG_PLUGIN_SOURCES})
 
 target_link_libraries(${SCRIBUS_IMPORTXFIG_PLUGIN} ${PLUGIN_LIBRARIES})
 
@@ -32,5 +26,3 @@
 )
 
 add_dependencies(${SCRIBUS_IMPORTXFIG_PLUGIN} ${EXE_NAME})
-
-# set_target_properties(${SCRIBUS_FONTPREVIEW_PLUGIN} PROPERTIES VERSION "0.0.0")

Modified: trunk/Scribus/scribus/plugins/import/xps/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24494&path=/trunk/Scribus/scribus/plugins/import/xps/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/import/xps/CMakeLists.txt	(original)
+++ trunk/Scribus/scribus/plugins/import/xps/CMakeLists.txt	Wed Feb 17 10:11:25 2021
@@ -2,17 +2,7 @@
 	${CMAKE_SOURCE_DIR}
 	${CMAKE_SOURCE_DIR}/scribus
 	${ZLIB_INCLUDE_DIR}
-)
-
-
-set(IMPORTXPS_PLUGIN_UI_SRC
-	xpsimportoptions.ui
-)
-
-set(IMPORTXPS_PLUGIN_MOC_CLASSES
-	importxps.h
-	importxpsplugin.h
-	xpsimportoptions.h
+	${SCRIBUS_AUTOGEN_INCLUDE_PATH}
 )
 
 set(IMPORTXPS_PLUGIN_SOURCES
@@ -23,10 +13,7 @@
 
 set(SCRIBUS_IMPORTXPS_PLUGIN "importxps")
 
-QT5_WRAP_UI(IMPORTXPS_PLUGIN_UI_SOURCES ${IMPORTXPS_PLUGIN_UI_SRC} )
-QT5_WRAP_CPP(IMPORTXPS_PLUGIN_MOC_SOURCES ${IMPORTXPS_PLUGIN_MOC_CLASSES})
-
-add_library(${SCRIBUS_IMPORTXPS_PLUGIN} MODULE ${IMPORTXPS_PLUGIN_SOURCES} ${IMPORTXPS_PLUGIN_MOC_SOURCES} ${IMPORTXPS_PLUGIN_UI_SOURCES})
+add_library(${SCRIBUS_IMPORTXPS_PLUGIN} MODULE ${IMPORTXPS_PLUGIN_SOURCES})
 
 link_directories( /usr/local/lib )
 target_link_libraries(${SCRIBUS_IMPORTXPS_PLUGIN} ${PLUGIN_LIBRARIES} ${SCRIBUS_ZIP_LIB})

Modified: trunk/Scribus/scribus/plugins/import/zmf/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24494&path=/trunk/Scribus/scribus/plugins/import/zmf/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/import/zmf/CMakeLists.txt	(original)
+++ trunk/Scribus/scribus/plugins/import/zmf/CMakeLists.txt	Wed Feb 17 10:11:25 2021
@@ -3,11 +3,17 @@
 	pkg_check_modules(LIBZMF libzmf-0.0)
 	if (LIBZMF_FOUND)
 		message("Building Zoner Draw Importer")
-		include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/scribus ${LIBREVENGE_INCLUDE_DIRS} ${LIBREVENGE_GENERATORS_DIRS} ${LIBREVENGE_STREAM_INCLUDE_DIRS} ${LIBZMF_INCLUDE_DIRS})
-		set(IMPORTZMF_PLUGIN_MOC_CLASSES importzmf.h importzmfplugin.h)
+		include_directories(
+			${CMAKE_SOURCE_DIR}
+			${CMAKE_SOURCE_DIR}/scribus
+			${LIBREVENGE_INCLUDE_DIRS}
+			${LIBREVENGE_GENERATORS_DIRS}
+			${LIBREVENGE_STREAM_INCLUDE_DIRS}
+			${LIBZMF_INCLUDE_DIRS}
+			${SCRIBUS_AUTOGEN_INCLUDE_PATH}
+			)
 		set(IMPORTZMF_PLUGIN_SOURCES ../revenge/rawpainter.cpp importzmf.cpp importzmfplugin.cpp)
 		set(SCRIBUS_IMPORTZMF_PLUGIN "importzmf")
-		QT5_WRAP_CPP(IMPORTZMF_PLUGIN_MOC_SOURCES ${IMPORTZMF_PLUGIN_MOC_CLASSES})
 		add_library(${SCRIBUS_IMPORTZMF_PLUGIN} MODULE ${IMPORTZMF_PLUGIN_SOURCES} ${IMPORTZMF_PLUGIN_MOC_SOURCES})
 		target_link_libraries(${SCRIBUS_IMPORTZMF_PLUGIN} ${PLUGIN_LIBRARIES} ${LIBREVENGE_LDFLAGS} ${LIBREVENGE_GENERATORS_LDFLAGS} ${LIBREVENGE_STREAM_LDFLAGS} ${LIBZMF_LDFLAGS})
 		if(WANT_PCH)

Modified: trunk/Scribus/scribus/plugins/picbrowser/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24494&path=/trunk/Scribus/scribus/plugins/picbrowser/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/picbrowser/CMakeLists.txt	(original)
+++ trunk/Scribus/scribus/plugins/picbrowser/CMakeLists.txt	Wed Feb 17 10:11:25 2021
@@ -1,24 +1,6 @@
 include_directories(
 	${CMAKE_SOURCE_DIR}
 	${CMAKE_SOURCE_DIR}/scribus
-)
-
-set(PICTUREBROWSER_PLUGIN_UI_SRC
-	picturebrowser.ui
-	imagedialog.ui
-)
-
-set(PICTUREBROWSER_PLUGIN_MOC_CLASSES
-	collection.h
-	findimage.h
-	imagedialog.h
-	iview.h
-	loadimage.h
-	multicombobox.h
-	picturebrowserplugin.h
-	picturebrowser.h
-	pictview.h
-	previewimage.h
 )
 
 set(PICTUREBROWSER_PLUGIN_SOURCES
@@ -36,11 +18,8 @@
 
 set(SCRIBUS_PICTUREBROWSER_PLUGIN "picturebrowser")
 
-QT5_WRAP_UI(PICTUREBROWSER_PLUGIN_UI_SOURCES ${PICTUREBROWSER_PLUGIN_UI_SRC} )
-QT5_WRAP_CPP(PICTUREBROWSER_PLUGIN_MOC_SOURCES ${PICTUREBROWSER_PLUGIN_MOC_CLASSES})
 
-add_library(${SCRIBUS_PICTUREBROWSER_PLUGIN} MODULE ${PICTUREBROWSER_PLUGIN_SOURCES}
-${PICTUREBROWSER_PLUGIN_MOC_SOURCES} ${PICTUREBROWSER_PLUGIN_UI_SOURCES})
+add_library(${SCRIBUS_PICTUREBROWSER_PLUGIN} MODULE ${PICTUREBROWSER_PLUGIN_SOURCES})
 
 target_link_libraries(${SCRIBUS_PICTUREBROWSER_PLUGIN} ${PLUGIN_LIBRARIES})
 
@@ -59,5 +38,3 @@
 )
 
 install(FILES collectionsdb.xml DESTINATION ${SHAREDIR}/plugins)
-
-# set_target_properties(${SCRIBUS_FONTPREVIEW_PLUGIN} PROPERTIES VERSION "0.0.0")

Modified: trunk/Scribus/scribus/plugins/saveastemplateplugin/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24494&path=/trunk/Scribus/scribus/plugins/saveastemplateplugin/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/saveastemplateplugin/CMakeLists.txt	(original)
+++ trunk/Scribus/scribus/plugins/saveastemplateplugin/CMakeLists.txt	Wed Feb 17 10:11:25 2021
@@ -1,15 +1,6 @@
 include_directories(
 	${CMAKE_SOURCE_DIR}
 	${CMAKE_SOURCE_DIR}/scribus
-)
-
-set(SAVEASTEMPLATE_PLUGIN_UI_SRC
-	satdialog.ui
-)
-
-set(SAVEASTEMPLATE_PLUGIN_MOC_CLASSES
-	satdialog.h
-	satemplate.h
 )
 
 set(SAVEASTEMPLATE_PLUGIN_SOURCES
@@ -19,11 +10,7 @@
 
 set(SCRIBUS_SAVEASTEMPLATE_PLUGIN "saveastemplateplugin")
 
-QT5_WRAP_UI(SAVEASTEMPLATE_PLUGIN_UI_SOURCES ${SAVEASTEMPLATE_PLUGIN_UI_SRC} )
-QT5_WRAP_CPP(SAVEASTEMPLATE_PLUGIN_MOC_SOURCES ${SAVEASTEMPLATE_PLUGIN_MOC_CLASSES})
-
-add_library(${SCRIBUS_SAVEASTEMPLATE_PLUGIN} MODULE ${SAVEASTEMPLATE_PLUGIN_SOURCES}
-			${SAVEASTEMPLATE_PLUGIN_MOC_SOURCES} ${SAVEASTEMPLATE_PLUGIN_UI_SOURCES})
+add_library(${SCRIBUS_SAVEASTEMPLATE_PLUGIN} MODULE ${SAVEASTEMPLATE_PLUGIN_SOURCES})
 
 target_link_libraries(${SCRIBUS_SAVEASTEMPLATE_PLUGIN} ${PLUGIN_LIBRARIES})
 
@@ -36,5 +23,3 @@
 	DESTINATION ${PLUGINDIR}
 	PERMISSIONS ${PLUGIN_PERMISSIONS}
 )
-
-# set_target_properties(${SCRIBUS_FONTPREVIEW_PLUGIN} PROPERTIES VERSION "0.0.0")

Modified: trunk/Scribus/scribus/plugins/scripter/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24494&path=/trunk/Scribus/scribus/plugins/scripter/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/scripter/CMakeLists.txt	(original)
+++ trunk/Scribus/scribus/plugins/scripter/CMakeLists.txt	Wed Feb 17 10:11:25 2021
@@ -2,24 +2,9 @@
 ${CMAKE_SOURCE_DIR}
 ${CMAKE_SOURCE_DIR}/scribus
 ${PYTHON_INCLUDE_PATH}
+${SCRIBUS_AUTOGEN_INCLUDE_PATH}
 )
 
-set(SCRIPTER_PLUGIN_MOC_CLASSES
-scripter.h
-scripterimpl.h
-api_prefs.h
-api_imageitem.h
-api_item.h
-api_textitem.h
-api_printer.h
-api_imageexport.h
-api_layer.h
-api_page.h
-api_dialogs.h
-api_window.h
-api_document.h
-api_color.h
-)
 
 set(SCRIPTER_PLUGIN_SOURCES
 scripter.cpp
@@ -40,23 +25,9 @@
 utils.cpp
 )
 
-
-#set(PYTHONIZE "pythonize")
-#set(PYTHONIZE_SOURCES "pythonize.cpp")
-#add_library(${PYTHONIZE} SHARED ${PYTHONIZE_SOURCES})
-#target_link_libraries(${PYTHONIZE} ${PYTHON_LIBRARIES})
-#install(TARGETS ${PYTHONIZE}
-#  LIBRARY
-#  DESTINATION ${PLUGINDIR}
-#  PERMISSIONS ${PLUGIN_PERMISSIONS}
-#)
-
-
 set(SCRIBUS_SCRIPTER_PLUGIN "scripter")
 
-QT5_WRAP_CPP(SCRIPTER_PLUGIN_MOC_SOURCES ${SCRIPTER_PLUGIN_MOC_CLASSES})
-
-add_library(${SCRIBUS_SCRIPTER_PLUGIN} MODULE ${SCRIPTER_PLUGIN_SOURCES} ${SCRIPTER_PLUGIN_MOC_SOURCES})
+add_library(${SCRIBUS_SCRIPTER_PLUGIN} MODULE ${SCRIPTER_PLUGIN_SOURCES})
 
 target_link_libraries(${SCRIBUS_SCRIPTER_PLUGIN}
   ${PYTHON_LIBRARIES}

Modified: trunk/Scribus/scribus/plugins/scriptplugin/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24494&path=/trunk/Scribus/scribus/plugins/scriptplugin/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/scriptplugin/CMakeLists.txt	(original)
+++ trunk/Scribus/scribus/plugins/scriptplugin/CMakeLists.txt	Wed Feb 17 10:11:25 2021
@@ -9,20 +9,6 @@
 	add_subdirectory(samples)
 endif ()
 add_subdirectory(scripts)
-
-set(SCRIPTER_PLUGIN_UI_SRC
-	pconsole.ui
-	runscriptdialog.ui
-	prefs_scripterbase.ui
-)
-
-set(SCRIPTER_PLUGIN_MOC_CLASSES
-	pconsole.h
-	scriptplugin.h
-	scriptercore.h
-	runscriptdialog.h
-	prefs_scripter.h
-)
 
 set(SCRIPTER_PLUGIN_SOURCES
 	cmdannotations.cpp
@@ -55,13 +41,8 @@
 
 set(SCRIBUS_SCRIPTER_PLUGIN "scriptplugin")
 
-QT5_WRAP_UI(SCRIPTER_PLUGIN_UI_SOURCES ${SCRIPTER_PLUGIN_UI_SRC} )
-QT5_WRAP_CPP(SCRIPTER_PLUGIN_MOC_SOURCES ${SCRIPTER_PLUGIN_MOC_CLASSES})
-
 add_library(${SCRIBUS_SCRIPTER_PLUGIN} MODULE 
 	${SCRIPTER_PLUGIN_SOURCES}
-	${SCRIPTER_PLUGIN_MOC_SOURCES}
-	${SCRIPTER_PLUGIN_UI_SOURCES}
 )
 
 target_link_libraries(${SCRIBUS_SCRIPTER_PLUGIN}
@@ -81,5 +62,3 @@
 )
 
 add_dependencies(${SCRIBUS_SCRIPTER_PLUGIN} ${EXE_NAME})
-
-# set_target_properties(${SCRIBUS_SCRIPTER_PLUGIN} PROPERTIES VERSION "0.0.0")

Modified: trunk/Scribus/scribus/plugins/scriptplugin_py2x/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24494&path=/trunk/Scribus/scribus/plugins/scriptplugin_py2x/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/scriptplugin_py2x/CMakeLists.txt	(original)
+++ trunk/Scribus/scribus/plugins/scriptplugin_py2x/CMakeLists.txt	Wed Feb 17 10:11:25 2021
@@ -2,6 +2,7 @@
 	${CMAKE_SOURCE_DIR}
 	${CMAKE_SOURCE_DIR}/scribus
 	${Python2_INCLUDE_DIRS}
+	${SCRIBUS_AUTOGEN_INCLUDE_PATH}
 )
 
 # Gentoo has an option for no examples. Let's make the ebuild simpler and open up the option to others, but leave as a default for us
@@ -9,20 +10,6 @@
 	add_subdirectory(samples)
 endif ()
 add_subdirectory(scripts)
-
-set(SCRIPTER_PLUGIN_UI_SRC
-	pconsole.ui
-	runscriptdialog.ui
-	prefs_scripterbase.ui
-)
-
-set(SCRIPTER_PLUGIN_MOC_CLASSES
-	pconsole.h
-	scriptplugin.h
-	scriptercore.h
-	runscriptdialog.h
-	prefs_scripter.h
-)
 
 set(SCRIPTER_PLUGIN_SOURCES
 	cmdannotations.cpp
@@ -55,14 +42,9 @@
 
 set(SCRIBUS_SCRIPTER_PLUGIN "scriptplugin_py2x")
 
-QT5_WRAP_UI(SCRIPTER_PLUGIN_UI_SOURCES ${SCRIPTER_PLUGIN_UI_SRC} )
-QT5_WRAP_CPP(SCRIPTER_PLUGIN_MOC_SOURCES ${SCRIPTER_PLUGIN_MOC_CLASSES})
-
 add_library(${SCRIBUS_SCRIPTER_PLUGIN} MODULE 
 	${SCRIPTER_PLUGIN_SOURCES}
-	${SCRIPTER_PLUGIN_MOC_SOURCES}
-	${SCRIPTER_PLUGIN_UI_SOURCES}
-)
+	)
 
 target_link_libraries(${SCRIBUS_SCRIPTER_PLUGIN}
 	${Python2_LIBRARIES}
@@ -82,5 +64,3 @@
 )
 
 add_dependencies(${SCRIBUS_SCRIPTER_PLUGIN} ${EXE_NAME})
-
-# set_target_properties(${SCRIBUS_SCRIPTER_PLUGIN} PROPERTIES VERSION "0.0.0")

Modified: trunk/Scribus/scribus/plugins/shapes/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24494&path=/trunk/Scribus/scribus/plugins/shapes/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/shapes/CMakeLists.txt	(original)
+++ trunk/Scribus/scribus/plugins/shapes/CMakeLists.txt	Wed Feb 17 10:11:25 2021
@@ -1,11 +1,6 @@
 include_directories(
 	${CMAKE_SOURCE_DIR}
 	${CMAKE_SOURCE_DIR}/scribus
-)
-
-set(SHAPE_PLUGIN_MOC_CLASSES
-	shapepalette.h
-	shapeplugin.h
 )
 
 set(SHAPE_PLUGIN_SOURCES
@@ -15,11 +10,10 @@
 
 set(SCRIBUS_SHAPE_PLUGIN "shapeplugin")
 
-QT5_WRAP_CPP(SHAPE_PLUGIN_MOC_SOURCES ${SHAPE_PLUGIN_MOC_CLASSES})
+
 
 add_library(${SCRIBUS_SHAPE_PLUGIN} MODULE
 	${SHAPE_PLUGIN_SOURCES}
-	${SHAPE_PLUGIN_MOC_SOURCES}
 )
 
 target_link_libraries(${SCRIBUS_SHAPE_PLUGIN} ${PLUGIN_LIBRARIES})

Modified: trunk/Scribus/scribus/plugins/short-words/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24494&path=/trunk/Scribus/scribus/plugins/short-words/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/short-words/CMakeLists.txt	(original)
+++ trunk/Scribus/scribus/plugins/short-words/CMakeLists.txt	Wed Feb 17 10:11:25 2021
@@ -1,20 +1,7 @@
 include_directories(
 	${CMAKE_SOURCE_DIR}
 	${CMAKE_SOURCE_DIR}/scribus
-)
-
-set(SHORTWORDS_PLUGIN_UI_SRC
-	swdialog.ui
-	prefs_shortwordsbase.ui
-)
-
-set(SHORTWORDS_PLUGIN_MOC_CLASSES
-	configuration.h
-	parse.h
-	prefs_shortwords.h
-	shortwords.h
-	swdialog.h
-	swsyntaxhighlighter.h
+	${SCRIBUS_AUTOGEN_INCLUDE_PATH}
 )
 
 set(SHORTWORDS_PLUGIN_SOURCES
@@ -28,13 +15,8 @@
 
 set(SCRIBUS_SHORTWORDS_PLUGIN "scribusshortwords")
 
-QT5_WRAP_UI(SHORTWORDS_PLUGIN_UI_SOURCES ${SHORTWORDS_PLUGIN_UI_SRC} )
-QT5_WRAP_CPP(SHORTWORDS_PLUGIN_MOC_SOURCES ${SHORTWORDS_PLUGIN_MOC_CLASSES})
-
 add_library(${SCRIBUS_SHORTWORDS_PLUGIN} MODULE
 	${SHORTWORDS_PLUGIN_SOURCES}
-	${SHORTWORDS_PLUGIN_MOC_SOURCES}
-	${SHORTWORDS_PLUGIN_UI_SOURCES}
 )
 
 target_link_libraries(${SCRIBUS_SHORTWORDS_PLUGIN} ${PLUGIN_LIBRARIES})
@@ -54,5 +36,3 @@
 )
 
 add_dependencies(${SCRIBUS_SHORTWORDS_PLUGIN} ${EXE_NAME})
-
-# set_target_properties(${SCRIBUS_FONTPREVIEW_PLUGIN} PROPERTIES VERSION "0.0.0")

Modified: trunk/Scribus/scribus/plugins/tools/2geomtools/meshdistortion/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24494&path=/trunk/Scribus/scribus/plugins/tools/2geomtools/meshdistortion/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/tools/2geomtools/meshdistortion/CMakeLists.txt	(original)
+++ trunk/Scribus/scribus/plugins/tools/2geomtools/meshdistortion/CMakeLists.txt	Wed Feb 17 10:11:25 2021
@@ -1,15 +1,6 @@
 include_directories(
 	${CMAKE_SOURCE_DIR}
 	${CMAKE_SOURCE_DIR}/scribus
-)
-
-set(MESHDISTORTION_PLUGIN_UI_SRC
-	meshdistortiondialog.ui
-)
-
-set(MESHDISTORTION_PLUGIN_MOC_CLASSES
-	meshdistortiondialog.h
-	meshdistortion.h
 )
 
 set(MESHDISTORTION_PLUGIN_SOURCES
@@ -19,10 +10,7 @@
 
 set(SCRIBUS_MESHDISTORTION_PLUGIN "meshdistortion")
 
-QT5_WRAP_UI(MESHDISTORTION_PLUGIN_UI_SOURCES ${MESHDISTORTION_PLUGIN_UI_SRC} )
-QT5_WRAP_CPP(MESHDISTORTION_PLUGIN_MOC_SOURCES ${MESHDISTORTION_PLUGIN_MOC_CLASSES})
-
-add_library(${SCRIBUS_MESHDISTORTION_PLUGIN} MODULE ${MESHDISTORTION_PLUGIN_SOURCES} ${MESHDISTORTION_PLUGIN_MOC_SOURCES} ${MESHDISTORTION_PLUGIN_UI_CPP} ${MESHDISTORTION_PLUGIN_UI_SOURCES})
+add_library(${SCRIBUS_MESHDISTORTION_PLUGIN} MODULE ${MESHDISTORTION_PLUGIN_SOURCES})
 
 target_link_libraries(${SCRIBUS_MESHDISTORTION_PLUGIN} ${PLUGIN_LIBRARIES} ${SCRIBUS_2GEOM_LIB})
 

Modified: trunk/Scribus/scribus/plugins/tools/2geomtools/pathalongpath/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24494&path=/trunk/Scribus/scribus/plugins/tools/2geomtools/pathalongpath/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/tools/2geomtools/pathalongpath/CMakeLists.txt	(original)
+++ trunk/Scribus/scribus/plugins/tools/2geomtools/pathalongpath/CMakeLists.txt	Wed Feb 17 10:11:25 2021
@@ -1,15 +1,6 @@
 include_directories(
 	${CMAKE_SOURCE_DIR}
 	${CMAKE_SOURCE_DIR}/scribus
-)
-
-set(PATHALONGPATH_PLUGIN_UI_SRC
-	pathdialogbase.ui
-)
-
-set(PATHALONGPATH_PLUGIN_MOC_CLASSES
-	pathdialog.h
-	pathalongpath.h
 )
 
 set(PATHALONGPATH_PLUGIN_SOURCES
@@ -19,10 +10,7 @@
 
 set(SCRIBUS_PATHALONGPATH_PLUGIN "pathalongpath")
 
-QT5_WRAP_UI(PATHALONGPATH_PLUGIN_UI_SOURCES ${PATHALONGPATH_PLUGIN_UI_SRC} )
-QT5_WRAP_CPP(PATHALONGPATH_PLUGIN_MOC_SOURCES ${PATHALONGPATH_PLUGIN_MOC_CLASSES})
-
-add_library(${SCRIBUS_PATHALONGPATH_PLUGIN} MODULE ${PATHALONGPATH_PLUGIN_SOURCES} ${PATHALONGPATH_PLUGIN_MOC_SOURCES} ${PATHALONGPATH_PLUGIN_UI_CPP} ${PATHALONGPATH_PLUGIN_UI_SOURCES})
+add_library(${SCRIBUS_PATHALONGPATH_PLUGIN} MODULE ${PATHALONGPATH_PLUGIN_SOURCES})
 
 target_link_libraries(${SCRIBUS_PATHALONGPATH_PLUGIN} ${PLUGIN_LIBRARIES} ${SCRIBUS_2GEOM_LIB})
 

Modified: trunk/Scribus/scribus/plugins/tools/flattenpath/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24494&path=/trunk/Scribus/scribus/plugins/tools/flattenpath/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/tools/flattenpath/CMakeLists.txt	(original)
+++ trunk/Scribus/scribus/plugins/tools/flattenpath/CMakeLists.txt	Wed Feb 17 10:11:25 2021
@@ -1,10 +1,6 @@
 include_directories(
 	${CMAKE_SOURCE_DIR}
 	${CMAKE_SOURCE_DIR}/scribus
-)
-
-set(FLATTENPATH_PLUGIN_MOC_CLASSES
-	flattenpath.h
 )
 
 set(FLATTENPATH_PLUGIN_SOURCES
@@ -13,9 +9,7 @@
 
 set(SCRIBUS_FLATTENPATH_PLUGIN "flattenpath")
 
-QT5_WRAP_CPP(FLATTENPATH_PLUGIN_MOC_SOURCES ${FLATTENPATH_PLUGIN_MOC_CLASSES})
-
-add_library(${SCRIBUS_FLATTENPATH_PLUGIN} MODULE ${FLATTENPATH_PLUGIN_SOURCES} ${FLATTENPATH_PLUGIN_MOC_SOURCES})
+add_library(${SCRIBUS_FLATTENPATH_PLUGIN} MODULE ${FLATTENPATH_PLUGIN_SOURCES})
 
 target_link_libraries(${SCRIBUS_FLATTENPATH_PLUGIN} ${PLUGIN_LIBRARIES})
 

Modified: trunk/Scribus/scribus/plugins/tools/hunspellcheck/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24494&path=/trunk/Scribus/scribus/plugins/tools/hunspellcheck/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/tools/hunspellcheck/CMakeLists.txt	(original)
+++ trunk/Scribus/scribus/plugins/tools/hunspellcheck/CMakeLists.txt	Wed Feb 17 10:11:25 2021
@@ -2,16 +2,6 @@
 	${CMAKE_SOURCE_DIR}
 	${CMAKE_SOURCE_DIR}/scribus
 	${hunspell_INCLUDE_DIR}
-)
-
-set(HUNSPELL_PLUGIN_UI_SRC
-	hunspelldialogbase.ui
-)
-
-set(HUNSPELL_PLUGIN_MOC_CLASSES
-	hunspelldialog.h
-	hunspellplugin.h
-	hunspellpluginimpl.h
 )
 
 set(HUNSPELL_PLUGIN_SOURCES
@@ -23,14 +13,9 @@
 
 set(SCRIBUS_HUNSPELL_PLUGIN "hunspellplugin")
 
-QT5_WRAP_UI(HUNSPELL_PLUGIN_UI_SOURCES ${HUNSPELL_PLUGIN_UI_SRC} )
-QT5_WRAP_CPP(HUNSPELL_PLUGIN_MOC_SOURCES ${HUNSPELL_PLUGIN_MOC_CLASSES})
-
 
 add_library(${SCRIBUS_HUNSPELL_PLUGIN} MODULE
 	${HUNSPELL_PLUGIN_SOURCES}
-	${HUNSPELL_PLUGIN_MOC_SOURCES}
-	${HUNSPELL_PLUGIN_UI_SOURCES}
 )
 
 target_link_libraries(${SCRIBUS_HUNSPELL_PLUGIN} ${hunspell_LIBRARIES} ${PLUGIN_LIBRARIES})
@@ -46,6 +31,3 @@
 )
 
 add_dependencies(${SCRIBUS_HUNSPELL_PLUGIN} ${EXE_NAME})
-
-# set_target_properties(${SCRIBUS_ASPELL_PLUGIN} PROPERTIES VERSION "0.0.1")
-

Modified: trunk/Scribus/scribus/plugins/tools/lenseffects/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24494&path=/trunk/Scribus/scribus/plugins/tools/lenseffects/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/tools/lenseffects/CMakeLists.txt	(original)
+++ trunk/Scribus/scribus/plugins/tools/lenseffects/CMakeLists.txt	Wed Feb 17 10:11:25 2021
@@ -1,15 +1,6 @@
 include_directories(
 	${CMAKE_SOURCE_DIR}
 	${CMAKE_SOURCE_DIR}/scribus
-)
-
-set(LENSEFFECTS_PLUGIN_UI_SRC
-	lensdialogbase.ui
-)
-
-set(LENSEFFECTS_PLUGIN_MOC_CLASSES
-	lensdialog.h
-	lenseffects.h
 )
 
 set(LENSEFFECTS_PLUGIN_SOURCES
@@ -19,10 +10,7 @@
 
 set(SCRIBUS_LENSEFFECTS_PLUGIN "lenseffects")
 
-QT5_WRAP_UI(LENSEFFECTS_PLUGIN_UI_SOURCES ${LENSEFFECTS_PLUGIN_UI_SRC} )
-QT5_WRAP_CPP(LENSEFFECTS_PLUGIN_MOC_SOURCES ${LENSEFFECTS_PLUGIN_MOC_CLASSES})
-
-add_library(${SCRIBUS_LENSEFFECTS_PLUGIN} MODULE ${LENSEFFECTS_PLUGIN_SOURCES} ${LENSEFFECTS_PLUGIN_MOC_SOURCES} ${LENSEFFECTS_PLUGIN_UI_CPP} ${LENSEFFECTS_PLUGIN_UI_SOURCES})
+add_library(${SCRIBUS_LENSEFFECTS_PLUGIN} MODULE ${LENSEFFECTS_PLUGIN_SOURCES})
 
 target_link_libraries(${SCRIBUS_LENSEFFECTS_PLUGIN} ${PLUGIN_LIBRARIES})
 
@@ -35,5 +23,3 @@
 	DESTINATION ${PLUGINDIR}
 	PERMISSIONS ${PLUGIN_PERMISSIONS}
 )
-
-# set_target_properties(${SCRIBUS_COLORWHEEL_PLUGIN} PROPERTIES VERSION "0.0.0")

Modified: trunk/Scribus/scribus/plugins/tools/pathconnect/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24494&path=/trunk/Scribus/scribus/plugins/tools/pathconnect/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/tools/pathconnect/CMakeLists.txt	(original)
+++ trunk/Scribus/scribus/plugins/tools/pathconnect/CMakeLists.txt	Wed Feb 17 10:11:25 2021
@@ -1,15 +1,6 @@
 include_directories(
 	${CMAKE_SOURCE_DIR}
 	${CMAKE_SOURCE_DIR}/scribus
-)
-
-set(PATHCONNECT_PLUGIN_UI_SRC
-	pathconnectdialogbase.ui
-)
-
-set(PATHCONNECT_PLUGIN_MOC_CLASSES
-	pathconnectdialog.h
-	pathconnect.h
 )
 
 set(PATHCONNECT_PLUGIN_SOURCES
@@ -19,10 +10,7 @@
 
 set(SCRIBUS_PATHCONNECT_PLUGIN "pathconnect")
 
-QT5_WRAP_UI(PATHCONNECT_PLUGIN_UI_SOURCES ${PATHCONNECT_PLUGIN_UI_SRC} )
-QT5_WRAP_CPP(PATHCONNECT_PLUGIN_MOC_SOURCES ${PATHCONNECT_PLUGIN_MOC_CLASSES})
-
-add_library(${SCRIBUS_PATHCONNECT_PLUGIN} MODULE ${PATHCONNECT_PLUGIN_SOURCES} ${PATHCONNECT_PLUGIN_MOC_SOURCES} ${PATHCONNECT_PLUGIN_UI_CPP} ${PATHCONNECT_PLUGIN_UI_SOURCES})
+add_library(${SCRIBUS_PATHCONNECT_PLUGIN} MODULE ${PATHCONNECT_PLUGIN_SOURCES})
 
 target_link_libraries(${SCRIBUS_PATHCONNECT_PLUGIN} ${PLUGIN_LIBRARIES})
 

Modified: trunk/Scribus/scribus/plugins/tools/pathcut/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24494&path=/trunk/Scribus/scribus/plugins/tools/pathcut/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/tools/pathcut/CMakeLists.txt	(original)
+++ trunk/Scribus/scribus/plugins/tools/pathcut/CMakeLists.txt	Wed Feb 17 10:11:25 2021
@@ -8,19 +8,15 @@
 	DESTINATION ${ICONDIR}/1_5_1/
 )
 
-set(PATHCUT_PLUGIN_MOC_CLASSES
-	pathcut.h
-)
-
 set(PATHCUT_PLUGIN_SOURCES
 	pathcut.cpp
 )
 
 set(SCRIBUS_PATHCUT_PLUGIN "pathcut")
 
-QT5_WRAP_CPP(PATHCUT_PLUGIN_MOC_SOURCES ${PATHCUT_PLUGIN_MOC_CLASSES})
 
-add_library(${SCRIBUS_PATHCUT_PLUGIN} MODULE ${PATHCUT_PLUGIN_SOURCES} ${PATHCUT_PLUGIN_MOC_SOURCES})
+
+add_library(${SCRIBUS_PATHCUT_PLUGIN} MODULE ${PATHCUT_PLUGIN_SOURCES})
 
 target_link_libraries(${SCRIBUS_PATHCUT_PLUGIN} ${PLUGIN_LIBRARIES})
 

Modified: trunk/Scribus/scribus/plugins/tools/pathfinder/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24494&path=/trunk/Scribus/scribus/plugins/tools/pathfinder/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/tools/pathfinder/CMakeLists.txt	(original)
+++ trunk/Scribus/scribus/plugins/tools/pathfinder/CMakeLists.txt	Wed Feb 17 10:11:25 2021
@@ -12,15 +12,6 @@
 	DESTINATION ${ICONDIR}/1_5_1/
 )
 
-set(PATHFINDER_PLUGIN_UI_SRC
-	pathfinderbase.ui
-)
-
-set(PATHFINDER_PLUGIN_MOC_CLASSES
-	pathfinder.h
-	pathfinderdialog.h
-)
-
 set(PATHFINDER_PLUGIN_SOURCES
 	pathfinder.cpp
 	pathfinderdialog.cpp
@@ -28,10 +19,8 @@
 
 set(SCRIBUS_PATHFINDER_PLUGIN "pathfinder")
 
-QT5_WRAP_UI(PATHFINDER_PLUGIN_UI_SOURCES ${PATHFINDER_PLUGIN_UI_SRC} )
-QT5_WRAP_CPP(PATHFINDER_PLUGIN_MOC_SOURCES ${PATHFINDER_PLUGIN_MOC_CLASSES})
 
-add_library(${SCRIBUS_PATHFINDER_PLUGIN} MODULE ${PATHFINDER_PLUGIN_SOURCES} ${PATHFINDER_PLUGIN_MOC_SOURCES} ${PATHFINDER_PLUGIN_UI_CPP} ${PATHFINDER_PLUGIN_UI_SOURCES})
+add_library(${SCRIBUS_PATHFINDER_PLUGIN} MODULE ${PATHFINDER_PLUGIN_SOURCES})
 
 target_link_libraries(${SCRIBUS_PATHFINDER_PLUGIN} ${PLUGIN_LIBRARIES})
 

Modified: trunk/Scribus/scribus/plugins/tools/pathstroker/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24494&path=/trunk/Scribus/scribus/plugins/tools/pathstroker/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/tools/pathstroker/CMakeLists.txt	(original)
+++ trunk/Scribus/scribus/plugins/tools/pathstroker/CMakeLists.txt	Wed Feb 17 10:11:25 2021
@@ -1,10 +1,6 @@
 include_directories(
 	${CMAKE_SOURCE_DIR}
 	${CMAKE_SOURCE_DIR}/scribus
-)
-
-set(PATHSTROKER_PLUGIN_MOC_CLASSES
-	pathstroker.h
 )
 
 set(PATHSTROKER_PLUGIN_SOURCES
@@ -13,9 +9,7 @@
 
 set(SCRIBUS_PATHSTROKER_PLUGIN "pathstroker")
 
-QT5_WRAP_CPP(PATHSTROKER_PLUGIN_MOC_SOURCES ${PATHSTROKER_PLUGIN_MOC_CLASSES})
-
-add_library(${SCRIBUS_PATHSTROKER_PLUGIN} MODULE ${PATHSTROKER_PLUGIN_SOURCES} ${PATHSTROKER_PLUGIN_MOC_SOURCES})
+add_library(${SCRIBUS_PATHSTROKER_PLUGIN} MODULE ${PATHSTROKER_PLUGIN_SOURCES})
 
 target_link_libraries(${SCRIBUS_PATHSTROKER_PLUGIN} ${PLUGIN_LIBRARIES})
 

Modified: trunk/Scribus/scribus/plugins/tools/smoothpath/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24494&path=/trunk/Scribus/scribus/plugins/tools/smoothpath/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/tools/smoothpath/CMakeLists.txt	(original)
+++ trunk/Scribus/scribus/plugins/tools/smoothpath/CMakeLists.txt	Wed Feb 17 10:11:25 2021
@@ -1,10 +1,6 @@
 include_directories(
 	${CMAKE_SOURCE_DIR}
 	${CMAKE_SOURCE_DIR}/scribus
-)
-
-set(SMOOTHPATH_PLUGIN_MOC_CLASSES
-	smoothpath.h
 )
 
 set(SMOOTHPATH_PLUGIN_SOURCES
@@ -13,9 +9,7 @@
 
 set(SCRIBUS_SMOOTHPATH_PLUGIN "smoothpath")
 
-QT5_WRAP_CPP(SMOOTHPATH_PLUGIN_MOC_SOURCES ${SMOOTHPATH_PLUGIN_MOC_CLASSES})
-
-add_library(${SCRIBUS_SMOOTHPATH_PLUGIN} MODULE ${SMOOTHPATH_PLUGIN_SOURCES} ${SMOOTHPATH_PLUGIN_MOC_SOURCES})
+add_library(${SCRIBUS_SMOOTHPATH_PLUGIN} MODULE ${SMOOTHPATH_PLUGIN_SOURCES})
 
 target_link_libraries(${SCRIBUS_SMOOTHPATH_PLUGIN} ${PLUGIN_LIBRARIES})
 

Modified: trunk/Scribus/scribus/plugins/tools/subdivide/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24494&path=/trunk/Scribus/scribus/plugins/tools/subdivide/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/tools/subdivide/CMakeLists.txt	(original)
+++ trunk/Scribus/scribus/plugins/tools/subdivide/CMakeLists.txt	Wed Feb 17 10:11:25 2021
@@ -1,10 +1,6 @@
 include_directories(
 	${CMAKE_SOURCE_DIR}
 	${CMAKE_SOURCE_DIR}/scribus
-)
-
-set(SUBDIVIDE_PLUGIN_MOC_CLASSES
-	subdivide.h
 )
 
 set(SUBDIVIDE_PLUGIN_SOURCES
@@ -13,9 +9,7 @@
 
 set(SCRIBUS_SUBDIVIDE_PLUGIN "subdivide")
 
-QT5_WRAP_CPP(SUBDIVIDE_PLUGIN_MOC_SOURCES ${SUBDIVIDE_PLUGIN_MOC_CLASSES})
-
-add_library(${SCRIBUS_SUBDIVIDE_PLUGIN} MODULE ${SUBDIVIDE_PLUGIN_SOURCES} ${SUBDIVIDE_PLUGIN_MOC_SOURCES})
+add_library(${SCRIBUS_SUBDIVIDE_PLUGIN} MODULE ${SUBDIVIDE_PLUGIN_SOURCES})
 
 target_link_libraries(${SCRIBUS_SUBDIVIDE_PLUGIN} ${PLUGIN_LIBRARIES})
 
@@ -28,5 +22,3 @@
 	DESTINATION ${PLUGINDIR}
 	PERMISSIONS ${PLUGIN_PERMISSIONS}
 )
-
-# set_target_properties(${SCRIBUS_COLORWHEEL_PLUGIN} PROPERTIES VERSION "0.0.0")

Modified: trunk/Scribus/scribus/plugins/tools/transform/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24494&path=/trunk/Scribus/scribus/plugins/tools/transform/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/tools/transform/CMakeLists.txt	(original)
+++ trunk/Scribus/scribus/plugins/tools/transform/CMakeLists.txt	Wed Feb 17 10:11:25 2021
@@ -1,15 +1,7 @@
 include_directories(
-${CMAKE_SOURCE_DIR}
-${CMAKE_SOURCE_DIR}/scribus
-)
-
-set(TRANSFORMEFFECT_PLUGIN_UI_SRC
-transformdialogbase.ui
-)
-
-set(TRANSFORMEFFECT_PLUGIN_MOC_CLASSES
-transformdialog.h
-transformeffect.h
+	${CMAKE_SOURCE_DIR}
+	${CMAKE_SOURCE_DIR}/scribus
+	${SCRIBUS_AUTOGEN_INCLUDE_PATH}
 )
 
 set(TRANSFORMEFFECT_PLUGIN_SOURCES
@@ -19,10 +11,7 @@
 
 set(SCRIBUS_TRANSFORMEFFECT_PLUGIN "transformeffect")
 
-QT5_WRAP_UI(TRANSFORMEFFECT_PLUGIN_UI_SOURCES ${TRANSFORMEFFECT_PLUGIN_UI_SRC} )
-QT5_WRAP_CPP(TRANSFORMEFFECT_PLUGIN_MOC_SOURCES ${TRANSFORMEFFECT_PLUGIN_MOC_CLASSES})
-
-add_library(${SCRIBUS_TRANSFORMEFFECT_PLUGIN} MODULE ${TRANSFORMEFFECT_PLUGIN_SOURCES} ${TRANSFORMEFFECT_PLUGIN_MOC_SOURCES} ${TRANSFORMEFFECT_PLUGIN_UI_CPP} ${TRANSFORMEFFECT_PLUGIN_UI_SOURCES})
+add_library(${SCRIBUS_TRANSFORMEFFECT_PLUGIN} MODULE ${TRANSFORMEFFECT_PLUGIN_SOURCES})
 
 target_link_libraries(${SCRIBUS_TRANSFORMEFFECT_PLUGIN} ${PLUGIN_LIBRARIES})
 

Modified: trunk/Scribus/scribus/tests/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24494&path=/trunk/Scribus/scribus/tests/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/tests/CMakeLists.txt	(original)
+++ trunk/Scribus/scribus/tests/CMakeLists.txt	Wed Feb 17 10:11:25 2021
@@ -2,13 +2,8 @@
 ${CMAKE_SOURCE_DIR}
 ${CMAKE_SOURCE_DIR}/scribus
 ${FREETYPE_INCLUDE_DIRS}
+${SCRIBUS_AUTOGEN_INCLUDE_PATH}
 ..
-)
-
-
-set(SCRIBUS_TEST_MOC_CLASSES
-#testIndex.h
-testStoryText.h
 )
 
 set(SCRIBUS_TEST_SOURCES
@@ -17,10 +12,8 @@
 testStoryText.cpp
 )
 
-  QT5_WRAP_CPP(SCRIBUS_TEST_MOC_SOURCES ${SCRIBUS_TEST_MOC_CLASSES})
-
 set(SCRIBUS_TESTS_LIB "scribus_tests_lib")
-add_library(${SCRIBUS_TESTS_LIB} STATIC ${SCRIBUS_TEST_SOURCES} ${SCRIBUS_TEST_MOC_SOURCES})
+add_library(${SCRIBUS_TESTS_LIB} STATIC ${SCRIBUS_TEST_SOURCES})
 
 
 # This is a convenience library that for linkage purposes is part of Scribus's
@@ -39,9 +32,7 @@
 set(TESTS_LIBRARIES ${QT_QTTEST_LIBRARY} ${QT_LIBRARIES})
 
 # Unit tests for CellArea
-set(CELLAREATESTS_CLASSES cellareatests.h)
 set(CELLAREATESTS_SOURCES cellareatests.cpp ../cellarea.cpp)
-QT5_WRAP_CPP(CELLAREATESTS_SOURCES ${CELLAREATESTS_CLASSES})
 add_executable(cellareatests ${CELLAREATESTS_SOURCES})
 target_link_libraries(cellareatests ${TESTS_LIBRARIES})
 add_test(NAME cellareatests COMMAND cellareatests)

Modified: trunk/Scribus/scribus/third_party/rtf-qt/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24494&path=/trunk/Scribus/scribus/third_party/rtf-qt/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/third_party/rtf-qt/CMakeLists.txt	(original)
+++ trunk/Scribus/scribus/third_party/rtf-qt/CMakeLists.txt	Wed Feb 17 10:11:25 2021
@@ -1,8 +1,8 @@
 include_directories(
-${CMAKE_SOURCE_DIR}
-${CMAKE_SOURCE_DIR}/scribus
-${FREETYPE_INCLUDE_DIRS}
-)
+	${CMAKE_SOURCE_DIR}
+	${CMAKE_SOURCE_DIR}/scribus
+	${FREETYPE_INCLUDE_DIRS}
+	)
 
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_FPIC}")
 
@@ -41,16 +41,9 @@
 	UserPropsDestination.cpp
 )
 
-set(SCRIBUS_RTF_LIB_MOC_CLASSES
-	rtfreader.h
-)
-
-
-QT5_WRAP_CPP(SCRIBUS_RTF_LIB_MOC_SOURCES ${SCRIBUS_RTF_LIB_MOC_CLASSES})
-
 set(SCRIBUS_RTF_LIB "scribus_rtf_lib")
-add_library(${SCRIBUS_RTF_LIB} STATIC ${SCRIBUS_RTF_LIB_SOURCES} ${SCRIBUS_RTF_LIB_MOC_SOURCES})
-set_target_properties(${SCRIBUS_ZIB_LIB}
-  PROPERTIES
-  COMPILE_FLAGS -DCOMPILE_SCRIBUS_MAIN_APP
-  )
+add_library(${SCRIBUS_RTF_LIB} STATIC ${SCRIBUS_RTF_LIB_SOURCES})
+set_target_properties(${SCRIBUS_RTF_LIB}
+	PROPERTIES
+	COMPILE_FLAGS -DCOMPILE_SCRIBUS_MAIN_APP
+	)

Modified: trunk/Scribus/scribus/third_party/zip/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24494&path=/trunk/Scribus/scribus/third_party/zip/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/third_party/zip/CMakeLists.txt	(original)
+++ trunk/Scribus/scribus/third_party/zip/CMakeLists.txt	Wed Feb 17 10:11:25 2021
@@ -7,23 +7,15 @@
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_FPIC}")
 
 set(SCRIBUS_ZIP_LIB_SOURCES
-        unzip.cpp
-        zip.cpp
-        zipglobal.cpp
-		scribus_zip.cpp
-       )
-
-set(SCRIBUS_ZIP_LIB_MOC_CLASSES
-	zip_p.h
-	unzip_p.h
+	unzip.cpp
+	zip.cpp
+	zipglobal.cpp
+	scribus_zip.cpp
 )
 
-
-QT5_WRAP_CPP(SCRIBUS_ZIP_LIB_MOC_SOURCES ${SCRIBUS_ZIP_LIB_MOC_CLASSES})
-
 set(SCRIBUS_ZIB_LIB "scribus_zip_lib")
-add_library(${SCRIBUS_ZIB_LIB} STATIC ${SCRIBUS_ZIP_LIB_SOURCES} ${SCRIBUS_ZIP_LIB_MOC_SOURCES})
+add_library(${SCRIBUS_ZIB_LIB} STATIC ${SCRIBUS_ZIP_LIB_SOURCES})
 set_target_properties(${SCRIBUS_ZIB_LIB}
-  PROPERTIES
-  COMPILE_FLAGS -DCOMPILE_SCRIBUS_MAIN_APP
-  )
+	PROPERTIES
+	COMPILE_FLAGS -DCOMPILE_SCRIBUS_MAIN_APP
+	)

Modified: trunk/Scribus/scribus/third_party/zip/unzip.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24494&path=/trunk/Scribus/scribus/third_party/zip/unzip.h
==============================================================================
--- trunk/Scribus/scribus/third_party/zip/unzip.h	(original)
+++ trunk/Scribus/scribus/third_party/zip/unzip.h	Wed Feb 17 10:11:25 2021
@@ -41,7 +41,7 @@
 class QFile;
 class QIODevice;
 class QString;
-class QStringList;
+#include <QStringList>
 
 OSDAB_BEGIN_NAMESPACE(Zip)
 

Modified: trunk/Scribus/scribus/third_party/zip/zip.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24494&path=/trunk/Scribus/scribus/third_party/zip/zip.h
==============================================================================
--- trunk/Scribus/scribus/third_party/zip/zip.h	(original)
+++ trunk/Scribus/scribus/third_party/zip/zip.h	Wed Feb 17 10:11:25 2021
@@ -39,7 +39,7 @@
 class QIODevice;
 class QFile;
 class QDir;
-class QStringList;
+#include <QStringList>
 class QString;
 
 OSDAB_BEGIN_NAMESPACE(Zip)

Modified: trunk/Scribus/scribus/third_party/zip/zipglobal.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24494&path=/trunk/Scribus/scribus/third_party/zip/zipglobal.h
==============================================================================
--- trunk/Scribus/scribus/third_party/zip/zipglobal.h	(original)
+++ trunk/Scribus/scribus/third_party/zip/zipglobal.h	Wed Feb 17 10:11:25 2021
@@ -28,8 +28,8 @@
 #ifndef OSDAB_ZIPGLOBAL__H
 #define OSDAB_ZIPGLOBAL__H
 
-#include <QtCore/QDateTime>
-#include <QtCore/QtGlobal>
+#include <QDateTime>
+#include <QtGlobal>
 //#define OSDAB_ZIP_LIB
 #define OSDAB_ZIP_BUILD_LIB
 /* If you want to build the OSDaB Zip code as

Modified: trunk/Scribus/scribus/ui/markinsert.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24494&path=/trunk/Scribus/scribus/ui/markinsert.h
==============================================================================
--- trunk/Scribus/scribus/ui/markinsert.h	(original)
+++ trunk/Scribus/scribus/ui/markinsert.h	Wed Feb 17 10:11:25 2021
@@ -2,7 +2,7 @@
 #define MARKINSERT_H
 
 #include <QDialog>
-#include <scribusapi.h>
+#include "scribusapi.h"
 
 class NotesStyle;
 class Mark;

Modified: trunk/Scribus/scribus/ui/prefs_pane.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24494&path=/trunk/Scribus/scribus/ui/prefs_pane.h
==============================================================================
--- trunk/Scribus/scribus/ui/prefs_pane.h	(original)
+++ trunk/Scribus/scribus/ui/prefs_pane.h	Wed Feb 17 10:11:25 2021
@@ -21,16 +21,8 @@
 
 		virtual void restoreDefaults(struct ApplicationPrefs *prefsData) = 0;
 		virtual void saveGuiToPrefs(struct ApplicationPrefs *prefsData) const = 0;
-
-		const QString& caption() const
-		{
-			return m_caption;
-		}
-
-		const QString& icon() const
-		{
-			return m_icon;
-		}
+		const QString& caption() const;
+		const QString& icon() const;
 
 	public slots:
 		virtual void apply() {}; // For plugin prefs panels




More information about the scribus-commit mailing list