Skip to content

Commit 49a99e3

Browse files
author
kyngchaos
committedMay 24, 2010
remove postgres threading (r13557);
fix missing 'new spatialite layer' function (#2745); misc cleanup git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@13567 c8812cc2-4d05-0410-92ff-de0c093fc19c
·
final-1_7_1final-1_7_0
1 parent da44c2b commit 49a99e3

File tree

4 files changed

+11
-31
lines changed

4 files changed

+11
-31
lines changed
 

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

Lines changed: 7 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1188,10 +1188,6 @@
11881188
72A07DA60F3BDFA3004FC2A4 /* libqgis_core.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 7209F1D20F39E760003DC336 /* libqgis_core.dylib */; };
11891189
72A07DBD0F3BDFC8004FC2A4 /* libqgis_core.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 7209F1D20F39E760003DC336 /* libqgis_core.dylib */; };
11901190
72A07DC60F3BE1B1004FC2A4 /* qgspostgresprovider.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7209EC720F39E57B003DC336 /* qgspostgresprovider.cpp */; };
1191-
72A07DC70F3BE1B4004FC2A4 /* qgspostgisbox2d.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7209EC6A0F39E57B003DC336 /* qgspostgisbox2d.cpp */; };
1192-
72A07DC80F3BE1B5004FC2A4 /* qgspostgisbox3d.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7209EC6C0F39E57B003DC336 /* qgspostgisbox3d.cpp */; };
1193-
72A07DC90F3BE1B8004FC2A4 /* qgspostgrescountthread.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7209EC6E0F39E57B003DC336 /* qgspostgrescountthread.cpp */; };
1194-
72A07DCA0F3BE1BB004FC2A4 /* qgspostgresextentthread.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7209EC700F39E57B003DC336 /* qgspostgresextentthread.cpp */; };
11951191
72A07DDA0F3BE4A0004FC2A4 /* gpsdata.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7209EC510F39E57B003DC336 /* gpsdata.cpp */; };
11961192
72A07DDB0F3BE4A1004FC2A4 /* qgsgpxprovider.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7209EC530F39E57B003DC336 /* qgsgpxprovider.cpp */; };
11971193
72A07DF00F3BE76B004FC2A4 /* qgswfsdata.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7209EC760F39E57B003DC336 /* qgswfsdata.cpp */; };
@@ -4395,14 +4391,6 @@
43954391
7209EC650F39E57B003DC336 /* qgsogrprovider.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = qgsogrprovider.h; path = ../../src/providers/ogr/qgsogrprovider.h; sourceTree = SOURCE_ROOT; };
43964392
7209EC680F39E57B003DC336 /* CMakeLists.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = CMakeLists.txt; path = ../../src/providers/postgres/CMakeLists.txt; sourceTree = SOURCE_ROOT; };
43974393
7209EC690F39E57B003DC336 /* create_test_tables */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = create_test_tables; path = ../../src/providers/postgres/create_test_tables; sourceTree = SOURCE_ROOT; };
4398-
7209EC6A0F39E57B003DC336 /* qgspostgisbox2d.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = qgspostgisbox2d.cpp; path = ../../src/providers/postgres/qgspostgisbox2d.cpp; sourceTree = SOURCE_ROOT; };
4399-
7209EC6B0F39E57B003DC336 /* qgspostgisbox2d.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = qgspostgisbox2d.h; path = ../../src/providers/postgres/qgspostgisbox2d.h; sourceTree = SOURCE_ROOT; };
4400-
7209EC6C0F39E57B003DC336 /* qgspostgisbox3d.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = qgspostgisbox3d.cpp; path = ../../src/providers/postgres/qgspostgisbox3d.cpp; sourceTree = SOURCE_ROOT; };
4401-
7209EC6D0F39E57B003DC336 /* qgspostgisbox3d.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = qgspostgisbox3d.h; path = ../../src/providers/postgres/qgspostgisbox3d.h; sourceTree = SOURCE_ROOT; };
4402-
7209EC6E0F39E57B003DC336 /* qgspostgrescountthread.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = qgspostgrescountthread.cpp; path = ../../src/providers/postgres/qgspostgrescountthread.cpp; sourceTree = SOURCE_ROOT; };
4403-
7209EC6F0F39E57B003DC336 /* qgspostgrescountthread.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = qgspostgrescountthread.h; path = ../../src/providers/postgres/qgspostgrescountthread.h; sourceTree = SOURCE_ROOT; };
4404-
7209EC700F39E57B003DC336 /* qgspostgresextentthread.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = qgspostgresextentthread.cpp; path = ../../src/providers/postgres/qgspostgresextentthread.cpp; sourceTree = SOURCE_ROOT; };
4405-
7209EC710F39E57B003DC336 /* qgspostgresextentthread.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = qgspostgresextentthread.h; path = ../../src/providers/postgres/qgspostgresextentthread.h; sourceTree = SOURCE_ROOT; };
44064394
7209EC720F39E57B003DC336 /* qgspostgresprovider.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = qgspostgresprovider.cpp; path = ../../src/providers/postgres/qgspostgresprovider.cpp; sourceTree = SOURCE_ROOT; };
44074395
7209EC730F39E57B003DC336 /* qgspostgresprovider.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = qgspostgresprovider.h; path = ../../src/providers/postgres/qgspostgresprovider.h; sourceTree = SOURCE_ROOT; };
44084396
7209EC750F39E57B003DC336 /* CMakeLists.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = CMakeLists.txt; path = ../../src/providers/wfs/CMakeLists.txt; sourceTree = SOURCE_ROOT; };
@@ -7021,6 +7009,7 @@
70217009
72BDC398116E1E690088DEB4 /* qgsspatialitesridsdialogbase.ui */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; name = qgsspatialitesridsdialogbase.ui; path = ../../src/ui/qgsspatialitesridsdialogbase.ui; sourceTree = SOURCE_ROOT; };
70227010
72BDC399116E261C0088DEB4 /* QgsNewSpatialiteLayerDialog-en_US */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = "QgsNewSpatialiteLayerDialog-en_US"; path = "../../resources/context_help/QgsNewSpatialiteLayerDialog-en_US"; sourceTree = SOURCE_ROOT; };
70237011
72BDC39B116E26470088DEB4 /* spatialite.db */ = {isa = PBXFileReference; lastKnownFileType = file; name = spatialite.db; path = ../../resources/spatialite.db; sourceTree = SOURCE_ROOT; };
7012+
72BE5A0C11A207EA0048A3C7 /* mActionSaveEdits.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = mActionSaveEdits.png; path = ../../images/themes/default/mActionSaveEdits.png; sourceTree = SOURCE_ROOT; };
70247013
72C4241C103DE65D005CD18E /* qgis_srs.sh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; name = qgis_srs.sh; path = ../../scripts/qgis_srs.sh; sourceTree = SOURCE_ROOT; };
70257014
72C4241D103DE67F005CD18E /* README */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = README; path = ../../resources/README; sourceTree = SOURCE_ROOT; };
70267015
72C4241E103DE718005CD18E /* mActionAddMap.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = mActionAddMap.png; path = ../../images/themes/gis/mActionAddMap.png; sourceTree = SOURCE_ROOT; };
@@ -7423,6 +7412,7 @@
74237412
72F22FB50FDAC1F4000E8CB0 /* qgsmaptoolnodetool.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = qgsmaptoolnodetool.cpp; path = ../../src/app/qgsmaptoolnodetool.cpp; sourceTree = SOURCE_ROOT; };
74247413
72F22FB60FDAC1F4000E8CB0 /* qgsmaptoolnodetool.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = qgsmaptoolnodetool.h; path = ../../src/app/qgsmaptoolnodetool.h; sourceTree = SOURCE_ROOT; };
74257414
72F22FB80FDAC236000E8CB0 /* mActionNodeTool.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = mActionNodeTool.png; path = ../../images/themes/default/mActionNodeTool.png; sourceTree = SOURCE_ROOT; };
7415+
72F4037711AB0C18001C3163 /* qgis_ca_ES.ts */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; name = qgis_ca_ES.ts; path = ../../i18n/qgis_ca_ES.ts; sourceTree = SOURCE_ROOT; };
74267416
72F4861F10AB752500E7BFEE /* qgscomposermanagerbase.ui */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; name = qgscomposermanagerbase.ui; path = ../../src/ui/qgscomposermanagerbase.ui; sourceTree = SOURCE_ROOT; };
74277417
72F4862010AB753D00E7BFEE /* qgscomposermanager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = qgscomposermanager.cpp; path = ../../src/app/composer/qgscomposermanager.cpp; sourceTree = SOURCE_ROOT; };
74287418
72F4862110AB753D00E7BFEE /* qgscomposermanager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = qgscomposermanager.h; path = ../../src/app/composer/qgscomposermanager.h; sourceTree = SOURCE_ROOT; };
@@ -9610,14 +9600,6 @@
96109600
children = (
96119601
7209EC680F39E57B003DC336 /* CMakeLists.txt */,
96129602
7209EC690F39E57B003DC336 /* create_test_tables */,
9613-
7209EC6A0F39E57B003DC336 /* qgspostgisbox2d.cpp */,
9614-
7209EC6B0F39E57B003DC336 /* qgspostgisbox2d.h */,
9615-
7209EC6C0F39E57B003DC336 /* qgspostgisbox3d.cpp */,
9616-
7209EC6D0F39E57B003DC336 /* qgspostgisbox3d.h */,
9617-
7209EC6E0F39E57B003DC336 /* qgspostgrescountthread.cpp */,
9618-
7209EC6F0F39E57B003DC336 /* qgspostgrescountthread.h */,
9619-
7209EC700F39E57B003DC336 /* qgspostgresextentthread.cpp */,
9620-
7209EC710F39E57B003DC336 /* qgspostgresextentthread.h */,
96219603
7209EC720F39E57B003DC336 /* qgspostgresprovider.cpp */,
96229604
7209EC730F39E57B003DC336 /* qgspostgresprovider.h */,
96239605
);
@@ -10643,6 +10625,7 @@
1064310625
72D84C131044BBB7009F8F39 /* mActionReshape.png */,
1064410626
7286D63A10627610008D83A6 /* mActionRotatePointSymbols.png */,
1064510627
7209EF330F39E5D9003DC336 /* mActionSaveAsSVG.png */,
10628+
72BE5A0C11A207EA0048A3C7 /* mActionSaveEdits.png */,
1064610629
7209EF340F39E5D9003DC336 /* mActionSaveMapAsImage.png */,
1064710630
7209EF350F39E5D9003DC336 /* mActionScaleBar.png */,
1064810631
7209EF360F39E5D9003DC336 /* mActionSelect.png */,
@@ -10909,6 +10892,7 @@
1090910892
7209EFD80F39E5D9003DC336 /* modifications_qt_xx.txt */,
1091010893
7209EFD90F39E5D9003DC336 /* qgis_ar.ts */,
1091110894
72AF7AF010F8EBC400BD549A /* qgis_bg.ts */,
10895+
72F4037711AB0C18001C3163 /* qgis_ca_ES.ts */,
1091210896
7209EFDA0F39E5D9003DC336 /* qgis_cs_CZ.ts */,
1091310897
7209EFDB0F39E5D9003DC336 /* qgis_de.ts */,
1091410898
7209EFDC0F39E5D9003DC336 /* qgis_el_GR.ts */,
@@ -14673,7 +14657,7 @@
1467314657
);
1467414658
runOnlyForDeploymentPostprocessing = 0;
1467514659
shellPath = /bin/sh;
14676-
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";
14660+
shellScript = "# optional moc sources, can't use dummy file with #if'd #include\n\nrm -f src/x_qgsspatialitesourceselect.h\nif [ \"$SQLITE_QSYSTEM\" = \"1\" ] ; then\n\ttouch src/x_qgsspatialitesourceselect.h\nelse\n\tln -s ../../../src/app/qgsspatialitesourceselect.h src/x_qgsspatialitesourceselect.h\nfi\n";
1467714661
showEnvVarsInLog = 0;
1467814662
};
1467914663
72832D1210362D61002E3B72 /* Script - osm ui+rc */ = {
@@ -15581,10 +15565,6 @@
1558115565
buildActionMask = 2147483647;
1558215566
files = (
1558315567
72A07DC60F3BE1B1004FC2A4 /* qgspostgresprovider.cpp in Sources */,
15584-
72A07DC70F3BE1B4004FC2A4 /* qgspostgisbox2d.cpp in Sources */,
15585-
72A07DC80F3BE1B5004FC2A4 /* qgspostgisbox3d.cpp in Sources */,
15586-
72A07DC90F3BE1B8004FC2A4 /* qgspostgrescountthread.cpp in Sources */,
15587-
72A07DCA0F3BE1BB004FC2A4 /* qgspostgresextentthread.cpp in Sources */,
1558815568
729287C10F71DF47006D9489 /* qgspostgresprovider.h in Sources */,
1558915569
);
1559015570
runOnlyForDeploymentPostprocessing = 0;
@@ -19996,7 +19976,7 @@
1999619976
COPY_PHASE_STRIP = NO;
1999719977
GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
1999819978
GCC_OPTIMIZATION_LEVEL = 0;
19999-
QGIS_VERSION_BUILD = 13485;
19979+
QGIS_VERSION_BUILD = 13566;
2000019980
STRIP_INSTALLED_PRODUCT = NO;
2000119981
};
2000219982
name = Debug;
@@ -20007,7 +19987,7 @@
2000719987
buildSettings = {
2000819988
COPY_PHASE_STRIP = YES;
2000919989
GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
20010-
QGIS_VERSION_BUILD = 13485;
19990+
QGIS_VERSION_BUILD = 13566;
2001119991
STRIP_INSTALLED_PRODUCT = YES;
2001219992
};
2001319993
name = Release;

