Skip to content

Commit 0ddcf29

Browse files
author
kyngchaos
committed
font marker layer (r12794)
git-svn-id: http://svn.osgeo.org/qgis/trunk@12804 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent b1d8387 commit 0ddcf29

File tree

1 file changed

+12
-4
lines changed

1 file changed

+12
-4
lines changed

mac/xcode/Qgis.xcodeproj/project.pbxproj

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -799,6 +799,8 @@
799799
72442AEC1095DD4C00B54796 /* qgsavoidintersectionsdialog.h in Sources */ = {isa = PBXBuildFile; fileRef = 72442AEA1095DCFC00B54796 /* qgsavoidintersectionsdialog.h */; };
800800
72448CD310E9A1C100D4586B /* qgsprojectbadlayerguihandler.h in Sources */ = {isa = PBXBuildFile; fileRef = 72A51A4B10CE05B000E202D7 /* qgsprojectbadlayerguihandler.h */; };
801801
72448CD710E9A21500D4586B /* qgsattributetableview.h in Sources */ = {isa = PBXBuildFile; fileRef = 72A239480F74A62200AFC35B /* qgsattributetableview.h */; };
802+
72491FB711074E930035D7E5 /* characterwidget.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 72491FB511074E700035D7E5 /* characterwidget.cpp */; };
803+
72491FB811074E930035D7E5 /* characterwidget.h in Sources */ = {isa = PBXBuildFile; fileRef = 72491FB611074E700035D7E5 /* characterwidget.h */; };
802804
724D05C610A910F200F9680A /* north-arrow_10_with_map_layers.svg in Copy - svg-n_arrow */ = {isa = PBXBuildFile; fileRef = 724D05BE10A910B400F9680A /* north-arrow_10_with_map_layers.svg */; };
803805
724D05C710A910F200F9680A /* north-arrow_11_simple_corner.svg in Copy - svg-n_arrow */ = {isa = PBXBuildFile; fileRef = 724D05BF10A910B400F9680A /* north-arrow_11_simple_corner.svg */; };
804806
724D05C810A910F200F9680A /* north-arrow_12_triangular_arrows_with_worldmap.svg in Copy - svg-n_arrow */ = {isa = PBXBuildFile; fileRef = 724D05C010A910B400F9680A /* north-arrow_12_triangular_arrows_with_worldmap.svg */; };
@@ -5454,7 +5456,6 @@
54545456
72411D5610D884A400DA6DBB /* mActionMoveItemsToBottom.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = mActionMoveItemsToBottom.png; path = ../../images/themes/gis/mActionMoveItemsToBottom.png; sourceTree = SOURCE_ROOT; };
54555457
72411D5710D884A400DA6DBB /* mActionMoveItemsToTop.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = mActionMoveItemsToTop.png; path = ../../images/themes/gis/mActionMoveItemsToTop.png; sourceTree = SOURCE_ROOT; };
54565458
72411D5810D884A400DA6DBB /* mActionNewComposer.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = mActionNewComposer.png; path = ../../images/themes/gis/mActionNewComposer.png; sourceTree = SOURCE_ROOT; };
5457-
72411D5910D884A400DA6DBB /* mActionPrintComposers.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = mActionPrintComposers.png; path = ../../images/themes/gis/mActionPrintComposers.png; sourceTree = SOURCE_ROOT; };
54585459
72411D5A10D884A400DA6DBB /* mActionRaiseItems.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = mActionRaiseItems.png; path = ../../images/themes/gis/mActionRaiseItems.png; sourceTree = SOURCE_ROOT; };
54595460
72411D5B10D884A400DA6DBB /* mActionReshape.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = mActionReshape.png; path = ../../images/themes/gis/mActionReshape.png; sourceTree = SOURCE_ROOT; };
54605461
72411D5C10D884A400DA6DBB /* mActionSelectedToTop.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = mActionSelectedToTop.png; path = ../../images/themes/gis/mActionSelectedToTop.png; sourceTree = SOURCE_ROOT; };
@@ -5464,6 +5465,9 @@
54645465
72442AE81095DCD800B54796 /* qgsavoidintersectionsdialogbase.ui */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = qgsavoidintersectionsdialogbase.ui; path = ../../src/ui/qgsavoidintersectionsdialogbase.ui; sourceTree = SOURCE_ROOT; };
54655466
72442AE91095DCFC00B54796 /* qgsavoidintersectionsdialog.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = qgsavoidintersectionsdialog.cpp; path = ../../src/app/qgsavoidintersectionsdialog.cpp; sourceTree = SOURCE_ROOT; };
54665467
72442AEA1095DCFC00B54796 /* qgsavoidintersectionsdialog.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = qgsavoidintersectionsdialog.h; path = ../../src/app/qgsavoidintersectionsdialog.h; sourceTree = SOURCE_ROOT; };
5468+
72491FB511074E700035D7E5 /* characterwidget.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = characterwidget.cpp; path = "../../src/gui/symbology-ng/characterwidget.cpp"; sourceTree = SOURCE_ROOT; };
5469+
72491FB611074E700035D7E5 /* characterwidget.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = characterwidget.h; path = "../../src/gui/symbology-ng/characterwidget.h"; sourceTree = SOURCE_ROOT; };
5470+
72491FB911074EC20035D7E5 /* widget_fontmarker.ui */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; name = widget_fontmarker.ui; path = ../../src/ui/symbollayer/widget_fontmarker.ui; sourceTree = SOURCE_ROOT; };
54675471
724C9FE11019EDE700A1E1D4 /* mActionSaveAsPDF.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = mActionSaveAsPDF.png; path = ../../images/themes/default/mActionSaveAsPDF.png; sourceTree = SOURCE_ROOT; };
54685472
724C9FEC1019EE2500A1E1D4 /* mActionSaveAsPDF.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = mActionSaveAsPDF.png; path = ../../images/themes/gis/mActionSaveAsPDF.png; sourceTree = SOURCE_ROOT; };
54695473
724D05B510A910B400F9680A /* north-arrow_1_simple_half_arrow.svg */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; name = "north-arrow_1_simple_half_arrow.svg"; path = "../../images/svg/north_arrows/north-arrow_1_simple_half_arrow.svg"; sourceTree = SOURCE_ROOT; };
@@ -10308,7 +10312,6 @@
1030810312
72411D5610D884A400DA6DBB /* mActionMoveItemsToBottom.png */,
1030910313
72411D5710D884A400DA6DBB /* mActionMoveItemsToTop.png */,
1031010314
72411D5810D884A400DA6DBB /* mActionNewComposer.png */,
10311-
72411D5910D884A400DA6DBB /* mActionPrintComposers.png */,
1031210315
72411D5A10D884A400DA6DBB /* mActionRaiseItems.png */,
1031310316
72411D5B10D884A400DA6DBB /* mActionReshape.png */,
1031410317
72411D5C10D884A400DA6DBB /* mActionSelectedToTop.png */,
@@ -10768,6 +10771,8 @@
1076810771
7225EF3110B2275E00D23EA2 /* symbology-ng */ = {
1076910772
isa = PBXGroup;
1077010773
children = (
10774+
72491FB511074E700035D7E5 /* characterwidget.cpp */,
10775+
72491FB611074E700035D7E5 /* characterwidget.h */,
1077110776
7225EF3210B2275E00D23EA2 /* qgsbrushstylecombobox.cpp */,
1077210777
7225EF3310B2275E00D23EA2 /* qgsbrushstylecombobox.h */,
1077310778
7225EF3410B2275E00D23EA2 /* qgscategorizedsymbolrendererv2widget.cpp */,
@@ -10848,6 +10853,7 @@
1084810853
isa = PBXGroup;
1084910854
children = (
1085010855
72E35C8F1104BFD500B0EA85 /* qgsdashspacedialogbase.ui */,
10856+
72491FB911074EC20035D7E5 /* widget_fontmarker.ui */,
1085110857
7225EFAB10B22C5000D23EA2 /* widget_linedecoration.ui */,
1085210858
7225EFAC10B22C5000D23EA2 /* widget_markerline.ui */,
1085310859
7225EFAD10B22C5000D23EA2 /* widget_simplefill.ui */,
@@ -14614,6 +14620,8 @@
1461414620
72A51A5310CE065B00E202D7 /* qgslegendinterface.h in Sources */,
1461514621
72E35C921104C02A00B0EA85 /* qgsdashspacedialog.cpp in Sources */,
1461614622
72E35C931104C02A00B0EA85 /* qgsdashspacedialog.h in Sources */,
14623+
72491FB711074E930035D7E5 /* characterwidget.cpp in Sources */,
14624+
72491FB811074E930035D7E5 /* characterwidget.h in Sources */,
1461714625
);
1461814626
runOnlyForDeploymentPostprocessing = 0;
1461914627
};
@@ -18704,7 +18712,7 @@
1870418712
COPY_PHASE_STRIP = NO;
1870518713
GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
1870618714
GCC_OPTIMIZATION_LEVEL = 0;
18707-
QGIS_VERSION_BUILD = 12789;
18715+
QGIS_VERSION_BUILD = 12803;
1870818716
STRIP_INSTALLED_PRODUCT = NO;
1870918717
};
1871018718
name = Debug;
@@ -18715,7 +18723,7 @@
1871518723
buildSettings = {
1871618724
COPY_PHASE_STRIP = YES;
1871718725
GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
18718-
QGIS_VERSION_BUILD = 12789;
18726+
QGIS_VERSION_BUILD = 12803;
1871918727
STRIP_INSTALLED_PRODUCT = YES;
1872018728
};
1872118729
name = Release;

0 commit comments

Comments
 (0)