diff --git a/CMakeLists.txt b/CMakeLists.txt index 9c88c24a06a..1f983e5bdbd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,6 +7,7 @@ SET(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake ${CMAKE_MODULE_PATH}) # POLICIES CMAKE_POLICY (SET CMP0048 NEW) CMAKE_POLICY (SET CMP0053 NEW) +CMAKE_POLICY (SET CMP0071 NEW) # don't relink it only the shared object changes SET(CMAKE_LINK_DEPENDS_NO_SHARED ON) @@ -455,6 +456,8 @@ IF(WITH_CORE) ADD_DEFINITIONS(-DQT_NO_CAST_TO_ASCII) ENDIF(WITH_CORE) +SET(CMAKE_AUTOMOC ON) + # build our version of astyle SET (WITH_ASTYLE FALSE CACHE BOOL "If you plan to contribute you should reindent with scripts/prepare-commit.sh (using 'our' astyle)") diff --git a/src/3d/CMakeLists.txt b/src/3d/CMakeLists.txt index 7d9e1474487..389f094b31f 100644 --- a/src/3d/CMakeLists.txt +++ b/src/3d/CMakeLists.txt @@ -61,39 +61,6 @@ SET(QGIS_3D_SRCS #terrain/quantizedmeshterraingenerator.cpp ) -SET(QGIS_3D_MOC_HDRS - - qgs3dmapscene.h - qgs3dmapsettings.h - qgsabstract3dengine.h - qgscameracontroller.h - qgslayoutitem3dmap.h - qgsoffscreen3dengine.h - qgstessellatedpolygongeometry.h - qgswindow3dengine.h - - chunks/qgschunkboundsentity_p.h - chunks/qgschunkedentity_p.h - chunks/qgschunkloader_p.h - chunks/qgschunkqueuejob_p.h - - processing/qgs3dalgorithms.h - - symbols/qgsbillboardgeometry.h - symbols/qgspoint3dbillboardmaterial.h - symbols/qgslinematerial_p.h - - terrain/qgsdemterraintileloader_p.h - terrain/qgsflatterraingenerator.h - terrain/qgsterrainentity_p.h - terrain/qgsterraintexturegenerator_p.h - terrain/qgsterraintextureimage_p.h - terrain/qgsterraintileentity_p.h - terrain/qgsterraintileloader_p.h -) - -QT5_WRAP_CPP(QGIS_3D_MOC_SRCS ${QGIS_3D_MOC_HDRS}) - QT5_ADD_RESOURCES(QGIS_3D_RCC_SRCS shaders.qrc) # install headers @@ -183,7 +150,7 @@ INCLUDE_DIRECTORIES(SYSTEM ############################################################# # qgis_3d library -ADD_LIBRARY(qgis_3d SHARED ${QGIS_3D_SRCS} ${QGIS_3D_MOC_SRCS} ${QGIS_3D_HDRS} ${QGIS_3D_RCC_SRCS}) +ADD_LIBRARY(qgis_3d SHARED ${QGIS_3D_SRCS} ${QGIS_3D_HDRS} ${QGIS_3D_RCC_SRCS}) TARGET_LINK_LIBRARIES(qgis_3d Qt5::3DCore Qt5::3DRender Qt5::3DInput Qt5::3DLogic Qt5::3DExtras) diff --git a/src/analysis/CMakeLists.txt b/src/analysis/CMakeLists.txt index a114b100a88..e03c4c78337 100644 --- a/src/analysis/CMakeLists.txt +++ b/src/analysis/CMakeLists.txt @@ -202,23 +202,6 @@ SET(QGIS_ANALYSIS_SRCS vector/geometry_checker/qgsvectorlayerfeaturepool.cpp ) -SET(QGIS_ANALYSIS_MOC_HDRS - processing/qgsnativealgorithms.h - - vector/qgsgeometrysnapper.h - - network/qgsgraphdirector.h - network/qgsvectorlayerdirector.h - - processing/qgsalgorithmfiledownloader.h - - vector/geometry_checker/qgsgeometrychecker.h - vector/geometry_checker/qgsgeometrycheck.h - vector/geometry_checker/qgsvectorlayerfeaturepool.h - vector/geometry_checker/qgsgeometrygapcheck.h - vector/geometry_checker/qgsgeometrymissingvertexcheck.h -) - FIND_PACKAGE(EXIV2 REQUIRED) INCLUDE_DIRECTORIES(SYSTEM ${SPATIALITE_INCLUDE_DIR}) @@ -259,8 +242,6 @@ IF (CMAKE_CXX_COMPILER_ID MATCHES "Clang") ) ENDIF (CMAKE_CXX_COMPILER_ID MATCHES "Clang") -QT5_WRAP_CPP(QGIS_ANALYSIS_MOC_SRCS ${QGIS_ANALYSIS_MOC_HDRS}) - # install headers SET(QGIS_ANALYSIS_HDRS @@ -316,6 +297,7 @@ SET(QGIS_ANALYSIS_HDRS network/qgsgraph.h network/qgsgraphbuilderinterface.h network/qgsgraphbuilder.h + network/qgsgraphdirector.h network/qgsnetworkstrategy.h network/qgsnetworkspeedstrategy.h network/qgsnetworkdistancestrategy.h @@ -391,7 +373,7 @@ ENDIF(HAVE_OPENCL) ############################################################# # qgis_analysis library -ADD_LIBRARY(qgis_analysis SHARED ${QGIS_ANALYSIS_SRCS} ${QGIS_ANALYSIS_MOC_SRCS} ${QGIS_ANALYSIS_HDRS}) +ADD_LIBRARY(qgis_analysis SHARED ${QGIS_ANALYSIS_SRCS} ${QGIS_ANALYSIS_HDRS}) GENERATE_EXPORT_HEADER( qgis_analysis diff --git a/src/app/CMakeLists.txt b/src/app/CMakeLists.txt index d1a8a69142f..a5191dcd36e 100644 --- a/src/app/CMakeLists.txt +++ b/src/app/CMakeLists.txt @@ -257,243 +257,6 @@ SET(QGIS_APP_SRCS mesh/qgsmeshtimeformatdialog.cpp ) -SET (QGIS_APP_MOC_HDRS - qgisapp.h - qgisappinterface.h - qgisappstylesheet.h - qgsabout.h - qgsaddattrdialog.h - qgsalignrasterdialog.h - qgsappbrowserproviders.h - qgsappcoordinateoperationhandlers.h - qgsappscreenshots.h - qgsjoindialog.h - qgswmsdimensiondialog.h - qgsaddtaborgroup.h - qgsannotationwidget.h - qgsapplayertreeviewmenuprovider.h - qgsattributeactiondialog.h - qgsattributeactionpropertiesdialog.h - qgsattributetypedialog.h - qgsattributerelationedit.h - qgsattributesforminitcode.h - qgsattributetabledialog.h - qgsbookmarks.h - qgsbookmarkeditordialog.h - qgsclipboard.h - qgscustomization.h - qgscustomprojectiondialog.h - qgsdatumtransformtablewidget.h - qgsdelattrdialog.h - qgsdiagramproperties.h - qgsdiscoverrelationsdialog.h - qgsdisplayangle.h - qgsdxfexportdialog.h - qgsfeatureaction.h - qgsfieldcalculator.h - qgsfirstrundialog.h - qgssourcefieldsproperties.h - qgsattributesformproperties.h - qgsformannotationdialog.h - qgsguivectorlayertools.h - qgsgeometryvalidationservice.h - qgsgeometryvalidationdock.h - qgsgeometryvalidationmodel.h - qgshtmlannotationdialog.h - qgsidentifyresultsdialog.h - qgsinstallgridshiftdialog.h - qgslabelengineconfigdialog.h - qgslabelingwidget.h - qgslabelpropertydialog.h - qgslayercapabilitiesmodel.h - qgslayertreeviewindicatorprovider.h - qgslayertreeviewembeddedindicator.h - qgslayertreeviewmemoryindicator.h - qgslayertreeviewfilterindicator.h - qgslayertreeviewnocrsindicator.h - qgslayertreeviewnonremovableindicator.h - qgslayertreeviewbadlayerindicator.h - qgsmapcanvasdockwidget.h - qgsmaplayerstylecategoriesmodel.h - qgsmaplayerstyleguiutils.h - qgsmapsavedialog.h - qgspuzzlewidget.h - qgsprojectlistitemdelegate.h - qgsrulebasedlabelingwidget.h - qgssnappinglayertreemodel.h - qgssnappingwidget.h - qgsstatusbarcoordinateswidget.h - qgsstatusbarmagnifierwidget.h - qgsstatusbarscalewidget.h - qgstemplateprojectsmodel.h - qgsvectorlayerloadstyledialog.h - qgsversioninfo.h - qgsrecentprojectsitemsmodel.h - qgswelcomepage.h - - qgsmaptooladdfeature.h - qgsmaptoolannotation.h - qgsmaptoolcircularstringradius.h - qgsmaptooladdpart.h - qgsmaptooladdring.h - qgsmaptoolfillring.h - qgsmaptoolchangelabelproperties.h - qgsmaptooldeletepart.h - qgsmaptooldeletering.h - qgsmaptooltrimextendfeature.h - qgsmaptoolfeatureaction.h - qgsmaptoolformannotation.h - qgsmaptoolhtmlannotation.h - qgsmaptoolpinlabels.h - qgsmaptoolshowhidelabels.h - qgsmaptoolidentifyaction.h - qgsmaptoolmeasureangle.h - qgsmaptoolmovefeature.h - qgsmaptoolmovelabel.h - qgsmaptoollabel.h - qgsmaptooloffsetcurve.h - qgsmaptooloffsetpointsymbol.h - qgsmaptoolpointsymbol.h - qgsmaptoolreshape.h - qgsmaptoolreverseline.h - qgsmaptoolrotatefeature.h - qgsmaptoolrotatelabel.h - qgsmaptoolrotatepointsymbols.h - qgsmaptoolselect.h - qgsmaptoolselectionhandler.h - qgsmaptoolsimplify.h - qgsmaptoolsplitfeatures.h - qgsmaptoolsplitparts.h - qgsmaptoolsvgannotation.h - qgsmaptooltextannotation.h - qgsmaptooladdcircularstring.h - qgsmaptoolcircularstringcurvepoint.h - qgsmaptooladdcircle.h - qgsmaptoolcircle2points.h - qgsmaptoolcircle3points.h - qgsmaptoolcircle3tangents.h - qgsmaptoolcircle2tangentspoint.h - qgsmaptoolcirclecenterpoint.h - qgsmaptooladdellipse.h - qgsmaptoolellipsefoci.h - qgsmaptoolellipseextent.h - qgsmaptoolellipsecenterpoint.h - qgsmaptoolellipsecenter2points.h - qgsmaptooladdrectangle.h - qgsmaptooladdregularpolygon.h - qgsmaptoolrectanglecenter.h - qgsmaptoolrectangleextent.h - qgsmaptoolrectangle3points.h - qgsmaptoolregularpolygon2points.h - qgsmaptoolregularpolygoncenterpoint.h - qgsmaptoolregularpolygoncentercorner.h - - decorations/qgsdecorationitem.h - decorations/qgsdecorationtitle.h - decorations/qgsdecorationtitledialog.h - decorations/qgsdecorationcopyright.h - decorations/qgsdecorationcopyrightdialog.h - decorations/qgsdecorationimage.h - decorations/qgsdecorationimagedialog.h - decorations/qgsdecorationlayoutextent.h - decorations/qgsdecorationlayoutextentdialog.h - decorations/qgsdecorationnortharrow.h - decorations/qgsdecorationnortharrowdialog.h - decorations/qgsdecorationscalebar.h - decorations/qgsdecorationscalebardialog.h - decorations/qgsdecorationgrid.h - decorations/qgsdecorationgriddialog.h - - vertextool/qgslockedfeature.h - vertextool/qgsvertexeditor.h - vertextool/qgsvertextool.h - - qgslayerstylingwidget.h - qgsmeasuredialog.h - qgsmeasuretool.h - qgsmergeattributesdialog.h - qgsoptions.h - qgsprojectlayergroupdialog.h - qgsprojectproperties.h - qgsrastercalcdialog.h - qgsrasterlayerproperties.h - qgsrelationmanagerdialog.h - qgsrelationadddlg.h - qgsselectbyformdialog.h - qgsstatisticalsummarydockwidget.h - qgssvgannotationdialog.h - qgstextannotationdialog.h - qgsundowidget.h - qgsvectorlayerlegendwidget.h - qgsvectorlayersavestyledialog.h - qgsvectorlayerproperties.h - qgsmapthemes.h - qgshandlebadlayers.h - - browser/qgsinbuiltdataitemproviders.h - - layout/qgsgeopdflayertreemodel.h - layout/qgslayoutaddpagesdialog.h - layout/qgslayoutappmenuprovider.h - layout/qgslayoutatlaswidget.h - layout/qgslayoutattributeselectiondialog.h - layout/qgslayoutattributetablewidget.h - layout/qgslayoutdesignerdialog.h - layout/qgslayoutguidewidget.h - layout/qgslayouthtmlwidget.h - layout/qgslayoutimageexportoptionsdialog.h - layout/qgslayoutitemslistview.h - layout/qgslayoutlabelwidget.h - layout/qgslayoutlegendwidget.h - layout/qgslayoutlegendlayersdialog.h - layout/qgslayoutmanagerdialog.h - layout/qgslayoutmapwidget.h - layout/qgslayoutmapgridwidget.h - layout/qgslayoutpagepropertieswidget.h - layout/qgslayoutpdfexportoptionsdialog.h - layout/qgslayoutpicturewidget.h - layout/qgslayoutpolygonwidget.h - layout/qgslayoutpolylinewidget.h - layout/qgslayoutpropertieswidget.h - layout/qgslayoutqptdrophandler.h - layout/qgslayoutscalebarwidget.h - layout/qgslayoutshapewidget.h - layout/qgslayouttablebackgroundcolorsdialog.h - layout/qgsreportfieldgroupsectionwidget.h - layout/qgsreportlayoutsectionwidget.h - layout/qgsreportorganizerwidget.h - layout/qgsreportsectionmodel.h - layout/qgsreportsectionwidget.h - - locator/qgsinbuiltlocatorfilters.h - locator/qgslocatoroptionswidget.h - - gps/qgsgpsinformationwidget.h - - dwg/qgsdwgimportdialog.h - - pluginmanager/qgspluginmanager.h - pluginmanager/qgsapppluginmanagerinterface.h - pluginmanager/qgspluginsortfilterproxymodel.h - pluginmanager/qgspluginitemdelegate.h - - qgsnewspatialitelayerdialog.h - - qgssettingstree.h - qgsvariantdelegate.h - - mesh/qgsmeshlayerproperties.h - mesh/qgsrenderermeshpropertieswidget.h - mesh/qgsmeshrenderermeshsettingswidget.h - mesh/qgsmeshrendererscalarsettingswidget.h - mesh/qgsmeshrenderervectorsettingswidget.h - mesh/qgsmeshrendereractivedatasetwidget.h - mesh/qgsmeshdatasetgrouptreeview.h - mesh/qgsmeshcalculatordialog.h - mesh/qgsmeshtimeformatdialog.h -) - - IF (WITH_3D) SET(QGIS_APP_SRCS ${QGIS_APP_SRCS} @@ -519,31 +282,6 @@ IF (WITH_3D) 3d/qgsmeshlayer3drendererwidget.cpp layout/qgslayout3dmapwidget.cpp ) - - SET (QGIS_APP_MOC_HDRS - ${QGIS_APP_MOC_HDRS} - 3d/qgs3danimationwidget.h - 3d/qgs3danimationexportdialog.h - 3d/qgs3dmapcanvas.h - 3d/qgs3dmapcanvasdockwidget.h - 3d/qgs3dmapconfigwidget.h - 3d/qgs3dmaptool.h - 3d/qgs3dmaptoolidentify.h - 3d/qgs3dmaptoolmeasureline.h - 3d/qgs3dmeasuredialog.h - 3d/qgs3dnavigationwidget.h - 3d/qgslightswidget.h - 3d/qgsline3dsymbolwidget.h - 3d/qgsmesh3dsymbolwidget.h - 3d/qgspoint3dsymbolwidget.h - 3d/qgspolygon3dsymbolwidget.h - 3d/qgsphongmaterialwidget.h - 3d/qgsrulebased3drendererwidget.h - 3d/qgssymbol3dwidget.h - 3d/qgsvectorlayer3drendererwidget.h - 3d/qgsmeshlayer3drendererwidget.h - layout/qgslayout3dmapwidget.h - ) ENDIF (WITH_3D) @@ -581,16 +319,6 @@ IF (WITH_QWTPOLAR) ${CMAKE_SOURCE_DIR}/external/qwtpolar-1.1.1/qwt_polar_spectrogram.cpp ) - SET (QGIS_APP_MOC_HDRS - ${QGIS_APP_MOC_HDRS} - ${CMAKE_SOURCE_DIR}/external/qwtpolar-1.1.1/qwt_polar_canvas.h - ${CMAKE_SOURCE_DIR}/external/qwtpolar-1.1.1/qwt_polar_magnifier.h - ${CMAKE_SOURCE_DIR}/external/qwtpolar-1.1.1/qwt_polar_panner.h - ${CMAKE_SOURCE_DIR}/external/qwtpolar-1.1.1/qwt_polar_picker.h - ${CMAKE_SOURCE_DIR}/external/qwtpolar-1.1.1/qwt_polar_plot.h - ${CMAKE_SOURCE_DIR}/external/qwtpolar-1.1.1/qwt_polar_renderer.h - ) - SET(QWTPOLAR_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/external/qwtpolar-1.1.1) SET(QWTPOLAR_LIBRARY "") @@ -618,8 +346,6 @@ QT5_ADD_RESOURCES(IMAGE_RCC_SRCS ${IMAGE_RCCS}) SET(TEST_RCCS ../../tests/testdata/testdata.qrc) QT5_ADD_RESOURCES(TEST_RCC_SRCS ${TEST_RCCS}) -QT5_WRAP_CPP(QGIS_APP_MOC_SRCS ${QGIS_APP_MOC_HDRS}) - IF (WIN32) SET (QGIS_APP_SRCS ${QGIS_APP_SRCS} main.cpp ${IMAGE_RCC_SRCS} ${TEST_RCC_SRCS}) SET (QGIS_APPMAIN_SRCS mainwin.cpp) @@ -839,7 +565,7 @@ ENDIF (ANDROID) # Putting IMAGE_RCC_SRCS into qgis_app lib is causing problems when the lib is # loaded (by plugin for example) in test unit (qgis_layoutpicturetest). -ADD_LIBRARY(qgis_app SHARED ${QGIS_APP_SRCS} ${QGIS_APP_MOC_SRCS} ${QGIS_APP_HDRS} ${QGIS_APP_MOC_HDRS}) +ADD_LIBRARY(qgis_app SHARED ${QGIS_APP_SRCS}) TARGET_LINK_LIBRARIES(qgis_app ${QWT_LIBRARY} @@ -875,6 +601,8 @@ GENERATE_EXPORT_HEADER( EXPORT_FILE_NAME qgis_app.h ) +SET_TARGET_PROPERTIES(qgis_app PROPERTIES AUTOMOC TRUE) + IF (NOT ANDROID) SET_TARGET_PROPERTIES(qgis_app PROPERTIES VERSION ${COMPLETE_VERSION} @@ -886,7 +614,6 @@ IF (APPLE) TARGET_LINK_LIBRARIES(qgis_app ${APP_SERVICES_LIBRARY}) ENDIF(APPLE) - if(MSVC AND CMAKE_SIZEOF_VOID_P EQUAL 8) SET_TARGET_PROPERTIES(qgis_app PROPERTIES STATIC_LIBRARY_FLAGS "/machine:x64") ENDIF(MSVC AND CMAKE_SIZEOF_VOID_P EQUAL 8) diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt index e3cbad53441..52dfb138a1a 100644 --- a/src/core/CMakeLists.txt +++ b/src/core/CMakeLists.txt @@ -611,13 +611,8 @@ IF(ENABLE_MODELTEST) ../../tests/qt_modeltest/modeltest.cpp ../../tests/qt_modeltest/dynamictreemodel.cpp ) - SET(MODELTEST_MOC_HDRS - ../../tests/qt_modeltest/modeltest.h - ../../tests/qt_modeltest/dynamictreemodel.h - ) - QT5_WRAP_CPP(MODELTEST_MOC_SRCS ${MODELTEST_MOC_HDRS}) SET(QGIS_CORE_SRCS ${QGIS_CORE_SRCS} - ${MODELTEST_SRCS} ${MODELTEST_MOC_SRCS} + ${MODELTEST_SRCS} ) ENDIF(ENABLE_MODELTEST) @@ -648,254 +643,6 @@ ELSE(NOT MSVC) PROPERTIES COMPILE_FLAGS -wd4702) ENDIF(NOT MSVC) -SET(QGIS_CORE_MOC_HDRS - qgis.h - qgsabstractcontentcache.h - qgsabstractdatabaseproviderconnection.h - qgsapplication.h - qgsactionmanager.h - qgsactionscoperegistry.h - qgsanimatedicon.h - qgsauxiliarystorage.h - qgsblockingnetworkrequest.h - qgsbookmarkmanager.h - qgsbookmarkmodel.h - qgsbrowsermodel.h - qgsbrowserproxymodel.h - qgsconditionalstyle.h - qgscoordinatereferencesystem.h - qgscoordinateutils.h - qgscredentials.h - qgsdataitem.h - qgsdataprovider.h - qgsdatasourceuri.h - qgsdbfilterproxymodel.h - qgsdefaultvalue.h - qgsfeature.h - qgsfeedback.h - qgsfield.h - qgsfieldconstraints.h - qgsfieldformatterregistry.h - qgsfieldmodel.h - qgsfieldproxymodel.h - qgsfiledownloader.h - qgsfeaturefiltermodel.h - qgsfeaturefiltermodel_p.h - qgsgeometryoptions.h - qgsgeometryvalidator.h - qgsgml.h - qgsgmlschema.h - qgsimagecache.h - qgsmaplayer.h - qgsmaplayerlegend.h - qgsmaplayermodel.h - qgsmaplayerproxymodel.h - qgsmaplayerstore.h - qgsmaplayerstylemanager.h - qgsmaprenderercache.h - qgsmaprenderercustompainterjob.h - qgsmaprendererjob.h - qgsmaprendererparalleljob.h - qgsmaprenderersequentialjob.h - qgsmaprendererstagedrenderjob.h - qgsmaprenderertask.h - qgsmessagelog.h - qgsmessageoutput.h - qgsnetworkaccessmanager.h - qgsnetworkdiskcache.h - qgsnetworkcontentfetcher.h - qgsnetworkcontentfetcherregistry.h - qgsnetworkcontentfetchertask.h - qgsnetworkreplyparser.h - qgsnewsfeedmodel.h - qgsnewsfeedparser.h - qgsofflineediting.h - qgsowsconnection.h - qgspluginlayer.h - qgspointxy.h - qgspointlocator.h - qgspointlocatorinittask.h - qgsproject.h - qgsprojectviewsettings.h - qgsproxyprogresstask.h - qgsrelationmanager.h - qgsrelation.h - qgsrunprocess.h - qgssnappingconfig.h - qgssnappingutils.h - qgsstoredexpressionmanager.h - qgstaskmanager.h - qgstolerance.h - qgstracer.h - qgstrackedvectorlayertools.h - qgstransaction.h - qgstransactiongroup.h - qgsunittypes.h - qgsvectordataprovider.h - qgsvectorfilewritertask.h - qgsvectorlayercache.h - qgsvectorlayereditbuffer.h - qgsvectorlayereditpassthrough.h - qgsvectorlayer.h - qgsvirtuallayertask.h - qgsvectorlayerexporter.h - qgsvectorlayerfeaturecounter.h - qgsvectorlayerjoinbuffer.h - qgsvectorlayerrenderer.h - qgsvectorlayertools.h - qgsvectorsimplifymethod.h - qgsvectorlayerserverproperties.h - qgsmapthemecollection.h - qgswebpage.h - qgswebview.h - qgssettings.h - - annotations/qgsannotation.h - annotations/qgsannotationmanager.h - annotations/qgshtmlannotation.h - annotations/qgssvgannotation.h - annotations/qgstextannotation.h - - auth/qgsauthmanager.h - auth/qgsauthmethod.h - - locator/qgslocator.h - locator/qgslocatorfilter.h - locator/qgslocatormodel.h - locator/qgslocatormodelbridge.h - - processing/qgsprocessingalgrunnertask.h - processing/qgsprocessingfeedback.h - processing/qgsprocessingprovider.h - processing/qgsprocessingregistry.h - - providers/gdal/qgsgdalprovider.h - providers/gdal/qgsgdaldataitems.h - - providers/memory/qgsmemoryprovider.h - - providers/meshmemory/qgsmeshmemorydataprovider.h - - providers/ogr/qgsogrprovider.h - providers/ogr/qgsogrdataitems.h - providers/ogr/qgsogrconnpool.h - providers/ogr/qgsgeopackagedataitems.h - providers/ogr/qgsgeopackagerasterwritertask.h - providers/ogr/qgsogrdbconnection.h - providers/ogr/qgsogrtransaction.h - - raster/qgsrasterfilewritertask.h - raster/qgsrasterlayer.h - raster/qgsrasterdataprovider.h - raster/qgsrasterinterface.h - raster/qgsrasterlayerrenderer.h - raster/qgsrasterprojector.h - - mesh/qgsmeshdataprovider.h - mesh/qgsmeshlayer.h - - geometry/qgsabstractgeometry.h - geometry/qgsgeometry.h - geometry/qgspoint.h - geometry/qgswkbtypes.h - - geocms/geonode/qgsgeonoderequest.h - - gps/qgsgpsconnection.h - gps/qgsgpsdetector.h - gps/qgsnmeaconnection.h - gps/qgsgpsdconnection.h - - layout/qgslayout.h - layout/qgslayoutatlas.h - layout/qgslayouteffect.h - layout/qgslayoutguidecollection.h - layout/qgslayoutframe.h - layout/qgslayoutitem.h - layout/qgslayoutitemattributetable.h - layout/qgslayoutitemgroup.h - layout/qgslayoutitemgroupundocommand.h - layout/qgslayoutitemhtml.h - layout/qgslayoutitemlabel.h - layout/qgslayoutitemlegend.h - layout/qgslayoutitemmap.h - layout/qgslayoutitemmapgrid.h - layout/qgslayoutitemmapitem.h - layout/qgslayoutitemmapoverview.h - layout/qgslayoutitemnodeitem.h - layout/qgslayoutitempage.h - layout/qgslayoutitempicture.h - layout/qgslayoutitempolygon.h - layout/qgslayoutitempolyline.h - layout/qgslayoutitemregistry.h - layout/qgslayoutitemscalebar.h - layout/qgslayoutitemshape.h - layout/qgslayoutitemtexttable.h - layout/qgslayoutmanager.h - layout/qgslayoutmodel.h - layout/qgslayoutmultiframe.h - layout/qgslayoutpagecollection.h - layout/qgslayoutobject.h - layout/qgslayoutrendercontext.h - layout/qgslayoutreportcontext.h - layout/qgslayouttable.h - layout/qgslayouttablecolumn.h - layout/qgslayoutundostack.h - layout/qgsprintlayout.h - layout/qgsreport.h - - symbology/qgscptcityarchive.h - symbology/qgssvgcache.h - symbology/qgsstyle.h - symbology/qgsstylemodel.h - - layertree/qgslayertree.h - layertree/qgslayertreegroup.h - layertree/qgslayertreelayer.h - layertree/qgslayertreemodel.h - layertree/qgslayertreemodellegendnode.h - layertree/qgslayertreenode.h - layertree/qgslayertreeregistrybridge.h - - qgsuserprofilemanager.h -) - -IF (NOT WITH_QTWEBKIT) - SET(QGIS_CORE_MOC_HDRS ${QGIS_CORE_MOC_HDRS} - qgswebframe.h - ) -ENDIF(NOT WITH_QTWEBKIT) - -# TODO - update for Qt5 -#SET(QGIS_CORE_MOC_HDRS ${QGIS_CORE_MOC_HDRS} -# qgshttptransaction.h -#) - -IF (QT_MOBILITY_LOCATION_FOUND OR Qt5Positioning_FOUND) - SET(QGIS_CORE_MOC_HDRS ${QGIS_CORE_MOC_HDRS} - gps/qgsqtlocationconnection.h - ) -ENDIF (QT_MOBILITY_LOCATION_FOUND OR Qt5Positioning_FOUND) - - -IF (HAVE_OPENCL) - SET(QGIS_CORE_MOC_HDRS ${QGIS_CORE_MOC_HDRS} - qgsopenclutils.h - ) -ENDIF (HAVE_OPENCL) - -QT5_WRAP_CPP(QGIS_CORE_MOC_SRCS ${QGIS_CORE_MOC_HDRS}) - - -IF(MSVC) - SET_SOURCE_FILES_PROPERTIES(${QGIS_CORE_MOC_SRCS} PROPERTIES COMPILE_FLAGS "/wd4512 /wd4996" ) -ELSE(MSVC) - SET_SOURCE_FILES_PROPERTIES(${QGIS_CORE_MOC_SRCS} PROPERTIES COMPILE_FLAGS "-Wno-deprecated-declarations" ) - IF ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang" AND (CMAKE_BUILD_TYPE MATCHES Release OR CMAKE_BUILD_TYPE MATCHES RelWithDebInfo)) - SET_SOURCE_FILES_PROPERTIES(${CMAKE_CURRENT_BINARY_DIR}/qgsexpression_texts.cpp PROPERTIES COMPILE_FLAGS "-O1") - ENDIF () -ENDIF(MSVC) - # install headers # install qgsconfig.h and plugin.h here so they can get into # the OS X framework target @@ -963,8 +710,8 @@ SET(QGIS_CORE_HDRS qgsfeaturesink.h qgsfeaturesource.h qgsfeaturestore.h + qgsfeedback.h qgsfieldformatter.h - qgsfield_p.h qgsfields.h qgsfileutils.h qgsfontutils.h @@ -1021,7 +768,6 @@ SET(QGIS_CORE_HDRS qgsprojectversion.h qgsprojutils.h qgsproperty.h - qgsproperty_p.h qgspropertycollection.h qgspropertytransformer.h qgsprovidermetadata.h @@ -1041,7 +787,6 @@ SET(QGIS_CORE_HDRS qgssnappingutils.h qgsspatialindex.h qgsspatialindexkdbush.h - qgsspatialindexkdbush_p.h qgsspatialindexkdbushdata.h qgsspatialiteutils.h qgssqlstatement.h @@ -1053,12 +798,15 @@ SET(QGIS_CORE_HDRS qgsstringutils.h qgstextlabelfeature.h qgstextrenderer.h - qgstextrenderer_p.h qgsthreadingutils.h qgstilecache.h qgstracer.h qgstranslationcontext.h qobjectuniqueptr.h + qgswebpage.h + qgswebview.h + qgssettings.h + qgsvectordataprovider.h qgsvectorlayercache.h @@ -1073,6 +821,7 @@ SET(QGIS_CORE_HDRS qgsvectorlayerundocommand.h qgsvectorlayerundopassthroughcommand.h qgsvectorlayerutils.h + qgsvectorlayerrenderer.h qgsvirtuallayerdefinition.h qgsvirtuallayerdefinitionutils.h qgsmapthemecollection.h @@ -1407,7 +1156,7 @@ ADD_DEFINITIONS(-DTEST_DATA_DIR="${TEST_DATA_DIR}") ############################################################# # qgis_core library -ADD_LIBRARY(qgis_core ${LIBRARY_TYPE} ${QGIS_CORE_SRCS} ${QGIS_CORE_MOC_SRCS} ${QGIS_CORE_HDRS} ${QGIS_CORE_MOC_HDRS}) +ADD_LIBRARY(qgis_core ${LIBRARY_TYPE} ${QGIS_CORE_SRCS} ${QGIS_CORE_HDRS}) GENERATE_EXPORT_HEADER( qgis_core @@ -1426,9 +1175,10 @@ IF(HAVE_OPENCL) TARGET_LINK_LIBRARIES(qgis_core ${OpenCL_LIBRARY}) ENDIF(HAVE_OPENCL) +SET_TARGET_PROPERTIES(qgis_core PROPERTIES AUTOMOC TRUE) IF(NOT APPLE) - INSTALL(FILES ${QGIS_CORE_HDRS} ${QGIS_CORE_MOC_HDRS} DESTINATION ${QGIS_INCLUDE_DIR}) + INSTALL(FILES ${QGIS_CORE_HDRS} DESTINATION ${QGIS_INCLUDE_DIR}) ELSE(NOT APPLE) SET_TARGET_PROPERTIES(qgis_core PROPERTIES @@ -1439,7 +1189,7 @@ ELSE(NOT APPLE) MACOSX_FRAMEWORK_SHORT_VERSION_STRING ${COMPLETE_VERSION} MACOSX_FRAMEWORK_IDENTIFIER org.qgis.qgis3_core BUILD_WITH_INSTALL_RPATH TRUE - PUBLIC_HEADER "${QGIS_CORE_HDRS};${QGIS_CORE_MOC_HDRS}" + PUBLIC_HEADER "${QGIS_CORE_HDRS}" LINK_FLAGS "${CMAKE_SHARED_LINKER_FLAGS}" ) # generated export header does not get copied with PUBLIC_HEADER files diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt index f8b05614ce6..c9add682925 100644 --- a/src/gui/CMakeLists.txt +++ b/src/gui/CMakeLists.txt @@ -318,6 +318,7 @@ SET(QGIS_GUI_SRCS qgslistwidget.cpp qgslegendfilterbutton.cpp qgslimitedrandomcolorrampdialog.cpp + qgslonglongvalidator.h qgsratiolockbutton.cpp qgsludialog.cpp qgsmanageconnectionsdialog.cpp @@ -424,410 +425,13 @@ SET(QGIS_GUI_SRCS qgssourceselectproviderregistry.cpp ) -SET(QGIS_GUI_MOC_HDRS - qgisinterface.h - qgsactionmenu.h - qgsadvanceddigitizingdockwidget.h - qgsadvanceddigitizingfloater.h - qgsaggregatetoolbutton.h - qgsalignmentcombobox.h - qgsattributedialog.h - qgsattributeform.h - qgsattributeformeditorwidget.h - qgsattributeformrelationeditorwidget.h - qgsattributeformwidget.h - qgsattributetypeloaddialog.h - qgsblendmodecombobox.h - qgsbrowserguimodel.h - qgsbrowsertreeview.h - qgsbusyindicatordialog.h - qgscharacterselectordialog.h - qgscheckablecombobox.h - qgscodeeditor.h - qgscodeeditorcss.h - qgscodeeditorhtml.h - qgscodeeditorpython.h - qgscodeeditorsql.h - qgscodeeditorexpression.h - qgscollapsiblegroupbox.h - qgscolorbrewercolorrampdialog.h - qgscolorbutton.h - qgscolorrampbutton.h - qgscolordialog.h - qgscolorschemelist.h - qgscolorswatchgrid.h - qgscolorwidgets.h - qgscompoundcolorwidget.h - qgsconfigureshortcutsdialog.h - qgscoordinateboundspreviewmapwidget.h - qgscredentialdialog.h - qgscurveeditorwidget.h - qgscustomdrophandler.h - qgsdatumtransformdialog.h - qgsdatasourceselectdialog.h - qgsdetaileditemdelegate.h - qgsdetaileditemwidget.h - qgsdial.h - qgsdialog.h - qgsdockwidget.h - qgsbrowserdockwidget_p.h - qgsbrowserdockwidget.h - qgsencodingfiledialog.h - qgserrordialog.h - qgsexpressionbuilderdialog.h - qgsexpressionbuilderwidget.h - qgsexpressionhighlighter.h - qgsexpressionlineedit.h - qgsexpressionselectiondialog.h - qgsextentgroupbox.h - qgsexternalresourcewidget.h - qgsfeatureselectiondlg.h - qgsfieldcombobox.h - qgsfieldexpressionwidget.h - qgsfindfilesbypatternwidget.h - qgsfeaturelistcombobox.h - qgsfieldvalidator.h - qgsfieldvalueslineedit.h - qgsfilecontentsourcelineedit.h - qgsfilewidget.h - qgsfilterlineedit.h - qgsfloatingwidget.h - qgsfocuswatcher.h - qgsfontbutton.h - qgsformannotation.h - qgsgradientcolorrampdialog.h - qgsgradientstopeditor.h - qgsgroupwmsdatadialog.h - qgsgui.h - qgshistogramwidget.h - qgshighlight.h - qgsidentifymenu.h - qgskeyvaluewidget.h - qgslabelinggui.h - qgslistwidget.h - qgslegendfilterbutton.h - qgslimitedrandomcolorrampdialog.h - qgsratiolockbutton.h - qgslonglongvalidator.h - qgsludialog.h - qgsmanageconnectionsdialog.h - qgsmapcanvas.h - qgsmapcanvasannotationitem.h - qgsmapcanvassnappingutils.h - qgsmapcanvastracer.h - qgsmaplayeractionregistry.h - qgsmaplayercombobox.h - qgsmaplayerstylemanagerwidget.h - qgsmapoverviewcanvas.h - qgsmaptip.h - qgsmaptool.h - qgsmaptooladvanceddigitizing.h - qgsmaptoolcapture.h - qgsmaptooledit.h - qgsmaptooldigitizefeature.h - qgsmaptoolemitpoint.h - qgsmaptoolextent.h - qgsmaptoolidentify.h - qgsmaptoolidentifyfeature.h - qgsmaptoolpan.h - qgsmaptoolzoom.h - qgsmaplayerconfigwidget.h - qgsmenuheader.h - qgsmessagebar.h - qgsmessagebaritem.h - qgsmessagelogviewer.h - qgsmessageviewer.h - qgsmetadatawidget.h - qgsnewauxiliarylayerdialog.h - qgsnewauxiliaryfielddialog.h - qgsnewhttpconnection.h - qgsnewmemorylayerdialog.h - qgsnewnamedialog.h - qgsnewvectorlayerdialog.h - qgsnewgeopackagelayerdialog.h - qgsopacitywidget.h - qgsoptionsdialogbase.h - qgsoptionsdialoghighlightwidget.h - qgsoptionsdialoghighlightwidgetsimpl.h - qgsoptionswidgetfactory.h - qgsorderbydialog.h - qgsowssourceselect.h - qgspanelwidget.h - qgspanelwidgetstack.h - qgspasswordlineedit.h - qgspixmaplabel.h - qgspluginmanagerinterface.h - qgspresetcolorrampdialog.h - qgsprevieweffect.h - qgsprojectionselectiondialog.h - qgsprojectionselectionwidget.h - qgsprojectionselectiontreewidget.h - qgspropertyassistantwidget.h - qgspropertyoverridebutton.h - qgsproxystyle.h - qgsquerybuilder.h - qgsrasterformatsaveoptionswidget.h - qgsrasterlayersaveasdialog.h - qgsrasterpyramidsoptionswidget.h - qgsrelationeditorwidget.h - qgsrubberband.h - qgsscalecombobox.h - qgsscalerangewidget.h - qgsscalevisibilitydialog.h - qgsscalewidget.h - qgsscrollarea.h - qgssearchquerybuilder.h - qgsshortcutsmanager.h - qgsslider.h - qgssnaptogridcanvasitem.h - qgssqlcomposerdialog.h - qgsstatusbar.h - qgsstyleitemslistwidget.h - qgssublayersdialog.h - qgssubstitutionlistwidget.h - qgssymbolbutton.h - qgstablewidgetbase.h - qgstabwidget.h - qgstaskmanagerwidget.h - qgstextformatwidget.h - qgstextpreview.h - qgstreewidgetitem.h - qgsunitselectionwidget.h - qgsuserinputwidget.h - qgsvaliditycheckresultswidget.h - qgsvariableeditorwidget.h - qgsvscrollarea.h - qgsfiledownloaderdialog.h - qgsdatasourcemanagerdialog.h - qgsabstractdatasourcewidget.h - qgswidgetstatehelper_p.h - qgsattributeeditorcontext.h - - callouts/qgscalloutwidget.h - - ogr/qgsnewogrconnection.h - ogr/qgsvectorlayersaveasdialog.h - - raster/qgscolorrampshaderwidget.h - raster/qgsmultibandcolorrendererwidget.h - raster/qgspalettedrendererwidget.h - raster/qgsrasterbandcombobox.h - raster/qgsrasterhistogramwidget.h - raster/qgsrasterminmaxwidget.h - raster/qgsrasterrendererwidget.h - raster/qgssinglebandgrayrendererwidget.h - raster/qgssinglebandpseudocolorrendererwidget.h - raster/qgsrendererrasterpropertieswidget.h - raster/qgsrastertransparencywidget.h - raster/qgshillshaderendererwidget.h - - symbology/qgs25drendererwidget.h - symbology/characterwidget.h - symbology/qgsarrowsymbollayerwidget.h - symbology/qgsbrushstylecombobox.h - symbology/qgscategorizedsymbolrendererwidget.h - symbology/qgscptcitycolorrampdialog.h - symbology/qgsdashspacedialog.h - symbology/qgsdatadefinedsizelegendwidget.h - symbology/qgsellipsesymbollayerwidget.h - symbology/qgsgraduatedhistogramwidget.h - symbology/qgsgraduatedsymbolrendererwidget.h - symbology/qgsheatmaprendererwidget.h - symbology/qgsinvertedpolygonrendererwidget.h - symbology/qgslayerpropertieswidget.h - symbology/qgsnullsymbolrendererwidget.h - symbology/qgspenstylecombobox.h - symbology/qgspointclusterrendererwidget.h - symbology/qgspointdisplacementrendererwidget.h - symbology/qgsrendererpropertiesdialog.h - symbology/qgsrendererwidget.h - symbology/qgsrulebasedrendererwidget.h - symbology/qgssinglesymbolrendererwidget.h - symbology/qgssmartgroupeditordialog.h - symbology/qgsstyleexportimportdialog.h - symbology/qgsstylegroupselectiondialog.h - symbology/qgsstylemanagerdialog.h - symbology/qgsstylesavedialog.h - symbology/qgssvgselectorwidget.h - symbology/qgssymbollayerwidget.h - symbology/qgssymbollevelsdialog.h - symbology/qgssymbolslistwidget.h - symbology/qgssymbolselectordialog.h - symbology/qgsvectorfieldsymbollayerwidget.h - - attributetable/qgsattributetabledelegate.h - attributetable/qgsattributetablefiltermodel.h - attributetable/qgsattributetablemodel.h - attributetable/qgsattributetableview.h - attributetable/qgsdualview.h - attributetable/qgsfeaturelistmodel.h - attributetable/qgsfeaturelistview.h - attributetable/qgsfeaturelistviewdelegate.h - attributetable/qgsfeatureselectionmodel.h - attributetable/qgsfieldconditionalformatwidget.h - attributetable/qgsgenericfeatureselectionmanager.h - attributetable/qgsifeatureselectionmanager.h - attributetable/qgsvectorlayerselectionmanager.h - attributetable/qgsorganizetablecolumnsdialog.h - - auth/qgsauthauthoritieseditor.h - auth/qgsauthcertificateinfo.h - auth/qgsauthcertificatemanager.h - auth/qgsauthcerttrustpolicycombobox.h - auth/qgsauthconfigedit.h - auth/qgsauthconfigeditor.h - auth/qgsauthconfigidedit.h - auth/qgsauthconfigselect.h - auth/qgsauthsettingswidget.h - auth/qgsautheditorwidgets.h - auth/qgsauthidentitieseditor.h - auth/qgsauthimportcertdialog.h - auth/qgsauthimportidentitydialog.h - auth/qgsauthmasterpassresetdialog.h - auth/qgsauthmethodedit.h - auth/qgsauthserverseditor.h - auth/qgsauthsslconfigwidget.h - auth/qgsauthsslerrorsdialog.h - auth/qgsauthsslimportdialog.h - auth/qgsauthtrustedcasdialog.h - - effects/qgseffectdrawmodecombobox.h - effects/qgseffectstackpropertieswidget.h - effects/qgspainteffectpropertieswidget.h - effects/qgspainteffectwidget.h - - editorwidgets/core/qgseditorconfigwidget.h - editorwidgets/core/qgseditorconfigwidget.h - editorwidgets/core/qgseditorwidgetregistry.h - editorwidgets/core/qgseditorwidgetregistry.h - editorwidgets/core/qgseditorwidgetwrapper.h - editorwidgets/core/qgssearchwidgetwrapper.h - editorwidgets/core/qgswidgetwrapper.h - - editorwidgets/qgsbinarywidgetwrapper.h - editorwidgets/qgscheckboxconfigdlg.h - editorwidgets/qgscheckboxsearchwidgetwrapper.h - editorwidgets/qgscheckboxwidgetwrapper.h - editorwidgets/qgsclassificationwidgetwrapper.h - editorwidgets/qgscolorwidgetwrapper.h - editorwidgets/qgsdatetimeedit.h - editorwidgets/qgsdatetimeeditconfig.h - editorwidgets/qgsdatetimesearchwidgetwrapper.h - editorwidgets/qgsdatetimeeditwrapper.h - editorwidgets/qgsdefaultsearchwidgetwrapper.h - editorwidgets/qgsdoublespinbox.h - editorwidgets/qgsdummyconfigdlg.h - editorwidgets/qgsenumerationwidgetwrapper.h - editorwidgets/qgsexternalresourceconfigdlg.h - editorwidgets/qgsexternalresourcewidgetwrapper.h - editorwidgets/qgshiddenwidgetwrapper.h - editorwidgets/qgshtmlwidgetwrapper.h - editorwidgets/qgskeyvaluewidgetwrapper.h - editorwidgets/qgslistwidgetwrapper.h - editorwidgets/qgsmultiedittoolbutton.h - editorwidgets/qgsrangeconfigdlg.h - editorwidgets/qgsrangewidgetwrapper.h - editorwidgets/qgsrelationreferenceconfigdlg.h - editorwidgets/qgsrelationreferencesearchwidgetwrapper.h - editorwidgets/qgsrelationreferencewidget.h - editorwidgets/qgsrelationreferencewidgetwrapper.h - editorwidgets/qgsrelationwidgetwrapper.h - editorwidgets/qgsrelationaggregatesearchwidgetwrapper.h - editorwidgets/qgssearchwidgettoolbutton.h - editorwidgets/qgsspinbox.h - editorwidgets/qgstexteditconfigdlg.h - editorwidgets/qgstexteditwrapper.h - editorwidgets/qgstexteditsearchwidgetwrapper.h - editorwidgets/qgsuniquevaluesconfigdlg.h - editorwidgets/qgsuniquevaluewidgetwrapper.h - editorwidgets/qgsuuidwidgetwrapper.h - editorwidgets/qgsvaluemapconfigdlg.h - editorwidgets/qgsvaluemapsearchwidgetwrapper.h - editorwidgets/qgsvaluemapwidgetwrapper.h - editorwidgets/qgsvaluerelationconfigdlg.h - editorwidgets/qgsvaluerelationsearchwidgetwrapper.h - editorwidgets/qgsvaluerelationwidgetwrapper.h - - layertree/qgscustomlayerorderwidget.h - layertree/qgslayertreeembeddedconfigwidget.h - layertree/qgslayertreeembeddedwidgetsimpl.h - layertree/qgslayertreemapcanvasbridge.h - layertree/qgslayertreeview.h - layertree/qgslayertreeviewdefaultactions.h - layertree/qgslayertreeviewindicator.h - layertree/qgslayertreeviewitemdelegate.h - - layout/qgslayoutcombobox.h - layout/qgslayoutcustomdrophandler.h - layout/qgslayoutdesignerinterface.h - layout/qgslayoutitemcombobox.h - layout/qgslayoutitemguiregistry.h - layout/qgslayoutitemwidget.h - layout/qgslayoutmousehandles.h - layout/qgslayoutnewitempropertiesdialog.h - layout/qgslayoutruler.h - layout/qgslayoutunitscombobox.h - layout/qgslayoutview.h - layout/qgslayoutviewrubberband.h - layout/qgslayoutviewtool.h - layout/qgslayoutviewtooladditem.h - layout/qgslayoutviewtooladdnodeitem.h - layout/qgslayoutviewtooleditnodes.h - layout/qgslayoutviewtoolmoveitemcontent.h - layout/qgslayoutviewtoolpan.h - layout/qgslayoutviewtoolselect.h - layout/qgslayoutviewtooltemporarykeypan.h - layout/qgslayoutviewtooltemporarykeyzoom.h - layout/qgslayoutviewtooltemporarymousepan.h - layout/qgslayoutviewtoolzoom.h - - locator/qgslocatorwidget.h - - processing/qgsprocessingalgorithmconfigurationwidget.h - processing/qgsprocessingalgorithmdialogbase.h - processing/qgsprocessingconfigurationwidgets.h - processing/qgsprocessingmaplayercombobox.h - processing/qgsprocessingmatrixparameterdialog.h - processing/qgsprocessingmodelerparameterwidget.h - processing/qgsprocessingmultipleselectiondialog.h - processing/qgsprocessingparameterdefinitionwidget.h - processing/qgsprocessingrecentalgorithmlog.h - processing/qgsprocessingtoolboxmodel.h - processing/qgsprocessingtoolboxtreeview.h - processing/qgsprocessingwidgetwrapper.h - processing/qgsprocessingwidgetwrapperimpl.h - - providers/gdal/qgsgdalsourceselect.h - providers/gdal/qgsgdalguiprovider.h - - providers/ogr/qgsogrsourceselect.h - providers/ogr/qgsogrdbsourceselect.h - providers/ogr/qgsogrdbtablemodel.h - providers/ogr/qgsgeopackageprojectstoragedialog.h - providers/ogr/qgsgeopackageitemguiprovider.h - providers/ogr/qgsogritemguiprovider.h -) FIND_PACKAGE(Qt5Qml REQUIRED) FIND_PACKAGE(Qt5QuickWidgets REQUIRED) IF(Qt5Qml_FOUND) -ADD_DEFINITIONS(-DWITH_QML) -SET(QGIS_GUI_MOC_HDRS - ${QGIS_GUI_MOC_HDRS} - editorwidgets/qgsqmlwidgetwrapper.h -) + ADD_DEFINITIONS(-DWITH_QML) ENDIF(Qt5Qml_FOUND) -SET_PROPERTY(GLOBAL PROPERTY QGIS_GUI_MOC_HDRS ${QGIS_GUI_MOC_HDRS}) - -QT5_WRAP_CPP(QGIS_GUI_MOC_SRCS ${QGIS_GUI_MOC_HDRS}) - -IF(MSVC) - SET_SOURCE_FILES_PROPERTIES(${QGIS_GUI_MOC_SRCS} PROPERTIES COMPILE_FLAGS "/wd4512 /wd4996" ) -ELSE(MSVC) - SET_SOURCE_FILES_PROPERTIES(${QGIS_GUI_MOC_SRCS} PROPERTIES COMPILE_FLAGS "-Wno-deprecated-declarations" ) -ENDIF(MSVC) - # for installing headers SET(QGIS_GUI_HDRS @@ -851,17 +455,17 @@ SET(QGIS_GUI_HDRS qgsmaplayerconfigwidgetfactory.h qgsmapmouseevent.h qgsmaptip.h + qgsoptionsdialogbase.h + qgsoptionswidgetfactory.h qgssnapindicator.h qgssqlcomposerdialog.h qgstablewidgetitem.h qgsuserinputwidget.h qgsbrowserdockwidget.h - qgsbrowserdockwidget_p.h qgsvertexmarker.h qgsdatasourcemanagerdialog.h qgsdatasourceselectdialog.h qgsabstractdatasourcewidget.h - qgswidgetstatehelper_p.h qgssourceselectprovider.h qgssourceselectproviderregistry.h qgswindowmanagerinterface.h @@ -872,6 +476,7 @@ SET(QGIS_GUI_HDRS ogr/qgsvectorlayersaveasdialog.h attributetable/qgsfeaturemodel.h + attributetable/qgsifeatureselectionmanager.h auth/qgsauthauthoritieseditor.h auth/qgsauthcertificateinfo.h @@ -921,6 +526,7 @@ SET(QGIS_GUI_HDRS layout/qgslayoutreportsectionlabel.h layout/qgslayoutviewmouseevent.h + layout/qgslayoutdesignerinterface.h processing/qgsprocessinggui.h processing/qgsprocessingguiregistry.h @@ -1065,7 +671,7 @@ ENDIF(MSVC) # qgis_gui library ADD_LIBRARY(qgis_gui SHARED - ${QGIS_GUI_SRCS} ${QGIS_GUI_MOC_SRCS} ${QGIS_GUI_HDRS} ${QGIS_GUI_MOC_HDRS} + ${QGIS_GUI_SRCS} ${QGIS_GUI_HDRS} ) GENERATE_EXPORT_HEADER( @@ -1076,6 +682,8 @@ GENERATE_EXPORT_HEADER( SET(QGIS_GUI_HDRS ${QGIS_GUI_HDRS} ${CMAKE_CURRENT_BINARY_DIR}/qgis_gui.h) +SET_TARGET_PROPERTIES(qgis_gui PROPERTIES AUTOMOC TRUE) + IF(NOT APPLE) IF (WIN32 ) INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/src/native/win) @@ -1083,7 +691,7 @@ IF(NOT APPLE) IF (UNIX) INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/src/native/linux) ENDIF(UNIX) - INSTALL(FILES ${QGIS_GUI_HDRS} ${QGIS_GUI_MOC_HDRS} DESTINATION ${QGIS_INCLUDE_DIR}) + INSTALL(FILES ${QGIS_GUI_HDRS} DESTINATION ${QGIS_INCLUDE_DIR}) ELSE(NOT APPLE) INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/src/native/mac) SET_TARGET_PROPERTIES(qgis_gui PROPERTIES @@ -1094,7 +702,7 @@ ELSE(NOT APPLE) MACOSX_FRAMEWORK_SHORT_VERSION_STRING ${COMPLETE_VERSION} MACOSX_FRAMEWORK_IDENTIFIER org.qgis.qgis3_gui BUILD_WITH_INSTALL_RPATH TRUE - PUBLIC_HEADER "${QGIS_GUI_HDRS};${QGIS_GUI_MOC_HDRS}" + PUBLIC_HEADER "${QGIS_GUI_HDRS}" LINK_FLAGS "${CMAKE_SHARED_LINKER_FLAGS}" ) # generated export header does not get copied with PUBLIC_HEADER files diff --git a/src/native/CMakeLists.txt b/src/native/CMakeLists.txt index 38939aaaa0f..552b010e043 100644 --- a/src/native/CMakeLists.txt +++ b/src/native/CMakeLists.txt @@ -42,10 +42,6 @@ SET(QGIS_NATIVE_SRCS qgsnative.cpp ) -SET(QGIS_NATIVE_MOC_HDRS - qgsnative.h -) - SET(QGIS_NATIVE_HDRS qgsnative.h ) @@ -61,10 +57,6 @@ IF(APPLE) SET(QGIS_NATIVE_SRCS ${QGIS_NATIVE_SRCS} ${QGIS_APP_OBJC_SRCS} ) - SET (QGIS_NATIVE_MOC_HDRS - ${QGIS_NATIVE_MOC_HDRS} - mac/qgsmacnative.h - ) SET (QGIS_NATIVE_HDRS ${QGIS_NATIVE_HDRS} mac/qgsmacnative.h mac/cocoainitializer.h @@ -76,10 +68,6 @@ IF(MSVC) ../../external/wintoast/src/wintoastlib.cpp win/qgswinnative.cpp ) - SET (QGIS_NATIVE_MOC_HDRS - ${QGIS_NATIVE_MOC_HDRS} - win/qgswinnative.h - ) SET (QGIS_NATIVE_HDRS ${QGIS_NATIVE_HDRS} win/qgswinnative.h ) @@ -89,17 +77,11 @@ IF(UNIX AND NOT APPLE AND NOT ANDROID) SET(QGIS_NATIVE_SRCS ${QGIS_NATIVE_SRCS} linux/qgslinuxnative.cpp ) - SET (QGIS_NATIVE_MOC_HDRS - ${QGIS_NATIVE_MOC_HDRS} - linux/qgslinuxnative.h - ) SET (QGIS_NATIVE_HDRS ${QGIS_NATIVE_HDRS} linux/qgslinuxnative.h ) ENDIF(UNIX AND NOT APPLE AND NOT ANDROID) -QT5_WRAP_CPP(QGIS_NATIVE_MOC_SRCS ${QGIS_NATIVE_MOC_HDRS}) - INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} @@ -114,7 +96,7 @@ ENDIF(MSVC) ############################################################# # qgis_native library -ADD_LIBRARY(qgis_native SHARED ${QGIS_NATIVE_SRCS} ${QGIS_NATIVE_MOC_SRCS} ${QGIS_NATIVE_HDRS} ${QGIS_NATIVE_MOC_HDRS}) +ADD_LIBRARY(qgis_native SHARED ${QGIS_NATIVE_SRCS} ${QGIS_NATIVE_HDRS}) SET_PROPERTY(TARGET qgis_native PROPERTY POSITION_INDEPENDENT_CODE ON) GENERATE_EXPORT_HEADER( diff --git a/src/providers/arcgisrest/CMakeLists.txt b/src/providers/arcgisrest/CMakeLists.txt index 75dc87f63db..0c8ad64dbf5 100644 --- a/src/providers/arcgisrest/CMakeLists.txt +++ b/src/providers/arcgisrest/CMakeLists.txt @@ -39,13 +39,6 @@ SET (AFS_SRCS qgsafsprovider.cpp qgsafsshareddata.cpp ) -SET (AFS_MOC_HDRS - qgsarcgisrestutils.h - qgsafsdataitems.h - qgsafsprovider.h - qgsafsshareddata.h -) - IF (WITH_GUI) SET(AFS_SRCS ${AFS_SRCS} qgsafsprovidergui.cpp @@ -53,17 +46,10 @@ IF (WITH_GUI) qgsafssourceselect.cpp qgsarcgisservicesourceselect.cpp ) - SET(AFS_MOC_HDRS ${AFS_MOC_HDRS} - qgsafsdataitemguiprovider.h - qgsafssourceselect.h - qgsarcgisservicesourceselect.h - ) ENDIF () -QT5_WRAP_CPP (AFS_MOC_SRCS ${AFS_MOC_HDRS}) - -ADD_LIBRARY (arcgisfeatureserverprovider_a STATIC ${AFS_SRCS} ${AFS_MOC_SRCS}) -ADD_LIBRARY(arcgisfeatureserverprovider MODULE ${AFS_SRCS} ${AFS_MOC_SRCS}) +ADD_LIBRARY (arcgisfeatureserverprovider_a STATIC ${AFS_SRCS}) +ADD_LIBRARY(arcgisfeatureserverprovider MODULE ${AFS_SRCS}) TARGET_LINK_LIBRARIES(arcgisfeatureserverprovider qgis_core @@ -97,11 +83,6 @@ SET (AMS_SRCS qgsamsdataitems.cpp qgsamsprovider.cpp ) -SET (AMS_MOC_HDRS - qgsarcgisrestutils.h - qgsamsdataitems.h - qgsamsprovider.h -) IF (WITH_GUI) SET(AMS_SRCS ${AMS_SRCS} @@ -110,16 +91,9 @@ IF (WITH_GUI) qgsamssourceselect.cpp qgsarcgisservicesourceselect.cpp ) - SET(AMS_MOC_HDRS ${AMS_MOC_HDRS} - qgsamsdataitemguiprovider.h - qgsamssourceselect.h - qgsarcgisservicesourceselect.h - ) ENDIF () -QT5_WRAP_CPP (AMS_MOC_SRCS ${AMS_MOC_HDRS}) - -ADD_LIBRARY(arcgismapserverprovider MODULE ${AMS_SRCS} ${AMS_MOC_SRCS}) +ADD_LIBRARY(arcgismapserverprovider MODULE ${AMS_SRCS}) TARGET_LINK_LIBRARIES(arcgismapserverprovider qgis_core diff --git a/src/providers/db2/CMakeLists.txt b/src/providers/db2/CMakeLists.txt index 6d03441ada3..92230d9a1d1 100644 --- a/src/providers/db2/CMakeLists.txt +++ b/src/providers/db2/CMakeLists.txt @@ -10,7 +10,7 @@ SET(DB2_SRCS qgsdb2tablemodel.cpp qgsdb2featureiterator.cpp ) -SET(DB2_MOC_HDRS +SET(DB2_HDRS qgsdb2provider.h qgsdb2dataitems.h qgsdb2tablemodel.h @@ -23,7 +23,7 @@ IF (WITH_GUI) qgsdb2newconnection.cpp qgsdb2sourceselect.cpp ) - SET(DB2_MOC_HDRS ${DB2_MOC_HDRS} + SET(DB2_HDRS ${DB2_HDRS} qgsdb2dataitemguiprovider.h qgsdb2newconnection.h qgsdb2sourceselect.h @@ -33,8 +33,6 @@ ENDIF () ######################################################## # Build -QT5_WRAP_CPP(DB2_MOC_SRCS ${DB2_MOC_HDRS}) - INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR}/src/core ${CMAKE_SOURCE_DIR}/src/core/auth @@ -62,7 +60,7 @@ IF (WITH_GUI) ) ENDIF () -ADD_LIBRARY (db2provider MODULE ${DB2_SRCS} ${DB2_HDRS} ${DB2_MOC_SRCS}) +ADD_LIBRARY (db2provider MODULE ${DB2_SRCS} ${DB2_HDRS}) TARGET_LINK_LIBRARIES (db2provider qgis_core diff --git a/src/providers/delimitedtext/CMakeLists.txt b/src/providers/delimitedtext/CMakeLists.txt index 6503059b6fc..a0067b2bb29 100644 --- a/src/providers/delimitedtext/CMakeLists.txt +++ b/src/providers/delimitedtext/CMakeLists.txt @@ -8,19 +8,11 @@ SET (DTEXT_SRCS qgsdelimitedtextfile.cpp ) -SET (DTEXT_MOC_HDRS - qgsdelimitedtextfile.h - qgsdelimitedtextprovider.h -) - IF (WITH_GUI) SET(DTEXT_SRCS ${DTEXT_SRCS} qgsdelimitedtextprovidergui.cpp qgsdelimitedtextsourceselect.cpp ) - SET(DTEXT_MOC_HDRS ${DTEXT_MOC_HDRS} - qgsdelimitedtextsourceselect.h - ) ENDIF () ######################################################## @@ -43,9 +35,7 @@ INCLUDE_DIRECTORIES( INCLUDE_DIRECTORIES (SYSTEM ) -QT5_WRAP_CPP(DTEXT_MOC_SRCS ${DTEXT_MOC_HDRS}) - -ADD_LIBRARY(delimitedtextprovider MODULE ${DTEXT_SRCS} ${DTEXT_MOC_SRCS}) +ADD_LIBRARY(delimitedtextprovider MODULE ${DTEXT_SRCS}) TARGET_LINK_LIBRARIES(delimitedtextprovider qgis_core diff --git a/src/providers/geonode/CMakeLists.txt b/src/providers/geonode/CMakeLists.txt index 4bd913b813e..7030c8606e1 100644 --- a/src/providers/geonode/CMakeLists.txt +++ b/src/providers/geonode/CMakeLists.txt @@ -4,10 +4,6 @@ SET (GEONODE_SRCS qgsgeonodedataitems.cpp ) -SET(GEONODE_MOC_HDRS - qgsgeonodedataitems.h -) - IF (WITH_GUI) SET(GEONODE_SRCS ${GEONODE_SRCS} qgsgeonodeprovidergui.cpp @@ -15,18 +11,11 @@ IF (WITH_GUI) qgsgeonodenewconnection.cpp qgsgeonodesourceselect.cpp ) - SET(GEONODE_MOC_HDRS ${GEONODE_MOC_HDRS} - qgsgeonodedataitemguiprovider.h - qgsgeonodesourceselect.h - qgsgeonodenewconnection.h - ) ENDIF () ######################################################## # Build -QT5_WRAP_CPP(GEONODE_MOC_SRCS ${GEONODE_MOC_HDRS}) - INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR}/src/core ${CMAKE_SOURCE_DIR}/src/core/raster @@ -48,7 +37,7 @@ INCLUDE_DIRECTORIES( INCLUDE_DIRECTORIES(SYSTEM ) -ADD_LIBRARY(geonodeprovider MODULE ${GEONODE_SRCS} ${GEONODE_MOC_SRCS}) +ADD_LIBRARY(geonodeprovider MODULE ${GEONODE_SRCS}) TARGET_LINK_LIBRARIES(geonodeprovider qgis_core diff --git a/src/providers/gpx/CMakeLists.txt b/src/providers/gpx/CMakeLists.txt index d1d24a85055..94b32572762 100644 --- a/src/providers/gpx/CMakeLists.txt +++ b/src/providers/gpx/CMakeLists.txt @@ -8,10 +8,6 @@ SET (GPX_SRCS gpsdata.cpp ) -SET (GPX_MOC_HDRS - qgsgpxprovider.h -) - ######################################################## # Build @@ -30,9 +26,7 @@ INCLUDE_DIRECTORIES (SYSTEM ${EXPAT_INCLUDE_DIR} ) -QT5_WRAP_CPP(GPX_MOC_SRCS ${GPX_MOC_HDRS}) - -ADD_LIBRARY(gpxprovider MODULE ${GPX_SRCS} ${GPX_MOC_SRCS}) +ADD_LIBRARY(gpxprovider MODULE ${GPX_SRCS}) TARGET_LINK_LIBRARIES(gpxprovider ${EXPAT_LIBRARY} diff --git a/src/providers/grass/CMakeLists.txt b/src/providers/grass/CMakeLists.txt index b6892142bcf..fc532e20665 100644 --- a/src/providers/grass/CMakeLists.txt +++ b/src/providers/grass/CMakeLists.txt @@ -33,18 +33,6 @@ MACRO(ADD_GRASSLIB GRASS_BUILD_VERSION) SET(GRASS_MINOR_VERSION ${GRASS_MINOR_VERSION${GRASS_BUILD_VERSION}}) SET(GRASS_OFF_T_SIZE ${GRASS_OFF_T_SIZE${GRASS_BUILD_VERSION}}) - SET(GRASS_LIBRARY_MOC_HDRS - ../qgsgrass.h - ../qgsgrassdatafile.h - ../qgsgrassfeatureiterator.h - ../qgsgrassimport.h - ../qgsgrassprovider.h - ../qgsgrassrasterprovider.h - ../qgsgrassvector.h - ../qgsgrassvectormap.h - ../qgsgrassvectormaplayer.h - ) - SET (GRASS_LIBRARY_SRCS ../qgsgrass.cpp ../qgsgrasswin.cpp @@ -60,16 +48,11 @@ MACRO(ADD_GRASSLIB GRASS_BUILD_VERSION) ) IF (WITH_GUI) - SET(GRASS_LIBRARY_MOC_HDRS ${GRASS_LIBRARY_MOC_HDRS} - ../qgsgrassoptions.h - ) SET(GRASS_LIBRARY_SRCS ${GRASS_LIBRARY_SRCS} ../qgsgrassoptions.cpp ) ENDIF () - QT5_WRAP_CPP(GRASS_LIBRARY_MOC_SRCS ${GRASS_LIBRARY_MOC_HDRS}) - IF(MSVC) # 4611 setjmp SET_SOURCE_FILES_PROPERTIES( @@ -95,7 +78,6 @@ MACRO(ADD_GRASSLIB GRASS_BUILD_VERSION) ADD_LIBRARY(qgisgrass${GRASS_BUILD_VERSION} SHARED ${GRASS_LIBRARY_SRCS} - ${GRASS_LIBRARY_MOC_SRCS} ${GRASS_LIBRARY_UIS_H} ) @@ -174,8 +156,7 @@ MACRO(ADD_GRASSLIB GRASS_BUILD_VERSION) # GRASS vector provider # SET (GRASS_VECTOR_PROVIDER_SRCS ../qgsgrassprovidermodule.cpp) - QT5_WRAP_CPP(GRASS_VECTOR_PROVIDER_MOC_SRCS ../qgsgrassprovidermodule.h) - ADD_LIBRARY(grassprovider${GRASS_BUILD_VERSION} MODULE ${GRASS_VECTOR_PROVIDER_SRCS} ${GRASS_VECTOR_PROVIDER_MOC_SRCS}) + ADD_LIBRARY(grassprovider${GRASS_BUILD_VERSION} MODULE ${GRASS_VECTOR_PROVIDER_SRCS}) SET_TARGET_PROPERTIES(grassprovider${GRASS_BUILD_VERSION} PROPERTIES COMPILE_FLAGS "-DGRASS_BASE=\\\"${GRASS_PREFIX}\\\"" ) diff --git a/src/providers/mdal/CMakeLists.txt b/src/providers/mdal/CMakeLists.txt index a0a1ae09fe4..25ef90870b5 100644 --- a/src/providers/mdal/CMakeLists.txt +++ b/src/providers/mdal/CMakeLists.txt @@ -2,19 +2,12 @@ SET(MDAL_SRCS qgsmdalprovider.cpp qgsmdaldataitems.cpp ) -SET(MDAL_MOC_HDRS - qgsmdalprovider.h - qgsmdaldataitems.h -) IF (WITH_GUI) SET(MDAL_SRCS ${MDAL_SRCS} qgsmdalprovidergui.cpp qgsmdalsourceselect.cpp ) - SET(MDAL_MOC_HDRS ${MDAL_MOC_HDRS} - qgsmdalsourceselect.h - ) ENDIF () SET(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/external/mdal/cmake ${CMAKE_MODULE_PATH}) @@ -163,8 +156,7 @@ INCLUDE_DIRECTORIES ( ${CMAKE_BINARY_DIR}/src/ui ) -QT5_WRAP_CPP(MDAL_MOC_SRCS ${MDAL_MOC_HDRS}) -ADD_LIBRARY (mdalprovider MODULE ${MDAL_SRCS} ${MDAL_MOC_HDRS} ${MDAL_MOC_SRCS} ${MDAL_LIB_SRCS} ${MDAL_LIB_HDRS}) +ADD_LIBRARY (mdalprovider MODULE ${MDAL_SRCS} ${MDAL_LIB_SRCS} ${MDAL_LIB_HDRS}) TARGET_LINK_LIBRARIES (mdalprovider qgis_core diff --git a/src/providers/mssql/CMakeLists.txt b/src/providers/mssql/CMakeLists.txt index 45d234b1289..6ac8cc7ef1d 100644 --- a/src/providers/mssql/CMakeLists.txt +++ b/src/providers/mssql/CMakeLists.txt @@ -9,13 +9,6 @@ SET(MSSQL_SRCS qgsmssqlgeomcolumntypethread.cpp ) -SET(MSSQL_MOC_HDRS - qgsmssqlprovider.h - qgsmssqltablemodel.h - qgsmssqldataitems.h - qgsmssqlgeomcolumntypethread.h -) - IF (WITH_GUI) SET(MSSQL_SRCS ${MSSQL_SRCS} qgsmssqlprovidergui.cpp @@ -23,11 +16,6 @@ IF (WITH_GUI) qgsmssqlsourceselect.cpp qgsmssqlnewconnection.cpp ) - SET(MSSQL_MOC_HDRS ${MSSQL_MOC_HDRS} - qgsmssqldataitemguiprovider.h - qgsmssqlsourceselect.h - qgsmssqlnewconnection.h - ) ENDIF () SET(MSSQL_HDRS @@ -37,8 +25,6 @@ SET(MSSQL_HDRS ######################################################## # Build -QT5_WRAP_CPP(MSSQL_MOC_SRCS ${MSSQL_MOC_HDRS}) - INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR}/src/core ${CMAKE_SOURCE_DIR}/src/core/expression @@ -64,7 +50,7 @@ IF (WITH_GUI) ENDIF () -ADD_LIBRARY(mssqlprovider MODULE ${MSSQL_SRCS} ${MSSQL_MOC_SRCS} ${MSSQL_HDRS}) +ADD_LIBRARY(mssqlprovider MODULE ${MSSQL_SRCS} ${MSSQL_HDRS}) TARGET_LINK_LIBRARIES(mssqlprovider qgis_core diff --git a/src/providers/oracle/CMakeLists.txt b/src/providers/oracle/CMakeLists.txt index 4ea0be0b335..a9b5f695546 100644 --- a/src/providers/oracle/CMakeLists.txt +++ b/src/providers/oracle/CMakeLists.txt @@ -17,24 +17,10 @@ SET(ORACLE_SRCS qgsoracletransaction.cpp ) -SET(ORACLE_MOC_HDRS - qgsoracleprovider.h - qgsoracleconn.h - qgsoracledataitems.h - qgsoraclenewconnection.h - qgsoracletablemodel.h - qgsoraclecolumntypethread.h - qgsoracleconnpool.h - qgsoracletransaction.h -) - IF (WITH_GUI) SET(ORACLE_SRCS ${ORACLE_SRCS} qgsoraclesourceselect.cpp ) - SET(ORACLE_MOC_HDRS ${ORACLE_MOC_HDRS} - qgsoraclesourceselect.h - ) ENDIF () SET(ORACLE_HDRS @@ -45,8 +31,6 @@ SET(ORACLE_HDRS ######################################################## # Build -QT5_WRAP_CPP(ORACLE_MOC_SRCS ${ORACLE_MOC_HDRS}) - INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR}/src/core ${CMAKE_SOURCE_DIR}/src/core/auth @@ -73,7 +57,7 @@ IF (WITH_GUI) ) ENDIF () -ADD_LIBRARY (oracleprovider MODULE ${ORACLE_SRCS} ${ORACLE_HDRS} ${ORACLE_MOC_SRCS}) +ADD_LIBRARY (oracleprovider MODULE ${ORACLE_SRCS} ${ORACLE_HDRS}) TARGET_LINK_LIBRARIES (oracleprovider qgis_core diff --git a/src/providers/ows/CMakeLists.txt b/src/providers/ows/CMakeLists.txt index 341e22304a8..bd16dc77f72 100644 --- a/src/providers/ows/CMakeLists.txt +++ b/src/providers/ows/CMakeLists.txt @@ -2,10 +2,6 @@ SET(OWS_SRCS qgsowsprovider.cpp qgsowsdataitems.cpp ) -SET(OWS_MOC_HDRS - qgsowsprovider.h - qgsowsdataitems.h -) INCLUDE_DIRECTORIES ( ${CMAKE_SOURCE_DIR}/src/core @@ -25,8 +21,7 @@ INCLUDE_DIRECTORIES ( INCLUDE_DIRECTORIES(SYSTEM ) -QT5_WRAP_CPP(OWS_MOC_SRCS ${OWS_MOC_HDRS}) -ADD_LIBRARY (owsprovider MODULE ${OWS_SRCS} ${OWS_MOC_SRCS}) +ADD_LIBRARY (owsprovider MODULE ${OWS_SRCS}) TARGET_LINK_LIBRARIES (owsprovider qgis_core diff --git a/src/providers/postgres/CMakeLists.txt b/src/providers/postgres/CMakeLists.txt index 3bd1989f998..f336eed5534 100644 --- a/src/providers/postgres/CMakeLists.txt +++ b/src/providers/postgres/CMakeLists.txt @@ -16,17 +16,6 @@ SET(PG_SRCS qgspostgresproviderconnection.cpp ) -SET(PG_MOC_HDRS - qgscolumntypethread.h - qgspgtablemodel.h - qgspostgresconn.h - qgspostgresconnpool.h - qgspostgresdataitems.h - qgspostgresprovider.h - qgspostgrestransaction.h - qgspostgreslistener.h -) - IF (WITH_GUI) SET(PG_GUI_SRCS qgspostgresprovidergui.cpp @@ -35,12 +24,6 @@ IF (WITH_GUI) qgspgnewconnection.cpp qgspostgresprojectstoragedialog.cpp ) - SET(PG_GUI_MOC_HDRS - qgspostgresdataitemguiprovider.h - qgspgnewconnection.h - qgspgsourceselect.h - qgspostgresprojectstoragedialog.h - ) ENDIF () SET(PG_HDRS @@ -51,9 +34,6 @@ SET(PG_HDRS ######################################################## # Build -QT5_WRAP_CPP(PG_MOC_SRCS ${PG_MOC_HDRS}) -QT5_WRAP_CPP (PG_GUI_MOC_SRCS ${PG_GUI_MOC_HDRS}) - INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR}/src/core ${CMAKE_SOURCE_DIR}/src/core/auth @@ -83,7 +63,7 @@ IF (WITH_GUI) ENDIF () # static library -ADD_LIBRARY (postgresprovider_a STATIC ${PG_SRCS} ${PG_HDRS} ${PG_MOC_SRCS}) +ADD_LIBRARY (postgresprovider_a STATIC ${PG_SRCS} ${PG_HDRS}) TARGET_LINK_LIBRARIES (postgresprovider_a ${POSTGRES_LIBRARY} ${Qt5Xml_LIBRARIES} @@ -95,7 +75,7 @@ TARGET_LINK_LIBRARIES (postgresprovider_a ) IF (WITH_GUI) - ADD_LIBRARY(postgresprovider_gui_a STATIC ${PG_GUI_SRCS} ${PG_GUI_MOC_SRCS}) + ADD_LIBRARY(postgresprovider_gui_a STATIC ${PG_GUI_SRCS}) TARGET_LINK_LIBRARIES(postgresprovider_gui_a ${POSTGRES_LIBRARY} ${Qt5Xml_LIBRARIES} @@ -118,7 +98,7 @@ IF (FORCE_STATIC_PROVIDERS) ENDIF (WITH_GUI) ELSE (FORCE_STATIC_PROVIDERS) # dynamically loaded module - ADD_LIBRARY(postgresprovider MODULE ${PG_SRCS} ${PG_GUI_SRCS} ${PG_MOC_SRCS} ${PG_GUI_MOC_SRCS} ${PG_HDRS}) + ADD_LIBRARY(postgresprovider MODULE ${PG_SRCS} ${PG_GUI_SRCS} ${PG_HDRS}) TARGET_LINK_LIBRARIES(postgresprovider ${POSTGRES_LIBRARY} diff --git a/src/providers/spatialite/CMakeLists.txt b/src/providers/spatialite/CMakeLists.txt index 3a581a3a0eb..4b4a23631c1 100644 --- a/src/providers/spatialite/CMakeLists.txt +++ b/src/providers/spatialite/CMakeLists.txt @@ -15,32 +15,18 @@ SET(SPATIALITE_SRCS qgsspatialiteproviderconnection.cpp ) -SET(SPATIALITE_MOC_HDRS - qgsspatialiteprovider.h - qgsspatialiteconnpool.h - qgsspatialitedataitems.h - qgsspatialitetablemodel.h - qgsspatialiteconnection.h -) - IF (WITH_GUI) SET(SPATIALITE_SRCS ${SPATIALITE_SRCS} qgsspatialiteprovidergui.cpp qgsspatialitedataitemguiprovider.cpp qgsspatialitesourceselect.cpp ) - SET(SPATIALITE_MOC_HDRS ${SPATIALITE_MOC_HDRS} - qgsspatialitedataitemguiprovider.h - qgsspatialitesourceselect.h - ) ENDIF () ######################################################## # Build -QT5_WRAP_CPP(SPATIALITE_MOC_SRCS ${SPATIALITE_MOC_HDRS}) - IF (WITH_GUI) INCLUDE_DIRECTORIES(SYSTEM ${QSCINTILLA_INCLUDE_DIR} @@ -69,7 +55,7 @@ INCLUDE_DIRECTORIES(SYSTEM ${SPATIALITE_INCLUDE_DIR} ) -ADD_LIBRARY (spatialiteprovider MODULE ${SPATIALITE_SRCS} ${SPATIALITE_MOC_SRCS}) +ADD_LIBRARY (spatialiteprovider MODULE ${SPATIALITE_SRCS}) TARGET_LINK_LIBRARIES(spatialiteprovider qgis_core diff --git a/src/providers/spatialite/qgsspatialitetablemodel.h b/src/providers/spatialite/qgsspatialitetablemodel.h index 749912ed215..7d83a3adda5 100644 --- a/src/providers/spatialite/qgsspatialitetablemodel.h +++ b/src/providers/spatialite/qgsspatialitetablemodel.h @@ -15,6 +15,9 @@ * * ***************************************************************************/ +#ifndef QGSSPATIALITETABLEMODEL_H +#define QGSSPATIALITETABLEMODEL_H + #include class QIcon; #include "qgswkbtypes.h" @@ -58,3 +61,5 @@ class QgsSpatiaLiteTableModel: public QStandardItemModel //! Returns qgis wkbtype from database typename QgsWkbTypes::Type qgisTypeFromDbType( const QString &dbType ) const; }; + +#endif // QGSSPATIALITETABLEMODEL_H diff --git a/src/providers/virtual/CMakeLists.txt b/src/providers/virtual/CMakeLists.txt index e702a6293af..75a33c13d18 100644 --- a/src/providers/virtual/CMakeLists.txt +++ b/src/providers/virtual/CMakeLists.txt @@ -4,7 +4,7 @@ QT5_ADD_RESOURCES(QGIS_VLAYER_SQL_FUNCTIONS_RCC sqlfunctionslist.qrc) -SET(vlayer_provider_MOC_HDRS +SET(QGIS_VLAYER_PROVIDER_HDRS qgsvirtuallayerprovider.h qgsslottofunction.h ) @@ -23,7 +23,7 @@ IF (WITH_GUI) qgsvirtuallayersourceselect.cpp qgsembeddedlayerselectdialog.cpp ) - SET(vlayer_provider_MOC_HDRS ${vlayer_provider_MOC_HDRS} + SET(QGIS_VLAYER_PROVIDER_HDRS ${QGIS_VLAYER_PROVIDER_HDRS} qgsvirtuallayersourceselect.h qgsembeddedlayerselectdialog.h ) @@ -31,8 +31,6 @@ ENDIF () QT5_WRAP_UI(vlayer_provider_UI_H qgsvirtuallayersourceselectbase.ui qgsembeddedlayerselect.ui) -QT5_WRAP_CPP(vlayer_provider_MOC_SRCS ${vlayer_provider_MOC_HDRS}) - INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR}/src/core ${CMAKE_SOURCE_DIR}/src/core/auth @@ -68,7 +66,7 @@ ENDIF () ADD_LIBRARY(virtuallayerprovider MODULE ${QGIS_VLAYER_PROVIDER_SRCS} - ${vlayer_provider_MOC_SRCS} + ${QGIS_VLAYER_PROVIDER_HDRS} ${vlayer_provider_UI_H} ${QGIS_VLAYER_SQL_FUNCTIONS_RCC} ) diff --git a/src/providers/wcs/CMakeLists.txt b/src/providers/wcs/CMakeLists.txt index 51a9e1de391..786b92c2fba 100644 --- a/src/providers/wcs/CMakeLists.txt +++ b/src/providers/wcs/CMakeLists.txt @@ -6,26 +6,14 @@ SET (WCS_SRCS qgswcsdataitems.cpp ) -SET (WCS_MOC_HDRS - qgswcsprovider.h - qgswcscapabilities.h - qgswcsdataitems.h -) - IF (WITH_GUI) SET(WCS_SRCS ${WCS_SRCS} qgswcsprovidergui.cpp qgswcsdataitemguiprovider.cpp qgswcssourceselect.cpp ) - SET(WCS_MOC_HDRS ${WCS_MOC_HDRS} - qgswcsdataitemguiprovider.h - qgswcssourceselect.h - ) ENDIF () -QT5_WRAP_CPP (WCS_MOC_SRCS ${WCS_MOC_HDRS}) - INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR}/src/core ${CMAKE_SOURCE_DIR}/src/core/auth @@ -49,7 +37,7 @@ INCLUDE_DIRECTORIES(SYSTEM ${QTKEYCHAIN_INCLUDE_DIR} ) -ADD_LIBRARY(wcsprovider MODULE ${WCS_SRCS} ${WCS_MOC_SRCS}) +ADD_LIBRARY(wcsprovider MODULE ${WCS_SRCS}) TARGET_LINK_LIBRARIES(wcsprovider qgis_core diff --git a/src/providers/wfs/CMakeLists.txt b/src/providers/wfs/CMakeLists.txt index 67c667d38e1..71b324aecd9 100644 --- a/src/providers/wfs/CMakeLists.txt +++ b/src/providers/wfs/CMakeLists.txt @@ -28,26 +28,6 @@ SET(WFS_SRCS qgsoapifutils.cpp ) -SET (WFS_MOC_HDRS - qgswfscapabilities.h - qgswfsconnection.h - qgswfsdataitems.h - qgswfsprovider.h - qgswfsfeatureiterator.h - qgswfsrequest.h - qgsbasenetworkrequest.h - qgswfsdescribefeaturetype.h - qgswfstransactionrequest.h - qgswfsshareddata.h - qgsbackgroundcachedfeatureiterator.h - qgscachedirectorymanager.h - qgsoapiflandingpagerequest.h - qgsoapifapirequest.h - qgsoapifcollection.h - qgsoapifitemsrequest.h - qgsoapifprovider.h -) - IF (WITH_GUI) SET(WFS_SRCS ${WFS_SRCS} qgswfsprovidergui.cpp @@ -56,18 +36,11 @@ IF (WITH_GUI) qgswfsnewconnection.cpp qgswfsguiutils.cpp ) - SET(WFS_MOC_HDRS ${WFS_MOC_HDRS} - qgswfsdataitemguiprovider.h - qgswfssourceselect.h - qgswfsnewconnection.h - ) ENDIF () ######################################################## # Build -QT5_WRAP_CPP(WFS_MOC_SRCS ${WFS_MOC_HDRS}) - INCLUDE_DIRECTORIES ( ${CMAKE_SOURCE_DIR}/src/core ${CMAKE_SOURCE_DIR}/src/core/auth @@ -100,7 +73,7 @@ IF (WITH_GUI) ) ENDIF () -ADD_LIBRARY (wfsprovider MODULE ${WFS_SRCS} ${WFS_MOC_SRCS}) +ADD_LIBRARY (wfsprovider MODULE ${WFS_SRCS}) TARGET_LINK_LIBRARIES (wfsprovider ${EXPAT_LIBRARY} diff --git a/src/providers/wms/CMakeLists.txt b/src/providers/wms/CMakeLists.txt index d4d98fad591..30b3c06b87a 100644 --- a/src/providers/wms/CMakeLists.txt +++ b/src/providers/wms/CMakeLists.txt @@ -5,11 +5,6 @@ SET (WMS_SRCS qgswmsdataitems.cpp qgsxyzconnection.cpp ) -SET (WMS_MOC_HDRS - qgswmscapabilities.h - qgswmsprovider.h - qgswmsdataitems.h -) IF (WITH_GUI) SET(WMS_GUI_SRCS @@ -20,18 +15,8 @@ IF (WITH_GUI) qgswmtsdimensions.cpp qgsxyzconnectiondialog.cpp ) - SET(WMS_GUI_MOC_HDRS - qgswmssourceselect.h - qgswmsdataitemguiproviders.h - qgstilescalewidget.h - qgswmtsdimensions.h - qgsxyzconnectiondialog.h - ) ENDIF () -QT5_WRAP_CPP (WMS_MOC_SRCS ${WMS_MOC_HDRS}) -QT5_WRAP_CPP (WMS_GUI_MOC_SRCS ${WMS_GUI_MOC_HDRS}) - INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR}/src/core ${CMAKE_SOURCE_DIR}/src/core/auth @@ -57,7 +42,7 @@ INCLUDE_DIRECTORIES(SYSTEM ) # static library -ADD_LIBRARY(wmsprovider_a STATIC ${WMS_SRCS} ${WMS_MOC_SRCS}) +ADD_LIBRARY(wmsprovider_a STATIC ${WMS_SRCS}) TARGET_LINK_LIBRARIES(wmsprovider_a ${Qt5Xml_LIBRARIES} ${Qt5Core_LIBRARIES} @@ -69,7 +54,7 @@ TARGET_LINK_LIBRARIES(wmsprovider_a TARGET_COMPILE_DEFINITIONS(wmsprovider_a PRIVATE "-DQT_NO_FOREACH") IF (WITH_GUI) - ADD_LIBRARY(wmsprovider_gui_a STATIC ${WMS_GUI_SRCS} ${WMS_GUI_MOC_SRCS}) + ADD_LIBRARY(wmsprovider_gui_a STATIC ${WMS_GUI_SRCS}) TARGET_LINK_LIBRARIES(wmsprovider_gui_a ${Qt5Xml_LIBRARIES} ${Qt5Core_LIBRARIES} @@ -92,7 +77,7 @@ IF (FORCE_STATIC_PROVIDERS) ENDIF (WITH_GUI) ELSE (FORCE_STATIC_PROVIDERS) # dynamically loaded module - ADD_LIBRARY(wmsprovider MODULE ${WMS_SRCS} ${WMS_GUI_SRCS} ${WMS_MOC_SRCS} ${WMS_GUI_MOC_SRCS}) + ADD_LIBRARY(wmsprovider MODULE ${WMS_SRCS} ${WMS_GUI_SRCS}) TARGET_LINK_LIBRARIES(wmsprovider qgis_core diff --git a/src/server/CMakeLists.txt b/src/server/CMakeLists.txt index 394bc200449..4c7fd8e0746 100644 --- a/src/server/CMakeLists.txt +++ b/src/server/CMakeLists.txt @@ -60,24 +60,10 @@ SET (QGIS_SERVER_HDRS qgsserverquerystringparameter.h ) - -SET (QGIS_SERVER_MOC_HDRS - qgscapabilitiescache.h - qgsconfigcache.h - qgsserverlogger.h - qgsserverogcapi.h - qgsserversettings.h - qgsserverparameters.h - qgsserverquerystringparameter.h -) - - ############################################################# # qgis_server library -SET(QGIS_SERVER_MOC_HDRS ${QGIS_SERVER_MOC_HDRS}) - IF (WITH_SERVER_PLUGINS) SET(QGIS_SERVER_SRCS ${QGIS_SERVER_SRCS} qgsserverplugins.cpp @@ -89,14 +75,6 @@ IF (WITH_SERVER_PLUGINS) ) ENDIF (WITH_SERVER_PLUGINS) -QT5_WRAP_CPP(QGIS_SERVER_MOC_SRCS ${QGIS_SERVER_MOC_HDRS}) - -IF(MSVC) - SET_SOURCE_FILES_PROPERTIES(${QGIS_SERVER_MOC_SRCS} PROPERTIES COMPILE_FLAGS "/wd4512 /wd4996" ) -ELSE(MSVC) - SET_SOURCE_FILES_PROPERTIES(${QGIS_SERVER_MOC_SRCS} PROPERTIES COMPILE_FLAGS "-Wno-deprecated-declarations" ) -ENDIF(MSVC) - INCLUDE_DIRECTORIES(SYSTEM ${GDAL_INCLUDE_DIR} ${FCGI_INCLUDE_DIR} @@ -135,7 +113,7 @@ INCLUDE_DIRECTORIES( ${CMAKE_BINARY_DIR}/src/server ) -ADD_LIBRARY(qgis_server SHARED ${QGIS_SERVER_SRCS} ${QGIS_SERVER_MOC_SRCS} ${QGIS_SERVER_HDRS} ${QGIS_SERVER_MOC_HDRS}) +ADD_LIBRARY(qgis_server SHARED ${QGIS_SERVER_SRCS} ${QGIS_SERVER_HDRS}) GENERATE_EXPORT_HEADER( qgis_server diff --git a/src/server/services/wfs/CMakeLists.txt b/src/server/services/wfs/CMakeLists.txt index b49bdea634c..526c54f8ae2 100644 --- a/src/server/services/wfs/CMakeLists.txt +++ b/src/server/services/wfs/CMakeLists.txt @@ -2,7 +2,7 @@ ######################################################## # Files -SET (wfs_SRCS +SET (WFS_SRCS qgswfs.cpp qgswfsutils.cpp qgswfsgetcapabilities.cpp @@ -14,16 +14,14 @@ SET (wfs_SRCS qgswfsparameters.cpp ) -SET (wfs_MOC_HDRS +SET (WFS_HDRS qgswfsparameters.h ) ######################################################## # Build -QT5_WRAP_CPP(wfs_MOC_SRCS ${wfs_MOC_HDRS}) - -ADD_LIBRARY (wfs MODULE ${wfs_SRCS} ${wfs_MOC_SRCS} ${wfs_MOC_HDRS}) +ADD_LIBRARY (wfs MODULE ${WFS_SRCS} ${WFS_HDRS}) INCLUDE_DIRECTORIES(SYSTEM diff --git a/src/server/services/wfs3/CMakeLists.txt b/src/server/services/wfs3/CMakeLists.txt index 37c8f7f1ecd..1156eb4853b 100644 --- a/src/server/services/wfs3/CMakeLists.txt +++ b/src/server/services/wfs3/CMakeLists.txt @@ -1,23 +1,17 @@ ######################################################## # Files -SET (wfs3_SRCS +SET (WFS3_SRCS ${CMAKE_SOURCE_DIR}/external/nlohmann/json.hpp ${CMAKE_SOURCE_DIR}/external/inja/inja.hpp qgswfs3.cpp qgswfs3handlers.cpp ) -SET (wfs3_MOC_HDRS -) - ######################################################## # Build -QT5_WRAP_CPP(wfs3_MOC_SRCS ${wfs3_MOC_HDRS}) - -ADD_LIBRARY (wfs3 MODULE ${wfs3_SRCS} ${wfs3_MOC_SRCS} ${wfs3_MOC_HDRS}) - +ADD_LIBRARY (wfs3 MODULE ${WFS3_SRCS}) INCLUDE_DIRECTORIES(SYSTEM ${GDAL_INCLUDE_DIR} diff --git a/src/server/services/wms/CMakeLists.txt b/src/server/services/wms/CMakeLists.txt index 44a92eb86a3..68a16376c64 100644 --- a/src/server/services/wms/CMakeLists.txt +++ b/src/server/services/wms/CMakeLists.txt @@ -2,7 +2,7 @@ ######################################################## # Files -SET (wms_SRCS +SET (WMS_SRCS qgswms.cpp qgswmsutils.cpp qgsdxfwriter.cpp @@ -23,7 +23,7 @@ SET (wms_SRCS qgswmsrendercontext.cpp ) -SET (wms_MOC_HDRS +SET (WMS_HDRS qgswmsparameters.h qgswmsserviceexception.h ) @@ -31,9 +31,7 @@ SET (wms_MOC_HDRS ######################################################## # Build -QT5_WRAP_CPP(wms_MOC_SRCS ${wms_MOC_HDRS}) - -ADD_LIBRARY (wms MODULE ${wms_SRCS} ${wms_MOC_SRCS} ${wms_MOC_HDRS}) +ADD_LIBRARY (wms MODULE ${WMS_SRCS} ${WMS_HDRS}) INCLUDE_DIRECTORIES(SYSTEM diff --git a/src/server/services/wmts/CMakeLists.txt b/src/server/services/wmts/CMakeLists.txt index e63031b9260..0e9d9018dcb 100644 --- a/src/server/services/wmts/CMakeLists.txt +++ b/src/server/services/wmts/CMakeLists.txt @@ -2,7 +2,7 @@ ######################################################## # Files -SET (wmts_SRCS +SET (WMTS_SRCS qgswmts.cpp qgswmtsutils.cpp qgswmtsgetcapabilities.cpp @@ -11,16 +11,14 @@ SET (wmts_SRCS qgswmtsparameters.cpp ) -SET (wmts_MOC_HDRS +SET (WMTS_HDRS qgswmtsparameters.h ) ######################################################## # Build -QT5_WRAP_CPP(wmts_MOC_SRCS ${wmts_MOC_HDRS}) - -ADD_LIBRARY (wmts MODULE ${wmts_SRCS} ${wmts_MOC_SRCS} ${wmts_MOC_HDRS}) +ADD_LIBRARY (wmts MODULE ${WMTS_SRCS} ${WMTS_HDRS}) INCLUDE_DIRECTORIES(SYSTEM