Skip to content

Commit 80b5912

Browse files
author
kyngchaos
committedApr 7, 2009
vector overlay added, misc updates (r10481, r10484)
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@10500 c8812cc2-4d05-0410-92ff-de0c093fc19c
·
final-1_7_1final-1_7_0
1 parent d44b439 commit 80b5912

File tree

2 files changed

+440
-17
lines changed

2 files changed

+440
-17
lines changed
 

‎mac/xcode/Qgis.xcodeproj/project.pbxproj

Lines changed: 438 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@
7878
7256F1C30F411C7C0022BE1F /* PBXTargetDependency */,
7979
7256F1C10F411C7C0022BE1F /* PBXTargetDependency */,
8080
7256F1BF0F411C7C0022BE1F /* PBXTargetDependency */,
81+
720383870F8BA92B0083B883 /* PBXTargetDependency */,
8182
);
8283
name = "Base Plugins";
8384
productName = "Base Plugins";
@@ -131,6 +132,44 @@
131132
/* End PBXAggregateTarget section */
132133

133134
/* Begin PBXBuildFile section */
135+
720382E00F8B86070083B883 /* qgstolerance.h in Headers */ = {isa = PBXBuildFile; fileRef = 72F8D9420F8924F100D10CE5 /* qgstolerance.h */; };
136+
7203830A0F8B8C8F0083B883 /* qgscentralpointpositionmanager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 720383000F8B8C2D0083B883 /* qgscentralpointpositionmanager.cpp */; };
137+
7203830B0F8B8C8F0083B883 /* qgsoverlayobject.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 720383080F8B8C2D0083B883 /* qgsoverlayobject.cpp */; };
138+
7203830C0F8B8C8F0083B883 /* qgspalobjectpositionmanager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 720383050F8B8C2D0083B883 /* qgspalobjectpositionmanager.cpp */; };
139+
7203830D0F8B8C8F0083B883 /* qgsvectoroverlay.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 720383030F8B8C2D0083B883 /* qgsvectoroverlay.cpp */; };
140+
720383510F8B905D0083B883 /* libqgis_core.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 7209F1D20F39E760003DC336 /* libqgis_core.dylib */; };
141+
720383520F8B905D0083B883 /* libqgis_gui.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 7209F38E0F3A2F2B003DC336 /* libqgis_gui.dylib */; };
142+
7203835F0F8B92E60083B883 /* qgsbardiagramfactory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 720383230F8B8FC40083B883 /* qgsbardiagramfactory.cpp */; };
143+
720383600F8B92E60083B883 /* qgsdiagramcategory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 720383250F8B8FC40083B883 /* qgsdiagramcategory.cpp */; };
144+
720383610F8B92E60083B883 /* qgsdiagramdialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 720383270F8B8FC40083B883 /* qgsdiagramdialog.cpp */; };
145+
720383620F8B92E60083B883 /* qgsdiagramfactory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7203832A0F8B8FC40083B883 /* qgsdiagramfactory.cpp */; };
146+
720383630F8B92E60083B883 /* qgsdiagramfactorywidget.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7203832C0F8B8FC40083B883 /* qgsdiagramfactorywidget.cpp */; };
147+
720383640F8B92E60083B883 /* qgsdiagramoverlay.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7203832E0F8B8FC40083B883 /* qgsdiagramoverlay.cpp */; };
148+
720383650F8B92E60083B883 /* qgsdiagramoverlayplugin.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 720383300F8B8FC40083B883 /* qgsdiagramoverlayplugin.cpp */; };
149+
720383660F8B92E60083B883 /* qgsdiagramrenderer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 720383320F8B8FC40083B883 /* qgsdiagramrenderer.cpp */; };
150+
720383670F8B92E60083B883 /* qgsdiagramrendererwidget.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 720383340F8B8FC40083B883 /* qgsdiagramrendererwidget.cpp */; };
151+
720383680F8B92E60083B883 /* qgslinearlyscalingdialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 720383360F8B8FC40083B883 /* qgslinearlyscalingdialog.cpp */; };
152+
720383690F8B92E60083B883 /* qgspiediagramfactory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 720383390F8B8FC40083B883 /* qgspiediagramfactory.cpp */; };
153+
7203836A0F8B92E60083B883 /* qgssvgdiagramfactory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7203833B0F8B8FC40083B883 /* qgssvgdiagramfactory.cpp */; };
154+
7203836B0F8B92E60083B883 /* qgssvgdiagramfactorywidget.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7203833D0F8B8FC40083B883 /* qgssvgdiagramfactorywidget.cpp */; };
155+
7203836C0F8B92E60083B883 /* qgswkndiagramfactory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 720383400F8B8FC40083B883 /* qgswkndiagramfactory.cpp */; };
156+
7203836D0F8B92E60083B883 /* qgswkndiagramfactorywidget.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 720383420F8B8FC40083B883 /* qgswkndiagramfactorywidget.cpp */; };
157+
7203836E0F8B93450083B883 /* qgsdiagramdialog.h in Sources */ = {isa = PBXBuildFile; fileRef = 720383280F8B8FC40083B883 /* qgsdiagramdialog.h */; };
158+
7203836F0F8B93450083B883 /* qgsdiagramoverlayplugin.h in Sources */ = {isa = PBXBuildFile; fileRef = 720383310F8B8FC40083B883 /* qgsdiagramoverlayplugin.h */; };
159+
720383700F8B93450083B883 /* qgslinearlyscalingdialog.h in Sources */ = {isa = PBXBuildFile; fileRef = 720383370F8B8FC40083B883 /* qgslinearlyscalingdialog.h */; };
160+
720383710F8B93450083B883 /* qgssvgdiagramfactorywidget.h in Sources */ = {isa = PBXBuildFile; fileRef = 7203833E0F8B8FC40083B883 /* qgssvgdiagramfactorywidget.h */; };
161+
720383720F8B93450083B883 /* qgswkndiagramfactorywidget.h in Sources */ = {isa = PBXBuildFile; fileRef = 720383430F8B8FC40083B883 /* qgswkndiagramfactorywidget.h */; };
162+
720383780F8BA8C50083B883 /* feature.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 720382E20F8B8B540083B883 /* feature.cpp */; };
163+
720383790F8BA8C50083B883 /* geomfunction.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 720382E40F8B8B540083B883 /* geomfunction.cpp */; };
164+
7203837A0F8BA8C50083B883 /* label.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 720382E80F8B8B540083B883 /* label.cpp */; };
165+
7203837B0F8BA8C50083B883 /* labelposition.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 720382EA0F8B8B540083B883 /* labelposition.cpp */; };
166+
7203837C0F8BA8C50083B883 /* layer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 720382EC0F8B8B540083B883 /* layer.cpp */; };
167+
7203837D0F8BA8C50083B883 /* pal.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 720382EF0F8B8B540083B883 /* pal.cpp */; };
168+
7203837E0F8BA8C50083B883 /* palstat.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 720382F30F8B8B540083B883 /* palstat.cpp */; };
169+
7203837F0F8BA8C50083B883 /* pointset.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 720382F50F8B8B540083B883 /* pointset.cpp */; };
170+
720383800F8BA8C50083B883 /* priorityqueue.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 720382F70F8B8B540083B883 /* priorityqueue.cpp */; };
171+
720383810F8BA8C50083B883 /* problem.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 720382F90F8B8B540083B883 /* problem.cpp */; };
172+
720383820F8BA8C50083B883 /* util.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 720382FD0F8B8B540083B883 /* util.cpp */; };
134173
7209CEF70F4DA72500DAC424 /* r.watershed.1.png in Copy - modules */ = {isa = PBXBuildFile; fileRef = 7209CEF60F4DA70000DAC424 /* r.watershed.1.png */; };
135174
7209CEF80F4DA72500DAC424 /* r.watershed.2.png in Copy - modules */ = {isa = PBXBuildFile; fileRef = 7209CEF50F4DA70000DAC424 /* r.watershed.2.png */; };
136175
7209CEF90F4DA72500DAC424 /* r.watershed.qgm in Copy - modules */ = {isa = PBXBuildFile; fileRef = 7209CEF40F4DA70000DAC424 /* r.watershed.qgm */; };
@@ -2390,6 +2429,28 @@
23902429
/* End PBXBuildFile section */
23912430

