Skip to content

Commit 188abb3

Browse files
author
kyngchaos
committed
polish context help (r11470);
map composer icons (r11472); version change (r11484) git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@11486 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent bbfd155 commit 188abb3

File tree

2 files changed

+43
-3
lines changed

2 files changed

+43
-3
lines changed

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

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1093,6 +1093,16 @@
10931093
72745A130F770319007F4218 /* spit.png in Copy - theme-gis-plugins */ = {isa = PBXBuildFile; fileRef = 72745A030F770252007F4218 /* spit.png */; };
10941094
72745A140F770319007F4218 /* wfs.png in Copy - theme-gis-plugins */ = {isa = PBXBuildFile; fileRef = 72745A040F770252007F4218 /* wfs.png */; };
10951095
72745A190F770356007F4218 /* coordinate_capture.png in Copy - theme-gis-plug-cc */ = {isa = PBXBuildFile; fileRef = 727459F80F770252007F4218 /* coordinate_capture.png */; };
1096+
72779E95104060DC00CA9DE5 /* 361087368_pl_PL in Copy - context_help */ = {isa = PBXBuildFile; fileRef = 72779E8D104060CF00CA9DE5 /* 361087368_pl_PL */; };
1097+
72779E96104060DC00CA9DE5 /* 687883780_pl_PL in Copy - context_help */ = {isa = PBXBuildFile; fileRef = 72779E92104060CF00CA9DE5 /* 687883780_pl_PL */; };
1098+
72779E97104060DC00CA9DE5 /* 689216579_pl_PL in Copy - context_help */ = {isa = PBXBuildFile; fileRef = 72779E93104060CF00CA9DE5 /* 689216579_pl_PL */; };
1099+
72779E98104060DC00CA9DE5 /* 831088384_pl_PL in Copy - context_help */ = {isa = PBXBuildFile; fileRef = 72779E8E104060CF00CA9DE5 /* 831088384_pl_PL */; };
1100+
72779E99104060DC00CA9DE5 /* 863656587_pl_PL in Copy - context_help */ = {isa = PBXBuildFile; fileRef = 72779E91104060CF00CA9DE5 /* 863656587_pl_PL */; };
1101+
72779E9A104060DC00CA9DE5 /* 929865718_pl_PL in Copy - context_help */ = {isa = PBXBuildFile; fileRef = 72779E90104060CF00CA9DE5 /* 929865718_pl_PL */; };
1102+
72779E9B104060DC00CA9DE5 /* 939347163_pl_PL in Copy - context_help */ = {isa = PBXBuildFile; fileRef = 72779E8F104060CF00CA9DE5 /* 939347163_pl_PL */; };
1103+
72779E9C104060DC00CA9DE5 /* 985715179_pl_PL in Copy - context_help */ = {isa = PBXBuildFile; fileRef = 72779E94104060CF00CA9DE5 /* 985715179_pl_PL */; };
1104+
72779E9F1040615000CA9DE5 /* mActionAddImage.png in Copy - theme-default */ = {isa = PBXBuildFile; fileRef = 72779E9E1040614100CA9DE5 /* mActionAddImage.png */; };
1105+
72779EA01040615000CA9DE5 /* mActionAddMap.png in Copy - theme-default */ = {isa = PBXBuildFile; fileRef = 72779E9D1040614100CA9DE5 /* mActionAddMap.png */; };
10961106
727CEC220FBAFFA200F5B88C /* mIconLock.png in Copy - theme-default */ = {isa = PBXBuildFile; fileRef = 727CEC210FBAFF6000F5B88C /* mIconLock.png */; };
10971107
727E6AF10FEA90E200DF6F64 /* x_sqlite3.c in Sources */ = {isa = PBXBuildFile; fileRef = 727E6AF00FEA90E200DF6F64 /* x_sqlite3.c */; };
10981108
727E6B040FEA9BC000DF6F64 /* x_spatialite.c in Sources */ = {isa = PBXBuildFile; fileRef = 727E6B030FEA9BC000DF6F64 /* x_spatialite.c */; };
@@ -3118,6 +3128,8 @@
31183128
72683FFB0FD6B21A00D90FFC /* mActionFromSelectedFeature.png in Copy - theme-default */,
31193129
72683FFC0FD6B21A00D90FFC /* mActionMergeFeatures.png in Copy - theme-default */,
31203130
72683FFD0FD6B21A00D90FFC /* mActionRemoveSelectedFeature.png in Copy - theme-default */,
3131+
72779E9F1040615000CA9DE5 /* mActionAddImage.png in Copy - theme-default */,
3132+
72779EA01040615000CA9DE5 /* mActionAddMap.png in Copy - theme-default */,
31213133
);
31223134
name = "Copy - theme-default";
31233135
runOnlyForDeploymentPostprocessing = 0;
@@ -3358,6 +3370,14 @@
33583370
7256F57A0F41C64F0022BE1F /* 995980174_de_DE in Copy - context_help */,
33593371
7256F57B0F41C64F0022BE1F /* 995980174_en_US in Copy - context_help */,
33603372
7256F57C0F41C64F0022BE1F /* 995980174_sk_SK in Copy - context_help */,
3373+
72779E95104060DC00CA9DE5 /* 361087368_pl_PL in Copy - context_help */,
3374+
72779E96104060DC00CA9DE5 /* 687883780_pl_PL in Copy - context_help */,
3375+
72779E97104060DC00CA9DE5 /* 689216579_pl_PL in Copy - context_help */,
3376+
72779E98104060DC00CA9DE5 /* 831088384_pl_PL in Copy - context_help */,
3377+
72779E99104060DC00CA9DE5 /* 863656587_pl_PL in Copy - context_help */,
3378+
72779E9A104060DC00CA9DE5 /* 929865718_pl_PL in Copy - context_help */,
3379+
72779E9B104060DC00CA9DE5 /* 939347163_pl_PL in Copy - context_help */,
3380+
72779E9C104060DC00CA9DE5 /* 985715179_pl_PL in Copy - context_help */,
33613381
);
33623382
name = "Copy - context_help";
33633383
runOnlyForDeploymentPostprocessing = 0;
@@ -5861,6 +5881,16 @@
58615881
72745A020F770252007F4218 /* scale_bar.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = scale_bar.png; path = ../../images/themes/gis/plugins/scale_bar.png; sourceTree = SOURCE_ROOT; };
58625882
72745A030F770252007F4218 /* spit.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = spit.png; path = ../../images/themes/gis/plugins/spit.png; sourceTree = SOURCE_ROOT; };
58635883
72745A040F770252007F4218 /* wfs.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = wfs.png; path = ../../images/themes/gis/plugins/wfs.png; sourceTree = SOURCE_ROOT; };
5884+
72779E8D104060CF00CA9DE5 /* 361087368_pl_PL */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = 361087368_pl_PL; path = ../../resources/context_help/361087368_pl_PL; sourceTree = SOURCE_ROOT; };
5885+
72779E8E104060CF00CA9DE5 /* 831088384_pl_PL */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = 831088384_pl_PL; path = ../../resources/context_help/831088384_pl_PL; sourceTree = SOURCE_ROOT; };
5886+
72779E8F104060CF00CA9DE5 /* 939347163_pl_PL */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = 939347163_pl_PL; path = ../../resources/context_help/939347163_pl_PL; sourceTree = SOURCE_ROOT; };
5887+
72779E90104060CF00CA9DE5 /* 929865718_pl_PL */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = 929865718_pl_PL; path = ../../resources/context_help/929865718_pl_PL; sourceTree = SOURCE_ROOT; };
5888+
72779E91104060CF00CA9DE5 /* 863656587_pl_PL */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = 863656587_pl_PL; path = ../../resources/context_help/863656587_pl_PL; sourceTree = SOURCE_ROOT; };
5889+
72779E92104060CF00CA9DE5 /* 687883780_pl_PL */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = 687883780_pl_PL; path = ../../resources/context_help/687883780_pl_PL; sourceTree = SOURCE_ROOT; };
5890+
72779E93104060CF00CA9DE5 /* 689216579_pl_PL */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = 689216579_pl_PL; path = ../../resources/context_help/689216579_pl_PL; sourceTree = SOURCE_ROOT; };
5891+
72779E94104060CF00CA9DE5 /* 985715179_pl_PL */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = 985715179_pl_PL; path = ../../resources/context_help/985715179_pl_PL; sourceTree = SOURCE_ROOT; };
5892+
72779E9D1040614100CA9DE5 /* mActionAddMap.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = mActionAddMap.png; path = ../../images/themes/default/mActionAddMap.png; sourceTree = SOURCE_ROOT; };
5893+
72779E9E1040614100CA9DE5 /* mActionAddImage.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = mActionAddImage.png; path = ../../images/themes/default/mActionAddImage.png; sourceTree = SOURCE_ROOT; };
58645894
727CEC210FBAFF6000F5B88C /* mIconLock.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = mIconLock.png; path = ../../images/themes/default/mIconLock.png; sourceTree = SOURCE_ROOT; };
58655895
727E6AF00FEA90E200DF6F64 /* x_sqlite3.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = x_sqlite3.c; sourceTree = "<group>"; };
58665896
727E6B030FEA9BC000DF6F64 /* x_spatialite.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = x_spatialite.c; sourceTree = "<group>"; };
@@ -9455,6 +9485,14 @@
94559485
7209ED7F0F39E5D9003DC336 /* 995980174_sk_SK */,
94569486
726979C30F71392200AFA402 /* 63428984_en_US */,
94579487
726979C40F71392200AFA402 /* 348772824_en_US */,
9488+
72779E8D104060CF00CA9DE5 /* 361087368_pl_PL */,
9489+
72779E8E104060CF00CA9DE5 /* 831088384_pl_PL */,
9490+
72779E8F104060CF00CA9DE5 /* 939347163_pl_PL */,
9491+
72779E90104060CF00CA9DE5 /* 929865718_pl_PL */,
9492+
72779E91104060CF00CA9DE5 /* 863656587_pl_PL */,
9493+
72779E92104060CF00CA9DE5 /* 687883780_pl_PL */,
9494+
72779E93104060CF00CA9DE5 /* 689216579_pl_PL */,
9495+
72779E94104060CF00CA9DE5 /* 985715179_pl_PL */,
94589496
7209ED800F39E5D9003DC336 /* CMakeLists.txt */,
94599497
7209ED810F39E5D9003DC336 /* contextids.txt */,
94609498
);
@@ -10143,6 +10181,8 @@
1014310181
7209EF620F39E5D9003DC336 /* zoomMaster.svg */,
1014410182
7262ED890F7A75FB00498385 /* mActionAddSpatiaLiteLayer.png */,
1014510183
727CEC210FBAFF6000F5B88C /* mIconLock.png */,
10184+
72779E9D1040614100CA9DE5 /* mActionAddMap.png */,
10185+
72779E9E1040614100CA9DE5 /* mActionAddImage.png */,
1014610186
72EB12940F7E9B51002C38FA /* plugins */,
1014710187
);
1014810188
name = default;

‎mac/xcode/qgis_settings.xcconfig‎

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

1616
// major-minor-patch must be integers for Mac OS X
17-
QGIS_RELEASE_NAME = Daphnis
17+
QGIS_RELEASE_NAME = Unstable
1818
QGIS_VERSION_MAJOR = 1
19-
QGIS_VERSION_MINOR = 2
19+
QGIS_VERSION_MINOR = 3
2020
QGIS_VERSION_PATCH = 0
2121
QGIS_VERSION_FULL = $(QGIS_VERSION_MAJOR).$(QGIS_VERSION_MINOR).$(QGIS_VERSION_PATCH)-$(QGIS_RELEASE_NAME)
22-
QGIS_VERSION_INT = 10200
22+
QGIS_VERSION_INT = 10300
2323

2424
//////////////////////////////////////////////////////////////////////
2525
// Qt and other support

0 commit comments

Comments
 (0)