Skip to content

Commit 6ada84b

Browse files
author
kyngchaos
committedMay 2, 2009
version update (r10698), vector edit update (r10700)
git-svn-id: http://svn.osgeo.org/qgis/trunk@10704 c8812cc2-4d05-0410-92ff-de0c093fc19c
·
ltr-3_40Before-merge-new_vector_api
1 parent 0eaa6ba commit 6ada84b

File tree

2 files changed

+39
-5
lines changed

2 files changed

+39
-5
lines changed
 

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

Lines changed: 35 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1073,6 +1073,13 @@
10731073
72745A130F770319007F4218 /* spit.png in Copy - theme-gis-plugins */ = {isa = PBXBuildFile; fileRef = 72745A030F770252007F4218 /* spit.png */; };
10741074
72745A140F770319007F4218 /* wfs.png in Copy - theme-gis-plugins */ = {isa = PBXBuildFile; fileRef = 72745A040F770252007F4218 /* wfs.png */; };
10751075
72745A190F770356007F4218 /* coordinate_capture.png in Copy - theme-gis-plug-cc */ = {isa = PBXBuildFile; fileRef = 727459F80F770252007F4218 /* coordinate_capture.png */; };
1076+
72820FE10FACCE770011C963 /* qgsmaptooldeletehole.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 72820FDE0FACCE520011C963 /* qgsmaptooldeletehole.cpp */; };
1077+
72820FE20FACCE770011C963 /* qgsmaptooldeletepart.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 72820FDD0FACCE520011C963 /* qgsmaptooldeletepart.cpp */; };
1078+
72820FE30FACCE770011C963 /* qgsmaptoolsimplify.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 72820FE00FACCE520011C963 /* qgsmaptoolsimplify.cpp */; };
1079+
72820FE70FACCEC80011C963 /* qgsmaptoolsimplify.h in Sources */ = {isa = PBXBuildFile; fileRef = 72820FDF0FACCE520011C963 /* qgsmaptoolsimplify.h */; };
1080+
72820FEF0FACCFA90011C963 /* mActionDeleteHole.png in Copy - theme-default */ = {isa = PBXBuildFile; fileRef = 72820FEE0FACCF970011C963 /* mActionDeleteHole.png */; };
1081+
72820FF00FACCFA90011C963 /* mActionDeletePart.png in Copy - theme-default */ = {isa = PBXBuildFile; fileRef = 72820FED0FACCF970011C963 /* mActionDeletePart.png */; };
1082+
72820FF10FACCFA90011C963 /* mActionSimplify.png in Copy - theme-default */ = {isa = PBXBuildFile; fileRef = 72820FEC0FACCF970011C963 /* mActionSimplify.png */; };
10761083
7292873D0F71C0DF006D9489 /* qgssearchstringparser.yy in Sources */ = {isa = PBXBuildFile; fileRef = 7209E6CE0F39E57A003DC336 /* qgssearchstringparser.yy */; };
10771084
7292873E0F71C103006D9489 /* qgssearchstringlexer.ll in Sources */ = {isa = PBXBuildFile; fileRef = 7209E6CD0F39E57A003DC336 /* qgssearchstringlexer.ll */; };
10781085
729287430F71C2CB006D9489 /* qgsapplication.h in Sources */ = {isa = PBXBuildFile; fileRef = 7209E6840F39E57A003DC336 /* qgsapplication.h */; };
@@ -4099,6 +4106,9 @@
40994106
7256F4930F41C4DD0022BE1F /* transformed.png in Copy - theme-default */,
41004107
7256F4940F41C4DD0022BE1F /* user.png in Copy - theme-default */,
41014108
7262ED8A0F7A760B00498385 /* mActionAddSpatiaLiteLayer.png in Copy - theme-default */,
4109+
72820FEF0FACCFA90011C963 /* mActionDeleteHole.png in Copy - theme-default */,
4110+
72820FF00FACCFA90011C963 /* mActionDeletePart.png in Copy - theme-default */,
4111+
72820FF10FACCFA90011C963 /* mActionSimplify.png in Copy - theme-default */,
41024112
);
41034113
name = "Copy - theme-default";
41044114
runOnlyForDeploymentPostprocessing = 0;
@@ -8352,6 +8362,16 @@
83528362
72745A020F770252007F4218 /* scale_bar.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = scale_bar.png; path = ../../images/themes/gis/plugins/scale_bar.png; sourceTree = SOURCE_ROOT; };
83538363
72745A030F770252007F4218 /* spit.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = spit.png; path = ../../images/themes/gis/plugins/spit.png; sourceTree = SOURCE_ROOT; };
83548364
72745A040F770252007F4218 /* wfs.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = wfs.png; path = ../../images/themes/gis/plugins/wfs.png; sourceTree = SOURCE_ROOT; };
8365+
72820FDB0FACCE520011C963 /* qgsmaptooldeletehole.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = qgsmaptooldeletehole.h; path = ../../src/app/qgsmaptooldeletehole.h; sourceTree = SOURCE_ROOT; };
8366+
72820FDC0FACCE520011C963 /* qgsmaptooldeletepart.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = qgsmaptooldeletepart.h; path = ../../src/app/qgsmaptooldeletepart.h; sourceTree = SOURCE_ROOT; };
8367+
72820FDD0FACCE520011C963 /* qgsmaptooldeletepart.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = qgsmaptooldeletepart.cpp; path = ../../src/app/qgsmaptooldeletepart.cpp; sourceTree = SOURCE_ROOT; };
8368+
72820FDE0FACCE520011C963 /* qgsmaptooldeletehole.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = qgsmaptooldeletehole.cpp; path = ../../src/app/qgsmaptooldeletehole.cpp; sourceTree = SOURCE_ROOT; };
8369+
72820FDF0FACCE520011C963 /* qgsmaptoolsimplify.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = qgsmaptoolsimplify.h; path = ../../src/app/qgsmaptoolsimplify.h; sourceTree = SOURCE_ROOT; };
8370+
72820FE00FACCE520011C963 /* qgsmaptoolsimplify.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = qgsmaptoolsimplify.cpp; path = ../../src/app/qgsmaptoolsimplify.cpp; sourceTree = SOURCE_ROOT; };
8371+
72820FEB0FACCF370011C963 /* qgssimplifytolerancedialog.ui */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; name = qgssimplifytolerancedialog.ui; path = ../../src/ui/qgssimplifytolerancedialog.ui; sourceTree = SOURCE_ROOT; };
8372+
72820FEC0FACCF970011C963 /* mActionSimplify.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = mActionSimplify.png; path = ../../images/themes/default/mActionSimplify.png; sourceTree = SOURCE_ROOT; };
8373+
72820FED0FACCF970011C963 /* mActionDeletePart.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = mActionDeletePart.png; path = ../../images/themes/default/mActionDeletePart.png; sourceTree = SOURCE_ROOT; };
8374+
72820FEE0FACCF970011C963 /* mActionDeleteHole.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = mActionDeleteHole.png; path = ../../images/themes/default/mActionDeleteHole.png; sourceTree = SOURCE_ROOT; };
83558375
7299E8B70F90EFB9002F58DE /* TRANSLATORS */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = TRANSLATORS; path = ../../TRANSLATORS; sourceTree = SOURCE_ROOT; };
83568376
729BBEFF0F40770B001BCB63 /* qgis_help.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = qgis_help.app; sourceTree = BUILT_PRODUCTS_DIR; };
83578377
729BBF010F40770B001BCB63 /* qgis_help-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "qgis_help-Info.plist"; sourceTree = "<group>"; };
@@ -9247,6 +9267,12 @@
92479267
7262ED800F7A74B700498385 /* qgsspatialitesourceselect.cpp */,
92489268
7262ED810F7A74B700498385 /* qgsspatialitesourceselect.h */,
92499269
7262ED820F7A74B700498385 /* qgsspatialitetablemodel.cpp */,
9270+
72820FDB0FACCE520011C963 /* qgsmaptooldeletehole.h */,
9271+
72820FDC0FACCE520011C963 /* qgsmaptooldeletepart.h */,
9272+
72820FDD0FACCE520011C963 /* qgsmaptooldeletepart.cpp */,
9273+
72820FDE0FACCE520011C963 /* qgsmaptooldeletehole.cpp */,
9274+
72820FDF0FACCE520011C963 /* qgsmaptoolsimplify.h */,
9275+
72820FE00FACCE520011C963 /* qgsmaptoolsimplify.cpp */,
92509276
72A239420F74A62200AFC35B /* attributetable */,
92519277
7209E5BD0F39E57A003DC336 /* composer */,
92529278
7209E5D00F39E57A003DC336 /* legend */,
@@ -11371,6 +11397,7 @@
1137111397
726979C10F7138DB00AFA402 /* qgsnewogrconnectionbase.ui */,
1137211398
726979C20F7138DB00AFA402 /* qgsopenvectorlayerdialogbase.ui */,
1137311399
7262ED8B0F7A763C00498385 /* qgsspatialitesourceselectbase.ui */,
11400+
72820FEB0FACCF370011C963 /* qgssimplifytolerancedialog.ui */,
1137411401
);
1137511402
name = ui;
1137611403
path = ../../src/ui;
@@ -12084,9 +12111,9 @@
1208412111
7209EE820F39E5D9003DC336 /* themes */ = {
1208512112
isa = PBXGroup;
1208612113
children = (
12114+
7209EEE30F39E5D9003DC336 /* default */,
1208712115
7209EE840F39E5D9003DC336 /* classic */,
1208812116
7209EEE20F39E5D9003DC336 /* CMakeLists.txt */,
12089-
7209EEE30F39E5D9003DC336 /* default */,
1209012117
7209EF630F39E5D9003DC336 /* gis */,
1209112118
7209EF970F39E5D9003DC336 /* nkids */,
1209212119
);
@@ -12324,6 +12351,9 @@
1232412351
7209EF590F39E5D9003DC336 /* mIconUnknownLayerType.png */,
1232512352
7209EF5A0F39E5D9003DC336 /* mIconWaitingForLayerType.png */,
1232612353
7209EF5B0F39E5D9003DC336 /* mMapserverExport.png */,
12354+
72820FEC0FACCF970011C963 /* mActionSimplify.png */,
12355+
72820FED0FACCF970011C963 /* mActionDeletePart.png */,
12356+
72820FEE0FACCF970011C963 /* mActionDeleteHole.png */,
1232712357
7209EF5C0F39E5D9003DC336 /* qgis.xpm */,
1232812358
7209EF5D0F39E5D9003DC336 /* tracking.png */,
1232912359
7209EF5E0F39E5D9003DC336 /* tracking.svg */,
@@ -15176,6 +15206,10 @@
1517615206
7262EDCD0F7A9FFC00498385 /* qgsspatialitetablemodel.h in Sources */,
1517715207
7262ED870F7A754100498385 /* qgsspatialitesourceselect.cpp in Sources */,
1517815208
7262ED880F7A754100498385 /* qgsspatialitesourceselect.h in Sources */,
15209+
72820FE10FACCE770011C963 /* qgsmaptooldeletehole.cpp in Sources */,
15210+
72820FE20FACCE770011C963 /* qgsmaptooldeletepart.cpp in Sources */,
15211+
72820FE30FACCE770011C963 /* qgsmaptoolsimplify.cpp in Sources */,
15212+
72820FE70FACCEC80011C963 /* qgsmaptoolsimplify.h in Sources */,
1517915213
);
1518015214
runOnlyForDeploymentPostprocessing = 0;
1518115215
};

‎mac/xcode/qgis_settings.xcconfig

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@ ARCHS = $(NATIVE_ARCH)
1414
//////////////////////////////////////////////////////////////////////
1515

1616
// major-minor-patch must be integers for Mac OS X
17-
QGIS_RELEASE_NAME = Pan (Unstable)
17+
QGIS_RELEASE_NAME = Unstable Trunk
1818
QGIS_VERSION_MAJOR = 1
19-
QGIS_VERSION_MINOR = 1
19+
QGIS_VERSION_MINOR = 2
2020
QGIS_VERSION_PATCH = 0
21-
QGIS_VERSION_BUILD = 20090407
21+
QGIS_VERSION_BUILD = 20090502
2222
QGIS_VERSION_FULL = $(QGIS_VERSION_MAJOR).$(QGIS_VERSION_MINOR).$(QGIS_VERSION_PATCH)-$(QGIS_VERSION_BUILD)
23-
QGIS_VERSION_INT = 10100
23+
QGIS_VERSION_INT = 10200
2424

2525
//////////////////////////////////////////////////////////////////////
2626
// Qt and other support

0 commit comments

Comments
 (0)
Please sign in to comment.