23922431
/* Begin PBXBuildRule section */
2432+
720383530F8B905D0083B883 /* PBXBuildRule */ = {
2433+
isa = PBXBuildRule;
2434+
compilerSpec = com.apple.compilers.proxy.script;
2435+
filePatterns = "*.qrc";
2436+
fileType = pattern.proxy;
2437+
isEditable = 1;
2438+
outputFiles = (
2439+
"$(DERIVED_FILES_DIR)/qrc_$(INPUT_FILE_BASE).cpp",
2440+
);
2441+
script = "$QTRCC -name $INPUT_FILE_BASE -o \"$DERIVED_FILES_DIR/qrc_$INPUT_FILE_BASE.cpp\" \"$INPUT_FILE_PATH\"";
2442+
};
2443+
720383540F8B905D0083B883 /* PBXBuildRule */ = {
2444+
isa = PBXBuildRule;
2445+
compilerSpec = com.apple.compilers.proxy.script;
2446+
filePatterns = "*.h";
2447+
fileType = pattern.proxy;
2448+
isEditable = 1;
2449+
outputFiles = (
2450+
"$(DERIVED_FILES_DIR)/moc_$(INPUT_FILE_BASE).cpp",
2451+
);
2452+
script = "$QTMOC $QT_CXXFLAGS -o \"$DERIVED_FILES_DIR/moc_$INPUT_FILE_BASE.cpp\" \"$INPUT_FILE_PATH\"";
2453+
};
23932454
7262ED980F7A770300498385 /* PBXBuildRule */ = {
23942455
isa = PBXBuildRule;
23952456
compilerSpec = com.apple.compilers.proxy.script;
@@ -2889,6 +2950,27 @@
28892950
/* End PBXBuildRule section */
28902951

28912952
/* Begin PBXContainerItemProxy section */
2953+
7203834B0F8B905D0083B883 /* PBXContainerItemProxy */ = {
2954+
isa = PBXContainerItemProxy;
2955+
containerPortal = 20286C28FDCF999611CA2CEA /* Project object */;
2956+
proxyType = 1;
2957+
remoteGlobalIDString = 7209F1D10F39E760003DC336;
2958+
remoteInfo = qgis_core;
2959+
};
2960+
7203834D0F8B905D0083B883 /* PBXContainerItemProxy */ = {
2961+
isa = PBXContainerItemProxy;
2962+
containerPortal = 20286C28FDCF999611CA2CEA /* Project object */;
2963+
proxyType = 1;
2964+
remoteGlobalIDString = 7209F3120F3A2F2B003DC336;
2965+
remoteInfo = qgis_gui;
2966+
};
2967+
720383860F8BA92B0083B883 /* PBXContainerItemProxy */ = {
2968+
isa = PBXContainerItemProxy;
2969+
containerPortal = 20286C28FDCF999611CA2CEA /* Project object */;
2970+
proxyType = 1;
2971+
remoteGlobalIDString = 720383490F8B905D0083B883 /* diagramoverlayplugin */;
2972+
remoteInfo = diagramoverlayplugin;
2973+
};
28922974
7209F3F50F3A3C25003DC336 /* PBXContainerItemProxy */ = {
28932975
isa = PBXContainerItemProxy;
28942976
containerPortal = 20286C28FDCF999611CA2CEA /* Project object */;
@@ -5458,6 +5540,82 @@
54585540

54595541
/* Begin PBXFileReference section */
54605542
508344B209E5C41E0093A071 /* Qgis.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Qgis.app; sourceTree = BUILT_PRODUCTS_DIR; };
5543+
720382E20F8B8B540083B883 /* feature.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = feature.cpp; path = ../../src/core/pal/feature.cpp; sourceTree = SOURCE_ROOT; };
5544+
720382E30F8B8B540083B883 /* feature.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = feature.h; path = ../../src/core/pal/feature.h; sourceTree = SOURCE_ROOT; };
5545+
720382E40F8B8B540083B883 /* geomfunction.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = geomfunction.cpp; path = ../../src/core/pal/geomfunction.cpp; sourceTree = SOURCE_ROOT; };
5546+
720382E50F8B8B540083B883 /* geomfunction.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = geomfunction.h; path = ../../src/core/pal/geomfunction.h; sourceTree = SOURCE_ROOT; };
5547+
720382E60F8B8B540083B883 /* hashtable.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = hashtable.hpp; path = ../../src/core/pal/hashtable.hpp; sourceTree = SOURCE_ROOT; };
5548+
720382E70F8B8B540083B883 /* internalexception.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = internalexception.h; path = ../../src/core/pal/internalexception.h; sourceTree = SOURCE_ROOT; };
5549+
720382E80F8B8B540083B883 /* label.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = label.cpp; path = ../../src/core/pal/label.cpp; sourceTree = SOURCE_ROOT; };
5550+
720382E90F8B8B540083B883 /* label.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = label.h; path = ../../src/core/pal/label.h; sourceTree = SOURCE_ROOT; };
5551+
720382EA0F8B8B540083B883 /* labelposition.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = labelposition.cpp; path = ../../src/core/pal/labelposition.cpp; sourceTree = SOURCE_ROOT; };
5552+
720382EB0F8B8B540083B883 /* labelposition.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = labelposition.h; path = ../../src/core/pal/labelposition.h; sourceTree = SOURCE_ROOT; };
5553+
720382EC0F8B8B540083B883 /* layer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = layer.cpp; path = ../../src/core/pal/layer.cpp; sourceTree = SOURCE_ROOT; };
5554+
720382ED0F8B8B540083B883 /* layer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = layer.h; path = ../../src/core/pal/layer.h; sourceTree = SOURCE_ROOT; };
5555+
720382EE0F8B8B540083B883 /* linkedlist.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = linkedlist.hpp; path = ../../src/core/pal/linkedlist.hpp; sourceTree = SOURCE_ROOT; };
5556+
720382EF0F8B8B540083B883 /* pal.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = pal.cpp; path = ../../src/core/pal/pal.cpp; sourceTree = SOURCE_ROOT; };
5557+
720382F00F8B8B540083B883 /* pal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = pal.h; path = ../../src/core/pal/pal.h; sourceTree = SOURCE_ROOT; };
5558+
720382F10F8B8B540083B883 /* palexception.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = palexception.h; path = ../../src/core/pal/palexception.h; sourceTree = SOURCE_ROOT; };
5559+
720382F20F8B8B540083B883 /* palgeometry.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = palgeometry.h; path = ../../src/core/pal/palgeometry.h; sourceTree = SOURCE_ROOT; };
5560+
720382F30F8B8B540083B883 /* palstat.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = palstat.cpp; path = ../../src/core/pal/palstat.cpp; sourceTree = SOURCE_ROOT; };
5561+
720382F40F8B8B540083B883 /* palstat.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = palstat.h; path = ../../src/core/pal/palstat.h; sourceTree = SOURCE_ROOT; };
5562+
720382F50F8B8B540083B883 /* pointset.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = pointset.cpp; path = ../../src/core/pal/pointset.cpp; sourceTree = SOURCE_ROOT; };
5563+
720382F60F8B8B540083B883 /* pointset.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = pointset.h; path = ../../src/core/pal/pointset.h; sourceTree = SOURCE_ROOT; };
5564+
720382F70F8B8B540083B883 /* priorityqueue.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = priorityqueue.cpp; path = ../../src/core/pal/priorityqueue.cpp; sourceTree = SOURCE_ROOT; };
5565+
720382F80F8B8B540083B883 /* priorityqueue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = priorityqueue.h; path = ../../src/core/pal/priorityqueue.h; sourceTree = SOURCE_ROOT; };
5566+
720382F90F8B8B540083B883 /* problem.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = problem.cpp; path = ../../src/core/pal/problem.cpp; sourceTree = SOURCE_ROOT; };
5567+
720382FA0F8B8B540083B883 /* problem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = problem.h; path = ../../src/core/pal/problem.h; sourceTree = SOURCE_ROOT; };
5568+
720382FB0F8B8B540083B883 /* rtree.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = rtree.hpp; path = ../../src/core/pal/rtree.hpp; sourceTree = SOURCE_ROOT; };
5569+
720382FC0F8B8B540083B883 /* simplemutex.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = simplemutex.h; path = ../../src/core/pal/simplemutex.h; sourceTree = SOURCE_ROOT; };
5570+
720382FD0F8B8B540083B883 /* util.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = util.cpp; path = ../../src/core/pal/util.cpp; sourceTree = SOURCE_ROOT; };
5571+
720382FE0F8B8B540083B883 /* util.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = util.h; path = ../../src/core/pal/util.h; sourceTree = SOURCE_ROOT; };
5572+
720383000F8B8C2D0083B883 /* qgscentralpointpositionmanager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = qgscentralpointpositionmanager.cpp; path = ../../src/core/qgscentralpointpositionmanager.cpp; sourceTree = SOURCE_ROOT; };
5573+
720383010F8B8C2D0083B883 /* qgscentralpointpositionmanager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = qgscentralpointpositionmanager.h; path = ../../src/core/qgscentralpointpositionmanager.h; sourceTree = SOURCE_ROOT; };
5574+
720383020F8B8C2D0083B883 /* qgsvectoroverlay.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = qgsvectoroverlay.h; path = ../../src/core/qgsvectoroverlay.h; sourceTree = SOURCE_ROOT; };
5575+
720383030F8B8C2D0083B883 /* qgsvectoroverlay.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = qgsvectoroverlay.cpp; path = ../../src/core/qgsvectoroverlay.cpp; sourceTree = SOURCE_ROOT; };
5576+
720383040F8B8C2D0083B883 /* qgspalobjectpositionmanager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = qgspalobjectpositionmanager.h; path = ../../src/core/qgspalobjectpositionmanager.h; sourceTree = SOURCE_ROOT; };
5577+
720383050F8B8C2D0083B883 /* qgspalobjectpositionmanager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = qgspalobjectpositionmanager.cpp; path = ../../src/core/qgspalobjectpositionmanager.cpp; sourceTree = SOURCE_ROOT; };
5578+
720383060F8B8C2D0083B883 /* qgsoverlayobjectpositionmanager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = qgsoverlayobjectpositionmanager.h; path = ../../src/core/qgsoverlayobjectpositionmanager.h; sourceTree = SOURCE_ROOT; };
5579+
720383070F8B8C2D0083B883 /* qgsoverlayobject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = qgsoverlayobject.h; path = ../../src/core/qgsoverlayobject.h; sourceTree = SOURCE_ROOT; };
5580+
720383080F8B8C2D0083B883 /* qgsoverlayobject.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = qgsoverlayobject.cpp; path = ../../src/core/qgsoverlayobject.cpp; sourceTree = SOURCE_ROOT; };
5581+
720383220F8B8FC40083B883 /* CMakeLists.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = CMakeLists.txt; path = ../../src/plugins/diagram_overlay/CMakeLists.txt; sourceTree = SOURCE_ROOT; };
5582+
720383230F8B8FC40083B883 /* qgsbardiagramfactory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = qgsbardiagramfactory.cpp; path = ../../src/plugins/diagram_overlay/qgsbardiagramfactory.cpp; sourceTree = SOURCE_ROOT; };
5583+
720383240F8B8FC40083B883 /* qgsbardiagramfactory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = qgsbardiagramfactory.h; path = ../../src/plugins/diagram_overlay/qgsbardiagramfactory.h; sourceTree = SOURCE_ROOT; };
5584+
720383250F8B8FC40083B883 /* qgsdiagramcategory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = qgsdiagramcategory.cpp; path = ../../src/plugins/diagram_overlay/qgsdiagramcategory.cpp; sourceTree = SOURCE_ROOT; };
5585+
720383260F8B8FC40083B883 /* qgsdiagramcategory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = qgsdiagramcategory.h; path = ../../src/plugins/diagram_overlay/qgsdiagramcategory.h; sourceTree = SOURCE_ROOT; };
5586+
720383270F8B8FC40083B883 /* qgsdiagramdialog.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = qgsdiagramdialog.cpp; path = ../../src/plugins/diagram_overlay/qgsdiagramdialog.cpp; sourceTree = SOURCE_ROOT; };
5587+
720383280F8B8FC40083B883 /* qgsdiagramdialog.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = qgsdiagramdialog.h; path = ../../src/plugins/diagram_overlay/qgsdiagramdialog.h; sourceTree = SOURCE_ROOT; };
5588+
720383290F8B8FC40083B883 /* qgsdiagramdialogbase.ui */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = qgsdiagramdialogbase.ui; path = ../../src/plugins/diagram_overlay/qgsdiagramdialogbase.ui; sourceTree = SOURCE_ROOT; };
5589+
7203832A0F8B8FC40083B883 /* qgsdiagramfactory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = qgsdiagramfactory.cpp; path = ../../src/plugins/diagram_overlay/qgsdiagramfactory.cpp; sourceTree = SOURCE_ROOT; };
5590+
7203832B0F8B8FC40083B883 /* qgsdiagramfactory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = qgsdiagramfactory.h; path = ../../src/plugins/diagram_overlay/qgsdiagramfactory.h; sourceTree = SOURCE_ROOT; };
5591+
7203832C0F8B8FC40083B883 /* qgsdiagramfactorywidget.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = qgsdiagramfactorywidget.cpp; path = ../../src/plugins/diagram_overlay/qgsdiagramfactorywidget.cpp; sourceTree = SOURCE_ROOT; };
5592+
7203832D0F8B8FC40083B883 /* qgsdiagramfactorywidget.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = qgsdiagramfactorywidget.h; path = ../../src/plugins/diagram_overlay/qgsdiagramfactorywidget.h; sourceTree = SOURCE_ROOT; };
5593+
7203832E0F8B8FC40083B883 /* qgsdiagramoverlay.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = qgsdiagramoverlay.cpp; path = ../../src/plugins/diagram_overlay/qgsdiagramoverlay.cpp; sourceTree = SOURCE_ROOT; };
5594+
7203832F0F8B8FC40083B883 /* qgsdiagramoverlay.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = qgsdiagramoverlay.h; path = ../../src/plugins/diagram_overlay/qgsdiagramoverlay.h; sourceTree = SOURCE_ROOT; };
5595+
720383300F8B8FC40083B883 /* qgsdiagramoverlayplugin.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = qgsdiagramoverlayplugin.cpp; path = ../../src/plugins/diagram_overlay/qgsdiagramoverlayplugin.cpp; sourceTree = SOURCE_ROOT; };
5596+
720383310F8B8FC40083B883 /* qgsdiagramoverlayplugin.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = qgsdiagramoverlayplugin.h; path = ../../src/plugins/diagram_overlay/qgsdiagramoverlayplugin.h; sourceTree = SOURCE_ROOT; };
5597+
720383320F8B8FC40083B883 /* qgsdiagramrenderer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = qgsdiagramrenderer.cpp; path = ../../src/plugins/diagram_overlay/qgsdiagramrenderer.cpp; sourceTree = SOURCE_ROOT; };
5598+
720383330F8B8FC40083B883 /* qgsdiagramrenderer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = qgsdiagramrenderer.h; path = ../../src/plugins/diagram_overlay/qgsdiagramrenderer.h; sourceTree = SOURCE_ROOT; };
5599+
720383340F8B8FC40083B883 /* qgsdiagramrendererwidget.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = qgsdiagramrendererwidget.cpp; path = ../../src/plugins/diagram_overlay/qgsdiagramrendererwidget.cpp; sourceTree = SOURCE_ROOT; };
5600+
720383350F8B8FC40083B883 /* qgsdiagramrendererwidget.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = qgsdiagramrendererwidget.h; path = ../../src/plugins/diagram_overlay/qgsdiagramrendererwidget.h; sourceTree = SOURCE_ROOT; };
5601+
720383360F8B8FC40083B883 /* qgslinearlyscalingdialog.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = qgslinearlyscalingdialog.cpp; path = ../../src/plugins/diagram_overlay/qgslinearlyscalingdialog.cpp; sourceTree = SOURCE_ROOT; };
5602+
720383370F8B8FC40083B883 /* qgslinearlyscalingdialog.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = qgslinearlyscalingdialog.h; path = ../../src/plugins/diagram_overlay/qgslinearlyscalingdialog.h; sourceTree = SOURCE_ROOT; };
5603+
720383380F8B8FC40083B883 /* qgslinearlyscalingdialogbase.ui */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = qgslinearlyscalingdialogbase.ui; path = ../../src/plugins/diagram_overlay/qgslinearlyscalingdialogbase.ui; sourceTree = SOURCE_ROOT; };
5604+
720383390F8B8FC40083B883 /* qgspiediagramfactory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = qgspiediagramfactory.cpp; path = ../../src/plugins/diagram_overlay/qgspiediagramfactory.cpp; sourceTree = SOURCE_ROOT; };
5605+
7203833A0F8B8FC40083B883 /* qgspiediagramfactory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = qgspiediagramfactory.h; path = ../../src/plugins/diagram_overlay/qgspiediagramfactory.h; sourceTree = SOURCE_ROOT; };
5606+
7203833B0F8B8FC40083B883 /* qgssvgdiagramfactory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = qgssvgdiagramfactory.cpp; path = ../../src/plugins/diagram_overlay/qgssvgdiagramfactory.cpp; sourceTree = SOURCE_ROOT; };
5607+
7203833C0F8B8FC40083B883 /* qgssvgdiagramfactory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = qgssvgdiagramfactory.h; path = ../../src/plugins/diagram_overlay/qgssvgdiagramfactory.h; sourceTree = SOURCE_ROOT; };
5608+
7203833D0F8B8FC40083B883 /* qgssvgdiagramfactorywidget.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = qgssvgdiagramfactorywidget.cpp; path = ../../src/plugins/diagram_overlay/qgssvgdiagramfactorywidget.cpp; sourceTree = SOURCE_ROOT; };
5609+
7203833E0F8B8FC40083B883 /* qgssvgdiagramfactorywidget.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = qgssvgdiagramfactorywidget.h; path = ../../src/plugins/diagram_overlay/qgssvgdiagramfactorywidget.h; sourceTree = SOURCE_ROOT; };
5610+
7203833F0F8B8FC40083B883 /* qgssvgdiagramfactorywidgetbase.ui */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = qgssvgdiagramfactorywidgetbase.ui; path = ../../src/plugins/diagram_overlay/qgssvgdiagramfactorywidgetbase.ui; sourceTree = SOURCE_ROOT; };
5611+
720383400F8B8FC40083B883 /* qgswkndiagramfactory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = qgswkndiagramfactory.cpp; path = ../../src/plugins/diagram_overlay/qgswkndiagramfactory.cpp; sourceTree = SOURCE_ROOT; };
5612+
720383410F8B8FC40083B883 /* qgswkndiagramfactory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = qgswkndiagramfactory.h; path = ../../src/plugins/diagram_overlay/qgswkndiagramfactory.h; sourceTree = SOURCE_ROOT; };
5613+
720383420F8B8FC40083B883 /* qgswkndiagramfactorywidget.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = qgswkndiagramfactorywidget.cpp; path = ../../src/plugins/diagram_overlay/qgswkndiagramfactorywidget.cpp; sourceTree = SOURCE_ROOT; };
5614+
720383430F8B8FC40083B883 /* qgswkndiagramfactorywidget.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = qgswkndiagramfactorywidget.h; path = ../../src/plugins/diagram_overlay/qgswkndiagramfactorywidget.h; sourceTree = SOURCE_ROOT; };
5615+
720383440F8B8FC40083B883 /* qgswkndiagramfactorywidgetbase.ui */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = qgswkndiagramfactorywidgetbase.ui; path = ../../src/plugins/diagram_overlay/qgswkndiagramfactorywidgetbase.ui; sourceTree = SOURCE_ROOT; };
5616+
720383580F8B905D0083B883 /* libdiagramoverlayplugin.so */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = libdiagramoverlayplugin.so; sourceTree = BUILT_PRODUCTS_DIR; };
5617+
7203835A0F8B90B50083B883 /* qgsapplydialog.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = qgsapplydialog.h; path = ../../src/plugins/qgsapplydialog.h; sourceTree = SOURCE_ROOT; };
5618+
7203835B0F8B90B50083B883 /* qgsvectoroverlayplugin.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = qgsvectoroverlayplugin.h; path = ../../src/plugins/qgsvectoroverlayplugin.h; sourceTree = SOURCE_ROOT; };
54615619
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; };
54625620
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; };
54635621
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 @@
58235981
7209E72F0F39E57A003DC336 /* ExternalSort.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ExternalSort.h; path = ../../src/core/spatialindex/tools/ExternalSort.h; sourceTree = SOURCE_ROOT; };
58245982
7209E7300F39E57A003DC336 /* TemporaryFile.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = TemporaryFile.cc; path = ../../src/core/spatialindex/tools/TemporaryFile.cc; sourceTree = SOURCE_ROOT; };
58255983
7209E7310F39E57A003DC336 /* Tools.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Tools.cc; path = ../../src/core/spatialindex/tools/Tools.cc; sourceTree = SOURCE_ROOT; };
5826-
7209E7330F39E57A003DC336 /* sqlite3.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = sqlite3.c; path = ../../src/core/sqlite3/sqlite3.c; sourceTree = SOURCE_ROOT; };
5827-
7209E7340F39E57A003DC336 /* sqlite3.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = sqlite3.h; path = ../../src/core/sqlite3/sqlite3.h; sourceTree = SOURCE_ROOT; };
5828-
7209E7350F39E57A003DC336 /* sqlite3ext.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = sqlite3ext.h; path = ../../src/core/sqlite3/sqlite3ext.h; sourceTree = SOURCE_ROOT; };
58295984
7209E7370F39E57A003DC336 /* qgsmarkercatalogue.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = qgsmarkercatalogue.cpp; path = ../../src/core/symbology/qgsmarkercatalogue.cpp; sourceTree = SOURCE_ROOT; };
58305985
7209E7380F39E57A003DC336 /* qgsmarkercatalogue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = qgsmarkercatalogue.h; path = ../../src/core/symbology/qgsmarkercatalogue.h; sourceTree = SOURCE_ROOT; };
58315986
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 @@
83108465
/* End PBXFileReference section */
83118466

