Skip to content
Permalink
Browse files

Code shuffle

  • Loading branch information
nyalldawson committed May 11, 2020
1 parent 7fc9c55 commit e4b201a414fa8cc009e6b726aaf4dbd92c19e70b
@@ -98,6 +98,7 @@ IF(WITH_APIDOC)
${CMAKE_SOURCE_DIR}/src/core/raster
${CMAKE_SOURCE_DIR}/src/core/scalebar
${CMAKE_SOURCE_DIR}/src/core/symbology
${CMAKE_SOURCE_DIR}/src/core/textrenderer
${CMAKE_SOURCE_DIR}/src/core/validity
${CMAKE_SOURCE_DIR}/src/core/vectortile
${CMAKE_SOURCE_DIR}/src/gui
@@ -97,6 +97,7 @@ INCLUDE_DIRECTORIES(
${CMAKE_SOURCE_DIR}/src/core/annotations
${CMAKE_SOURCE_DIR}/src/core/auth
${CMAKE_SOURCE_DIR}/src/core/callouts
${CMAKE_SOURCE_DIR}/src/core/classification
${CMAKE_SOURCE_DIR}/src/core/expression
${CMAKE_SOURCE_DIR}/src/core/pal
${CMAKE_SOURCE_DIR}/src/core/diagram
@@ -121,7 +122,7 @@ INCLUDE_DIRECTORIES(
${CMAKE_SOURCE_DIR}/src/core/raster
${CMAKE_SOURCE_DIR}/src/core/scalebar
${CMAKE_SOURCE_DIR}/src/core/symbology
${CMAKE_SOURCE_DIR}/src/core/classification
${CMAKE_SOURCE_DIR}/src/core/textrenderer
${CMAKE_SOURCE_DIR}/src/core/validity
${CMAKE_SOURCE_DIR}/src/core/vectortile
${CMAKE_SOURCE_DIR}/src/plugins
@@ -1,7 +1,7 @@
/************************************************************************
* This file has been generated automatically from *
* *
* src/core/qgstextrenderer.h *
* src/core/textrenderer/qgstextrenderer.h *
* *
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
************************************************************************/
@@ -2130,7 +2130,7 @@ Attempts to decode a string representation of a text orientation.
/************************************************************************
* This file has been generated automatically from *
* *
* src/core/qgstextrenderer.h *
* src/core/textrenderer/qgstextrenderer.h *
* *
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
************************************************************************/
@@ -209,7 +209,6 @@
%Include auto_generated/qgstemporalutils.sip
%Include auto_generated/qgstessellator.sip
%Include auto_generated/qgstestutils.sip
%Include auto_generated/qgstextrenderer.sip
%Include auto_generated/qgstiles.sip
%Include auto_generated/qgstolerance.sip
%Include auto_generated/qgstracer.sip
@@ -546,6 +545,7 @@
%Include auto_generated/symbology/qgssymbollayerregistry.sip
%Include auto_generated/symbology/qgssymbollayerutils.sip
%Include auto_generated/symbology/qgsvectorfieldsymbollayer.sip
%Include auto_generated/textrenderer/qgstextrenderer.sip
%Include auto_generated/validity/qgsabstractvaliditycheck.sip
%Include auto_generated/validity/qgsvaliditycheckcontext.sip
%Include auto_generated/validity/qgsvaliditycheckregistry.sip
@@ -195,6 +195,8 @@ SET(QGIS_CORE_SRCS
scalebar/qgssteppedlinescalebarrenderer.cpp
scalebar/qgsticksscalebarrenderer.cpp

textrenderer/qgstextrenderer.cpp

qgis.cpp
qgsabstractcontentcache.cpp
qgsabstractgeopdfexporter.cpp
@@ -404,7 +406,6 @@ SET(QGIS_CORE_SRCS
qgstemporalrangeobject.cpp
qgstemporalutils.cpp
qgstessellator.cpp
qgstextrenderer.cpp
qgstilecache.cpp
qgstiles.cpp
qgstolerance.cpp
@@ -964,7 +965,6 @@ SET(QGIS_CORE_HDRS
qgstemporalutils.h
qgstessellator.h
qgstestutils.h
qgstextrenderer.h
qgsthreadingutils.h
qgstilecache.h
qgstiles.h
@@ -1374,6 +1374,8 @@ SET(QGIS_CORE_HDRS
symbology/qgssymbollayerutils.h
symbology/qgsvectorfieldsymbollayer.h

textrenderer/qgstextrenderer.h

validity/qgsabstractvaliditycheck.h
validity/qgsvaliditycheckcontext.h
validity/qgsvaliditycheckregistry.h
@@ -1406,7 +1408,8 @@ SET(QGIS_CORE_PRIVATE_HDRS
qgsproperty_p.h
qgsrelation_p.h
qgsspatialindexkdbush_p.h
qgstextrenderer_p.h

textrenderer/qgstextrenderer_p.h
)

IF (NOT WITH_QTWEBKIT)
@@ -1477,6 +1480,7 @@ INCLUDE_DIRECTORIES(
layertree
layout
locator
mesh
metadata
numericformats
pal
@@ -1491,7 +1495,7 @@ INCLUDE_DIRECTORIES(
renderer
scalebar
symbology
mesh
textrenderer
validity
vectortile
${CMAKE_SOURCE_DIR}/external
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 comments on commit e4b201a

Please sign in to comment.
You can’t perform that action at this time.