Skip to content

Commit b9f94f4

Browse files
author
mhugent
committed
Moved composer view to gui for potential reuse by plugins
git-svn-id: http://svn.osgeo.org/qgis/trunk@9146 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent 8449c22 commit b9f94f4

File tree

4 files changed

+3
-3
lines changed

4 files changed

+3
-3
lines changed

src/app/CMakeLists.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,6 @@ SET(QGIS_APP_SRCS
6363
composer/qgscomposerscalebarwidget.cpp
6464
composer/qgscomposerlegenditemdialog.cpp
6565
composer/qgscomposerlegendwidget.cpp
66-
composer/qgscomposerview.cpp
6766
composer/qgscompositionwidget.cpp
6867

6968
legend/qgslegendgroup.cpp
@@ -127,7 +126,6 @@ SET (QGIS_APP_MOC_HDRS
127126
composer/qgscomposermapwidget.h
128127
composer/qgscomposerpicturewidget.h
129128
composer/qgscomposerscalebarwidget.h
130-
composer/qgscomposerview.h
131129
composer/qgscompositionwidget.h
132130

133131
legend/qgslegend.h

src/gui/CMakeLists.txt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ SET(QGIS_GUI_SRCS
33
qgisgui.cpp
44
qgisinterface.cpp
55
qgscolorbutton.cpp
6+
qgscomposerview.cpp
67
qgscursors.cpp
78
qgsdetaileditemdelegate.cpp
89
qgsdetaileditemwidget.cpp
@@ -28,6 +29,7 @@ qgsvertexmarker.cpp
2829
)
2930

3031
SET(QGIS_GUI_MOC_HDRS
32+
qgscomposerview.h
3133
qgsdetaileditemdelegate.h
3234
qgsdetaileditemwidget.h
3335
qgisinterface.h
@@ -44,7 +46,7 @@ qgsquickprint.h
4446
QT4_WRAP_CPP(QGIS_GUI_MOC_SRCS ${QGIS_GUI_MOC_HDRS})
4547

4648
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR} ../core
47-
../core/raster ../core/renderer ../core/symbology
49+
../core/composer ../core/raster ../core/renderer ../core/symbology
4850
${CMAKE_CURRENT_BINARY_DIR}
4951
${CMAKE_CURRENT_BINARY_DIR}/../ui
5052
${GEOS_INCLUDE_DIR}
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)