Skip to content

Commit 0acfaaf

Browse files
author
kyngchaos
committedOct 7, 2010
sync with r14331, r14335, r14325
git-svn-id: http://svn.osgeo.org/qgis/trunk@14351 c8812cc2-4d05-0410-92ff-de0c093fc19c
·
ltr-3_40Before-merge-new_vector_api
1 parent 4c055b9 commit 0acfaaf

File tree

3 files changed

+252
-7
lines changed

3 files changed

+252
-7
lines changed
 

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

Lines changed: 244 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@
6969
72FB0B6D0FFD6B8F0052360B /* PBXTargetDependency */,
7070
7256F1AD0F411C120022BE1F /* PBXTargetDependency */,
7171
7256F1AB0F411C120022BE1F /* PBXTargetDependency */,
72+
72448A84125D3F8A0071B130 /* PBXTargetDependency */,
7273
7256F1BF0F411C7C0022BE1F /* PBXTargetDependency */,
7374
7223B7A60F96AA6C00D905B4 /* PBXTargetDependency */,
7475
7256F1C50F411C7C0022BE1F /* PBXTargetDependency */,
@@ -836,6 +837,19 @@
836837
723FD05F0FBCB87900EFA55D /* qgspalgeometry.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 723FD05D0FBCB85D00EFA55D /* qgspalgeometry.cpp */; };
837838
72442AEB1095DD4C00B54796 /* qgsavoidintersectionsdialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 72442AE91095DCFC00B54796 /* qgsavoidintersectionsdialog.cpp */; };
838839
72442AEC1095DD4C00B54796 /* qgsavoidintersectionsdialog.h in Sources */ = {isa = PBXBuildFile; fileRef = 72442AEA1095DCFC00B54796 /* qgsavoidintersectionsdialog.h */; };
840+
72448A51125D3D290071B130 /* libqgis_core.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 7209F1D20F39E760003DC336 /* libqgis_core.dylib */; };
841+
72448A52125D3D290071B130 /* libqgis_gui.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 7209F38E0F3A2F2B003DC336 /* libqgis_gui.dylib */; };
842+
72448A67125D3D940071B130 /* offline_editing.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 72448A3F125D3D0C0071B130 /* offline_editing.cpp */; };
843+
72448A68125D3D940071B130 /* offline_editing.h in Sources */ = {isa = PBXBuildFile; fileRef = 72448A40125D3D0C0071B130 /* offline_editing.h */; };
844+
72448A69125D3D940071B130 /* offline_editing_plugin.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 72448A42125D3D0C0071B130 /* offline_editing_plugin.cpp */; };
845+
72448A6A125D3D940071B130 /* offline_editing_plugin.h in Sources */ = {isa = PBXBuildFile; fileRef = 72448A43125D3D0C0071B130 /* offline_editing_plugin.h */; };
846+
72448A6B125D3D940071B130 /* offline_editing_plugin_gui.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 72448A45125D3D0C0071B130 /* offline_editing_plugin_gui.cpp */; };
847+
72448A6C125D3D940071B130 /* offline_editing_plugin_gui.h in Sources */ = {isa = PBXBuildFile; fileRef = 72448A46125D3D0C0071B130 /* offline_editing_plugin_gui.h */; };
848+
72448A6D125D3D940071B130 /* offline_editing_progress_dialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 72448A48125D3D0C0071B130 /* offline_editing_progress_dialog.cpp */; };
849+
72448A6E125D3D940071B130 /* offline_editing_progress_dialog.h in Sources */ = {isa = PBXBuildFile; fileRef = 72448A49125D3D0C0071B130 /* offline_editing_progress_dialog.h */; };
850+
72448A6F125D3DCE0071B130 /* offline_editing_plugin.qrc in Sources */ = {isa = PBXBuildFile; fileRef = 72448A44125D3D0C0071B130 /* offline_editing_plugin.qrc */; };
851+
72448A7E125D3F6E0071B130 /* qgsgpsdconnection.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 72448A7D125D3F5E0071B130 /* qgsgpsdconnection.cpp */; };
852+
72448A87125D40750071B130 /* qgsgpsdconnection.h in Sources */ = {isa = PBXBuildFile; fileRef = 72448A7B125D3F010071B130 /* qgsgpsdconnection.h */; };
839853
72448CD310E9A1C100D4586B /* qgsprojectbadlayerguihandler.h in Sources */ = {isa = PBXBuildFile; fileRef = 72A51A4B10CE05B000E202D7 /* qgsprojectbadlayerguihandler.h */; };
840854
72448CD710E9A21500D4586B /* qgsattributetableview.h in Sources */ = {isa = PBXBuildFile; fileRef = 72A239480F74A62200AFC35B /* qgsattributetableview.h */; };
841855
72463E511122FF7300BE5F17 /* qgis.g.browser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 72463E3C1122FEC500BE5F17 /* qgis.g.browser.cpp */; };
@@ -2251,6 +2265,28 @@
22512265
);
22522266
script = "$QTMOC -I$QGIS_HEADER_SEARCH_BASE $OTHER_CFLAGS -o \"$DERIVED_FILES_DIR/moc_$INPUT_FILE_BASE.cpp\" \"$INPUT_FILE_PATH\"";
22532267
};
2268+
72448A53125D3D290071B130 /* PBXBuildRule */ = {
2269+
isa = PBXBuildRule;
2270+
compilerSpec = com.apple.compilers.proxy.script;
2271+
filePatterns = "*.qrc";
2272+
fileType = pattern.proxy;
2273+
isEditable = 1;
2274+
outputFiles = (
2275+
"$(DERIVED_FILES_DIR)/qrc_$(INPUT_FILE_BASE).cpp",
2276+
);
2277+
script = "$QTRCC -name $INPUT_FILE_BASE -o \"$DERIVED_FILES_DIR/qrc_$INPUT_FILE_BASE.cpp\" \"$INPUT_FILE_PATH\"";
2278+
};
2279+
72448A54125D3D290071B130 /* PBXBuildRule */ = {
2280+
isa = PBXBuildRule;
2281+
compilerSpec = com.apple.compilers.proxy.script;
2282+
filePatterns = "*.h";
2283+
fileType = pattern.proxy;
2284+
isEditable = 1;
2285+
outputFiles = (
2286+
"$(DERIVED_FILES_DIR)/moc_$(INPUT_FILE_BASE).cpp",
2287+
);
2288+
script = "$QTMOC -I$QGIS_HEADER_SEARCH_BASE $OTHER_CFLAGS -o \"$DERIVED_FILES_DIR/moc_$INPUT_FILE_BASE.cpp\" \"$INPUT_FILE_PATH\"";
2289+
};
22542290
7262ED980F7A770300498385 /* PBXBuildRule */ = {
22552291
isa = PBXBuildRule;
22562292
compilerSpec = com.apple.compilers.proxy.script;
@@ -2294,7 +2330,7 @@
22942330
"$(DERIVED_FILES_DIR)/sip$(INPUT_FILE_BASE)part0.cpp",
22952331
"$(DERIVED_FILES_DIR)/sip$(INPUT_FILE_BASE)part1.cpp",
22962332
);
2297-
script = "$SIP $PYQT_SIP_FLAGS -j 2 -I $PYQT_SIP_DIR -I $PROJECT_DIR/../../python -c \"$DERIVED_FILES_DIR\" \"$INPUT_FILE_PATH\"";
2333+
script = "$SIP $PYQT_SIP_FLAGS -j 2 -I $PYQT_SIP_DIR -I $PROJECT_DIR/../../python $QT_INC -c \"$DERIVED_FILES_DIR\" \"$INPUT_FILE_PATH\"";
22982334
};
22992335
7268E86D11023A8700B96374 /* PBXBuildRule */ = {
23002336
isa = PBXBuildRule;
@@ -2308,7 +2344,7 @@
23082344
"$(DERIVED_FILES_DIR)/sip$(INPUT_FILE_BASE)part2.cpp",
23092345
"$(DERIVED_FILES_DIR)/sip$(INPUT_FILE_BASE)part3.cpp",
23102346
);
2311-
script = "$SIP $PYQT_SIP_FLAGS -j 4 -I $PYQT_SIP_DIR -I $PROJECT_DIR/../../python -c \"$DERIVED_FILES_DIR\" \"$INPUT_FILE_PATH\"";
2347+
script = "$SIP $PYQT_SIP_FLAGS -j 4 -I $PYQT_SIP_DIR -I $PROJECT_DIR/../../python $QT_INC -c \"$DERIVED_FILES_DIR\" \"$INPUT_FILE_PATH\"";
23122348
};
23132349
7268E88B11023DF700B96374 /* PBXBuildRule */ = {
23142350
isa = PBXBuildRule;
@@ -2322,7 +2358,7 @@
23222358
"$(DERIVED_FILES_DIR)/sip$(INPUT_FILE_BASE)part2.cpp",
23232359
"$(DERIVED_FILES_DIR)/sip$(INPUT_FILE_BASE)part3.cpp",
23242360
);
2325-
script = "$SIP $PYQT_SIP_FLAGS -j 4 -I $PYQT_SIP_DIR -I $PROJECT_DIR/../../python -c \"$DERIVED_FILES_DIR\" \"$INPUT_FILE_PATH\"";
2361+
script = "$SIP $PYQT_SIP_FLAGS -j 4 -I $PYQT_SIP_DIR -I $PROJECT_DIR/../../python $QT_INC -c \"$DERIVED_FILES_DIR\" \"$INPUT_FILE_PATH\"";
23262362
};
23272363
726C673C1046030F00EFEDCC /* PBXBuildRule */ = {
23282364
isa = PBXBuildRule;
@@ -2939,6 +2975,13 @@
29392975
remoteGlobalIDString = 7223B77E0F96A96500D905B4;
29402976
remoteInfo = oracleplugin;
29412977
};
2978+
72448A83125D3F8A0071B130 /* PBXContainerItemProxy */ = {
2979+
isa = PBXContainerItemProxy;
2980+
containerPortal = 20286C28FDCF999611CA2CEA /* Project object */;
2981+
proxyType = 1;
2982+
remoteGlobalIDString = 72448A4D125D3D290071B130 /* offlineeditingplugin */;
2983+
remoteInfo = offlineeditingplugin;
2984+
};
29422985
7256F18F0F411B110022BE1F /* PBXContainerItemProxy */ = {
29432986
isa = PBXContainerItemProxy;
29442987
containerPortal = 20286C28FDCF999611CA2CEA /* Project object */;
@@ -6675,6 +6718,23 @@
66756718
72442AE81095DCD800B54796 /* qgsavoidintersectionsdialogbase.ui */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = qgsavoidintersectionsdialogbase.ui; path = ../../src/ui/qgsavoidintersectionsdialogbase.ui; sourceTree = SOURCE_ROOT; };
66766719
72442AE91095DCFC00B54796 /* qgsavoidintersectionsdialog.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = qgsavoidintersectionsdialog.cpp; path = ../../src/app/qgsavoidintersectionsdialog.cpp; sourceTree = SOURCE_ROOT; };
66776720
72442AEA1095DCFC00B54796 /* qgsavoidintersectionsdialog.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = qgsavoidintersectionsdialog.h; path = ../../src/app/qgsavoidintersectionsdialog.h; sourceTree = SOURCE_ROOT; };
6721+
72448A3E125D3D0C0071B130 /* CMakeLists.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = CMakeLists.txt; path = ../../src/plugins/offline_editing/CMakeLists.txt; sourceTree = SOURCE_ROOT; };
6722+
72448A3F125D3D0C0071B130 /* offline_editing.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = offline_editing.cpp; path = ../../src/plugins/offline_editing/offline_editing.cpp; sourceTree = SOURCE_ROOT; };
6723+
72448A40125D3D0C0071B130 /* offline_editing.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = offline_editing.h; path = ../../src/plugins/offline_editing/offline_editing.h; sourceTree = SOURCE_ROOT; };
6724+
72448A41125D3D0C0071B130 /* offline_editing_copy.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = offline_editing_copy.png; path = ../../src/plugins/offline_editing/offline_editing_copy.png; sourceTree = SOURCE_ROOT; };
6725+
72448A42125D3D0C0071B130 /* offline_editing_plugin.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = offline_editing_plugin.cpp; path = ../../src/plugins/offline_editing/offline_editing_plugin.cpp; sourceTree = SOURCE_ROOT; };
6726+
72448A43125D3D0C0071B130 /* offline_editing_plugin.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = offline_editing_plugin.h; path = ../../src/plugins/offline_editing/offline_editing_plugin.h; sourceTree = SOURCE_ROOT; };
6727+
72448A44125D3D0C0071B130 /* offline_editing_plugin.qrc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = offline_editing_plugin.qrc; path = ../../src/plugins/offline_editing/offline_editing_plugin.qrc; sourceTree = SOURCE_ROOT; };
6728+
72448A45125D3D0C0071B130 /* offline_editing_plugin_gui.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = offline_editing_plugin_gui.cpp; path = ../../src/plugins/offline_editing/offline_editing_plugin_gui.cpp; sourceTree = SOURCE_ROOT; };
6729+
72448A46125D3D0C0071B130 /* offline_editing_plugin_gui.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = offline_editing_plugin_gui.h; path = ../../src/plugins/offline_editing/offline_editing_plugin_gui.h; sourceTree = SOURCE_ROOT; };
6730+
72448A47125D3D0C0071B130 /* offline_editing_plugin_guibase.ui */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; name = offline_editing_plugin_guibase.ui; path = ../../src/plugins/offline_editing/offline_editing_plugin_guibase.ui; sourceTree = SOURCE_ROOT; };
6731+
72448A48125D3D0C0071B130 /* offline_editing_progress_dialog.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = offline_editing_progress_dialog.cpp; path = ../../src/plugins/offline_editing/offline_editing_progress_dialog.cpp; sourceTree = SOURCE_ROOT; };
6732+
72448A49125D3D0C0071B130 /* offline_editing_progress_dialog.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = offline_editing_progress_dialog.h; path = ../../src/plugins/offline_editing/offline_editing_progress_dialog.h; sourceTree = SOURCE_ROOT; };
6733+
72448A4A125D3D0C0071B130 /* offline_editing_progress_dialog_base.ui */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; name = offline_editing_progress_dialog_base.ui; path = ../../src/plugins/offline_editing/offline_editing_progress_dialog_base.ui; sourceTree = SOURCE_ROOT; };
6734+
72448A4B125D3D0C0071B130 /* offline_editing_sync.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = offline_editing_sync.png; path = ../../src/plugins/offline_editing/offline_editing_sync.png; sourceTree = SOURCE_ROOT; };
6735+
72448A58125D3D290071B130 /* libofflineeditingplugin.so */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = libofflineeditingplugin.so; sourceTree = BUILT_PRODUCTS_DIR; };
6736+
72448A7B125D3F010071B130 /* qgsgpsdconnection.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = qgsgpsdconnection.h; path = ../../src/core/gps/qgsgpsdconnection.h; sourceTree = SOURCE_ROOT; };
6737+
72448A7D125D3F5E0071B130 /* qgsgpsdconnection.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = qgsgpsdconnection.cpp; path = ../../src/core/gps/qgsgpsdconnection.cpp; sourceTree = SOURCE_ROOT; };
66786738
72463E3C1122FEC500BE5F17 /* qgis.g.browser.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = qgis.g.browser.cpp; path = ../../src/plugins/grass/qgis.g.browser.cpp; sourceTree = SOURCE_ROOT; };
66796739
72463E451122FEF200BE5F17 /* qgis.g.browser */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = qgis.g.browser; sourceTree = BUILT_PRODUCTS_DIR; };
66806740
724723DA11342BB3004B93DA /* qgsvalidateddoublespinbox.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = qgsvalidateddoublespinbox.h; path = ../../src/plugins/georeferencer/qgsvalidateddoublespinbox.h; sourceTree = SOURCE_ROOT; };
@@ -9056,6 +9116,15 @@
90569116
);
90579117
runOnlyForDeploymentPostprocessing = 0;
90589118
};
9119+
72448A50125D3D290071B130 /* Frameworks */ = {
9120+
isa = PBXFrameworksBuildPhase;
9121+
buildActionMask = 2147483647;
9122+
files = (
9123+
72448A51125D3D290071B130 /* libqgis_core.dylib in Frameworks */,
9124+
72448A52125D3D290071B130 /* libqgis_gui.dylib in Frameworks */,
9125+
);
9126+
runOnlyForDeploymentPostprocessing = 0;
9127+
};
90599128
72463E411122FEF200BE5F17 /* Frameworks */ = {
90609129
isa = PBXFrameworksBuildPhase;
90619130
buildActionMask = 2147483647;
@@ -9472,6 +9541,7 @@
94729541
72B236B711570743007B4803 /* libdisplacementplugin.so */,
94739542
7268C057118294F2001BC9C4 /* libspatialqueryplugin.so */,
94749543
72DBBD1C12217BB000384557 /* qgis_mapserv.fcgi */,
9544+
72448A58125D3D290071B130 /* libofflineeditingplugin.so */,
94759545
);
94769546
name = Products;
94779547
sourceTree = "<group>";
@@ -10438,6 +10508,7 @@
1043810508
72FB0B170FFD657D0052360B /* evis */,
1043910509
7209EBB90F39E57B003DC336 /* interpolation */,
1044010510
7209EBE90F39E57B003DC336 /* north_arrow */,
10511+
72448A3D125D3D0C0071B130 /* offline_editing */,
1044110512
7209EBF90F39E57B003DC336 /* ogr_converter */,
1044210513
7223B7720F969A9D00D905B4 /* oracle_raster */,
1044310514
72B236A211570705007B4803 /* point_displacement_renderer */,
@@ -12769,6 +12840,28 @@
1276912840
path = ../../src/plugins/grass/scripts;
1277012841
sourceTree = SOURCE_ROOT;
1277112842
};
12843+
72448A3D125D3D0C0071B130 /* offline_editing */ = {
12844+
isa = PBXGroup;
12845+
children = (
12846+
72448A3E125D3D0C0071B130 /* CMakeLists.txt */,
12847+
72448A3F125D3D0C0071B130 /* offline_editing.cpp */,
12848+
72448A40125D3D0C0071B130 /* offline_editing.h */,
12849+
72448A41125D3D0C0071B130 /* offline_editing_copy.png */,
12850+
72448A42125D3D0C0071B130 /* offline_editing_plugin.cpp */,
12851+
72448A43125D3D0C0071B130 /* offline_editing_plugin.h */,
12852+
72448A44125D3D0C0071B130 /* offline_editing_plugin.qrc */,
12853+
72448A45125D3D0C0071B130 /* offline_editing_plugin_gui.cpp */,
12854+
72448A46125D3D0C0071B130 /* offline_editing_plugin_gui.h */,
12855+
72448A47125D3D0C0071B130 /* offline_editing_plugin_guibase.ui */,
12856+
72448A48125D3D0C0071B130 /* offline_editing_progress_dialog.cpp */,
12857+
72448A49125D3D0C0071B130 /* offline_editing_progress_dialog.h */,
12858+
72448A4A125D3D0C0071B130 /* offline_editing_progress_dialog_base.ui */,
12859+
72448A4B125D3D0C0071B130 /* offline_editing_sync.png */,
12860+
);
12861+
name = offline_editing;
12862+
path = ../../src/plugins/offline_editing;
12863+
sourceTree = SOURCE_ROOT;
12864+
};
1277212865
724D05D810A9112D00F9680A /* newgis */ = {
1277312866
isa = PBXGroup;
1277412867
children = (
@@ -14732,6 +14825,8 @@
1473214825
72AF7B0410F8EC1600BD549A /* qgsgpsconnection.h */,
1473314826
72AF7B0510F8EC1600BD549A /* qgsgpsconnectionregistry.cpp */,
1473414827
72AF7B0610F8EC1600BD549A /* qgsgpsconnectionregistry.h */,
14828+
72448A7D125D3F5E0071B130 /* qgsgpsdconnection.cpp */,
14829+
72448A7B125D3F010071B130 /* qgsgpsdconnection.h */,
1473514830
72D2486D1100CD2300923469 /* qgsgpsdetector.cpp */,
1473614831
72D2486E1100CD2300923469 /* qgsgpsdetector.h */,
1473714832
72AF7B0710F8EC1600BD549A /* qgsgpstrackerthread.cpp */,
@@ -15766,6 +15861,25 @@
1576615861
productReference = 7223B78D0F96A96500D905B4 /* liboracleplugin.so */;
1576715862
productType = "com.apple.product-type.tool";
1576815863
};
15864+
72448A4D125D3D290071B130 /* offlineeditingplugin */ = {
15865+
isa = PBXNativeTarget;
15866+
buildConfigurationList = 72448A55125D3D290071B130 /* Build configuration list for PBXNativeTarget "offlineeditingplugin" */;
15867+
buildPhases = (
15868+
72448A4E125D3D290071B130 /* Script - ui */,
15869+
72448A4F125D3D290071B130 /* Sources */,
15870+
72448A50125D3D290071B130 /* Frameworks */,
15871+
);
15872+
buildRules = (
15873+
72448A53125D3D290071B130 /* PBXBuildRule */,
15874+
72448A54125D3D290071B130 /* PBXBuildRule */,
15875+
);
15876+
dependencies = (
15877+
);
15878+
name = offlineeditingplugin;
15879+
productName = testprog;
15880+
productReference = 72448A58125D3D290071B130 /* libofflineeditingplugin.so */;
15881+
productType = "com.apple.product-type.tool";
15882+
};
1576915883
72463E3E1122FEF200BE5F17 /* qgis.g.browser */ = {
1577015884
isa = PBXNativeTarget;
1577115885
buildConfigurationList = 72463E421122FEF200BE5F17 /* Build configuration list for PBXNativeTarget "qgis.g.browser" */;
@@ -16621,6 +16735,7 @@
1662116735
72FB0B4A0FFD680F0052360B /* evisplugin */,
1662216736
72A56B6C0F3C824400BA32A1 /* interpolationplugin */,
1662316737
72A56B760F3C824400BA32A1 /* northarrowplugin */,
16738+
72448A4D125D3D290071B130 /* offlineeditingplugin */,
1662416739
72A56C060F3C887300BA32A1 /* ogrconverterplugin */,
1662516740
7223B77E0F96A96500D905B4 /* oracleplugin */,
1662616741
72A56B800F3C824400BA32A1 /* quickprintplugin */,
@@ -16729,6 +16844,21 @@
1672916844
shellScript = "GUI_UI=\"$TARGET_TEMP_DIR/../qgis_gui.build/DerivedSources\"\n\nfor u in qgsdetaileditemwidgetbase qgsgenericprojectionselectorbase qgsmessageviewer qgsprojectionselectorbase qgscredentialdialog\ndo\n\tcp -f \"$GUI_UI/ui_$u.h\" \"$QGIS_BUILD_PATH/Headers/qgis/\"\ndone\n";
1673016845
showEnvVarsInLog = 0;
1673116846
};
16847+
72448A4E125D3D290071B130 /* Script - ui */ = {
16848+
isa = PBXShellScriptBuildPhase;
16849+
buildActionMask = 2147483647;
16850+
files = (
16851+
);
16852+
inputPaths = (
16853+
);
16854+
name = "Script - ui";
16855+
outputPaths = (
16856+
);
16857+
runOnlyForDeploymentPostprocessing = 0;
16858+
shellPath = /bin/sh;
16859+
shellScript = "# generate ui headers in separate script because:\n# 1. Xcode will attempt to process generated *.h with moc rule\n# 2. parallel processing might not finish ui's before a cpp source needs it\n\n# derived sources dir created by Compile Sources phase, we need it NOW\nmkdir -p \"$DERIVED_FILES_DIR\"\n\ncd ../../src/plugins/$TARGET_PLUGINDIR\n\nUIUI=`ls *.ui`\n\nfor u in $UIUI\ndo\n\tuh=`echo $u | sed 's,\\.ui$,.h,'`\n\t# compare times because output files spec below doesn't seem to work with wildcards\n\tif [ ! -f \"$DERIVED_FILES_DIR/ui_$uh\" ] || [ $u -nt \"$DERIVED_FILES_DIR/ui_$uh\" ] ; then\n\t\trm -f \"$DERIVED_FILES_DIR/ui_$uh\"\n\t\techo \"$QTUIC -o \\\"$DERIVED_FILES_DIR/ui_$uh\\\" $u\"\n\t\t$QTUIC -o \"$DERIVED_FILES_DIR/ui_$uh\" $u\n\tfi\ndone\n\nexit 0\n";
16860+
showEnvVarsInLog = 0;
16861+
};
1673216862
7256FA100F41D03B0022BE1F /* Script - qt.conf */ = {
1673316863
isa = PBXShellScriptBuildPhase;
1673416864
buildActionMask = 2147483647;
@@ -17418,6 +17548,8 @@
1741817548
7225EF9810B229FA00D23EA2 /* qgsvectorcolorrampv2.cpp in Sources */,
1741917549
7295BC7510F57D50005D1408 /* qgscomposertable.cpp in Sources */,
1742017550
72AF7B2010F8ECB100BD549A /* qgsgpsconnection.cpp in Sources */,
17551+
72448A7E125D3F6E0071B130 /* qgsgpsdconnection.cpp in Sources */,
17552+
72448A87125D40750071B130 /* qgsgpsdconnection.h in Sources */,
1742117553
72AF7B1510F8EC6300BD549A /* qgsgpsconnectionregistry.cpp in Sources */,
1742217554
72D2486F1100CD7400923469 /* qgsgpsdetector.cpp in Sources */,
1742317555
72AF7B1710F8EC6300BD549A /* qgsnmeaconnection.cpp in Sources */,
@@ -17597,6 +17729,22 @@
1759717729
);
1759817730
runOnlyForDeploymentPostprocessing = 0;
1759917731
};
17732+
72448A4F125D3D290071B130 /* Sources */ = {
17733+
isa = PBXSourcesBuildPhase;
17734+
buildActionMask = 2147483647;
17735+
files = (
17736+
72448A67125D3D940071B130 /* offline_editing.cpp in Sources */,
17737+
72448A68125D3D940071B130 /* offline_editing.h in Sources */,
17738+
72448A69125D3D940071B130 /* offline_editing_plugin.cpp in Sources */,
17739+
72448A6A125D3D940071B130 /* offline_editing_plugin.h in Sources */,
17740+
72448A6B125D3D940071B130 /* offline_editing_plugin_gui.cpp in Sources */,
17741+
72448A6C125D3D940071B130 /* offline_editing_plugin_gui.h in Sources */,
17742+
72448A6D125D3D940071B130 /* offline_editing_progress_dialog.cpp in Sources */,
17743+
72448A6E125D3D940071B130 /* offline_editing_progress_dialog.h in Sources */,
17744+
72448A6F125D3DCE0071B130 /* offline_editing_plugin.qrc in Sources */,
17745+
);
17746+
runOnlyForDeploymentPostprocessing = 0;
17747+
};
1760017748
72463E3F1122FEF200BE5F17 /* Sources */ = {
1760117749
isa = PBXSourcesBuildPhase;
1760217750
buildActionMask = 2147483647;
@@ -18449,6 +18597,11 @@
1844918597
target = 7223B77E0F96A96500D905B4 /* oracleplugin */;
1845018598
targetProxy = 7223B7A50F96AA6C00D905B4 /* PBXContainerItemProxy */;
1845118599
};
18600+
72448A84125D3F8A0071B130 /* PBXTargetDependency */ = {
18601+
isa = PBXTargetDependency;
18602+
target = 72448A4D125D3D290071B130 /* offlineeditingplugin */;
18603+
targetProxy = 72448A83125D3F8A0071B130 /* PBXContainerItemProxy */;
18604+
};
1845218605
7256F1900F411B110022BE1F /* PBXTargetDependency */ = {
1845318606
isa = PBXTargetDependency;
1845418607
target = 72A07D140F3BD625004FC2A4 /* delimitedtextprovider */;
@@ -19148,6 +19301,85 @@
1914819301
};
1914919302
name = Release;
1915019303
};
19304+
72448A56125D3D290071B130 /* Debug */ = {
19305+
isa = XCBuildConfiguration;
19306+
buildSettings = {
19307+
CONFIGURATION_BUILD_DIR = "$(QGIS_BUILD_PATH)/MacOS/$(QGIS_PLUGIN_SUBDIR)";
19308+
EXECUTABLE_PREFIX = lib;
19309+
GCC_DYNAMIC_NO_PIC = NO;
19310+
GCC_OPTIMIZATION_LEVEL = 0;
19311+
GCC_PREPROCESSOR_DEFINITIONS = (
19312+
"$(inherited)",
19313+
offlineeditingplugin_EXPORTS,
19314+
);
19315+
HEADER_SEARCH_PATHS = (
19316+
"$(inherited)",
19317+
../../src/plugins,
19318+
../../src/plugins/offline_editing,
19319+
../../src/core,
19320+
../../src/core/raster,
19321+
../../src/core/renderer,
19322+
../../src/core/symbology,
19323+
../../src/gui,
19324+
"$(GEOS_INC)",
19325+
"$(SQLITE_INC)",
19326+
"$(SPATIALITE_INC)",
19327+
);
19328+
LIBRARY_SEARCH_PATHS = "$(QGIS_BUILD_PATH)/MacOS/$(QGIS_LIB_SUBDIR)";
19329+
MACH_O_TYPE = mh_bundle;
19330+
OTHER_CFLAGS = "$(QT_CXXFLAGS)";
19331+
OTHER_LDFLAGS = (
19332+
"$(inherited)",
19333+
"$(QT_LIB_CORE)",
19334+
"$(QT_LIB_GUI)",
19335+
"$(QT_LIB_XML)",
19336+
"$(SQLITE_LIB)",
19337+
"$(SPATIALITE_LIB)",
19338+
);
19339+
PRODUCT_NAME = offlineeditingplugin.so;
19340+
TARGET_PLUGINDIR = offline_editing;
19341+
};
19342+
name = Debug;
19343+
};
19344+
72448A57125D3D290071B130 /* Release */ = {
19345+
isa = XCBuildConfiguration;
19346+
buildSettings = {
19347+
CONFIGURATION_BUILD_DIR = "$(QGIS_BUILD_PATH)/MacOS/$(QGIS_PLUGIN_SUBDIR)";
19348+
EXECUTABLE_PREFIX = lib;
19349+
GCC_DYNAMIC_NO_PIC = NO;
19350+
GCC_PREPROCESSOR_DEFINITIONS = (
19351+
"$(inherited)",
19352+
offlineeditingplugin_EXPORTS,
19353+
);
19354+
HEADER_SEARCH_PATHS = (
19355+
"$(inherited)",
19356+
../../src/plugins,
19357+
../../src/plugins/offline_editing,
19358+
../../src/core,
19359+
../../src/core/raster,
19360+
../../src/core/renderer,
19361+
../../src/core/symbology,
19362+
../../src/gui,
19363+
"$(GEOS_INC)",
19364+
"$(SQLITE_INC)",
19365+
"$(SPATIALITE_INC)",
19366+
);
19367+
LIBRARY_SEARCH_PATHS = "$(QGIS_BUILD_PATH)/MacOS/$(QGIS_LIB_SUBDIR)";
19368+
MACH_O_TYPE = mh_bundle;
19369+
OTHER_CFLAGS = "$(QT_CXXFLAGS)";
19370+
OTHER_LDFLAGS = (
19371+
"$(inherited)",
19372+
"$(QT_LIB_CORE)",
19373+
"$(QT_LIB_GUI)",
19374+
"$(QT_LIB_XML)",
19375+
"$(SQLITE_LIB)",
19376+
"$(SPATIALITE_LIB)",
19377+
);
19378+
PRODUCT_NAME = offlineeditingplugin.so;
19379+
TARGET_PLUGINDIR = offline_editing;
19380+
};
19381+
name = Release;
19382+
};
1915119383
72463E431122FEF200BE5F17 /* Debug */ = {
1915219384
isa = XCBuildConfiguration;
1915319385
buildSettings = {
@@ -22521,6 +22753,15 @@
2252122753
defaultConfigurationIsVisible = 0;
2252222754
defaultConfigurationName = Release;
2252322755
};
22756+
72448A55125D3D290071B130 /* Build configuration list for PBXNativeTarget "offlineeditingplugin" */ = {
22757+
isa = XCConfigurationList;
22758+
buildConfigurations = (
22759+
72448A56125D3D290071B130 /* Debug */,
22760+
72448A57125D3D290071B130 /* Release */,
22761+
);
22762+
defaultConfigurationIsVisible = 0;
22763+
defaultConfigurationName = Release;
22764+
};
2252422765
72463E421122FEF200BE5F17 /* Build configuration list for PBXNativeTarget "qgis.g.browser" */ = {
2252522766
isa = XCConfigurationList;
2252622767
buildConfigurations = (

‎mac/xcode/qgis_settings.xcconfig

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,10 @@ SIP_INC = /usr/local/include
5656
PYQT_SIP_DIR = /usr/local/share/sip/PyQt4
5757
PYQT_SIP_FLAGS = -x VendorID -t WS_MACX -x PyQt_NoPrintRangeBug -t Qt_$(QT_VER_MAJOR)_$(QT_VER_MINOR)_0 -x Py_v3 $(SIP_DISABLE_FEATURES) -g
5858

59+
SIP_DISABLE_FEATURES = $(SIP_DISABLE_FEATURES_$(PYQT4_VER_MAJOR)_$(PYQT4_VER_MINOR))
60+
SIP_DISABLE_FEATURES_4_5 = -x PROXY_FACTORY
61+
SIP_DISABLE_FEATURES_4_7 = -x QSETINT_CONVERSION
62+
5963
BISON = /usr/bin/bison
6064
GPSBABEL = /usr/local/bin/gpsbabel
6165

@@ -234,7 +238,8 @@ DEFS_EXPORT = CORE_EXPORT= GUI_EXPORT= PYTHON_EXPORT= ANALYSIS_EXPORT=
234238

235239
// use full flags instead of Xcode includes and defs,
236240
// since these are needed in scripts also
237-
QT_CXXFLAGS = -DQT_DLL -DQT_SVG_LIB -DQT_GUI_LIB -DQT_XML_LIB -DQT_SQL_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_NO_CAST_TO_ASCII $(QTDEFS_$(CONFIGURATION)) -F$(QT_PREFIX_FW) -I$(QT_PREFIX_FW)/QtCore.framework/Headers -I$(QT_PREFIX_FW)/QtGui.framework/Headers -I$(QT_PREFIX_FW)/QtNetwork.framework/Headers -I$(QT_PREFIX_FW)/QtSql.framework/Headers -I$(QT_PREFIX_FW)/QtSvg.framework/Headers -I$(QT_PREFIX_FW)/QtXml.framework/Headers -I$(QT_PREFIX_FW)/QtWebKit.framework/Headers
241+
QT_CXXFLAGS = -DQT_DLL -DQT_SVG_LIB -DQT_GUI_LIB -DQT_XML_LIB -DQT_SQL_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_NO_CAST_TO_ASCII $(QTDEFS_$(CONFIGURATION)) -F$(QT_PREFIX_FW) $(QT_INC)
242+
QT_INC = -I$(QT_PREFIX_FW)/QtCore.framework/Headers -I$(QT_PREFIX_FW)/QtGui.framework/Headers -I$(QT_PREFIX_FW)/QtNetwork.framework/Headers -I$(QT_PREFIX_FW)/QtSql.framework/Headers -I$(QT_PREFIX_FW)/QtSvg.framework/Headers -I$(QT_PREFIX_FW)/QtXml.framework/Headers -I$(QT_PREFIX_FW)/QtWebKit.framework/Headers
238243
QT_INC_UITOOLS = $(QT_DIR)/include/QtUiTools
239244
QTDEFS_Debug = -DQT_DEBUG
240245
QTDEFS_Release = -DQT_NO_DEBUG
@@ -263,9 +268,6 @@ QTLISTQG = QtCore QtGui QtNetwork QtSql QtSvg QtXml QtWebKit $(QT_USE_$(QT_VER_M
263268
// list of PyQt modules used
264269
PYQTLIST = Qt QtCore QtGui QtNetwork QtSql QtSvg QtXml QtWebKit phonon
265270

266-
SIP_DISABLE_FEATURES = $(SIP_DISABLE_FEATURES_$(PYQT4_VER_MAJOR)_$(PYQT4_VER_MINOR))
267-
SIP_DISABLE_FEATURES_4_5 = -x PROXY_FACTORY
268-
269271
// with a choice of system vs user unix libs, use full path to lib file
270272
// to avoid possible accidental linking to system lib (ie expat)
271273

‎mac/xcode/qgis_user-template.xcconfig

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,8 @@
4141
//SIP_INC = /usr/local/include
4242
//PYQT_SIP_DIR = /usr/local/share/sip/PyQt4
4343
//PYQT_SIP_FLAGS = -x VendorID -t WS_MACX -x PyQt_NoPrintRangeBug -t Qt_$(QT_VER_MAJOR)_$(QT_VER_MINOR)_0 -x Py_v3 -g
44+
// assume for now that PyQt 4.7 is at least 4.7.6, if 4.7.5 or earlier, uncomment following line:
45+
//SIP_DISABLE_FEATURES_4_7 =
4446
//BISON = /usr/bin/bison // Tiger requires user-installed bison 2.3
4547
//GPSBABEL = /usr/local/bin/gpsbabel
4648

0 commit comments

Comments
 (0)
Please sign in to comment.