Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Merge pull request #3510 from nyalldawson/qt5_tests
Require python 3 and qt5
- Loading branch information
Showing
with
1,956 additions
and 2,470 deletions.
- +4 −60 .travis.yml
- +28 −70 CMakeLists.txt
- +0 −2 ci/travis/linux/qt5/blacklist.txt
- +0 −2 ci/travis/linux/qt5/install.sh
- +1 −5 cmake/FindPythonLibrary.cmake
- +1 −5 cmake/FindQCA.cmake
- +1 −5 cmake/FindQScintilla.cmake
- +5 −16 cmake/FindQsci.cmake
- +1 −5 cmake/FindQwt.cmake
- +3 −9 cmake/PyQtMacros.cmake
- +0 −2 cmake_templates/qgsconfig.h.in
- +1 −0 doc/api_break.dox
- +0 −7 python/CMakeLists.txt
- +1 −5 python/PyQt/CMakeLists.txt
- +2 −6 python/core/composer/qgscomposerscalebar.sip
- +2 −9 python/core/core.sip
- +0 −6 python/core/geometry/qgsgeometry.sip
- +0 −97 python/core/qgshttptransaction.sip
- +2 −2 python/core/qgsmaplayermodel.sip
- +5 −7 python/core/qgsproviderregistry.sip
- +1 −32 python/ext-libs/CMakeLists.txt
- +1 −6 python/gui/gui.sip
- +14 −17 python/plugins/CMakeLists.txt
- +1 −1 src/analysis/CMakeLists.txt
- +1 −1 src/analysis/network/CMakeLists.txt
- +3 −3 src/app/CMakeLists.txt
- +0 −11 src/app/main.cpp
- +0 −13 src/app/qgisapp.cpp
- +2 −2 src/auth/basic/CMakeLists.txt
- +2 −2 src/auth/identcert/CMakeLists.txt
- +2 −2 src/auth/pkipaths/CMakeLists.txt
- +2 −2 src/auth/pkipkcs12/CMakeLists.txt
- +4 −4 src/browser/CMakeLists.txt
- +6 −13 src/core/CMakeLists.txt
- +0 −2 src/core/auth/qgsauthcertutils.cpp
- +0 −8 src/core/auth/qgsauthcertutils.h
- +1 −1 src/core/composer/qgscomposerscalebar.h
- +0 −2 src/core/dxf/qgsdxfpaintdevice.cpp
- +0 −40 src/core/qgis.h
- +0 −8 src/core/qgsexpression.cpp
- +0 −2 src/core/qgsmaplayermodel.cpp
- +0 −2 src/core/qgsmaplayermodel.h
- +0 −20 src/core/qgsproviderregistry.cpp
- +0 −10 src/core/qgsproviderregistry.h
- +0 −5 src/core/qgsstringutils.cpp
- +4 −6 src/customwidgets/CMakeLists.txt
- +1 −1 src/gui/CMakeLists.txt
- +0 −2 src/gui/auth/qgsauthsslconfigwidget.cpp
- +0 −8 src/gui/qgsattributeform.cpp
- +0 −4 src/gui/qgscolorschemelist.cpp
- +0 −4 src/gui/qgstablewidgetitem.cpp
- +3 −3 src/helpviewer/CMakeLists.txt
- +3 −3 src/plugins/compass/CMakeLists.txt
- +3 −3 src/plugins/coordinate_capture/CMakeLists.txt
- +3 −3 src/plugins/dxf2shp_converter/CMakeLists.txt
- +3 −3 src/plugins/evis/CMakeLists.txt
- +3 −3 src/plugins/geometry_checker/CMakeLists.txt
- +3 −3 src/plugins/geometry_snapper/CMakeLists.txt
- +3 −3 src/plugins/georeferencer/CMakeLists.txt
- +3 −3 src/plugins/globe/CMakeLists.txt
- +1 −1 src/plugins/globe/featuresource/CMakeLists.txt
- +3 −3 src/plugins/gps_importer/CMakeLists.txt
- +3 −3 src/plugins/grass/CMakeLists.txt
- +1 −1 src/plugins/grass/qtermwidget/Session.cpp
- +3 −3 src/plugins/heatmap/CMakeLists.txt
- +3 −3 src/plugins/interpolation/CMakeLists.txt
- +3 −3 src/plugins/offline_editing/CMakeLists.txt
- +3 −3 src/plugins/oracle_raster/CMakeLists.txt
- +3 −3 src/plugins/plugin_template/CMakeLists.txt
- +3 −3 src/plugins/raster_terrain_analysis/CMakeLists.txt
- +2 −2 src/plugins/roadgraph/CMakeLists.txt
- +3 −3 src/plugins/spatialquery/CMakeLists.txt
- +3 −3 src/plugins/topology/CMakeLists.txt
- +3 −3 src/plugins/zonal_statistics/CMakeLists.txt
- +1 −3 src/providers/CMakeLists.txt
- +2 −9 src/providers/arcgisrest/CMakeLists.txt
- +0 −1 src/providers/arcgisrest/qgsafsprovider.cpp
- +7 −6 src/providers/arcgisrest/qgsamsprovider.cpp
- +8 −8 src/providers/arcgisrest/qgsarcgisrestutils.cpp
- +1 −1 src/providers/db2/CMakeLists.txt
- +1 −1 src/providers/delimitedtext/CMakeLists.txt
- +0 −6 src/providers/delimitedtext/qgsdelimitedtextprovider.cpp
- +1 −1 src/providers/gdal/CMakeLists.txt
- +1 −1 src/providers/gpx/CMakeLists.txt
- +3 −3 src/providers/grass/CMakeLists.txt
- +1 −1 src/providers/memory/CMakeLists.txt
- +1 −1 src/providers/mssql/CMakeLists.txt
- +1 −1 src/providers/ogr/CMakeLists.txt
- +1 −1 src/providers/oracle/CMakeLists.txt
- +1 −1 src/providers/oracle/ocispatial/CMakeLists.txt
- +1 −1 src/providers/ows/CMakeLists.txt
- +1 −1 src/providers/postgres/CMakeLists.txt
- +0 −74 src/providers/postgres/qgspostgresprovider.cpp
- +1 −1 src/providers/spatialite/CMakeLists.txt
- +1 −1 src/providers/spatialite/qspatialite/CMakeLists.txt
- +3 −3 src/providers/virtual/CMakeLists.txt
- +1 −1 src/providers/wcs/CMakeLists.txt
- +1 −1 src/providers/wfs/CMakeLists.txt
- +2 −4 src/providers/wms/CMakeLists.txt
- +6 −4 src/server/CMakeLists.txt
- +4 −0 src/{core → server}/qgshttptransaction.cpp
- +8 −2 src/{core → server}/qgshttptransaction.h
- +2 −0 src/server/qgsserver.cpp
- +1 −1 src/ui/CMakeLists.txt
- +1 −1 tests/bench/CMakeLists.txt
- +0 −4 tests/src/core/testqgsauthconfig.cpp
- +0 −2 tests/src/core/testqgsogcutils.cpp
- +3 −3 tests/src/gui/CMakeLists.txt
- +1 −1 tests/src/providers/CMakeLists.txt
- +1 −1 tests/src/python/offlineditingtestbase.py
- +4 −4 tests/src/python/providertestbase.py
- +17 −13 tests/src/python/qgis_local_server.py
- +3 −3 tests/src/python/qgis_wrapped_server.py
- +1 −1 tests/src/python/test_offline_editing_wfs.py
- +4 −4 tests/src/python/test_provider_db2.py
- +8 −8 tests/src/python/test_provider_memory.py
- +3 −3 tests/src/python/test_provider_mssql.py
- +8 −8 tests/src/python/test_provider_ogr.py
- +3 −3 tests/src/python/test_provider_ogr_gpkg.py
- +1 −1 tests/src/python/test_provider_ogr_sqlite.py
- +3 −3 tests/src/python/test_provider_oracle.py
- +8 −8 tests/src/python/test_provider_postgres.py
- +33 −33 tests/src/python/test_provider_shapefile.py
- +3 −3 tests/src/python/test_provider_spatialite.py
- +6 −6 tests/src/python/test_provider_tabfile.py
- +14 −14 tests/src/python/test_provider_virtual.py
- +37 −37 tests/src/python/test_provider_wfs.py
- +2 −2 tests/src/python/test_qgis_local_server.py
- +4 −4 tests/src/python/test_qgsappstartup.py
- +4 −4 tests/src/python/test_qgsattributeformeditorwidget.py
- +6 −6 tests/src/python/test_qgsattributetablemodel.py
- +1 −1 tests/src/python/test_qgsauthsystem.py
- +2 −2 tests/src/python/test_qgscomposerpicture.py
- +33 −32 tests/src/python/test_qgsdelimitedtextprovider.py
- +1,051 −1,051 tests/src/python/test_qgsdelimitedtextprovider_wanted.py
- +37 −37 tests/src/python/test_qgsdistancearea.py
- +13 −13 tests/src/python/test_qgsdoccoverage.py
- +3 −3 tests/src/python/test_qgsexpression.py
- +5 −5 tests/src/python/test_qgsfeatureiterator.py
- +2 −2 tests/src/python/test_qgsgeometry.py
- +1 −1 tests/src/python/test_qgsmaplayerregistry.py
- +9 −8 tests/src/python/test_qgsnetworkcontentfetcher.py
- +4 −4 tests/src/python/test_qgsoptional.py
- +4 −3 tests/src/python/test_qgspallabeling_base.py
- +1 −1 tests/src/python/test_qgspallabeling_composer.py
- +6 −6 tests/src/python/test_qgspallabeling_placement.py
- +2 −2 tests/src/python/test_qgspallabeling_server.py
- +7 −7 tests/src/python/test_qgsproject.py
- +1 −1 tests/src/python/test_qgsrectangle.py
- +2 −2 tests/src/python/test_qgsrelation.py
- +1 −1 tests/src/python/test_qgsrelationeditwidget.py
- +1 −1 tests/src/python/test_qgsrelationmanager.py
- +98 −98 tests/src/python/test_qgssearchwidgetwrapper.py
- +26 −21 tests/src/python/test_qgsserver.py
- +138 −129 tests/src/python/test_qgsserver_accesscontrol.py
- +1 −1 tests/src/python/test_qgsserver_wfst.py
- +6 −6 tests/src/python/test_qgssipcoverage.py
- +1 −1 tests/src/python/test_qgssymbol.py
- +16 −16 tests/src/python/test_qgssymbollayer.py
- +16 −16 tests/src/python/test_qgssymbollayer_createsld.py
- +15 −15 tests/src/python/test_qgstabwidget.py
- +16 −16 tests/src/python/test_qgsunittypes.py
- +10 −10 tests/src/python/test_qgsvectorfilewriter.py
- +9 −9 tests/src/python/test_qgsvectorlayer.py
- +3 −3 tests/src/python/test_qgsvirtuallayerdefinition.py
- +7 −7 tests/src/python/test_versioncompare.py
- +2 −2 tests/src/python/utilities.py
Oops, something went wrong.