83128467
/* Begin PBXFrameworksBuildPhase section */
8468+
720383500F8B905D0083B883 /* Frameworks */ = {
8469+
isa = PBXFrameworksBuildPhase;
8470+
buildActionMask = 2147483647;
8471+
files = (
8472+
720383510F8B905D0083B883 /* libqgis_core.dylib in Frameworks */,
8473+
720383520F8B905D0083B883 /* libqgis_gui.dylib in Frameworks */,
8474+
);
8475+
runOnlyForDeploymentPostprocessing = 0;
8476+
};
83138477
7209F1D00F39E760003DC336 /* Frameworks */ = {
83148478
isa = PBXFrameworksBuildPhase;
83158479
buildActionMask = 2147483647;
@@ -8617,6 +8781,7 @@
86178781
7256F29B0F4141240022BE1F /* core.so */,
86188782
7256F29C0F4141570022BE1F /* gui.so */,
86198783
7262ED9C0F7A770300498385 /* libspatialiteprovider.so */,
8784+
720383580F8B905D0083B883 /* libdiagramoverlayplugin.so */,
86208785
);
86218786
name = Products;
86228787
sourceTree = "<group>";
@@ -8694,6 +8859,86 @@
86948859
name = "Configuration Files";
86958860
sourceTree = "<group>";
86968861
};
8862+
720382E10F8B8B540083B883 /* pal */ = {
8863+
isa = PBXGroup;
8864+
children = (
8865+
720382E20F8B8B540083B883 /* feature.cpp */,
8866+
720382E30F8B8B540083B883 /* feature.h */,
8867+
720382E40F8B8B540083B883 /* geomfunction.cpp */,
8868+
720382E50F8B8B540083B883 /* geomfunction.h */,
8869+
720382E60F8B8B540083B883 /* hashtable.hpp */,
8870+
720382E70F8B8B540083B883 /* internalexception.h */,
8871+
720382E80F8B8B540083B883 /* label.cpp */,
8872+
720382E90F8B8B540083B883 /* label.h */,
8873+
720382EA0F8B8B540083B883 /* labelposition.cpp */,
8874+
720382EB0F8B8B540083B883 /* labelposition.h */,
8875+
720382EC0F8B8B540083B883 /* layer.cpp */,
8876+
720382ED0F8B8B540083B883 /* layer.h */,
8877+
720382EE0F8B8B540083B883 /* linkedlist.hpp */,
8878+
720382EF0F8B8B540083B883 /* pal.cpp */,
8879+
720382F00F8B8B540083B883 /* pal.h */,
8880+
720382F10F8B8B540083B883 /* palexception.h */,
8881+
720382F20F8B8B540083B883 /* palgeometry.h */,
8882+
720382F30F8B8B540083B883 /* palstat.cpp */,
8883+
720382F40F8B8B540083B883 /* palstat.h */,
8884+
720382F50F8B8B540083B883 /* pointset.cpp */,
8885+
720382F60F8B8B540083B883 /* pointset.h */,
8886+
720382F70F8B8B540083B883 /* priorityqueue.cpp */,
8887+
720382F80F8B8B540083B883 /* priorityqueue.h */,
8888+
720382F90F8B8B540083B883 /* problem.cpp */,
8889+
720382FA0F8B8B540083B883 /* problem.h */,
8890+
720382FB0F8B8B540083B883 /* rtree.hpp */,
8891+
720382FC0F8B8B540083B883 /* simplemutex.h */,
8892+
720382FD0F8B8B540083B883 /* util.cpp */,
8893+
720382FE0F8B8B540083B883 /* util.h */,
8894+
);
8895+
name = pal;
8896+
path = ../../src/core/pal;
8897+
sourceTree = SOURCE_ROOT;
8898+
};
8899+
720383210F8B8FC40083B883 /* diagram_overlay */ = {
8900+
isa = PBXGroup;
8901+
children = (
8902+
720383220F8B8FC40083B883 /* CMakeLists.txt */,
8903+
720383230F8B8FC40083B883 /* qgsbardiagramfactory.cpp */,
8904+
720383240F8B8FC40083B883 /* qgsbardiagramfactory.h */,
8905+
720383250F8B8FC40083B883 /* qgsdiagramcategory.cpp */,
8906+
720383260F8B8FC40083B883 /* qgsdiagramcategory.h */,
8907+
720383270F8B8FC40083B883 /* qgsdiagramdialog.cpp */,
8908+
720383280F8B8FC40083B883 /* qgsdiagramdialog.h */,
8909+
720383290F8B8FC40083B883 /* qgsdiagramdialogbase.ui */,
8910+
7203832A0F8B8FC40083B883 /* qgsdiagramfactory.cpp */,
8911+
7203832B0F8B8FC40083B883 /* qgsdiagramfactory.h */,
8912+
7203832C0F8B8FC40083B883 /* qgsdiagramfactorywidget.cpp */,
8913+
7203832D0F8B8FC40083B883 /* qgsdiagramfactorywidget.h */,
8914+
7203832E0F8B8FC40083B883 /* qgsdiagramoverlay.cpp */,
8915+
7203832F0F8B8FC40083B883 /* qgsdiagramoverlay.h */,
8916+
720383300F8B8FC40083B883 /* qgsdiagramoverlayplugin.cpp */,
8917+
720383310F8B8FC40083B883 /* qgsdiagramoverlayplugin.h */,
8918+
720383320F8B8FC40083B883 /* qgsdiagramrenderer.cpp */,
8919+
720383330F8B8FC40083B883 /* qgsdiagramrenderer.h */,
8920+
720383340F8B8FC40083B883 /* qgsdiagramrendererwidget.cpp */,
8921+
720383350F8B8FC40083B883 /* qgsdiagramrendererwidget.h */,
8922+
720383360F8B8FC40083B883 /* qgslinearlyscalingdialog.cpp */,
8923+
720383370F8B8FC40083B883 /* qgslinearlyscalingdialog.h */,
8924+
720383380F8B8FC40083B883 /* qgslinearlyscalingdialogbase.ui */,
8925+
720383390F8B8FC40083B883 /* qgspiediagramfactory.cpp */,
8926+
7203833A0F8B8FC40083B883 /* qgspiediagramfactory.h */,
8927+
7203833B0F8B8FC40083B883 /* qgssvgdiagramfactory.cpp */,
8928+
7203833C0F8B8FC40083B883 /* qgssvgdiagramfactory.h */,
8929+
7203833D0F8B8FC40083B883 /* qgssvgdiagramfactorywidget.cpp */,
8930+
7203833E0F8B8FC40083B883 /* qgssvgdiagramfactorywidget.h */,
8931+
7203833F0F8B8FC40083B883 /* qgssvgdiagramfactorywidgetbase.ui */,
8932+
720383400F8B8FC40083B883 /* qgswkndiagramfactory.cpp */,
8933+
720383410F8B8FC40083B883 /* qgswkndiagramfactory.h */,
8934+
720383420F8B8FC40083B883 /* qgswkndiagramfactorywidget.cpp */,
8935+
720383430F8B8FC40083B883 /* qgswkndiagramfactorywidget.h */,
8936+
720383440F8B8FC40083B883 /* qgswkndiagramfactorywidgetbase.ui */,
8937+
);
8938+
name = diagram_overlay;
8939+
path = ../../src/plugins/diagram_overlay;
8940+
sourceTree = SOURCE_ROOT;
8941+
};
86978942
7209E5B90F39E57A003DC336 /* src */ = {
86988943
isa = PBXGroup;
86998944
children = (
@@ -9006,12 +9251,21 @@
90069251
7209E6D60F39E57A003DC336 /* qgsvectorfilewriter.h */,
90079252
7209E6D70F39E57A003DC336 /* qgsvectorlayer.cpp */,
90089253
7209E6D80F39E57A003DC336 /* qgsvectorlayer.h */,
9254+
720383000F8B8C2D0083B883 /* qgscentralpointpositionmanager.cpp */,
9255+
720383010F8B8C2D0083B883 /* qgscentralpointpositionmanager.h */,
9256+
720383020F8B8C2D0083B883 /* qgsvectoroverlay.h */,
9257+
720383030F8B8C2D0083B883 /* qgsvectoroverlay.cpp */,
9258+
720383040F8B8C2D0083B883 /* qgspalobjectpositionmanager.h */,
9259+
720383050F8B8C2D0083B883 /* qgspalobjectpositionmanager.cpp */,
9260+
720383060F8B8C2D0083B883 /* qgsoverlayobjectpositionmanager.h */,
9261+
720383070F8B8C2D0083B883 /* qgsoverlayobject.h */,
9262+
720383080F8B8C2D0083B883 /* qgsoverlayobject.cpp */,
90099263
7209E6630F39E57A003DC336 /* composer */,
9264+
720382E10F8B8B540083B883 /* pal */,
90109265
7209E6D90F39E57A003DC336 /* raster */,
90119266
7209E6F50F39E57A003DC336 /* renderer */,
90129267
7209E7000F39E57A003DC336 /* spatialindex */,
90139268
72F8D9470F89268C00D10CE5 /* spatialite */,
9014-
7209E7320F39E57A003DC336 /* sqlite3 */,
90159269
7209E7360F39E57A003DC336 /* symbology */,
90169270
7209E6620F39E57A003DC336 /* CMakeLists.txt */,
90179271
7209E6800F39E57A003DC336 /* genlexyacc.bat */,
@@ -9216,17 +9470,6 @@
92169470
path = ../../src/core/spatialindex/tools;
92179471
sourceTree = SOURCE_ROOT;
92189472
};
9219-
7209E7320F39E57A003DC336 /* sqlite3 */ = {
9220-
isa = PBXGroup;
9221-
children = (
9222-
7209E7330F39E57A003DC336 /* sqlite3.c */,
9223-
7209E7340F39E57A003DC336 /* sqlite3.h */,
9224-
7209E7350F39E57A003DC336 /* sqlite3ext.h */,
9225-
);
9226-
name = sqlite3;
9227-
path = ../../src/core/sqlite3;
9228-
sourceTree = SOURCE_ROOT;
9229-
};
92309473
7209E7360F39E57A003DC336 /* symbology */ = {
92319474
isa = PBXGroup;
92329475
children = (
@@ -9378,6 +9621,7 @@
93789621
7209E79A0F39E57A003DC336 /* CMakeLists.txt */,
93799622
7209E7AE0F39E57A003DC336 /* copyright_label */,
93809623
7209E7BB0F39E57B003DC336 /* delimited_text */,
9624+
720383210F8B8FC40083B883 /* diagram_overlay */,
93819625
7209EBB90F39E57B003DC336 /* interpolation */,
93829626
7209EBE90F39E57B003DC336 /* north_arrow */,
93839627
7209EC1E0F39E57B003DC336 /* scale_bar */,
@@ -9395,6 +9639,8 @@
93959639
7209EC080F39E57B003DC336 /* plugin_template */,
93969640
7209EC130F39E57B003DC336 /* qgisplugin.h */,
93979641
7209EC140F39E57B003DC336 /* qgsrendererplugin.h */,
9642+
7203835A0F8B90B50083B883 /* qgsapplydialog.h */,
9643+
7203835B0F8B90B50083B883 /* qgsvectoroverlayplugin.h */,
93989644
);
93999645
name = plugins;
94009646
path = ../../src/plugins;
@@ -12790,12 +13036,34 @@
1279013036
7209F60B0F3A577C003DC336 /* qgsvectorfilewriter.h in Headers */,
1279113037
7209F60C0F3A577C003DC336 /* qgsvectorlayer.h in Headers */,
1279213038
7209F60D0F3A577C003DC336 /* qgsvertexmarker.h in Headers */,
13039+
720382E00F8B86070083B883 /* qgstolerance.h in Headers */,
1279313040
);
1279413041
runOnlyForDeploymentPostprocessing = 0;
1279513042
};
1279613043
/* End PBXHeadersBuildPhase section */
1279713044

