mirror of
https://github.com/qgis/QGIS.git
synced 2025-10-06 00:07:29 -04:00
attribute dialog (r10550, r10551, r10552), config cleanup
git-svn-id: http://svn.osgeo.org/qgis/trunk@10558 c8812cc2-4d05-0410-92ff-de0c093fc19c
This commit is contained in:
kyngchaos
parent
62d01abe74
commit
a36c0ad56e
@ -302,8 +302,6 @@
|
||||
7209F42B0F3A468C003DC336 /* qgsaddattrdialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7209E5F10F39E57A003DC336 /* qgsaddattrdialog.cpp */; };
|
||||
7209F42C0F3A468C003DC336 /* qgsattributeactiondialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7209E5F30F39E57A003DC336 /* qgsattributeactiondialog.cpp */; };
|
||||
7209F42D0F3A468C003DC336 /* qgsattributedialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7209E5F50F39E57A003DC336 /* qgsattributedialog.cpp */; };
|
||||
7209F42E0F3A468C003DC336 /* qgsattributetable.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7209E5F70F39E57A003DC336 /* qgsattributetable.cpp */; };
|
||||
7209F42F0F3A468C003DC336 /* qgsattributetabledisplay.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7209E5F90F39E57A003DC336 /* qgsattributetabledisplay.cpp */; };
|
||||
7209F4300F3A468C003DC336 /* qgsbookmarkitem.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7209E5FB0F39E57A003DC336 /* qgsbookmarkitem.cpp */; };
|
||||
7209F4310F3A468C003DC336 /* qgsbookmarks.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7209E5FD0F39E57A003DC336 /* qgsbookmarks.cpp */; };
|
||||
7209F4320F3A468C003DC336 /* qgsclipboard.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7209E5FF0F39E57A003DC336 /* qgsclipboard.cpp */; };
|
||||
@ -1136,8 +1134,6 @@
|
||||
7292887E0F71FE65006D9489 /* qgsaddattrdialog.h in Sources */ = {isa = PBXBuildFile; fileRef = 7209E5F20F39E57A003DC336 /* qgsaddattrdialog.h */; };
|
||||
7292887F0F71FE65006D9489 /* qgsattributeactiondialog.h in Sources */ = {isa = PBXBuildFile; fileRef = 7209E5F40F39E57A003DC336 /* qgsattributeactiondialog.h */; };
|
||||
729288800F71FE65006D9489 /* qgsattributedialog.h in Sources */ = {isa = PBXBuildFile; fileRef = 7209E5F60F39E57A003DC336 /* qgsattributedialog.h */; };
|
||||
729288810F71FE65006D9489 /* qgsattributetable.h in Sources */ = {isa = PBXBuildFile; fileRef = 7209E5F80F39E57A003DC336 /* qgsattributetable.h */; };
|
||||
729288820F71FE65006D9489 /* qgsattributetabledisplay.h in Sources */ = {isa = PBXBuildFile; fileRef = 7209E5FA0F39E57A003DC336 /* qgsattributetabledisplay.h */; };
|
||||
729288830F71FE65006D9489 /* qgsbookmarks.h in Sources */ = {isa = PBXBuildFile; fileRef = 7209E5FE0F39E57A003DC336 /* qgsbookmarks.h */; };
|
||||
729288840F71FE65006D9489 /* qgscomposer.h in Sources */ = {isa = PBXBuildFile; fileRef = 7209E5BF0F39E57A003DC336 /* qgscomposer.h */; };
|
||||
729288850F71FE65006D9489 /* qgscomposeritemwidget.h in Sources */ = {isa = PBXBuildFile; fileRef = 7209E5C10F39E57A003DC336 /* qgscomposeritemwidget.h */; };
|
||||
@ -1192,6 +1188,10 @@
|
||||
729288B60F71FEE2006D9489 /* qgsopenvectorlayerdialog.h in Sources */ = {isa = PBXBuildFile; fileRef = 726979A70F71369A00AFA402 /* qgsopenvectorlayerdialog.h */; };
|
||||
729288ED0F7293DB006D9489 /* qgshelpserver.h in Sources */ = {isa = PBXBuildFile; fileRef = 7209E77B0F39E57A003DC336 /* qgshelpserver.h */; };
|
||||
729288EE0F7293DB006D9489 /* qgshelpviewer.h in Sources */ = {isa = PBXBuildFile; fileRef = 7209E77D0F39E57A003DC336 /* qgshelpviewer.h */; };
|
||||
7299E8BA0F90F06C002F58DE /* AUTHORS in Copy - doc */ = {isa = PBXBuildFile; fileRef = 7256F2E50F4147890022BE1F /* AUTHORS */; };
|
||||
7299E8BB0F90F06C002F58DE /* CODING in Copy - doc */ = {isa = PBXBuildFile; fileRef = 7256F2E40F4147890022BE1F /* CODING */; };
|
||||
7299E8BC0F90F06C002F58DE /* SPONSORS in Copy - doc */ = {isa = PBXBuildFile; fileRef = 7256F2DD0F4147890022BE1F /* SPONSORS */; };
|
||||
7299E8BD0F90F06C002F58DE /* TRANSLATORS in Copy - doc */ = {isa = PBXBuildFile; fileRef = 7299E8B70F90EFB9002F58DE /* TRANSLATORS */; };
|
||||
729BBF080F40778A001BCB63 /* main.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7209E7790F39E57A003DC336 /* main.cpp */; };
|
||||
729BBF090F40778E001BCB63 /* qgshelpserver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7209E77A0F39E57A003DC336 /* qgshelpserver.cpp */; };
|
||||
729BBF0A0F407790001BCB63 /* qgshelpviewer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7209E77C0F39E57A003DC336 /* qgshelpviewer.cpp */; };
|
||||
@ -1230,11 +1230,11 @@
|
||||
72A07EA40F3C022A004FC2A4 /* plugin.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7209E7B40F39E57B003DC336 /* plugin.cpp */; };
|
||||
72A07EA50F3C022B004FC2A4 /* plugingui.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7209E7B60F39E57B003DC336 /* plugingui.cpp */; };
|
||||
72A07EA80F3C02E1004FC2A4 /* libqgis_gui.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 7209F38E0F3A2F2B003DC336 /* libqgis_gui.dylib */; };
|
||||
72A239490F74A64400AFC35B /* BeataDialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 72A239430F74A62200AFC35B /* BeataDialog.cpp */; };
|
||||
72A2394A0F74A64400AFC35B /* BeataModel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 72A239450F74A62200AFC35B /* BeataModel.cpp */; };
|
||||
72A2394B0F74A64400AFC35B /* BeataView.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 72A239470F74A62200AFC35B /* BeataView.cpp */; };
|
||||
72A2394C0F74A66400AFC35B /* BeataDialog.h in Sources */ = {isa = PBXBuildFile; fileRef = 72A239440F74A62200AFC35B /* BeataDialog.h */; };
|
||||
72A2394D0F74A66400AFC35B /* BeataModel.h in Sources */ = {isa = PBXBuildFile; fileRef = 72A239460F74A62200AFC35B /* BeataModel.h */; };
|
||||
72A239490F74A64400AFC35B /* qgsattributetabledialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 72A239430F74A62200AFC35B /* qgsattributetabledialog.cpp */; };
|
||||
72A2394A0F74A64400AFC35B /* qgsattributetablemodel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 72A239450F74A62200AFC35B /* qgsattributetablemodel.cpp */; };
|
||||
72A2394B0F74A64400AFC35B /* qgsattributetableview.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 72A239470F74A62200AFC35B /* qgsattributetableview.cpp */; };
|
||||
72A2394C0F74A66400AFC35B /* qgsattributetabledialog.h in Sources */ = {isa = PBXBuildFile; fileRef = 72A239440F74A62200AFC35B /* qgsattributetabledialog.h */; };
|
||||
72A2394D0F74A66400AFC35B /* qgsattributetablemodel.h in Sources */ = {isa = PBXBuildFile; fileRef = 72A239460F74A62200AFC35B /* qgsattributetablemodel.h */; };
|
||||
72A56B2D0F3C810600BA32A1 /* libqgis_core.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 7209F1D20F39E760003DC336 /* libqgis_core.dylib */; };
|
||||
72A56B470F3C822800BA32A1 /* libqgis_core.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 7209F1D20F39E760003DC336 /* libqgis_core.dylib */; };
|
||||
72A56B520F3C823800BA32A1 /* libqgis_core.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 7209F1D20F39E760003DC336 /* libqgis_core.dylib */; };
|
||||
@ -2968,7 +2968,7 @@
|
||||
isa = PBXContainerItemProxy;
|
||||
containerPortal = 20286C28FDCF999611CA2CEA /* Project object */;
|
||||
proxyType = 1;
|
||||
remoteGlobalIDString = 720383490F8B905D0083B883 /* diagramoverlayplugin */;
|
||||
remoteGlobalIDString = 720383490F8B905D0083B883;
|
||||
remoteInfo = diagramoverlayplugin;
|
||||
};
|
||||
7209F3F50F3A3C25003DC336 /* PBXContainerItemProxy */ = {
|
||||
@ -5529,6 +5529,10 @@
|
||||
dstPath = "$(QGIS_DATA_SUBDIR)/doc";
|
||||
dstSubfolderSpec = 6;
|
||||
files = (
|
||||
7299E8BA0F90F06C002F58DE /* AUTHORS in Copy - doc */,
|
||||
7299E8BB0F90F06C002F58DE /* CODING in Copy - doc */,
|
||||
7299E8BC0F90F06C002F58DE /* SPONSORS in Copy - doc */,
|
||||
7299E8BD0F90F06C002F58DE /* TRANSLATORS in Copy - doc */,
|
||||
72EBCB3B0F49E8240016BA3C /* favicon.ico in Copy - doc */,
|
||||
72EBCB3C0F49E8240016BA3C /* index.html in Copy - doc */,
|
||||
72EBCB3D0F49E8240016BA3C /* qgisdoc.css in Copy - doc */,
|
||||
@ -5677,10 +5681,6 @@
|
||||
7209E5F40F39E57A003DC336 /* qgsattributeactiondialog.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = qgsattributeactiondialog.h; path = ../../src/app/qgsattributeactiondialog.h; sourceTree = SOURCE_ROOT; };
|
||||
7209E5F50F39E57A003DC336 /* qgsattributedialog.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = qgsattributedialog.cpp; path = ../../src/app/qgsattributedialog.cpp; sourceTree = SOURCE_ROOT; };
|
||||
7209E5F60F39E57A003DC336 /* qgsattributedialog.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = qgsattributedialog.h; path = ../../src/app/qgsattributedialog.h; sourceTree = SOURCE_ROOT; };
|
||||
7209E5F70F39E57A003DC336 /* qgsattributetable.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = qgsattributetable.cpp; path = ../../src/app/qgsattributetable.cpp; sourceTree = SOURCE_ROOT; };
|
||||
7209E5F80F39E57A003DC336 /* qgsattributetable.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = qgsattributetable.h; path = ../../src/app/qgsattributetable.h; sourceTree = SOURCE_ROOT; };
|
||||
7209E5F90F39E57A003DC336 /* qgsattributetabledisplay.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = qgsattributetabledisplay.cpp; path = ../../src/app/qgsattributetabledisplay.cpp; sourceTree = SOURCE_ROOT; };
|
||||
7209E5FA0F39E57A003DC336 /* qgsattributetabledisplay.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = qgsattributetabledisplay.h; path = ../../src/app/qgsattributetabledisplay.h; sourceTree = SOURCE_ROOT; };
|
||||
7209E5FB0F39E57A003DC336 /* qgsbookmarkitem.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = qgsbookmarkitem.cpp; path = ../../src/app/qgsbookmarkitem.cpp; sourceTree = SOURCE_ROOT; };
|
||||
7209E5FC0F39E57A003DC336 /* qgsbookmarkitem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = qgsbookmarkitem.h; path = ../../src/app/qgsbookmarkitem.h; sourceTree = SOURCE_ROOT; };
|
||||
7209E5FD0F39E57A003DC336 /* qgsbookmarks.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = qgsbookmarks.cpp; path = ../../src/app/qgsbookmarks.cpp; sourceTree = SOURCE_ROOT; };
|
||||
@ -7253,7 +7253,6 @@
|
||||
7209EC8B0F39E57B003DC336 /* qgsaddattrdialogbase.ui */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = qgsaddattrdialogbase.ui; path = ../../src/ui/qgsaddattrdialogbase.ui; sourceTree = SOURCE_ROOT; };
|
||||
7209EC8C0F39E57B003DC336 /* qgsattributeactiondialogbase.ui */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = qgsattributeactiondialogbase.ui; path = ../../src/ui/qgsattributeactiondialogbase.ui; sourceTree = SOURCE_ROOT; };
|
||||
7209EC8D0F39E57B003DC336 /* qgsattributedialogbase.ui */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = qgsattributedialogbase.ui; path = ../../src/ui/qgsattributedialogbase.ui; sourceTree = SOURCE_ROOT; };
|
||||
7209EC8E0F39E57B003DC336 /* qgsattributetablebase.ui */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = qgsattributetablebase.ui; path = ../../src/ui/qgsattributetablebase.ui; sourceTree = SOURCE_ROOT; };
|
||||
7209EC8F0F39E57B003DC336 /* qgsbookmarksbase.ui */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = qgsbookmarksbase.ui; path = ../../src/ui/qgsbookmarksbase.ui; sourceTree = SOURCE_ROOT; };
|
||||
7209EC900F39E57B003DC336 /* qgscomposerbase.ui */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = qgscomposerbase.ui; path = ../../src/ui/qgscomposerbase.ui; sourceTree = SOURCE_ROOT; };
|
||||
7209EC910F39E57B003DC336 /* qgscomposeritemwidgetbase.ui */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = qgscomposeritemwidgetbase.ui; path = ../../src/ui/qgscomposeritemwidgetbase.ui; sourceTree = SOURCE_ROOT; };
|
||||
@ -8123,6 +8122,10 @@
|
||||
721DDCE70F6E97C2006DD13E /* v.in.ogr.qgis.2.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = v.in.ogr.qgis.2.png; path = ../../src/plugins/grass/modules/v.in.ogr.qgis.2.png; sourceTree = SOURCE_ROOT; };
|
||||
721DDCE80F6E97C2006DD13E /* v.in.ogr.qgis.1.svg */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; name = v.in.ogr.qgis.1.svg; path = ../../src/plugins/grass/modules/v.in.ogr.qgis.1.svg; sourceTree = SOURCE_ROOT; };
|
||||
723043270F770E15009B5354 /* bundle-template.sh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = "bundle-template.sh"; sourceTree = "<group>"; };
|
||||
72331DFA0F8E2A2100398D2B /* qgsvectoroverlay.sip */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = qgsvectoroverlay.sip; path = ../../python/core/qgsvectoroverlay.sip; sourceTree = SOURCE_ROOT; };
|
||||
72331DFB0F8E2A2100398D2B /* qgsoverlayobject.sip */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = qgsoverlayobject.sip; path = ../../python/core/qgsoverlayobject.sip; sourceTree = SOURCE_ROOT; };
|
||||
72331DFC0F8E2A5D00398D2B /* sqlite3.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = sqlite3.c; path = ../../src/core/spatialite/sqlite3.c; sourceTree = SOURCE_ROOT; };
|
||||
72331DFD0F8E2A5D00398D2B /* spatialite.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = spatialite.c; path = ../../src/core/spatialite/spatialite.c; sourceTree = SOURCE_ROOT; };
|
||||
7256F29B0F4141240022BE1F /* core.so */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.bundle"; name = core.so; path = generated/python/python/core/core.so; sourceTree = SOURCE_ROOT; };
|
||||
7256F29C0F4141570022BE1F /* gui.so */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.bundle"; name = gui.so; path = generated/python/python/gui/gui.so; sourceTree = SOURCE_ROOT; };
|
||||
7256F2DC0F4147890022BE1F /* TODO */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = TODO; path = ../../TODO; sourceTree = SOURCE_ROOT; };
|
||||
@ -8135,6 +8138,8 @@
|
||||
7256F2E30F4147890022BE1F /* CONTRIBUTORS */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = CONTRIBUTORS; path = ../../CONTRIBUTORS; sourceTree = SOURCE_ROOT; };
|
||||
7256F2E40F4147890022BE1F /* CODING */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = CODING; path = ../../CODING; sourceTree = SOURCE_ROOT; };
|
||||
7256F2E50F4147890022BE1F /* AUTHORS */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = AUTHORS; path = ../../AUTHORS; sourceTree = SOURCE_ROOT; };
|
||||
725B4FEF0F936E1700084072 /* qgsrunprocess.sip */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = qgsrunprocess.sip; path = ../../python/core/qgsrunprocess.sip; sourceTree = SOURCE_ROOT; };
|
||||
725B4FF00F936E3300084072 /* qgsmaptip.sip */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = qgsmaptip.sip; path = ../../python/gui/qgsmaptip.sip; sourceTree = SOURCE_ROOT; };
|
||||
7262ED5A0F7A6E0800498385 /* grass_new_boundary.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = grass_new_boundary.png; path = ../../src/plugins/grass/themes/gis/grass_new_boundary.png; sourceTree = SOURCE_ROOT; };
|
||||
7262ED5B0F7A6E0800498385 /* grass_move_vertex.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = grass_move_vertex.png; path = ../../src/plugins/grass/themes/gis/grass_move_vertex.png; sourceTree = SOURCE_ROOT; };
|
||||
7262ED5C0F7A6E0800498385 /* grass_edit_attributes.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = grass_edit_attributes.png; path = ../../src/plugins/grass/themes/gis/grass_edit_attributes.png; sourceTree = SOURCE_ROOT; };
|
||||
@ -8192,6 +8197,7 @@
|
||||
72745A020F770252007F4218 /* scale_bar.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = scale_bar.png; path = ../../images/themes/gis/plugins/scale_bar.png; sourceTree = SOURCE_ROOT; };
|
||||
72745A030F770252007F4218 /* spit.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = spit.png; path = ../../images/themes/gis/plugins/spit.png; sourceTree = SOURCE_ROOT; };
|
||||
72745A040F770252007F4218 /* wfs.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = wfs.png; path = ../../images/themes/gis/plugins/wfs.png; sourceTree = SOURCE_ROOT; };
|
||||
7299E8B70F90EFB9002F58DE /* TRANSLATORS */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = TRANSLATORS; path = ../../TRANSLATORS; sourceTree = SOURCE_ROOT; };
|
||||
729BBEFF0F40770B001BCB63 /* qgis_help.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = qgis_help.app; sourceTree = BUILT_PRODUCTS_DIR; };
|
||||
729BBF010F40770B001BCB63 /* qgis_help-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "qgis_help-Info.plist"; sourceTree = "<group>"; };
|
||||
729BBF3D0F407CBA001BCB63 /* libqgispython.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = libqgispython.dylib; sourceTree = BUILT_PRODUCTS_DIR; };
|
||||
@ -8208,13 +8214,13 @@
|
||||
72A07E040F3BE917004FC2A4 /* ReadMe-Developers.rtf */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; path = "ReadMe-Developers.rtf"; sourceTree = "<group>"; };
|
||||
72A07E3A0F3BEE16004FC2A4 /* libqgisgrass.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = libqgisgrass.dylib; sourceTree = BUILT_PRODUCTS_DIR; };
|
||||
72A07E5F0F3BF35F004FC2A4 /* libcopyrightlabelplugin.so */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = libcopyrightlabelplugin.so; sourceTree = BUILT_PRODUCTS_DIR; };
|
||||
72A239430F74A62200AFC35B /* BeataDialog.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = BeataDialog.cpp; path = ../../src/app/attributetable/BeataDialog.cpp; sourceTree = SOURCE_ROOT; };
|
||||
72A239440F74A62200AFC35B /* BeataDialog.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = BeataDialog.h; path = ../../src/app/attributetable/BeataDialog.h; sourceTree = SOURCE_ROOT; };
|
||||
72A239450F74A62200AFC35B /* BeataModel.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = BeataModel.cpp; path = ../../src/app/attributetable/BeataModel.cpp; sourceTree = SOURCE_ROOT; };
|
||||
72A239460F74A62200AFC35B /* BeataModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = BeataModel.h; path = ../../src/app/attributetable/BeataModel.h; sourceTree = SOURCE_ROOT; };
|
||||
72A239470F74A62200AFC35B /* BeataView.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = BeataView.cpp; path = ../../src/app/attributetable/BeataView.cpp; sourceTree = SOURCE_ROOT; };
|
||||
72A239480F74A62200AFC35B /* BeataView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = BeataView.h; path = ../../src/app/attributetable/BeataView.h; sourceTree = SOURCE_ROOT; };
|
||||
72A2395B0F74A69300AFC35B /* BeataGui.ui */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = BeataGui.ui; path = ../../src/ui/BeataGui.ui; sourceTree = SOURCE_ROOT; };
|
||||
72A239430F74A62200AFC35B /* qgsattributetabledialog.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = qgsattributetabledialog.cpp; path = ../../src/app/attributetable/qgsattributetabledialog.cpp; sourceTree = SOURCE_ROOT; };
|
||||
72A239440F74A62200AFC35B /* qgsattributetabledialog.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = qgsattributetabledialog.h; path = ../../src/app/attributetable/qgsattributetabledialog.h; sourceTree = SOURCE_ROOT; };
|
||||
72A239450F74A62200AFC35B /* qgsattributetablemodel.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = qgsattributetablemodel.cpp; path = ../../src/app/attributetable/qgsattributetablemodel.cpp; sourceTree = SOURCE_ROOT; };
|
||||
72A239460F74A62200AFC35B /* qgsattributetablemodel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = qgsattributetablemodel.h; path = ../../src/app/attributetable/qgsattributetablemodel.h; sourceTree = SOURCE_ROOT; };
|
||||
72A239470F74A62200AFC35B /* qgsattributetableview.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = qgsattributetableview.cpp; path = ../../src/app/attributetable/qgsattributetableview.cpp; sourceTree = SOURCE_ROOT; };
|
||||
72A239480F74A62200AFC35B /* qgsattributetableview.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = qgsattributetableview.h; path = ../../src/app/attributetable/qgsattributetableview.h; sourceTree = SOURCE_ROOT; };
|
||||
72A2395B0F74A69300AFC35B /* qgsattributetabledialog.ui */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = qgsattributetabledialog.ui; path = ../../src/ui/qgsattributetabledialog.ui; sourceTree = SOURCE_ROOT; };
|
||||
72A56B310F3C810600BA32A1 /* libdelimitedtextplugin.so */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = libdelimitedtextplugin.so; sourceTree = BUILT_PRODUCTS_DIR; };
|
||||
72A56B4B0F3C822800BA32A1 /* libgeoreferencerplugin.so */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = libgeoreferencerplugin.so; sourceTree = BUILT_PRODUCTS_DIR; };
|
||||
72A56B560F3C823800BA32A1 /* libgpsimporterplugin.so */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = libgpsimporterplugin.so; sourceTree = BUILT_PRODUCTS_DIR; };
|
||||
@ -8433,15 +8439,6 @@
|
||||
72F8D9420F8924F100D10CE5 /* qgstolerance.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = qgstolerance.h; path = ../../src/core/qgstolerance.h; sourceTree = SOURCE_ROOT; };
|
||||
72F8D9430F8924F100D10CE5 /* qgstolerance.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = qgstolerance.cpp; path = ../../src/core/qgstolerance.cpp; sourceTree = SOURCE_ROOT; };
|
||||
72F8D9460F89264000D10CE5 /* qgis_he.ts */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = qgis_he.ts; path = ../../i18n/qgis_he.ts; sourceTree = SOURCE_ROOT; };
|
||||
72F8D9490F89268C00D10CE5 /* gaia_exif.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = gaia_exif.c; path = ../../src/core/spatialite/gaiaexif/gaia_exif.c; sourceTree = SOURCE_ROOT; };
|
||||
72F8D94B0F89268C00D10CE5 /* gg_advanced.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = gg_advanced.c; path = ../../src/core/spatialite/gaiageo/gg_advanced.c; sourceTree = SOURCE_ROOT; };
|
||||
72F8D94C0F89268C00D10CE5 /* gg_endian.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = gg_endian.c; path = ../../src/core/spatialite/gaiageo/gg_endian.c; sourceTree = SOURCE_ROOT; };
|
||||
72F8D94D0F89268C00D10CE5 /* gg_geometries.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = gg_geometries.c; path = ../../src/core/spatialite/gaiageo/gg_geometries.c; sourceTree = SOURCE_ROOT; };
|
||||
72F8D94E0F89268C00D10CE5 /* gg_relations.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = gg_relations.c; path = ../../src/core/spatialite/gaiageo/gg_relations.c; sourceTree = SOURCE_ROOT; };
|
||||
72F8D94F0F89268C00D10CE5 /* gg_shape.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = gg_shape.c; path = ../../src/core/spatialite/gaiageo/gg_shape.c; sourceTree = SOURCE_ROOT; };
|
||||
72F8D9500F89268C00D10CE5 /* gg_transform.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = gg_transform.c; path = ../../src/core/spatialite/gaiageo/gg_transform.c; sourceTree = SOURCE_ROOT; };
|
||||
72F8D9510F89268C00D10CE5 /* gg_wkb.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = gg_wkb.c; path = ../../src/core/spatialite/gaiageo/gg_wkb.c; sourceTree = SOURCE_ROOT; };
|
||||
72F8D9520F89268C00D10CE5 /* gg_wkt.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = gg_wkt.c; path = ../../src/core/spatialite/gaiageo/gg_wkt.c; sourceTree = SOURCE_ROOT; };
|
||||
72F8D9550F89268C00D10CE5 /* gaiaaux.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = gaiaaux.h; path = ../../src/core/spatialite/headers/spatialite/gaiaaux.h; sourceTree = SOURCE_ROOT; };
|
||||
72F8D9560F89268C00D10CE5 /* gaiaexif.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = gaiaexif.h; path = ../../src/core/spatialite/headers/spatialite/gaiaexif.h; sourceTree = SOURCE_ROOT; };
|
||||
72F8D9570F89268C00D10CE5 /* gaiageo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = gaiageo.h; path = ../../src/core/spatialite/headers/spatialite/gaiageo.h; sourceTree = SOURCE_ROOT; };
|
||||
@ -8449,18 +8446,6 @@
|
||||
72F8D9590F89268C00D10CE5 /* sqlite3.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = sqlite3.h; path = ../../src/core/spatialite/headers/spatialite/sqlite3.h; sourceTree = SOURCE_ROOT; };
|
||||
72F8D95A0F89268C00D10CE5 /* sqlite3ext.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = sqlite3ext.h; path = ../../src/core/spatialite/headers/spatialite/sqlite3ext.h; sourceTree = SOURCE_ROOT; };
|
||||
72F8D95B0F89268C00D10CE5 /* spatialite.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = spatialite.h; path = ../../src/core/spatialite/headers/spatialite.h; sourceTree = SOURCE_ROOT; };
|
||||
72F8D95D0F89268C00D10CE5 /* mbrcache.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = mbrcache.c; path = ../../src/core/spatialite/spatialite/mbrcache.c; sourceTree = SOURCE_ROOT; };
|
||||
72F8D95E0F89268C00D10CE5 /* spatialite.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = spatialite.c; path = ../../src/core/spatialite/spatialite/spatialite.c; sourceTree = SOURCE_ROOT; };
|
||||
72F8D95F0F89268C00D10CE5 /* virtualfdo.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = virtualfdo.c; path = ../../src/core/spatialite/spatialite/virtualfdo.c; sourceTree = SOURCE_ROOT; };
|
||||
72F8D9600F89268C00D10CE5 /* virtualnetwork.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = virtualnetwork.c; path = ../../src/core/spatialite/spatialite/virtualnetwork.c; sourceTree = SOURCE_ROOT; };
|
||||
72F8D9610F89268C00D10CE5 /* virtualshape.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = virtualshape.c; path = ../../src/core/spatialite/spatialite/virtualshape.c; sourceTree = SOURCE_ROOT; };
|
||||
72F8D9630F89268C00D10CE5 /* spatialite_c99.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = spatialite_c99.c; path = ../../src/core/spatialite/spatialite_c99/spatialite_c99.c; sourceTree = SOURCE_ROOT; };
|
||||
72F8D9650F89268C00D10CE5 /* version.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = version.c; path = ../../src/core/spatialite/versioninfo/version.c; sourceTree = SOURCE_ROOT; };
|
||||
72F8D9680F89268C00D10CE5 /* gg_sqlaux.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = gg_sqlaux.c; path = ../../src/core/spatialite/virtualtext/gaiaaux/gg_sqlaux.c; sourceTree = SOURCE_ROOT; };
|
||||
72F8D9690F89268C00D10CE5 /* gg_utf8.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = gg_utf8.c; path = ../../src/core/spatialite/virtualtext/gaiaaux/gg_utf8.c; sourceTree = SOURCE_ROOT; };
|
||||
72F8D96B0F89268C00D10CE5 /* sqlite3.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = sqlite3.c; path = ../../src/core/spatialite/virtualtext/sqlite3/sqlite3.c; sourceTree = SOURCE_ROOT; };
|
||||
72F8D96D0F89268C00D10CE5 /* version.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = version.c; path = ../../src/core/spatialite/virtualtext/versiontext/version.c; sourceTree = SOURCE_ROOT; };
|
||||
72F8D96F0F89268C00D10CE5 /* virtualtext.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = virtualtext.c; path = ../../src/core/spatialite/virtualtext/virtualtext/virtualtext.c; sourceTree = SOURCE_ROOT; };
|
||||
8D0C4E960486CD37000505A6 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
|
||||
/* End PBXFileReference section */
|
||||
|
||||
@ -8825,6 +8810,7 @@
|
||||
7256F2DE0F4147890022BE1F /* README */,
|
||||
7256F2DD0F4147890022BE1F /* SPONSORS */,
|
||||
7256F2DC0F4147890022BE1F /* TODO */,
|
||||
7299E8B70F90EFB9002F58DE /* TRANSLATORS */,
|
||||
);
|
||||
name = Sources;
|
||||
sourceTree = "<group>";
|
||||
@ -8977,10 +8963,6 @@
|
||||
7209E5F40F39E57A003DC336 /* qgsattributeactiondialog.h */,
|
||||
7209E5F50F39E57A003DC336 /* qgsattributedialog.cpp */,
|
||||
7209E5F60F39E57A003DC336 /* qgsattributedialog.h */,
|
||||
7209E5F70F39E57A003DC336 /* qgsattributetable.cpp */,
|
||||
7209E5F80F39E57A003DC336 /* qgsattributetable.h */,
|
||||
7209E5F90F39E57A003DC336 /* qgsattributetabledisplay.cpp */,
|
||||
7209E5FA0F39E57A003DC336 /* qgsattributetabledisplay.h */,
|
||||
7209E5FB0F39E57A003DC336 /* qgsbookmarkitem.cpp */,
|
||||
7209E5FC0F39E57A003DC336 /* qgsbookmarkitem.h */,
|
||||
7209E5FD0F39E57A003DC336 /* qgsbookmarks.cpp */,
|
||||
@ -11158,13 +11140,12 @@
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
7209EC880F39E57B003DC336 /* CMakeLists.txt */,
|
||||
72A2395B0F74A69300AFC35B /* BeataGui.ui */,
|
||||
72A2395B0F74A69300AFC35B /* qgsattributetabledialog.ui */,
|
||||
7209EC890F39E57B003DC336 /* qgisappbase.ui */,
|
||||
7209EC8A0F39E57B003DC336 /* qgsabout.ui */,
|
||||
7209EC8B0F39E57B003DC336 /* qgsaddattrdialogbase.ui */,
|
||||
7209EC8C0F39E57B003DC336 /* qgsattributeactiondialogbase.ui */,
|
||||
7209EC8D0F39E57B003DC336 /* qgsattributedialogbase.ui */,
|
||||
7209EC8E0F39E57B003DC336 /* qgsattributetablebase.ui */,
|
||||
7209EC8F0F39E57B003DC336 /* qgsbookmarksbase.ui */,
|
||||
7209EC900F39E57B003DC336 /* qgscomposerbase.ui */,
|
||||
7209EC910F39E57B003DC336 /* qgscomposeritemwidgetbase.ui */,
|
||||
@ -11565,6 +11546,7 @@
|
||||
7209EDB00F39E5D9003DC336 /* qgsrect.sip */,
|
||||
7209EDB10F39E5D9003DC336 /* qgsrendercontext.sip */,
|
||||
7209EDB20F39E5D9003DC336 /* qgsrenderer.sip */,
|
||||
725B4FEF0F936E1700084072 /* qgsrunprocess.sip */,
|
||||
7209EDB30F39E5D9003DC336 /* qgsscalecalculator.sip */,
|
||||
7209EDB40F39E5D9003DC336 /* qgssinglesymbolrenderer.sip */,
|
||||
7209EDB50F39E5D9003DC336 /* qgssnapper.sip */,
|
||||
@ -11586,6 +11568,8 @@
|
||||
72E9A3C50F5AE63500E78E3C /* qgscomposerpicture.sip */,
|
||||
72E9A3C60F5AE63500E78E3C /* qgscomposerscalebar.sip */,
|
||||
72E9A3C70F5AE63500E78E3C /* qgscomposerlabel.sip */,
|
||||
72331DFA0F8E2A2100398D2B /* qgsvectoroverlay.sip */,
|
||||
72331DFB0F8E2A2100398D2B /* qgsoverlayobject.sip */,
|
||||
);
|
||||
name = core;
|
||||
path = ../../python/core;
|
||||
@ -11604,6 +11588,7 @@
|
||||
7209EDC40F39E5D9003DC336 /* qgsmapcanvasmap.sip */,
|
||||
7209EDC50F39E5D9003DC336 /* qgsmapcanvassnapper.sip */,
|
||||
7209EDC60F39E5D9003DC336 /* qgsmapoverviewcanvas.sip */,
|
||||
725B4FF00F936E3300084072 /* qgsmaptip.sip */,
|
||||
7209EDC70F39E5D9003DC336 /* qgsmaptool.sip */,
|
||||
7209EDC80F39E5D9003DC336 /* qgsmaptoolemitpoint.sip */,
|
||||
7209EDC90F39E5D9003DC336 /* qgsmaptoolpan.sip */,
|
||||
@ -12527,12 +12512,12 @@
|
||||
72A239420F74A62200AFC35B /* attributetable */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
72A239430F74A62200AFC35B /* BeataDialog.cpp */,
|
||||
72A239440F74A62200AFC35B /* BeataDialog.h */,
|
||||
72A239450F74A62200AFC35B /* BeataModel.cpp */,
|
||||
72A239460F74A62200AFC35B /* BeataModel.h */,
|
||||
72A239470F74A62200AFC35B /* BeataView.cpp */,
|
||||
72A239480F74A62200AFC35B /* BeataView.h */,
|
||||
72A239430F74A62200AFC35B /* qgsattributetabledialog.cpp */,
|
||||
72A239440F74A62200AFC35B /* qgsattributetabledialog.h */,
|
||||
72A239450F74A62200AFC35B /* qgsattributetablemodel.cpp */,
|
||||
72A239460F74A62200AFC35B /* qgsattributetablemodel.h */,
|
||||
72A239470F74A62200AFC35B /* qgsattributetableview.cpp */,
|
||||
72A239480F74A62200AFC35B /* qgsattributetableview.h */,
|
||||
);
|
||||
name = attributetable;
|
||||
path = ../../src/app/attributetable;
|
||||
@ -12789,43 +12774,14 @@
|
||||
72F8D9470F89268C00D10CE5 /* spatialite */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
72F8D9480F89268C00D10CE5 /* gaiaexif */,
|
||||
72F8D94A0F89268C00D10CE5 /* gaiageo */,
|
||||
72331DFC0F8E2A5D00398D2B /* sqlite3.c */,
|
||||
72331DFD0F8E2A5D00398D2B /* spatialite.c */,
|
||||
72F8D9530F89268C00D10CE5 /* headers */,
|
||||
72F8D95C0F89268C00D10CE5 /* spatialite */,
|
||||
72F8D9620F89268C00D10CE5 /* spatialite_c99 */,
|
||||
72F8D9640F89268C00D10CE5 /* versioninfo */,
|
||||
72F8D9660F89268C00D10CE5 /* virtualtext */,
|
||||
);
|
||||
name = spatialite;
|
||||
path = ../../src/core/spatialite;
|
||||
sourceTree = SOURCE_ROOT;
|
||||
};
|
||||
72F8D9480F89268C00D10CE5 /* gaiaexif */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
72F8D9490F89268C00D10CE5 /* gaia_exif.c */,
|
||||
);
|
||||
name = gaiaexif;
|
||||
path = ../../src/core/spatialite/gaiaexif;
|
||||
sourceTree = SOURCE_ROOT;
|
||||
};
|
||||
72F8D94A0F89268C00D10CE5 /* gaiageo */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
72F8D94B0F89268C00D10CE5 /* gg_advanced.c */,
|
||||
72F8D94C0F89268C00D10CE5 /* gg_endian.c */,
|
||||
72F8D94D0F89268C00D10CE5 /* gg_geometries.c */,
|
||||
72F8D94E0F89268C00D10CE5 /* gg_relations.c */,
|
||||
72F8D94F0F89268C00D10CE5 /* gg_shape.c */,
|
||||
72F8D9500F89268C00D10CE5 /* gg_transform.c */,
|
||||
72F8D9510F89268C00D10CE5 /* gg_wkb.c */,
|
||||
72F8D9520F89268C00D10CE5 /* gg_wkt.c */,
|
||||
);
|
||||
name = gaiageo;
|
||||
path = ../../src/core/spatialite/gaiageo;
|
||||
sourceTree = SOURCE_ROOT;
|
||||
};
|
||||
72F8D9530F89268C00D10CE5 /* headers */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
@ -12850,86 +12806,6 @@
|
||||
path = ../../src/core/spatialite/headers/spatialite;
|
||||
sourceTree = SOURCE_ROOT;
|
||||
};
|
||||
72F8D95C0F89268C00D10CE5 /* spatialite */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
72F8D95D0F89268C00D10CE5 /* mbrcache.c */,
|
||||
72F8D95E0F89268C00D10CE5 /* spatialite.c */,
|
||||
72F8D95F0F89268C00D10CE5 /* virtualfdo.c */,
|
||||
72F8D9600F89268C00D10CE5 /* virtualnetwork.c */,
|
||||
72F8D9610F89268C00D10CE5 /* virtualshape.c */,
|
||||
);
|
||||
name = spatialite;
|
||||
path = ../../src/core/spatialite/spatialite;
|
||||
sourceTree = SOURCE_ROOT;
|
||||
};
|
||||
72F8D9620F89268C00D10CE5 /* spatialite_c99 */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
72F8D9630F89268C00D10CE5 /* spatialite_c99.c */,
|
||||
);
|
||||
name = spatialite_c99;
|
||||
path = ../../src/core/spatialite/spatialite_c99;
|
||||
sourceTree = SOURCE_ROOT;
|
||||
};
|
||||
72F8D9640F89268C00D10CE5 /* versioninfo */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
72F8D9650F89268C00D10CE5 /* version.c */,
|
||||
);
|
||||
name = versioninfo;
|
||||
path = ../../src/core/spatialite/versioninfo;
|
||||
sourceTree = SOURCE_ROOT;
|
||||
};
|
||||
72F8D9660F89268C00D10CE5 /* virtualtext */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
72F8D9670F89268C00D10CE5 /* gaiaaux */,
|
||||
72F8D96A0F89268C00D10CE5 /* sqlite3 */,
|
||||
72F8D96C0F89268C00D10CE5 /* versiontext */,
|
||||
72F8D96E0F89268C00D10CE5 /* virtualtext */,
|
||||
);
|
||||
name = virtualtext;
|
||||
path = ../../src/core/spatialite/virtualtext;
|
||||
sourceTree = SOURCE_ROOT;
|
||||
};
|
||||
72F8D9670F89268C00D10CE5 /* gaiaaux */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
72F8D9680F89268C00D10CE5 /* gg_sqlaux.c */,
|
||||
72F8D9690F89268C00D10CE5 /* gg_utf8.c */,
|
||||
);
|
||||
name = gaiaaux;
|
||||
path = ../../src/core/spatialite/virtualtext/gaiaaux;
|
||||
sourceTree = SOURCE_ROOT;
|
||||
};
|
||||
72F8D96A0F89268C00D10CE5 /* sqlite3 */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
72F8D96B0F89268C00D10CE5 /* sqlite3.c */,
|
||||
);
|
||||
name = sqlite3;
|
||||
path = ../../src/core/spatialite/virtualtext/sqlite3;
|
||||
sourceTree = SOURCE_ROOT;
|
||||
};
|
||||
72F8D96C0F89268C00D10CE5 /* versiontext */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
72F8D96D0F89268C00D10CE5 /* version.c */,
|
||||
);
|
||||
name = versiontext;
|
||||
path = ../../src/core/spatialite/virtualtext/versiontext;
|
||||
sourceTree = SOURCE_ROOT;
|
||||
};
|
||||
72F8D96E0F89268C00D10CE5 /* virtualtext */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
72F8D96F0F89268C00D10CE5 /* virtualtext.c */,
|
||||
);
|
||||
name = virtualtext;
|
||||
path = ../../src/core/spatialite/virtualtext/virtualtext;
|
||||
sourceTree = SOURCE_ROOT;
|
||||
};
|
||||
/* End PBXGroup section */
|
||||
|
||||
/* Begin PBXHeadersBuildPhase section */
|
||||
@ -14214,7 +14090,7 @@
|
||||
);
|
||||
runOnlyForDeploymentPostprocessing = 0;
|
||||
shellPath = /bin/sh;
|
||||
shellScript = "# Note: assumes default Qt binary framework install\n\nAPPDIRC=\"$QGIS_BUILD_PATH\" # app contents\nAPPDIR=\"$APPDIRC/MacOS\"\nFWDIR=\"$APPDIR/$QGIS_FW_SUBDIR\"\nLIBDIR=\"$APPDIR/$QGIS_LIB_SUBDIR\"\nQGISPYDIR=\"$APPDIR/$QGIS_DATA_SUBDIR/python\"\n\n# copy Qt frameworks\nmkdir -p \"$FWDIR\"\nfor q in $QTLISTQG\ndo\n\tif [ ! -d \"$FWDIR/$q.framework\" ] ; then\n\t\tcp -Rf \"/Library/Frameworks/$q.framework\" \"$FWDIR\"\n\t\trm -f \"$FWDIR/$q.framework/$q.prl\"\n\t\t# Qt headers might be useful?\n\t\trm -f \"$FWDIR/$q.framework/Headers\"\n\t\trm -Rf \"$FWDIR/$q.framework/Versions/$QT_FWVER/Headers\"\n\tfi\ndone\n\n# copy Qt plugins\nmkdir -p \"$APPDIRC/PlugIns/imageformats\"\nif [ ! -f \"$APPDIRC/PlugIns/imageformats/libqjpeg.dylib\" ] ; then\n\tcp -f \"$QTDIR/plugins/imageformats/libqjpeg.dylib\" \"$APPDIRC/PlugIns/imageformats/\"\nfi\n\n# PyQt path based on PYTHON_FORM\nif [ \"$PYTHON_FORM\" = \"fw\" ] ; then\n\tPYSITE=\"/Library/Frameworks/Python.framework/Versions/$PYTHON_VERSION/lib/python$PYTHON_VERSION/site-packages\"\nelif [ \"$PYTHON_FORM\" = \"system\" ] ; then\n\tPYSITE=\"/Library/Python/$PYTHON_VERSION/site-packages\"\nelse\n\tPYSITE=\"\"\nfi\n\nif [ \"$PYSITE\" ] ; then\n\tmkdir -p \"$QGISPYDIR/PyQt$QT_FWVER\"\n\tif [ ! -f \"$QGISPYDIR/sip.so\" ] ; then\n\t\tcp -f \"$PYSITE/sip.so\" \"$PYSITE/sipconfig.py\" \"$QGISPYDIR/\"\n\tfi\n\tfor q in $PYQTLIST\n\tdo\n\t\tif [ ! -f \"$QGISPYDIR/PyQt$QT_FWVER/$q.so\" ] ; then\n\t\t\tcp -f \"$PYSITE/PyQt$QT_FWVER/$q.so\" \"$QGISPYDIR/PyQt$QT_FWVER/\"\n\t\tfi\n\tdone\n\tcp -f \"$PYSITE/PyQt$QT_FWVER/\"*.py \"$QGISPYDIR/PyQt$QT_FWVER/\"\nfi\n\n# just in case no plugins were compiled\nmkdir -p \"$APPDIR/$QGIS_PLUGIN_SUBDIR\"\n# list plugins & libs\ncd \"$APPDIR/$QGIS_PLUGIN_SUBDIR\"\npluglist=`ls`\ncd \"$APPDIR/$QGIS_LIB_SUBDIR\"\nqgliblist=`ls *.dylib`\n\n# main Qt framework loop\n\ncd \"$APPDIR\"\n\nfor q in $QTLISTQG\ndo\n\tqq=\"$q.framework/Versions/$QT_FWVER/$q\"\n\t# app\n\tinstall_name_tool -change $qq @executable_path/$QGIS_FW_SUBDIR/$qq \"$APPDIR/Qgis\"\n\t# bin\n\t# qgis_help qt linking done with symlinks\n\tinstall_name_tool -change $qq @executable_path/$QGIS_FW_SUBDIR/$qq \"$APPDIR/$QGIS_BIN_SUBDIR/qgis_help.app/Contents/MacOS/qgis_help\"\n\t# libs\n\tfor ql in $qgliblist\n\tdo\n\t\tinstall_name_tool -change $qq @executable_path/$QGIS_FW_SUBDIR/$qq \"$APPDIR/$QGIS_LIB_SUBDIR/$ql\"\n\tdone\n\t# plugins\n\tfor qp in $pluglist\n\tdo\n\t\tinstall_name_tool -change $qq @executable_path/$QGIS_FW_SUBDIR/$qq \"$APPDIR/$QGIS_PLUGIN_SUBDIR/$qp\"\n\tdone\n\t# qt fw\n\tfor qf in $QTLISTQG\n\tdo\n\t\tinstall_name_tool -change $qq @executable_path/$QGIS_FW_SUBDIR/$qq \"$APPDIR/$QGIS_FW_SUBDIR/$qf.framework/Versions/$QT_FWVER/$qf\"\n\tdone\n\t# qt plugs\n\tinstall_name_tool -change $qq @executable_path/$QGIS_FW_SUBDIR/$qq \"$APPDIRC/PlugIns/imageformats/libqjpeg.dylib\"\n\t# PyQt\n\tif [ \"$PYSITE\" ] ; then\n\tfor pq in $PYQTLIST\n\t\tdo\n\t\t\tinstall_name_tool -change $qq @executable_path/$QGIS_FW_SUBDIR/$qq \"$QGISPYDIR/PyQt$QT_FWVER/$pq.so\"\n\t\tdone\n\t\tinstall_name_tool -change $qq @executable_path/$QGIS_FW_SUBDIR/$qq \"$QGISPYDIR/qgis/core.so\"\n\t\tinstall_name_tool -change $qq @executable_path/$QGIS_FW_SUBDIR/$qq \"$QGISPYDIR/qgis/gui.so\"\n\tfi\ndone\n";
|
||||
shellScript = "# Note: assumes default Qt binary framework install\n\nAPPDIRC=\"$QGIS_BUILD_PATH\" # app contents\nAPPDIR=\"$APPDIRC/MacOS\"\nFWDIR=\"$APPDIR/$QGIS_FW_SUBDIR\"\nLIBDIR=\"$APPDIR/$QGIS_LIB_SUBDIR\"\nQGISPYDIR=\"$APPDIR/$QGIS_DATA_SUBDIR/python\"\n\n# copy Qt frameworks\nmkdir -p \"$FWDIR\"\nfor q in $QTLISTQG\ndo\n\tif [ ! -d \"$FWDIR/$q.framework\" ] ; then\n\t\tcp -Rf \"/Library/Frameworks/$q.framework\" \"$FWDIR\"\n\t\trm -f \"$FWDIR/$q.framework/$q.prl\"\n\t\t# Qt headers might be useful?\n\t\trm -f \"$FWDIR/$q.framework/Headers\"\n\t\trm -Rf \"$FWDIR/$q.framework/Versions/$QT_FWVER/Headers\"\n\tfi\ndone\n\n# copy Qt plugins\nmkdir -p \"$APPDIRC/PlugIns/imageformats\"\nif [ ! -f \"$APPDIRC/PlugIns/imageformats/libqjpeg.dylib\" ] ; then\n\tcp -f \"$QT_PLUGINS_DIR/imageformats/libqjpeg.dylib\" \"$APPDIRC/PlugIns/imageformats/\"\nfi\n\n# PyQt path based on PYTHON_FORM\n\nif [ \"$PYSITE\" ] ; then\n\tmkdir -p \"$QGISPYDIR/PyQt$QT_FWVER\"\n\tif [ ! -f \"$QGISPYDIR/sip.so\" ] ; then\n\t\tcp -f \"$PYSITE/sip.so\" \"$PYSITE/sipconfig.py\" \"$QGISPYDIR/\"\n\tfi\n\tfor q in $PYQTLIST\n\tdo\n\t\tif [ ! -f \"$QGISPYDIR/PyQt$QT_FWVER/$q.so\" ] ; then\n\t\t\tcp -f \"$PYSITE/PyQt$QT_FWVER/$q.so\" \"$QGISPYDIR/PyQt$QT_FWVER/\"\n\t\tfi\n\tdone\n\tcp -f \"$PYSITE/PyQt$QT_FWVER/\"*.py \"$QGISPYDIR/PyQt$QT_FWVER/\"\nfi\n\n# just in case no plugins were compiled\nmkdir -p \"$APPDIR/$QGIS_PLUGIN_SUBDIR\"\n# list plugins & libs\ncd \"$APPDIR/$QGIS_PLUGIN_SUBDIR\"\npluglist=`ls`\ncd \"$APPDIR/$QGIS_LIB_SUBDIR\"\nqgliblist=`ls *.dylib`\n\n# main Qt framework loop\n\ncd \"$APPDIR\"\n\nfor q in $QTLISTQG\ndo\n\tqq=\"$q.framework/Versions/$QT_FWVER/$q\"\n\t# app\n\tinstall_name_tool -change $qq @executable_path/$QGIS_FW_SUBDIR/$qq \"$APPDIR/Qgis\"\n\t# bin\n\t# qgis_help qt linking done with symlinks\n\tinstall_name_tool -change $qq @executable_path/$QGIS_FW_SUBDIR/$qq \"$APPDIR/$QGIS_BIN_SUBDIR/qgis_help.app/Contents/MacOS/qgis_help\"\n\t# libs\n\tfor ql in $qgliblist\n\tdo\n\t\tinstall_name_tool -change $qq @executable_path/$QGIS_FW_SUBDIR/$qq \"$APPDIR/$QGIS_LIB_SUBDIR/$ql\"\n\tdone\n\t# plugins\n\tfor qp in $pluglist\n\tdo\n\t\tinstall_name_tool -change $qq @executable_path/$QGIS_FW_SUBDIR/$qq \"$APPDIR/$QGIS_PLUGIN_SUBDIR/$qp\"\n\tdone\n\t# qt fw\n\tfor qf in $QTLISTQG\n\tdo\n\t\tinstall_name_tool -change $qq @executable_path/$QGIS_FW_SUBDIR/$qq \"$APPDIR/$QGIS_FW_SUBDIR/$qf.framework/Versions/$QT_FWVER/$qf\"\n\tdone\n\t# qt plugs\n\tinstall_name_tool -change $qq @executable_path/$QGIS_FW_SUBDIR/$qq \"$APPDIRC/PlugIns/imageformats/libqjpeg.dylib\"\n\t# PyQt\n\tif [ \"$PYSITE\" ] ; then\n\tfor pq in $PYQTLIST\n\t\tdo\n\t\t\tinstall_name_tool -change $qq @executable_path/$QGIS_FW_SUBDIR/$qq \"$QGISPYDIR/PyQt$QT_FWVER/$pq.so\"\n\t\tdone\n\t\tinstall_name_tool -change $qq @executable_path/$QGIS_FW_SUBDIR/$qq \"$QGISPYDIR/qgis/core.so\"\n\t\tinstall_name_tool -change $qq @executable_path/$QGIS_FW_SUBDIR/$qq \"$QGISPYDIR/qgis/gui.so\"\n\tfi\ndone\n";
|
||||
showEnvVarsInLog = 0;
|
||||
};
|
||||
/* End PBXShellScriptBuildPhase section */
|
||||
@ -14810,8 +14686,6 @@
|
||||
7209F42B0F3A468C003DC336 /* qgsaddattrdialog.cpp in Sources */,
|
||||
7209F42C0F3A468C003DC336 /* qgsattributeactiondialog.cpp in Sources */,
|
||||
7209F42D0F3A468C003DC336 /* qgsattributedialog.cpp in Sources */,
|
||||
7209F42E0F3A468C003DC336 /* qgsattributetable.cpp in Sources */,
|
||||
7209F42F0F3A468C003DC336 /* qgsattributetabledisplay.cpp in Sources */,
|
||||
7209F4300F3A468C003DC336 /* qgsbookmarkitem.cpp in Sources */,
|
||||
7209F4310F3A468C003DC336 /* qgsbookmarks.cpp in Sources */,
|
||||
7209F4320F3A468C003DC336 /* qgsclipboard.cpp in Sources */,
|
||||
@ -14892,8 +14766,6 @@
|
||||
7292887E0F71FE65006D9489 /* qgsaddattrdialog.h in Sources */,
|
||||
7292887F0F71FE65006D9489 /* qgsattributeactiondialog.h in Sources */,
|
||||
729288800F71FE65006D9489 /* qgsattributedialog.h in Sources */,
|
||||
729288810F71FE65006D9489 /* qgsattributetable.h in Sources */,
|
||||
729288820F71FE65006D9489 /* qgsattributetabledisplay.h in Sources */,
|
||||
729288830F71FE65006D9489 /* qgsbookmarks.h in Sources */,
|
||||
729288840F71FE65006D9489 /* qgscomposer.h in Sources */,
|
||||
729288850F71FE65006D9489 /* qgscomposeritemwidget.h in Sources */,
|
||||
@ -14946,11 +14818,11 @@
|
||||
729288B40F71FEE2006D9489 /* qgsnewogrconnection.h in Sources */,
|
||||
729288B50F71FEE2006D9489 /* qgsogrsublayersdialog.h in Sources */,
|
||||
729288B60F71FEE2006D9489 /* qgsopenvectorlayerdialog.h in Sources */,
|
||||
72A239490F74A64400AFC35B /* BeataDialog.cpp in Sources */,
|
||||
72A2394A0F74A64400AFC35B /* BeataModel.cpp in Sources */,
|
||||
72A2394B0F74A64400AFC35B /* BeataView.cpp in Sources */,
|
||||
72A2394C0F74A66400AFC35B /* BeataDialog.h in Sources */,
|
||||
72A2394D0F74A66400AFC35B /* BeataModel.h in Sources */,
|
||||
72A239490F74A64400AFC35B /* qgsattributetabledialog.cpp in Sources */,
|
||||
72A2394A0F74A64400AFC35B /* qgsattributetablemodel.cpp in Sources */,
|
||||
72A2394B0F74A64400AFC35B /* qgsattributetableview.cpp in Sources */,
|
||||
72A2394C0F74A66400AFC35B /* qgsattributetabledialog.h in Sources */,
|
||||
72A2394D0F74A66400AFC35B /* qgsattributetablemodel.h in Sources */,
|
||||
7262ED830F7A750F00498385 /* qgsspatialitefilterproxymodel.cpp in Sources */,
|
||||
7262ED840F7A750F00498385 /* qgsspatialitetablemodel.cpp in Sources */,
|
||||
7262EDCD0F7A9FFC00498385 /* qgsspatialitetablemodel.h in Sources */,
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
// QGIS Xcode project common build settings
|
||||
|
||||
CURRENT_PROJECT_VERSION = 2.1.5
|
||||
CURRENT_PROJECT_VERSION = 2.1.6
|
||||
|
||||
// SDK not required for native universal build, but recommended,
|
||||
// and allows building multiple SDK builds side-by-side
|
||||
@ -14,7 +14,7 @@ ARCHS = $(NATIVE_ARCH)
|
||||
//////////////////////////////////////////////////////////////////////
|
||||
|
||||
// major-minor-patch must be integers for Mac OS X
|
||||
QGIS_RELEASE_NAME = Unstable-trunk
|
||||
QGIS_RELEASE_NAME = Pan (Unstable)
|
||||
QGIS_VERSION_MAJOR = 1
|
||||
QGIS_VERSION_MINOR = 1
|
||||
QGIS_VERSION_PATCH = 0
|
||||
@ -22,21 +22,15 @@ QGIS_VERSION_BUILD = 20090407
|
||||
QGIS_VERSION_FULL = $(QGIS_VERSION_MAJOR).$(QGIS_VERSION_MINOR).$(QGIS_VERSION_PATCH)-$(QGIS_VERSION_BUILD)
|
||||
QGIS_VERSION_INT = 10100
|
||||
|
||||
// library version - generally, keep in sync with qgis version
|
||||
LIBQGIS_VERSION_MAJOR = $(QGIS_VERSION_MAJOR)
|
||||
LIBQGIS_VERSION_MINOR = $(QGIS_VERSION_MINOR)
|
||||
LIBQGIS_VERSION_CURRENT = $(LIBQGIS_VERSION_MAJOR).$(LIBQGIS_VERSION_MINOR)
|
||||
LIBQGIS_VERSION_COMPAT = $(LIBQGIS_VERSION_MAJOR).0
|
||||
|
||||
//////////////////////////////////////////////////////////////////////
|
||||
// Qt and other support
|
||||
//////////////////////////////////////////////////////////////////////
|
||||
|
||||
// ***TODO*** - detect current version, only used in bundle script
|
||||
QT_FWVER = 4 // the Versions/ folder name
|
||||
QT_MVER = 4 // the install_name version
|
||||
QT_FWVER = $(QT_MVER) // the Versions/ folder name, normally same as Qt ver
|
||||
|
||||
QTDIR = /Developer/Applications/Qt
|
||||
QT_PLUGINS_DIR = /Developer/Applications/Qt/plugins
|
||||
QTBIN = /Developer/Tools/Qt
|
||||
QTMOC = $(QTBIN)/moc
|
||||
QTUIC = $(QTBIN)/uic
|
||||
@ -44,8 +38,6 @@ QTRCC = $(QTBIN)/rcc
|
||||
QTLREL = $(QTBIN)/lrelease
|
||||
BISON = /usr/bin/bison
|
||||
GPSBABEL = /usr/local/bin/gpsbabel
|
||||
SIP_system = /usr/local/bin/sip
|
||||
SIP_fw = $(PYTHON_PREFIX_fw)/bin/sip
|
||||
|
||||
//////////////////////////////////////////////////////////////////////
|
||||
// forms of some libraries
|
||||
@ -125,15 +117,18 @@ GSL_PREFIX = /usr/local
|
||||
GRASS_PREFIX_app = /Applications/GRASS-$(GRASS_VERSION).app/Contents/MacOS
|
||||
GRASS_PREFIX_unix = /usr/local/grass-$(GRASS_VERSION)
|
||||
|
||||
PYSITE_fw = $(PYTHON_PREFIX)/lib/python$(PYTHON_VERSION)/site-packages
|
||||
|
||||
EXPAT_PREFIX = /usr/local // not used for system expat
|
||||
|
||||
// unix SQLite defaults to system
|
||||
SQLITE_PREFIX_shared = /usr
|
||||
SQLITE_PREFIX_static = /usr/local
|
||||
SPATIALITE_PREFIX = /usr/local
|
||||
|
||||
PGSQL_PREFIX = /usr/local/pgsql
|
||||
// used to link static libs
|
||||
PGSQL_LIBADD = -lssl -lcrypto -lpam -lkrb5
|
||||
// used to link static libs, defaults based on kyngchaos dist
|
||||
PGSQL_LIBADD = -lintl -framework CoreFoundation -liconv -lxml2 -lssl -lcrypto -lpam -lkrb5 -lldap -lreadline -lz
|
||||
|
||||
//////////////////////////////////////////////////////////////////////
|
||||
// DO NOT CHANGE THESE
|
||||
@ -164,8 +159,8 @@ HEADER_SEARCH_PATHS = $(SYMROOT)/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)/incl
|
||||
ALWAYS_SEARCH_USER_PATHS = NO
|
||||
USE_HEADERMAP = NO // else headers with same name cause confusion
|
||||
|
||||
DYLIB_CURRENT_VERSION = $(LIBQGIS_VERSION_MAJOR).$(LIBQGIS_VERSION_MINOR)
|
||||
DYLIB_COMPATIBILITY_VERSION = $(LIBQGIS_VERSION_MAJOR).0
|
||||
DYLIB_CURRENT_VERSION = $(QGIS_VERSION_MAJOR).$(QGIS_VERSION_MINOR)
|
||||
DYLIB_COMPATIBILITY_VERSION = $(QGIS_VERSION_MAJOR).0
|
||||
MACOSX_DEPLOYMENT_TARGET_tig = 10.4
|
||||
MACOSX_DEPLOYMENT_TARGET_leo = 10.5
|
||||
MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(SDKSYS))
|
||||
@ -264,7 +259,7 @@ GSL_LIB = $(GSL_LIB_$(GSL_FORM))
|
||||
|
||||
PGSQL_INC = $(PGSQL_PREFIX)/include
|
||||
PGSQL_LIB_shared = -L$(PGSQL_PREFIX)/lib -lpq
|
||||
PGSQL_LIB_static = $(PGSQL_PREFIX)/lib/libpq.a $(PGSQL_LIBADD)
|
||||
PGSQL_LIB_static = -L$(PGSQL_PREFIX)/lib $(PGSQL_PREFIX)/lib/libpq.a $(PGSQL_LIBADD)
|
||||
PGSQL_LIB = $(PGSQL_LIB_$(PGSQL_FORM))
|
||||
PGSQL_HAVE_shared = -DHAVE_PGCONFIG=1
|
||||
PGSQL_HAVE_static = -DHAVE_PGCONFIG=1
|
||||
@ -297,9 +292,9 @@ SPATIALITE_LIBADD = $(SPATIALITE_GEOS_$(SPATIALITE_GEOS)) $(SPATIALITE_PROJ_$(SP
|
||||
|
||||
PYTHON_PREFIX_fw = /Library/Frameworks/Python.framework
|
||||
PYTHON_PREFIX_system = /System/Library/Frameworks/Python.framework
|
||||
PYTHON_PREFIX = $(PYTHON_PREFIX_$(PYTHON_FORM))/Versions/Current
|
||||
PYTHON_PREFIX = $(PYTHON_PREFIX_$(PYTHON_FORM))/Versions/$(PYTHON_VERSION)
|
||||
PYTHON_INC = $(PYTHON_PREFIX)/Headers
|
||||
PYTHON_LIB = -framework Python
|
||||
PYTHON_LIB = -framework Python // must always be framework, full path will work
|
||||
PYTHON_HAVE_fw_tig = HAVE_PYTHON=1
|
||||
PYTHON_HAVE_fw_leo = HAVE_PYTHON=1
|
||||
PYTHON_HAVE_fw_ = HAVE_PYTHON=1
|
||||
@ -307,6 +302,8 @@ PYTHON_HAVE_system_tig =
|
||||
PYTHON_HAVE_system_leo = HAVE_PYTHON=1
|
||||
PYTHON_HAVE_system_ =
|
||||
PYTHON_HAVE = $(PYTHON_HAVE_$(PYTHON_FORM)_$(SDKSYS))
|
||||
PYSITE_system = /Library/Python/$(PYTHON_VERSION)/site-packages
|
||||
PYSITE = $(PYSITE_$(PYTHON_FORM))
|
||||
PYTHON = $(PYTHON_PREFIX)/bin/python
|
||||
|
||||
#include "qgis_user.xcconfig"
|
||||
|
||||
@ -14,14 +14,13 @@
|
||||
// Qt and other support
|
||||
//////////////////////////////////////////////////////////////////////
|
||||
|
||||
//QT_FWVER = 4 // the Versions/ folder name
|
||||
//QT_MVER = 4 // the install_name version
|
||||
//QT_FWVER = $(QT_MVER) // the Versions/ folder name, normally same as Qt ver
|
||||
|
||||
//QTDIR = /Developer/Applications/Qt // Qt apps and plugins
|
||||
//QT_PLUGINS_DIR = /Developer/Applications/Qt/plugins
|
||||
//QTBIN = /Developer/Tools/Qt // bin dir
|
||||
//BISON = /usr/bin/bison // Tiger requires user-installed bison 2.3
|
||||
//GPSBABEL = /usr/local/bin/gpsbabel
|
||||
//SIP_system = /usr/local/bin/sip
|
||||
|
||||
//////////////////////////////////////////////////////////////////////
|
||||
// forms of some libraries
|
||||
@ -106,15 +105,18 @@
|
||||
//GRASS_PREFIX_app = /Applications/GRASS-$(GRASS_VERSION).app/Contents/MacOS
|
||||
//GRASS_PREFIX_unix = /usr/local/grass-$(GRASS_VERSION)
|
||||
|
||||
//PYSITE_fw = $(PYTHON_PREFIX)/lib/python$(PYTHON_VERSION)/site-packages
|
||||
|
||||
//EXPAT_PREFIX = /usr/local // not used for system expat
|
||||
|
||||
// unix SQLite defaults to system
|
||||
//SQLITE_PREFIX_shared = /usr
|
||||
//SQLITE_PREFIX_static = /usr/local
|
||||
//SPATIALITE_PREFIX = /usr/local
|
||||
|
||||
//PGSQL_PREFIX = /usr/local/pgsql
|
||||
// used to link static libs
|
||||
//PGSQL_LIBADD = -lssl -lcrypto -lpam -lkrb5
|
||||
// used to link static libs, defaults based on kyngchaos dist
|
||||
//PGSQL_LIBADD = -lintl -framework CoreFoundation -liconv -lxml2 -lssl -lcrypto -lpam -lkrb5 -lldap -lreadline -lz
|
||||
|
||||
//////////////////////////////////////////////////////////////////////
|
||||
// do not change these unless you have a very odd layout for them
|
||||
@ -151,6 +153,8 @@
|
||||
//SPATIALITE_LIB = $(SPATIALITE_LIB_$(SPATIALITE_FORM))
|
||||
//SPATIALITE_LIBADD = $(GEOS_LIB) $(PROJ_LIB)
|
||||
|
||||
//PYTHON_PREFIX = $(PYTHON_PREFIX_$(PYTHON_FORM))/Versions/Current
|
||||
//PYTHON_PREFIX = $(PYTHON_PREFIX_$(PYTHON_FORM))/Versions/$(PYTHON_VERSION)
|
||||
//PYTHON_INC = $(PYTHON_PREFIX)/Headers
|
||||
//PYTHON_LIB = -framework Python
|
||||
//PYTHON_LIB = -framework Python // must always be framework, full path will work
|
||||
//PYSITE = $(PYSITE_$(PYTHON_FORM))
|
||||
//PYTHON = $(PYTHON_PREFIX)/bin/python
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user