Skip to content

Commit d6503b2

Browse files
author
kyngchaos
committedNov 17, 2009
attribute action improvements (r12113)
symbology-ng and labeling plugin (r12139) git-svn-id: http://svn.osgeo.org/qgis/trunk@12158 c8812cc2-4d05-0410-92ff-de0c093fc19c
·
ltr-3_40Before-merge-new_vector_api
1 parent 68bc696 commit d6503b2

File tree

1 file changed

+586
-10
lines changed

1 file changed

+586
-10
lines changed
 

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

Lines changed: 586 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,7 @@
8080
7256F1C10F411C7C0022BE1F /* PBXTargetDependency */,
8181
72FB0B6D0FFD6B8F0052360B /* PBXTargetDependency */,
8282
7256F1AD0F411C120022BE1F /* PBXTargetDependency */,
83+
7225EF3010B2273D00D23EA2 /* PBXTargetDependency */,
8384
7256F1AB0F411C120022BE1F /* PBXTargetDependency */,
8485
7256F1BF0F411C7C0022BE1F /* PBXTargetDependency */,
8586
7223B7A60F96AA6C00D905B4 /* PBXTargetDependency */,
@@ -181,7 +182,6 @@
181182
720383720F8B93450083B883 /* qgswkndiagramfactorywidget.h in Sources */ = {isa = PBXBuildFile; fileRef = 720383430F8B8FC40083B883 /* qgswkndiagramfactorywidget.h */; };
182183
720383780F8BA8C50083B883 /* feature.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 720382E20F8B8B540083B883 /* feature.cpp */; };
183184
720383790F8BA8C50083B883 /* geomfunction.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 720382E40F8B8B540083B883 /* geomfunction.cpp */; };
184-
7203837A0F8BA8C50083B883 /* label.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 720382E80F8B8B540083B883 /* label.cpp */; };
185185
7203837B0F8BA8C50083B883 /* labelposition.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 720382EA0F8B8B540083B883 /* labelposition.cpp */; };
186186
7203837C0F8BA8C50083B883 /* layer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 720382EC0F8B8B540083B883 /* layer.cpp */; };
187187
7203837D0F8BA8C50083B883 /* pal.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 720382EF0F8B8B540083B883 /* pal.cpp */; };
@@ -575,6 +575,76 @@
575575
7223B79D0F96A9BF00D905B4 /* qgsselectgeoraster_ui.h in Sources */ = {isa = PBXBuildFile; fileRef = 7223B77C0F969A9D00D905B4 /* qgsselectgeoraster_ui.h */; };
576576
7223B79E0F96AA2000D905B4 /* oracleplugin.qrc in Sources */ = {isa = PBXBuildFile; fileRef = 7223B7750F969A9D00D905B4 /* oracleplugin.qrc */; };
577577
7224A24E0FEA732A004E87E3 /* qgsmaptoolnodetool.h in Sources */ = {isa = PBXBuildFile; fileRef = 72F22FB60FDAC1F4000E8CB0 /* qgsmaptoolnodetool.h */; };
578+
7225EF1B10B2265A00D23EA2 /* libqgis_core.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 7209F1D20F39E760003DC336 /* libqgis_core.dylib */; };
579+
7225EF1C10B2265A00D23EA2 /* libqgis_gui.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 7209F38E0F3A2F2B003DC336 /* libqgis_gui.dylib */; };
580+
7225EF2510B2268F00D23EA2 /* engineconfigdialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7225EF0810B2264D00D23EA2 /* engineconfigdialog.cpp */; };
581+
7225EF2610B2268F00D23EA2 /* labeling.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7225EF0B10B2264D00D23EA2 /* labeling.cpp */; };
582+
7225EF2710B2268F00D23EA2 /* labelinggui.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7225EF0F10B2264D00D23EA2 /* labelinggui.cpp */; };
583+
7225EF2810B2268F00D23EA2 /* labelpreview.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7225EF1210B2264D00D23EA2 /* labelpreview.cpp */; };
584+
7225EF2910B2268F00D23EA2 /* pallabeling.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7225EF1410B2264D00D23EA2 /* pallabeling.cpp */; };
585+
7225EF2A10B2269A00D23EA2 /* engineconfigdialog.h in Sources */ = {isa = PBXBuildFile; fileRef = 7225EF0910B2264D00D23EA2 /* engineconfigdialog.h */; };
586+
7225EF2B10B2269A00D23EA2 /* labeling.h in Sources */ = {isa = PBXBuildFile; fileRef = 7225EF0C10B2264D00D23EA2 /* labeling.h */; };
587+
7225EF2C10B2269A00D23EA2 /* labelinggui.h in Sources */ = {isa = PBXBuildFile; fileRef = 7225EF1010B2264D00D23EA2 /* labelinggui.h */; };
588+
7225EF2D10B226A300D23EA2 /* labeling.qrc in Sources */ = {isa = PBXBuildFile; fileRef = 7225EF0E10B2264D00D23EA2 /* labeling.qrc */; };
589+
7225EF8B10B229FA00D23EA2 /* qgscategorizedsymbolrendererv2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7225EF6D10B2298A00D23EA2 /* qgscategorizedsymbolrendererv2.cpp */; };
590+
7225EF8C10B229FA00D23EA2 /* qgsfillsymbollayerv2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7225EF7010B2298A00D23EA2 /* qgsfillsymbollayerv2.cpp */; };
591+
7225EF8D10B229FA00D23EA2 /* qgsgraduatedsymbolrendererv2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7225EF7210B2298A00D23EA2 /* qgsgraduatedsymbolrendererv2.cpp */; };
592+
7225EF8E10B229FA00D23EA2 /* qgslinesymbollayerv2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7225EF7410B2298A00D23EA2 /* qgslinesymbollayerv2.cpp */; };
593+
7225EF8F10B229FA00D23EA2 /* qgsmarkersymbollayerv2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7225EF7610B2298A00D23EA2 /* qgsmarkersymbollayerv2.cpp */; };
594+
7225EF9010B229FA00D23EA2 /* qgsrendererv2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7225EF7810B2298A00D23EA2 /* qgsrendererv2.cpp */; };
595+
7225EF9110B229FA00D23EA2 /* qgsrendererv2registry.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7225EF7A10B2298A00D23EA2 /* qgsrendererv2registry.cpp */; };
596+
7225EF9210B229FA00D23EA2 /* qgssinglesymbolrendererv2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7225EF7C10B2298A00D23EA2 /* qgssinglesymbolrendererv2.cpp */; };
597+
7225EF9310B229FA00D23EA2 /* qgsstylev2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7225EF7E10B2298A00D23EA2 /* qgsstylev2.cpp */; };
598+
7225EF9410B229FA00D23EA2 /* qgssymbollayerv2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7225EF8010B2298A00D23EA2 /* qgssymbollayerv2.cpp */; };
599+
7225EF9510B229FA00D23EA2 /* qgssymbollayerv2registry.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7225EF8210B2298A00D23EA2 /* qgssymbollayerv2registry.cpp */; };
600+
7225EF9610B229FA00D23EA2 /* qgssymbollayerv2utils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7225EF8410B2298A00D23EA2 /* qgssymbollayerv2utils.cpp */; };
601+
7225EF9710B229FA00D23EA2 /* qgssymbolv2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7225EF8610B2298A00D23EA2 /* qgssymbolv2.cpp */; };
602+
7225EF9810B229FA00D23EA2 /* qgsvectorcolorrampv2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7225EF8810B2298B00D23EA2 /* qgsvectorcolorrampv2.cpp */; };
603+
7225EF9D10B22AEF00D23EA2 /* costcalculator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7225EF9A10B22AC400D23EA2 /* costcalculator.cpp */; };
604+
7225EFB310B22D2000D23EA2 /* qgsgraduatedsymbolrendererv2widget.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7225EF3610B2275E00D23EA2 /* qgsgraduatedsymbolrendererv2widget.cpp */; };
605+
7225EFB410B22D2000D23EA2 /* qgspenstylecombobox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7225EF3810B2275E00D23EA2 /* qgspenstylecombobox.cpp */; };
606+
7225EFB510B22D2000D23EA2 /* qgsrendererv2propertiesdialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7225EF3A10B2275E00D23EA2 /* qgsrendererv2propertiesdialog.cpp */; };
607+
7225EFB610B22D2000D23EA2 /* qgsrendererv2widget.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7225EF3C10B2275E00D23EA2 /* qgsrendererv2widget.cpp */; };
608+
7225EFB710B22D2000D23EA2 /* qgssinglesymbolrendererv2widget.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7225EF3E10B2275E00D23EA2 /* qgssinglesymbolrendererv2widget.cpp */; };
609+
7225EFB810B22D2000D23EA2 /* qgsstylev2managerdialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7225EF4010B2275E00D23EA2 /* qgsstylev2managerdialog.cpp */; };
610+
7225EFB910B22D2000D23EA2 /* qgssymbollayerv2widget.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7225EF4210B2275E00D23EA2 /* qgssymbollayerv2widget.cpp */; };
611+
7225EFBA10B22D2000D23EA2 /* qgssymbollevelsv2dialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7225EF4410B2275E00D23EA2 /* qgssymbollevelsv2dialog.cpp */; };
612+
7225EFBB10B22D2000D23EA2 /* qgssymbolv2propertiesdialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7225EF4610B2275E00D23EA2 /* qgssymbolv2propertiesdialog.cpp */; };
613+
7225EFBC10B22D2000D23EA2 /* qgssymbolv2selectordialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7225EF4810B2275E00D23EA2 /* qgssymbolv2selectordialog.cpp */; };
614+
7225EFBD10B22D2000D23EA2 /* qgsvectorcolorbrewercolorrampv2dialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7225EF4A10B2275E00D23EA2 /* qgsvectorcolorbrewercolorrampv2dialog.cpp */; };
615+
7225EFBE10B22D2000D23EA2 /* qgsvectorgradientcolorrampv2dialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7225EF4C10B2275E00D23EA2 /* qgsvectorgradientcolorrampv2dialog.cpp */; };
616+
7225EFBF10B22D2000D23EA2 /* qgsvectorrandomcolorrampv2dialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7225EF4E10B2275E00D23EA2 /* qgsvectorrandomcolorrampv2dialog.cpp */; };
617+
7225EFC010B22D2000D23EA2 /* qgscategorizedsymbolrendererv2widget.h in Sources */ = {isa = PBXBuildFile; fileRef = 7225EF3510B2275E00D23EA2 /* qgscategorizedsymbolrendererv2widget.h */; };
618+
7225EFC110B22D2000D23EA2 /* qgsgraduatedsymbolrendererv2widget.h in Sources */ = {isa = PBXBuildFile; fileRef = 7225EF3710B2275E00D23EA2 /* qgsgraduatedsymbolrendererv2widget.h */; };
619+
7225EFC210B22D2000D23EA2 /* qgsrendererv2propertiesdialog.h in Sources */ = {isa = PBXBuildFile; fileRef = 7225EF3B10B2275E00D23EA2 /* qgsrendererv2propertiesdialog.h */; };
620+
7225EFC310B22D2000D23EA2 /* qgssinglesymbolrendererv2widget.h in Sources */ = {isa = PBXBuildFile; fileRef = 7225EF3F10B2275E00D23EA2 /* qgssinglesymbolrendererv2widget.h */; };
621+
7225EFC410B22D2000D23EA2 /* qgsstylev2managerdialog.h in Sources */ = {isa = PBXBuildFile; fileRef = 7225EF4110B2275E00D23EA2 /* qgsstylev2managerdialog.h */; };
622+
7225EFC510B22D2000D23EA2 /* qgssymbollayerv2widget.h in Sources */ = {isa = PBXBuildFile; fileRef = 7225EF4310B2275E00D23EA2 /* qgssymbollayerv2widget.h */; };
623+
7225EFC610B22D2000D23EA2 /* qgssymbollevelsv2dialog.h in Sources */ = {isa = PBXBuildFile; fileRef = 7225EF4510B2275E00D23EA2 /* qgssymbollevelsv2dialog.h */; };
624+
7225EFC710B22D2000D23EA2 /* qgssymbolv2propertiesdialog.h in Sources */ = {isa = PBXBuildFile; fileRef = 7225EF4710B2275E00D23EA2 /* qgssymbolv2propertiesdialog.h */; };
625+
7225EFC810B22D2000D23EA2 /* qgssymbolv2selectordialog.h in Sources */ = {isa = PBXBuildFile; fileRef = 7225EF4910B2275E00D23EA2 /* qgssymbolv2selectordialog.h */; };
626+
7225EFC910B22D2000D23EA2 /* qgsvectorcolorbrewercolorrampv2dialog.h in Sources */ = {isa = PBXBuildFile; fileRef = 7225EF4B10B2275E00D23EA2 /* qgsvectorcolorbrewercolorrampv2dialog.h */; };
627+
7225EFCA10B22D2000D23EA2 /* qgsvectorgradientcolorrampv2dialog.h in Sources */ = {isa = PBXBuildFile; fileRef = 7225EF4D10B2275E00D23EA2 /* qgsvectorgradientcolorrampv2dialog.h */; };
628+
7225EFCB10B22D2000D23EA2 /* qgsvectorrandomcolorrampv2dialog.h in Sources */ = {isa = PBXBuildFile; fileRef = 7225EF4F10B2275E00D23EA2 /* qgsvectorrandomcolorrampv2dialog.h */; };
629+
7225EFDE10B22E6C00D23EA2 /* cap_flat.png in Copy - theme-default */ = {isa = PBXBuildFile; fileRef = 7225EFCD10B22E5B00D23EA2 /* cap_flat.png */; };
630+
7225EFDF10B22E6C00D23EA2 /* cap_round.png in Copy - theme-default */ = {isa = PBXBuildFile; fileRef = 7225EFCE10B22E5B00D23EA2 /* cap_round.png */; };
631+
7225EFE010B22E6C00D23EA2 /* cap_square.png in Copy - theme-default */ = {isa = PBXBuildFile; fileRef = 7225EFCF10B22E5B00D23EA2 /* cap_square.png */; };
632+
7225EFE110B22E6C00D23EA2 /* cap_style.svg in Copy - theme-default */ = {isa = PBXBuildFile; fileRef = 7225EFD010B22E5B00D23EA2 /* cap_style.svg */; };
633+
7225EFE210B22E6C00D23EA2 /* join_bevel.png in Copy - theme-default */ = {isa = PBXBuildFile; fileRef = 7225EFD110B22E5B00D23EA2 /* join_bevel.png */; };
634+
7225EFE310B22E6C00D23EA2 /* join_miter.png in Copy - theme-default */ = {isa = PBXBuildFile; fileRef = 7225EFD210B22E5B00D23EA2 /* join_miter.png */; };
635+
7225EFE410B22E6C00D23EA2 /* join_round.png in Copy - theme-default */ = {isa = PBXBuildFile; fileRef = 7225EFD310B22E5B00D23EA2 /* join_round.png */; };
636+
7225EFE510B22E6C00D23EA2 /* join_style.svg in Copy - theme-default */ = {isa = PBXBuildFile; fileRef = 7225EFD410B22E5B00D23EA2 /* join_style.svg */; };
637+
7225EFE610B22E6C00D23EA2 /* rendererCategorizedSymbol.png in Copy - theme-default */ = {isa = PBXBuildFile; fileRef = 7225EFD510B22E5B00D23EA2 /* rendererCategorizedSymbol.png */; };
638+
7225EFE710B22E6C00D23EA2 /* rendererGraduatedSymbol.png in Copy - theme-default */ = {isa = PBXBuildFile; fileRef = 7225EFD610B22E5B00D23EA2 /* rendererGraduatedSymbol.png */; };
639+
7225EFE810B22E6C00D23EA2 /* rendererSingleSymbol.png in Copy - theme-default */ = {isa = PBXBuildFile; fileRef = 7225EFD710B22E5B00D23EA2 /* rendererSingleSymbol.png */; };
640+
7225EFE910B22E6C00D23EA2 /* symbologyAdd.png in Copy - theme-default */ = {isa = PBXBuildFile; fileRef = 7225EFD810B22E5B00D23EA2 /* symbologyAdd.png */; };
641+
7225EFEA10B22E6C00D23EA2 /* symbologyDown.png in Copy - theme-default */ = {isa = PBXBuildFile; fileRef = 7225EFD910B22E5B00D23EA2 /* symbologyDown.png */; };
642+
7225EFEB10B22E6C00D23EA2 /* symbologyEdit.png in Copy - theme-default */ = {isa = PBXBuildFile; fileRef = 7225EFDA10B22E5B00D23EA2 /* symbologyEdit.png */; };
643+
7225EFEC10B22E6C00D23EA2 /* symbologyLock.png in Copy - theme-default */ = {isa = PBXBuildFile; fileRef = 7225EFDB10B22E5B00D23EA2 /* symbologyLock.png */; };
644+
7225EFED10B22E6C00D23EA2 /* symbologyRemove.png in Copy - theme-default */ = {isa = PBXBuildFile; fileRef = 7225EFDC10B22E5B00D23EA2 /* symbologyRemove.png */; };
645+
7225EFEE10B22E6C00D23EA2 /* symbologyUp.png in Copy - theme-default */ = {isa = PBXBuildFile; fileRef = 7225EFDD10B22E5B00D23EA2 /* symbologyUp.png */; };
646+
7225EFF710B236C400D23EA2 /* qgscategorizedsymbolrendererv2widget.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7225EF3410B2275E00D23EA2 /* qgscategorizedsymbolrendererv2widget.cpp */; };
647+
7225EFF810B2375300D23EA2 /* qgsbrushstylecombobox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7225EF3210B2275E00D23EA2 /* qgsbrushstylecombobox.cpp */; };
578648
72267A470F9A1CC900010C18 /* mActionZoomNext.png in Copy - theme-classic */ = {isa = PBXBuildFile; fileRef = 72267A460F9A1CB400010C18 /* mActionZoomNext.png */; };
579649
72267A4B0F9A1CFD00010C18 /* mActionZoomNext.png in Copy - theme-default */ = {isa = PBXBuildFile; fileRef = 72267A4A0F9A1CE800010C18 /* mActionZoomNext.png */; };
580650
72267A4E0F9A1D1D00010C18 /* mActionZoomNext.png in Copy - theme-gis */ = {isa = PBXBuildFile; fileRef = 72267A4D0F9A1D1400010C18 /* mActionZoomNext.png */; };
@@ -1985,6 +2055,28 @@
19852055
);
19862056
script = "$QTMOC $QT_CXXFLAGS -o \"$DERIVED_FILES_DIR/moc_$INPUT_FILE_BASE.cpp\" \"$INPUT_FILE_PATH\"";
19872057
};
2058+
7225EF1D10B2265A00D23EA2 /* PBXBuildRule */ = {
2059+
isa = PBXBuildRule;
2060+
compilerSpec = com.apple.compilers.proxy.script;
2061+
filePatterns = "*.qrc";
2062+
fileType = pattern.proxy;
2063+
isEditable = 1;
2064+
outputFiles = (
2065+
"$(DERIVED_FILES_DIR)/qrc_$(INPUT_FILE_BASE).cpp",
2066+
);
2067+
script = "$QTRCC -name $INPUT_FILE_BASE -o \"$DERIVED_FILES_DIR/qrc_$INPUT_FILE_BASE.cpp\" \"$INPUT_FILE_PATH\"";
2068+
};
2069+
7225EF1E10B2265A00D23EA2 /* PBXBuildRule */ = {
2070+
isa = PBXBuildRule;
2071+
compilerSpec = com.apple.compilers.proxy.script;
2072+
filePatterns = "*.h";
2073+
fileType = pattern.proxy;
2074+
isEditable = 1;
2075+
outputFiles = (
2076+
"$(DERIVED_FILES_DIR)/moc_$(INPUT_FILE_BASE).cpp",
2077+
);
2078+
script = "$QTMOC $QT_CXXFLAGS -o \"$DERIVED_FILES_DIR/moc_$INPUT_FILE_BASE.cpp\" \"$INPUT_FILE_PATH\"";
2079+
};
19882080
7262ED980F7A770300498385 /* PBXBuildRule */ = {
19892081
isa = PBXBuildRule;
19902082
compilerSpec = com.apple.compilers.proxy.script;
@@ -2560,6 +2652,13 @@
25602652
remoteGlobalIDString = 7223B77E0F96A96500D905B4;
25612653
remoteInfo = oracleplugin;
25622654
};
2655+
7225EF2F10B2273D00D23EA2 /* PBXContainerItemProxy */ = {
2656+
isa = PBXContainerItemProxy;
2657+
containerPortal = 20286C28FDCF999611CA2CEA /* Project object */;
2658+
proxyType = 1;
2659+
remoteGlobalIDString = 7225EF1710B2265A00D23EA2 /* labelingplugin */;
2660+
remoteInfo = labelingplugin;
2661+
};
25632662
7256F18F0F411B110022BE1F /* PBXContainerItemProxy */ = {
25642663
isa = PBXContainerItemProxy;
25652664
containerPortal = 20286C28FDCF999611CA2CEA /* Project object */;
@@ -3399,6 +3498,23 @@
33993498
72683FFD0FD6B21A00D90FFC /* mActionRemoveSelectedFeature.png in Copy - theme-default */,
34003499
72779E9F1040615000CA9DE5 /* mActionAddImage.png in Copy - theme-default */,
34013500
72779EA01040615000CA9DE5 /* mActionAddMap.png in Copy - theme-default */,
3501+
7225EFDE10B22E6C00D23EA2 /* cap_flat.png in Copy - theme-default */,
3502+
7225EFDF10B22E6C00D23EA2 /* cap_round.png in Copy - theme-default */,
3503+
7225EFE010B22E6C00D23EA2 /* cap_square.png in Copy - theme-default */,
3504+
7225EFE110B22E6C00D23EA2 /* cap_style.svg in Copy - theme-default */,
3505+
7225EFE210B22E6C00D23EA2 /* join_bevel.png in Copy - theme-default */,
3506+
7225EFE310B22E6C00D23EA2 /* join_miter.png in Copy - theme-default */,
3507+
7225EFE410B22E6C00D23EA2 /* join_round.png in Copy - theme-default */,
3508+
7225EFE510B22E6C00D23EA2 /* join_style.svg in Copy - theme-default */,
3509+
7225EFE610B22E6C00D23EA2 /* rendererCategorizedSymbol.png in Copy - theme-default */,
3510+
7225EFE710B22E6C00D23EA2 /* rendererGraduatedSymbol.png in Copy - theme-default */,
3511+
7225EFE810B22E6C00D23EA2 /* rendererSingleSymbol.png in Copy - theme-default */,
3512+
7225EFE910B22E6C00D23EA2 /* symbologyAdd.png in Copy - theme-default */,
3513+
7225EFEA10B22E6C00D23EA2 /* symbologyDown.png in Copy - theme-default */,
3514+
7225EFEB10B22E6C00D23EA2 /* symbologyEdit.png in Copy - theme-default */,
3515+
7225EFEC10B22E6C00D23EA2 /* symbologyLock.png in Copy - theme-default */,
3516+
7225EFED10B22E6C00D23EA2 /* symbologyRemove.png in Copy - theme-default */,
3517+
7225EFEE10B22E6C00D23EA2 /* symbologyUp.png in Copy - theme-default */,
34023518
);
34033519
name = "Copy - theme-default";
34043520
runOnlyForDeploymentPostprocessing = 0;
@@ -4193,8 +4309,6 @@
41934309
720382E50F8B8B540083B883 /* geomfunction.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = geomfunction.h; path = ../../src/core/pal/geomfunction.h; sourceTree = SOURCE_ROOT; };
41944310
720382E60F8B8B540083B883 /* hashtable.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = hashtable.hpp; path = ../../src/core/pal/hashtable.hpp; sourceTree = SOURCE_ROOT; };
41954311
720382E70F8B8B540083B883 /* internalexception.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = internalexception.h; path = ../../src/core/pal/internalexception.h; sourceTree = SOURCE_ROOT; };
4196-
720382E80F8B8B540083B883 /* label.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = label.cpp; path = ../../src/core/pal/label.cpp; sourceTree = SOURCE_ROOT; };
4197-
720382E90F8B8B540083B883 /* label.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = label.h; path = ../../src/core/pal/label.h; sourceTree = SOURCE_ROOT; };
41984312
720382EA0F8B8B540083B883 /* labelposition.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = labelposition.cpp; path = ../../src/core/pal/labelposition.cpp; sourceTree = SOURCE_ROOT; };
41994313
720382EB0F8B8B540083B883 /* labelposition.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = labelposition.h; path = ../../src/core/pal/labelposition.h; sourceTree = SOURCE_ROOT; };
42004314
720382EC0F8B8B540083B883 /* layer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = layer.cpp; path = ../../src/core/pal/layer.cpp; sourceTree = SOURCE_ROOT; };
@@ -6072,6 +6186,120 @@
60726186
7223B77C0F969A9D00D905B4 /* qgsselectgeoraster_ui.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = qgsselectgeoraster_ui.h; path = ../../src/plugins/oracle_raster/qgsselectgeoraster_ui.h; sourceTree = SOURCE_ROOT; };
60736187
7223B77D0F969A9D00D905B4 /* qgsselectgeorasterbase.ui */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = qgsselectgeorasterbase.ui; path = ../../src/plugins/oracle_raster/qgsselectgeorasterbase.ui; sourceTree = SOURCE_ROOT; };
60746188
7223B78D0F96A96500D905B4 /* liboracleplugin.so */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = liboracleplugin.so; sourceTree = BUILT_PRODUCTS_DIR; };
6189+
7225EF0310B225DD00D23EA2 /* symbology-ng-gui.sip */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = "symbology-ng-gui.sip"; path = "../../python/gui/symbology-ng-gui.sip"; sourceTree = SOURCE_ROOT; };
6190+
7225EF0410B2260200D23EA2 /* symbology-ng-core.sip */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = "symbology-ng-core.sip"; path = "../../python/core/symbology-ng-core.sip"; sourceTree = SOURCE_ROOT; };
6191+
7225EF0510B2261C00D23EA2 /* qgsattributeaction.sip */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = qgsattributeaction.sip; path = ../../python/core/qgsattributeaction.sip; sourceTree = SOURCE_ROOT; };
6192+
7225EF0710B2264D00D23EA2 /* CMakeLists.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = CMakeLists.txt; path = ../../src/plugins/labeling/CMakeLists.txt; sourceTree = SOURCE_ROOT; };
6193+
7225EF0810B2264D00D23EA2 /* engineconfigdialog.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = engineconfigdialog.cpp; path = ../../src/plugins/labeling/engineconfigdialog.cpp; sourceTree = SOURCE_ROOT; };
6194+
7225EF0910B2264D00D23EA2 /* engineconfigdialog.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = engineconfigdialog.h; path = ../../src/plugins/labeling/engineconfigdialog.h; sourceTree = SOURCE_ROOT; };
6195+
7225EF0A10B2264D00D23EA2 /* engineconfigdialog.ui */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; name = engineconfigdialog.ui; path = ../../src/plugins/labeling/engineconfigdialog.ui; sourceTree = SOURCE_ROOT; };
6196+
7225EF0B10B2264D00D23EA2 /* labeling.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = labeling.cpp; path = ../../src/plugins/labeling/labeling.cpp; sourceTree = SOURCE_ROOT; };
6197+
7225EF0C10B2264D00D23EA2 /* labeling.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = labeling.h; path = ../../src/plugins/labeling/labeling.h; sourceTree = SOURCE_ROOT; };
6198+
7225EF0D10B2264D00D23EA2 /* labeling.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = labeling.png; path = ../../src/plugins/labeling/labeling.png; sourceTree = SOURCE_ROOT; };
6199+
7225EF0E10B2264D00D23EA2 /* labeling.qrc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = labeling.qrc; path = ../../src/plugins/labeling/labeling.qrc; sourceTree = SOURCE_ROOT; };
6200+
7225EF0F10B2264D00D23EA2 /* labelinggui.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = labelinggui.cpp; path = ../../src/plugins/labeling/labelinggui.cpp; sourceTree = SOURCE_ROOT; };
6201+
7225EF1010B2264D00D23EA2 /* labelinggui.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = labelinggui.h; path = ../../src/plugins/labeling/labelinggui.h; sourceTree = SOURCE_ROOT; };
6202+
7225EF1110B2264D00D23EA2 /* labelingguibase.ui */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; name = labelingguibase.ui; path = ../../src/plugins/labeling/labelingguibase.ui; sourceTree = SOURCE_ROOT; };
6203+
7225EF1210B2264D00D23EA2 /* labelpreview.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = labelpreview.cpp; path = ../../src/plugins/labeling/labelpreview.cpp; sourceTree = SOURCE_ROOT; };
6204+
7225EF1310B2264D00D23EA2 /* labelpreview.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = labelpreview.h; path = ../../src/plugins/labeling/labelpreview.h; sourceTree = SOURCE_ROOT; };
6205+
7225EF1410B2264D00D23EA2 /* pallabeling.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = pallabeling.cpp; path = ../../src/plugins/labeling/pallabeling.cpp; sourceTree = SOURCE_ROOT; };
6206+
7225EF1510B2264D00D23EA2 /* pallabeling.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = pallabeling.h; path = ../../src/plugins/labeling/pallabeling.h; sourceTree = SOURCE_ROOT; };
6207+
7225EF2210B2265A00D23EA2 /* liblabelingplugin.so */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = liblabelingplugin.so; sourceTree = BUILT_PRODUCTS_DIR; };
6208+
7225EF3210B2275E00D23EA2 /* qgsbrushstylecombobox.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = qgsbrushstylecombobox.cpp; path = "../../src/gui/symbology-ng/qgsbrushstylecombobox.cpp"; sourceTree = SOURCE_ROOT; };
6209+
7225EF3310B2275E00D23EA2 /* qgsbrushstylecombobox.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = qgsbrushstylecombobox.h; path = "../../src/gui/symbology-ng/qgsbrushstylecombobox.h"; sourceTree = SOURCE_ROOT; };
6210+
7225EF3410B2275E00D23EA2 /* qgscategorizedsymbolrendererv2widget.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = qgscategorizedsymbolrendererv2widget.cpp; path = "../../src/gui/symbology-ng/qgscategorizedsymbolrendererv2widget.cpp"; sourceTree = SOURCE_ROOT; };
6211+
7225EF3510B2275E00D23EA2 /* qgscategorizedsymbolrendererv2widget.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = qgscategorizedsymbolrendererv2widget.h; path = "../../src/gui/symbology-ng/qgscategorizedsymbolrendererv2widget.h"; sourceTree = SOURCE_ROOT; };
6212+
7225EF3610B2275E00D23EA2 /* qgsgraduatedsymbolrendererv2widget.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = qgsgraduatedsymbolrendererv2widget.cpp; path = "../../src/gui/symbology-ng/qgsgraduatedsymbolrendererv2widget.cpp"; sourceTree = SOURCE_ROOT; };
6213+
7225EF3710B2275E00D23EA2 /* qgsgraduatedsymbolrendererv2widget.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = qgsgraduatedsymbolrendererv2widget.h; path = "../../src/gui/symbology-ng/qgsgraduatedsymbolrendererv2widget.h"; sourceTree = SOURCE_ROOT; };
6214+
7225EF3810B2275E00D23EA2 /* qgspenstylecombobox.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = qgspenstylecombobox.cpp; path = "../../src/gui/symbology-ng/qgspenstylecombobox.cpp"; sourceTree = SOURCE_ROOT; };
6215+
7225EF3910B2275E00D23EA2 /* qgspenstylecombobox.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = qgspenstylecombobox.h; path = "../../src/gui/symbology-ng/qgspenstylecombobox.h"; sourceTree = SOURCE_ROOT; };
6216+
7225EF3A10B2275E00D23EA2 /* qgsrendererv2propertiesdialog.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = qgsrendererv2propertiesdialog.cpp; path = "../../src/gui/symbology-ng/qgsrendererv2propertiesdialog.cpp"; sourceTree = SOURCE_ROOT; };
6217+
7225EF3B10B2275E00D23EA2 /* qgsrendererv2propertiesdialog.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = qgsrendererv2propertiesdialog.h; path = "../../src/gui/symbology-ng/qgsrendererv2propertiesdialog.h"; sourceTree = SOURCE_ROOT; };
6218+
7225EF3C10B2275E00D23EA2 /* qgsrendererv2widget.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = qgsrendererv2widget.cpp; path = "../../src/gui/symbology-ng/qgsrendererv2widget.cpp"; sourceTree = SOURCE_ROOT; };
6219+
7225EF3D10B2275E00D23EA2 /* qgsrendererv2widget.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = qgsrendererv2widget.h; path = "../../src/gui/symbology-ng/qgsrendererv2widget.h"; sourceTree = SOURCE_ROOT; };
6220+
7225EF3E10B2275E00D23EA2 /* qgssinglesymbolrendererv2widget.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = qgssinglesymbolrendererv2widget.cpp; path = "../../src/gui/symbology-ng/qgssinglesymbolrendererv2widget.cpp"; sourceTree = SOURCE_ROOT; };
6221+
7225EF3F10B2275E00D23EA2 /* qgssinglesymbolrendererv2widget.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = qgssinglesymbolrendererv2widget.h; path = "../../src/gui/symbology-ng/qgssinglesymbolrendererv2widget.h"; sourceTree = SOURCE_ROOT; };
6222+
7225EF4010B2275E00D23EA2 /* qgsstylev2managerdialog.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = qgsstylev2managerdialog.cpp; path = "../../src/gui/symbology-ng/qgsstylev2managerdialog.cpp"; sourceTree = SOURCE_ROOT; };
6223+
7225EF4110B2275E00D23EA2 /* qgsstylev2managerdialog.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = qgsstylev2managerdialog.h; path = "../../src/gui/symbology-ng/qgsstylev2managerdialog.h"; sourceTree = SOURCE_ROOT; };
6224+
7225EF4210B2275E00D23EA2 /* qgssymbollayerv2widget.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = qgssymbollayerv2widget.cpp; path = "../../src/gui/symbology-ng/qgssymbollayerv2widget.cpp"; sourceTree = SOURCE_ROOT; };
6225+
7225EF4310B2275E00D23EA2 /* qgssymbollayerv2widget.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = qgssymbollayerv2widget.h; path = "../../src/gui/symbology-ng/qgssymbollayerv2widget.h"; sourceTree = SOURCE_ROOT; };
6226+
7225EF4410B2275E00D23EA2 /* qgssymbollevelsv2dialog.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = qgssymbollevelsv2dialog.cpp; path = "../../src/gui/symbology-ng/qgssymbollevelsv2dialog.cpp"; sourceTree = SOURCE_ROOT; };
6227+
7225EF4510B2275E00D23EA2 /* qgssymbollevelsv2dialog.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = qgssymbollevelsv2dialog.h; path = "../../src/gui/symbology-ng/qgssymbollevelsv2dialog.h"; sourceTree = SOURCE_ROOT; };
6228+
7225EF4610B2275E00D23EA2 /* qgssymbolv2propertiesdialog.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = qgssymbolv2propertiesdialog.cpp; path = "../../src/gui/symbology-ng/qgssymbolv2propertiesdialog.cpp"; sourceTree = SOURCE_ROOT; };
6229+
7225EF4710B2275E00D23EA2 /* qgssymbolv2propertiesdialog.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = qgssymbolv2propertiesdialog.h; path = "../../src/gui/symbology-ng/qgssymbolv2propertiesdialog.h"; sourceTree = SOURCE_ROOT; };
6230+
7225EF4810B2275E00D23EA2 /* qgssymbolv2selectordialog.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = qgssymbolv2selectordialog.cpp; path = "../../src/gui/symbology-ng/qgssymbolv2selectordialog.cpp"; sourceTree = SOURCE_ROOT; };
6231+
7225EF4910B2275E00D23EA2 /* qgssymbolv2selectordialog.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = qgssymbolv2selectordialog.h; path = "../../src/gui/symbology-ng/qgssymbolv2selectordialog.h"; sourceTree = SOURCE_ROOT; };
6232+
7225EF4A10B2275E00D23EA2 /* qgsvectorcolorbrewercolorrampv2dialog.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = qgsvectorcolorbrewercolorrampv2dialog.cpp; path = "../../src/gui/symbology-ng/qgsvectorcolorbrewercolorrampv2dialog.cpp"; sourceTree = SOURCE_ROOT; };
6233+
7225EF4B10B2275E00D23EA2 /* qgsvectorcolorbrewercolorrampv2dialog.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = qgsvectorcolorbrewercolorrampv2dialog.h; path = "../../src/gui/symbology-ng/qgsvectorcolorbrewercolorrampv2dialog.h"; sourceTree = SOURCE_ROOT; };
6234+
7225EF4C10B2275E00D23EA2 /* qgsvectorgradientcolorrampv2dialog.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = qgsvectorgradientcolorrampv2dialog.cpp; path = "../../src/gui/symbology-ng/qgsvectorgradientcolorrampv2dialog.cpp"; sourceTree = SOURCE_ROOT; };
6235+
7225EF4D10B2275E00D23EA2 /* qgsvectorgradientcolorrampv2dialog.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = qgsvectorgradientcolorrampv2dialog.h; path = "../../src/gui/symbology-ng/qgsvectorgradientcolorrampv2dialog.h"; sourceTree = SOURCE_ROOT; };
6236+
7225EF4E10B2275E00D23EA2 /* qgsvectorrandomcolorrampv2dialog.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = qgsvectorrandomcolorrampv2dialog.cpp; path = "../../src/gui/symbology-ng/qgsvectorrandomcolorrampv2dialog.cpp"; sourceTree = SOURCE_ROOT; };
6237+
7225EF4F10B2275E00D23EA2 /* qgsvectorrandomcolorrampv2dialog.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = qgsvectorrandomcolorrampv2dialog.h; path = "../../src/gui/symbology-ng/qgsvectorrandomcolorrampv2dialog.h"; sourceTree = SOURCE_ROOT; };
6238+
7225EF6D10B2298A00D23EA2 /* qgscategorizedsymbolrendererv2.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = qgscategorizedsymbolrendererv2.cpp; path = "../../src/core/symbology-ng/qgscategorizedsymbolrendererv2.cpp"; sourceTree = SOURCE_ROOT; };
6239+
7225EF6E10B2298A00D23EA2 /* qgscategorizedsymbolrendererv2.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = qgscategorizedsymbolrendererv2.h; path = "../../src/core/symbology-ng/qgscategorizedsymbolrendererv2.h"; sourceTree = SOURCE_ROOT; };
6240+
7225EF6F10B2298A00D23EA2 /* qgscolorbrewerpalette.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = qgscolorbrewerpalette.h; path = "../../src/core/symbology-ng/qgscolorbrewerpalette.h"; sourceTree = SOURCE_ROOT; };
6241+
7225EF7010B2298A00D23EA2 /* qgsfillsymbollayerv2.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = qgsfillsymbollayerv2.cpp; path = "../../src/core/symbology-ng/qgsfillsymbollayerv2.cpp"; sourceTree = SOURCE_ROOT; };
6242+
7225EF7110B2298A00D23EA2 /* qgsfillsymbollayerv2.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = qgsfillsymbollayerv2.h; path = "../../src/core/symbology-ng/qgsfillsymbollayerv2.h"; sourceTree = SOURCE_ROOT; };
6243+
7225EF7210B2298A00D23EA2 /* qgsgraduatedsymbolrendererv2.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = qgsgraduatedsymbolrendererv2.cpp; path = "../../src/core/symbology-ng/qgsgraduatedsymbolrendererv2.cpp"; sourceTree = SOURCE_ROOT; };
6244+
7225EF7310B2298A00D23EA2 /* qgsgraduatedsymbolrendererv2.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = qgsgraduatedsymbolrendererv2.h; path = "../../src/core/symbology-ng/qgsgraduatedsymbolrendererv2.h"; sourceTree = SOURCE_ROOT; };
6245+
7225EF7410B2298A00D23EA2 /* qgslinesymbollayerv2.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = qgslinesymbollayerv2.cpp; path = "../../src/core/symbology-ng/qgslinesymbollayerv2.cpp"; sourceTree = SOURCE_ROOT; };
6246+
7225EF7510B2298A00D23EA2 /* qgslinesymbollayerv2.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = qgslinesymbollayerv2.h; path = "../../src/core/symbology-ng/qgslinesymbollayerv2.h"; sourceTree = SOURCE_ROOT; };
6247+
7225EF7610B2298A00D23EA2 /* qgsmarkersymbollayerv2.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = qgsmarkersymbollayerv2.cpp; path = "../../src/core/symbology-ng/qgsmarkersymbollayerv2.cpp"; sourceTree = SOURCE_ROOT; };
6248+
7225EF7710B2298A00D23EA2 /* qgsmarkersymbollayerv2.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = qgsmarkersymbollayerv2.h; path = "../../src/core/symbology-ng/qgsmarkersymbollayerv2.h"; sourceTree = SOURCE_ROOT; };
6249+
7225EF7810B2298A00D23EA2 /* qgsrendererv2.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = qgsrendererv2.cpp; path = "../../src/core/symbology-ng/qgsrendererv2.cpp"; sourceTree = SOURCE_ROOT; };
6250+
7225EF7910B2298A00D23EA2 /* qgsrendererv2.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = qgsrendererv2.h; path = "../../src/core/symbology-ng/qgsrendererv2.h"; sourceTree = SOURCE_ROOT; };
6251+
7225EF7A10B2298A00D23EA2 /* qgsrendererv2registry.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = qgsrendererv2registry.cpp; path = "../../src/core/symbology-ng/qgsrendererv2registry.cpp"; sourceTree = SOURCE_ROOT; };
6252+
7225EF7B10B2298A00D23EA2 /* qgsrendererv2registry.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = qgsrendererv2registry.h; path = "../../src/core/symbology-ng/qgsrendererv2registry.h"; sourceTree = SOURCE_ROOT; };
6253+
7225EF7C10B2298A00D23EA2 /* qgssinglesymbolrendererv2.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = qgssinglesymbolrendererv2.cpp; path = "../../src/core/symbology-ng/qgssinglesymbolrendererv2.cpp"; sourceTree = SOURCE_ROOT; };
6254+
7225EF7D10B2298A00D23EA2 /* qgssinglesymbolrendererv2.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = qgssinglesymbolrendererv2.h; path = "../../src/core/symbology-ng/qgssinglesymbolrendererv2.h"; sourceTree = SOURCE_ROOT; };
6255+
7225EF7E10B2298A00D23EA2 /* qgsstylev2.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = qgsstylev2.cpp; path = "../../src/core/symbology-ng/qgsstylev2.cpp"; sourceTree = SOURCE_ROOT; };
6256+
7225EF7F10B2298A00D23EA2 /* qgsstylev2.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = qgsstylev2.h; path = "../../src/core/symbology-ng/qgsstylev2.h"; sourceTree = SOURCE_ROOT; };
6257+
7225EF8010B2298A00D23EA2 /* qgssymbollayerv2.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = qgssymbollayerv2.cpp; path = "../../src/core/symbology-ng/qgssymbollayerv2.cpp"; sourceTree = SOURCE_ROOT; };
6258+
7225EF8110B2298A00D23EA2 /* qgssymbollayerv2.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = qgssymbollayerv2.h; path = "../../src/core/symbology-ng/qgssymbollayerv2.h"; sourceTree = SOURCE_ROOT; };
6259+
7225EF8210B2298A00D23EA2 /* qgssymbollayerv2registry.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = qgssymbollayerv2registry.cpp; path = "../../src/core/symbology-ng/qgssymbollayerv2registry.cpp"; sourceTree = SOURCE_ROOT; };
6260+
7225EF8310B2298A00D23EA2 /* qgssymbollayerv2registry.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = qgssymbollayerv2registry.h; path = "../../src/core/symbology-ng/qgssymbollayerv2registry.h"; sourceTree = SOURCE_ROOT; };
6261+
7225EF8410B2298A00D23EA2 /* qgssymbollayerv2utils.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = qgssymbollayerv2utils.cpp; path = "../../src/core/symbology-ng/qgssymbollayerv2utils.cpp"; sourceTree = SOURCE_ROOT; };
6262+
7225EF8510B2298A00D23EA2 /* qgssymbollayerv2utils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = qgssymbollayerv2utils.h; path = "../../src/core/symbology-ng/qgssymbollayerv2utils.h"; sourceTree = SOURCE_ROOT; };
6263+
7225EF8610B2298A00D23EA2 /* qgssymbolv2.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = qgssymbolv2.cpp; path = "../../src/core/symbology-ng/qgssymbolv2.cpp"; sourceTree = SOURCE_ROOT; };
6264+
7225EF8710B2298A00D23EA2 /* qgssymbolv2.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = qgssymbolv2.h; path = "../../src/core/symbology-ng/qgssymbolv2.h"; sourceTree = SOURCE_ROOT; };
6265+
7225EF8810B2298B00D23EA2 /* qgsvectorcolorrampv2.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = qgsvectorcolorrampv2.cpp; path = "../../src/core/symbology-ng/qgsvectorcolorrampv2.cpp"; sourceTree = SOURCE_ROOT; };
6266+
7225EF8910B2298B00D23EA2 /* qgsvectorcolorrampv2.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = qgsvectorcolorrampv2.h; path = "../../src/core/symbology-ng/qgsvectorcolorrampv2.h"; sourceTree = SOURCE_ROOT; };
6267+
7225EF9A10B22AC400D23EA2 /* costcalculator.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = costcalculator.cpp; path = ../../src/core/pal/costcalculator.cpp; sourceTree = SOURCE_ROOT; };
6268+
7225EF9B10B22AC400D23EA2 /* costcalculator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = costcalculator.h; path = ../../src/core/pal/costcalculator.h; sourceTree = SOURCE_ROOT; };
6269+
7225EFA010B22C4400D23EA2 /* qgscategorizedsymbolrendererv2widget.ui */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; name = qgscategorizedsymbolrendererv2widget.ui; path = ../../src/ui/qgscategorizedsymbolrendererv2widget.ui; sourceTree = SOURCE_ROOT; };
6270+
7225EFA110B22C4400D23EA2 /* qgsgraduatedsymbolrendererv2widget.ui */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; name = qgsgraduatedsymbolrendererv2widget.ui; path = ../../src/ui/qgsgraduatedsymbolrendererv2widget.ui; sourceTree = SOURCE_ROOT; };
6271+
7225EFA210B22C4400D23EA2 /* qgsrendererv2propsdialogbase.ui */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; name = qgsrendererv2propsdialogbase.ui; path = ../../src/ui/qgsrendererv2propsdialogbase.ui; sourceTree = SOURCE_ROOT; };
6272+
7225EFA310B22C4400D23EA2 /* qgsstylev2managerdialogbase.ui */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; name = qgsstylev2managerdialogbase.ui; path = ../../src/ui/qgsstylev2managerdialogbase.ui; sourceTree = SOURCE_ROOT; };
6273+
7225EFA410B22C4400D23EA2 /* qgssymbollevelsv2dialogbase.ui */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; name = qgssymbollevelsv2dialogbase.ui; path = ../../src/ui/qgssymbollevelsv2dialogbase.ui; sourceTree = SOURCE_ROOT; };
6274+
7225EFA510B22C4400D23EA2 /* qgssymbolv2propertiesdialogbase.ui */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; name = qgssymbolv2propertiesdialogbase.ui; path = ../../src/ui/qgssymbolv2propertiesdialogbase.ui; sourceTree = SOURCE_ROOT; };
6275+
7225EFA610B22C4400D23EA2 /* qgssymbolv2selectordialogbase.ui */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; name = qgssymbolv2selectordialogbase.ui; path = ../../src/ui/qgssymbolv2selectordialogbase.ui; sourceTree = SOURCE_ROOT; };
6276+
7225EFA710B22C4400D23EA2 /* qgsvectorcolorbrewercolorrampv2dialogbase.ui */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; name = qgsvectorcolorbrewercolorrampv2dialogbase.ui; path = ../../src/ui/qgsvectorcolorbrewercolorrampv2dialogbase.ui; sourceTree = SOURCE_ROOT; };
6277+
7225EFA810B22C4400D23EA2 /* qgsvectorgradientcolorrampv2dialogbase.ui */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; name = qgsvectorgradientcolorrampv2dialogbase.ui; path = ../../src/ui/qgsvectorgradientcolorrampv2dialogbase.ui; sourceTree = SOURCE_ROOT; };
6278+
7225EFA910B22C4400D23EA2 /* qgsvectorrandomcolorrampv2dialogbase.ui */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; name = qgsvectorrandomcolorrampv2dialogbase.ui; path = ../../src/ui/qgsvectorrandomcolorrampv2dialogbase.ui; sourceTree = SOURCE_ROOT; };
6279+
7225EFAB10B22C5000D23EA2 /* widget_linedecoration.ui */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; name = widget_linedecoration.ui; path = ../../src/ui/symbollayer/widget_linedecoration.ui; sourceTree = SOURCE_ROOT; };
6280+
7225EFAC10B22C5000D23EA2 /* widget_markerline.ui */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; name = widget_markerline.ui; path = ../../src/ui/symbollayer/widget_markerline.ui; sourceTree = SOURCE_ROOT; };
6281+
7225EFAD10B22C5000D23EA2 /* widget_simplefill.ui */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; name = widget_simplefill.ui; path = ../../src/ui/symbollayer/widget_simplefill.ui; sourceTree = SOURCE_ROOT; };
6282+
7225EFAE10B22C5000D23EA2 /* widget_simpleline.ui */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; name = widget_simpleline.ui; path = ../../src/ui/symbollayer/widget_simpleline.ui; sourceTree = SOURCE_ROOT; };
6283+
7225EFAF10B22C5000D23EA2 /* widget_simplemarker.ui */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; name = widget_simplemarker.ui; path = ../../src/ui/symbollayer/widget_simplemarker.ui; sourceTree = SOURCE_ROOT; };
6284+
7225EFB010B22C5000D23EA2 /* widget_svgmarker.ui */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; name = widget_svgmarker.ui; path = ../../src/ui/symbollayer/widget_svgmarker.ui; sourceTree = SOURCE_ROOT; };
6285+
7225EFCD10B22E5B00D23EA2 /* cap_flat.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = cap_flat.png; path = ../../images/themes/default/cap_flat.png; sourceTree = SOURCE_ROOT; };
6286+
7225EFCE10B22E5B00D23EA2 /* cap_round.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = cap_round.png; path = ../../images/themes/default/cap_round.png; sourceTree = SOURCE_ROOT; };
6287+
7225EFCF10B22E5B00D23EA2 /* cap_square.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = cap_square.png; path = ../../images/themes/default/cap_square.png; sourceTree = SOURCE_ROOT; };
6288+
7225EFD010B22E5B00D23EA2 /* cap_style.svg */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; name = cap_style.svg; path = ../../images/themes/default/cap_style.svg; sourceTree = SOURCE_ROOT; };
6289+
7225EFD110B22E5B00D23EA2 /* join_bevel.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = join_bevel.png; path = ../../images/themes/default/join_bevel.png; sourceTree = SOURCE_ROOT; };
6290+
7225EFD210B22E5B00D23EA2 /* join_miter.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = join_miter.png; path = ../../images/themes/default/join_miter.png; sourceTree = SOURCE_ROOT; };
6291+
7225EFD310B22E5B00D23EA2 /* join_round.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = join_round.png; path = ../../images/themes/default/join_round.png; sourceTree = SOURCE_ROOT; };
6292+
7225EFD410B22E5B00D23EA2 /* join_style.svg */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; name = join_style.svg; path = ../../images/themes/default/join_style.svg; sourceTree = SOURCE_ROOT; };
6293+
7225EFD510B22E5B00D23EA2 /* rendererCategorizedSymbol.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = rendererCategorizedSymbol.png; path = ../../images/themes/default/rendererCategorizedSymbol.png; sourceTree = SOURCE_ROOT; };
6294+
7225EFD610B22E5B00D23EA2 /* rendererGraduatedSymbol.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = rendererGraduatedSymbol.png; path = ../../images/themes/default/rendererGraduatedSymbol.png; sourceTree = SOURCE_ROOT; };
6295+
7225EFD710B22E5B00D23EA2 /* rendererSingleSymbol.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = rendererSingleSymbol.png; path = ../../images/themes/default/rendererSingleSymbol.png; sourceTree = SOURCE_ROOT; };
6296+
7225EFD810B22E5B00D23EA2 /* symbologyAdd.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = symbologyAdd.png; path = ../../images/themes/default/symbologyAdd.png; sourceTree = SOURCE_ROOT; };
6297+
7225EFD910B22E5B00D23EA2 /* symbologyDown.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = symbologyDown.png; path = ../../images/themes/default/symbologyDown.png; sourceTree = SOURCE_ROOT; };
6298+
7225EFDA10B22E5B00D23EA2 /* symbologyEdit.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = symbologyEdit.png; path = ../../images/themes/default/symbologyEdit.png; sourceTree = SOURCE_ROOT; };
6299+
7225EFDB10B22E5B00D23EA2 /* symbologyLock.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = symbologyLock.png; path = ../../images/themes/default/symbologyLock.png; sourceTree = SOURCE_ROOT; };
6300+
7225EFDC10B22E5B00D23EA2 /* symbologyRemove.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = symbologyRemove.png; path = ../../images/themes/default/symbologyRemove.png; sourceTree = SOURCE_ROOT; };
6301+
7225EFDD10B22E5B00D23EA2 /* symbologyUp.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = symbologyUp.png; path = ../../images/themes/default/symbologyUp.png; sourceTree = SOURCE_ROOT; };
6302+
7225EFF110B22E9700D23EA2 /* symbology-ng-style.xml */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; name = "symbology-ng-style.xml"; path = "../../resources/symbology-ng-style.xml"; sourceTree = SOURCE_ROOT; };
60756303
72267A460F9A1CB400010C18 /* mActionZoomNext.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = mActionZoomNext.png; path = ../../images/themes/classic/mActionZoomNext.png; sourceTree = SOURCE_ROOT; };
60766304
72267A4A0F9A1CE800010C18 /* mActionZoomNext.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = mActionZoomNext.png; path = ../../images/themes/default/mActionZoomNext.png; sourceTree = SOURCE_ROOT; };
60776305
72267A4D0F9A1D1400010C18 /* mActionZoomNext.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = mActionZoomNext.png; path = ../../images/themes/gis/mActionZoomNext.png; sourceTree = SOURCE_ROOT; };
@@ -7678,6 +7906,15 @@
76787906
);
76797907
runOnlyForDeploymentPostprocessing = 0;
76807908
};
7909+
7225EF1A10B2265A00D23EA2 /* Frameworks */ = {
7910+
isa = PBXFrameworksBuildPhase;
7911+
buildActionMask = 2147483647;
7912+
files = (
7913+
7225EF1B10B2265A00D23EA2 /* libqgis_core.dylib in Frameworks */,
7914+
7225EF1C10B2265A00D23EA2 /* libqgis_gui.dylib in Frameworks */,
7915+
);
7916+
runOnlyForDeploymentPostprocessing = 0;
7917+
};
76817918
7262ED960F7A770300498385 /* Frameworks */ = {
76827919
isa = PBXFrameworksBuildPhase;
76837920
buildActionMask = 2147483647;
@@ -8002,6 +8239,7 @@
80028239
72DB68E31021D08400ED5F3A /* libosmprovider.so */,
80038240
726C67411046030F00EFEDCC /* librasterterrainplugin.so */,
80048241
721598191052B46D003D1610 /* libqgis_analysis.dylib */,
8242+
7225EF2210B2265A00D23EA2 /* liblabelingplugin.so */,
80058243
);
80068244
name = Products;
80078245
sourceTree = "<group>";
@@ -8091,14 +8329,14 @@
80918329
720382E10F8B8B540083B883 /* pal */ = {
80928330
isa = PBXGroup;
80938331
children = (
8332+
7225EF9A10B22AC400D23EA2 /* costcalculator.cpp */,
8333+
7225EF9B10B22AC400D23EA2 /* costcalculator.h */,
80948334
720382E20F8B8B540083B883 /* feature.cpp */,
80958335
720382E30F8B8B540083B883 /* feature.h */,
80968336
720382E40F8B8B540083B883 /* geomfunction.cpp */,
80978337
720382E50F8B8B540083B883 /* geomfunction.h */,
80988338
720382E60F8B8B540083B883 /* hashtable.hpp */,
80998339
720382E70F8B8B540083B883 /* internalexception.h */,
8100-
720382E80F8B8B540083B883 /* label.cpp */,
8101-
720382E90F8B8B540083B883 /* label.h */,
81028340
720382EA0F8B8B540083B883 /* labelposition.cpp */,
81038341
720382EB0F8B8B540083B883 /* labelposition.h */,
81048342
720382EC0F8B8B540083B883 /* layer.cpp */,
@@ -8527,6 +8765,7 @@
85278765
7209E7000F39E57A003DC336 /* spatialindex */,
85288766
72F8D9470F89268C00D10CE5 /* spatialite */,
85298767
7209E7360F39E57A003DC336 /* symbology */,
8768+
7225EF6C10B2298A00D23EA2 /* symbology-ng */,
85308769
7209E6800F39E57A003DC336 /* genlexyacc.bat */,
85318770
);
85328771
name = core;
@@ -8756,6 +8995,7 @@
87568995
7209E7400F39E57A003DC336 /* gui */ = {
87578996
isa = PBXGroup;
87588997
children = (
8998+
7209E7410F39E57A003DC336 /* CMakeLists.txt */,
87598999
7209E7420F39E57A003DC336 /* qgisgui.cpp */,
87609000
7209E7430F39E57A003DC336 /* qgisgui.h */,
87619001
7209E7440F39E57A003DC336 /* qgisinterface.cpp */,
@@ -8808,7 +9048,7 @@
88089048
7209E7730F39E57A003DC336 /* qgsrubberband.h */,
88099049
7209E7740F39E57A003DC336 /* qgsvertexmarker.cpp */,
88109050
7209E7750F39E57A003DC336 /* qgsvertexmarker.h */,
8811-
7209E7410F39E57A003DC336 /* CMakeLists.txt */,
9051+
7225EF3110B2275E00D23EA2 /* symbology-ng */,
88129052
);
88139053
name = gui;
88149054
path = ../../src/gui;
@@ -8884,6 +9124,7 @@
88849124
7209E7C60F39E57B003DC336 /* dxf2shp_converter */,
88859125
72FB0B170FFD657D0052360B /* evis */,
88869126
7209EBB90F39E57B003DC336 /* interpolation */,
9127+
7225EF0610B2264D00D23EA2 /* labeling */,
88879128
7209EBE90F39E57B003DC336 /* north_arrow */,
88889129
7209EBF90F39E57B003DC336 /* ogr_converter */,
88899130
7223B7720F969A9D00D905B4 /* oracle_raster */,
@@ -9676,6 +9917,17 @@
96769917
7262ED8B0F7A763C00498385 /* qgsspatialitesourceselectbase.ui */,
96779918
72820FEB0FACCF370011C963 /* qgssimplifytolerancedialog.ui */,
96789919
72A892C70FAF7B3800108152 /* qgsconfigureshortcutsdialog.ui */,
9920+
7225EFA010B22C4400D23EA2 /* qgscategorizedsymbolrendererv2widget.ui */,
9921+
7225EFA110B22C4400D23EA2 /* qgsgraduatedsymbolrendererv2widget.ui */,
9922+
7225EFA210B22C4400D23EA2 /* qgsrendererv2propsdialogbase.ui */,
9923+
7225EFA310B22C4400D23EA2 /* qgsstylev2managerdialogbase.ui */,
9924+
7225EFA410B22C4400D23EA2 /* qgssymbollevelsv2dialogbase.ui */,
9925+
7225EFA510B22C4400D23EA2 /* qgssymbolv2propertiesdialogbase.ui */,
9926+
7225EFA610B22C4400D23EA2 /* qgssymbolv2selectordialogbase.ui */,
9927+
7225EFA710B22C4400D23EA2 /* qgsvectorcolorbrewercolorrampv2dialogbase.ui */,
9928+
7225EFA810B22C4400D23EA2 /* qgsvectorgradientcolorrampv2dialogbase.ui */,
9929+
7225EFA910B22C4400D23EA2 /* qgsvectorrandomcolorrampv2dialogbase.ui */,
9930+
7225EFAA10B22C5000D23EA2 /* symbollayer */,
96799931
);
96809932
name = ui;
96819933
path = ../../src/ui;
@@ -9892,6 +10144,7 @@
989210144
7209ED830F39E5D9003DC336 /* qgis_help.db */,
989310145
72C4241D103DE67F005CD18E /* README */,
989410146
7209ED840F39E5D9003DC336 /* srs.db */,
10147+
7225EFF110B22E9700D23EA2 /* symbology-ng-style.xml */,
989510148
);
989610149
name = resources;
989710150
path = ../../resources;
@@ -10026,6 +10279,7 @@
1002610279
7209ED8B0F39E5D9003DC336 /* core.sip */,
1002710280
7209ED8C0F39E5D9003DC336 /* qgis.sip */,
1002810281
7209ED8D0F39E5D9003DC336 /* qgsapplication.sip */,
10282+
7225EF0510B2261C00D23EA2 /* qgsattributeaction.sip */,
1002910283
7209ED8E0F39E5D9003DC336 /* qgscontexthelp.sip */,
1003010284
7209ED8F0F39E5D9003DC336 /* qgscontinuouscolorrenderer.sip */,
1003110285
7209ED900F39E5D9003DC336 /* qgscontrastenhancement.sip */,
@@ -10087,6 +10341,7 @@
1008710341
72E9A3C70F5AE63500E78E3C /* qgscomposerlabel.sip */,
1008810342
72331DFA0F8E2A2100398D2B /* qgsvectoroverlay.sip */,
1008910343
72331DFB0F8E2A2100398D2B /* qgsoverlayobject.sip */,
10344+
7225EF0410B2260200D23EA2 /* symbology-ng-core.sip */,
1009010345
);
1009110346
name = core;
1009210347
path = ../../python/core;
@@ -10115,6 +10370,7 @@
1011510370
7209EDCD0F39E5D9003DC336 /* qgsquickprint.sip */,
1011610371
7209EDCE0F39E5D9003DC336 /* qgsrubberband.sip */,
1011710372
7209EDCF0F39E5D9003DC336 /* qgsvertexmarker.sip */,
10373+
7225EF0310B225DD00D23EA2 /* symbology-ng-gui.sip */,
1011810374
);
1011910375
name = gui;
1012010376
path = ../../python/gui;
@@ -10707,6 +10963,23 @@
1070710963
727CEC210FBAFF6000F5B88C /* mIconLock.png */,
1070810964
72779E9D1040614100CA9DE5 /* mActionAddMap.png */,
1070910965
72779E9E1040614100CA9DE5 /* mActionAddImage.png */,
10966+
7225EFCD10B22E5B00D23EA2 /* cap_flat.png */,
10967+
7225EFCE10B22E5B00D23EA2 /* cap_round.png */,
10968+
7225EFCF10B22E5B00D23EA2 /* cap_square.png */,
10969+
7225EFD010B22E5B00D23EA2 /* cap_style.svg */,
10970+
7225EFD110B22E5B00D23EA2 /* join_bevel.png */,
10971+
7225EFD210B22E5B00D23EA2 /* join_miter.png */,
10972+
7225EFD310B22E5B00D23EA2 /* join_round.png */,
10973+
7225EFD410B22E5B00D23EA2 /* join_style.svg */,
10974+
7225EFD510B22E5B00D23EA2 /* rendererCategorizedSymbol.png */,
10975+
7225EFD610B22E5B00D23EA2 /* rendererGraduatedSymbol.png */,
10976+
7225EFD710B22E5B00D23EA2 /* rendererSingleSymbol.png */,
10977+
7225EFD810B22E5B00D23EA2 /* symbologyAdd.png */,
10978+
7225EFD910B22E5B00D23EA2 /* symbologyDown.png */,
10979+
7225EFDA10B22E5B00D23EA2 /* symbologyEdit.png */,
10980+
7225EFDB10B22E5B00D23EA2 /* symbologyLock.png */,
10981+
7225EFDC10B22E5B00D23EA2 /* symbologyRemove.png */,
10982+
7225EFDD10B22E5B00D23EA2 /* symbologyUp.png */,
1071010983
72EB12940F7E9B51002C38FA /* plugins */,
1071110984
);
1071210985
name = default;
@@ -11203,6 +11476,118 @@
1120311476
path = ../../src/plugins/oracle_raster;
1120411477
sourceTree = SOURCE_ROOT;
1120511478
};
11479+
7225EF0610B2264D00D23EA2 /* labeling */ = {
11480+
isa = PBXGroup;
11481+
children = (
11482+
7225EF0710B2264D00D23EA2 /* CMakeLists.txt */,
11483+
7225EF0810B2264D00D23EA2 /* engineconfigdialog.cpp */,
11484+
7225EF0910B2264D00D23EA2 /* engineconfigdialog.h */,
11485+
7225EF0A10B2264D00D23EA2 /* engineconfigdialog.ui */,
11486+
7225EF0B10B2264D00D23EA2 /* labeling.cpp */,
11487+
7225EF0C10B2264D00D23EA2 /* labeling.h */,
11488+
7225EF0D10B2264D00D23EA2 /* labeling.png */,
11489+
7225EF0E10B2264D00D23EA2 /* labeling.qrc */,
11490+
7225EF0F10B2264D00D23EA2 /* labelinggui.cpp */,
11491+
7225EF1010B2264D00D23EA2 /* labelinggui.h */,
11492+
7225EF1110B2264D00D23EA2 /* labelingguibase.ui */,
11493+
7225EF1210B2264D00D23EA2 /* labelpreview.cpp */,
11494+
7225EF1310B2264D00D23EA2 /* labelpreview.h */,
11495+
7225EF1410B2264D00D23EA2 /* pallabeling.cpp */,
11496+
7225EF1510B2264D00D23EA2 /* pallabeling.h */,
11497+
);
11498+
name = labeling;
11499+
path = ../../src/plugins/labeling;
11500+
sourceTree = SOURCE_ROOT;
11501+
};
11502+
7225EF3110B2275E00D23EA2 /* symbology-ng */ = {
11503+
isa = PBXGroup;
11504+
children = (
11505+
7225EF3210B2275E00D23EA2 /* qgsbrushstylecombobox.cpp */,
11506+
7225EF3310B2275E00D23EA2 /* qgsbrushstylecombobox.h */,
11507+
7225EF3410B2275E00D23EA2 /* qgscategorizedsymbolrendererv2widget.cpp */,
11508+
7225EF3510B2275E00D23EA2 /* qgscategorizedsymbolrendererv2widget.h */,
11509+
7225EF3610B2275E00D23EA2 /* qgsgraduatedsymbolrendererv2widget.cpp */,
11510+
7225EF3710B2275E00D23EA2 /* qgsgraduatedsymbolrendererv2widget.h */,
11511+
7225EF3810B2275E00D23EA2 /* qgspenstylecombobox.cpp */,
11512+
7225EF3910B2275E00D23EA2 /* qgspenstylecombobox.h */,
11513+
7225EF3A10B2275E00D23EA2 /* qgsrendererv2propertiesdialog.cpp */,
11514+
7225EF3B10B2275E00D23EA2 /* qgsrendererv2propertiesdialog.h */,
11515+
7225EF3C10B2275E00D23EA2 /* qgsrendererv2widget.cpp */,
11516+
7225EF3D10B2275E00D23EA2 /* qgsrendererv2widget.h */,
11517+
7225EF3E10B2275E00D23EA2 /* qgssinglesymbolrendererv2widget.cpp */,
11518+
7225EF3F10B2275E00D23EA2 /* qgssinglesymbolrendererv2widget.h */,
11519+
7225EF4010B2275E00D23EA2 /* qgsstylev2managerdialog.cpp */,
11520+
7225EF4110B2275E00D23EA2 /* qgsstylev2managerdialog.h */,
11521+
7225EF4210B2275E00D23EA2 /* qgssymbollayerv2widget.cpp */,
11522+
7225EF4310B2275E00D23EA2 /* qgssymbollayerv2widget.h */,
11523+
7225EF4410B2275E00D23EA2 /* qgssymbollevelsv2dialog.cpp */,
11524+
7225EF4510B2275E00D23EA2 /* qgssymbollevelsv2dialog.h */,
11525+
7225EF4610B2275E00D23EA2 /* qgssymbolv2propertiesdialog.cpp */,
11526+
7225EF4710B2275E00D23EA2 /* qgssymbolv2propertiesdialog.h */,
11527+
7225EF4810B2275E00D23EA2 /* qgssymbolv2selectordialog.cpp */,
11528+
7225EF4910B2275E00D23EA2 /* qgssymbolv2selectordialog.h */,
11529+
7225EF4A10B2275E00D23EA2 /* qgsvectorcolorbrewercolorrampv2dialog.cpp */,
11530+
7225EF4B10B2275E00D23EA2 /* qgsvectorcolorbrewercolorrampv2dialog.h */,
11531+
7225EF4C10B2275E00D23EA2 /* qgsvectorgradientcolorrampv2dialog.cpp */,
11532+
7225EF4D10B2275E00D23EA2 /* qgsvectorgradientcolorrampv2dialog.h */,
11533+
7225EF4E10B2275E00D23EA2 /* qgsvectorrandomcolorrampv2dialog.cpp */,
11534+
7225EF4F10B2275E00D23EA2 /* qgsvectorrandomcolorrampv2dialog.h */,
11535+
);
11536+
name = "symbology-ng";
11537+
path = "../../src/gui/symbology-ng";
11538+
sourceTree = SOURCE_ROOT;
11539+
};
11540+
7225EF6C10B2298A00D23EA2 /* symbology-ng */ = {
11541+
isa = PBXGroup;
11542+
children = (
11543+
7225EF6D10B2298A00D23EA2 /* qgscategorizedsymbolrendererv2.cpp */,
11544+
7225EF6E10B2298A00D23EA2 /* qgscategorizedsymbolrendererv2.h */,
11545+
7225EF6F10B2298A00D23EA2 /* qgscolorbrewerpalette.h */,
11546+
7225EF7010B2298A00D23EA2 /* qgsfillsymbollayerv2.cpp */,
11547+
7225EF7110B2298A00D23EA2 /* qgsfillsymbollayerv2.h */,
11548+
7225EF7210B2298A00D23EA2 /* qgsgraduatedsymbolrendererv2.cpp */,
11549+
7225EF7310B2298A00D23EA2 /* qgsgraduatedsymbolrendererv2.h */,
11550+
7225EF7410B2298A00D23EA2 /* qgslinesymbollayerv2.cpp */,
11551+
7225EF7510B2298A00D23EA2 /* qgslinesymbollayerv2.h */,
11552+
7225EF7610B2298A00D23EA2 /* qgsmarkersymbollayerv2.cpp */,
11553+
7225EF7710B2298A00D23EA2 /* qgsmarkersymbollayerv2.h */,
11554+
7225EF7810B2298A00D23EA2 /* qgsrendererv2.cpp */,
11555+
7225EF7910B2298A00D23EA2 /* qgsrendererv2.h */,
11556+
7225EF7A10B2298A00D23EA2 /* qgsrendererv2registry.cpp */,
11557+
7225EF7B10B2298A00D23EA2 /* qgsrendererv2registry.h */,
11558+
7225EF7C10B2298A00D23EA2 /* qgssinglesymbolrendererv2.cpp */,
11559+
7225EF7D10B2298A00D23EA2 /* qgssinglesymbolrendererv2.h */,
11560+
7225EF7E10B2298A00D23EA2 /* qgsstylev2.cpp */,
11561+
7225EF7F10B2298A00D23EA2 /* qgsstylev2.h */,
11562+
7225EF8010B2298A00D23EA2 /* qgssymbollayerv2.cpp */,
11563+
7225EF8110B2298A00D23EA2 /* qgssymbollayerv2.h */,
11564+
7225EF8210B2298A00D23EA2 /* qgssymbollayerv2registry.cpp */,
11565+
7225EF8310B2298A00D23EA2 /* qgssymbollayerv2registry.h */,
11566+
7225EF8410B2298A00D23EA2 /* qgssymbollayerv2utils.cpp */,
11567+
7225EF8510B2298A00D23EA2 /* qgssymbollayerv2utils.h */,
11568+
7225EF8610B2298A00D23EA2 /* qgssymbolv2.cpp */,
11569+
7225EF8710B2298A00D23EA2 /* qgssymbolv2.h */,
11570+
7225EF8810B2298B00D23EA2 /* qgsvectorcolorrampv2.cpp */,
11571+
7225EF8910B2298B00D23EA2 /* qgsvectorcolorrampv2.h */,
11572+
);
11573+
name = "symbology-ng";
11574+
path = "../../src/core/symbology-ng";
11575+
sourceTree = SOURCE_ROOT;
11576+
};
11577+
7225EFAA10B22C5000D23EA2 /* symbollayer */ = {
11578+
isa = PBXGroup;
11579+
children = (
11580+
7225EFAB10B22C5000D23EA2 /* widget_linedecoration.ui */,
11581+
7225EFAC10B22C5000D23EA2 /* widget_markerline.ui */,
11582+
7225EFAD10B22C5000D23EA2 /* widget_simplefill.ui */,
11583+
7225EFAE10B22C5000D23EA2 /* widget_simpleline.ui */,
11584+
7225EFAF10B22C5000D23EA2 /* widget_simplemarker.ui */,
11585+
7225EFB010B22C5000D23EA2 /* widget_svgmarker.ui */,
11586+
);
11587+
name = symbollayer;
11588+
path = ../../src/ui/symbollayer;
11589+
sourceTree = SOURCE_ROOT;
11590+
};
1120611591
723FD0650FBCB94600EFA55D /* scripts */ = {
1120711592
isa = PBXGroup;
1120811593
children = (
@@ -13051,6 +13436,25 @@
1305113436
productReference = 7223B78D0F96A96500D905B4 /* liboracleplugin.so */;
1305213437
productType = "com.apple.product-type.tool";
1305313438
};
13439+
7225EF1710B2265A00D23EA2 /* labelingplugin */ = {
13440+
isa = PBXNativeTarget;
13441+
buildConfigurationList = 7225EF1F10B2265A00D23EA2 /* Build configuration list for PBXNativeTarget "labelingplugin" */;
13442+
buildPhases = (
13443+
7225EF1810B2265A00D23EA2 /* Script - ui */,
13444+
7225EF1910B2265A00D23EA2 /* Sources */,
13445+
7225EF1A10B2265A00D23EA2 /* Frameworks */,
13446+
);
13447+
buildRules = (
13448+
7225EF1D10B2265A00D23EA2 /* PBXBuildRule */,
13449+
7225EF1E10B2265A00D23EA2 /* PBXBuildRule */,
13450+
);
13451+
dependencies = (
13452+
);
13453+
name = labelingplugin;
13454+
productName = testprog;
13455+
productReference = 7225EF2210B2265A00D23EA2 /* liblabelingplugin.so */;
13456+
productType = "com.apple.product-type.tool";
13457+
};
1305413458
7262ED920F7A770300498385 /* spatialiteprovider */ = {
1305513459
isa = PBXNativeTarget;
1305613460
buildConfigurationList = 7262ED990F7A770300498385 /* Build configuration list for PBXNativeTarget "spatialiteprovider" */;
@@ -13715,6 +14119,7 @@
1371514119
72A56BFB0F3C887000BA32A1 /* dxf2shpconverterplugin */,
1371614120
72FB0B4A0FFD680F0052360B /* evisplugin */,
1371714121
72A56B6C0F3C824400BA32A1 /* interpolationplugin */,
14122+
7225EF1710B2265A00D23EA2 /* labelingplugin */,
1371814123
72A56B760F3C824400BA32A1 /* northarrowplugin */,
1371914124
72A56C060F3C887300BA32A1 /* ogrconverterplugin */,
1372014125
7223B77E0F96A96500D905B4 /* oracleplugin */,
@@ -13807,6 +14212,21 @@
1380714212
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";
1380814213
showEnvVarsInLog = 0;
1380914214
};
14215+
7225EF1810B2265A00D23EA2 /* Script - ui */ = {
14216+
isa = PBXShellScriptBuildPhase;
14217+
buildActionMask = 2147483647;
14218+
files = (
14219+
);
14220+
inputPaths = (
14221+
);
14222+
name = "Script - ui";
14223+
outputPaths = (
14224+
);
14225+
runOnlyForDeploymentPostprocessing = 0;
14226+
shellPath = /bin/sh;
14227+
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";
14228+
showEnvVarsInLog = 0;
14229+
};
1381014230
722E163C0FB4E95F00DA3CCA /* Script - install ui headers */ = {
1381114231
isa = PBXShellScriptBuildPhase;
1381214232
buildActionMask = 2147483647;
@@ -13969,7 +14389,7 @@
1396914389
);
1397014390
runOnlyForDeploymentPostprocessing = 0;
1397114391
shellPath = /bin/sh;
13972-
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/ui\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";
14392+
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/ui\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\ncd symbollayer\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";
1397314393
showEnvVarsInLog = 0;
1397414394
};
1397514395
729287E70F71E576006D9489 /* Script - ui */ = {
@@ -14475,9 +14895,9 @@
1447514895
7203830C0F8B8C8F0083B883 /* qgspalobjectpositionmanager.cpp in Sources */,
1447614896
723FD05F0FBCB87900EFA55D /* qgspalgeometry.cpp in Sources */,
1447714897
7203830D0F8B8C8F0083B883 /* qgsvectoroverlay.cpp in Sources */,
14898+
7225EF9D10B22AEF00D23EA2 /* costcalculator.cpp in Sources */,
1447814899
720383780F8BA8C50083B883 /* feature.cpp in Sources */,
1447914900
720383790F8BA8C50083B883 /* geomfunction.cpp in Sources */,
14480-
7203837A0F8BA8C50083B883 /* label.cpp in Sources */,
1448114901
7203837B0F8BA8C50083B883 /* labelposition.cpp in Sources */,
1448214902
7203837C0F8BA8C50083B883 /* layer.cpp in Sources */,
1448314903
7203837D0F8BA8C50083B883 /* pal.cpp in Sources */,
@@ -14489,6 +14909,20 @@
1448914909
7216ADEF0FE571C000552832 /* qgsvectorlayerundocommand.cpp in Sources */,
1449014910
727E6AF10FEA90E200DF6F64 /* x_sqlite3.c in Sources */,
1449114911
727E6B040FEA9BC000DF6F64 /* x_spatialite.c in Sources */,
14912+
7225EF8B10B229FA00D23EA2 /* qgscategorizedsymbolrendererv2.cpp in Sources */,
14913+
7225EF8C10B229FA00D23EA2 /* qgsfillsymbollayerv2.cpp in Sources */,
14914+
7225EF8D10B229FA00D23EA2 /* qgsgraduatedsymbolrendererv2.cpp in Sources */,
14915+
7225EF8E10B229FA00D23EA2 /* qgslinesymbollayerv2.cpp in Sources */,
14916+
7225EF8F10B229FA00D23EA2 /* qgsmarkersymbollayerv2.cpp in Sources */,
14917+
7225EF9010B229FA00D23EA2 /* qgsrendererv2.cpp in Sources */,
14918+
7225EF9110B229FA00D23EA2 /* qgsrendererv2registry.cpp in Sources */,
14919+
7225EF9210B229FA00D23EA2 /* qgssinglesymbolrendererv2.cpp in Sources */,
14920+
7225EF9310B229FA00D23EA2 /* qgsstylev2.cpp in Sources */,
14921+
7225EF9410B229FA00D23EA2 /* qgssymbollayerv2.cpp in Sources */,
14922+
7225EF9510B229FA00D23EA2 /* qgssymbollayerv2registry.cpp in Sources */,
14923+
7225EF9610B229FA00D23EA2 /* qgssymbollayerv2utils.cpp in Sources */,
14924+
7225EF9710B229FA00D23EA2 /* qgssymbolv2.cpp in Sources */,
14925+
7225EF9810B229FA00D23EA2 /* qgsvectorcolorrampv2.cpp in Sources */,
1449214926
);
1449314927
runOnlyForDeploymentPostprocessing = 0;
1449414928
};
@@ -14534,6 +14968,33 @@
1453414968
7292879E0F71D415006D9489 /* qgsmessageviewer.h in Sources */,
1453514969
7292879F0F71D415006D9489 /* qgsprojectionselector.h in Sources */,
1453614970
729287A00F71D415006D9489 /* qgsquickprint.h in Sources */,
14971+
7225EFF810B2375300D23EA2 /* qgsbrushstylecombobox.cpp in Sources */,
14972+
7225EFF710B236C400D23EA2 /* qgscategorizedsymbolrendererv2widget.cpp in Sources */,
14973+
7225EFB310B22D2000D23EA2 /* qgsgraduatedsymbolrendererv2widget.cpp in Sources */,
14974+
7225EFB410B22D2000D23EA2 /* qgspenstylecombobox.cpp in Sources */,
14975+
7225EFB510B22D2000D23EA2 /* qgsrendererv2propertiesdialog.cpp in Sources */,
14976+
7225EFB610B22D2000D23EA2 /* qgsrendererv2widget.cpp in Sources */,
14977+
7225EFB710B22D2000D23EA2 /* qgssinglesymbolrendererv2widget.cpp in Sources */,
14978+
7225EFB810B22D2000D23EA2 /* qgsstylev2managerdialog.cpp in Sources */,
14979+
7225EFB910B22D2000D23EA2 /* qgssymbollayerv2widget.cpp in Sources */,
14980+
7225EFBA10B22D2000D23EA2 /* qgssymbollevelsv2dialog.cpp in Sources */,
14981+
7225EFBB10B22D2000D23EA2 /* qgssymbolv2propertiesdialog.cpp in Sources */,
14982+
7225EFBC10B22D2000D23EA2 /* qgssymbolv2selectordialog.cpp in Sources */,
14983+
7225EFBD10B22D2000D23EA2 /* qgsvectorcolorbrewercolorrampv2dialog.cpp in Sources */,
14984+
7225EFBE10B22D2000D23EA2 /* qgsvectorgradientcolorrampv2dialog.cpp in Sources */,
14985+
7225EFBF10B22D2000D23EA2 /* qgsvectorrandomcolorrampv2dialog.cpp in Sources */,
14986+
7225EFC010B22D2000D23EA2 /* qgscategorizedsymbolrendererv2widget.h in Sources */,
14987+
7225EFC110B22D2000D23EA2 /* qgsgraduatedsymbolrendererv2widget.h in Sources */,
14988+
7225EFC210B22D2000D23EA2 /* qgsrendererv2propertiesdialog.h in Sources */,
14989+
7225EFC310B22D2000D23EA2 /* qgssinglesymbolrendererv2widget.h in Sources */,
14990+
7225EFC410B22D2000D23EA2 /* qgsstylev2managerdialog.h in Sources */,
14991+
7225EFC510B22D2000D23EA2 /* qgssymbollayerv2widget.h in Sources */,
14992+
7225EFC610B22D2000D23EA2 /* qgssymbollevelsv2dialog.h in Sources */,
14993+
7225EFC710B22D2000D23EA2 /* qgssymbolv2propertiesdialog.h in Sources */,
14994+
7225EFC810B22D2000D23EA2 /* qgssymbolv2selectordialog.h in Sources */,
14995+
7225EFC910B22D2000D23EA2 /* qgsvectorcolorbrewercolorrampv2dialog.h in Sources */,
14996+
7225EFCA10B22D2000D23EA2 /* qgsvectorgradientcolorrampv2dialog.h in Sources */,
14997+
7225EFCB10B22D2000D23EA2 /* qgsvectorrandomcolorrampv2dialog.h in Sources */,
1453714998
);
1453814999
runOnlyForDeploymentPostprocessing = 0;
1453915000
};
@@ -14586,6 +15047,22 @@
1458615047
);
1458715048
runOnlyForDeploymentPostprocessing = 0;
1458815049
};
15050+
7225EF1910B2265A00D23EA2 /* Sources */ = {
15051+
isa = PBXSourcesBuildPhase;
15052+
buildActionMask = 2147483647;
15053+
files = (
15054+
7225EF2510B2268F00D23EA2 /* engineconfigdialog.cpp in Sources */,
15055+
7225EF2610B2268F00D23EA2 /* labeling.cpp in Sources */,
15056+
7225EF2710B2268F00D23EA2 /* labelinggui.cpp in Sources */,
15057+
7225EF2810B2268F00D23EA2 /* labelpreview.cpp in Sources */,
15058+
7225EF2910B2268F00D23EA2 /* pallabeling.cpp in Sources */,
15059+
7225EF2A10B2269A00D23EA2 /* engineconfigdialog.h in Sources */,
15060+
7225EF2B10B2269A00D23EA2 /* labeling.h in Sources */,
15061+
7225EF2C10B2269A00D23EA2 /* labelinggui.h in Sources */,
15062+
7225EF2D10B226A300D23EA2 /* labeling.qrc in Sources */,
15063+
);
15064+
runOnlyForDeploymentPostprocessing = 0;
15065+
};
1458915066
7262ED950F7A770300498385 /* Sources */ = {
1459015067
isa = PBXSourcesBuildPhase;
1459115068
buildActionMask = 2147483647;
@@ -15224,6 +15701,11 @@
1522415701
target = 7223B77E0F96A96500D905B4 /* oracleplugin */;
1522515702
targetProxy = 7223B7A50F96AA6C00D905B4 /* PBXContainerItemProxy */;
1522615703
};
15704+
7225EF3010B2273D00D23EA2 /* PBXTargetDependency */ = {
15705+
isa = PBXTargetDependency;
15706+
target = 7225EF1710B2265A00D23EA2 /* labelingplugin */;
15707+
targetProxy = 7225EF2F10B2273D00D23EA2 /* PBXContainerItemProxy */;
15708+
};
1522715709
7256F1900F411B110022BE1F /* PBXTargetDependency */ = {
1522815710
isa = PBXTargetDependency;
1522915711
target = 72A07D140F3BD625004FC2A4 /* delimitedtextprovider */;
@@ -15538,6 +16020,7 @@
1553816020
../../src/core/raster,
1553916021
../../src/core/renderer,
1554016022
../../src/core/symbology,
16023+
"../../src/core/symbology-ng",
1554116024
../../src/core/spatialindex/include,
1554216025
../../src/core/pal,
1554316026
"$(GDAL_INC)",
@@ -15579,6 +16062,7 @@
1557916062
../../src/core/raster,
1558016063
../../src/core/renderer,
1558116064
../../src/core/symbology,
16065+
"../../src/core/symbology-ng",
1558216066
../../src/core/spatialindex/include,
1558316067
../../src/core/pal,
1558416068
"$(GDAL_INC)",
@@ -15615,11 +16099,13 @@
1561516099
HEADER_SEARCH_PATHS = (
1561616100
"$(inherited)",
1561716101
../../src/gui,
16102+
"../../src/gui/symbology-ng",
1561816103
../../src/core,
1561916104
../../src/core/composer,
1562016105
../../src/core/raster,
1562116106
../../src/core/renderer,
1562216107
../../src/core/symbology,
16108+
"../../src/core/symbology-ng",
1562316109
"$(GEOS_INC)",
1562416110
"$(SQLITE_INC)",
1562516111
);
@@ -15648,11 +16134,13 @@
1564816134
HEADER_SEARCH_PATHS = (
1564916135
"$(inherited)",
1565016136
../../src/gui,
16137+
"../../src/gui/symbology-ng",
1565116138
../../src/core,
1565216139
../../src/core/composer,
1565316140
../../src/core/raster,
1565416141
../../src/core/renderer,
1565516142
../../src/core/symbology,
16143+
"../../src/core/symbology-ng",
1565616144
"$(GEOS_INC)",
1565716145
"$(SQLITE_INC)",
1565816146
);
@@ -15807,6 +16295,81 @@
1580716295
};
1580816296
name = Release;
1580916297
};
16298+
7225EF2010B2265A00D23EA2 /* Debug */ = {
16299+
isa = XCBuildConfiguration;
16300+
buildSettings = {
16301+
CONFIGURATION_BUILD_DIR = "$(QGIS_BUILD_PATH)/MacOS/$(QGIS_PLUGIN_SUBDIR)";
16302+
EXECUTABLE_PREFIX = lib;
16303+
GCC_DYNAMIC_NO_PIC = NO;
16304+
GCC_OPTIMIZATION_LEVEL = 0;
16305+
GCC_PREPROCESSOR_DEFINITIONS = (
16306+
"$(inherited)",
16307+
plugin_EXPORTS,
16308+
);
16309+
HEADER_SEARCH_PATHS = (
16310+
"$(inherited)",
16311+
../../src/plugins,
16312+
../../src/plugins/plugin,
16313+
../../src/plugins/labeling,
16314+
../../src/core,
16315+
../../src/core/pal,
16316+
../../src/core/raster,
16317+
../../src/core/renderer,
16318+
../../src/core/symbology,
16319+
../../src/gui,
16320+
"$(GEOS_INC)",
16321+
);
16322+
LIBRARY_SEARCH_PATHS = "$(QGIS_BUILD_PATH)/MacOS/$(QGIS_LIB_SUBDIR)";
16323+
MACH_O_TYPE = mh_bundle;
16324+
OTHER_CFLAGS = "$(QT_CXXFLAGS)";
16325+
OTHER_LDFLAGS = (
16326+
"$(inherited)",
16327+
"$(QT_LIB_CORE)",
16328+
"$(QT_LIB_GUI)",
16329+
"$(GEOS_LIB)",
16330+
);
16331+
PRODUCT_NAME = labelingplugin.so;
16332+
TARGET_PLUGINDIR = labeling;
16333+
};
16334+
name = Debug;
16335+
};
16336+
7225EF2110B2265A00D23EA2 /* Release */ = {
16337+
isa = XCBuildConfiguration;
16338+
buildSettings = {
16339+
CONFIGURATION_BUILD_DIR = "$(QGIS_BUILD_PATH)/MacOS/$(QGIS_PLUGIN_SUBDIR)";
16340+
EXECUTABLE_PREFIX = lib;
16341+
GCC_DYNAMIC_NO_PIC = NO;
16342+
GCC_PREPROCESSOR_DEFINITIONS = (
16343+
"$(inherited)",
16344+
plugin_EXPORTS,
16345+
);
16346+
HEADER_SEARCH_PATHS = (
16347+
"$(inherited)",
16348+
../../src/plugins,
16349+
../../src/plugins/plugin,
16350+
../../src/plugins/labeling,
16351+
../../src/core,
16352+
../../src/core/pal,
16353+
../../src/core/raster,
16354+
../../src/core/renderer,
16355+
../../src/core/symbology,
16356+
../../src/gui,
16357+
"$(GEOS_INC)",
16358+
);
16359+
LIBRARY_SEARCH_PATHS = "$(QGIS_BUILD_PATH)/MacOS/$(QGIS_LIB_SUBDIR)";
16360+
MACH_O_TYPE = mh_bundle;
16361+
OTHER_CFLAGS = "$(QT_CXXFLAGS)";
16362+
OTHER_LDFLAGS = (
16363+
"$(inherited)",
16364+
"$(QT_LIB_CORE)",
16365+
"$(QT_LIB_GUI)",
16366+
"$(GEOS_LIB)",
16367+
);
16368+
PRODUCT_NAME = labelingplugin.so;
16369+
TARGET_PLUGINDIR = labeling;
16370+
};
16371+
name = Release;
16372+
};
1581016373
7256F1550F4105770022BE1F /* Debug */ = {
1581116374
isa = XCBuildConfiguration;
1581216375
buildSettings = {
@@ -18084,7 +18647,9 @@
1808418647
../../src/core/raster,
1808518648
../../src/core/renderer,
1808618649
../../src/core/symbology,
18650+
"../../src/core/symbology-ng",
1808718651
../../src/gui,
18652+
"../../src/gui/symbology-ng",
1808818653
../../src/python,
1808918654
../../src/plugins,
1809018655
"$(HEADER_SEARCH_PATHS_QUOTED_FOR_TARGET_1)",
@@ -18138,7 +18703,9 @@
1813818703
../../src/core/raster,
1813918704
../../src/core/renderer,
1814018705
../../src/core/symbology,
18706+
"../../src/core/symbology-ng",
1814118707
../../src/gui,
18708+
"../../src/gui/symbology-ng",
1814218709
../../src/python,
1814318710
../../src/plugins,
1814418711
"$(HEADER_SEARCH_PATHS_QUOTED_FOR_TARGET_1)",
@@ -18181,7 +18748,7 @@
1818118748
COPY_PHASE_STRIP = NO;
1818218749
GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
1818318750
GCC_OPTIMIZATION_LEVEL = 0;
18184-
QGIS_VERSION_BUILD = 12095;
18751+
QGIS_VERSION_BUILD = 12155;
1818518752
STRIP_INSTALLED_PRODUCT = NO;
1818618753
};
1818718754
name = Debug;
@@ -18192,7 +18759,7 @@
1819218759
buildSettings = {
1819318760
COPY_PHASE_STRIP = YES;
1819418761
GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
18195-
QGIS_VERSION_BUILD = 12095;
18762+
QGIS_VERSION_BUILD = 12155;
1819618763
STRIP_INSTALLED_PRODUCT = YES;
1819718764
};
1819818765
name = Release;
@@ -18254,6 +18821,15 @@
1825418821
defaultConfigurationIsVisible = 0;
1825518822
defaultConfigurationName = Release;
1825618823
};
18824+
7225EF1F10B2265A00D23EA2 /* Build configuration list for PBXNativeTarget "labelingplugin" */ = {
18825+
isa = XCConfigurationList;
18826+
buildConfigurations = (
18827+
7225EF2010B2265A00D23EA2 /* Debug */,
18828+
7225EF2110B2265A00D23EA2 /* Release */,
18829+
);
18830+
defaultConfigurationIsVisible = 0;
18831+
defaultConfigurationName = Release;
18832+
};
1825718833
7256F1570F4105A40022BE1F /* Build configuration list for PBXAggregateTarget "python_modules" */ = {
1825818834
isa = XCConfigurationList;
1825918835
buildConfigurations = (

0 commit comments

Comments
 (0)
Please sign in to comment.