[qgis] branch upstream updated (69edb36 -> 417bf39)
Bas Couwenberg
sebastic at debian.org
Fri Nov 25 15:37:13 UTC 2016
This is an automated email from the git hooks/post-receive script.
sebastic pushed a change to branch upstream
in repository qgis.
from 69edb36 Imported Upstream version 2.18.0+dfsg
new 417bf39 Imported Upstream version 2.18.1+dfsg
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.
Summary of changes:
CMakeLists.txt | 2 +-
ChangeLog | 541 +++++++++++++
ci/travis/linux/qt4/script.sh | 2 +-
ci/travis/linux/qt5/blacklist.txt | 3 +-
ci/travis/linux/qt5/script.sh | 2 +-
cmake/SIPMacros.cmake | 4 +
debian/changelog | 10 +-
debian/rules | 2 +-
i18n/qgis_de.ts | 4 +-
ms-windows/osgeo4w/package.cmd | 1 -
python/core/geometry/qgsabstractgeometryv2.sip | 4 +-
python/core/geometry/qgscircularstringv2.sip | 4 +-
python/core/geometry/qgscompoundcurvev2.sip | 4 +-
python/core/geometry/qgscurvepolygonv2.sip | 5 +-
python/core/geometry/qgscurvev2.sip | 4 +-
python/core/geometry/qgsgeometrycollectionv2.sip | 5 +-
python/core/geometry/qgslinestringv2.sip | 1 +
python/core/geometry/qgsmulticurvev2.sip | 4 +-
python/core/geometry/qgsmultilinestringv2.sip | 4 +-
python/core/geometry/qgsmultipointv2.sip | 5 +-
python/core/geometry/qgsmultipolygonv2.sip | 4 +-
python/core/geometry/qgsmultisurfacev2.sip | 4 +-
python/core/geometry/qgspointv2.sip | 1 +
python/core/geometry/qgspolygonv2.sip | 4 +-
python/core/geometry/qgssurfacev2.sip | 2 +-
python/core/layertree/qgslayertreelayer.sip | 10 +
python/core/layertree/qgslayertreemodel.sip | 3 +
python/core/layertree/qgslayertreenode.sip | 10 +
python/core/qgscacheindexfeatureid.sip | 34 -
python/core/qgsvectorfilewriter.sip | 143 ++++
python/core/qgsvectorlayercache.sip | 18 +-
python/core/symbology-ng/qgssymbollayerv2.sip | 76 +-
python/gui/gui.sip | 1 +
python/gui/qgsextentgroupbox.sip | 2 +-
python/gui/qgsfiledownloader.sip | 66 ++
python/plugins/CMakeLists.txt | 11 +
python/{PyQt/PyQt5 => plugins}/__init__.py | 0
python/plugins/db_manager/db_model.py | 7 +-
.../plugins/db_manager/db_plugins/CMakeLists.txt | 1 +
python/plugins/db_manager/db_plugins/__init__.py | 3 +-
python/plugins/db_manager/db_plugins/connector.py | 6 +
.../db_manager/db_plugins/gpkg/CMakeLists.txt | 9 +
.../db_manager/db_plugins/gpkg}/__init__.py | 0
.../db_manager/db_plugins/gpkg/connector.py | 868 +++++++++++++++++++++
.../db_manager/db_plugins/gpkg/data_model.py | 51 ++
.../db_manager/db_plugins/gpkg/icons/gpkg_icon.png | Bin 0 -> 23317 bytes
.../db_plugins/{spatialite => gpkg}/info_model.py | 33 +-
.../db_plugins/{spatialite => gpkg}/plugin.py | 133 ++--
.../db_manager/db_plugins/gpkg/resources.qrc | 5 +
.../db_manager/db_plugins/gpkg/sql_dictionary.py | 28 +
.../db_manager/db_plugins/spatialite/connector.py | 74 +-
.../db_manager/db_plugins/spatialite/info_model.py | 5 +-
.../db_manager/db_plugins/spatialite/plugin.py | 24 +-
python/plugins/db_manager/db_tree.py | 2 +-
python/plugins/db_manager/dlg_sql_layer_window.py | 2 +
python/plugins/db_manager/dlg_table_properties.py | 26 +-
python/plugins/processing/algs/help/qgis.yaml | 14 +-
python/plugins/processing/algs/qgis/Difference.py | 2 +-
.../processing/algs/qgis/ImportIntoPostGIS.py | 2 +-
.../processing/algs/qgis/MergeLines_BASE_1606.py | 90 ---
.../processing/algs/qgis/MergeLines_LOCAL_1606.py | 0
.../processing/algs/qgis/MergeLines_REMOTE_1606.py | 89 ---
.../processing/algs/qgis/SimplifyGeometries.py | 21 +-
.../processing/algs/qgis/SymmetricalDifference.py | 2 +-
.../algs/qgis/ui/FieldsCalculatorDialog.py | 2 +
.../processing/algs/qgis/ui/FieldsMapperDialogs.py | 10 +-
.../plugins/processing/gui/AlgorithmDialogBase.py | 7 +-
python/plugins/processing/gui/BatchPanel.py | 8 +-
python/plugins/processing/gui/ConfigDialog.py | 22 +-
python/plugins/processing/gui/menus.py | 4 +-
...=> clip_lines_by_multipolygon_BACKUP_11112.gml} | 0
.../clip_lines_by_multipolygon_BASE_3790.gml | 34 -
.../clip_lines_by_multipolygon_LOCAL_3790.gml | 0
src/app/composer/qgsattributeselectiondialog.cpp | 2 +-
src/app/ogr/qgsvectorlayersaveasdialog.cpp | 164 +++-
src/app/ogr/qgsvectorlayersaveasdialog.h | 5 +
src/app/qgisapp.cpp | 48 +-
src/app/qgsattributetabledialog.cpp | 4 +-
src/app/qgsfeatureaction.cpp | 30 +-
src/app/qgsfieldcalculator.cpp | 4 +-
src/app/qgsidentifyresultsdialog.cpp | 52 ++
src/app/qgsidentifyresultsdialog.h | 7 +
src/app/qgsmaptoolfeatureaction.cpp | 4 +-
src/app/qgsoptions.cpp | 4 +-
src/app/qgsrulebasedlabelingwidget.cpp | 1 -
src/app/qgsstatusbarmagnifierwidget.cpp | 5 +-
src/app/qgsvectorlayerproperties.cpp | 9 +-
src/core/CMakeLists.txt | 1 +
src/core/composer/qgscomposerattributetablev2.cpp | 2 +-
src/core/composer/qgscomposermapgrid.cpp | 8 +-
src/core/dxf/qgsdxfexport.cpp | 2 +-
src/core/geometry/qgsabstractgeometryv2.h | 2 +-
src/core/geometry/qgscurvepolygonv2.cpp | 21 +
src/core/geometry/qgscurvepolygonv2.h | 1 +
src/core/geometry/qgsgeometrycollectionv2.cpp | 16 +
src/core/geometry/qgsgeometrycollectionv2.h | 2 +
src/core/geometry/qgsgeometryutils.cpp | 39 +-
src/core/geometry/qgslinestringv2.h | 1 +
src/core/geometry/qgsmultipointv2.h | 1 +
src/core/geometry/qgspointv2.h | 1 +
src/core/layertree/qgslayertreegroup.cpp | 14 +
src/core/layertree/qgslayertreegroup.h | 4 +-
src/core/layertree/qgslayertreelayer.cpp | 26 +
src/core/layertree/qgslayertreelayer.h | 10 +
src/core/layertree/qgslayertreemodel.cpp | 11 +-
src/core/layertree/qgslayertreemodel.h | 3 +
src/core/layertree/qgslayertreenode.cpp | 1 +
src/core/layertree/qgslayertreenode.h | 10 +
src/core/qgsactionmanager.cpp | 2 +-
src/core/qgsattributeaction.h | 2 +-
src/core/qgscacheindex.h | 4 +-
src/core/qgscacheindexfeatureid.cpp | 32 +-
src/core/qgscacheindexfeatureid.h | 34 -
src/core/qgsconditionalstyle.cpp | 2 +-
src/core/qgsexpression.cpp | 4 +-
src/core/qgsexpressioncontext.cpp | 4 +-
src/core/qgsvectorfilewriter.cpp | 324 +++++++-
src/core/qgsvectorfilewriter.h | 155 +++-
src/core/qgsvectorlayer.cpp | 2 +-
src/core/qgsvectorlayercache.cpp | 67 +-
src/core/qgsvectorlayercache.h | 29 +-
src/core/qgsvectorlayerfeatureiterator.cpp | 2 +
src/core/qgsvectorlayerrenderer.cpp | 2 +-
src/core/qgswebpage.h | 4 +
src/core/raster/qgsrasterprojector.cpp | 1 -
src/core/symbology-ng/qgsarrowsymbollayer.cpp | 8 +-
src/core/symbology-ng/qgslinesymbollayerv2.cpp | 8 +-
src/core/symbology-ng/qgssymbolv2.cpp | 10 +-
src/gui/CMakeLists.txt | 3 +
.../qgsattributetablefiltermodel.cpp | 6 -
src/gui/attributetable/qgsdualview.cpp | 2 -
.../qgsfieldconditionalformatwidget.cpp | 2 +-
src/gui/qgisgui.h | 16 +
src/gui/qgsattributedialog.cpp | 5 +-
src/gui/qgsattributedialog.h | 5 +-
src/gui/qgscolorbuttonv2.cpp | 10 +-
src/gui/qgsextentgroupbox.h | 2 +-
src/gui/qgsfiledownloader.cpp | 203 +++++
src/gui/qgsfiledownloader.h | 112 +++
src/gui/qgsmapcanvas.cpp | 5 +-
.../symbology-ng/qgsrulebasedrendererv2widget.cpp | 3 +-
src/gui/symbology-ng/qgssymbollayerv2widget.cpp | 2 +-
src/providers/memory/qgsmemoryprovider.cpp | 9 +-
src/providers/ogr/qgsogrprovider.cpp | 650 +++++++++++++--
src/providers/ogr/qgsogrprovider.h | 3 +-
src/providers/oracle/qgsoracleprovider.cpp | 53 +-
src/providers/oracle/qgsoracleprovider.h | 11 +
src/providers/postgres/qgspostgresprovider.cpp | 11 +-
src/providers/spatialite/qgsspatialiteprovider.cpp | 11 +-
.../virtual/qgsvirtuallayersqlitehelper.cpp | 14 +-
.../virtual/qgsvirtuallayersqlitemodule.cpp | 2 +-
src/providers/wms/qgswmsprovider.cpp | 5 +
src/server/qgshostedrdsbuilder.cpp | 2 +-
src/server/qgsserverprojectparser.cpp | 4 +
src/server/qgswfsserver.cpp | 39 +
src/server/qgswmsprojectparser.cpp | 9 +-
src/ui/qgsvectorlayersaveasdialogbase.ui | 34 +-
tests/src/core/testqgslayertree.cpp | 62 ++
tests/src/core/testqgsvectorlayercache.cpp | 112 +++
tests/src/gui/CMakeLists.txt | 1 +
tests/src/gui/testqgsfiledownloader.cpp | 251 ++++++
tests/src/python/CMakeLists.txt | 6 +-
tests/src/python/qgis_wrapped_server.py | 60 +-
...ndpoint.py => test_authmanager_password_ows.py} | 25 +-
...ger_endpoint.py => test_authmanager_pki_ows.py} | 108 ++-
tests/src/python/test_authmanager_pki_postgres.py | 233 ++++++
tests/src/python/test_db_manager_gpkg.py | 433 ++++++++++
tests/src/python/test_provider_ogr_gpkg.py | 69 ++
tests/src/python/test_qgsfiledownloader.py | 147 ++++
tests/src/python/test_qgsserver.py | 12 +-
tests/src/python/test_qgsvectorfilewriter.py | 172 ++++
tests/src/python/utilities.py | 6 +-
172 files changed, 5785 insertions(+), 940 deletions(-)
create mode 100644 python/gui/qgsfiledownloader.sip
copy python/{PyQt/PyQt5 => plugins}/__init__.py (100%)
create mode 100644 python/plugins/db_manager/db_plugins/gpkg/CMakeLists.txt
copy python/{PyQt/PyQt5 => plugins/db_manager/db_plugins/gpkg}/__init__.py (100%)
create mode 100644 python/plugins/db_manager/db_plugins/gpkg/connector.py
create mode 100644 python/plugins/db_manager/db_plugins/gpkg/data_model.py
create mode 100644 python/plugins/db_manager/db_plugins/gpkg/icons/gpkg_icon.png
copy python/plugins/db_manager/db_plugins/{spatialite => gpkg}/info_model.py (59%)
copy python/plugins/db_manager/db_plugins/{spatialite => gpkg}/plugin.py (70%)
create mode 100644 python/plugins/db_manager/db_plugins/gpkg/resources.qrc
create mode 100644 python/plugins/db_manager/db_plugins/gpkg/sql_dictionary.py
delete mode 100644 python/plugins/processing/algs/qgis/MergeLines_BASE_1606.py
delete mode 100644 python/plugins/processing/algs/qgis/MergeLines_LOCAL_1606.py
delete mode 100644 python/plugins/processing/algs/qgis/MergeLines_REMOTE_1606.py
rename python/plugins/processing/tests/testdata/expected/{clip_lines_by_multipolygon_REMOTE_3790.gml => clip_lines_by_multipolygon_BACKUP_11112.gml} (100%)
delete mode 100644 python/plugins/processing/tests/testdata/expected/clip_lines_by_multipolygon_BASE_3790.gml
delete mode 100644 python/plugins/processing/tests/testdata/expected/clip_lines_by_multipolygon_LOCAL_3790.gml
create mode 100644 src/gui/qgsfiledownloader.cpp
create mode 100644 src/gui/qgsfiledownloader.h
create mode 100644 tests/src/gui/testqgsfiledownloader.cpp
copy tests/src/python/{test_authmanager_endpoint.py => test_authmanager_password_ows.py} (85%)
rename tests/src/python/{test_authmanager_endpoint.py => test_authmanager_pki_ows.py} (56%)
create mode 100644 tests/src/python/test_authmanager_pki_postgres.py
create mode 100644 tests/src/python/test_db_manager_gpkg.py
create mode 100644 tests/src/python/test_qgsfiledownloader.py
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/qgis.git
More information about the Pkg-grass-devel
mailing list