Merge branch 'master' of https://github.com/qgis/QGIS into usr_bin_env

.ci/travis/linux/before_script.sh

@@ -23,7 +23,11 @@ docker-compose --version
 docker-compose -f $DOCKER_COMPOSE config
 #docker pull ubuntu:16.04
 docker pull "qgis/qgis3-build-deps:${DOCKER_TAG}" || true
-docker build --cache-from "qgis/qgis3-build-deps:${DOCKER_TAG}" -t "qgis/qgis3-build-deps:${DOCKER_TAG}" .
+if [[ $DOCKER_DEPS_IMAGE_REBUILD =~ true ]]; then
+  docker build --no-cache -t "qgis/qgis3-build-deps:${DOCKER_TAG}" .
+else
+  docker build --cache-from "qgis/qgis3-build-deps:${DOCKER_TAG}" -t "qgis/qgis3-build-deps:${DOCKER_TAG}" .
+fi
 echo "travis_fold:end:docker"
 # image should be pushed even if QGIS build fails
 # but push is achieved only on branches (not for PRs)

.ci/travis/linux/blacklist.txt

@@ -30,7 +30,11 @@ PyQgsSpatialiteProvider
 # Flaky, see https://travis-ci.org/qgis/QGIS/jobs/297708174
 PyQgsServerAccessControl
 
+# Flaky, see https://dash.orfeo-toolbox.org/testDetails.php?test=61670866&build=297397
+PyQgsLocator
+
 # Need a local postgres installation
 PyQgsAuthManagerPKIPostgresTest
 PyQgsAuthManagerPasswordPostgresTest
 PyQgsAuthManagerOgrPostgresTest
+

.ci/travis/linux/docker-build-test.sh

@@ -58,10 +58,10 @@ echo "travis_fold:end:cmake"
 #######
 # Build
 #######
-echo "travis_fold:start:ninja-build.1"
+# echo "travis_fold:start:ninja-build.1"
 echo "${bold}Building QGIS...${endbold}"
 ${CTEST_BUILD_COMMAND}
-echo "travis_fold:end:ninja-build.1"
+# echo "travis_fold:end:ninja-build.1"
 
 # Temporarily uncomment to debug ccache issues
 # echo "travis_fold:start:ccache-debug"

.docker/Dockerfile

@@ -12,7 +12,7 @@ RUN  apt-get update \
     ca-certificates \
     ccache \
     clang \
-    cmake \
+    # cmake \
     curl \
     dh-python \
     flex \
@@ -69,7 +69,6 @@ RUN  apt-get update \
     qt5keychain-dev \
     qtbase5-dev \
     qtpositioning5-dev \
-    qtscript5-dev \
     qttools5-dev \
     qttools5-dev-tools \
     spawn-fcgi \
@@ -89,13 +88,17 @@ RUN  apt-get update \
     future \
     termcolor \
   && apt-get autoremove -y python3-pip python2.7 \
-  && apt-get clean
+  && apt-get clean \
+  && curl -s -S -O https://cmake.org/files/v3.10/cmake-3.10.1-Linux-x86_64.tar.gz \
+  && tar --strip-components=1 -zx -f cmake-3.10.1-Linux-x86_64.tar.gz -C /usr/local \
+  && rm cmake-3.10.1-Linux-x86_64.tar.gz
 
 RUN echo "alias python=python3" >> ~/.bash_aliases
 
 ENV CC=/usr/lib/ccache/clang
 ENV CXX=/usr/lib/ccache/clang++
 ENV QT_SELECT=5
 ENV LANG=C.UTF-8
+ENV PATH="/usr/local/bin:${PATH}"
 
 CMD /root/QGIS/.ci/travis/linux/docker-build-test.sh

.gitignore

@@ -23,7 +23,7 @@
 /CMakeLists.txt.user
 /CMakeLists.txt.user.*
 api_doc
