[QGIS Commit] r10704 - in trunk/qgis/mac/xcode: . Qgis.xcodeproj

svn_qgis at osgeo.org svn_qgis at osgeo.org
Sat May 2 15:08:22 EDT 2009


Author: kyngchaos
Date: 2009-05-02 15:08:21 -0400 (Sat, 02 May 2009)
New Revision: 10704

Modified:
   trunk/qgis/mac/xcode/Qgis.xcodeproj/project.pbxproj
   trunk/qgis/mac/xcode/qgis_settings.xcconfig
Log:
version update (r10698), vector edit update (r10700)

Modified: trunk/qgis/mac/xcode/Qgis.xcodeproj/project.pbxproj
===================================================================
--- trunk/qgis/mac/xcode/Qgis.xcodeproj/project.pbxproj	2009-05-02 16:29:56 UTC (rev 10703)
+++ trunk/qgis/mac/xcode/Qgis.xcodeproj/project.pbxproj	2009-05-02 19:08:21 UTC (rev 10704)
@@ -1073,6 +1073,13 @@
 		72745A130F770319007F4218 /* spit.png in Copy - theme-gis-plugins */ = {isa = PBXBuildFile; fileRef = 72745A030F770252007F4218 /* spit.png */; };
 		72745A140F770319007F4218 /* wfs.png in Copy - theme-gis-plugins */ = {isa = PBXBuildFile; fileRef = 72745A040F770252007F4218 /* wfs.png */; };
 		72745A190F770356007F4218 /* coordinate_capture.png in Copy - theme-gis-plug-cc */ = {isa = PBXBuildFile; fileRef = 727459F80F770252007F4218 /* coordinate_capture.png */; };
+		72820FE10FACCE770011C963 /* qgsmaptooldeletehole.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 72820FDE0FACCE520011C963 /* qgsmaptooldeletehole.cpp */; };
+		72820FE20FACCE770011C963 /* qgsmaptooldeletepart.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 72820FDD0FACCE520011C963 /* qgsmaptooldeletepart.cpp */; };
+		72820FE30FACCE770011C963 /* qgsmaptoolsimplify.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 72820FE00FACCE520011C963 /* qgsmaptoolsimplify.cpp */; };
+		72820FE70FACCEC80011C963 /* qgsmaptoolsimplify.h in Sources */ = {isa = PBXBuildFile; fileRef = 72820FDF0FACCE520011C963 /* qgsmaptoolsimplify.h */; };
+		72820FEF0FACCFA90011C963 /* mActionDeleteHole.png in Copy - theme-default */ = {isa = PBXBuildFile; fileRef = 72820FEE0FACCF970011C963 /* mActionDeleteHole.png */; };
+		72820FF00FACCFA90011C963 /* mActionDeletePart.png in Copy - theme-default */ = {isa = PBXBuildFile; fileRef = 72820FED0FACCF970011C963 /* mActionDeletePart.png */; };
+		72820FF10FACCFA90011C963 /* mActionSimplify.png in Copy - theme-default */ = {isa = PBXBuildFile; fileRef = 72820FEC0FACCF970011C963 /* mActionSimplify.png */; };
 		7292873D0F71C0DF006D9489 /* qgssearchstringparser.yy in Sources */ = {isa = PBXBuildFile; fileRef = 7209E6CE0F39E57A003DC336 /* qgssearchstringparser.yy */; };
 		7292873E0F71C103006D9489 /* qgssearchstringlexer.ll in Sources */ = {isa = PBXBuildFile; fileRef = 7209E6CD0F39E57A003DC336 /* qgssearchstringlexer.ll */; };
 		729287430F71C2CB006D9489 /* qgsapplication.h in Sources */ = {isa = PBXBuildFile; fileRef = 7209E6840F39E57A003DC336 /* qgsapplication.h */; };
@@ -4099,6 +4106,9 @@
 				7256F4930F41C4DD0022BE1F /* transformed.png in Copy - theme-default */,
 				7256F4940F41C4DD0022BE1F /* user.png in Copy - theme-default */,
 				7262ED8A0F7A760B00498385 /* mActionAddSpatiaLiteLayer.png in Copy - theme-default */,
