diff --git a/python/core/core_auto.sip b/python/core/core_auto.sip index 759697b52bf..915817dd0d7 100644 --- a/python/core/core_auto.sip +++ b/python/core/core_auto.sip @@ -118,6 +118,7 @@ %Include auto_generated/qgsmaptopixelgeometrysimplifier.sip %Include auto_generated/qgsmapunitscale.sip %Include auto_generated/qgsmargins.sip +%Include auto_generated/qgsmaskidprovider.sip %Include auto_generated/qgsmessagelog.sip %Include auto_generated/qgsmessageoutput.sip %Include auto_generated/qgsmimedatautils.sip @@ -493,5 +494,4 @@ %Include auto_generated/gps/qgsqtlocationconnection.sip %Include auto_generated/gps/qgsgpsconnectionregistry.sip %Include auto_generated/symbology/qgsmasksymbollayer.sip -%Include auto_generated/qgsmaskidprovider.sip %Include auto_generated/qgsuserprofile.sip diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt index 5dd819d9263..ae5835465aa 100644 --- a/src/core/CMakeLists.txt +++ b/src/core/CMakeLists.txt @@ -785,6 +785,7 @@ SET(QGIS_CORE_HDRS qgsmaptopixelgeometrysimplifier.h qgsmapunitscale.h qgsmargins.h + qgsmaskidprovider.h qgsmessagelog.h qgsmessageoutput.h qgsmimedatautils.h diff --git a/src/core/qgsmaskidprovider.h b/src/core/qgsmaskidprovider.h index 67fea75cd18..82afd4d27f2 100644 --- a/src/core/qgsmaskidprovider.h +++ b/src/core/qgsmaskidprovider.h @@ -18,7 +18,7 @@ #include #include -#include "symbology/qgssymbollayerreference.h" +#include "qgssymbollayerreference.h" /** * \ingroup core diff --git a/src/core/qgsrendercontext.h b/src/core/qgsrendercontext.h index ab118fc725a..aae3a1c7c57 100644 --- a/src/core/qgsrendercontext.h +++ b/src/core/qgsrendercontext.h @@ -33,7 +33,7 @@ #include "qgsdistancearea.h" #include "qgscoordinatetransformcontext.h" #include "qgspathresolver.h" -#include "symbology/qgssymbollayerreference.h" +#include "qgssymbollayerreference.h" class QPainter; class QgsAbstractGeometry; diff --git a/src/core/qgstextrenderer.h b/src/core/qgstextrenderer.h index d1114ab2ffd..9e0cf5e329c 100644 --- a/src/core/qgstextrenderer.h +++ b/src/core/qgstextrenderer.h @@ -21,7 +21,7 @@ #include "qgis_core.h" #include "qgsmapunitscale.h" #include "qgsunittypes.h" -#include "symbology/qgssymbollayerreference.h" +#include "qgssymbollayerreference.h" #include #include diff --git a/src/plugins/coordinate_capture/CMakeLists.txt b/src/plugins/coordinate_capture/CMakeLists.txt index 2e6535cd83a..a882e5a4945 100644 --- a/src/plugins/coordinate_capture/CMakeLists.txt +++ b/src/plugins/coordinate_capture/CMakeLists.txt @@ -25,6 +25,7 @@ INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR}/src/core/layertree ${CMAKE_SOURCE_DIR}/src/core/metadata ${CMAKE_SOURCE_DIR}/src/core/raster + ${CMAKE_SOURCE_DIR}/src/core/symbology ${CMAKE_SOURCE_DIR}/src/gui ${CMAKE_SOURCE_DIR}/src/plugins ${CMAKE_SOURCE_DIR}/external diff --git a/src/plugins/evis/CMakeLists.txt b/src/plugins/evis/CMakeLists.txt index c93dbe6aa94..7669ff421f2 100644 --- a/src/plugins/evis/CMakeLists.txt +++ b/src/plugins/evis/CMakeLists.txt @@ -50,6 +50,7 @@ INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR}/src/core/layertree ${CMAKE_SOURCE_DIR}/src/core/metadata ${CMAKE_SOURCE_DIR}/src/core/raster + ${CMAKE_SOURCE_DIR}/src/core/symbology ${CMAKE_SOURCE_DIR}/src/plugins ${CMAKE_SOURCE_DIR}/external ${CMAKE_SOURCE_DIR}/external/nlohmann diff --git a/src/plugins/gps_importer/CMakeLists.txt b/src/plugins/gps_importer/CMakeLists.txt index 8583da85b68..6d5277be758 100644 --- a/src/plugins/gps_importer/CMakeLists.txt +++ b/src/plugins/gps_importer/CMakeLists.txt @@ -33,6 +33,7 @@ INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR}/src/core/layertree ${CMAKE_SOURCE_DIR}/src/core/metadata ${CMAKE_SOURCE_DIR}/src/core/gps + ${CMAKE_SOURCE_DIR}/src/core/symbology ${CMAKE_SOURCE_DIR}/src/gui ${CMAKE_SOURCE_DIR}/src/plugins ${CMAKE_SOURCE_DIR}/external diff --git a/src/plugins/topology/CMakeLists.txt b/src/plugins/topology/CMakeLists.txt index 4caaba4f39c..17eb1e62647 100644 --- a/src/plugins/topology/CMakeLists.txt +++ b/src/plugins/topology/CMakeLists.txt @@ -38,6 +38,7 @@ INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR}/src/core/layertree ${CMAKE_SOURCE_DIR}/src/core/metadata ${CMAKE_SOURCE_DIR}/src/core/raster + ${CMAKE_SOURCE_DIR}/src/core/symbology ${CMAKE_SOURCE_DIR}/src/gui ${CMAKE_SOURCE_DIR}/src/plugins ${CMAKE_SOURCE_DIR}/external diff --git a/src/providers/db2/CMakeLists.txt b/src/providers/db2/CMakeLists.txt index 92230d9a1d1..6470b20092d 100644 --- a/src/providers/db2/CMakeLists.txt +++ b/src/providers/db2/CMakeLists.txt @@ -39,6 +39,7 @@ INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR}/src/core/expression ${CMAKE_SOURCE_DIR}/src/core/geometry ${CMAKE_SOURCE_DIR}/src/core/metadata + ${CMAKE_SOURCE_DIR}/src/core/symbology ${CMAKE_SOURCE_DIR}/src/gui ${CMAKE_SOURCE_DIR}/src/gui/auth ${CMAKE_SOURCE_DIR}/src/ui diff --git a/src/providers/delimitedtext/CMakeLists.txt b/src/providers/delimitedtext/CMakeLists.txt index a0067b2bb29..70154dc0461 100644 --- a/src/providers/delimitedtext/CMakeLists.txt +++ b/src/providers/delimitedtext/CMakeLists.txt @@ -24,6 +24,7 @@ INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR}/src/core/geometry ${CMAKE_SOURCE_DIR}/src/core/layertree ${CMAKE_SOURCE_DIR}/src/core/metadata + ${CMAKE_SOURCE_DIR}/src/core/symbology ${CMAKE_SOURCE_DIR}/src/gui ${CMAKE_SOURCE_DIR}/external ${CMAKE_SOURCE_DIR}/external/nlohmann diff --git a/src/providers/gpx/CMakeLists.txt b/src/providers/gpx/CMakeLists.txt index 94b32572762..22fced96da8 100644 --- a/src/providers/gpx/CMakeLists.txt +++ b/src/providers/gpx/CMakeLists.txt @@ -16,6 +16,7 @@ INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR}/src/core/geometry ${CMAKE_SOURCE_DIR}/src/core/metadata ${CMAKE_SOURCE_DIR}/src/core/expression + ${CMAKE_SOURCE_DIR}/src/core/symbology ${CMAKE_SOURCE_DIR}/external ${CMAKE_SOURCE_DIR}/external/nlohmann diff --git a/src/providers/grass/CMakeLists.txt b/src/providers/grass/CMakeLists.txt index fc532e20665..b8d65737cb1 100644 --- a/src/providers/grass/CMakeLists.txt +++ b/src/providers/grass/CMakeLists.txt @@ -8,6 +8,7 @@ INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR}/src/core/geometry ${CMAKE_SOURCE_DIR}/src/core/metadata ${CMAKE_SOURCE_DIR}/src/core/raster + ${CMAKE_SOURCE_DIR}/src/core/symbology ${CMAKE_SOURCE_DIR}/src/gui ${CMAKE_SOURCE_DIR}/external ${CMAKE_SOURCE_DIR}/external/nlohmann diff --git a/src/providers/mdal/CMakeLists.txt b/src/providers/mdal/CMakeLists.txt index 25ef90870b5..aeb2923da1b 100644 --- a/src/providers/mdal/CMakeLists.txt +++ b/src/providers/mdal/CMakeLists.txt @@ -146,6 +146,7 @@ INCLUDE_DIRECTORIES ( ${CMAKE_SOURCE_DIR}/src/core/expression ${CMAKE_SOURCE_DIR}/src/core/geometry ${CMAKE_SOURCE_DIR}/src/core/metadata + ${CMAKE_SOURCE_DIR}/src/core/symbology ${CMAKE_SOURCE_DIR}/src/gui ${CMAKE_SOURCE_DIR}/src/gui/auth ${CMAKE_SOURCE_DIR}/external diff --git a/src/providers/mssql/CMakeLists.txt b/src/providers/mssql/CMakeLists.txt index 6ac8cc7ef1d..ed82b1590f0 100644 --- a/src/providers/mssql/CMakeLists.txt +++ b/src/providers/mssql/CMakeLists.txt @@ -30,6 +30,7 @@ INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR}/src/core/expression ${CMAKE_SOURCE_DIR}/src/core/geometry ${CMAKE_SOURCE_DIR}/src/core/metadata + ${CMAKE_SOURCE_DIR}/src/core/symbology ${CMAKE_SOURCE_DIR}/src/gui ${CMAKE_SOURCE_DIR}/external ${CMAKE_SOURCE_DIR}/external/nlohmann diff --git a/src/providers/oracle/CMakeLists.txt b/src/providers/oracle/CMakeLists.txt index a9b5f695546..3916f1d453b 100644 --- a/src/providers/oracle/CMakeLists.txt +++ b/src/providers/oracle/CMakeLists.txt @@ -37,6 +37,7 @@ INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR}/src/core/expression ${CMAKE_SOURCE_DIR}/src/core/geometry ${CMAKE_SOURCE_DIR}/src/core/metadata + ${CMAKE_SOURCE_DIR}/src/core/symbology ${CMAKE_SOURCE_DIR}/src/gui ${CMAKE_SOURCE_DIR}/src/gui/auth ${CMAKE_SOURCE_DIR}/external diff --git a/src/providers/ows/CMakeLists.txt b/src/providers/ows/CMakeLists.txt index bd16dc77f72..48d58198676 100644 --- a/src/providers/ows/CMakeLists.txt +++ b/src/providers/ows/CMakeLists.txt @@ -9,6 +9,7 @@ INCLUDE_DIRECTORIES ( ${CMAKE_SOURCE_DIR}/src/core/geometry ${CMAKE_SOURCE_DIR}/src/core/auth ${CMAKE_SOURCE_DIR}/src/core/metadata + ${CMAKE_SOURCE_DIR}/src/core/symbology ${CMAKE_SOURCE_DIR}/src/gui ${CMAKE_SOURCE_DIR}/src/gui/auth ${CMAKE_SOURCE_DIR}/external diff --git a/src/providers/postgres/CMakeLists.txt b/src/providers/postgres/CMakeLists.txt index f336eed5534..1fc13117b95 100644 --- a/src/providers/postgres/CMakeLists.txt +++ b/src/providers/postgres/CMakeLists.txt @@ -40,6 +40,7 @@ INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR}/src/core/expression ${CMAKE_SOURCE_DIR}/src/core/geometry ${CMAKE_SOURCE_DIR}/src/core/metadata + ${CMAKE_SOURCE_DIR}/src/core/symbology ${CMAKE_SOURCE_DIR}/src/gui ${CMAKE_SOURCE_DIR}/src/gui/auth ${CMAKE_SOURCE_DIR}/external diff --git a/src/providers/wcs/CMakeLists.txt b/src/providers/wcs/CMakeLists.txt index 786b92c2fba..eeb441977eb 100644 --- a/src/providers/wcs/CMakeLists.txt +++ b/src/providers/wcs/CMakeLists.txt @@ -21,6 +21,7 @@ INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR}/src/core/raster ${CMAKE_SOURCE_DIR}/src/core/geometry ${CMAKE_SOURCE_DIR}/src/core/metadata + ${CMAKE_SOURCE_DIR}/src/core/symbology ${CMAKE_SOURCE_DIR}/src/gui ${CMAKE_SOURCE_DIR}/src/gui/auth ${CMAKE_SOURCE_DIR}/src/core/providers/gdal diff --git a/src/providers/wfs/CMakeLists.txt b/src/providers/wfs/CMakeLists.txt index 71b324aecd9..e219506f5e3 100644 --- a/src/providers/wfs/CMakeLists.txt +++ b/src/providers/wfs/CMakeLists.txt @@ -49,6 +49,7 @@ INCLUDE_DIRECTORIES ( ${CMAKE_SOURCE_DIR}/src/core/symbology # needed by qgsvectorfilewriter.h ${CMAKE_SOURCE_DIR}/src/core/geocms/geonode ${CMAKE_SOURCE_DIR}/src/core/metadata + ${CMAKE_SOURCE_DIR}/src/core/symbology ${CMAKE_SOURCE_DIR}/src/gui ${CMAKE_SOURCE_DIR}/src/gui/auth ${CMAKE_SOURCE_DIR}/external diff --git a/src/providers/wms/CMakeLists.txt b/src/providers/wms/CMakeLists.txt index 30b3c06b87a..60dc3448db3 100644 --- a/src/providers/wms/CMakeLists.txt +++ b/src/providers/wms/CMakeLists.txt @@ -25,6 +25,7 @@ INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR}/src/core/geocms/geonode ${CMAKE_SOURCE_DIR}/src/core/raster ${CMAKE_SOURCE_DIR}/src/core/metadata + ${CMAKE_SOURCE_DIR}/src/core/symbology ${CMAKE_SOURCE_DIR}/src/gui ${CMAKE_SOURCE_DIR}/src/gui/auth ${CMAKE_SOURCE_DIR}/external diff --git a/tests/bench/CMakeLists.txt b/tests/bench/CMakeLists.txt index eca0e87cebc..b4fd4da6134 100644 --- a/tests/bench/CMakeLists.txt +++ b/tests/bench/CMakeLists.txt @@ -20,6 +20,7 @@ INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR}/src/core/geometry ${CMAKE_SOURCE_DIR}/src/core/metadata ${CMAKE_SOURCE_DIR}/src/core/raster + ${CMAKE_SOURCE_DIR}/src/core/symbology ${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}/src/core diff --git a/tests/src/geometry_checker/CMakeLists.txt b/tests/src/geometry_checker/CMakeLists.txt index a658b50fc58..70bc31b037e 100644 --- a/tests/src/geometry_checker/CMakeLists.txt +++ b/tests/src/geometry_checker/CMakeLists.txt @@ -9,6 +9,7 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/src/core/expression ${CMAKE_SOURCE_DIR}/src/core/geometry ${CMAKE_SOURCE_DIR}/src/core/metadata + ${CMAKE_SOURCE_DIR}/src/core/symbology ${CMAKE_SOURCE_DIR}/src/analysis/ ${CMAKE_SOURCE_DIR}/src/analysis/vector/geometry_checker ${CMAKE_SOURCE_DIR}/src/test