1279813045
/* Begin PBXNativeTarget section */
13046+
720383490F8B905D0083B883 /* diagramoverlayplugin */ = {
13047+
isa = PBXNativeTarget;
13048+
buildConfigurationList = 720383550F8B905D0083B883 /* Build configuration list for PBXNativeTarget "diagramoverlayplugin" */;
13049+
buildPhases = (
13050+
7203834E0F8B905D0083B883 /* Script - ui */,
13051+
7203834F0F8B905D0083B883 /* Sources */,
13052+
720383500F8B905D0083B883 /* Frameworks */,
13053+
);
13054+
buildRules = (
13055+
720383530F8B905D0083B883 /* PBXBuildRule */,
13056+
720383540F8B905D0083B883 /* PBXBuildRule */,
13057+
);
13058+
dependencies = (
13059+
7203834A0F8B905D0083B883 /* PBXTargetDependency */,
13060+
7203834C0F8B905D0083B883 /* PBXTargetDependency */,
13061+
);
13062+
name = diagramoverlayplugin;
13063+
productName = testprog;
13064+
productReference = 720383580F8B905D0083B883 /* libdiagramoverlayplugin.so */;
13065+
productType = "com.apple.product-type.tool";
13066+
};
1279913067
7209F1D10F39E760003DC336 /* qgis_core */ = {
1280013068
isa = PBXNativeTarget;
1280113069
buildConfigurationList = 7209F1D50F39E77E003DC336 /* Build configuration list for PBXNativeTarget "qgis_core" */;
@@ -13491,6 +13759,7 @@
1349113759
72A56BEA0F3C886100BA32A1 /* coordinatecaptureplugin */,
1349213760
72A56BFB0F3C887000BA32A1 /* dxf2shpconverterplugin */,
1349313761
72A56C060F3C887300BA32A1 /* ogrconverterplugin */,
13762+
720383490F8B905D0083B883 /* diagramoverlayplugin */,
1349413763
);
1349513764
};
1349613765
/* End PBXProject section */
@@ -13525,6 +13794,21 @@
1352513794
/* End PBXResourcesBuildPhase section */
1352613795