+				72820FEF0FACCFA90011C963 /* mActionDeleteHole.png in Copy - theme-default */,
+				72820FF00FACCFA90011C963 /* mActionDeletePart.png in Copy - theme-default */,
+				72820FF10FACCFA90011C963 /* mActionSimplify.png in Copy - theme-default */,
 			);
 			name = "Copy - theme-default";
 			runOnlyForDeploymentPostprocessing = 0;
@@ -8352,6 +8362,16 @@
 		72745A020F770252007F4218 /* scale_bar.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = scale_bar.png; path = ../../images/themes/gis/plugins/scale_bar.png; sourceTree = SOURCE_ROOT; };
 		72745A030F770252007F4218 /* spit.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = spit.png; path = ../../images/themes/gis/plugins/spit.png; sourceTree = SOURCE_ROOT; };
 		72745A040F770252007F4218 /* wfs.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = wfs.png; path = ../../images/themes/gis/plugins/wfs.png; sourceTree = SOURCE_ROOT; };
+		72820FDB0FACCE520011C963 /* qgsmaptooldeletehole.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = qgsmaptooldeletehole.h; path = ../../src/app/qgsmaptooldeletehole.h; sourceTree = SOURCE_ROOT; };
+		72820FDC0FACCE520011C963 /* qgsmaptooldeletepart.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = qgsmaptooldeletepart.h; path = ../../src/app/qgsmaptooldeletepart.h; sourceTree = SOURCE_ROOT; };
+		72820FDD0FACCE520011C963 /* qgsmaptooldeletepart.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = qgsmaptooldeletepart.cpp; path = ../../src/app/qgsmaptooldeletepart.cpp; sourceTree = SOURCE_ROOT; };
+		72820FDE0FACCE520011C963 /* qgsmaptooldeletehole.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = qgsmaptooldeletehole.cpp; path = ../../src/app/qgsmaptooldeletehole.cpp; sourceTree = SOURCE_ROOT; };
+		72820FDF0FACCE520011C963 /* qgsmaptoolsimplify.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = qgsmaptoolsimplify.h; path = ../../src/app/qgsmaptoolsimplify.h; sourceTree = SOURCE_ROOT; };
+		72820FE00FACCE520011C963 /* qgsmaptoolsimplify.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = qgsmaptoolsimplify.cpp; path = ../../src/app/qgsmaptoolsimplify.cpp; sourceTree = SOURCE_ROOT; };
+		72820FEB0FACCF370011C963 /* qgssimplifytolerancedialog.ui */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; name = qgssimplifytolerancedialog.ui; path = ../../src/ui/qgssimplifytolerancedialog.ui; sourceTree = SOURCE_ROOT; };
+		72820FEC0FACCF970011C963 /* mActionSimplify.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = mActionSimplify.png; path = ../../images/themes/default/mActionSimplify.png; sourceTree = SOURCE_ROOT; };
+		72820FED0FACCF970011C963 /* mActionDeletePart.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = mActionDeletePart.png; path = ../../images/themes/default/mActionDeletePart.png; sourceTree = SOURCE_ROOT; };
+		72820FEE0FACCF970011C963 /* mActionDeleteHole.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = mActionDeleteHole.png; path = ../../images/themes/default/mActionDeleteHole.png; sourceTree = SOURCE_ROOT; };
 		7299E8B70F90EFB9002F58DE /* TRANSLATORS */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = TRANSLATORS; path = ../../TRANSLATORS; sourceTree = SOURCE_ROOT; };
 		729BBEFF0F40770B001BCB63 /* qgis_help.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = qgis_help.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		729BBF010F40770B001BCB63 /* qgis_help-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "qgis_help-Info.plist"; sourceTree = "<group>"; };
@@ -9247,6 +9267,12 @@
 				7262ED800F7A74B700498385 /* qgsspatialitesourceselect.cpp */,
 				7262ED810F7A74B700498385 /* qgsspatialitesourceselect.h */,
 				7262ED820F7A74B700498385 /* qgsspatialitetablemodel.cpp */,
+				72820FDB0FACCE520011C963 /* qgsmaptooldeletehole.h */,
+				72820FDC0FACCE520011C963 /* qgsmaptooldeletepart.h */,
+				72820FDD0FACCE520011C963 /* qgsmaptooldeletepart.cpp */,
+				72820FDE0FACCE520011C963 /* qgsmaptooldeletehole.cpp */,
+				72820FDF0FACCE520011C963 /* qgsmaptoolsimplify.h */,
+				72820FE00FACCE520011C963 /* qgsmaptoolsimplify.cpp */,
 				72A239420F74A62200AFC35B /* attributetable */,
 				7209E5BD0F39E57A003DC336 /* composer */,
 				7209E5D00F39E57A003DC336 /* legend */,
