[QGIS Commit] r10500 - in trunk/qgis/mac/xcode: . Qgis.xcodeproj
svn_qgis at osgeo.org
svn_qgis at osgeo.org
Tue Apr 7 11:49:30 EDT 2009
Author: kyngchaos
Date: 2009-04-07 11:49:29 -0400 (Tue, 07 Apr 2009)
New Revision: 10500
Modified:
trunk/qgis/mac/xcode/Qgis.xcodeproj/project.pbxproj
trunk/qgis/mac/xcode/qgis_settings.xcconfig
Log:
vector overlay added, misc updates (r10481, r10484)
Modified: trunk/qgis/mac/xcode/Qgis.xcodeproj/project.pbxproj
===================================================================
--- trunk/qgis/mac/xcode/Qgis.xcodeproj/project.pbxproj 2009-04-07 15:41:55 UTC (rev 10499)
+++ trunk/qgis/mac/xcode/Qgis.xcodeproj/project.pbxproj 2009-04-07 15:49:29 UTC (rev 10500)
@@ -78,6 +78,7 @@
7256F1C30F411C7C0022BE1F /* PBXTargetDependency */,
7256F1C10F411C7C0022BE1F /* PBXTargetDependency */,
7256F1BF0F411C7C0022BE1F /* PBXTargetDependency */,
+ 720383870F8BA92B0083B883 /* PBXTargetDependency */,
);
name = "Base Plugins";
productName = "Base Plugins";
@@ -131,6 +132,44 @@
/* End PBXAggregateTarget section */
/* Begin PBXBuildFile section */
+ 720382E00F8B86070083B883 /* qgstolerance.h in Headers */ = {isa = PBXBuildFile; fileRef = 72F8D9420F8924F100D10CE5 /* qgstolerance.h */; };
+ 7203830A0F8B8C8F0083B883 /* qgscentralpointpositionmanager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 720383000F8B8C2D0083B883 /* qgscentralpointpositionmanager.cpp */; };
+ 7203830B0F8B8C8F0083B883 /* qgsoverlayobject.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 720383080F8B8C2D0083B883 /* qgsoverlayobject.cpp */; };
+ 7203830C0F8B8C8F0083B883 /* qgspalobjectpositionmanager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 720383050F8B8C2D0083B883 /* qgspalobjectpositionmanager.cpp */; };
+ 7203830D0F8B8C8F0083B883 /* qgsvectoroverlay.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 720383030F8B8C2D0083B883 /* qgsvectoroverlay.cpp */; };
+ 720383510F8B905D0083B883 /* libqgis_core.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 7209F1D20F39E760003DC336 /* libqgis_core.dylib */; };
+ 720383520F8B905D0083B883 /* libqgis_gui.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 7209F38E0F3A2F2B003DC336 /* libqgis_gui.dylib */; };
+ 7203835F0F8B92E60083B883 /* qgsbardiagramfactory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 720383230F8B8FC40083B883 /* qgsbardiagramfactory.cpp */; };
+ 720383600F8B92E60083B883 /* qgsdiagramcategory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 720383250F8B8FC40083B883 /* qgsdiagramcategory.cpp */; };
+ 720383610F8B92E60083B883 /* qgsdiagramdialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 720383270F8B8FC40083B883 /* qgsdiagramdialog.cpp */; };
+ 720383620F8B92E60083B883 /* qgsdiagramfactory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7203832A0F8B8FC40083B883 /* qgsdiagramfactory.cpp */; };
+ 720383630F8B92E60083B883 /* qgsdiagramfactorywidget.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7203832C0F8B8FC40083B883 /* qgsdiagramfactorywidget.cpp */; };
+ 720383640F8B92E60083B883 /* qgsdiagramoverlay.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7203832E0F8B8FC40083B883 /* qgsdiagramoverlay.cpp */; };
+ 720383650F8B92E60083B883 /* qgsdiagramoverlayplugin.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 720383300F8B8FC40083B883 /* qgsdiagramoverlayplugin.cpp */; };
+ 720383660F8B92E60083B883 /* qgsdiagramrenderer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 720383320F8B8FC40083B883 /* qgsdiagramrenderer.cpp */; };
+ 720383670F8B92E60083B883 /* qgsdiagramrendererwidget.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 720383340F8B8FC40083B883 /* qgsdiagramrendererwidget.cpp */; };
+ 720383680F8B92E60083B883 /* qgslinearlyscalingdialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 720383360F8B8FC40083B883 /* qgslinearlyscalingdialog.cpp */; };
+ 720383690F8B92E60083B883 /* qgspiediagramfactory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 720383390F8B8FC40083B883 /* qgspiediagramfactory.cpp */; };
+ 7203836A0F8B92E60083B883 /* qgssvgdiagramfactory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7203833B0F8B8FC40083B883 /* qgssvgdiagramfactory.cpp */; };
+ 7203836B0F8B92E60083B883 /* qgssvgdiagramfactorywidget.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7203833D0F8B8FC40083B883 /* qgssvgdiagramfactorywidget.cpp */; };
+ 7203836C0F8B92E60083B883 /* qgswkndiagramfactory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 720383400F8B8FC40083B883 /* qgswkndiagramfactory.cpp */; };
+ 7203836D0F8B92E60083B883 /* qgswkndiagramfactorywidget.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 720383420F8B8FC40083B883 /* qgswkndiagramfactorywidget.cpp */; };
+ 7203836E0F8B93450083B883 /* qgsdiagramdialog.h in Sources */ = {isa = PBXBuildFile; fileRef = 720383280F8B8FC40083B883 /* qgsdiagramdialog.h */; };
+ 7203836F0F8B93450083B883 /* qgsdiagramoverlayplugin.h in Sources */ = {isa = PBXBuildFile; fileRef = 720383310F8B8FC40083B883 /* qgsdiagramoverlayplugin.h */; };
+ 720383700F8B93450083B883 /* qgslinearlyscalingdialog.h in Sources */ = {isa = PBXBuildFile; fileRef = 720383370F8B8FC40083B883 /* qgslinearlyscalingdialog.h */; };
+ 720383710F8B93450083B883 /* qgssvgdiagramfactorywidget.h in Sources */ = {isa = PBXBuildFile; fileRef = 7203833E0F8B8FC40083B883 /* qgssvgdiagramfactorywidget.h */; };
+ 720383720F8B93450083B883 /* qgswkndiagramfactorywidget.h in Sources */ = {isa = PBXBuildFile; fileRef = 720383430F8B8FC40083B883 /* qgswkndiagramfactorywidget.h */; };
+ 720383780F8BA8C50083B883 /* feature.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 720382E20F8B8B540083B883 /* feature.cpp */; };
+ 720383790F8BA8C50083B883 /* geomfunction.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 720382E40F8B8B540083B883 /* geomfunction.cpp */; };
+ 7203837A0F8BA8C50083B883 /* label.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 720382E80F8B8B540083B883 /* label.cpp */; };
+ 7203837B0F8BA8C50083B883 /* labelposition.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 720382EA0F8B8B540083B883 /* labelposition.cpp */; };
+ 7203837C0F8BA8C50083B883 /* layer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 720382EC0F8B8B540083B883 /* layer.cpp */; };
+ 7203837D0F8BA8C50083B883 /* pal.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 720382EF0F8B8B540083B883 /* pal.cpp */; };
+ 7203837E0F8BA8C50083B883 /* palstat.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 720382F30F8B8B540083B883 /* palstat.cpp */; };
+ 7203837F0F8BA8C50083B883 /* pointset.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 720382F50F8B8B540083B883 /* pointset.cpp */; };
+ 720383800F8BA8C50083B883 /* priorityqueue.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 720382F70F8B8B540083B883 /* priorityqueue.cpp */; };
+ 720383810F8BA8C50083B883 /* problem.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 720382F90F8B8B540083B883 /* problem.cpp */; };
+ 720383820F8BA8C50083B883 /* util.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 720382FD0F8B8B540083B883 /* util.cpp */; };
7209CEF70F4DA72500DAC424 /* r.watershed.1.png in Copy - modules */ = {isa = PBXBuildFile; fileRef = 7209CEF60F4DA70000DAC424 /* r.watershed.1.png */; };
7209CEF80F4DA72500DAC424 /* r.watershed.2.png in Copy - modules */ = {isa = PBXBuildFile; fileRef = 7209CEF50F4DA70000DAC424 /* r.watershed.2.png */; };
7209CEF90F4DA72500DAC424 /* r.watershed.qgm in Copy - modules */ = {isa = PBXBuildFile; fileRef = 7209CEF40F4DA70000DAC424 /* r.watershed.qgm */; };
@@ -2390,6 +2429,28 @@
/* End PBXBuildFile section */
/* Begin PBXBuildRule section */
+ 720383530F8B905D0083B883 /* PBXBuildRule */ = {
+ isa = PBXBuildRule;
+ compilerSpec = com.apple.compilers.proxy.script;
+ filePatterns = "*.qrc";
+ fileType = pattern.proxy;
+ isEditable = 1;
+ outputFiles = (
+ "$(DERIVED_FILES_DIR)/qrc_$(INPUT_FILE_BASE).cpp",
+ );
+ script = "$QTRCC -name $INPUT_FILE_BASE -o \"$DERIVED_FILES_DIR/qrc_$INPUT_FILE_BASE.cpp\" \"$INPUT_FILE_PATH\"";
+ };
+ 720383540F8B905D0083B883 /* PBXBuildRule */ = {
+ isa = PBXBuildRule;
+ compilerSpec = com.apple.compilers.proxy.script;
+ filePatterns = "*.h";
+ fileType = pattern.proxy;
+ isEditable = 1;
+ outputFiles = (
+ "$(DERIVED_FILES_DIR)/moc_$(INPUT_FILE_BASE).cpp",
+ );
+ script = "$QTMOC $QT_CXXFLAGS -o \"$DERIVED_FILES_DIR/moc_$INPUT_FILE_BASE.cpp\" \"$INPUT_FILE_PATH\"";
+ };
7262ED980F7A770300498385 /* PBXBuildRule */ = {
isa = PBXBuildRule;
compilerSpec = com.apple.compilers.proxy.script;
@@ -2889,6 +2950,27 @@
/* End PBXBuildRule section */
/* Begin PBXContainerItemProxy section */
+ 7203834B0F8B905D0083B883 /* PBXContainerItemProxy */ = {
+ isa = PBXContainerItemProxy;
+ containerPortal = 20286C28FDCF999611CA2CEA /* Project object */;
+ proxyType = 1;
+ remoteGlobalIDString = 7209F1D10F39E760003DC336;
+ remoteInfo = qgis_core;
+ };
+ 7203834D0F8B905D0083B883 /* PBXContainerItemProxy */ = {
+ isa = PBXContainerItemProxy;
+ containerPortal = 20286C28FDCF999611CA2CEA /* Project object */;
+ proxyType = 1;
+ remoteGlobalIDString = 7209F3120F3A2F2B003DC336;
+ remoteInfo = qgis_gui;
+ };
+ 720383860F8BA92B0083B883 /* PBXContainerItemProxy */ = {
+ isa = PBXContainerItemProxy;
+ containerPortal = 20286C28FDCF999611CA2CEA /* Project object */;
+ proxyType = 1;
+ remoteGlobalIDString = 720383490F8B905D0083B883 /* diagramoverlayplugin */;
+ remoteInfo = diagramoverlayplugin;
+ };
7209F3F50F3A3C25003DC336 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 20286C28FDCF999611CA2CEA /* Project object */;
@@ -5458,6 +5540,82 @@
/* Begin PBXFileReference section */
508344B209E5C41E0093A071 /* Qgis.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Qgis.app; sourceTree = BUILT_PRODUCTS_DIR; };
+ 720382E20F8B8B540083B883 /* feature.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = feature.cpp; path = ../../src/core/pal/feature.cpp; sourceTree = SOURCE_ROOT; };
+ 720382E30F8B8B540083B883 /* feature.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = feature.h; path = ../../src/core/pal/feature.h; sourceTree = SOURCE_ROOT; };
+ 720382E40F8B8B540083B883 /* geomfunction.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = geomfunction.cpp; path = ../../src/core/pal/geomfunction.cpp; sourceTree = SOURCE_ROOT; };
+ 720382E50F8B8B540083B883 /* geomfunction.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = geomfunction.h; path = ../../src/core/pal/geomfunction.h; sourceTree = SOURCE_ROOT; };
+ 720382E60F8B8B540083B883 /* hashtable.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = hashtable.hpp; path = ../../src/core/pal/hashtable.hpp; sourceTree = SOURCE_ROOT; };
+ 720382E70F8B8B540083B883 /* internalexception.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = internalexception.h; path = ../../src/core/pal/internalexception.h; sourceTree = SOURCE_ROOT; };
+ 720382E80F8B8B540083B883 /* label.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = label.cpp; path = ../../src/core/pal/label.cpp; sourceTree = SOURCE_ROOT; };
+ 720382E90F8B8B540083B883 /* label.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = label.h; path = ../../src/core/pal/label.h; sourceTree = SOURCE_ROOT; };
+ 720382EA0F8B8B540083B883 /* labelposition.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = labelposition.cpp; path = ../../src/core/pal/labelposition.cpp; sourceTree = SOURCE_ROOT; };
+ 720382EB0F8B8B540083B883 /* labelposition.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = labelposition.h; path = ../../src/core/pal/labelposition.h; sourceTree = SOURCE_ROOT; };
+ 720382EC0F8B8B540083B883 /* layer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = layer.cpp; path = ../../src/core/pal/layer.cpp; sourceTree = SOURCE_ROOT; };
+ 720382ED0F8B8B540083B883 /* layer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = layer.h; path = ../../src/core/pal/layer.h; sourceTree = SOURCE_ROOT; };
+ 720382EE0F8B8B540083B883 /* linkedlist.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = linkedlist.hpp; path = ../../src/core/pal/linkedlist.hpp; sourceTree = SOURCE_ROOT; };
+ 720382EF0F8B8B540083B883 /* pal.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = pal.cpp; path = ../../src/core/pal/pal.cpp; sourceTree = SOURCE_ROOT; };
+ 720382F00F8B8B540083B883 /* pal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = pal.h; path = ../../src/core/pal/pal.h; sourceTree = SOURCE_ROOT; };
+ 720382F10F8B8B540083B883 /* palexception.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = palexception.h; path = ../../src/core/pal/palexception.h; sourceTree = SOURCE_ROOT; };
+ 720382F20F8B8B540083B883 /* palgeometry.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = palgeometry.h; path = ../../src/core/pal/palgeometry.h; sourceTree = SOURCE_ROOT; };
+ 720382F30F8B8B540083B883 /* palstat.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = palstat.cpp; path = ../../src/core/pal/palstat.cpp; sourceTree = SOURCE_ROOT; };
+ 720382F40F8B8B540083B883 /* palstat.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = palstat.h; path = ../../src/core/pal/palstat.h; sourceTree = SOURCE_ROOT; };
+ 720382F50F8B8B540083B883 /* pointset.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = pointset.cpp; path = ../../src/core/pal/pointset.cpp; sourceTree = SOURCE_ROOT; };
+ 720382F60F8B8B540083B883 /* pointset.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = pointset.h; path = ../../src/core/pal/pointset.h; sourceTree = SOURCE_ROOT; };
+ 720382F70F8B8B540083B883 /* priorityqueue.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = priorityqueue.cpp; path = ../../src/core/pal/priorityqueue.cpp; sourceTree = SOURCE_ROOT; };
+ 720382F80F8B8B540083B883 /* priorityqueue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = priorityqueue.h; path = ../../src/core/pal/priorityqueue.h; sourceTree = SOURCE_ROOT; };
+ 720382F90F8B8B540083B883 /* problem.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = problem.cpp; path = ../../src/core/pal/problem.cpp; sourceTree = SOURCE_ROOT; };
+ 720382FA0F8B8B540083B883 /* problem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = problem.h; path = ../../src/core/pal/problem.h; sourceTree = SOURCE_ROOT; };
+ 720382FB0F8B8B540083B883 /* rtree.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = rtree.hpp; path = ../../src/core/pal/rtree.hpp; sourceTree = SOURCE_ROOT; };
+ 720382FC0F8B8B540083B883 /* simplemutex.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = simplemutex.h; path = ../../src/core/pal/simplemutex.h; sourceTree = SOURCE_ROOT; };
+ 720382FD0F8B8B540083B883 /* util.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = util.cpp; path = ../../src/core/pal/util.cpp; sourceTree = SOURCE_ROOT; };
+ 720382FE0F8B8B540083B883 /* util.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = util.h; path = ../../src/core/pal/util.h; sourceTree = SOURCE_ROOT; };
+ 720383000F8B8C2D0083B883 /* qgscentralpointpositionmanager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = qgscentralpointpositionmanager.cpp; path = ../../src/core/qgscentralpointpositionmanager.cpp; sourceTree = SOURCE_ROOT; };
+ 720383010F8B8C2D0083B883 /* qgscentralpointpositionmanager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = qgscentralpointpositionmanager.h; path = ../../src/core/qgscentralpointpositionmanager.h; sourceTree = SOURCE_ROOT; };
+ 720383020F8B8C2D0083B883 /* qgsvectoroverlay.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = qgsvectoroverlay.h; path = ../../src/core/qgsvectoroverlay.h; sourceTree = SOURCE_ROOT; };
+ 720383030F8B8C2D0083B883 /* qgsvectoroverlay.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = qgsvectoroverlay.cpp; path = ../../src/core/qgsvectoroverlay.cpp; sourceTree = SOURCE_ROOT; };
+ 720383040F8B8C2D0083B883 /* qgspalobjectpositionmanager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = qgspalobjectpositionmanager.h; path = ../../src/core/qgspalobjectpositionmanager.h; sourceTree = SOURCE_ROOT; };
+ 720383050F8B8C2D0083B883 /* qgspalobjectpositionmanager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = qgspalobjectpositionmanager.cpp; path = ../../src/core/qgspalobjectpositionmanager.cpp; sourceTree = SOURCE_ROOT; };
+ 720383060F8B8C2D0083B883 /* qgsoverlayobjectpositionmanager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = qgsoverlayobjectpositionmanager.h; path = ../../src/core/qgsoverlayobjectpositionmanager.h; sourceTree = SOURCE_ROOT; };
+ 720383070F8B8C2D0083B883 /* qgsoverlayobject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = qgsoverlayobject.h; path = ../../src/core/qgsoverlayobject.h; sourceTree = SOURCE_ROOT; };
+ 720383080F8B8C2D0083B883 /* qgsoverlayobject.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = qgsoverlayobject.cpp; path = ../../src/core/qgsoverlayobject.cpp; sourceTree = SOURCE_ROOT; };
+ 720383220F8B8FC40083B883 /* CMakeLists.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = CMakeLists.txt; path = ../../src/plugins/diagram_overlay/CMakeLists.txt; sourceTree = SOURCE_ROOT; };
+ 720383230F8B8FC40083B883 /* qgsbardiagramfactory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = qgsbardiagramfactory.cpp; path = ../../src/plugins/diagram_overlay/qgsbardiagramfactory.cpp; sourceTree = SOURCE_ROOT; };
+ 720383240F8B8FC40083B883 /* qgsbardiagramfactory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = qgsbardiagramfactory.h; path = ../../src/plugins/diagram_overlay/qgsbardiagramfactory.h; sourceTree = SOURCE_ROOT; };
+ 720383250F8B8FC40083B883 /* qgsdiagramcategory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = qgsdiagramcategory.cpp; path = ../../src/plugins/diagram_overlay/qgsdiagramcategory.cpp; sourceTree = SOURCE_ROOT; };
+ 720383260F8B8FC40083B883 /* qgsdiagramcategory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = qgsdiagramcategory.h; path = ../../src/plugins/diagram_overlay/qgsdiagramcategory.h; sourceTree = SOURCE_ROOT; };
+ 720383270F8B8FC40083B883 /* qgsdiagramdialog.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = qgsdiagramdialog.cpp; path = ../../src/plugins/diagram_overlay/qgsdiagramdialog.cpp; sourceTree = SOURCE_ROOT; };
+ 720383280F8B8FC40083B883 /* qgsdiagramdialog.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = qgsdiagramdialog.h; path = ../../src/plugins/diagram_overlay/qgsdiagramdialog.h; sourceTree = SOURCE_ROOT; };
+ 720383290F8B8FC40083B883 /* qgsdiagramdialogbase.ui */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = qgsdiagramdialogbase.ui; path = ../../src/plugins/diagram_overlay/qgsdiagramdialogbase.ui; sourceTree = SOURCE_ROOT; };
+ 7203832A0F8B8FC40083B883 /* qgsdiagramfactory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = qgsdiagramfactory.cpp; path = ../../src/plugins/diagram_overlay/qgsdiagramfactory.cpp; sourceTree = SOURCE_ROOT; };
+ 7203832B0F8B8FC40083B883 /* qgsdiagramfactory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = qgsdiagramfactory.h; path = ../../src/plugins/diagram_overlay/qgsdiagramfactory.h; sourceTree = SOURCE_ROOT; };
+ 7203832C0F8B8FC40083B883 /* qgsdiagramfactorywidget.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = qgsdiagramfactorywidget.cpp; path = ../../src/plugins/diagram_overlay/qgsdiagramfactorywidget.cpp; sourceTree = SOURCE_ROOT; };
+ 7203832D0F8B8FC40083B883 /* qgsdiagramfactorywidget.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = qgsdiagramfactorywidget.h; path = ../../src/plugins/diagram_overlay/qgsdiagramfactorywidget.h; sourceTree = SOURCE_ROOT; };
+ 7203832E0F8B8FC40083B883 /* qgsdiagramoverlay.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = qgsdiagramoverlay.cpp; path = ../../src/plugins/diagram_overlay/qgsdiagramoverlay.cpp; sourceTree = SOURCE_ROOT; };
+ 7203832F0F8B8FC40083B883 /* qgsdiagramoverlay.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = qgsdiagramoverlay.h; path = ../../src/plugins/diagram_overlay/qgsdiagramoverlay.h; sourceTree = SOURCE_ROOT; };
+ 720383300F8B8FC40083B883 /* qgsdiagramoverlayplugin.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = qgsdiagramoverlayplugin.cpp; path = ../../src/plugins/diagram_overlay/qgsdiagramoverlayplugin.cpp; sourceTree = SOURCE_ROOT; };
+ 720383310F8B8FC40083B883 /* qgsdiagramoverlayplugin.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = qgsdiagramoverlayplugin.h; path = ../../src/plugins/diagram_overlay/qgsdiagramoverlayplugin.h; sourceTree = SOURCE_ROOT; };
+ 720383320F8B8FC40083B883 /* qgsdiagramrenderer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = qgsdiagramrenderer.cpp; path = ../../src/plugins/diagram_overlay/qgsdiagramrenderer.cpp; sourceTree = SOURCE_ROOT; };
+ 720383330F8B8FC40083B883 /* qgsdiagramrenderer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = qgsdiagramrenderer.h; path = ../../src/plugins/diagram_overlay/qgsdiagramrenderer.h; sourceTree = SOURCE_ROOT; };
+ 720383340F8B8FC40083B883 /* qgsdiagramrendererwidget.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = qgsdiagramrendererwidget.cpp; path = ../../src/plugins/diagram_overlay/qgsdiagramrendererwidget.cpp; sourceTree = SOURCE_ROOT; };
+ 720383350F8B8FC40083B883 /* qgsdiagramrendererwidget.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = qgsdiagramrendererwidget.h; path = ../../src/plugins/diagram_overlay/qgsdiagramrendererwidget.h; sourceTree = SOURCE_ROOT; };
+ 720383360F8B8FC40083B883 /* qgslinearlyscalingdialog.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = qgslinearlyscalingdialog.cpp; path = ../../src/plugins/diagram_overlay/qgslinearlyscalingdialog.cpp; sourceTree = SOURCE_ROOT; };
+ 720383370F8B8FC40083B883 /* qgslinearlyscalingdialog.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = qgslinearlyscalingdialog.h; path = ../../src/plugins/diagram_overlay/qgslinearlyscalingdialog.h; sourceTree = SOURCE_ROOT; };
+ 720383380F8B8FC40083B883 /* qgslinearlyscalingdialogbase.ui */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = qgslinearlyscalingdialogbase.ui; path = ../../src/plugins/diagram_overlay/qgslinearlyscalingdialogbase.ui; sourceTree = SOURCE_ROOT; };
+ 720383390F8B8FC40083B883 /* qgspiediagramfactory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = qgspiediagramfactory.cpp; path = ../../src/plugins/diagram_overlay/qgspiediagramfactory.cpp; sourceTree = SOURCE_ROOT; };
+ 7203833A0F8B8FC40083B883 /* qgspiediagramfactory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = qgspiediagramfactory.h; path = ../../src/plugins/diagram_overlay/qgspiediagramfactory.h; sourceTree = SOURCE_ROOT; };
+ 7203833B0F8B8FC40083B883 /* qgssvgdiagramfactory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = qgssvgdiagramfactory.cpp; path = ../../src/plugins/diagram_overlay/qgssvgdiagramfactory.cpp; sourceTree = SOURCE_ROOT; };
+ 7203833C0F8B8FC40083B883 /* qgssvgdiagramfactory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = qgssvgdiagramfactory.h; path = ../../src/plugins/diagram_overlay/qgssvgdiagramfactory.h; sourceTree = SOURCE_ROOT; };
+ 7203833D0F8B8FC40083B883 /* qgssvgdiagramfactorywidget.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = qgssvgdiagramfactorywidget.cpp; path = ../../src/plugins/diagram_overlay/qgssvgdiagramfactorywidget.cpp; sourceTree = SOURCE_ROOT; };
+ 7203833E0F8B8FC40083B883 /* qgssvgdiagramfactorywidget.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = qgssvgdiagramfactorywidget.h; path = ../../src/plugins/diagram_overlay/qgssvgdiagramfactorywidget.h; sourceTree = SOURCE_ROOT; };
+ 7203833F0F8B8FC40083B883 /* qgssvgdiagramfactorywidgetbase.ui */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = qgssvgdiagramfactorywidgetbase.ui; path = ../../src/plugins/diagram_overlay/qgssvgdiagramfactorywidgetbase.ui; sourceTree = SOURCE_ROOT; };
+ 720383400F8B8FC40083B883 /* qgswkndiagramfactory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = qgswkndiagramfactory.cpp; path = ../../src/plugins/diagram_overlay/qgswkndiagramfactory.cpp; sourceTree = SOURCE_ROOT; };
+ 720383410F8B8FC40083B883 /* qgswkndiagramfactory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = qgswkndiagramfactory.h; path = ../../src/plugins/diagram_overlay/qgswkndiagramfactory.h; sourceTree = SOURCE_ROOT; };
+ 720383420F8B8FC40083B883 /* qgswkndiagramfactorywidget.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = qgswkndiagramfactorywidget.cpp; path = ../../src/plugins/diagram_overlay/qgswkndiagramfactorywidget.cpp; sourceTree = SOURCE_ROOT; };
+ 720383430F8B8FC40083B883 /* qgswkndiagramfactorywidget.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = qgswkndiagramfactorywidget.h; path = ../../src/plugins/diagram_overlay/qgswkndiagramfactorywidget.h; sourceTree = SOURCE_ROOT; };
+ 720383440F8B8FC40083B883 /* qgswkndiagramfactorywidgetbase.ui */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = qgswkndiagramfactorywidgetbase.ui; path = ../../src/plugins/diagram_overlay/qgswkndiagramfactorywidgetbase.ui; sourceTree = SOURCE_ROOT; };
+ 720383580F8B905D0083B883 /* libdiagramoverlayplugin.so */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = libdiagramoverlayplugin.so; sourceTree = BUILT_PRODUCTS_DIR; };
+ 7203835A0F8B90B50083B883 /* qgsapplydialog.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = qgsapplydialog.h; path = ../../src/plugins/qgsapplydialog.h; sourceTree = SOURCE_ROOT; };
+ 7203835B0F8B90B50083B883 /* qgsvectoroverlayplugin.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = qgsvectoroverlayplugin.h; path = ../../src/plugins/qgsvectoroverlayplugin.h; sourceTree = SOURCE_ROOT; };
7209CEF40F4DA70000DAC424 /* r.watershed.qgm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; name = r.watershed.qgm; path = ../../src/plugins/grass/modules/r.watershed.qgm; sourceTree = SOURCE_ROOT; };
7209CEF50F4DA70000DAC424 /* r.watershed.2.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = r.watershed.2.png; path = ../../src/plugins/grass/modules/r.watershed.2.png; sourceTree = SOURCE_ROOT; };
7209CEF60F4DA70000DAC424 /* r.watershed.1.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = r.watershed.1.png; path = ../../src/plugins/grass/modules/r.watershed.1.png; sourceTree = SOURCE_ROOT; };
@@ -5823,9 +5981,6 @@
7209E72F0F39E57A003DC336 /* ExternalSort.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ExternalSort.h; path = ../../src/core/spatialindex/tools/ExternalSort.h; sourceTree = SOURCE_ROOT; };
7209E7300F39E57A003DC336 /* TemporaryFile.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = TemporaryFile.cc; path = ../../src/core/spatialindex/tools/TemporaryFile.cc; sourceTree = SOURCE_ROOT; };
7209E7310F39E57A003DC336 /* Tools.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Tools.cc; path = ../../src/core/spatialindex/tools/Tools.cc; sourceTree = SOURCE_ROOT; };
- 7209E7330F39E57A003DC336 /* sqlite3.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = sqlite3.c; path = ../../src/core/sqlite3/sqlite3.c; sourceTree = SOURCE_ROOT; };
- 7209E7340F39E57A003DC336 /* sqlite3.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = sqlite3.h; path = ../../src/core/sqlite3/sqlite3.h; sourceTree = SOURCE_ROOT; };
- 7209E7350F39E57A003DC336 /* sqlite3ext.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = sqlite3ext.h; path = ../../src/core/sqlite3/sqlite3ext.h; sourceTree = SOURCE_ROOT; };
7209E7370F39E57A003DC336 /* qgsmarkercatalogue.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = qgsmarkercatalogue.cpp; path = ../../src/core/symbology/qgsmarkercatalogue.cpp; sourceTree = SOURCE_ROOT; };
7209E7380F39E57A003DC336 /* qgsmarkercatalogue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = qgsmarkercatalogue.h; path = ../../src/core/symbology/qgsmarkercatalogue.h; sourceTree = SOURCE_ROOT; };
7209E7390F39E57A003DC336 /* qgssymbol.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = qgssymbol.cpp; path = ../../src/core/symbology/qgssymbol.cpp; sourceTree = SOURCE_ROOT; };
@@ -8310,6 +8465,15 @@
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */
+ 720383500F8B905D0083B883 /* Frameworks */ = {
+ isa = PBXFrameworksBuildPhase;
+ buildActionMask = 2147483647;
+ files = (
+ 720383510F8B905D0083B883 /* libqgis_core.dylib in Frameworks */,
+ 720383520F8B905D0083B883 /* libqgis_gui.dylib in Frameworks */,
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ };
7209F1D00F39E760003DC336 /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
@@ -8617,6 +8781,7 @@
7256F29B0F4141240022BE1F /* core.so */,
7256F29C0F4141570022BE1F /* gui.so */,
7262ED9C0F7A770300498385 /* libspatialiteprovider.so */,
+ 720383580F8B905D0083B883 /* libdiagramoverlayplugin.so */,
);
name = Products;
sourceTree = "<group>";
@@ -8694,6 +8859,86 @@
name = "Configuration Files";
sourceTree = "<group>";
};
+ 720382E10F8B8B540083B883 /* pal */ = {
+ isa = PBXGroup;
+ children = (
+ 720382E20F8B8B540083B883 /* feature.cpp */,
+ 720382E30F8B8B540083B883 /* feature.h */,
+ 720382E40F8B8B540083B883 /* geomfunction.cpp */,
+ 720382E50F8B8B540083B883 /* geomfunction.h */,
+ 720382E60F8B8B540083B883 /* hashtable.hpp */,
+ 720382E70F8B8B540083B883 /* internalexception.h */,
+ 720382E80F8B8B540083B883 /* label.cpp */,
+ 720382E90F8B8B540083B883 /* label.h */,
+ 720382EA0F8B8B540083B883 /* labelposition.cpp */,
+ 720382EB0F8B8B540083B883 /* labelposition.h */,
+ 720382EC0F8B8B540083B883 /* layer.cpp */,
+ 720382ED0F8B8B540083B883 /* layer.h */,
+ 720382EE0F8B8B540083B883 /* linkedlist.hpp */,
+ 720382EF0F8B8B540083B883 /* pal.cpp */,
+ 720382F00F8B8B540083B883 /* pal.h */,
+ 720382F10F8B8B540083B883 /* palexception.h */,
+ 720382F20F8B8B540083B883 /* palgeometry.h */,
+ 720382F30F8B8B540083B883 /* palstat.cpp */,
+ 720382F40F8B8B540083B883 /* palstat.h */,
+ 720382F50F8B8B540083B883 /* pointset.cpp */,
+ 720382F60F8B8B540083B883 /* pointset.h */,
+ 720382F70F8B8B540083B883 /* priorityqueue.cpp */,
+ 720382F80F8B8B540083B883 /* priorityqueue.h */,
+ 720382F90F8B8B540083B883 /* problem.cpp */,
+ 720382FA0F8B8B540083B883 /* problem.h */,
+ 720382FB0F8B8B540083B883 /* rtree.hpp */,
+ 720382FC0F8B8B540083B883 /* simplemutex.h */,
+ 720382FD0F8B8B540083B883 /* util.cpp */,
+ 720382FE0F8B8B540083B883 /* util.h */,
+ );
+ name = pal;
+ path = ../../src/core/pal;
+ sourceTree = SOURCE_ROOT;
+ };
+ 720383210F8B8FC40083B883 /* diagram_overlay */ = {
+ isa = PBXGroup;
+ children = (
+ 720383220F8B8FC40083B883 /* CMakeLists.txt */,
+ 720383230F8B8FC40083B883 /* qgsbardiagramfactory.cpp */,
+ 720383240F8B8FC40083B883 /* qgsbardiagramfactory.h */,
+ 720383250F8B8FC40083B883 /* qgsdiagramcategory.cpp */,
+ 720383260F8B8FC40083B883 /* qgsdiagramcategory.h */,
+ 720383270F8B8FC40083B883 /* qgsdiagramdialog.cpp */,
+ 720383280F8B8FC40083B883 /* qgsdiagramdialog.h */,
+ 720383290F8B8FC40083B883 /* qgsdiagramdialogbase.ui */,
+ 7203832A0F8B8FC40083B883 /* qgsdiagramfactory.cpp */,
+ 7203832B0F8B8FC40083B883 /* qgsdiagramfactory.h */,
+ 7203832C0F8B8FC40083B883 /* qgsdiagramfactorywidget.cpp */,
+ 7203832D0F8B8FC40083B883 /* qgsdiagramfactorywidget.h */,
+ 7203832E0F8B8FC40083B883 /* qgsdiagramoverlay.cpp */,
+ 7203832F0F8B8FC40083B883 /* qgsdiagramoverlay.h */,
+ 720383300F8B8FC40083B883 /* qgsdiagramoverlayplugin.cpp */,
+ 720383310F8B8FC40083B883 /* qgsdiagramoverlayplugin.h */,
+ 720383320F8B8FC40083B883 /* qgsdiagramrenderer.cpp */,
+ 720383330F8B8FC40083B883 /* qgsdiagramrenderer.h */,
+ 720383340F8B8FC40083B883 /* qgsdiagramrendererwidget.cpp */,
+ 720383350F8B8FC40083B883 /* qgsdiagramrendererwidget.h */,
+ 720383360F8B8FC40083B883 /* qgslinearlyscalingdialog.cpp */,
+ 720383370F8B8FC40083B883 /* qgslinearlyscalingdialog.h */,
+ 720383380F8B8FC40083B883 /* qgslinearlyscalingdialogbase.ui */,
+ 720383390F8B8FC40083B883 /* qgspiediagramfactory.cpp */,
+ 7203833A0F8B8FC40083B883 /* qgspiediagramfactory.h */,
+ 7203833B0F8B8FC40083B883 /* qgssvgdiagramfactory.cpp */,
+ 7203833C0F8B8FC40083B883 /* qgssvgdiagramfactory.h */,
+ 7203833D0F8B8FC40083B883 /* qgssvgdiagramfactorywidget.cpp */,
+ 7203833E0F8B8FC40083B883 /* qgssvgdiagramfactorywidget.h */,
+ 7203833F0F8B8FC40083B883 /* qgssvgdiagramfactorywidgetbase.ui */,
+ 720383400F8B8FC40083B883 /* qgswkndiagramfactory.cpp */,
+ 720383410F8B8FC40083B883 /* qgswkndiagramfactory.h */,
+ 720383420F8B8FC40083B883 /* qgswkndiagramfactorywidget.cpp */,
+ 720383430F8B8FC40083B883 /* qgswkndiagramfactorywidget.h */,
+ 720383440F8B8FC40083B883 /* qgswkndiagramfactorywidgetbase.ui */,
+ );
+ name = diagram_overlay;
+ path = ../../src/plugins/diagram_overlay;
+ sourceTree = SOURCE_ROOT;
+ };
7209E5B90F39E57A003DC336 /* src */ = {
isa = PBXGroup;
children = (
@@ -9006,12 +9251,21 @@
7209E6D60F39E57A003DC336 /* qgsvectorfilewriter.h */,
7209E6D70F39E57A003DC336 /* qgsvectorlayer.cpp */,
7209E6D80F39E57A003DC336 /* qgsvectorlayer.h */,
+ 720383000F8B8C2D0083B883 /* qgscentralpointpositionmanager.cpp */,
+ 720383010F8B8C2D0083B883 /* qgscentralpointpositionmanager.h */,
+ 720383020F8B8C2D0083B883 /* qgsvectoroverlay.h */,
+ 720383030F8B8C2D0083B883 /* qgsvectoroverlay.cpp */,
+ 720383040F8B8C2D0083B883 /* qgspalobjectpositionmanager.h */,
+ 720383050F8B8C2D0083B883 /* qgspalobjectpositionmanager.cpp */,
+ 720383060F8B8C2D0083B883 /* qgsoverlayobjectpositionmanager.h */,
+ 720383070F8B8C2D0083B883 /* qgsoverlayobject.h */,
+ 720383080F8B8C2D0083B883 /* qgsoverlayobject.cpp */,
7209E6630F39E57A003DC336 /* composer */,
+ 720382E10F8B8B540083B883 /* pal */,
7209E6D90F39E57A003DC336 /* raster */,
7209E6F50F39E57A003DC336 /* renderer */,
7209E7000F39E57A003DC336 /* spatialindex */,
72F8D9470F89268C00D10CE5 /* spatialite */,
- 7209E7320F39E57A003DC336 /* sqlite3 */,
7209E7360F39E57A003DC336 /* symbology */,
7209E6620F39E57A003DC336 /* CMakeLists.txt */,
7209E6800F39E57A003DC336 /* genlexyacc.bat */,
@@ -9216,17 +9470,6 @@
path = ../../src/core/spatialindex/tools;
sourceTree = SOURCE_ROOT;
};
- 7209E7320F39E57A003DC336 /* sqlite3 */ = {
- isa = PBXGroup;
- children = (
- 7209E7330F39E57A003DC336 /* sqlite3.c */,
- 7209E7340F39E57A003DC336 /* sqlite3.h */,
- 7209E7350F39E57A003DC336 /* sqlite3ext.h */,
- );
- name = sqlite3;
- path = ../../src/core/sqlite3;
- sourceTree = SOURCE_ROOT;
- };
7209E7360F39E57A003DC336 /* symbology */ = {
isa = PBXGroup;
children = (
@@ -9378,6 +9621,7 @@
7209E79A0F39E57A003DC336 /* CMakeLists.txt */,
7209E7AE0F39E57A003DC336 /* copyright_label */,
7209E7BB0F39E57B003DC336 /* delimited_text */,
+ 720383210F8B8FC40083B883 /* diagram_overlay */,
7209EBB90F39E57B003DC336 /* interpolation */,
7209EBE90F39E57B003DC336 /* north_arrow */,
7209EC1E0F39E57B003DC336 /* scale_bar */,
@@ -9395,6 +9639,8 @@
7209EC080F39E57B003DC336 /* plugin_template */,
7209EC130F39E57B003DC336 /* qgisplugin.h */,
7209EC140F39E57B003DC336 /* qgsrendererplugin.h */,
+ 7203835A0F8B90B50083B883 /* qgsapplydialog.h */,
+ 7203835B0F8B90B50083B883 /* qgsvectoroverlayplugin.h */,
);
name = plugins;
path = ../../src/plugins;
@@ -12790,12 +13036,34 @@
7209F60B0F3A577C003DC336 /* qgsvectorfilewriter.h in Headers */,
7209F60C0F3A577C003DC336 /* qgsvectorlayer.h in Headers */,
7209F60D0F3A577C003DC336 /* qgsvertexmarker.h in Headers */,
+ 720382E00F8B86070083B883 /* qgstolerance.h in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXHeadersBuildPhase section */
/* Begin PBXNativeTarget section */
+ 720383490F8B905D0083B883 /* diagramoverlayplugin */ = {
+ isa = PBXNativeTarget;
+ buildConfigurationList = 720383550F8B905D0083B883 /* Build configuration list for PBXNativeTarget "diagramoverlayplugin" */;
+ buildPhases = (
+ 7203834E0F8B905D0083B883 /* Script - ui */,
+ 7203834F0F8B905D0083B883 /* Sources */,
+ 720383500F8B905D0083B883 /* Frameworks */,
+ );
+ buildRules = (
+ 720383530F8B905D0083B883 /* PBXBuildRule */,
+ 720383540F8B905D0083B883 /* PBXBuildRule */,
+ );
+ dependencies = (
+ 7203834A0F8B905D0083B883 /* PBXTargetDependency */,
+ 7203834C0F8B905D0083B883 /* PBXTargetDependency */,
+ );
+ name = diagramoverlayplugin;
+ productName = testprog;
+ productReference = 720383580F8B905D0083B883 /* libdiagramoverlayplugin.so */;
+ productType = "com.apple.product-type.tool";
+ };
7209F1D10F39E760003DC336 /* qgis_core */ = {
isa = PBXNativeTarget;
buildConfigurationList = 7209F1D50F39E77E003DC336 /* Build configuration list for PBXNativeTarget "qgis_core" */;
@@ -13491,6 +13759,7 @@
72A56BEA0F3C886100BA32A1 /* coordinatecaptureplugin */,
72A56BFB0F3C887000BA32A1 /* dxf2shpconverterplugin */,
72A56C060F3C887300BA32A1 /* ogrconverterplugin */,
+ 720383490F8B905D0083B883 /* diagramoverlayplugin */,
);
};
/* End PBXProject section */
@@ -13525,6 +13794,21 @@
/* End PBXResourcesBuildPhase section */
/* Begin PBXShellScriptBuildPhase section */
+ 7203834E0F8B905D0083B883 /* Script - ui */ = {
+ isa = PBXShellScriptBuildPhase;
+ buildActionMask = 2147483647;
+ files = (
+ );
+ inputPaths = (
+ );
+ name = "Script - ui";
+ outputPaths = (
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ shellPath = /bin/sh;
+ shellScript = "# generate ui headers in separate script because:\n# 1. Xcode will attempt to process generated *.h with moc rule\n# 2. parallel processing might not finish ui's before a cpp source needs it\n\n# derived sources dir created by Compile Sources phase, we need it NOW\nmkdir -p \"$DERIVED_FILES_DIR\"\n\ncd ../../src/plugins/$TARGET_PLUGINDIR\n\nUIUI=`ls *.ui`\n\nfor u in $UIUI\ndo\n\tuh=`echo $u | sed 's,\\.ui$,.h,'`\n\t# compare times because output files spec below doesn't seem to work with wildcards\n\tif [ ! -f \"$DERIVED_FILES_DIR/ui_$uh\" ] || [ $u -nt \"$DERIVED_FILES_DIR/ui_$uh\" ] ; then\n\t\trm -f \"$DERIVED_FILES_DIR/ui_$uh\"\n\t\techo \"$QTUIC -o \\\"$DERIVED_FILES_DIR/ui_$uh\\\" $u\"\n\t\t$QTUIC -o \"$DERIVED_FILES_DIR/ui_$uh\" $u\n\tfi\ndone\n\nexit 0\n";
+ showEnvVarsInLog = 0;
+ };
7209F1C20F39E6E3003DC336 /* ShellScript */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
@@ -13936,6 +14220,33 @@
/* End PBXShellScriptBuildPhase section */
/* Begin PBXSourcesBuildPhase section */
+ 7203834F0F8B905D0083B883 /* Sources */ = {
+ isa = PBXSourcesBuildPhase;
+ buildActionMask = 2147483647;
+ files = (
+ 7203836E0F8B93450083B883 /* qgsdiagramdialog.h in Sources */,
+ 7203836F0F8B93450083B883 /* qgsdiagramoverlayplugin.h in Sources */,
+ 720383700F8B93450083B883 /* qgslinearlyscalingdialog.h in Sources */,
+ 720383710F8B93450083B883 /* qgssvgdiagramfactorywidget.h in Sources */,
+ 720383720F8B93450083B883 /* qgswkndiagramfactorywidget.h in Sources */,
+ 7203835F0F8B92E60083B883 /* qgsbardiagramfactory.cpp in Sources */,
+ 720383600F8B92E60083B883 /* qgsdiagramcategory.cpp in Sources */,
+ 720383610F8B92E60083B883 /* qgsdiagramdialog.cpp in Sources */,
+ 720383620F8B92E60083B883 /* qgsdiagramfactory.cpp in Sources */,
+ 720383630F8B92E60083B883 /* qgsdiagramfactorywidget.cpp in Sources */,
+ 720383640F8B92E60083B883 /* qgsdiagramoverlay.cpp in Sources */,
+ 720383650F8B92E60083B883 /* qgsdiagramoverlayplugin.cpp in Sources */,
+ 720383660F8B92E60083B883 /* qgsdiagramrenderer.cpp in Sources */,
+ 720383670F8B92E60083B883 /* qgsdiagramrendererwidget.cpp in Sources */,
+ 720383680F8B92E60083B883 /* qgslinearlyscalingdialog.cpp in Sources */,
+ 720383690F8B92E60083B883 /* qgspiediagramfactory.cpp in Sources */,
+ 7203836A0F8B92E60083B883 /* qgssvgdiagramfactory.cpp in Sources */,
+ 7203836B0F8B92E60083B883 /* qgssvgdiagramfactorywidget.cpp in Sources */,
+ 7203836C0F8B92E60083B883 /* qgswkndiagramfactory.cpp in Sources */,
+ 7203836D0F8B92E60083B883 /* qgswkndiagramfactorywidget.cpp in Sources */,
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ };
7209F1CF0F39E760003DC336 /* Sources */ = {
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
@@ -14058,6 +14369,21 @@
729287550F71C2CB006D9489 /* qgsrunprocess.h in Sources */,
729287560F71C2CB006D9489 /* qgsvectorlayer.h in Sources */,
72F8D9450F89251100D10CE5 /* qgstolerance.cpp in Sources */,
+ 7203830A0F8B8C8F0083B883 /* qgscentralpointpositionmanager.cpp in Sources */,
+ 7203830B0F8B8C8F0083B883 /* qgsoverlayobject.cpp in Sources */,
+ 7203830C0F8B8C8F0083B883 /* qgspalobjectpositionmanager.cpp in Sources */,
+ 7203830D0F8B8C8F0083B883 /* qgsvectoroverlay.cpp in Sources */,
+ 720383780F8BA8C50083B883 /* feature.cpp in Sources */,
+ 720383790F8BA8C50083B883 /* geomfunction.cpp in Sources */,
+ 7203837A0F8BA8C50083B883 /* label.cpp in Sources */,
+ 7203837B0F8BA8C50083B883 /* labelposition.cpp in Sources */,
+ 7203837C0F8BA8C50083B883 /* layer.cpp in Sources */,
+ 7203837D0F8BA8C50083B883 /* pal.cpp in Sources */,
+ 7203837E0F8BA8C50083B883 /* palstat.cpp in Sources */,
+ 7203837F0F8BA8C50083B883 /* pointset.cpp in Sources */,
+ 720383800F8BA8C50083B883 /* priorityqueue.cpp in Sources */,
+ 720383810F8BA8C50083B883 /* problem.cpp in Sources */,
+ 720383820F8BA8C50083B883 /* util.cpp in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -14636,6 +14962,21 @@
/* End PBXSourcesBuildPhase section */
/* Begin PBXTargetDependency section */
+ 7203834A0F8B905D0083B883 /* PBXTargetDependency */ = {
+ isa = PBXTargetDependency;
+ target = 7209F1D10F39E760003DC336 /* qgis_core */;
+ targetProxy = 7203834B0F8B905D0083B883 /* PBXContainerItemProxy */;
+ };
+ 7203834C0F8B905D0083B883 /* PBXTargetDependency */ = {
+ isa = PBXTargetDependency;
+ target = 7209F3120F3A2F2B003DC336 /* qgis_gui */;
+ targetProxy = 7203834D0F8B905D0083B883 /* PBXContainerItemProxy */;
+ };
+ 720383870F8BA92B0083B883 /* PBXTargetDependency */ = {
+ isa = PBXTargetDependency;
+ target = 720383490F8B905D0083B883 /* diagramoverlayplugin */;
+ targetProxy = 720383860F8BA92B0083B883 /* PBXContainerItemProxy */;
+ };
7209F3F60F3A3C25003DC336 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = 7209F1D10F39E760003DC336 /* qgis_core */;
@@ -15059,6 +15400,75 @@
/* End PBXTargetDependency section */
/* Begin XCBuildConfiguration section */
+ 720383560F8B905D0083B883 /* Debug */ = {
+ isa = XCBuildConfiguration;
+ buildSettings = {
+ CONFIGURATION_BUILD_DIR = "$(QGIS_BUILD_PATH)/MacOS/$(QGIS_PLUGIN_SUBDIR)";
+ EXECUTABLE_PREFIX = lib;
+ GCC_DYNAMIC_NO_PIC = NO;
+ GCC_OPTIMIZATION_LEVEL = 0;
+ GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)";
+ HEADER_SEARCH_PATHS = (
+ "$(inherited)",
+ ../../src/plugins,
+ ../../src/plugins/plugin,
+ ../../src/core,
+ ../../src/core/raster,
+ ../../src/core/renderer,
+ ../../src/core/symbology,
+ ../../src/core/pal,
+ ../../src/gui,
+ "$(GEOS_INC)",
+ );
+ LIBRARY_SEARCH_PATHS = "$(QGIS_BUILD_PATH)/MacOS/$(QGIS_LIB_SUBDIR)";
+ MACH_O_TYPE = mh_bundle;
+ OTHER_CFLAGS = "$(QT_CXXFLAGS)";
+ OTHER_LDFLAGS = (
+ "$(inherited)",
+ "$(QT_LIB_CORE)",
+ "$(QT_LIB_GUI)",
+ "$(QT_LIB_SVG)",
+ "$(QT_LIB_XML)",
+ );
+ PRODUCT_NAME = diagramoverlayplugin.so;
+ TARGET_PLUGINDIR = diagram_overlay;
+ };
+ name = Debug;
+ };
+ 720383570F8B905D0083B883 /* Release */ = {
+ isa = XCBuildConfiguration;
+ buildSettings = {
+ CONFIGURATION_BUILD_DIR = "$(QGIS_BUILD_PATH)/MacOS/$(QGIS_PLUGIN_SUBDIR)";
+ EXECUTABLE_PREFIX = lib;
+ GCC_DYNAMIC_NO_PIC = NO;
+ GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)";
+ HEADER_SEARCH_PATHS = (
+ "$(inherited)",
+ ../../src/plugins,
+ ../../src/plugins/plugin,
+ ../../src/core,
+ ../../src/core/raster,
+ ../../src/core/renderer,
+ ../../src/core/symbology,
+ ../../src/core/pal,
+ ../../src/gui,
+ "$(GEOS_INC)",
+ );
+ LIBRARY_SEARCH_PATHS = "$(QGIS_BUILD_PATH)/MacOS/$(QGIS_LIB_SUBDIR)";
+ MACH_O_TYPE = mh_bundle;
+ OTHER_CFLAGS = "$(QT_CXXFLAGS)";
+ OTHER_LDFLAGS = (
+ "$(inherited)",
+ "$(QT_LIB_CORE)",
+ "$(QT_LIB_GUI)",
+ "$(QT_LIB_SVG)",
+ "$(QT_LIB_XML)",
+ );
+ PRODUCT_NAME = diagramoverlayplugin.so;
+ TARGET_PLUGINDIR = diagram_overlay;
+ };
+ name = Release;
+ };
7209F1C40F39E6E3003DC336 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
@@ -15085,6 +15495,7 @@
GCC_PREPROCESSOR_DEFINITIONS = (
"$(inherited)",
qgis_core_EXPORTS,
+ _HAVE_PTHREAD_,
);
HEADER_SEARCH_PATHS = (
"$(inherited)",
@@ -15094,6 +15505,7 @@
../../src/core/renderer,
../../src/core/symbology,
../../src/core/spatialindex/include,
+ ../../src/core/pal,
"$(GDAL_INC)",
"$(PROJ_INC)",
"$(GEOS_INC)",
@@ -15122,6 +15534,7 @@
GCC_PREPROCESSOR_DEFINITIONS = (
"$(inherited)",
qgis_core_EXPORTS,
+ _HAVE_PTHREAD_,
);
HEADER_SEARCH_PATHS = (
"$(inherited)",
@@ -15131,6 +15544,7 @@
../../src/core/renderer,
../../src/core/symbology,
../../src/core/spatialindex/include,
+ ../../src/core/pal,
"$(GDAL_INC)",
"$(PROJ_INC)",
"$(GEOS_INC)",
@@ -17215,6 +17629,15 @@
/* End XCBuildConfiguration section */
/* Begin XCConfigurationList section */
+ 720383550F8B905D0083B883 /* Build configuration list for PBXNativeTarget "diagramoverlayplugin" */ = {
+ isa = XCConfigurationList;
+ buildConfigurations = (
+ 720383560F8B905D0083B883 /* Debug */,
+ 720383570F8B905D0083B883 /* Release */,
+ );
+ defaultConfigurationIsVisible = 0;
+ defaultConfigurationName = Release;
+ };
7209F1CB0F39E6FC003DC336 /* Build configuration list for PBXAggregateTarget "config" */ = {
isa = XCConfigurationList;
buildConfigurations = (
Modified: trunk/qgis/mac/xcode/qgis_settings.xcconfig
===================================================================
--- trunk/qgis/mac/xcode/qgis_settings.xcconfig 2009-04-07 15:41:55 UTC (rev 10499)
+++ trunk/qgis/mac/xcode/qgis_settings.xcconfig 2009-04-07 15:49:29 UTC (rev 10500)
@@ -1,6 +1,6 @@
// QGIS Xcode project common build settings
-CURRENT_PROJECT_VERSION = 2.1.4
+CURRENT_PROJECT_VERSION = 2.1.5
// SDK not required for native universal build, but recommended,
// and allows building multiple SDK builds side-by-side
@@ -18,7 +18,7 @@
QGIS_VERSION_MAJOR = 1
QGIS_VERSION_MINOR = 1
QGIS_VERSION_PATCH = 0
-QGIS_VERSION_BUILD = 20090319
+QGIS_VERSION_BUILD = 20090407
QGIS_VERSION_FULL = $(QGIS_VERSION_MAJOR).$(QGIS_VERSION_MINOR).$(QGIS_VERSION_PATCH)-$(QGIS_VERSION_BUILD)
QGIS_VERSION_INT = 10100
More information about the QGIS-commit
mailing list