‎mac/xcode/qgis_settings.xcconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -355,7 +355,7 @@ SQLITE_SYSTEM_system = 1
355355
SQLITE_SYSTEM_internal = 0
356356
SQLITE_SYSTEM_fw = 0
357357
SQLITE_SYSTEM_shared = 0
358-
SQLITE_SYSTEM = SQLITE_SYSTEM=$(SQLITE_SYSTEM_$(SQLITE_FORM))
358+
SQLITE_SYSTEM_DEF = SQLITE_QSYSTEM=$(SQLITE_SYSTEM_$(SQLITE_FORM))
359359

360360
SPATIALITE_GEOS_yes_fw = $(GEOS_LIB)
361361
SPATIALITE_GEOS_yes_shared = $(GEOS_LIB)

‎mac/xcode/src/x_qgsspatialitesourceselect.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#if !SQLITE_SYSTEM
1+
#if !SQLITE_QSYSTEM
22

33
#include "../../src/app/qgsspatialitesourceselect.cpp"
44

‎src/app/qgisapp.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -500,10 +500,10 @@ class QgisApp : public QMainWindow
500500
void fileNew( bool thePromptToSaveFlag );
501501
//! Create a new empty vector layer
502502
void newVectorLayer();
503-
#ifdef HAVE_SPATIALITE
503+
//#ifdef HAVE_SPATIALITE
504504
//! Create a new empty spatialite layer
505505
void newSpatialiteLayer();
506-
#endif
506+
//#endif
507507
//! Print the current map view frame
508508
void newPrintComposer();
509509
void showComposerManager();

0 commit comments

Comments
 (0)
Please sign in to comment.