-*build*
+/build*
 debian/*.debhelper
 debian/*.substvars
 desktop.ini

.travis.yml

@@ -10,6 +10,7 @@ matrix:
         - DOCKER_COMPOSE=${TRAVIS_BUILD_DIR}/.docker/docker-compose.travis.yml
         - DOCKER_TAG=$( [[ $TRAVIS_REPO_SLUG =~ qgis/QGIS ]] && echo $TRAVIS_BRANCH | sed 's/master/latest/' || echo "latest" )
         - DOCKER_PUSH=$( [[ $TRAVIS_REPO_SLUG =~ qgis/QGIS ]] && [[ $TRAVIS_PULL_REQUEST =~ false ]] && echo "true" || echo "false" )
+        - DOCKER_DEPS_IMAGE_REBUILD=$( [[ $TRAVIS_COMMIT_MESSAGE =~ '[docker] update dependencies' ]] && echo "true" || echo "false" )
         - CCACHE_DIR=${HOME}/.ccache
       dist: trusty
       sudo: false

CMakeLists.txt

@@ -233,7 +233,7 @@ IF(WITH_CORE)
   FIND_PACKAGE(LibZip REQUIRED)
 
   IF (WITH_INTERNAL_QEXTSERIALPORT)
-    SET(QEXTSERIALPORT_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/src/core/gps/qextserialport)
+    SET(QEXTSERIALPORT_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/external/qextserialport)
   ELSE (WITH_INTERNAL_QEXTSERIALPORT)
     FIND_PACKAGE(Qextserialport REQUIRED)
   ENDIF(WITH_INTERNAL_QEXTSERIALPORT)
@@ -291,7 +291,6 @@ IF(WITH_CORE)
   ENDIF(WITH_QTWEBKIT)
   FIND_PACKAGE(Qt5Test REQUIRED)
   FIND_PACKAGE(Qt5UiTools REQUIRED)
-  FIND_PACKAGE(Qt5Script REQUIRED)
   FIND_PACKAGE(Qt5Sql REQUIRED)
   IF (WITH_3D)
     FIND_PACKAGE(Qt53DCore REQUIRED)
@@ -463,12 +462,14 @@ ENDIF(CMAKE_SYSTEM_PROCESSOR MATCHES "^(powerpc|ppc)")
 
 IF (CMAKE_BUILD_TYPE MATCHES Debug OR CMAKE_BUILD_TYPE MATCHES RelWithDebInfo)
   MESSAGE (STATUS "Debug output enabled")
-  ADD_DEFINITIONS(-DQGISDEBUG=1)
+  SET(QGISDEBUG TRUE)
+ELSE (CMAKE_BUILD_TYPE MATCHES Debug OR CMAKE_BUILD_TYPE MATCHES RelWithDebInfo)
+  SET(QGISDEBUG FALSE)
 ENDIF (CMAKE_BUILD_TYPE MATCHES Debug OR CMAKE_BUILD_TYPE MATCHES RelWithDebInfo)
 
 IF(MSVC)
-  SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -DQGISDEBUG=1")
-  SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DQGISDEBUG=1")
+  SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO}")
+  SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG}")
   # disable macros that offend std::numeric_limits<T>::min()/max()
   ADD_DEFINITIONS(-DNOMINMAX)
 ENDIF(MSVC)

cmake/SIPMacros.cmake

@@ -42,7 +42,7 @@ SET(SIP_DISABLE_FEATURES)
 SET(SIP_EXTRA_OPTIONS)
 SET(SIP_EXTRA_OBJECTS)
 
-MACRO(GENERATE_SIP_PYTHON_MODULE_CODE MODULE_NAME MODULE_SIP CPP_FILES)
+MACRO(GENERATE_SIP_PYTHON_MODULE_CODE MODULE_NAME MODULE_SIP SIP_FILES CPP_FILES)
   STRING(REPLACE "." "/" _x ${MODULE_NAME})
   GET_FILENAME_COMPONENT(_parent_module_path ${_x} PATH)
   GET_FILENAME_COMPONENT(_child_module_name ${_x} NAME)
@@ -52,6 +52,18 @@ MACRO(GENERATE_SIP_PYTHON_MODULE_CODE MODULE_NAME MODULE_SIP CPP_FILES)
 
   FILE(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${_module_path})    # Output goes in this dir.
 
+  # If this is not need anymore (using input configuration file for SIP files)
+  # SIP could be run in the source rather than in binary directory
+  SET(_configured_module_sip ${CMAKE_CURRENT_BINARY_DIR}/${_module_path}/${_module_path}.sip)
+  FOREACH (_sip_file ${SIP_FILES})
+    GET_FILENAME_COMPONENT(_sip_file_path ${_sip_file} PATH)
+    GET_FILENAME_COMPONENT(_sip_file_name_we ${_sip_file} NAME_WE)
+    FILE(RELATIVE_PATH _sip_file_relpath ${CMAKE_CURRENT_SOURCE_DIR} "${_sip_file_path}/${_sip_file_name_we}")
+    SET(_out_sip_file "${CMAKE_CURRENT_BINARY_DIR}/${_sip_file_relpath}.sip")
+    CONFIGURE_FILE(${_sip_file} ${_out_sip_file})
+  ENDFOREACH (_sip_file)
+
+
   SET(_sip_includes)
   FOREACH (_inc ${SIP_INCLUDES})
     GET_FILENAME_COMPONENT(_abs_inc ${_inc} ABSOLUTE)
@@ -99,13 +111,14 @@ MACRO(GENERATE_SIP_PYTHON_MODULE_CODE MODULE_NAME MODULE_SIP CPP_FILES)
     ADD_DEFINITIONS( /bigobj )
   ENDIF(MSVC)
 
-  SET(SIPCMD ${SIP_BINARY_PATH} ${_sip_tags} -w -e ${_sip_x} ${SIP_EXTRA_OPTIONS} -j ${SIP_CONCAT_PARTS} -c ${CMAKE_CURRENT_BINARY_DIR}/${_module_path} ${_sip_includes} ${_abs_module_sip})
+  SET(SIPCMD ${SIP_BINARY_PATH} ${_sip_tags} -w -e ${_sip_x} ${SIP_EXTRA_OPTIONS} -j ${SIP_CONCAT_PARTS} -c ${CMAKE_CURRENT_BINARY_DIR}/${_module_path} -I ${CMAKE_CURRENT_BINARY_DIR}/${_module_path} ${_sip_includes} ${_configured_module_sip})
   ADD_CUSTOM_COMMAND(
     OUTPUT ${_sip_output_files}
     COMMAND ${CMAKE_COMMAND} -E echo ${message}
     COMMAND ${CMAKE_COMMAND} -E touch ${_sip_output_files}
     COMMAND ${SIPCMD}
-    DEPENDS ${_abs_module_sip} ${SIP_EXTRA_FILES_DEPEND}
+    MAIN_DEPENDENCY ${_configured_module_sip}
+    DEPENDS ${SIP_EXTRA_FILES_DEPEND}
     VERBATIM
   )
 

cmake_templates/qgsconfig.h.in

@@ -62,5 +62,7 @@
 
 #cmakedefine USE_THREAD_LOCAL
 
+#cmakedefine QGISDEBUG
+
 #endif
 

debian/control

@@ -20,7 +20,7 @@ Build-Depends:
  libspatialite-dev,
  libsqlite3-dev,
  libspatialindex-dev,
- qtbase5-dev, qttools5-dev-tools, qttools5-dev, qtscript5-dev, qtpositioning5-dev,
+ qtbase5-dev, qttools5-dev-tools, qttools5-dev, qtpositioning5-dev,
  libqt5svg5-dev, libqt5xmlpatterns5-dev, libqt5webkit5-dev, libqt5opengl5-dev, libqt5sql5-sqlite, libqt5scintilla2-dev,
  libqwt-qt5-dev, libqca-qt5-2-dev, libqca-qt5-2-plugins,
  python3-dev, python3-all-dev, python3-sip, python3-sip-dev,
@@ -203,7 +203,6 @@ Depends:
  libqt5webkit5-dev,
  libqca-qt5-2-dev,
  libqwt-qt5-dev,
- qtscript5-dev,
  qtpositioning5-dev,
  pyqt5-dev-tools,
  python3-pyqt5,

debian/control.in

@@ -13,15 +13,15 @@ Build-Depends:
  libexpat1-dev,
  libfcgi-dev,
  libgdal-dev (>= 1.11),
-#sid stretch xenial yakkety zesty artful# libgsl-dev,
+#sid stretch xenial yakkety zesty artful bionic# libgsl-dev,
  libgeos-dev (>= 3.0.0),
  libpq-dev,
  libproj-dev,
  libspatialite-dev, libsqlite3-mod-spatialite,
  libsqlite3-dev,
  libspatialindex-dev,
  libzip-dev,
- qtbase5-dev, qttools5-dev-tools, qttools5-dev, qtscript5-dev, qtpositioning5-dev, qt5keychain-dev,
+ qtbase5-dev, qttools5-dev-tools, qttools5-dev, qtpositioning5-dev, qt5keychain-dev,
  libqt5svg5-dev, libqt5xmlpatterns5-dev, libqt5webkit5-dev, libqt5opengl5-dev, libqt5sql5-sqlite, libqt5scintilla2-dev,
  libqwt-qt5-dev, libqca-qt5-2-dev, libqca-qt5-2-plugins,
  python3-dev, python3-all-dev, python3-sip, python3-sip-dev,
@@ -38,12 +38,12 @@ Build-Depends:
  graphviz,
  xvfb, xauth,
  xfonts-base, xfonts-100dpi, xfonts-75dpi, xfonts-scalable,
-#artful sid# libosgearth-dev, qt3d5-dev, qt3d-assimpsceneimport-plugin, qt3d-defaultgeometryloader-plugin, qt3d-gltfsceneio-plugin, qt3d-scene2d-plugin,
+#sid artful bionic# libosgearth-dev, qt3d5-dev, qt3d-assimpsceneimport-plugin, qt3d-defaultgeometryloader-plugin, qt3d-gltfsceneio-plugin, qt3d-scene2d-plugin,
 #oracle# oracle-instantclient12.1-devel, oracle-instantclient12.1-basiclite, qtbase5-private-dev,
  locales, ca-certificates, ninja-build
 Build-Conflicts: libqgis-dev, qgis-dev
-#sid stretch xenial yakkety zesty artful#Standards-Version: 3.9.7
-#            xenial yakkety zesty artful#XS-Python-Version: current
+#sid stretch xenial yakkety zesty artful bionic#Standards-Version: 3.9.7
+#            xenial yakkety zesty artful bionic#XS-Python-Version: current
 Vcs-Browser: https://github.com/qgis/QGIS/
 Vcs-Git: https://github.com/qgis/QGIS.git
 Homepage: http://qgis.org/
@@ -145,19 +145,19 @@ Description: QGIS - shared native gui library
  .
  This package contains the shared native gui library.
 
-#artful sid#Package: libqgis-3d{QGIS_ABI}
-#artful sid#Architecture: any
-#artful sid#Section: libs
-#artful sid#Depends:
-#artful sid# qt3d-assimpsceneimport-plugin, qt3d-defaultgeometryloader-plugin, qt3d-gltfsceneio-plugin, qt3d-scene2d-plugin,
-#artful sid# ${shlibs:Depends},
-#artful sid# ${misc:Depends}
-#artful sid#Description: QGIS - shared 3d library
-#artful sid# QGIS is a Geographic Information System (GIS) which manages, analyzes and
-#artful sid# display databases of geographic information.
-#artful sid# .
-#artful sid# This package contains the shared 3d library.
-#artful sid#
+#artful bionic sid#Package: libqgis-3d{QGIS_ABI}
+#artful bionic sid#Architecture: any
+#artful bionic sid#Section: libs
+#artful bionic sid#Depends:
+#artful bionic sid# qt3d-assimpsceneimport-plugin, qt3d-defaultgeometryloader-plugin, qt3d-gltfsceneio-plugin, qt3d-scene2d-plugin,
+#artful bionic sid# ${shlibs:Depends},
+#artful bionic sid# ${misc:Depends}
+#artful bionic sid#Description: QGIS - shared 3d library
+#artful bionic sid# QGIS is a Geographic Information System (GIS) which manages, analyzes and
+#artful bionic sid# display databases of geographic information.
+#artful bionic sid# .
+#artful bionic sid# This package contains the shared 3d library.
+#artful bionic sid#
 Package: libqgisgrass{GRASSVER}-{QGIS_ABI}
 Architecture: any
 Section: libs
@@ -214,7 +214,7 @@ Depends:
  libexpat1-dev,
  libgdal-dev (>= 1.11),
  libgeos-dev (>= 3.0.0),
-#sid stretch xenial yakkety zesty artful# libgsl-dev,
+#sid stretch xenial yakkety zesty artful bionic# libgsl-dev,
  libpq-dev,
  libproj-dev,
  libqgis-app{QGIS_ABI} (= ${binary:Version}),
@@ -232,7 +232,6 @@ Depends:
  libqt5webkit5-dev,
  libqca-qt5-2-dev,
  libqwt-qt5-dev,
- qtscript5-dev,
  qtpositioning5-dev,
  pyqt5-dev-tools,
  python3-pyqt5,

debian/copyright

@@ -166,9 +166,9 @@ Comment: Voronoi diagram calculator/ Delaunay triangulator
  Steve Fortune's homepage: http://netlib.bell-labs.com/cm/cs/who/sjf/index.html
 License: GPL-2+
 
-Files: src/app/gps/qwtpolar-0.1/*
- src/app/gps/qwtpolar-1.0/*
- src/app/gps/qwtpolar-1.1.1/*
+Files: external//qwtpolar-0.1/*
+ external//qwtpolar-1.0/*
+ external//qwtpolar-1.1.1/*
 Copyright: 2008, Uwe Rathmann
 Comment: This library is free software; you can redistribute it and/or
  modify it under the terms of the Qwt License, Version 1.0
@@ -185,23 +185,23 @@ Comment: Artistic Style is maintained and updated by Jim Pattee.
  The original author was Tal Davidson, Israel.
 License: LGPL-2.1+
 
-Files: src/core/gps/config.h
- src/core/gps/context.c
- src/core/gps/context.h
- src/core/gps/gmath.c
- src/core/gps/gmath.h
- src/core/gps/info.c
- src/core/gps/info.h
- src/core/gps/nmeatime.h
- src/core/gps/parse.c
- src/core/gps/parse.h
- src/core/gps/parser.h
- src/core/gps/sentence.c
- src/core/gps/sentence.h
- src/core/gps/time.c
- src/core/gps/tok.c
- src/core/gps/tok.h
- src/core/gps/units.h
+Files: external/nmea/config.h
+ external/nmea/context.c
+ external/nmea/context.h
+ external/nmea/gmath.c
+ external/nmea/gmath.h
+ external/nmea/info.c
+ external/nmea/info.h
+ external/nmea/nmeatime.h
+ external/nmea/parse.c
+ external/nmea/parse.h
+ external/nmea/parser.h
+ external/nmea/sentence.c
+ external/nmea/sentence.h
+ external/nmea/time.c
+ external/nmea/tok.c
+ external/nmea/tok.h
+ external/nmea/units.h
 Copyright: Tim <xtimor@gmail.com>
 License: LGPL-2+
 

debian/qgis-common.install

@@ -18,4 +18,7 @@ usr/share/qgis/i18n/*
 usr/share/qgis/images/*
 usr/share/qgis/resources/spatialite.db
 usr/share/qgis/resources/themes/*
+usr/share/qgis/resources/data/*
+usr/share/qgis/resources/metadata-ISO/*
+usr/share/qgis/resources/2to3migration.txt
 usr/share/qgis/qgis_global_settings.ini

debian/rules

@@ -36,7 +36,7 @@ endif
 
 QT_PLUGINS_DIR = usr/lib/$(DEB_BUILD_MULTIARCH)/qt5/plugins
 
-ifneq ($(DISTRIBUTION),$(findstring $(DISTRIBUTION),"stretch xenial yakkety zesty artful"))
+ifneq ($(DISTRIBUTION),$(findstring $(DISTRIBUTION),"stretch xenial yakkety zesty artful bionic"))
 	DISTRIBUTION := sid
 endif
 
@@ -102,7 +102,7 @@ ifneq (,$(findstring $(DISTRIBUTION),"sid stretch"))
 	CMAKE_OPTS += -DPOSTGRES_LIBRARY=/usr/lib/$(DEB_BUILD_MULTIARCH)/libpq.so
 endif
 
-ifneq (,$(findstring $(DISTRIBUTION),"artful sid"))
+ifneq (,$(findstring $(DISTRIBUTION),"artful bionic sid"))
 	CMAKE_OPTS += \
 		-DWITH_3D=TRUE \
 		-DGEOS_LIBRARY=/usr/lib/$(DEB_BUILD_MULTIARCH)/libgeos_c.so
@@ -266,6 +266,9 @@ override_dh_auto_install:
 	$(RM) $(CURDIR)/debian/tmp/usr/share/qgis/doc/LICENSE
 	$(RM) $(CURDIR)/debian/tmp/usr/share/qgis/python/plugins/db_manager/LICENSE
 	$(RM) $(CURDIR)/debian/tmp/usr/share/qgis/python/plugins/MetaSearch/LICENSE.txt
+	$(RM) $(CURDIR)/debian/tmp/usr/bin/qgis_wcstest
+	$(RM) $(CURDIR)/debian/tmp/usr/bin/qgis_bench
+	$(RM) $(CURDIR)/debian/tmp/usr/share/qgis/resources/wcs-servers.json
 
 	# Man pages are installed by dh_installman
 	$(RM) $(CURDIR)/debian/tmp/usr/man/man1/qgis.1

doc/CMakeLists.txt

@@ -56,7 +56,6 @@ IF(WITH_APIDOC)
       ${CMAKE_SOURCE_DIR}/src/core/3d
       ${CMAKE_SOURCE_DIR}/src/core/annotations
       ${CMAKE_SOURCE_DIR}/src/core/auth
-      ${CMAKE_SOURCE_DIR}/src/core/composer
       ${CMAKE_SOURCE_DIR}/src/core/diagram
       ${CMAKE_SOURCE_DIR}/src/core/dxf
       ${CMAKE_SOURCE_DIR}/src/core/effects