Skip to content

Commit ddf5ace

Browse files
nyalldawsonnyalldawson
authoredJul 6, 2017
Merge pull request #4807 from nyalldawson/layout_item_registry
Create a layout item registry for item types
·
ltr-3_40final-3_0_0
2 parents f3a6df5 + ada01d8 commit ddf5ace

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+2120
-5
lines changed
 

‎python/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,7 @@ INCLUDE_DIRECTORIES(
123123
${CMAKE_SOURCE_DIR}/src/gui/editorwidgets/core
124124
${CMAKE_SOURCE_DIR}/src/gui/effects
125125
${CMAKE_SOURCE_DIR}/src/gui/layertree
126+
${CMAKE_SOURCE_DIR}/src/gui/layout
126127
${CMAKE_SOURCE_DIR}/src/gui/locator
127128
${CMAKE_SOURCE_DIR}/src/plugins
128129

‎python/core/core_auto.sip

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -153,6 +153,7 @@
153153
%Include composer/qgscomposermultiframecommand.sip
154154
%Include composer/qgscomposertexttable.sip
155155
%Include composer/qgspaperitem.sip
156+
%Include layout/qgslayout.sip
156157
%Include layout/qgslayoutmeasurement.sip
157158
%Include layout/qgslayoutmeasurementconverter.sip
158159
%Include layout/qgspagesizeregistry.sip
@@ -371,6 +372,9 @@
371372
%Include gps/qgsgpsdetector.sip
372373
%Include gps/qgsnmeaconnection.sip
373374
%Include gps/qgsgpsdconnection.sip
375+
%Include layout/qgslayoutitem.sip
376+
%Include layout/qgslayoutitemregistry.sip
377+
%Include layout/qgslayoutobject.sip
374378
%Include symbology-ng/qgscptcityarchive.sip
375379
%Include symbology-ng/qgssvgcache.sip
376380
%Include symbology-ng/qgsstyle.sip

0 commit comments

Comments
 (0)
Please sign in to comment.