Skip to content

Commit c5ede41

Browse files
author
kyngchaos
committed
more spatial query cleanup (r13367)
lupdate fixes (r13370) git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@13382 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent 115b482 commit c5ede41

File tree

1 file changed

+26
-17
lines changed

1 file changed

+26
-17
lines changed

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

+26-17
Original file line numberDiff line numberDiff line change
@@ -1623,6 +1623,12 @@
16231623
72F22FB70FDAC209000E8CB0 /* qgsmaptoolnodetool.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 72F22FB50FDAC1F4000E8CB0 /* qgsmaptoolnodetool.cpp */; };
16241624
72F4862210AB755200E7BFEE /* qgscomposermanager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 72F4862010AB753D00E7BFEE /* qgscomposermanager.cpp */; };
16251625
72F4862310AB755200E7BFEE /* qgscomposermanager.h in Sources */ = {isa = PBXBuildFile; fileRef = 72F4862110AB753D00E7BFEE /* qgscomposermanager.h */; };
1626+
72F70B0911848B5B001369AD /* qgsdisplayangle.h in Sources */ = {isa = PBXBuildFile; fileRef = 7216329210EFCE6C00588EAD /* qgsdisplayangle.h */; };
1627+
72F70B0A11848B5B001369AD /* qgsmaptoolreshape.h in Sources */ = {isa = PBXBuildFile; fileRef = 72D84C1E1044BBFD009F8F39 /* qgsmaptoolreshape.h */; };
1628+
72F70B0B11848B5B001369AD /* qgsmaptoolrotatepointsymbols.h in Sources */ = {isa = PBXBuildFile; fileRef = 7286D63D1062769D008D83A6 /* qgsmaptoolrotatepointsymbols.h */; };
1629+
72F70B1011848BA2001369AD /* qgspenstylecombobox.h in Sources */ = {isa = PBXBuildFile; fileRef = 7225EF3910B2275E00D23EA2 /* qgspenstylecombobox.h */; };
1630+
72F70B1211848C3D001369AD /* qgsmemoryprovider.h in Sources */ = {isa = PBXBuildFile; fileRef = 7209EC600F39E57B003DC336 /* qgsmemoryprovider.h */; };
1631+
72F70B2111848EE1001369AD /* qgsgrassprovider.h in Sources */ = {isa = PBXBuildFile; fileRef = 7209EC5C0F39E57B003DC336 /* qgsgrassprovider.h */; };
16261632
72F8D9450F89251100D10CE5 /* qgstolerance.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 72F8D9430F8924F100D10CE5 /* qgstolerance.cpp */; };
16271633
72FA6DD51124D7F6003CD56B /* QgsAttributeTableDialog-pt_BR in Copy - context_help */ = {isa = PBXBuildFile; fileRef = 72FA6DCF1124D7E4003CD56B /* QgsAttributeTableDialog-pt_BR */; };
16281634
72FA6DD61124D7F6003CD56B /* QgsGPSPluginGui-pt_BR in Copy - context_help */ = {isa = PBXBuildFile; fileRef = 72FA6DD01124D7E4003CD56B /* QgsGPSPluginGui-pt_BR */; };
@@ -2364,6 +2370,17 @@
23642370
);
23652371
script = "$QTMOC $QT_CXXFLAGS -o \"$DERIVED_FILES_DIR/moc_$INPUT_FILE_BASE.cpp\" \"$INPUT_FILE_PATH\"";
23662372
};
2373+
72F70B2C11849076001369AD /* PBXBuildRule */ = {
2374+
isa = PBXBuildRule;
2375+
compilerSpec = com.apple.compilers.proxy.script;
2376+
filePatterns = "*.h";
2377+
fileType = pattern.proxy;
2378+
isEditable = 1;
2379+
outputFiles = (
2380+
"$(DERIVED_FILES_DIR)/moc_$(INPUT_FILE_BASE).cpp",
2381+
);
2382+
script = "$QTMOC $QT_CXXFLAGS -o \"$DERIVED_FILES_DIR/moc_$INPUT_FILE_BASE.cpp\" \"$INPUT_FILE_PATH\"";
2383+
};
23672384
72FB0B500FFD680F0052360B /* PBXBuildRule */ = {
23682385
isa = PBXBuildRule;
23692386
compilerSpec = com.apple.compilers.proxy.script;
@@ -5824,8 +5841,6 @@
58245841
7268C045118294E5001BC9C4 /* qgsspatialqueryplugin.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = qgsspatialqueryplugin.h; path = ../../src/plugins/spatialquery/qgsspatialqueryplugin.h; sourceTree = SOURCE_ROOT; };
58255842
7268C046118294E5001BC9C4 /* README */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = README; path = ../../src/plugins/spatialquery/README; sourceTree = SOURCE_ROOT; };
58265843
7268C047118294E5001BC9C4 /* spatialquery.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = spatialquery.png; path = ../../src/plugins/spatialquery/spatialquery.png; sourceTree = SOURCE_ROOT; };
5827-
7268C049118294E5001BC9C4 /* spatialquery_pt_BR.qm */ = {isa = PBXFileReference; lastKnownFileType = file; name = spatialquery_pt_BR.qm; path = ../../src/plugins/spatialquery/ts/spatialquery_pt_BR.qm; sourceTree = SOURCE_ROOT; };
5828-
7268C04A118294E5001BC9C4 /* spatialquery_pt_BR.ts */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; name = spatialquery_pt_BR.ts; path = ../../src/plugins/spatialquery/ts/spatialquery_pt_BR.ts; sourceTree = SOURCE_ROOT; };
58295844
7268C057118294F2001BC9C4 /* libspatialqueryplugin.so */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = libspatialqueryplugin.so; sourceTree = BUILT_PRODUCTS_DIR; };
58305845
7268E7F61102157C00B96374 /* qgscolorbutton.sip */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = qgscolorbutton.sip; path = ../../python/gui/qgscolorbutton.sip; sourceTree = SOURCE_ROOT; };
58315846
7268E7F7110215C900B96374 /* FindLibPython.py */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; name = FindLibPython.py; path = ../../cmake/FindLibPython.py; sourceTree = SOURCE_ROOT; };
@@ -11544,22 +11559,11 @@
1154411559
7268C045118294E5001BC9C4 /* qgsspatialqueryplugin.h */,
1154511560
7268C046118294E5001BC9C4 /* README */,
1154611561
7268C047118294E5001BC9C4 /* spatialquery.png */,
11547-
7268C048118294E5001BC9C4 /* ts */,
1154811562
);
1154911563
name = spatialquery;
1155011564
path = ../../src/plugins/spatialquery;
1155111565
sourceTree = SOURCE_ROOT;
1155211566
};
11553-
7268C048118294E5001BC9C4 /* ts */ = {
11554-
isa = PBXGroup;
11555-
children = (
11556-
7268C049118294E5001BC9C4 /* spatialquery_pt_BR.qm */,
11557-
7268C04A118294E5001BC9C4 /* spatialquery_pt_BR.ts */,
11558-
);
11559-
name = ts;
11560-
path = ../../src/plugins/spatialquery/ts;
11561-
sourceTree = SOURCE_ROOT;
11562-
};
1156311567
726979A10F71369A00AFA402 /* ogr */ = {
1156411568
isa = PBXGroup;
1156511569
children = (
@@ -13963,6 +13967,7 @@
1396313967
72A07E350F3BEE16004FC2A4 /* Frameworks */,
1396413968
);
1396513969
buildRules = (
13970+
72F70B2C11849076001369AD /* PBXBuildRule */,
1396613971
);
1396713972
comments = "had -undefined dynamic_lookup in old project\n";
1396813973
dependencies = (
@@ -15356,6 +15361,7 @@
1535615361
7297AA571160ECC700DC6F2D /* qgsformannotationitem.cpp in Sources */,
1535715362
7297AA581160ECC700DC6F2D /* qgsformannotationitem.h in Sources */,
1535815363
7297AA591160ECC700DC6F2D /* qgstextannotationitem.cpp in Sources */,
15364+
72F70B1011848BA2001369AD /* qgspenstylecombobox.h in Sources */,
1535915365
);
1536015366
runOnlyForDeploymentPostprocessing = 0;
1536115367
};
@@ -15523,6 +15529,7 @@
1552315529
buildActionMask = 2147483647;
1552415530
files = (
1552515531
72A07CC90F3BC2DE004FC2A4 /* qgsmemoryprovider.cpp in Sources */,
15532+
72F70B1211848C3D001369AD /* qgsmemoryprovider.h in Sources */,
1552615533
);
1552715534
runOnlyForDeploymentPostprocessing = 0;
1552815535
};
@@ -15608,6 +15615,7 @@
1560815615
files = (
1560915616
72A07E3C0F3BEECB004FC2A4 /* qgsgrass.cpp in Sources */,
1561015617
72A07E3D0F3BEECD004FC2A4 /* qgsgrassprovider.cpp in Sources */,
15618+
72F70B2111848EE1001369AD /* qgsgrassprovider.h in Sources */,
1561115619
);
1561215620
runOnlyForDeploymentPostprocessing = 0;
1561315621
};
@@ -16197,6 +16205,9 @@
1619716205
72BDC396116E1DF10088DEB4 /* qgsnewspatialitelayerdialog.h in Sources */,
1619816206
72BDC390116E1CDD0088DEB4 /* qgsspatialitesridsdialog.cpp in Sources */,
1619916207
72BDC391116E1CDD0088DEB4 /* qgsspatialitesridsdialog.h in Sources */,
16208+
72F70B0911848B5B001369AD /* qgsdisplayangle.h in Sources */,
16209+
72F70B0A11848B5B001369AD /* qgsmaptoolreshape.h in Sources */,
16210+
72F70B0B11848B5B001369AD /* qgsmaptoolrotatepointsymbols.h in Sources */,
1620016211
);
1620116212
runOnlyForDeploymentPostprocessing = 0;
1620216213
};
@@ -17173,7 +17184,6 @@
1717317184
"$(inherited)",
1717417185
"$(QT_LIB_CORE)",
1717517186
"$(QT_LIB_GUI)",
17176-
"$(GEOS_LIB)",
1717717187
);
1717817188
PRODUCT_NAME = spatialqueryplugin.so;
1717917189
TARGET_PLUGINDIR = spatialquery;
@@ -17210,7 +17220,6 @@
1721017220
"$(inherited)",
1721117221
"$(QT_LIB_CORE)",
1721217222
"$(QT_LIB_GUI)",
17213-
"$(GEOS_LIB)",
1721417223
);
1721517224
PRODUCT_NAME = spatialqueryplugin.so;
1721617225
TARGET_PLUGINDIR = spatialquery;
@@ -19969,7 +19978,7 @@
1996919978
COPY_PHASE_STRIP = NO;
1997019979
GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
1997119980
GCC_OPTIMIZATION_LEVEL = 0;
19972-
QGIS_VERSION_BUILD = 13363;
19981+
QGIS_VERSION_BUILD = 13381;
1997319982
STRIP_INSTALLED_PRODUCT = NO;
1997419983
};
1997519984
name = Debug;
@@ -19980,7 +19989,7 @@
1998019989
buildSettings = {
1998119990
COPY_PHASE_STRIP = YES;
1998219991
GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
19983-
QGIS_VERSION_BUILD = 13363;
19992+
QGIS_VERSION_BUILD = 13381;
1998419993
STRIP_INSTALLED_PRODUCT = YES;
1998519994
};
1998619995
name = Release;

0 commit comments

Comments
 (0)