1352713796
/* Begin PBXShellScriptBuildPhase section */
13797+
7203834E0F8B905D0083B883 /* Script - ui */ = {
13798+
isa = PBXShellScriptBuildPhase;
13799+
buildActionMask = 2147483647;
13800+
files = (
13801+
);
13802+
inputPaths = (
13803+
);
13804+
name = "Script - ui";
13805+
outputPaths = (
13806+
);
13807+
runOnlyForDeploymentPostprocessing = 0;
13808+
shellPath = /bin/sh;
13809+
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";
13810+
showEnvVarsInLog = 0;
13811+
};
1352813812
7209F1C20F39E6E3003DC336 /* ShellScript */ = {
1352913813
isa = PBXShellScriptBuildPhase;
1353013814
buildActionMask = 2147483647;
@@ -13936,6 +14220,33 @@
1393614220
/* End PBXShellScriptBuildPhase section */
1393714221

1393814222
/* Begin PBXSourcesBuildPhase section */
14223+
7203834F0F8B905D0083B883 /* Sources */ = {
14224+
isa = PBXSourcesBuildPhase;
14225+
buildActionMask = 2147483647;
14226+
files = (
14227+
7203836E0F8B93450083B883 /* qgsdiagramdialog.h in Sources */,
14228+
7203836F0F8B93450083B883 /* qgsdiagramoverlayplugin.h in Sources */,
14229+
720383700F8B93450083B883 /* qgslinearlyscalingdialog.h in Sources */,
14230+
720383710F8B93450083B883 /* qgssvgdiagramfactorywidget.h in Sources */,
14231+
720383720F8B93450083B883 /* qgswkndiagramfactorywidget.h in Sources */,
14232+
7203835F0F8B92E60083B883 /* qgsbardiagramfactory.cpp in Sources */,
14233+
720383600F8B92E60083B883 /* qgsdiagramcategory.cpp in Sources */,
14234+
720383610F8B92E60083B883 /* qgsdiagramdialog.cpp in Sources */,
14235+
720383620F8B92E60083B883 /* qgsdiagramfactory.cpp in Sources */,
14236+
720383630F8B92E60083B883 /* qgsdiagramfactorywidget.cpp in Sources */,
14237+
720383640F8B92E60083B883 /* qgsdiagramoverlay.cpp in Sources */,
14238+
720383650F8B92E60083B883 /* qgsdiagramoverlayplugin.cpp in Sources */,
14239+
720383660F8B92E60083B883 /* qgsdiagramrenderer.cpp in Sources */,
14240+
720383670F8B92E60083B883 /* qgsdiagramrendererwidget.cpp in Sources */,
14241+
720383680F8B92E60083B883 /* qgslinearlyscalingdialog.cpp in Sources */,
14242+
720383690F8B92E60083B883 /* qgspiediagramfactory.cpp in Sources */,
14243+
7203836A0F8B92E60083B883 /* qgssvgdiagramfactory.cpp in Sources */,
14244+
7203836B0F8B92E60083B883 /* qgssvgdiagramfactorywidget.cpp in Sources */,
14245+
7203836C0F8B92E60083B883 /* qgswkndiagramfactory.cpp in Sources */,
14246+
7203836D0F8B92E60083B883 /* qgswkndiagramfactorywidget.cpp in Sources */,
14247+
);
14248+
runOnlyForDeploymentPostprocessing = 0;
14249+
};
1393914250
7209F1CF0F39E760003DC336 /* Sources */ = {
1394014251
isa = PBXSourcesBuildPhase;
1394114252
buildActionMask = 2147483647;
@@ -14058,6 +14369,21 @@
1405814369
729287550F71C2CB006D9489 /* qgsrunprocess.h in Sources */,
1405914370
729287560F71C2CB006D9489 /* qgsvectorlayer.h in Sources */,
1406014371
72F8D9450F89251100D10CE5 /* qgstolerance.cpp in Sources */,
14372+
7203830A0F8B8C8F0083B883 /* qgscentralpointpositionmanager.cpp in Sources */,
14373+
7203830B0F8B8C8F0083B883 /* qgsoverlayobject.cpp in Sources */,
14374+
7203830C0F8B8C8F0083B883 /* qgspalobjectpositionmanager.cpp in Sources */,
14375+
7203830D0F8B8C8F0083B883 /* qgsvectoroverlay.cpp in Sources */,
14376+
720383780F8BA8C50083B883 /* feature.cpp in Sources */,
14377+
720383790F8BA8C50083B883 /* geomfunction.cpp in Sources */,
14378+
7203837A0F8BA8C50083B883 /* label.cpp in Sources */,
14379+
7203837B0F8BA8C50083B883 /* labelposition.cpp in Sources */,
14380+
7203837C0F8BA8C50083B883 /* layer.cpp in Sources */,
14381+
7203837D0F8BA8C50083B883 /* pal.cpp in Sources */,
14382+
7203837E0F8BA8C50083B883 /* palstat.cpp in Sources */,
14383+
7203837F0F8BA8C50083B883 /* pointset.cpp in Sources */,
14384+
720383800F8BA8C50083B883 /* priorityqueue.cpp in Sources */,
14385+
720383810F8BA8C50083B883 /* problem.cpp in Sources */,
14386+
720383820F8BA8C50083B883 /* util.cpp in Sources */,
1406114387
);
1406214388
runOnlyForDeploymentPostprocessing = 0;
1406314389
};
@@ -14636,6 +14962,21 @@
1463614962
/* End PBXSourcesBuildPhase section */
1463714963

