Skip to content

Commit c24c1af

Browse files
author
kyngchaos
committedNov 29, 2009
+composershape moc (r12262)
lib link cleanup (r12273) french context help (r12281) git-svn-id: http://svn.osgeo.org/qgis/trunk@12291 c8812cc2-4d05-0410-92ff-de0c093fc19c
·
ltr-3_40Before-merge-new_vector_api
1 parent acde244 commit c24c1af

File tree

2 files changed

+173
-141
lines changed

2 files changed

+173
-141
lines changed
 

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

Lines changed: 159 additions & 139 deletions
Original file line numberDiff line numberDiff line change
@@ -1037,6 +1037,8 @@
10371037
729288B60F71FEE2006D9489 /* qgsopenvectorlayerdialog.h in Sources */ = {isa = PBXBuildFile; fileRef = 726979A70F71369A00AFA402 /* qgsopenvectorlayerdialog.h */; };
10381038
729288ED0F7293DB006D9489 /* qgshelpserver.h in Sources */ = {isa = PBXBuildFile; fileRef = 7209E77B0F39E57A003DC336 /* qgshelpserver.h */; };
10391039
729288EE0F7293DB006D9489 /* qgshelpviewer.h in Sources */ = {isa = PBXBuildFile; fileRef = 7209E77D0F39E57A003DC336 /* qgshelpviewer.h */; };
1040+
7296CD9E10C2ED18001EAD92 /* qgscomposershape.h in Sources */ = {isa = PBXBuildFile; fileRef = 72C93CE110B58AD2003A618E /* qgscomposershape.h */; };
1041+
7296CE1A10C2FE91001EAD92 /* libqgis_core.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 7209F1D20F39E760003DC336 /* libqgis_core.dylib */; };
10401042
7299E8BA0F90F06C002F58DE /* AUTHORS in Copy - doc */ = {isa = PBXBuildFile; fileRef = 7256F2E50F4147890022BE1F /* AUTHORS */; };
10411043
7299E8BB0F90F06C002F58DE /* CODING in Copy - doc */ = {isa = PBXBuildFile; fileRef = 7256F2E40F4147890022BE1F /* CODING */; };
10421044
7299E8BC0F90F06C002F58DE /* SPONSORS in Copy - doc */ = {isa = PBXBuildFile; fileRef = 7256F2DD0F4147890022BE1F /* SPONSORS */; };
@@ -1061,7 +1063,6 @@
10611063
72A07D8E0F3BDF9C004FC2A4 /* libqgis_core.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 7209F1D20F39E760003DC336 /* libqgis_core.dylib */; };
10621064
72A07D9A0F3BDF9F004FC2A4 /* libqgis_core.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 7209F1D20F39E760003DC336 /* libqgis_core.dylib */; };
10631065
72A07DA60F3BDFA3004FC2A4 /* libqgis_core.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 7209F1D20F39E760003DC336 /* libqgis_core.dylib */; };
1064-
72A07DB20F3BDFA4004FC2A4 /* libqgis_core.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 7209F1D20F39E760003DC336 /* libqgis_core.dylib */; };
10651066
72A07DBD0F3BDFC8004FC2A4 /* libqgis_core.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 7209F1D20F39E760003DC336 /* libqgis_core.dylib */; };
10661067
72A07DC60F3BE1B1004FC2A4 /* qgspostgresprovider.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7209EC720F39E57B003DC336 /* qgspostgresprovider.cpp */; };
10671068
72A07DC70F3BE1B4004FC2A4 /* qgspostgisbox2d.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7209EC6A0F39E57B003DC336 /* qgspostgisbox2d.cpp */; };
@@ -1089,7 +1090,6 @@
10891090
72A56B2D0F3C810600BA32A1 /* libqgis_core.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 7209F1D20F39E760003DC336 /* libqgis_core.dylib */; };
10901091
72A56B470F3C822800BA32A1 /* libqgis_core.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 7209F1D20F39E760003DC336 /* libqgis_core.dylib */; };
10911092
72A56B520F3C823800BA32A1 /* libqgis_core.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 7209F1D20F39E760003DC336 /* libqgis_core.dylib */; };
1092-
72A56B5C0F3C823800BA32A1 /* libqgis_core.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 7209F1D20F39E760003DC336 /* libqgis_core.dylib */; };
10931093
72A56B700F3C824400BA32A1 /* libqgis_core.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 7209F1D20F39E760003DC336 /* libqgis_core.dylib */; };
10941094
72A56B7A0F3C824400BA32A1 /* libqgis_core.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 7209F1D20F39E760003DC336 /* libqgis_core.dylib */; };
10951095
72A56B840F3C824400BA32A1 /* libqgis_core.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 7209F1D20F39E760003DC336 /* libqgis_core.dylib */; };
@@ -5361,6 +5361,12 @@
53615361
7286D63D1062769D008D83A6 /* qgsmaptoolrotatepointsymbols.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = qgsmaptoolrotatepointsymbols.h; path = ../../src/app/qgsmaptoolrotatepointsymbols.h; sourceTree = SOURCE_ROOT; };
53625362
7286D63E1062769D008D83A6 /* qgspointrotationitem.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = qgspointrotationitem.cpp; path = ../../src/app/qgspointrotationitem.cpp; sourceTree = SOURCE_ROOT; };
53635363
7286D63F1062769D008D83A6 /* qgspointrotationitem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = qgspointrotationitem.h; path = ../../src/app/qgspointrotationitem.h; sourceTree = SOURCE_ROOT; };
5364+
7296CD8610C2E667001EAD92 /* chstroke.sh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; name = chstroke.sh; path = ../../scripts/chstroke.sh; sourceTree = SOURCE_ROOT; };
5365+
7296CD8710C2E6E3001EAD92 /* QgsAttributeTable-fr_FR */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = "QgsAttributeTable-fr_FR"; path = "../../resources/context_help/QgsAttributeTable-fr_FR"; sourceTree = SOURCE_ROOT; };
5366+
7296CD8810C2E6E3001EAD92 /* QgsBookmarks-fr_FR */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = "QgsBookmarks-fr_FR"; path = "../../resources/context_help/QgsBookmarks-fr_FR"; sourceTree = SOURCE_ROOT; };
5367+
7296CD8910C2E6E3001EAD92 /* QgsComposer-fr_FR */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = "QgsComposer-fr_FR"; path = "../../resources/context_help/QgsComposer-fr_FR"; sourceTree = SOURCE_ROOT; };
5368+
7296CD8A10C2E6E3001EAD92 /* QgsCopyrightLabelPluginGui-fr_FR */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = "QgsCopyrightLabelPluginGui-fr_FR"; path = "../../resources/context_help/QgsCopyrightLabelPluginGui-fr_FR"; sourceTree = SOURCE_ROOT; };
5369+
7296CD8B10C2E6E3001EAD92 /* QgsCreateNewVectorLayer-fr_FR */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = "QgsCreateNewVectorLayer-fr_FR"; path = "../../resources/context_help/QgsCreateNewVectorLayer-fr_FR"; sourceTree = SOURCE_ROOT; };
53645370
7299396A0FE3037600244D1A /* CMakeLists.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = CMakeLists.txt; path = "../../src/plugins/grass/modules-6.3/CMakeLists.txt"; sourceTree = SOURCE_ROOT; };
53655371
7299396B0FE3037600244D1A /* r.surf.fractal.1.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = r.surf.fractal.1.png; path = "../../src/plugins/grass/modules-6.3/r.surf.fractal.1.png"; sourceTree = SOURCE_ROOT; };
53665372
7299396C0FE3037600244D1A /* r.surf.fractal.2.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = r.surf.fractal.2.png; path = "../../src/plugins/grass/modules-6.3/r.surf.fractal.2.png"; sourceTree = SOURCE_ROOT; };
@@ -5397,7 +5403,6 @@
53975403
7299398C0FE3037600244D1A /* v.to.db.1.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = v.to.db.1.png; path = "../../src/plugins/grass/modules-6.4/v.to.db.1.png"; sourceTree = SOURCE_ROOT; };
53985404
7299398D0FE3037600244D1A /* v.to.db.2.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = v.to.db.2.png; path = "../../src/plugins/grass/modules-6.4/v.to.db.2.png"; sourceTree = SOURCE_ROOT; };
53995405
7299398E0FE3037600244D1A /* v.to.db.qgm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; name = v.to.db.qgm; path = "../../src/plugins/grass/modules-6.4/v.to.db.qgm"; sourceTree = SOURCE_ROOT; };
5400-
729939910FE3037600244D1A /* chstroke */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; name = chstroke; path = "../../src/plugins/grass/modules-common/chstroke"; sourceTree = SOURCE_ROOT; };
54015406
729939920FE3037600244D1A /* CMakeLists.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = CMakeLists.txt; path = "../../src/plugins/grass/modules-common/CMakeLists.txt"; sourceTree = SOURCE_ROOT; };
54025407
729939930FE3037600244D1A /* db.connect.1.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = db.connect.1.png; path = "../../src/plugins/grass/modules-common/db.connect.1.png"; sourceTree = SOURCE_ROOT; };
54035408
729939940FE3037600244D1A /* db.connect.qgm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; name = db.connect.qgm; path = "../../src/plugins/grass/modules-common/db.connect.qgm"; sourceTree = SOURCE_ROOT; };
@@ -6801,7 +6806,6 @@
68016806
isa = PBXFrameworksBuildPhase;
68026807
buildActionMask = 2147483647;
68036808
files = (
6804-
72A07DB20F3BDFA4004FC2A4 /* libqgis_core.dylib in Frameworks */,
68056809
72A07E3B0F3BEEB4004FC2A4 /* libqgisgrass.dylib in Frameworks */,
68066810
);
68076811
runOnlyForDeploymentPostprocessing = 0;
@@ -6862,7 +6866,7 @@
68626866
isa = PBXFrameworksBuildPhase;
68636867
buildActionMask = 2147483647;
68646868
files = (
6865-
72A56B5C0F3C823800BA32A1 /* libqgis_core.dylib in Frameworks */,
6869+
7296CE1A10C2FE91001EAD92 /* libqgis_core.dylib in Frameworks */,
68666870
72A56BB70F3C84A700BA32A1 /* libqgis_gui.dylib in Frameworks */,
68676871
72A56D730F3CC66000BA32A1 /* libqgisgrass.dylib in Frameworks */,
68686872
);
@@ -8919,6 +8923,7 @@
89198923
7209ED2E0F39E5D9003DC336 /* astyle-rollback.sh */,
89208924
7209ED2F0F39E5D9003DC336 /* astyle.sh */,
89218925
7209ED300F39E5D9003DC336 /* build_debian_package.sh */,
8926+
7296CD8610C2E667001EAD92 /* chstroke.sh */,
89228927
72E2D9FB10B240B2002E8663 /* context_help_id.py */,
89238928
7209ED310F39E5D9003DC336 /* create_new_ts.sh */,
89248929
7209ED320F39E5D9003DC336 /* fixdiff.pl */,
@@ -8958,100 +8963,105 @@
89588963
children = (
89598964
7209ED800F39E5D9003DC336 /* CMakeLists.txt */,
89608965
724FFB0810B47263006E3698 /* QgsAttributeTable-de_DE */,
8961-
724FFB0910B47263006E3698 /* QgsAttributeTable-en_US */,
8962-
724FFB0A10B47263006E3698 /* QgsAttributeTable-pl_PL */,
8963-
724FFB0B10B47263006E3698 /* QgsAttributeTable-ru_RU */,
8964-
724FFB0C10B47263006E3698 /* QgsAttributeTable-sk_SK */,
89658966
724FFB0D10B47263006E3698 /* QgsBookmarks-de_DE */,
8966-
724FFB0E10B47263006E3698 /* QgsBookmarks-en_US */,
8967-
724FFB0F10B47263006E3698 /* QgsBookmarks-es_ES */,
8968-
724FFB1010B47263006E3698 /* QgsBookmarks-pl_PL */,
8969-
724FFB1110B47263006E3698 /* QgsBookmarks-ru_RU */,
8970-
724FFB1210B47263006E3698 /* QgsBookmarks-sk_SK */,
8971-
724FFB1310B47263006E3698 /* QgsBookmarks-sv_SE */,
89728967
724FFB1410B47263006E3698 /* QgsComposer-de_DE */,
8973-
724FFB1510B47263006E3698 /* QgsComposer-en_US */,
8974-
724FFB1610B47263006E3698 /* QgsComposer-pl_PL */,
8975-
724FFB1710B47263006E3698 /* QgsComposer-ru_RU */,
8976-
724FFB1810B47263006E3698 /* QgsComposer-sk_SK */,
89778968
724FFB1910B47263006E3698 /* QgsCopyrightLabelPluginGui-de_DE */,
8978-
724FFB1A10B47263006E3698 /* QgsCopyrightLabelPluginGui-en_US */,
8979-
724FFB1B10B47263006E3698 /* QgsCopyrightLabelPluginGui-ru_RU */,
8980-
724FFB1C10B47263006E3698 /* QgsCopyrightLabelPluginGui-sk_SK */,
8981-
724FFB1D10B47263006E3698 /* QgsCopyrightLabelPluginGui-sv_SE */,
89828969
724FFB1E10B47263006E3698 /* QgsCreateNewVectorLayer-de_DE */,
8983-
724FFB1F10B47263006E3698 /* QgsCreateNewVectorLayer-en_US */,
8984-
724FFB2010B47263006E3698 /* QgsCreateNewVectorLayer-ru_RU */,
8985-
724FFB2110B47263006E3698 /* QgsCreateNewVectorLayer-sk_SK */,
89868970
724FFB2210B47263006E3698 /* QgsDbSourceSelect-de_DE */,
8987-
724FFB2310B47263006E3698 /* QgsDbSourceSelect-en_US */,
8988-
724FFB2410B47263006E3698 /* QgsDbSourceSelect-pl_PL */,
8989-
724FFB2510B47263006E3698 /* QgsDbSourceSelect-ru_RU */,
8990-
724FFB2610B47263006E3698 /* QgsDbSourceSelect-sk_SK */,
8991-
724FFB2710B47263006E3698 /* QgsDbSourceSelect-sv_SE */,
89928971
724FFB2810B47263006E3698 /* QgsDelimitedTextPluginGui-de_DE */,
8993-
724FFB2910B47263006E3698 /* QgsDelimitedTextPluginGui-en_US */,
8994-
724FFB2A10B47263006E3698 /* QgsDelimitedTextPluginGui-ru_RU */,
8995-
724FFB2B10B47263006E3698 /* QgsDelimitedTextPluginGui-sk_SK */,
8996-
724FFB2C10B47263006E3698 /* QgsDelimitedTextPluginGui-sv_SE */,
89978972
724FFB2D10B47263006E3698 /* QgsGPSPlugin-de_DE */,
8998-
724FFB2E10B47263006E3698 /* QgsGPSPlugin-en_US */,
8999-
724FFB2F10B47263006E3698 /* QgsGPSPlugin-ru_RU */,
9000-
724FFB3010B47263006E3698 /* QgsGPSPlugin-sk_SK */,
90018973
724FFB3110B47263006E3698 /* QgsIdentifyResults-de_DE */,
9002-
724FFB3210B47263006E3698 /* QgsIdentifyResults-en_US */,
9003-
724FFB3310B47263006E3698 /* QgsIdentifyResults-es_ES */,
9004-
724FFB3410B47263006E3698 /* QgsIdentifyResults-pl_PL */,
9005-
724FFB3510B47263006E3698 /* QgsIdentifyResults-ru_RU */,
9006-
724FFB3610B47263006E3698 /* QgsIdentifyResults-sk_SK */,
9007-
724FFB3710B47263006E3698 /* QgsIdentifyResults-sv_SE */,
90088974
724FFB3810B47263006E3698 /* QgsMapserverExport-de_DE */,
9009-
724FFB3910B47263006E3698 /* QgsMapserverExport-en_US */,
9010-
724FFB3A10B47263006E3698 /* QgsMapserverExport-es_ES */,
9011-
724FFB3B10B47263006E3698 /* QgsMapserverExport-pl_PL */,
9012-
724FFB3C10B47263006E3698 /* QgsMapserverExport-ru_RU */,
9013-
724FFB3D10B47263006E3698 /* QgsMapserverExport-sk_SK */,
90148975
724FFB3E10B47263006E3698 /* QgsMeasure-de_DE */,
9015-
724FFB3F10B47263006E3698 /* QgsMeasure-en_US */,
9016-
724FFB4010B47263006E3698 /* QgsMeasure-es_ES */,
9017-
724FFB4110B47263006E3698 /* QgsMeasure-pl_PL */,
9018-
724FFB4210B47263006E3698 /* QgsMeasure-ru_RU */,
9019-
724FFB4310B47263006E3698 /* QgsMeasure-sk_SK */,
9020-
724FFB4410B47263006E3698 /* QgsMeasure-sv_SE */,
90218976
724FFB4510B47263006E3698 /* QgsNewConnection-de_DE */,
9022-
724FFB4610B47263006E3698 /* QgsNewConnection-en_US */,
9023-
724FFB4710B47263006E3698 /* QgsNewConnection-es_ES */,
9024-
724FFB4810B47263006E3698 /* QgsNewConnection-pl_PL */,
9025-
724FFB4910B47263006E3698 /* QgsNewConnection-ru_RU */,
9026-
724FFB4A10B47263006E3698 /* QgsNewConnection-sk_SK */,
9027-
724FFB4B10B47263006E3698 /* QgsNewConnection-sv_SE */,
90288977
724FFB4C10B47263006E3698 /* QgsNewHttpConnection-de_DE */,
8978+
724FFB5510B47263006E3698 /* QgsProjectProperties-de_DE */,
8979+
724FFB5C10B47263006E3698 /* QgsServerSourceSelect-de_DE */,
8980+
724FFB6110B47263006E3698 /* QgsVectorLayerProperties-de_DE */,
8981+
724FFB0910B47263006E3698 /* QgsAttributeTable-en_US */,
8982+
724FFB0E10B47263006E3698 /* QgsBookmarks-en_US */,
8983+
724FFB1510B47263006E3698 /* QgsComposer-en_US */,
8984+
724FFB1A10B47263006E3698 /* QgsCopyrightLabelPluginGui-en_US */,
8985+
724FFB1F10B47263006E3698 /* QgsCreateNewVectorLayer-en_US */,
8986+
724FFB2310B47263006E3698 /* QgsDbSourceSelect-en_US */,
8987+
724FFB2910B47263006E3698 /* QgsDelimitedTextPluginGui-en_US */,
8988+
724FFB2E10B47263006E3698 /* QgsGPSPlugin-en_US */,
8989+
724FFB3210B47263006E3698 /* QgsIdentifyResults-en_US */,
8990+
724FFB3910B47263006E3698 /* QgsMapserverExport-en_US */,
8991+
724FFB3F10B47263006E3698 /* QgsMeasure-en_US */,
8992+
724FFB4610B47263006E3698 /* QgsNewConnection-en_US */,
90298993
724FFB4D10B47263006E3698 /* QgsNewHttpConnection-en_US */,
9030-
724FFB4E10B47263006E3698 /* QgsNewHttpConnection-ru_RU */,
9031-
724FFB4F10B47263006E3698 /* QgsNewHttpConnection-sk_SK */,
9032-
724FFB5010B47263006E3698 /* QgsNewHttpConnection-sv_SE */,
90338994
724FFB5110B47263006E3698 /* QgsNewOgrConnection-en_US */,
9034-
724FFB5210B47263006E3698 /* QgsNewOgrConnection-ru_RU */,
90358995
724FFB5310B47263006E3698 /* QgsOpenVectorLayerDialog-en_US */,
9036-
724FFB5410B47263006E3698 /* QgsOpenVectorLayerDialog-ru_RU */,
9037-
724FFB5510B47263006E3698 /* QgsProjectProperties-de_DE */,
90388996
724FFB5610B47263006E3698 /* QgsProjectProperties-en_US */,
9039-
724FFB5710B47263006E3698 /* QgsProjectProperties-es_ES */,
9040-
724FFB5810B47263006E3698 /* QgsProjectProperties-pl_PL */,
9041-
724FFB5910B47263006E3698 /* QgsProjectProperties-ru_RU */,
9042-
724FFB5A10B47263006E3698 /* QgsProjectProperties-sk_SK */,
9043-
724FFB5B10B47263006E3698 /* QgsProjectProperties-sv_SE */,
9044-
724FFB5C10B47263006E3698 /* QgsServerSourceSelect-de_DE */,
90458997
724FFB5D10B47263006E3698 /* QgsServerSourceSelect-en_US */,
9046-
724FFB5E10B47263006E3698 /* QgsServerSourceSelect-ru_RU */,
9047-
724FFB5F10B47263006E3698 /* QgsServerSourceSelect-sk_SK */,
9048-
724FFB6010B47263006E3698 /* QgsServerSourceSelect-sv_SE */,
9049-
724FFB6110B47263006E3698 /* QgsVectorLayerProperties-de_DE */,
90508998
724FFB6210B47263006E3698 /* QgsVectorLayerProperties-en_US */,
8999+
724FFB0F10B47263006E3698 /* QgsBookmarks-es_ES */,
9000+
724FFB3310B47263006E3698 /* QgsIdentifyResults-es_ES */,
9001+
724FFB3A10B47263006E3698 /* QgsMapserverExport-es_ES */,
9002+
724FFB4010B47263006E3698 /* QgsMeasure-es_ES */,
9003+
724FFB4710B47263006E3698 /* QgsNewConnection-es_ES */,
9004+
724FFB5710B47263006E3698 /* QgsProjectProperties-es_ES */,
90519005
724FFB6310B47263006E3698 /* QgsVectorLayerProperties-es_ES */,
9006+
7296CD8710C2E6E3001EAD92 /* QgsAttributeTable-fr_FR */,
9007+
7296CD8810C2E6E3001EAD92 /* QgsBookmarks-fr_FR */,
9008+
7296CD8910C2E6E3001EAD92 /* QgsComposer-fr_FR */,
9009+
7296CD8A10C2E6E3001EAD92 /* QgsCopyrightLabelPluginGui-fr_FR */,
9010+
7296CD8B10C2E6E3001EAD92 /* QgsCreateNewVectorLayer-fr_FR */,
9011+
724FFB0A10B47263006E3698 /* QgsAttributeTable-pl_PL */,
9012+
724FFB1010B47263006E3698 /* QgsBookmarks-pl_PL */,
9013+
724FFB1610B47263006E3698 /* QgsComposer-pl_PL */,
9014+
724FFB2410B47263006E3698 /* QgsDbSourceSelect-pl_PL */,
9015+
724FFB3410B47263006E3698 /* QgsIdentifyResults-pl_PL */,
9016+
724FFB3B10B47263006E3698 /* QgsMapserverExport-pl_PL */,
9017+
724FFB4110B47263006E3698 /* QgsMeasure-pl_PL */,
9018+
724FFB4810B47263006E3698 /* QgsNewConnection-pl_PL */,
9019+
724FFB5810B47263006E3698 /* QgsProjectProperties-pl_PL */,
90529020
724FFB6410B47263006E3698 /* QgsVectorLayerProperties-pl_PL */,
9021+
724FFB0B10B47263006E3698 /* QgsAttributeTable-ru_RU */,
9022+
724FFB1110B47263006E3698 /* QgsBookmarks-ru_RU */,
9023+
724FFB1710B47263006E3698 /* QgsComposer-ru_RU */,
9024+
724FFB1B10B47263006E3698 /* QgsCopyrightLabelPluginGui-ru_RU */,
9025+
724FFB2010B47263006E3698 /* QgsCreateNewVectorLayer-ru_RU */,
9026+
724FFB2510B47263006E3698 /* QgsDbSourceSelect-ru_RU */,
9027+
724FFB2A10B47263006E3698 /* QgsDelimitedTextPluginGui-ru_RU */,
9028+
724FFB2F10B47263006E3698 /* QgsGPSPlugin-ru_RU */,
9029+
724FFB3510B47263006E3698 /* QgsIdentifyResults-ru_RU */,
9030+
724FFB3C10B47263006E3698 /* QgsMapserverExport-ru_RU */,
9031+
724FFB4210B47263006E3698 /* QgsMeasure-ru_RU */,
9032+
724FFB4910B47263006E3698 /* QgsNewConnection-ru_RU */,
9033+
724FFB4E10B47263006E3698 /* QgsNewHttpConnection-ru_RU */,
9034+
724FFB5210B47263006E3698 /* QgsNewOgrConnection-ru_RU */,
9035+
724FFB5410B47263006E3698 /* QgsOpenVectorLayerDialog-ru_RU */,
9036+
724FFB5910B47263006E3698 /* QgsProjectProperties-ru_RU */,
9037+
724FFB5E10B47263006E3698 /* QgsServerSourceSelect-ru_RU */,
90539038
724FFB6510B47263006E3698 /* QgsVectorLayerProperties-ru_RU */,
9039+
724FFB0C10B47263006E3698 /* QgsAttributeTable-sk_SK */,
9040+
724FFB1210B47263006E3698 /* QgsBookmarks-sk_SK */,
9041+
724FFB1810B47263006E3698 /* QgsComposer-sk_SK */,
9042+
724FFB1C10B47263006E3698 /* QgsCopyrightLabelPluginGui-sk_SK */,
9043+
724FFB2110B47263006E3698 /* QgsCreateNewVectorLayer-sk_SK */,
9044+
724FFB2610B47263006E3698 /* QgsDbSourceSelect-sk_SK */,
9045+
724FFB2B10B47263006E3698 /* QgsDelimitedTextPluginGui-sk_SK */,
9046+
724FFB3010B47263006E3698 /* QgsGPSPlugin-sk_SK */,
9047+
724FFB3610B47263006E3698 /* QgsIdentifyResults-sk_SK */,
9048+
724FFB3D10B47263006E3698 /* QgsMapserverExport-sk_SK */,
9049+
724FFB4310B47263006E3698 /* QgsMeasure-sk_SK */,
9050+
724FFB4A10B47263006E3698 /* QgsNewConnection-sk_SK */,
9051+
724FFB4F10B47263006E3698 /* QgsNewHttpConnection-sk_SK */,
9052+
724FFB5A10B47263006E3698 /* QgsProjectProperties-sk_SK */,
9053+
724FFB5F10B47263006E3698 /* QgsServerSourceSelect-sk_SK */,
90549054
724FFB6610B47263006E3698 /* QgsVectorLayerProperties-sk_SK */,
9055+
724FFB1310B47263006E3698 /* QgsBookmarks-sv_SE */,
9056+
724FFB1D10B47263006E3698 /* QgsCopyrightLabelPluginGui-sv_SE */,
9057+
724FFB2710B47263006E3698 /* QgsDbSourceSelect-sv_SE */,
9058+
724FFB2C10B47263006E3698 /* QgsDelimitedTextPluginGui-sv_SE */,
9059+
724FFB3710B47263006E3698 /* QgsIdentifyResults-sv_SE */,
9060+
724FFB4410B47263006E3698 /* QgsMeasure-sv_SE */,
9061+
724FFB4B10B47263006E3698 /* QgsNewConnection-sv_SE */,
9062+
724FFB5010B47263006E3698 /* QgsNewHttpConnection-sv_SE */,
9063+
724FFB5B10B47263006E3698 /* QgsProjectProperties-sv_SE */,
9064+
724FFB6010B47263006E3698 /* QgsServerSourceSelect-sv_SE */,
90559065
);
90569066
name = context_help;
90579067
path = ../../resources/context_help;
@@ -10730,7 +10740,6 @@
1073010740
7299398F0FE3037600244D1A /* modules-common */ = {
1073110741
isa = PBXGroup;
1073210742
children = (
10733-
729939910FE3037600244D1A /* chstroke */,
1073410743
729939920FE3037600244D1A /* CMakeLists.txt */,
1073510744
729939930FE3037600244D1A /* db.connect.1.png */,
1073610745
729939940FE3037600244D1A /* db.connect.qgm */,
@@ -12922,11 +12931,11 @@
1292212931
729BBF320F407CBA001BCB63 /* qgispython */,
1292312932
7256F1540F4105770022BE1F /* python_modules */,
1292412933
72A07DB90F3BDFC8004FC2A4 /* provider template */,
12934+
72A07D140F3BD625004FC2A4 /* delimitedtextprovider */,
1292512935
72A07CBB0F3BBFEE004FC2A4 /* memoryprovider */,
1292612936
72A07CF00F3BD1F9004FC2A4 /* ogrprovider */,
1292712937
72DB68DB1021D08400ED5F3A /* osmprovider */,
1292812938
72A07D0A0F3BD625004FC2A4 /* wmsprovider */,
12929-
72A07D140F3BD625004FC2A4 /* delimitedtextprovider */,
1293012939
72A07D880F3BDF9C004FC2A4 /* postgresprovider */,
1293112940
72A07D940F3BDF9F004FC2A4 /* gpxprovider */,
1293212941
72A07DA00F3BDFA3004FC2A4 /* wfsprovider */,
@@ -13698,6 +13707,7 @@
1369813707
729287460F71C2CB006D9489 /* qgscomposermap.h in Sources */,
1369913708
729287470F71C2CB006D9489 /* qgscomposerpicture.h in Sources */,
1370013709
729287480F71C2CB006D9489 /* qgscomposerscalebar.h in Sources */,
13710+
7296CD9E10C2ED18001EAD92 /* qgscomposershape.h in Sources */,
1370113711
72038CA310893F3100439C44 /* qgscomposition.h in Sources */,
1370213712
729287490F71C2CB006D9489 /* qgscontexthelp.h in Sources */,
1370313713
7292874A0F71C2CB006D9489 /* qgscoordinatetransform.h in Sources */,
@@ -14769,8 +14779,8 @@
1476914779
"$(inherited)",
1477014780
"$(QT_LIB_CORE)",
1477114781
"$(QT_LIB_GUI)",
14772-
"$(QT_LIB_SVG)",
1477314782
"$(QT_LIB_XML)",
14783+
"$(QT_LIB_SVG)",
1477414784
);
1477514785
PRODUCT_NAME = diagramoverlayplugin.so;
1477614786
TARGET_PLUGINDIR = diagram_overlay;
@@ -14806,8 +14816,8 @@
1480614816
"$(inherited)",
1480714817
"$(QT_LIB_CORE)",
1480814818
"$(QT_LIB_GUI)",
14809-
"$(QT_LIB_SVG)",
1481014819
"$(QT_LIB_XML)",
14820+
"$(QT_LIB_SVG)",
1481114821
);
1481214822
PRODUCT_NAME = diagramoverlayplugin.so;
1481314823
TARGET_PLUGINDIR = diagram_overlay;
@@ -14868,7 +14878,11 @@
1486814878
"$(GEOS_LIB)",
1486914879
"$(SQLITE_LIB)",
1487014880
"$(SPATIALITE_LIBADD)",
14871-
"$(QT_LIB)",
14881+
"$(QT_LIB_CORE)",
14882+
"$(QT_LIB_XML)",
14883+
"$(QT_LIB_GUI)",
14884+
"$(QT_LIB_NET)",
14885+
"$(QT_LIB_SVG)",
1487214886
);
1487314887
PRODUCT_NAME = qgis_core;
1487414888
};
@@ -14910,7 +14924,11 @@
1491014924
"$(GEOS_LIB)",
1491114925
"$(SQLITE_LIB)",
1491214926
"$(SPATIALITE_LIBADD)",
14913-
"$(QT_LIB)",
14927+
"$(QT_LIB_CORE)",
14928+
"$(QT_LIB_XML)",
14929+
"$(QT_LIB_GUI)",
14930+
"$(QT_LIB_NET)",
14931+
"$(QT_LIB_SVG)",
1491414932
);
1491514933
PRODUCT_NAME = qgis_core;
1491614934
};
@@ -14944,9 +14962,12 @@
1494414962
OTHER_CFLAGS = "$(QT_CXXFLAGS)";
1494514963
OTHER_LDFLAGS = (
1494614964
"$(inherited)",
14947-
"$(GEOS_LIB)",
14965+
"$(QT_LIB_CORE)",
14966+
"$(QT_LIB_GUI)",
14967+
"$(QT_LIB_XML)",
14968+
"$(QT_LIB_SVG)",
14969+
"$(QT_LIB_SQL)",
1494814970
"$(SQLITE_LIB)",
14949-
"$(QT_LIB)",
1495014971
);
1495114972
PRODUCT_NAME = qgis_gui;
1495214973
};
@@ -14979,9 +15000,12 @@
1497915000
OTHER_CFLAGS = "$(QT_CXXFLAGS)";
1498015001
OTHER_LDFLAGS = (
1498115002
"$(inherited)",
14982-
"$(GEOS_LIB)",
15003+
"$(QT_LIB_CORE)",
15004+
"$(QT_LIB_GUI)",
15005+
"$(QT_LIB_XML)",
15006+
"$(QT_LIB_SVG)",
15007+
"$(QT_LIB_SQL)",
1498315008
"$(SQLITE_LIB)",
14984-
"$(QT_LIB)",
1498515009
);
1498615010
PRODUCT_NAME = qgis_gui;
1498715011
};
@@ -15012,10 +15036,9 @@
1501215036
OTHER_CFLAGS = "$(QT_CXXFLAGS)";
1501315037
OTHER_LDFLAGS = (
1501415038
"$(inherited)",
15015-
"$(GEOS_LIB)",
15016-
"$(PROJ_LIB)",
15039+
"$(QT_LIB_CORE)",
15040+
"$(QT_LIB_GUI)",
1501715041
"$(GDAL_LIB)",
15018-
"$(QT_LIB)",
1501915042
);
1502015043
PRODUCT_NAME = qgis_analysis;
1502115044
};
@@ -15045,10 +15068,9 @@
1504515068
OTHER_CFLAGS = "$(QT_CXXFLAGS)";
1504615069
OTHER_LDFLAGS = (
1504715070
"$(inherited)",
15048-
"$(GEOS_LIB)",
15049-
"$(PROJ_LIB)",
15071+
"$(QT_LIB_CORE)",
15072+
"$(QT_LIB_GUI)",
1505015073
"$(GDAL_LIB)",
15051-
"$(QT_LIB)",
1505215074
);
1505315075
PRODUCT_NAME = qgis_analysis;
1505415076
};
@@ -15308,7 +15330,6 @@
1530815330
OTHER_LDFLAGS = (
1530915331
"$(inherited)",
1531015332
"$(QT_LIB_CORE)",
15311-
"$(QT_LIB_XML)",
1531215333
"$(SQLITE_LIB)",
1531315334
);
1531415335
PRODUCT_NAME = spatialiteprovider.so;
@@ -15340,7 +15361,6 @@
1534015361
OTHER_LDFLAGS = (
1534115362
"$(inherited)",
1534215363
"$(QT_LIB_CORE)",
15343-
"$(QT_LIB_XML)",
1534415364
"$(SQLITE_LIB)",
1534515365
);
1534615366
PRODUCT_NAME = spatialiteprovider.so;
@@ -15538,8 +15558,6 @@
1553815558
OTHER_LDFLAGS = (
1553915559
"$(inherited)",
1554015560
"$(QT_LIB_CORE)",
15541-
"$(QT_LIB_XML)",
15542-
"$(QT_LIB_GUI)",
1554315561
"$(PYTHON_LIB)",
1554415562
);
1554515563
PRODUCT_NAME = qgispython;
@@ -15570,8 +15588,6 @@
1557015588
OTHER_LDFLAGS = (
1557115589
"$(inherited)",
1557215590
"$(QT_LIB_CORE)",
15573-
"$(QT_LIB_XML)",
15574-
"$(QT_LIB_GUI)",
1557515591
"$(PYTHON_LIB)",
1557615592
);
1557715593
PRODUCT_NAME = qgispython;
@@ -15659,9 +15675,7 @@
1565915675
OTHER_LDFLAGS = (
1566015676
"$(inherited)",
1566115677
"$(QT_LIB_CORE)",
15662-
"$(QT_LIB_XML)",
1566315678
"$(GDAL_LIB)",
15664-
"$(GEOS_LIB)",
1566515679
);
1566615680
PRODUCT_NAME = ogrprovider.so;
1566715681
};
@@ -15690,9 +15704,7 @@
1569015704
OTHER_LDFLAGS = (
1569115705
"$(inherited)",
1569215706
"$(QT_LIB_CORE)",
15693-
"$(QT_LIB_XML)",
1569415707
"$(GDAL_LIB)",
15695-
"$(GEOS_LIB)",
1569615708
);
1569715709
PRODUCT_NAME = ogrprovider.so;
1569815710
};
@@ -15779,9 +15791,6 @@
1577915791
OTHER_LDFLAGS = (
1578015792
"$(inherited)",
1578115793
"$(QT_LIB_CORE)",
15782-
"$(QT_LIB_XML)",
15783-
"$(GDAL_LIB)",
15784-
"$(GEOS_LIB)",
1578515794
);
1578615795
PRODUCT_NAME = delimitedtextprovider.so;
1578715796
};
@@ -15810,9 +15819,6 @@
1581015819
OTHER_LDFLAGS = (
1581115820
"$(inherited)",
1581215821
"$(QT_LIB_CORE)",
15813-
"$(QT_LIB_XML)",
15814-
"$(GDAL_LIB)",
15815-
"$(GEOS_LIB)",
1581615822
);
1581715823
PRODUCT_NAME = delimitedtextprovider.so;
1581815824
};
@@ -15842,7 +15848,6 @@
1584215848
OTHER_LDFLAGS = (
1584315849
"$(inherited)",
1584415850
"$(QT_LIB_CORE)",
15845-
"$(QT_LIB_XML)",
1584615851
"$(PGSQL_LIB)",
1584715852
);
1584815853
PRODUCT_NAME = postgresprovider.so;
@@ -15872,7 +15877,6 @@
1587215877
OTHER_LDFLAGS = (
1587315878
"$(inherited)",
1587415879
"$(QT_LIB_CORE)",
15875-
"$(QT_LIB_XML)",
1587615880
"$(PGSQL_LIB)",
1587715881
);
1587815882
PRODUCT_NAME = postgresprovider.so;
@@ -15903,8 +15907,6 @@
1590315907
OTHER_LDFLAGS = (
1590415908
"$(inherited)",
1590515909
"$(QT_LIB_CORE)",
15906-
"$(QT_LIB_XML)",
15907-
"$(GDAL_LIB)",
1590815910
"$(EXPAT_LIB)",
1590915911
);
1591015912
PRODUCT_NAME = gpxprovider.so;
@@ -15934,8 +15936,6 @@
1593415936
OTHER_LDFLAGS = (
1593515937
"$(inherited)",
1593615938
"$(QT_LIB_CORE)",
15937-
"$(QT_LIB_XML)",
15938-
"$(GDAL_LIB)",
1593915939
"$(EXPAT_LIB)",
1594015940
);
1594115941
PRODUCT_NAME = gpxprovider.so;
@@ -15968,10 +15968,9 @@
1596815968
"$(inherited)",
1596915969
"$(QT_LIB_CORE)",
1597015970
"$(QT_LIB_XML)",
15971-
"$(GEOS_LIB)",
15972-
"$(EXPAT_LIB)",
15973-
"$(QT_LIB_GUI)",
1597415971
"$(QT_LIB_NET)",
15972+
"$(QT_LIB_GUI)",
15973+
"$(EXPAT_LIB)",
1597515974
);
1597615975
PRODUCT_NAME = wfsprovider.so;
1597715976
};
@@ -16002,10 +16001,9 @@
1600216001
"$(inherited)",
1600316002
"$(QT_LIB_CORE)",
1600416003
"$(QT_LIB_XML)",
16005-
"$(GEOS_LIB)",
16006-
"$(EXPAT_LIB)",
16007-
"$(QT_LIB_GUI)",
1600816004
"$(QT_LIB_NET)",
16005+
"$(QT_LIB_GUI)",
16006+
"$(EXPAT_LIB)",
1600916007
);
1601016008
PRODUCT_NAME = wfsprovider.so;
1601116009
};
@@ -16040,7 +16038,6 @@
1604016038
OTHER_LDFLAGS = (
1604116039
"$(inherited)",
1604216040
"$(QT_LIB_CORE)",
16043-
"$(QT_LIB_XML)",
1604416041
);
1604516042
PRODUCT_NAME = grassprovider.so;
1604616043
};
@@ -16074,7 +16071,6 @@
1607416071
OTHER_LDFLAGS = (
1607516072
"$(inherited)",
1607616073
"$(QT_LIB_CORE)",
16077-
"$(QT_LIB_XML)",
1607816074
);
1607916075
PRODUCT_NAME = grassprovider.so;
1608016076
};
@@ -16156,14 +16152,20 @@
1615616152
"$(GEOS_INC)",
1615716153
);
1615816154
INSTALL_PATH = "@executable_path/$(QGIS_LIB_SUBDIR)";
16159-
LIBRARY_SEARCH_PATHS = "$(QGIS_BUILD_PATH)/MacOS/$(QGIS_LIB_SUBDIR)";
16155+
LIBRARY_SEARCH_PATHS = (
16156+
"$(QGIS_BUILD_PATH)/MacOS/$(QGIS_LIB_SUBDIR)",
16157+
"$(GRASS_LIB_DIR)",
16158+
);
1616016159
OTHER_CFLAGS = "$(QT_CXXFLAGS)";
1616116160
OTHER_LDFLAGS = (
1616216161
"$(inherited)",
1616316162
"$(QT_LIB_CORE)",
16164-
"$(QT_LIB_XML)",
1616516163
"$(QT_LIB_GUI)",
16166-
"$(GRASS_LIB)",
16164+
"$(GRASS_LIB_gis)",
16165+
"$(GRASS_LIB_vect)",
16166+
"$(GRASS_LIB_dbmibase)",
16167+
"$(GRASS_LIB_dbmiclient)",
16168+
"$(GRASS_LIB_gproj)",
1616716169
);
1616816170
PRODUCT_NAME = qgisgrass;
1616916171
};
@@ -16191,14 +16193,20 @@
1619116193
"$(GEOS_INC)",
1619216194
);
1619316195
INSTALL_PATH = "@executable_path/$(QGIS_LIB_SUBDIR)";
16194-
LIBRARY_SEARCH_PATHS = "$(QGIS_BUILD_PATH)/MacOS/$(QGIS_LIB_SUBDIR)";
16196+
LIBRARY_SEARCH_PATHS = (
16197+
"$(QGIS_BUILD_PATH)/MacOS/$(QGIS_LIB_SUBDIR)",
16198+
"$(GRASS_LIB_DIR)",
16199+
);
1619516200
OTHER_CFLAGS = "$(QT_CXXFLAGS)";
1619616201
OTHER_LDFLAGS = (
1619716202
"$(inherited)",
1619816203
"$(QT_LIB_CORE)",
16199-
"$(QT_LIB_XML)",
1620016204
"$(QT_LIB_GUI)",
16201-
"$(GRASS_LIB)",
16205+
"$(GRASS_LIB_gis)",
16206+
"$(GRASS_LIB_vect)",
16207+
"$(GRASS_LIB_dbmibase)",
16208+
"$(GRASS_LIB_dbmiclient)",
16209+
"$(GRASS_LIB_gproj)",
1620216210
);
1620316211
PRODUCT_NAME = qgisgrass;
1620416212
};
@@ -16516,17 +16524,23 @@
1651616524
"$(GEOS_INC)",
1651716525
);
1651816526
HEADER_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(TARGET_TEMP_DIR)/../qgis_gui.build/DerivedSources\"";
16519-
LIBRARY_SEARCH_PATHS = "$(QGIS_BUILD_PATH)/MacOS/$(QGIS_LIB_SUBDIR)";
16527+
LIBRARY_SEARCH_PATHS = (
16528+
"$(QGIS_BUILD_PATH)/MacOS/$(QGIS_LIB_SUBDIR)",
16529+
"$(GRASS_LIB_DIR)",
16530+
);
1652016531
MACH_O_TYPE = mh_bundle;
1652116532
OTHER_CFLAGS = "$(QT_CXXFLAGS)";
1652216533
OTHER_LDFLAGS = (
1652316534
"$(inherited)",
1652416535
"$(QT_LIB_CORE)",
1652516536
"$(QT_LIB_GUI)",
16526-
"$(GRASS_LIB)",
16527-
"$(QT_LIB_SQL)",
16528-
"$(QT_LIB_SVG)",
1652916537
"$(QT_LIB_XML)",
16538+
"$(QT_LIB_SVG)",
16539+
"$(GRASS_LIB_gis)",
16540+
"$(GRASS_LIB_vect)",
16541+
"$(GRASS_LIB_dbmibase)",
16542+
"$(GRASS_LIB_dbmiclient)",
16543+
"$(GRASS_LIB_gproj)",
1653016544
"$(GDAL_LIB)",
1653116545
);
1653216546
PRODUCT_NAME = grassplugin.so;
@@ -16567,17 +16581,23 @@
1656716581
"$(GEOS_INC)",
1656816582
);
1656916583
HEADER_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(TARGET_TEMP_DIR)/../qgis_gui.build/DerivedSources\"";
16570-
LIBRARY_SEARCH_PATHS = "$(QGIS_BUILD_PATH)/MacOS/$(QGIS_LIB_SUBDIR)";
16584+
LIBRARY_SEARCH_PATHS = (
16585+
"$(QGIS_BUILD_PATH)/MacOS/$(QGIS_LIB_SUBDIR)",
16586+
"$(GRASS_LIB_DIR)",
16587+
);
1657116588
MACH_O_TYPE = mh_bundle;
1657216589
OTHER_CFLAGS = "$(QT_CXXFLAGS)";
1657316590
OTHER_LDFLAGS = (
1657416591
"$(inherited)",
1657516592
"$(QT_LIB_CORE)",
1657616593
"$(QT_LIB_GUI)",
16577-
"$(GRASS_LIB)",
16578-
"$(QT_LIB_SQL)",
16579-
"$(QT_LIB_SVG)",
1658016594
"$(QT_LIB_XML)",
16595+
"$(QT_LIB_SVG)",
16596+
"$(GRASS_LIB_gis)",
16597+
"$(GRASS_LIB_vect)",
16598+
"$(GRASS_LIB_dbmibase)",
16599+
"$(GRASS_LIB_dbmiclient)",
16600+
"$(GRASS_LIB_gproj)",
1658116601
"$(GDAL_LIB)",
1658216602
);
1658316603
PRODUCT_NAME = grassplugin.so;
@@ -17578,7 +17598,7 @@
1757817598
COPY_PHASE_STRIP = NO;
1757917599
GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
1758017600
GCC_OPTIMIZATION_LEVEL = 0;
17581-
QGIS_VERSION_BUILD = 12259;
17601+
QGIS_VERSION_BUILD = 12290;
1758217602
STRIP_INSTALLED_PRODUCT = NO;
1758317603
};
1758417604
name = Debug;
@@ -17589,7 +17609,7 @@
1758917609
buildSettings = {
1759017610
COPY_PHASE_STRIP = YES;
1759117611
GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
17592-
QGIS_VERSION_BUILD = 12259;
17612+
QGIS_VERSION_BUILD = 12290;
1759317613
STRIP_INSTALLED_PRODUCT = YES;
1759417614
};
1759517615
name = Release;

