Merge branch 'dxf_export' of github.com:mhugent/Quantum-GIS into dxf_export

2025-02-27 00:33:48 -05:00 · 2013-11-23 18:13:36 +01:00 · 2013-11-23 18:13:36 +01:00 · 78672056bc
commit 78672056bc
parent a9d92cdcf4 34e1bd2377
4 changed files with 2 additions and 2 deletions
--- a/src/app/CMakeLists.txt
+++ b/src/app/CMakeLists.txt
@ -421,7 +421,7 @@ INCLUDE_DIRECTORIES(
  ../analysis/raster ../analysis/openstreetmap
  ../core
  ../core/gps
-  ../core/composer ../core/raster ../core/symbology-ng
+  ../core/composer ../core/dxf ../core/raster ../core/symbology-ng
  ../gui ../gui/symbology-ng ../gui/attributetable ../gui/raster
  ../plugins
  ../python
--- a/src/core/CMakeLists.txt
+++ b/src/core/CMakeLists.txt
@ -62,7 +62,6 @@ SET(QGIS_CORE_SRCS
  qgsdbfilterproxymodel.cpp
  qgsdiagramrendererv2.cpp
  qgsdistancearea.cpp
-  qgsdxfexport.cpp
  qgserror.cpp
  qgsexpression.cpp
  qgsexpression_texts.cpp
@ -161,6 +160,7 @@ SET(QGIS_CORE_SRCS
  composer/qgscomposermultiframe.cpp
  composer/qgscomposition.cpp
  
+  dxf/qgsdxfexport.cpp
  dxf/qgsdxfpaintdevice.cpp
  dxf/qgsdxfpaintengine.cpp

--- a/src/core/dxf/qgsdxfexport.cpp
+++ b/src/core/dxf/qgsdxfexport.cpp
--- a/src/core/dxf/qgsdxfexport.h
+++ b/src/core/dxf/qgsdxfexport.h