Skip to content

Commit 9500b0d

Browse files
author
kyngchaos
committedAug 15, 2009
osm updates (r11377, r11378, r11384)
git-svn-id: http://svn.osgeo.org/qgis/trunk@11385 c8812cc2-4d05-0410-92ff-de0c093fc19c
·
ltr-3_40Before-merge-new_vector_api
1 parent 10d1a0e commit 9500b0d

File tree

3 files changed

+111
-110
lines changed

3 files changed

+111
-110
lines changed
 

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

Lines changed: 100 additions & 110 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
72EBCB0E0F49DEC10016BA3C /* Copy - fTools-icons */,
3535
72EBCB0F0F49DEC10016BA3C /* Copy - ftools-icons-default */,
3636
72EBCB100F49DEC10016BA3C /* Copy - ftools-icons-gis */,
37+
72832D1210362D61002E3B72 /* Script - osm ui */,
3738
72DB694E1021DA3500ED5F3A /* Copy - osm */,
3839
72DB69701021DC8400ED5F3A /* Copy - osm-map_tools */,
3940
72DB69751021DCFE00ED5F3A /* Copy - osm-styles */,
@@ -1427,31 +1428,23 @@
14271428
72DB68F11021D0BD00ED5F3A /* osmrenderer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 72DB68D51021D06C00ED5F3A /* osmrenderer.cpp */; };
14281429
72DB68F31021D0BD00ED5F3A /* osmstyle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 72DB68D71021D06C00ED5F3A /* osmstyle.cpp */; };
14291430
72DB694F1021DA5600ED5F3A /* __init__.py in Copy - osm */ = {isa = PBXBuildFile; fileRef = 72DB690E1021D98600ED5F3A /* __init__.py */; };
1430-
72DB69501021DA5600ED5F3A /* DatabaseManager.py in Copy - osm */ = {isa = PBXBuildFile; fileRef = 72DB69101021D98600ED5F3A /* DatabaseManager.py */; };
1431-
72DB69511021DA5600ED5F3A /* DlgAddRelation.py in Copy - osm */ = {isa = PBXBuildFile; fileRef = 72DB69111021D98600ED5F3A /* DlgAddRelation.py */; };
1432-
72DB69521021DA5600ED5F3A /* DlgAddRelation_ui.py in Copy - osm */ = {isa = PBXBuildFile; fileRef = 72DB69121021D98600ED5F3A /* DlgAddRelation_ui.py */; };
1433-
72DB69531021DA5600ED5F3A /* DlgDownloadOSM.py in Copy - osm */ = {isa = PBXBuildFile; fileRef = 72DB69131021D98600ED5F3A /* DlgDownloadOSM.py */; };
1434-
72DB69541021DA5600ED5F3A /* DlgDownloadOSM_ui.py in Copy - osm */ = {isa = PBXBuildFile; fileRef = 72DB69141021D98600ED5F3A /* DlgDownloadOSM_ui.py */; };
1435-
72DB69551021DA5600ED5F3A /* DlgImport.py in Copy - osm */ = {isa = PBXBuildFile; fileRef = 72DB69151021D98600ED5F3A /* DlgImport.py */; };
1436-
72DB69561021DA5600ED5F3A /* DlgImport_ui.py in Copy - osm */ = {isa = PBXBuildFile; fileRef = 72DB69161021D98600ED5F3A /* DlgImport_ui.py */; };
1437-
72DB69571021DA5600ED5F3A /* DlgLoadOSM.py in Copy - osm */ = {isa = PBXBuildFile; fileRef = 72DB69171021D98600ED5F3A /* DlgLoadOSM.py */; };
1438-
72DB69581021DA5600ED5F3A /* DlgLoadOSM_ui.py in Copy - osm */ = {isa = PBXBuildFile; fileRef = 72DB69181021D98600ED5F3A /* DlgLoadOSM_ui.py */; };
1439-
72DB69591021DA5600ED5F3A /* DlgSaveOSM.py in Copy - osm */ = {isa = PBXBuildFile; fileRef = 72DB69191021D98600ED5F3A /* DlgSaveOSM.py */; };
1440-
72DB695A1021DA5600ED5F3A /* DlgSaveOSM_ui.py in Copy - osm */ = {isa = PBXBuildFile; fileRef = 72DB691A1021D98600ED5F3A /* DlgSaveOSM_ui.py */; };
1441-
72DB695B1021DA5600ED5F3A /* DlgUploadOSM.py in Copy - osm */ = {isa = PBXBuildFile; fileRef = 72DB691B1021D98600ED5F3A /* DlgUploadOSM.py */; };
1442-
72DB695C1021DA5600ED5F3A /* DlgUploadOSM_ui.py in Copy - osm */ = {isa = PBXBuildFile; fileRef = 72DB691C1021D98600ED5F3A /* DlgUploadOSM_ui.py */; };
1443-
72DB695D1021DA5600ED5F3A /* DockUndoRedo.py in Copy - osm */ = {isa = PBXBuildFile; fileRef = 72DB691D1021D98600ED5F3A /* DockUndoRedo.py */; };
1444-
72DB695E1021DA5600ED5F3A /* DockUndoRedo_ui.py in Copy - osm */ = {isa = PBXBuildFile; fileRef = 72DB691E1021D98600ED5F3A /* DockUndoRedo_ui.py */; };
1445-
72DB695F1021DA5600ED5F3A /* DockWidget.py in Copy - osm */ = {isa = PBXBuildFile; fileRef = 72DB691F1021D98600ED5F3A /* DockWidget.py */; };
1446-
72DB69601021DA5600ED5F3A /* DockWidget_ui.py in Copy - osm */ = {isa = PBXBuildFile; fileRef = 72DB69201021D98600ED5F3A /* DockWidget_ui.py */; };
1447-
72DB69611021DA5600ED5F3A /* osm_plugin.py in Copy - osm */ = {isa = PBXBuildFile; fileRef = 72DB693C1021D98600ED5F3A /* osm_plugin.py */; };
1431+
72DB69501021DA5600ED5F3A /* OsmDatabaseManager.py in Copy - osm */ = {isa = PBXBuildFile; fileRef = 72DB69101021D98600ED5F3A /* OsmDatabaseManager.py */; };
1432+
72DB69511021DA5600ED5F3A /* OsmAddRelationDlg.py in Copy - osm */ = {isa = PBXBuildFile; fileRef = 72DB69111021D98600ED5F3A /* OsmAddRelationDlg.py */; };
1433+
72DB69531021DA5600ED5F3A /* OsmDownloadDlg.py in Copy - osm */ = {isa = PBXBuildFile; fileRef = 72DB69131021D98600ED5F3A /* OsmDownloadDlg.py */; };
1434+
72DB69551021DA5600ED5F3A /* OsmImportDlg.py in Copy - osm */ = {isa = PBXBuildFile; fileRef = 72DB69151021D98600ED5F3A /* OsmImportDlg.py */; };
1435+
72DB69571021DA5600ED5F3A /* OsmLoadDlg.py in Copy - osm */ = {isa = PBXBuildFile; fileRef = 72DB69171021D98600ED5F3A /* OsmLoadDlg.py */; };
1436+
72DB69591021DA5600ED5F3A /* OsmSaveDlg.py in Copy - osm */ = {isa = PBXBuildFile; fileRef = 72DB69191021D98600ED5F3A /* OsmSaveDlg.py */; };
1437+
72DB695B1021DA5600ED5F3A /* OsmUploadDlg.py in Copy - osm */ = {isa = PBXBuildFile; fileRef = 72DB691B1021D98600ED5F3A /* OsmUploadDlg.py */; };
1438+
72DB695D1021DA5600ED5F3A /* OsmUndoRedoDW.py in Copy - osm */ = {isa = PBXBuildFile; fileRef = 72DB691D1021D98600ED5F3A /* OsmUndoRedoDW.py */; };
1439+
72DB695F1021DA5600ED5F3A /* OsmFeatureDW.py in Copy - osm */ = {isa = PBXBuildFile; fileRef = 72DB691F1021D98600ED5F3A /* OsmFeatureDW.py */; };
1440+
72DB69611021DA5600ED5F3A /* OsmPlugin.py in Copy - osm */ = {isa = PBXBuildFile; fileRef = 72DB693C1021D98600ED5F3A /* OsmPlugin.py */; };
14481441
72DB69621021DA5600ED5F3A /* resources.py in Copy - osm */ = {isa = PBXBuildFile; fileRef = 72DB693D1021D98600ED5F3A /* resources.py */; };
14491442
72DB69661021DC7600ED5F3A /* __init__.py in Copy - osm-map_tools */ = {isa = PBXBuildFile; fileRef = 72DB69361021D98600ED5F3A /* __init__.py */; };
1450-
72DB69671021DC7600ED5F3A /* CreateLineMapTool.py in Copy - osm-map_tools */ = {isa = PBXBuildFile; fileRef = 72DB69371021D98600ED5F3A /* CreateLineMapTool.py */; };
1451-
72DB69681021DC7600ED5F3A /* CreatePointMapTool.py in Copy - osm-map_tools */ = {isa = PBXBuildFile; fileRef = 72DB69381021D98600ED5F3A /* CreatePointMapTool.py */; };
1452-
72DB69691021DC7600ED5F3A /* CreatePolygonMapTool.py in Copy - osm-map_tools */ = {isa = PBXBuildFile; fileRef = 72DB69391021D98600ED5F3A /* CreatePolygonMapTool.py */; };
1453-
72DB696A1021DC7600ED5F3A /* IdentifyMapTool.py in Copy - osm-map_tools */ = {isa = PBXBuildFile; fileRef = 72DB693A1021D98600ED5F3A /* IdentifyMapTool.py */; };
1454-
72DB696B1021DC7600ED5F3A /* MoveMapTool.py in Copy - osm-map_tools */ = {isa = PBXBuildFile; fileRef = 72DB693B1021D98600ED5F3A /* MoveMapTool.py */; };
1443+
72DB69671021DC7600ED5F3A /* OsmCreateLineMT.py in Copy - osm-map_tools */ = {isa = PBXBuildFile; fileRef = 72DB69371021D98600ED5F3A /* OsmCreateLineMT.py */; };
1444+
72DB69681021DC7600ED5F3A /* OsmCreatePointMT.py in Copy - osm-map_tools */ = {isa = PBXBuildFile; fileRef = 72DB69381021D98600ED5F3A /* OsmCreatePointMT.py */; };
1445+
72DB69691021DC7600ED5F3A /* OsmCreatePolygonMT.py in Copy - osm-map_tools */ = {isa = PBXBuildFile; fileRef = 72DB69391021D98600ED5F3A /* OsmCreatePolygonMT.py */; };
1446+
72DB696A1021DC7600ED5F3A /* OsmIdentifyMT.py in Copy - osm-map_tools */ = {isa = PBXBuildFile; fileRef = 72DB693A1021D98600ED5F3A /* OsmIdentifyMT.py */; };
1447+
72DB696B1021DC7600ED5F3A /* OsmMoveMT.py in Copy - osm-map_tools */ = {isa = PBXBuildFile; fileRef = 72DB693B1021D98600ED5F3A /* OsmMoveMT.py */; };
14551448
72DB69721021DCE000ED5F3A /* big_scale.style in Copy - osm-styles */ = {isa = PBXBuildFile; fileRef = 72DB69401021D98600ED5F3A /* big_scale.style */; };
14561449
72DB69731021DCE000ED5F3A /* medium_scale.style in Copy - osm-styles */ = {isa = PBXBuildFile; fileRef = 72DB69411021D98600ED5F3A /* medium_scale.style */; };
14571450
72DB69741021DCE000ED5F3A /* small_scale.style in Copy - osm-styles */ = {isa = PBXBuildFile; fileRef = 72DB69421021D98600ED5F3A /* small_scale.style */; };
@@ -3424,24 +3417,16 @@
34243417
dstSubfolderSpec = 0;
34253418
files = (
34263419
72DB694F1021DA5600ED5F3A /* __init__.py in Copy - osm */,
3427-
72DB69501021DA5600ED5F3A /* DatabaseManager.py in Copy - osm */,
3428-
72DB69511021DA5600ED5F3A /* DlgAddRelation.py in Copy - osm */,
3429-
72DB69521021DA5600ED5F3A /* DlgAddRelation_ui.py in Copy - osm */,
3430-
72DB69531021DA5600ED5F3A /* DlgDownloadOSM.py in Copy - osm */,
3431-
72DB69541021DA5600ED5F3A /* DlgDownloadOSM_ui.py in Copy - osm */,
3432-
72DB69551021DA5600ED5F3A /* DlgImport.py in Copy - osm */,
3433-
72DB69561021DA5600ED5F3A /* DlgImport_ui.py in Copy - osm */,
3434-
72DB69571021DA5600ED5F3A /* DlgLoadOSM.py in Copy - osm */,
3435-
72DB69581021DA5600ED5F3A /* DlgLoadOSM_ui.py in Copy - osm */,
3436-
72DB69591021DA5600ED5F3A /* DlgSaveOSM.py in Copy - osm */,
3437-
72DB695A1021DA5600ED5F3A /* DlgSaveOSM_ui.py in Copy - osm */,
3438-
72DB695B1021DA5600ED5F3A /* DlgUploadOSM.py in Copy - osm */,
3439-
72DB695C1021DA5600ED5F3A /* DlgUploadOSM_ui.py in Copy - osm */,
3440-
72DB695D1021DA5600ED5F3A /* DockUndoRedo.py in Copy - osm */,
3441-
72DB695E1021DA5600ED5F3A /* DockUndoRedo_ui.py in Copy - osm */,
3442-
72DB695F1021DA5600ED5F3A /* DockWidget.py in Copy - osm */,
3443-
72DB69601021DA5600ED5F3A /* DockWidget_ui.py in Copy - osm */,
3444-
72DB69611021DA5600ED5F3A /* osm_plugin.py in Copy - osm */,
3420+
72DB69501021DA5600ED5F3A /* OsmDatabaseManager.py in Copy - osm */,
3421+
72DB69511021DA5600ED5F3A /* OsmAddRelationDlg.py in Copy - osm */,
3422+
72DB69531021DA5600ED5F3A /* OsmDownloadDlg.py in Copy - osm */,
3423+
72DB69551021DA5600ED5F3A /* OsmImportDlg.py in Copy - osm */,
3424+
72DB69571021DA5600ED5F3A /* OsmLoadDlg.py in Copy - osm */,
3425+
72DB69591021DA5600ED5F3A /* OsmSaveDlg.py in Copy - osm */,
3426+
72DB695B1021DA5600ED5F3A /* OsmUploadDlg.py in Copy - osm */,
3427+
72DB695D1021DA5600ED5F3A /* OsmUndoRedoDW.py in Copy - osm */,
3428+
72DB695F1021DA5600ED5F3A /* OsmFeatureDW.py in Copy - osm */,
3429+
72DB69611021DA5600ED5F3A /* OsmPlugin.py in Copy - osm */,
34453430
72DB69621021DA5600ED5F3A /* resources.py in Copy - osm */,
34463431
);
34473432
name = "Copy - osm";
@@ -3454,11 +3439,11 @@
34543439
dstSubfolderSpec = 0;
34553440
files = (
34563441
72DB69661021DC7600ED5F3A /* __init__.py in Copy - osm-map_tools */,
3457-
72DB69671021DC7600ED5F3A /* CreateLineMapTool.py in Copy - osm-map_tools */,
3458-
72DB69681021DC7600ED5F3A /* CreatePointMapTool.py in Copy - osm-map_tools */,
3459-
72DB69691021DC7600ED5F3A /* CreatePolygonMapTool.py in Copy - osm-map_tools */,
3460-
72DB696A1021DC7600ED5F3A /* IdentifyMapTool.py in Copy - osm-map_tools */,
3461-
72DB696B1021DC7600ED5F3A /* MoveMapTool.py in Copy - osm-map_tools */,
3442+
72DB69671021DC7600ED5F3A /* OsmCreateLineMT.py in Copy - osm-map_tools */,
3443+
72DB69681021DC7600ED5F3A /* OsmCreatePointMT.py in Copy - osm-map_tools */,
3444+
72DB69691021DC7600ED5F3A /* OsmCreatePolygonMT.py in Copy - osm-map_tools */,
3445+
72DB696A1021DC7600ED5F3A /* OsmIdentifyMT.py in Copy - osm-map_tools */,
3446+
72DB696B1021DC7600ED5F3A /* OsmMoveMT.py in Copy - osm-map_tools */,
34623447
);
34633448
name = "Copy - osm-map_tools";
34643449
runOnlyForDeploymentPostprocessing = 0;
@@ -5961,6 +5946,10 @@
59615946
72820FEC0FACCF970011C963 /* mActionSimplify.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = mActionSimplify.png; path = ../../images/themes/default/mActionSimplify.png; sourceTree = SOURCE_ROOT; };
59625947
72820FED0FACCF970011C963 /* mActionDeletePart.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = mActionDeletePart.png; path = ../../images/themes/default/mActionDeletePart.png; sourceTree = SOURCE_ROOT; };
59635948
72820FEE0FACCF970011C963 /* mActionDeleteRing.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = mActionDeleteRing.png; path = ../../images/themes/default/mActionDeleteRing.png; sourceTree = SOURCE_ROOT; };
5949+
72832D0C1036242E002E3B72 /* osm_editRelation.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = osm_editRelation.png; path = ../../python/plugins/osm/images/osm_editRelation.png; sourceTree = SOURCE_ROOT; };
5950+
72832D0D1036242E002E3B72 /* osm_addRelation.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = osm_addRelation.png; path = ../../python/plugins/osm/images/osm_addRelation.png; sourceTree = SOURCE_ROOT; };
5951+
72832D0E1036242E002E3B72 /* osm_urDetails.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = osm_urDetails.png; path = ../../python/plugins/osm/images/osm_urDetails.png; sourceTree = SOURCE_ROOT; };
5952+
72832D0F1036242E002E3B72 /* osm_removeRelation.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = osm_removeRelation.png; path = ../../python/plugins/osm/images/osm_removeRelation.png; sourceTree = SOURCE_ROOT; };
59645953
7299396A0FE3037600244D1A /* CMakeLists.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = CMakeLists.txt; path = "../../src/plugins/grass/modules-6.3/CMakeLists.txt"; sourceTree = SOURCE_ROOT; };
59655954
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; };
59665955
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; };
@@ -6904,23 +6893,15 @@
69046893
72DB68E31021D08400ED5F3A /* libosmprovider.so */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = libosmprovider.so; sourceTree = BUILT_PRODUCTS_DIR; };
69056894
72DB690E1021D98600ED5F3A /* __init__.py */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; name = __init__.py; path = ../../python/plugins/osm/__init__.py; sourceTree = SOURCE_ROOT; };
69066895
72DB690F1021D98600ED5F3A /* CMakeLists.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = CMakeLists.txt; path = ../../python/plugins/osm/CMakeLists.txt; sourceTree = SOURCE_ROOT; };
6907-
72DB69101021D98600ED5F3A /* DatabaseManager.py */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; name = DatabaseManager.py; path = ../../python/plugins/osm/DatabaseManager.py; sourceTree = SOURCE_ROOT; };
6908-
72DB69111021D98600ED5F3A /* DlgAddRelation.py */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; name = DlgAddRelation.py; path = ../../python/plugins/osm/DlgAddRelation.py; sourceTree = SOURCE_ROOT; };
6909-
72DB69121021D98600ED5F3A /* DlgAddRelation_ui.py */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; name = DlgAddRelation_ui.py; path = ../../python/plugins/osm/DlgAddRelation_ui.py; sourceTree = SOURCE_ROOT; };
6910-
72DB69131021D98600ED5F3A /* DlgDownloadOSM.py */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; name = DlgDownloadOSM.py; path = ../../python/plugins/osm/DlgDownloadOSM.py; sourceTree = SOURCE_ROOT; };
6911-
72DB69141021D98600ED5F3A /* DlgDownloadOSM_ui.py */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; name = DlgDownloadOSM_ui.py; path = ../../python/plugins/osm/DlgDownloadOSM_ui.py; sourceTree = SOURCE_ROOT; };
6912-
72DB69151021D98600ED5F3A /* DlgImport.py */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; name = DlgImport.py; path = ../../python/plugins/osm/DlgImport.py; sourceTree = SOURCE_ROOT; };
6913-
72DB69161021D98600ED5F3A /* DlgImport_ui.py */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; name = DlgImport_ui.py; path = ../../python/plugins/osm/DlgImport_ui.py; sourceTree = SOURCE_ROOT; };
6914-
72DB69171021D98600ED5F3A /* DlgLoadOSM.py */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; name = DlgLoadOSM.py; path = ../../python/plugins/osm/DlgLoadOSM.py; sourceTree = SOURCE_ROOT; };
6915-
72DB69181021D98600ED5F3A /* DlgLoadOSM_ui.py */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; name = DlgLoadOSM_ui.py; path = ../../python/plugins/osm/DlgLoadOSM_ui.py; sourceTree = SOURCE_ROOT; };
6916-
72DB69191021D98600ED5F3A /* DlgSaveOSM.py */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; name = DlgSaveOSM.py; path = ../../python/plugins/osm/DlgSaveOSM.py; sourceTree = SOURCE_ROOT; };
6917-
72DB691A1021D98600ED5F3A /* DlgSaveOSM_ui.py */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; name = DlgSaveOSM_ui.py; path = ../../python/plugins/osm/DlgSaveOSM_ui.py; sourceTree = SOURCE_ROOT; };
6918-
72DB691B1021D98600ED5F3A /* DlgUploadOSM.py */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; name = DlgUploadOSM.py; path = ../../python/plugins/osm/DlgUploadOSM.py; sourceTree = SOURCE_ROOT; };
6919-
72DB691C1021D98600ED5F3A /* DlgUploadOSM_ui.py */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; name = DlgUploadOSM_ui.py; path = ../../python/plugins/osm/DlgUploadOSM_ui.py; sourceTree = SOURCE_ROOT; };
6920-
72DB691D1021D98600ED5F3A /* DockUndoRedo.py */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; name = DockUndoRedo.py; path = ../../python/plugins/osm/DockUndoRedo.py; sourceTree = SOURCE_ROOT; };
6921-
72DB691E1021D98600ED5F3A /* DockUndoRedo_ui.py */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; name = DockUndoRedo_ui.py; path = ../../python/plugins/osm/DockUndoRedo_ui.py; sourceTree = SOURCE_ROOT; };
6922-
72DB691F1021D98600ED5F3A /* DockWidget.py */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; name = DockWidget.py; path = ../../python/plugins/osm/DockWidget.py; sourceTree = SOURCE_ROOT; };
6923-
72DB69201021D98600ED5F3A /* DockWidget_ui.py */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; name = DockWidget_ui.py; path = ../../python/plugins/osm/DockWidget_ui.py; sourceTree = SOURCE_ROOT; };
6896+
72DB69101021D98600ED5F3A /* OsmDatabaseManager.py */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; name = OsmDatabaseManager.py; path = ../../python/plugins/osm/OsmDatabaseManager.py; sourceTree = SOURCE_ROOT; };
6897+
72DB69111021D98600ED5F3A /* OsmAddRelationDlg.py */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; name = OsmAddRelationDlg.py; path = ../../python/plugins/osm/OsmAddRelationDlg.py; sourceTree = SOURCE_ROOT; };
6898+
72DB69131021D98600ED5F3A /* OsmDownloadDlg.py */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; name = OsmDownloadDlg.py; path = ../../python/plugins/osm/OsmDownloadDlg.py; sourceTree = SOURCE_ROOT; };
6899+
72DB69151021D98600ED5F3A /* OsmImportDlg.py */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; name = OsmImportDlg.py; path = ../../python/plugins/osm/OsmImportDlg.py; sourceTree = SOURCE_ROOT; };
6900+
72DB69171021D98600ED5F3A /* OsmLoadDlg.py */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; name = OsmLoadDlg.py; path = ../../python/plugins/osm/OsmLoadDlg.py; sourceTree = SOURCE_ROOT; };
6901+
72DB69191021D98600ED5F3A /* OsmSaveDlg.py */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; name = OsmSaveDlg.py; path = ../../python/plugins/osm/OsmSaveDlg.py; sourceTree = SOURCE_ROOT; };
6902+
72DB691B1021D98600ED5F3A /* OsmUploadDlg.py */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; name = OsmUploadDlg.py; path = ../../python/plugins/osm/OsmUploadDlg.py; sourceTree = SOURCE_ROOT; };
6903+
72DB691D1021D98600ED5F3A /* OsmUndoRedoDW.py */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; name = OsmUndoRedoDW.py; path = ../../python/plugins/osm/OsmUndoRedoDW.py; sourceTree = SOURCE_ROOT; };
6904+
72DB691F1021D98600ED5F3A /* OsmFeatureDW.py */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; name = OsmFeatureDW.py; path = ../../python/plugins/osm/OsmFeatureDW.py; sourceTree = SOURCE_ROOT; };
69246905
72DB69221021D98600ED5F3A /* osm_createLine.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = osm_createLine.png; path = ../../python/plugins/osm/images/osm_createLine.png; sourceTree = SOURCE_ROOT; };
69256906
72DB69231021D98600ED5F3A /* osm_createPoint.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = osm_createPoint.png; path = ../../python/plugins/osm/images/osm_createPoint.png; sourceTree = SOURCE_ROOT; };
69266907
72DB69241021D98600ED5F3A /* osm_createPolygon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = osm_createPolygon.png; path = ../../python/plugins/osm/images/osm_createPolygon.png; sourceTree = SOURCE_ROOT; };
@@ -6939,27 +6920,26 @@
69396920
72DB69311021D98600ED5F3A /* osm_undo.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = osm_undo.png; path = ../../python/plugins/osm/images/osm_undo.png; sourceTree = SOURCE_ROOT; };
69406921
72DB69321021D98600ED5F3A /* osm_upload.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = osm_upload.png; path = ../../python/plugins/osm/images/osm_upload.png; sourceTree = SOURCE_ROOT; };
69416922
72DB69331021D98600ED5F3A /* osmIconsMaster.svg */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; name = osmIconsMaster.svg; path = ../../python/plugins/osm/images/osmIconsMaster.svg; sourceTree = SOURCE_ROOT; };
6942-
72DB69341021D98600ED5F3A /* Makefile */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.make; name = Makefile; path = ../../python/plugins/osm/Makefile; sourceTree = SOURCE_ROOT; };
69436923
72DB69361021D98600ED5F3A /* __init__.py */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; name = __init__.py; path = ../../python/plugins/osm/map_tools/__init__.py; sourceTree = SOURCE_ROOT; };
6944-
72DB69371021D98600ED5F3A /* CreateLineMapTool.py */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; name = CreateLineMapTool.py; path = ../../python/plugins/osm/map_tools/CreateLineMapTool.py; sourceTree = SOURCE_ROOT; };
6945-
72DB69381021D98600ED5F3A /* CreatePointMapTool.py */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; name = CreatePointMapTool.py; path = ../../python/plugins/osm/map_tools/CreatePointMapTool.py; sourceTree = SOURCE_ROOT; };
6946-
72DB69391021D98600ED5F3A /* CreatePolygonMapTool.py */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; name = CreatePolygonMapTool.py; path = ../../python/plugins/osm/map_tools/CreatePolygonMapTool.py; sourceTree = SOURCE_ROOT; };
6947-
72DB693A1021D98600ED5F3A /* IdentifyMapTool.py */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; name = IdentifyMapTool.py; path = ../../python/plugins/osm/map_tools/IdentifyMapTool.py; sourceTree = SOURCE_ROOT; };
6948-
72DB693B1021D98600ED5F3A /* MoveMapTool.py */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; name = MoveMapTool.py; path = ../../python/plugins/osm/map_tools/MoveMapTool.py; sourceTree = SOURCE_ROOT; };
6949-
72DB693C1021D98600ED5F3A /* osm_plugin.py */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; name = osm_plugin.py; path = ../../python/plugins/osm/osm_plugin.py; sourceTree = SOURCE_ROOT; };
6924+
72DB69371021D98600ED5F3A /* OsmCreateLineMT.py */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; name = OsmCreateLineMT.py; path = ../../python/plugins/osm/map_tools/OsmCreateLineMT.py; sourceTree = SOURCE_ROOT; };
6925+
72DB69381021D98600ED5F3A /* OsmCreatePointMT.py */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; name = OsmCreatePointMT.py; path = ../../python/plugins/osm/map_tools/OsmCreatePointMT.py; sourceTree = SOURCE_ROOT; };
6926+
72DB69391021D98600ED5F3A /* OsmCreatePolygonMT.py */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; name = OsmCreatePolygonMT.py; path = ../../python/plugins/osm/map_tools/OsmCreatePolygonMT.py; sourceTree = SOURCE_ROOT; };
6927+
72DB693A1021D98600ED5F3A /* OsmIdentifyMT.py */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; name = OsmIdentifyMT.py; path = ../../python/plugins/osm/map_tools/OsmIdentifyMT.py; sourceTree = SOURCE_ROOT; };
6928+
72DB693B1021D98600ED5F3A /* OsmMoveMT.py */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; name = OsmMoveMT.py; path = ../../python/plugins/osm/map_tools/OsmMoveMT.py; sourceTree = SOURCE_ROOT; };
6929+
72DB693C1021D98600ED5F3A /* OsmPlugin.py */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; name = OsmPlugin.py; path = ../../python/plugins/osm/OsmPlugin.py; sourceTree = SOURCE_ROOT; };
69506930
72DB693D1021D98600ED5F3A /* resources.py */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; name = resources.py; path = ../../python/plugins/osm/resources.py; sourceTree = SOURCE_ROOT; };
69516931
72DB693E1021D98600ED5F3A /* resources.qrc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = resources.qrc; path = ../../python/plugins/osm/resources.qrc; sourceTree = SOURCE_ROOT; };
69526932
72DB69401021D98600ED5F3A /* big_scale.style */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = big_scale.style; path = ../../python/plugins/osm/styles/big_scale.style; sourceTree = SOURCE_ROOT; };
69536933
72DB69411021D98600ED5F3A /* medium_scale.style */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = medium_scale.style; path = ../../python/plugins/osm/styles/medium_scale.style; sourceTree = SOURCE_ROOT; };
69546934
72DB69421021D98600ED5F3A /* small_scale.style */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = small_scale.style; path = ../../python/plugins/osm/styles/small_scale.style; sourceTree = SOURCE_ROOT; };
6955-
72DB69441021D98600ED5F3A /* DlgAddRelation.ui */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DlgAddRelation.ui; path = ../../python/plugins/osm/ui_files/DlgAddRelation.ui; sourceTree = SOURCE_ROOT; };
6956-
72DB69451021D98600ED5F3A /* DlgDownloadOSM.ui */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DlgDownloadOSM.ui; path = ../../python/plugins/osm/ui_files/DlgDownloadOSM.ui; sourceTree = SOURCE_ROOT; };
6957-
72DB69461021D98600ED5F3A /* DlgImport.ui */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DlgImport.ui; path = ../../python/plugins/osm/ui_files/DlgImport.ui; sourceTree = SOURCE_ROOT; };
6958-
72DB69471021D98600ED5F3A /* DlgLoadOSM.ui */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DlgLoadOSM.ui; path = ../../python/plugins/osm/ui_files/DlgLoadOSM.ui; sourceTree = SOURCE_ROOT; };
6959-
72DB69481021D98600ED5F3A /* DlgSaveOSM.ui */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DlgSaveOSM.ui; path = ../../python/plugins/osm/ui_files/DlgSaveOSM.ui; sourceTree = SOURCE_ROOT; };
6960-
72DB69491021D98600ED5F3A /* DlgUploadOSM.ui */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DlgUploadOSM.ui; path = ../../python/plugins/osm/ui_files/DlgUploadOSM.ui; sourceTree = SOURCE_ROOT; };
6961-
72DB694A1021D98600ED5F3A /* DockUndoRedo.ui */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; name = DockUndoRedo.ui; path = ../../python/plugins/osm/ui_files/DockUndoRedo.ui; sourceTree = SOURCE_ROOT; };
6962-
72DB694B1021D98600ED5F3A /* DockWidget.ui */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; name = DockWidget.ui; path = ../../python/plugins/osm/ui_files/DockWidget.ui; sourceTree = SOURCE_ROOT; };
6935+
72DB69441021D98600ED5F3A /* OsmAddRelationDlg.ui */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = OsmAddRelationDlg.ui; path = ../../python/plugins/osm/ui_files/OsmAddRelationDlg.ui; sourceTree = SOURCE_ROOT; };
6936+
72DB69451021D98600ED5F3A /* OsmDownloadDlg.ui */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = OsmDownloadDlg.ui; path = ../../python/plugins/osm/ui_files/OsmDownloadDlg.ui; sourceTree = SOURCE_ROOT; };
6937+
72DB69461021D98600ED5F3A /* OsmImportDlg.ui */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = OsmImportDlg.ui; path = ../../python/plugins/osm/ui_files/OsmImportDlg.ui; sourceTree = SOURCE_ROOT; };
6938+
72DB69471021D98600ED5F3A /* OsmLoadDlg.ui */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = OsmLoadDlg.ui; path = ../../python/plugins/osm/ui_files/OsmLoadDlg.ui; sourceTree = SOURCE_ROOT; };
6939+
72DB69481021D98600ED5F3A /* OsmSaveDlg.ui */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = OsmSaveDlg.ui; path = ../../python/plugins/osm/ui_files/OsmSaveDlg.ui; sourceTree = SOURCE_ROOT; };
6940+
72DB69491021D98600ED5F3A /* OsmUploadDlg.ui */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = OsmUploadDlg.ui; path = ../../python/plugins/osm/ui_files/OsmUploadDlg.ui; sourceTree = SOURCE_ROOT; };
6941+
72DB694A1021D98600ED5F3A /* OsmUndoRedoDW.ui */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = OsmUndoRedoDW.ui; path = ../../python/plugins/osm/ui_files/OsmUndoRedoDW.ui; sourceTree = SOURCE_ROOT; };
6942+
72DB694B1021D98600ED5F3A /* OsmFeatureDW.ui */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = OsmFeatureDW.ui; path = ../../python/plugins/osm/ui_files/OsmFeatureDW.ui; sourceTree = SOURCE_ROOT; };
69636943
72E4DF0C0FE00FAD00D3505D /* v.out.ogr.pg.py */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; name = v.out.ogr.pg.py; path = ../../src/plugins/grass/scripts/v.out.ogr.pg.py; sourceTree = SOURCE_ROOT; };
69646944
72E9A3B50F5AE5BD00E78E3C /* qgscomposerview.sip */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = qgscomposerview.sip; sourceTree = "<group>"; };
69656945
72E9A3BE0F5AE63500E78E3C /* qgsscalebarstyle.sip */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = qgsscalebarstyle.sip; path = ../../python/core/qgsscalebarstyle.sip; sourceTree = SOURCE_ROOT; };
@@ -11639,27 +11619,18 @@
1163911619
children = (
1164011620
72DB690E1021D98600ED5F3A /* __init__.py */,
1164111621
72DB690F1021D98600ED5F3A /* CMakeLists.txt */,
11642-
72DB69101021D98600ED5F3A /* DatabaseManager.py */,
11643-
72DB69111021D98600ED5F3A /* DlgAddRelation.py */,
11644-
72DB69121021D98600ED5F3A /* DlgAddRelation_ui.py */,
11645-
72DB69131021D98600ED5F3A /* DlgDownloadOSM.py */,
11646-
72DB69141021D98600ED5F3A /* DlgDownloadOSM_ui.py */,
11647-
72DB69151021D98600ED5F3A /* DlgImport.py */,
11648-
72DB69161021D98600ED5F3A /* DlgImport_ui.py */,
11649-
72DB69171021D98600ED5F3A /* DlgLoadOSM.py */,
11650-
72DB69181021D98600ED5F3A /* DlgLoadOSM_ui.py */,
11651-
72DB69191021D98600ED5F3A /* DlgSaveOSM.py */,
11652-
72DB691A1021D98600ED5F3A /* DlgSaveOSM_ui.py */,
11653-
72DB691B1021D98600ED5F3A /* DlgUploadOSM.py */,
11654-
72DB691C1021D98600ED5F3A /* DlgUploadOSM_ui.py */,
11655-
72DB691D1021D98600ED5F3A /* DockUndoRedo.py */,
11656-
72DB691E1021D98600ED5F3A /* DockUndoRedo_ui.py */,
11657-
72DB691F1021D98600ED5F3A /* DockWidget.py */,
11658-
72DB69201021D98600ED5F3A /* DockWidget_ui.py */,
11622+
72DB69101021D98600ED5F3A /* OsmDatabaseManager.py */,
11623+
72DB69111021D98600ED5F3A /* OsmAddRelationDlg.py */,
11624+
72DB69131021D98600ED5F3A /* OsmDownloadDlg.py */,
11625+
72DB69151021D98600ED5F3A /* OsmImportDlg.py */,
11626+
72DB69171021D98600ED5F3A /* OsmLoadDlg.py */,
11627+
72DB69191021D98600ED5F3A /* OsmSaveDlg.py */,
11628+
72DB691B1021D98600ED5F3A /* OsmUploadDlg.py */,
11629+
72DB691D1021D98600ED5F3A /* OsmUndoRedoDW.py */,
11630+
72DB691F1021D98600ED5F3A /* OsmFeatureDW.py */,
1165911631
72DB69211021D98600ED5F3A /* images */,
11660-
72DB69341021D98600ED5F3A /* Makefile */,
1166111632
72DB69351021D98600ED5F3A /* map_tools */,
11662-
72DB693C1021D98600ED5F3A /* osm_plugin.py */,
11633+
72DB693C1021D98600ED5F3A /* OsmPlugin.py */,
1166311634
72DB693D1021D98600ED5F3A /* resources.py */,
1166411635
72DB693E1021D98600ED5F3A /* resources.qrc */,
1166511636
72DB693F1021D98600ED5F3A /* styles */,
@@ -11689,6 +11660,10 @@
1168911660
72DB69301021D98600ED5F3A /* osm_star.png */,
1169011661
72DB69311021D98600ED5F3A /* osm_undo.png */,
1169111662
72DB69321021D98600ED5F3A /* osm_upload.png */,
11663+
72832D0C1036242E002E3B72 /* osm_editRelation.png */,
11664+
72832D0D1036242E002E3B72 /* osm_addRelation.png */,
11665+
72832D0E1036242E002E3B72 /* osm_urDetails.png */,
11666+
72832D0F1036242E002E3B72 /* osm_removeRelation.png */,
1169211667
72DB69331021D98600ED5F3A /* osmIconsMaster.svg */,
1169311668
);
1169411669
name = images;
@@ -11699,11 +11674,11 @@
1169911674
isa = PBXGroup;
1170011675
children = (
1170111676
72DB69361021D98600ED5F3A /* __init__.py */,
11702-
72DB69371021D98600ED5F3A /* CreateLineMapTool.py */,
11703-
72DB69381021D98600ED5F3A /* CreatePointMapTool.py */,
11704-
72DB69391021D98600ED5F3A /* CreatePolygonMapTool.py */,
11705-
72DB693A1021D98600ED5F3A /* IdentifyMapTool.py */,
11706-
72DB693B1021D98600ED5F3A /* MoveMapTool.py */,
11677+
72DB69371021D98600ED5F3A /* OsmCreateLineMT.py */,
11678+
72DB69381021D98600ED5F3A /* OsmCreatePointMT.py */,
11679+
72DB69391021D98600ED5F3A /* OsmCreatePolygonMT.py */,
11680+
72DB693A1021D98600ED5F3A /* OsmIdentifyMT.py */,
11681+
72DB693B1021D98600ED5F3A /* OsmMoveMT.py */,
1170711682
);
1170811683
name = map_tools;
1170911684
path = ../../python/plugins/osm/map_tools;
@@ -11723,14 +11698,14 @@
1172311698
72DB69431021D98600ED5F3A /* ui_files */ = {
1172411699
isa = PBXGroup;
1172511700
children = (
11726-
72DB69441021D98600ED5F3A /* DlgAddRelation.ui */,
11727-
72DB69451021D98600ED5F3A /* DlgDownloadOSM.ui */,
11728-
72DB69461021D98600ED5F3A /* DlgImport.ui */,
11729-
72DB69471021D98600ED5F3A /* DlgLoadOSM.ui */,
11730-
72DB69481021D98600ED5F3A /* DlgSaveOSM.ui */,
11731-
72DB69491021D98600ED5F3A /* DlgUploadOSM.ui */,
11732-
72DB694A1021D98600ED5F3A /* DockUndoRedo.ui */,
11733-
72DB694B1021D98600ED5F3A /* DockWidget.ui */,
11701+
72DB69441021D98600ED5F3A /* OsmAddRelationDlg.ui */,
11702+
72DB69451021D98600ED5F3A /* OsmDownloadDlg.ui */,
11703+
72DB69461021D98600ED5F3A /* OsmImportDlg.ui */,
11704+
72DB69471021D98600ED5F3A /* OsmLoadDlg.ui */,
11705+
72DB69481021D98600ED5F3A /* OsmSaveDlg.ui */,
11706+
72DB69491021D98600ED5F3A /* OsmUploadDlg.ui */,
11707+
72DB694A1021D98600ED5F3A /* OsmUndoRedoDW.ui */,
11708+
72DB694B1021D98600ED5F3A /* OsmFeatureDW.ui */,
1173411709
);
1173511710
name = ui_files;
1173611711
path = ../../python/plugins/osm/ui_files;
@@ -13149,6 +13124,21 @@
1314913124
shellScript = "# optional moc sources, can't use dummy file with #if'd #include\n\nrm -f src/x_qgsspatialitesourceselect.h\nif [ \"$SQLITE_SYSTEM\" = \"1\" ] ; then\n\ttouch src/x_qgsspatialitesourceselect.h\nelse\n\tln -s ../../../src/app/qgsspatialitesourceselect.h src/x_qgsspatialitesourceselect.h\nfi\n";
1315013125
showEnvVarsInLog = 0;
1315113126
};
13127+
72832D1210362D61002E3B72 /* Script - osm ui */ = {
13128+
isa = PBXShellScriptBuildPhase;
13129+
buildActionMask = 2147483647;
13130+
files = (
13131+
);
13132+
inputPaths = (
13133+
);
13134+
name = "Script - osm ui";
13135+
outputPaths = (
13136+
);
13137+
runOnlyForDeploymentPostprocessing = 0;
13138+
shellPath = /bin/sh;
13139+
shellScript = "# generate ui py files\n\nosm_targetdir=\"$QGIS_BUILD_PATH/MacOS/$QGIS_DATA_SUBDIR/python/plugins/osm\"\nmkdir -p \"$osm_targetdir\"\n\ncd ../../python/plugins/osm/ui_files\nUIUI=`ls *.ui`\n\nfor u in $UIUI\ndo\n\tupy=`echo $u | sed 's,\\.ui$,_ui.py,'`\n\t# compare times because output files spec below doesn't seem to work with wildcards\n\tif [ ! -f \"$osm_targetdir/$upy\" ] || [ $u -nt \"$osm_targetdir/$upy\" ] ; then\n\t\trm -f \"$osm_targetdir/$upy\"\n\t\techo \"$PYUIC4 -o \\\"$osm_targetdir/$upy\\\" $u\"\n\t\t$PYUIC4 -o \"$osm_targetdir/$upy\" $u\n\tfi\ndone\n\nexit 0\n";
13140+
showEnvVarsInLog = 0;
13141+
};
1315213142
729287A60F71D4FE006D9489 /* Script - ui */ = {
1315313143
isa = PBXShellScriptBuildPhase;
1315413144
buildActionMask = 2147483647;

‎mac/xcode/qgis_settings.xcconfig

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,9 @@ QTMOC = $(QTBIN)/moc
3535
QTUIC = $(QTBIN)/uic
3636
QTRCC = $(QTBIN)/rcc
3737
QTLREL = $(QTBIN)/lrelease
38+
PYUIC4 = $(PYTHON_USRBIN)/pyuic4
39+
PYRCC4 = $(PYTHON_USRBIN)/pyrcc4
40+
3841
BISON = /usr/bin/bison
3942
GPSBABEL = /usr/local/bin/gpsbabel
4043

@@ -295,6 +298,12 @@ SPATIALITE_LIBADD = $(SPATIALITE_GEOS_$(SPATIALITE_GEOS)_$(SQLITE_FORM)) $(SPATI
295298
PYTHON_PREFIX_fw = /Library/Frameworks/Python.framework
296299
PYTHON_PREFIX_system = /System/Library/Frameworks/Python.framework
297300
PYTHON_PREFIX = $(PYTHON_PREFIX_$(PYTHON_FORM))/Versions/$(PYTHON_VERSION)
301+
PYTHON_BIN_fw = $(PYTHON_PREFIX_fw)/Versions/$(PYTHON_VERSION)/bin
302+
PYTHON_BIN_system = /usr/bin
303+
PYTHON_BIN = $(PYTHON_BIN_$(PYTHON_FORM))
304+
PYTHON_USRBIN_fw = $(PYTHON_BIN_fw)
305+
PYTHON_USRBIN_system = /usr/local/bin
306+
PYTHON_USRBIN = $(PYTHON_USRBIN_$(PYTHON_FORM))
298307
PYTHON_INC = $(PYTHON_PREFIX)/Headers
299308
PYTHON_LIB = -framework Python // must always be framework, full path will work
300309
PYTHON_HAVE_fw_tig = HAVE_PYTHON=1

‎mac/xcode/qgis_user-template.xcconfig

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -149,6 +149,8 @@
149149
//SPATIALITE_LIBADD = $(GEOS_LIB) $(PROJ_LIB)
150150

151151
//PYTHON_PREFIX = $(PYTHON_PREFIX_$(PYTHON_FORM))/Versions/$(PYTHON_VERSION)
152+
//PYTHON_BIN = $(PYTHON_BIN_$(PYTHON_FORM))
153+
//PYTHON_USRBIN = $(PYTHON_USRBIN_$(PYTHON_FORM))
152154
//PYTHON_INC = $(PYTHON_PREFIX)/Headers
153155
//PYTHON_LIB = -framework Python // must always be framework, full path will work
154156
//PYSITE = $(PYSITE_$(PYTHON_FORM))

0 commit comments

Comments
 (0)
Please sign in to comment.