@@ -11371,6 +11397,7 @@
 				726979C10F7138DB00AFA402 /* qgsnewogrconnectionbase.ui */,
 				726979C20F7138DB00AFA402 /* qgsopenvectorlayerdialogbase.ui */,
 				7262ED8B0F7A763C00498385 /* qgsspatialitesourceselectbase.ui */,
+				72820FEB0FACCF370011C963 /* qgssimplifytolerancedialog.ui */,
 			);
 			name = ui;
 			path = ../../src/ui;
@@ -12084,9 +12111,9 @@
 		7209EE820F39E5D9003DC336 /* themes */ = {
 			isa = PBXGroup;
 			children = (
+				7209EEE30F39E5D9003DC336 /* default */,
 				7209EE840F39E5D9003DC336 /* classic */,
 				7209EEE20F39E5D9003DC336 /* CMakeLists.txt */,
-				7209EEE30F39E5D9003DC336 /* default */,
 				7209EF630F39E5D9003DC336 /* gis */,
 				7209EF970F39E5D9003DC336 /* nkids */,
 			);
@@ -12324,6 +12351,9 @@
 				7209EF590F39E5D9003DC336 /* mIconUnknownLayerType.png */,
 				7209EF5A0F39E5D9003DC336 /* mIconWaitingForLayerType.png */,
 				7209EF5B0F39E5D9003DC336 /* mMapserverExport.png */,
+				72820FEC0FACCF970011C963 /* mActionSimplify.png */,
+				72820FED0FACCF970011C963 /* mActionDeletePart.png */,
+				72820FEE0FACCF970011C963 /* mActionDeleteHole.png */,
 				7209EF5C0F39E5D9003DC336 /* qgis.xpm */,
 				7209EF5D0F39E5D9003DC336 /* tracking.png */,
 				7209EF5E0F39E5D9003DC336 /* tracking.svg */,
@@ -15176,6 +15206,10 @@
 				7262EDCD0F7A9FFC00498385 /* qgsspatialitetablemodel.h in Sources */,
 				7262ED870F7A754100498385 /* qgsspatialitesourceselect.cpp in Sources */,
 				7262ED880F7A754100498385 /* qgsspatialitesourceselect.h in Sources */,
+				72820FE10FACCE770011C963 /* qgsmaptooldeletehole.cpp in Sources */,
+				72820FE20FACCE770011C963 /* qgsmaptooldeletepart.cpp in Sources */,
+				72820FE30FACCE770011C963 /* qgsmaptoolsimplify.cpp in Sources */,
+				72820FE70FACCEC80011C963 /* qgsmaptoolsimplify.h in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

Modified: trunk/qgis/mac/xcode/qgis_settings.xcconfig
===================================================================
--- trunk/qgis/mac/xcode/qgis_settings.xcconfig	2009-05-02 16:29:56 UTC (rev 10703)
+++ trunk/qgis/mac/xcode/qgis_settings.xcconfig	2009-05-02 19:08:21 UTC (rev 10704)
@@ -14,13 +14,13 @@
 //////////////////////////////////////////////////////////////////////
 
 // major-minor-patch must be integers for Mac OS X
-QGIS_RELEASE_NAME = Pan (Unstable)
+QGIS_RELEASE_NAME = Unstable Trunk
 QGIS_VERSION_MAJOR = 1
-QGIS_VERSION_MINOR = 1
+QGIS_VERSION_MINOR = 2
 QGIS_VERSION_PATCH = 0
-QGIS_VERSION_BUILD = 20090407
+QGIS_VERSION_BUILD = 20090502
 QGIS_VERSION_FULL = $(QGIS_VERSION_MAJOR).$(QGIS_VERSION_MINOR).$(QGIS_VERSION_PATCH)-$(QGIS_VERSION_BUILD)
-QGIS_VERSION_INT = 10100
+QGIS_VERSION_INT = 10200
 
 //////////////////////////////////////////////////////////////////////
 // Qt and other support



More information about the QGIS-commit mailing list