|
1037 | 1037 | 729288B60F71FEE2006D9489 /* qgsopenvectorlayerdialog.h in Sources */ = {isa = PBXBuildFile; fileRef = 726979A70F71369A00AFA402 /* qgsopenvectorlayerdialog.h */; };
|
1038 | 1038 | 729288ED0F7293DB006D9489 /* qgshelpserver.h in Sources */ = {isa = PBXBuildFile; fileRef = 7209E77B0F39E57A003DC336 /* qgshelpserver.h */; };
|
1039 | 1039 | 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 */; }; |
1040 | 1042 | 7299E8BA0F90F06C002F58DE /* AUTHORS in Copy - doc */ = {isa = PBXBuildFile; fileRef = 7256F2E50F4147890022BE1F /* AUTHORS */; };
|
1041 | 1043 | 7299E8BB0F90F06C002F58DE /* CODING in Copy - doc */ = {isa = PBXBuildFile; fileRef = 7256F2E40F4147890022BE1F /* CODING */; };
|
1042 | 1044 | 7299E8BC0F90F06C002F58DE /* SPONSORS in Copy - doc */ = {isa = PBXBuildFile; fileRef = 7256F2DD0F4147890022BE1F /* SPONSORS */; };
|
|
1061 | 1063 | 72A07D8E0F3BDF9C004FC2A4 /* libqgis_core.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 7209F1D20F39E760003DC336 /* libqgis_core.dylib */; };
|
1062 | 1064 | 72A07D9A0F3BDF9F004FC2A4 /* libqgis_core.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 7209F1D20F39E760003DC336 /* libqgis_core.dylib */; };
|
1063 | 1065 | 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 */; }; |
1065 | 1066 | 72A07DBD0F3BDFC8004FC2A4 /* libqgis_core.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 7209F1D20F39E760003DC336 /* libqgis_core.dylib */; };
|
1066 | 1067 | 72A07DC60F3BE1B1004FC2A4 /* qgspostgresprovider.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7209EC720F39E57B003DC336 /* qgspostgresprovider.cpp */; };
|
1067 | 1068 | 72A07DC70F3BE1B4004FC2A4 /* qgspostgisbox2d.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7209EC6A0F39E57B003DC336 /* qgspostgisbox2d.cpp */; };
|
|
1089 | 1090 | 72A56B2D0F3C810600BA32A1 /* libqgis_core.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 7209F1D20F39E760003DC336 /* libqgis_core.dylib */; };
|
1090 | 1091 | 72A56B470F3C822800BA32A1 /* libqgis_core.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 7209F1D20F39E760003DC336 /* libqgis_core.dylib */; };
|
1091 | 1092 | 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 */; }; |
1093 | 1093 | 72A56B700F3C824400BA32A1 /* libqgis_core.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 7209F1D20F39E760003DC336 /* libqgis_core.dylib */; };
|
1094 | 1094 | 72A56B7A0F3C824400BA32A1 /* libqgis_core.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 7209F1D20F39E760003DC336 /* libqgis_core.dylib */; };
|
1095 | 1095 | 72A56B840F3C824400BA32A1 /* libqgis_core.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 7209F1D20F39E760003DC336 /* libqgis_core.dylib */; };
|
|
5361 | 5361 | 7286D63D1062769D008D83A6 /* qgsmaptoolrotatepointsymbols.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = qgsmaptoolrotatepointsymbols.h; path = ../../src/app/qgsmaptoolrotatepointsymbols.h; sourceTree = SOURCE_ROOT; };
|
5362 | 5362 | 7286D63E1062769D008D83A6 /* qgspointrotationitem.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = qgspointrotationitem.cpp; path = ../../src/app/qgspointrotationitem.cpp; sourceTree = SOURCE_ROOT; };
|
5363 | 5363 | 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; }; |
5364 | 5370 | 7299396A0FE3037600244D1A /* CMakeLists.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = CMakeLists.txt; path = "../../src/plugins/grass/modules-6.3/CMakeLists.txt"; sourceTree = SOURCE_ROOT; };
|
5365 | 5371 | 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; };
|
5366 | 5372 | 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 | 5403 | 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; };
|
5398 | 5404 | 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; };
|
5399 | 5405 | 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; }; |
5401 | 5406 | 729939920FE3037600244D1A /* CMakeLists.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = CMakeLists.txt; path = "../../src/plugins/grass/modules-common/CMakeLists.txt"; sourceTree = SOURCE_ROOT; };
|
5402 | 5407 | 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; };
|
5403 | 5408 | 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 | 6806 | isa = PBXFrameworksBuildPhase;
|
6802 | 6807 | buildActionMask = 2147483647;
|
6803 | 6808 | files = (
|
6804 |
| - 72A07DB20F3BDFA4004FC2A4 /* libqgis_core.dylib in Frameworks */, |
6805 | 6809 | 72A07E3B0F3BEEB4004FC2A4 /* libqgisgrass.dylib in Frameworks */,
|
6806 | 6810 | );
|
6807 | 6811 | runOnlyForDeploymentPostprocessing = 0;
|
|
6862 | 6866 | isa = PBXFrameworksBuildPhase;
|
6863 | 6867 | buildActionMask = 2147483647;
|
6864 | 6868 | files = (
|
6865 |
| - 72A56B5C0F3C823800BA32A1 /* libqgis_core.dylib in Frameworks */, |
| 6869 | + 7296CE1A10C2FE91001EAD92 /* libqgis_core.dylib in Frameworks */, |
6866 | 6870 | 72A56BB70F3C84A700BA32A1 /* libqgis_gui.dylib in Frameworks */,
|
6867 | 6871 | 72A56D730F3CC66000BA32A1 /* libqgisgrass.dylib in Frameworks */,
|
6868 | 6872 | );
|
|
8919 | 8923 | 7209ED2E0F39E5D9003DC336 /* astyle-rollback.sh */,
|
8920 | 8924 | 7209ED2F0F39E5D9003DC336 /* astyle.sh */,
|
8921 | 8925 | 7209ED300F39E5D9003DC336 /* build_debian_package.sh */,
|
| 8926 | + 7296CD8610C2E667001EAD92 /* chstroke.sh */, |
8922 | 8927 | 72E2D9FB10B240B2002E8663 /* context_help_id.py */,
|
8923 | 8928 | 7209ED310F39E5D9003DC336 /* create_new_ts.sh */,
|
8924 | 8929 | 7209ED320F39E5D9003DC336 /* fixdiff.pl */,
|
@@ -8958,100 +8963,105 @@
|
8958 | 8963 | children = (
|
8959 | 8964 | 7209ED800F39E5D9003DC336 /* CMakeLists.txt */,
|
8960 | 8965 | 724FFB0810B47263006E3698 /* QgsAttributeTable-de_DE */,
|
8961 |
| - 724FFB0910B47263006E3698 /* QgsAttributeTable-en_US */, |
8962 |
| - 724FFB0A10B47263006E3698 /* QgsAttributeTable-pl_PL */, |
8963 |
| - 724FFB0B10B47263006E3698 /* QgsAttributeTable-ru_RU */, |
8964 |
| - 724FFB0C10B47263006E3698 /* QgsAttributeTable-sk_SK */, |
8965 | 8966 | 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 */, |
8972 | 8967 | 724FFB1410B47263006E3698 /* QgsComposer-de_DE */,
|
8973 |
| - 724FFB1510B47263006E3698 /* QgsComposer-en_US */, |
8974 |
| - 724FFB1610B47263006E3698 /* QgsComposer-pl_PL */, |
8975 |
| - 724FFB1710B47263006E3698 /* QgsComposer-ru_RU */, |
8976 |
| - 724FFB1810B47263006E3698 /* QgsComposer-sk_SK */, |
8977 | 8968 | 724FFB1910B47263006E3698 /* QgsCopyrightLabelPluginGui-de_DE */,
|
8978 |
| - 724FFB1A10B47263006E3698 /* QgsCopyrightLabelPluginGui-en_US */, |
8979 |
| - 724FFB1B10B47263006E3698 /* QgsCopyrightLabelPluginGui-ru_RU */, |
8980 |
| - 724FFB1C10B47263006E3698 /* QgsCopyrightLabelPluginGui-sk_SK */, |
8981 |
| - 724FFB1D10B47263006E3698 /* QgsCopyrightLabelPluginGui-sv_SE */, |
8982 | 8969 | 724FFB1E10B47263006E3698 /* QgsCreateNewVectorLayer-de_DE */,
|
8983 |
| - 724FFB1F10B47263006E3698 /* QgsCreateNewVectorLayer-en_US */, |
8984 |
| - 724FFB2010B47263006E3698 /* QgsCreateNewVectorLayer-ru_RU */, |
8985 |
| - 724FFB2110B47263006E3698 /* QgsCreateNewVectorLayer-sk_SK */, |
8986 | 8970 | 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 */, |
8992 | 8971 | 724FFB2810B47263006E3698 /* QgsDelimitedTextPluginGui-de_DE */,
|
8993 |
| - 724FFB2910B47263006E3698 /* QgsDelimitedTextPluginGui-en_US */, |
8994 |
| - 724FFB2A10B47263006E3698 /* QgsDelimitedTextPluginGui-ru_RU */, |
8995 |
| - 724FFB2B10B47263006E3698 /* QgsDelimitedTextPluginGui-sk_SK */, |
8996 |
| - 724FFB2C10B47263006E3698 /* QgsDelimitedTextPluginGui-sv_SE */, |
8997 | 8972 | 724FFB2D10B47263006E3698 /* QgsGPSPlugin-de_DE */,
|
8998 |
| - 724FFB2E10B47263006E3698 /* QgsGPSPlugin-en_US */, |
8999 |
| - 724FFB2F10B47263006E3698 /* QgsGPSPlugin-ru_RU */, |
9000 |
| - 724FFB3010B47263006E3698 /* QgsGPSPlugin-sk_SK */, |
9001 | 8973 | 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 */, |
9008 | 8974 | 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 */, |
9014 | 8975 | 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 */, |
9021 | 8976 | 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 */, |
9028 | 8977 | 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 */, |
9029 | 8993 | 724FFB4D10B47263006E3698 /* QgsNewHttpConnection-en_US */,
|
9030 |
| - 724FFB4E10B47263006E3698 /* QgsNewHttpConnection-ru_RU */, |
9031 |
| - 724FFB4F10B47263006E3698 /* QgsNewHttpConnection-sk_SK */, |
9032 |
| - 724FFB5010B47263006E3698 /* QgsNewHttpConnection-sv_SE */, |
9033 | 8994 | 724FFB5110B47263006E3698 /* QgsNewOgrConnection-en_US */,
|
9034 |
| - 724FFB5210B47263006E3698 /* QgsNewOgrConnection-ru_RU */, |
9035 | 8995 | 724FFB5310B47263006E3698 /* QgsOpenVectorLayerDialog-en_US */,
|
9036 |
| - 724FFB5410B47263006E3698 /* QgsOpenVectorLayerDialog-ru_RU */, |
9037 |
| - 724FFB5510B47263006E3698 /* QgsProjectProperties-de_DE */, |
9038 | 8996 | 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 */, |
9045 | 8997 | 724FFB5D10B47263006E3698 /* QgsServerSourceSelect-en_US */,
|
9046 |
| - 724FFB5E10B47263006E3698 /* QgsServerSourceSelect-ru_RU */, |
9047 |
| - 724FFB5F10B47263006E3698 /* QgsServerSourceSelect-sk_SK */, |
9048 |
| - 724FFB6010B47263006E3698 /* QgsServerSourceSelect-sv_SE */, |
9049 |
| - 724FFB6110B47263006E3698 /* QgsVectorLayerProperties-de_DE */, |
9050 | 8998 | 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 */, |
9051 | 9005 | 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 */, |
9052 | 9020 | 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 */, |
9053 | 9038 | 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 */, |
9054 | 9054 | 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 */, |
9055 | 9065 | );
|
9056 | 9066 | name = context_help;
|
9057 | 9067 | path = ../../resources/context_help;
|
|
10730 | 10740 | 7299398F0FE3037600244D1A /* modules-common */ = {
|
10731 | 10741 | isa = PBXGroup;
|
10732 | 10742 | children = (
|
10733 |
| - 729939910FE3037600244D1A /* chstroke */, |
10734 | 10743 | 729939920FE3037600244D1A /* CMakeLists.txt */,
|
10735 | 10744 | 729939930FE3037600244D1A /* db.connect.1.png */,
|
10736 | 10745 | 729939940FE3037600244D1A /* db.connect.qgm */,
|
@@ -12922,11 +12931,11 @@
|
12922 | 12931 | 729BBF320F407CBA001BCB63 /* qgispython */,
|
12923 | 12932 | 7256F1540F4105770022BE1F /* python_modules */,
|
12924 | 12933 | 72A07DB90F3BDFC8004FC2A4 /* provider template */,
|
| 12934 | + 72A07D140F3BD625004FC2A4 /* delimitedtextprovider */, |
12925 | 12935 | 72A07CBB0F3BBFEE004FC2A4 /* memoryprovider */,
|
12926 | 12936 | 72A07CF00F3BD1F9004FC2A4 /* ogrprovider */,
|
12927 | 12937 | 72DB68DB1021D08400ED5F3A /* osmprovider */,
|
12928 | 12938 | 72A07D0A0F3BD625004FC2A4 /* wmsprovider */,
|
12929 |
| - 72A07D140F3BD625004FC2A4 /* delimitedtextprovider */, |
12930 | 12939 | 72A07D880F3BDF9C004FC2A4 /* postgresprovider */,
|
12931 | 12940 | 72A07D940F3BDF9F004FC2A4 /* gpxprovider */,
|
12932 | 12941 | 72A07DA00F3BDFA3004FC2A4 /* wfsprovider */,
|
|
13698 | 13707 | 729287460F71C2CB006D9489 /* qgscomposermap.h in Sources */,
|
13699 | 13708 | 729287470F71C2CB006D9489 /* qgscomposerpicture.h in Sources */,
|
13700 | 13709 | 729287480F71C2CB006D9489 /* qgscomposerscalebar.h in Sources */,
|
| 13710 | + 7296CD9E10C2ED18001EAD92 /* qgscomposershape.h in Sources */, |
13701 | 13711 | 72038CA310893F3100439C44 /* qgscomposition.h in Sources */,
|
13702 | 13712 | 729287490F71C2CB006D9489 /* qgscontexthelp.h in Sources */,
|
13703 | 13713 | 7292874A0F71C2CB006D9489 /* qgscoordinatetransform.h in Sources */,
|
|
14769 | 14779 | "$(inherited)",
|
14770 | 14780 | "$(QT_LIB_CORE)",
|
14771 | 14781 | "$(QT_LIB_GUI)",
|
14772 |
| - "$(QT_LIB_SVG)", |
14773 | 14782 | "$(QT_LIB_XML)",
|
| 14783 | + "$(QT_LIB_SVG)", |
14774 | 14784 | );
|
14775 | 14785 | PRODUCT_NAME = diagramoverlayplugin.so;
|
14776 | 14786 | TARGET_PLUGINDIR = diagram_overlay;
|
|
14806 | 14816 | "$(inherited)",
|
14807 | 14817 | "$(QT_LIB_CORE)",
|
14808 | 14818 | "$(QT_LIB_GUI)",
|
14809 |
| - "$(QT_LIB_SVG)", |
14810 | 14819 | "$(QT_LIB_XML)",
|
| 14820 | + "$(QT_LIB_SVG)", |
14811 | 14821 | );
|
14812 | 14822 | PRODUCT_NAME = diagramoverlayplugin.so;
|
14813 | 14823 | TARGET_PLUGINDIR = diagram_overlay;
|
|
14868 | 14878 | "$(GEOS_LIB)",
|
14869 | 14879 | "$(SQLITE_LIB)",
|
14870 | 14880 | "$(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)", |
14872 | 14886 | );
|
14873 | 14887 | PRODUCT_NAME = qgis_core;
|
14874 | 14888 | };
|
|
14910 | 14924 | "$(GEOS_LIB)",
|
14911 | 14925 | "$(SQLITE_LIB)",
|
14912 | 14926 | "$(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)", |
14914 | 14932 | );
|
14915 | 14933 | PRODUCT_NAME = qgis_core;
|
14916 | 14934 | };
|
|
14944 | 14962 | OTHER_CFLAGS = "$(QT_CXXFLAGS)";
|
14945 | 14963 | OTHER_LDFLAGS = (
|
14946 | 14964 | "$(inherited)",
|
14947 |
| - "$(GEOS_LIB)", |
| 14965 | + "$(QT_LIB_CORE)", |
| 14966 | + "$(QT_LIB_GUI)", |
| 14967 | + "$(QT_LIB_XML)", |
| 14968 | + "$(QT_LIB_SVG)", |
| 14969 | + "$(QT_LIB_SQL)", |
14948 | 14970 | "$(SQLITE_LIB)",
|
14949 |
| - "$(QT_LIB)", |
14950 | 14971 | );
|
14951 | 14972 | PRODUCT_NAME = qgis_gui;
|
14952 | 14973 | };
|
|
14979 | 15000 | OTHER_CFLAGS = "$(QT_CXXFLAGS)";
|
14980 | 15001 | OTHER_LDFLAGS = (
|
14981 | 15002 | "$(inherited)",
|
14982 |
| - "$(GEOS_LIB)", |
| 15003 | + "$(QT_LIB_CORE)", |
| 15004 | + "$(QT_LIB_GUI)", |
| 15005 | + "$(QT_LIB_XML)", |
| 15006 | + "$(QT_LIB_SVG)", |
| 15007 | + "$(QT_LIB_SQL)", |
14983 | 15008 | "$(SQLITE_LIB)",
|
14984 |
| - "$(QT_LIB)", |
14985 | 15009 | );
|
14986 | 15010 | PRODUCT_NAME = qgis_gui;
|
14987 | 15011 | };
|
|
15012 | 15036 | OTHER_CFLAGS = "$(QT_CXXFLAGS)";
|
15013 | 15037 | OTHER_LDFLAGS = (
|
15014 | 15038 | "$(inherited)",
|
15015 |
| - "$(GEOS_LIB)", |
15016 |
| - "$(PROJ_LIB)", |
| 15039 | + "$(QT_LIB_CORE)", |
| 15040 | + "$(QT_LIB_GUI)", |
15017 | 15041 | "$(GDAL_LIB)",
|
15018 |
| - "$(QT_LIB)", |
15019 | 15042 | );
|
15020 | 15043 | PRODUCT_NAME = qgis_analysis;
|
15021 | 15044 | };
|
|
15045 | 15068 | OTHER_CFLAGS = "$(QT_CXXFLAGS)";
|
15046 | 15069 | OTHER_LDFLAGS = (
|
15047 | 15070 | "$(inherited)",
|
15048 |
| - "$(GEOS_LIB)", |
15049 |
| - "$(PROJ_LIB)", |
| 15071 | + "$(QT_LIB_CORE)", |
| 15072 | + "$(QT_LIB_GUI)", |
15050 | 15073 | "$(GDAL_LIB)",
|
15051 |
| - "$(QT_LIB)", |
15052 | 15074 | );
|
15053 | 15075 | PRODUCT_NAME = qgis_analysis;
|
15054 | 15076 | };
|
|
15308 | 15330 | OTHER_LDFLAGS = (
|
15309 | 15331 | "$(inherited)",
|
15310 | 15332 | "$(QT_LIB_CORE)",
|
15311 |
| - "$(QT_LIB_XML)", |
15312 | 15333 | "$(SQLITE_LIB)",
|
15313 | 15334 | );
|
15314 | 15335 | PRODUCT_NAME = spatialiteprovider.so;
|
|
15340 | 15361 | OTHER_LDFLAGS = (
|
15341 | 15362 | "$(inherited)",
|
15342 | 15363 | "$(QT_LIB_CORE)",
|
15343 |
| - "$(QT_LIB_XML)", |
15344 | 15364 | "$(SQLITE_LIB)",
|
15345 | 15365 | );
|
15346 | 15366 | PRODUCT_NAME = spatialiteprovider.so;
|
|
15538 | 15558 | OTHER_LDFLAGS = (
|
15539 | 15559 | "$(inherited)",
|
15540 | 15560 | "$(QT_LIB_CORE)",
|
15541 |
| - "$(QT_LIB_XML)", |
15542 |
| - "$(QT_LIB_GUI)", |
15543 | 15561 | "$(PYTHON_LIB)",
|
15544 | 15562 | );
|
15545 | 15563 | PRODUCT_NAME = qgispython;
|
|
15570 | 15588 | OTHER_LDFLAGS = (
|
15571 | 15589 | "$(inherited)",
|
15572 | 15590 | "$(QT_LIB_CORE)",
|
15573 |
| - "$(QT_LIB_XML)", |
15574 |
| - "$(QT_LIB_GUI)", |
15575 | 15591 | "$(PYTHON_LIB)",
|
15576 | 15592 | );
|
15577 | 15593 | PRODUCT_NAME = qgispython;
|
|
15659 | 15675 | OTHER_LDFLAGS = (
|
15660 | 15676 | "$(inherited)",
|
15661 | 15677 | "$(QT_LIB_CORE)",
|
15662 |
| - "$(QT_LIB_XML)", |
15663 | 15678 | "$(GDAL_LIB)",
|
15664 |
| - "$(GEOS_LIB)", |
15665 | 15679 | );
|
15666 | 15680 | PRODUCT_NAME = ogrprovider.so;
|
15667 | 15681 | };
|
|
15690 | 15704 | OTHER_LDFLAGS = (
|
15691 | 15705 | "$(inherited)",
|
15692 | 15706 | "$(QT_LIB_CORE)",
|
15693 |
| - "$(QT_LIB_XML)", |
15694 | 15707 | "$(GDAL_LIB)",
|
15695 |
| - "$(GEOS_LIB)", |
15696 | 15708 | );
|
15697 | 15709 | PRODUCT_NAME = ogrprovider.so;
|
15698 | 15710 | };
|
|
15779 | 15791 | OTHER_LDFLAGS = (
|
15780 | 15792 | "$(inherited)",
|
15781 | 15793 | "$(QT_LIB_CORE)",
|
15782 |
| - "$(QT_LIB_XML)", |
15783 |
| - "$(GDAL_LIB)", |
15784 |
| - "$(GEOS_LIB)", |
15785 | 15794 | );
|
15786 | 15795 | PRODUCT_NAME = delimitedtextprovider.so;
|
15787 | 15796 | };
|
|
15810 | 15819 | OTHER_LDFLAGS = (
|
15811 | 15820 | "$(inherited)",
|
15812 | 15821 | "$(QT_LIB_CORE)",
|
15813 |
| - "$(QT_LIB_XML)", |
15814 |
| - "$(GDAL_LIB)", |
15815 |
| - "$(GEOS_LIB)", |
15816 | 15822 | );
|
15817 | 15823 | PRODUCT_NAME = delimitedtextprovider.so;
|
15818 | 15824 | };
|
|
15842 | 15848 | OTHER_LDFLAGS = (
|
15843 | 15849 | "$(inherited)",
|
15844 | 15850 | "$(QT_LIB_CORE)",
|
15845 |
| - "$(QT_LIB_XML)", |
15846 | 15851 | "$(PGSQL_LIB)",
|
15847 | 15852 | );
|
15848 | 15853 | PRODUCT_NAME = postgresprovider.so;
|
|
15872 | 15877 | OTHER_LDFLAGS = (
|
15873 | 15878 | "$(inherited)",
|
15874 | 15879 | "$(QT_LIB_CORE)",
|
15875 |
| - "$(QT_LIB_XML)", |
15876 | 15880 | "$(PGSQL_LIB)",
|
15877 | 15881 | );
|
15878 | 15882 | PRODUCT_NAME = postgresprovider.so;
|
|
15903 | 15907 | OTHER_LDFLAGS = (
|
15904 | 15908 | "$(inherited)",
|
15905 | 15909 | "$(QT_LIB_CORE)",
|
15906 |
| - "$(QT_LIB_XML)", |
15907 |
| - "$(GDAL_LIB)", |
15908 | 15910 | "$(EXPAT_LIB)",
|
15909 | 15911 | );
|
15910 | 15912 | PRODUCT_NAME = gpxprovider.so;
|
|
15934 | 15936 | OTHER_LDFLAGS = (
|
15935 | 15937 | "$(inherited)",
|
15936 | 15938 | "$(QT_LIB_CORE)",
|
15937 |
| - "$(QT_LIB_XML)", |
15938 |
| - "$(GDAL_LIB)", |
15939 | 15939 | "$(EXPAT_LIB)",
|
15940 | 15940 | );
|
15941 | 15941 | PRODUCT_NAME = gpxprovider.so;
|
|
15968 | 15968 | "$(inherited)",
|
15969 | 15969 | "$(QT_LIB_CORE)",
|
15970 | 15970 | "$(QT_LIB_XML)",
|
15971 |
| - "$(GEOS_LIB)", |
15972 |
| - "$(EXPAT_LIB)", |
15973 |
| - "$(QT_LIB_GUI)", |
15974 | 15971 | "$(QT_LIB_NET)",
|
| 15972 | + "$(QT_LIB_GUI)", |
| 15973 | + "$(EXPAT_LIB)", |
15975 | 15974 | );
|
15976 | 15975 | PRODUCT_NAME = wfsprovider.so;
|
15977 | 15976 | };
|
|
16002 | 16001 | "$(inherited)",
|
16003 | 16002 | "$(QT_LIB_CORE)",
|
16004 | 16003 | "$(QT_LIB_XML)",
|
16005 |
| - "$(GEOS_LIB)", |
16006 |
| - "$(EXPAT_LIB)", |
16007 |
| - "$(QT_LIB_GUI)", |
16008 | 16004 | "$(QT_LIB_NET)",
|
| 16005 | + "$(QT_LIB_GUI)", |
| 16006 | + "$(EXPAT_LIB)", |
16009 | 16007 | );
|
16010 | 16008 | PRODUCT_NAME = wfsprovider.so;
|
16011 | 16009 | };
|
|
16040 | 16038 | OTHER_LDFLAGS = (
|
16041 | 16039 | "$(inherited)",
|
16042 | 16040 | "$(QT_LIB_CORE)",
|
16043 |
| - "$(QT_LIB_XML)", |
16044 | 16041 | );
|
16045 | 16042 | PRODUCT_NAME = grassprovider.so;
|
16046 | 16043 | };
|
|
16074 | 16071 | OTHER_LDFLAGS = (
|
16075 | 16072 | "$(inherited)",
|
16076 | 16073 | "$(QT_LIB_CORE)",
|
16077 |
| - "$(QT_LIB_XML)", |
16078 | 16074 | );
|
16079 | 16075 | PRODUCT_NAME = grassprovider.so;
|
16080 | 16076 | };
|
@@ -16156,14 +16152,20 @@
|
16156 | 16152 | "$(GEOS_INC)",
|
16157 | 16153 | );
|
16158 | 16154 | 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 | + ); |
16160 | 16159 | OTHER_CFLAGS = "$(QT_CXXFLAGS)";
|
16161 | 16160 | OTHER_LDFLAGS = (
|
16162 | 16161 | "$(inherited)",
|
16163 | 16162 | "$(QT_LIB_CORE)",
|
16164 |
| - "$(QT_LIB_XML)", |
16165 | 16163 | "$(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)", |
16167 | 16169 | );
|
16168 | 16170 | PRODUCT_NAME = qgisgrass;
|
16169 | 16171 | };
|
@@ -16191,14 +16193,20 @@
|
16191 | 16193 | "$(GEOS_INC)",
|
16192 | 16194 | );
|
16193 | 16195 | 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 | + ); |
16195 | 16200 | OTHER_CFLAGS = "$(QT_CXXFLAGS)";
|
16196 | 16201 | OTHER_LDFLAGS = (
|
16197 | 16202 | "$(inherited)",
|
16198 | 16203 | "$(QT_LIB_CORE)",
|
16199 |
| - "$(QT_LIB_XML)", |
16200 | 16204 | "$(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)", |
16202 | 16210 | );
|
16203 | 16211 | PRODUCT_NAME = qgisgrass;
|
16204 | 16212 | };
|
@@ -16516,17 +16524,23 @@
|
16516 | 16524 | "$(GEOS_INC)",
|
16517 | 16525 | );
|
16518 | 16526 | 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 | + ); |
16520 | 16531 | MACH_O_TYPE = mh_bundle;
|
16521 | 16532 | OTHER_CFLAGS = "$(QT_CXXFLAGS)";
|
16522 | 16533 | OTHER_LDFLAGS = (
|
16523 | 16534 | "$(inherited)",
|
16524 | 16535 | "$(QT_LIB_CORE)",
|
16525 | 16536 | "$(QT_LIB_GUI)",
|
16526 |
| - "$(GRASS_LIB)", |
16527 |
| - "$(QT_LIB_SQL)", |
16528 |
| - "$(QT_LIB_SVG)", |
16529 | 16537 | "$(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)", |
16530 | 16544 | "$(GDAL_LIB)",
|
16531 | 16545 | );
|
16532 | 16546 | PRODUCT_NAME = grassplugin.so;
|
@@ -16567,17 +16581,23 @@
|
16567 | 16581 | "$(GEOS_INC)",
|
16568 | 16582 | );
|
16569 | 16583 | 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 | + ); |
16571 | 16588 | MACH_O_TYPE = mh_bundle;
|
16572 | 16589 | OTHER_CFLAGS = "$(QT_CXXFLAGS)";
|
16573 | 16590 | OTHER_LDFLAGS = (
|
16574 | 16591 | "$(inherited)",
|
16575 | 16592 | "$(QT_LIB_CORE)",
|
16576 | 16593 | "$(QT_LIB_GUI)",
|
16577 |
| - "$(GRASS_LIB)", |
16578 |
| - "$(QT_LIB_SQL)", |
16579 |
| - "$(QT_LIB_SVG)", |
16580 | 16594 | "$(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)", |
16581 | 16601 | "$(GDAL_LIB)",
|
16582 | 16602 | );
|
16583 | 16603 | PRODUCT_NAME = grassplugin.so;
|
|
17578 | 17598 | COPY_PHASE_STRIP = NO;
|
17579 | 17599 | GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
|
17580 | 17600 | GCC_OPTIMIZATION_LEVEL = 0;
|
17581 |
| - QGIS_VERSION_BUILD = 12259; |
| 17601 | + QGIS_VERSION_BUILD = 12290; |
17582 | 17602 | STRIP_INSTALLED_PRODUCT = NO;
|
17583 | 17603 | };
|
17584 | 17604 | name = Debug;
|
|
17589 | 17609 | buildSettings = {
|
17590 | 17610 | COPY_PHASE_STRIP = YES;
|
17591 | 17611 | GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
|
17592 |
| - QGIS_VERSION_BUILD = 12259; |
| 17612 | + QGIS_VERSION_BUILD = 12290; |
17593 | 17613 | STRIP_INSTALLED_PRODUCT = YES;
|
17594 | 17614 | };
|
17595 | 17615 | name = Release;
|
|
0 commit comments