Skip to content
Permalink
Browse files

Merge branch 'master' into work_duplicategeom

  • Loading branch information
m-kuhn committed Jan 8, 2018
2 parents 5e7865c + 2b8143a commit 9ba5324b67af91464c858a31ab22dd54bbe2fe00
Showing 789 changed files with 23,065 additions and 29,786 deletions.
@@ -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"
@@ -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)
@@ -62,5 +62,7 @@

#cmakedefine USE_THREAD_LOCAL

#cmakedefine QGISDEBUG

#endif

@@ -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
@@ -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

Large diffs are not rendered by default.

@@ -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}
)

@@ -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>
@@ -1,7 +1 @@
<svg enable-background="new 0 0 24 24" height="16" viewBox="0 0 16 16" width="16" xmlns="http://www.w3.org/2000/svg">
<g stroke-linecap="square" transform="translate(0 -16)">
<path d="m4.4067695 22.865202c.118637-3.818452.9490726-5.54713 3.8198656-5.314294 2.8704699.232276 3.5159769 2.078983 3.3968089 5.897741" fill="none" stroke="#888a85" stroke-linejoin="round" stroke-width="3"/>
<path d="m4.2757863 25l .1166762-2.134798c.118637-3.818452.9490726-5.591324 3.8198656-5.358488 2.8704699.232276 3.5159769 2.123177 3.3968089 5.941935l-.085506 1.551351" fill="none" stroke="#eeeeec" stroke-linejoin="round"/>
<rect fill="#666" height="7" rx=".84615386" ry="1" stroke="#666" stroke-width=".99999994" width="11" x="2.5" y="24.5"/>
</g>
</svg>
<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16"><path d="M4.407 7.888c.118-3.818.949-5.547 3.82-5.314 2.87.232 3.516 2.08 3.396 5.898" fill="none" stroke="#888a85" stroke-width="3" stroke-linecap="square" stroke-linejoin="round"/><path d="M4.276 10.023l.116-2.135c.12-3.818.95-5.59 3.82-5.358 2.87.232 3.516 2.123 3.397 5.942l-.085 1.551" fill="none" stroke="#eeeeec" stroke-linecap="square" stroke-linejoin="round"/><rect y="8.5" x="2.5" width="11" ry="1" rx=".846" height="7" fill="#666" stroke="#666" stroke-linecap="square"/></svg>

0 comments on commit 9ba5324

Please sign in to comment.
You can’t perform that action at this time.