1463814964
/* Begin PBXTargetDependency section */
14965+
7203834A0F8B905D0083B883 /* PBXTargetDependency */ = {
14966+
isa = PBXTargetDependency;
14967+
target = 7209F1D10F39E760003DC336 /* qgis_core */;
14968+
targetProxy = 7203834B0F8B905D0083B883 /* PBXContainerItemProxy */;
14969+
};
14970+
7203834C0F8B905D0083B883 /* PBXTargetDependency */ = {
14971+
isa = PBXTargetDependency;
14972+
target = 7209F3120F3A2F2B003DC336 /* qgis_gui */;
14973+
targetProxy = 7203834D0F8B905D0083B883 /* PBXContainerItemProxy */;
14974+
};
14975+
720383870F8BA92B0083B883 /* PBXTargetDependency */ = {
14976+
isa = PBXTargetDependency;
14977+
target = 720383490F8B905D0083B883 /* diagramoverlayplugin */;
14978+
targetProxy = 720383860F8BA92B0083B883 /* PBXContainerItemProxy */;
14979+
};
1463914980
7209F3F60F3A3C25003DC336 /* PBXTargetDependency */ = {
1464014981
isa = PBXTargetDependency;
1464114982
target = 7209F1D10F39E760003DC336 /* qgis_core */;
@@ -15059,6 +15400,75 @@
1505915400
/* End PBXTargetDependency section */
1506015401

1506115402
/* Begin XCBuildConfiguration section */
15403+
720383560F8B905D0083B883 /* Debug */ = {
15404+
isa = XCBuildConfiguration;
15405+
buildSettings = {
15406+
CONFIGURATION_BUILD_DIR = "$(QGIS_BUILD_PATH)/MacOS/$(QGIS_PLUGIN_SUBDIR)";
15407+
EXECUTABLE_PREFIX = lib;
15408+
GCC_DYNAMIC_NO_PIC = NO;
15409+
GCC_OPTIMIZATION_LEVEL = 0;
15410+
GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)";
15411+
HEADER_SEARCH_PATHS = (
15412+
"$(inherited)",
15413+
../../src/plugins,
15414+
../../src/plugins/plugin,
15415+
../../src/core,
15416+
../../src/core/raster,
15417+
../../src/core/renderer,
15418+
../../src/core/symbology,
15419+
../../src/core/pal,
15420+
../../src/gui,
15421+
"$(GEOS_INC)",
15422+
);
15423+
LIBRARY_SEARCH_PATHS = "$(QGIS_BUILD_PATH)/MacOS/$(QGIS_LIB_SUBDIR)";
15424+
MACH_O_TYPE = mh_bundle;
15425+
OTHER_CFLAGS = "$(QT_CXXFLAGS)";
15426+
OTHER_LDFLAGS = (
15427+
"$(inherited)",
15428+
"$(QT_LIB_CORE)",
15429+
"$(QT_LIB_GUI)",
15430+
"$(QT_LIB_SVG)",
15431+
"$(QT_LIB_XML)",
15432+
);
15433+
PRODUCT_NAME = diagramoverlayplugin.so;
15434+
TARGET_PLUGINDIR = diagram_overlay;
15435+
};
15436+
name = Debug;
15437+
};
15438+
720383570F8B905D0083B883 /* Release */ = {
15439+
isa = XCBuildConfiguration;
15440+
buildSettings = {
15441+
CONFIGURATION_BUILD_DIR = "$(QGIS_BUILD_PATH)/MacOS/$(QGIS_PLUGIN_SUBDIR)";
15442+
EXECUTABLE_PREFIX = lib;
15443+
GCC_DYNAMIC_NO_PIC = NO;
15444+
GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)";
15445+
HEADER_SEARCH_PATHS = (
15446+
"$(inherited)",
15447+
../../src/plugins,
15448+
../../src/plugins/plugin,
15449+
../../src/core,
15450+
../../src/core/raster,
15451+
../../src/core/renderer,
15452+
../../src/core/symbology,
15453+
../../src/core/pal,
15454+
../../src/gui,
15455+
"$(GEOS_INC)",
15456+
);
15457+
LIBRARY_SEARCH_PATHS = "$(QGIS_BUILD_PATH)/MacOS/$(QGIS_LIB_SUBDIR)";
15458+
MACH_O_TYPE = mh_bundle;
15459+
OTHER_CFLAGS = "$(QT_CXXFLAGS)";
15460+
OTHER_LDFLAGS = (
15461+
"$(inherited)",
15462+
"$(QT_LIB_CORE)",
15463+
"$(QT_LIB_GUI)",
15464+
"$(QT_LIB_SVG)",
15465+
"$(QT_LIB_XML)",
15466+
);
15467+
PRODUCT_NAME = diagramoverlayplugin.so;
15468+
TARGET_PLUGINDIR = diagram_overlay;
15469+
};
15470+
name = Release;
15471+
};
1506215472
7209F1C40F39E6E3003DC336 /* Debug */ = {
1506315473
isa = XCBuildConfiguration;
1506415474
buildSettings = {
@@ -15085,6 +15495,7 @@
1508515495
GCC_PREPROCESSOR_DEFINITIONS = (
1508615496
"$(inherited)",
1508715497
qgis_core_EXPORTS,
15498+
_HAVE_PTHREAD_,
1508815499
);
1508915500
HEADER_SEARCH_PATHS = (
1509015501
"$(inherited)",
@@ -15094,6 +15505,7 @@
1509415505
../../src/core/renderer,
1509515506
../../src/core/symbology,
1509615507
../../src/core/spatialindex/include,
15508+
../../src/core/pal,
1509715509
"$(GDAL_INC)",
1509815510
"$(PROJ_INC)",
1509915511
"$(GEOS_INC)",
@@ -15122,6 +15534,7 @@
1512215534
GCC_PREPROCESSOR_DEFINITIONS = (
1512315535
"$(inherited)",
1512415536
qgis_core_EXPORTS,
15537+
_HAVE_PTHREAD_,
1512515538
);
1512615539
HEADER_SEARCH_PATHS = (
1512715540
"$(inherited)",
@@ -15131,6 +15544,7 @@
1513115544
../../src/core/renderer,
1513215545
../../src/core/symbology,
1513315546
../../src/core/spatialindex/include,
15547+
../../src/core/pal,
1513415548
"$(GDAL_INC)",
1513515549
"$(PROJ_INC)",
1513615550
"$(GEOS_INC)",
@@ -17215,6 +17629,15 @@
1721517629
/* End XCBuildConfiguration section */
1721617630

1721717631
/* Begin XCConfigurationList section */
17632+
720383550F8B905D0083B883 /* Build configuration list for PBXNativeTarget "diagramoverlayplugin" */ = {
17633+
isa = XCConfigurationList;
17634+
buildConfigurations = (
17635+
720383560F8B905D0083B883 /* Debug */,
17636+
720383570F8B905D0083B883 /* Release */,
17637+
);
17638+
defaultConfigurationIsVisible = 0;
17639+
defaultConfigurationName = Release;
17640+
};
1721817641
7209F1CB0F39E6FC003DC336 /* Build configuration list for PBXAggregateTarget "config" */ = {
1721917642
isa = XCConfigurationList;
1722017643
buildConfigurations = (

‎mac/xcode/qgis_settings.xcconfig

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// QGIS Xcode project common build settings
22

3-
CURRENT_PROJECT_VERSION = 2.1.4
3+
CURRENT_PROJECT_VERSION = 2.1.5
44

55
// SDK not required for native universal build, but recommended,
66
// and allows building multiple SDK builds side-by-side
@@ -18,7 +18,7 @@ QGIS_RELEASE_NAME = Unstable-trunk
1818
QGIS_VERSION_MAJOR = 1
1919
QGIS_VERSION_MINOR = 1
2020
QGIS_VERSION_PATCH = 0
21-
QGIS_VERSION_BUILD = 20090319
21+
QGIS_VERSION_BUILD = 20090407
2222
QGIS_VERSION_FULL = $(QGIS_VERSION_MAJOR).$(QGIS_VERSION_MINOR).$(QGIS_VERSION_PATCH)-$(QGIS_VERSION_BUILD)
2323
QGIS_VERSION_INT = 10100
2424

0 commit comments

Comments
 (0)
Please sign in to comment.