‎mac/xcode/qgis_settings.xcconfig

Lines changed: 14 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.2.1
3+
CURRENT_PROJECT_VERSION = 2.2.2
44

55
// SDKSYS must be set to valid value
66
SDKSYS = leo // tig (Tiger), leo (Leopard), snow (Snow Leopard)
@@ -247,7 +247,19 @@ GEOS_LIB = $(GEOS_LIB_$(GEOS_FORM))
247247

248248
GRASS_PREFIX = $(GRASS_PREFIX_$(GRASS_FORM))
249249
GRASS_INC = $(GRASS_PREFIX)/include $(GRASS_PREFIX)/include/grass
250-
GRASS_LIB = -L$(GRASS_PREFIX)/lib -lgrass_vect -lgrass_dig2 -lgrass_dbmiclient -lgrass_dbmibase -lgrass_shape -lgrass_dgl -lgrass_rtree -lgrass_gis -lgrass_datetime -lgrass_linkm -lgrass_form -lgrass_gproj
250+
GRASS_LIB_gis = -lgrass_gis
251+
GRASS_LIB_vect = -lgrass_vect
252+
GRASS_LIB_dig2 = -lgrass_dig2
253+
GRASS_LIB_dbmiclient = -lgrass_dbmiclient
254+
GRASS_LIB_dbmibase = -lgrass_dbmibase
255+
GRASS_LIB_shape = -lgrass_shape
256+
GRASS_LIB_dgl = -lgrass_dgl
257+
GRASS_LIB_rtree = -lgrass_rtree
258+
GRASS_LIB_datetime = -lgrass_datetime
259+
GRASS_LIB_linkm = -lgrass_linkm
260+
GRASS_LIB_form = -lgrass_form
261+
GRASS_LIB_gproj = -lgrass_gproj
262+
GRASS_LIB_DIR = $(GRASS_PREFIX)/lib
251263
GRASS_BASE = $(GRASS_PREFIX)
252264
HAVE_OPENPTY = 1
253265

0 commit comments

Comments
 (0)
Please sign in to comment.