Merge branch 'master' into work_duplicategeom

qgis · Jan 8, 2018 · 9ba5324 · 9ba5324
2 parents 5e7865c + 2b8143a
commit 9ba5324
Show file tree

Hide file tree

Showing 789 changed files with 23,065 additions and 29,786 deletions.
diff --git a/.ci/travis/linux/docker-build-test.sh b/.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"

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -462,7 +462,9 @@ 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)

diff --git a/cmake_templates/qgsconfig.h.in b/cmake_templates/qgsconfig.h.in
@@ -62,5 +62,7 @@
 
 #cmakedefine USE_THREAD_LOCAL
 
+#cmakedefine QGISDEBUG
+
 #endif
 
diff --git a/debian/qgis-common.install b/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
diff --git a/debian/rules b/debian/rules
@@ -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

diff --git a/doc/api_break.dox b/doc/api_break.dox
diff --git a/i18n/CMakeLists.txt b/i18n/CMakeLists.txt
@@ -11,7 +11,7 @@ MACRO(ADD_TRANSLATION_FILES _sources )
       ADD_CUSTOM_COMMAND(
          OUTPUT ${_out}
          COMMAND ${QT_LRELEASE_EXECUTABLE}
-         ARGS -verbose ${_in} -qm ${_out}
+         ARGS -silent ${_in} -qm ${_out}
          DEPENDS ${_in}
       )
 

diff --git a/images/images.qrc b/images/images.qrc
@@ -249,6 +249,7 @@
         <file>themes/default/mActionLabeling.svg</file>
         <file>themes/default/mActionLocalCumulativeCutStretch.svg</file>
         <file>themes/default/mActionLocalHistogramStretch.svg</file>
+        <file>themes/default/mActionLockItems.svg</file>
         <file>themes/default/mActionLowerItems.svg</file>
         <file>themes/default/mActionMapTips.svg</file>
         <file>themes/default/mActionMeasure.svg</file>
@@ -321,6 +322,7 @@
         <file>themes/default/mActionSharingExport.svg</file>
         <file>themes/default/mActionSharingImport.svg</file>
         <file>themes/default/mActionShowAllLayers.svg</file>
+        <file>themes/default/mActionShowAllLayersGray.svg</file>
         <file>themes/default/mActionShowBookmarks.svg</file>
         <file>themes/default/mActionShowHideLabels.svg</file>
         <file>themes/default/mActionShowPinnedLabels.svg</file>
@@ -339,6 +341,7 @@
         <file>themes/default/mActionTracing.svg</file>
         <file>themes/default/mActionUndo.svg</file>
         <file>themes/default/mActionUngroupItems.svg</file>
+        <file>themes/default/mActionUnlockAll.svg</file>
         <file>themes/default/mActionSvgAnnotation.svg</file>
         <file>themes/default/mActionWhatsThis.svg</file>
         <file>themes/default/mActionZoomActual.svg</file>
@@ -434,6 +437,19 @@
         <file>themes/default/mIconWms.svg</file>
         <file>themes/default/mIconZip.png</file>
         <file>themes/default/mIconZoom.svg</file>
+        <file>themes/default/mLayoutItem.svg</file>
+        <file>themes/default/mLayoutItemShapeEllipse.svg</file>
+        <file>themes/default/mLayoutItemShapeRectangle.svg</file>
+        <file>themes/default/mLayoutItemShapeTriangle.svg</file>
+        <file>themes/default/mLayoutItemHtml.svg</file>
+        <file>themes/default/mLayoutItemPicture.svg</file>
+        <file>themes/default/mLayoutItemLabel.svg</file>
+        <file>themes/default/mLayoutItemLegend.svg</file>
+        <file>themes/default/mLayoutItemMap.svg</file>
+        <file>themes/default/mLayoutItemPolygon.svg</file>
+        <file>themes/default/mLayoutItemPolyline.svg</file>
+        <file>themes/default/mLayoutItemScaleBar.svg</file>
+        <file>themes/default/mLayoutItemTable.svg</file>
         <file>themes/default/mMessageLog.svg</file>
         <file>themes/default/mMessageLogRead.svg</file>
         <file>themes/default/north_arrow.png</file>
@@ -442,6 +458,8 @@
         <file>themes/default/pin.svg</file>
         <file>themes/default/pluginExperimental.png</file>
         <file>themes/default/pluginDeprecated.png</file>
+        <file>themes/default/pluginNew.svg</file>
+        <file>themes/default/pluginUpgrade.svg</file>
         <file>themes/default/propertyicons/action.svg</file>
         <file>themes/default/propertyicons/attributes.png</file>
         <file>themes/default/propertyicons/CRS.svg</file>
@@ -620,6 +638,7 @@
         <file>themes/default/mActionNewPage.svg</file>
         <file>themes/default/mActionDuplicateFeatureDigitized.svg</file>
         <file>themes/default/mActionDuplicateFeature.svg</file>
+        <file>themes/default/mActionExport.svg</file>
     </qresource>
     <qresource prefix="/images/tips">
         <file alias="symbol_levels.png">qgis_tips/symbol_levels.png</file>

diff --git a/images/themes/default/lockedGray.svg b/images/themes/default/lockedGray.svg