Skip to content
Browse files
Merge branch 'master' into proc_tests
  • Loading branch information
ghtmtt committed Apr 11, 2017
2 parents 5e11886 + 669fa87 commit 410e8e7aff60c8b002687c8b493d35141e53d52e
Showing 1,572 changed files with 43,650 additions and 27,462 deletions.
@@ -2,9 +2,13 @@



ADD_SUBDIRECTORY(../../../src/astyle qgisstyle)


ADD_TEST(qgis_indentation ${CMAKE_SOURCE_DIR}/../../../scripts/
ADD_TEST(qgis_spelling ${CMAKE_SOURCE_DIR}/../../../scripts/spell_check/
ADD_TEST(qgis_sipify ${CMAKE_SOURCE_DIR}/../../../tests/scripts/
ADD_TEST(qgis_sip_uptodate ${CMAKE_SOURCE_DIR}/../../../tests/scripts/
@@ -1307,13 +1307,13 @@ ENABLE_PREPROCESSING = YES
# compilation will be performed. Macro expansion can be done in a controlled
# way by setting EXPAND_ONLY_PREDEF to YES.


# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES
# then the macro expansion is limited to the macros specified with the


# If the SEARCH_INCLUDES tag is set to YES (the default) the includes files
# in the INCLUDE_PATH (see below) will be search if a #include is found.
@@ -1348,7 +1348,23 @@ PREDEFINED = "QT_VERSION=0x040800"
# The macro definition that is found in the sources will be used.
# Use the PREDEFINED tag if you want to use a different macro definition.


# If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then
# doxygen's preprocessor will remove all function-like macros that are alone
Binary file not shown.
BIN +687 Bytes (180%) debian/icons/qgis-icon16x16.png
Binary file not shown.
Binary file not shown.
BIN +128 Bytes (110%) debian/icons/qgis-icon22x22.png
Binary file not shown.
BIN +79 Bytes (110%) debian/icons/qgis-icon24x24.png
Binary file not shown.
Binary file not shown.
BIN -54 Bytes (97%) debian/icons/qgis-icon32x32.png
Binary file not shown.
BIN -121 Bytes (95%) debian/icons/qgis-icon36x36.png
Binary file not shown.
BIN -279 Bytes (90%) debian/icons/qgis-icon42x42.png
Binary file not shown.
BIN -500 Bytes (86%) debian/icons/qgis-icon48x48.png
Binary file not shown.
Binary file not shown.
BIN -1.04 KB (79%) debian/icons/qgis-icon64x64.png
Binary file not shown.
BIN -1.33 KB (77%) debian/icons/qgis-icon72x72.png
Binary file not shown.
Binary file not shown.
BIN +242 Bytes (160%) debian/icons/qgis-icon8x8.png
Binary file not shown.
BIN -2.26 KB (73%) debian/icons/qgis-icon96x96.png
Binary file not shown.
@@ -278,7 +278,7 @@ override_dh_auto_install:
# Install menu pixmap
install -o root -g root -d $(CURDIR)/debian/tmp/usr/share/pixmaps
install -o root -g root -m 644 $(CURDIR)/images/icons/qgis_icon.svg $(CURDIR)/debian/tmp/usr/share/pixmaps/qgis.svg
install -o root -g root -m 644 $(CURDIR)/images/icons/qgis-icon.png $(CURDIR)/debian/tmp/usr/share/pixmaps/qgis.png
install -o root -g root -m 644 $(CURDIR)/images/icons/qgis-icon-512x512.png $(CURDIR)/debian/tmp/usr/share/pixmaps/qgis.png
install -o root -g root -m 644 $(CURDIR)/images/icons/qgis-mime-icon.png $(CURDIR)/debian/tmp/usr/share/pixmaps/qgis-mime.png

# Install MIME type icon
@@ -374,6 +374,16 @@ from a project, the new QgsProject.instance().layoutManager() class should be us
Additionally, the new interface methods work with QgsComposerInterface objects instead
of QgsComposerView objects.

CharacterWidget {#qgis_api_break_3_0_CharacterWidget}

- getColumns() was renamed to columns()
- getSquareSize() was renamed to squareSize()
- updateFont() was renamed to setFont()
- updateSize() was renamed to setFontSize()
- updateStyle() was renamed to setFontStyle()
- updateColumns() was renamed to setColumns()

QgsAbstractGeometry {#qgis_api_break_3_0_QgsAbstractGeometry}
@@ -930,6 +940,11 @@ QgsDiagramSettings {#qgis_api_break_3_0_QgsDiagramSettings}

- The SizeType enum was removed. Use QgsUnitTypes.RenderUnit instead.

QgsDial {#qgis_api_break_3_0_QgsDial}

- The protected valueChanged slot was removed.

QgsDistanceArea {#qgis_api_break_3_0_QgsDistanceArea}
@@ -1272,10 +1287,10 @@ QgsLayerTreeMapCanvasBridge {#qgis_api_break_3_0_QgsLayerTreeMapCanvasBri

- setAutoEnableCrsTransform() and autoEnableCrsTransform() were removed. CRS transformation is now always enabled.
- setCanvasLayers() now requires a third map layer list argument for storage of all layers in the layer tree order.
- `setCustomLayerOrder()` has been removed. Use `QgsProject::layerTree().setCustomLayerOrder()` instead
- `customLayerOrder()` has been removed. Use `QgsProject::layerTree().customLayerOrder()` or `QgsProject::layerOrder()` instead
- `hasCustomLayerOrder()` has been removed. Use `QgsProject::layerTree().hasCustomLayerOrder()` instead
- `setHasCustomLayerOrder()` has been removed. Use `QgsProject::layerTree().setHasCustomLayerOrder()` instead
- `setCustomLayerOrder()` has been removed. Use `QgsProject::layerTreeRoot().setCustomLayerOrder()` instead
- `customLayerOrder()` has been removed. Use `QgsProject::layerTreeRoot().customLayerOrder()` instead
- `hasCustomLayerOrder()` has been removed. Use `QgsProject::layerTreeRoot().hasCustomLayerOrder()` instead
- `setHasCustomLayerOrder()` has been removed. Use `QgsProject::layerTreeRoot().setHasCustomLayerOrder()` instead
- `defaultLayerOrder()` has been removed.

@@ -1375,6 +1390,8 @@ screenUpdateRequested() were removed. These members have had no effect for a num
- asLayerDefinition(), fromLayerDefinition(), fromLayerDefinitionFile() were moved to QgsLayerDefinition class and renamed to exportLayerDefinitionLayers() resp. loadLayerDefinitionLayers()
- loadNamedStyleFromDb() was renamed to loadNamedStyleFromDatabase()
- readLayerXml() and writeLayerXml() expect QgsPathResolver reference as the last argument
- the invalidTransformInput() slot was removed - calling this slot had no effect
- metadata() was renamed to htmlMetadata()

QgsMapOverviewCanvas {#qgis_api_break_3_0_QgsMapOverviewCanvas}
@@ -1536,7 +1553,10 @@ QgsPaintEffectRegistry {#qgis_api_break_3_0_QgsPaintEffectRegistry}
QgsPalettedRasterRenderer {#qgis_api_break_3_0_QgsPalettedRasterRenderer}

- The rgbArray() method was made private
- The rgbArray() method was removed
- colors() has been removed, use classes() instead.
- The constructor has a different signature and requires a list of classes instead of an array

QgsPalLabeling {#qgis_api_break_3_0_QgsPalLabeling}
@@ -1660,6 +1680,16 @@ QgsRasterDataProvider {#qgis_api_break_3_0_QgsRasterDataProvider}
- setUseSrcNoDataValue() has been renamed to setUseSourceNoDataValue()
- srcNoDataValue() has been renamed to sourceNoDataValue()
- draw() has been removed from the interface as it was not used anywhere.
- The progress and progressUpdate signals were removed. Methods which previously emitted these
signals now accept a QgsRasterBlockFeedback argument for reporting progress updates.

QgsRasterFileWriter {#qgis_api_break_3_0_QgsRasterFileWriter}

- writeRaster now uses a QgsRasterBlockFeedback object instead of a QProgressDialog argument. Any use of the old
QProgressDialog argument will need to be updated using manually created connections between QgsRasterBlockFeedback's
signals and the updates to the progress dialog.

QgsRasterInterface {#qgis_api_break_3_0_QgsRasterInterface}
@@ -1668,6 +1698,7 @@ QgsRasterInterface {#qgis_api_break_3_0_QgsRasterInterface}
- srcDataType() has been renamed to sourceDataType()
- srcInput() has been renamed to sourceInput()
- block() has new "feedback" argument.
- The signature of histogram() and bandStatistics() now takes a QgsRasterBlockFeedback pointer argument.

QgsRasterLayer {#qgis_api_break_3_0_QgsRasterLayer}
@@ -1681,6 +1712,10 @@ constructor variant which accepts a data provider string and loadDefaultStyleFla
- updateProgress() had no effect and was removed.
- CUMULATIVE_CUT_LOWER and CUMULATIVE_CUT_UPPER have been moved to QgsRasterMinMaxOrigin
- the second parameter of setContrastEnhancement() has changed type. It is now QgsRasterMinMaxOrigin::Limits
- showProgress() and onProgress() were removed
- The progressUpdate() signal was removed. Methods which previously emitted these
signals now accept a QgsRasterBlockFeedback argument for reporting progress updates.

QgsRasterProjector {#qgis_api_break_3_0_QgsRasterProjector}
@@ -1692,6 +1727,11 @@ QgsRasterRenderer

- MinMaxOrigin enum, minMaxOriginName(), minMaxOriginLabel(), minMaxOriginFromName() removed. Use minMaxOrigin() instead

QgsRectangle {#qgis_api_break_3_0_QgsRectangle}

- The protected members were removed - QgsRectangle is not intended to be subclassed.

QgsRelation {#qgis_api_break_3_0_QgsRelation}

@@ -1800,6 +1840,11 @@ QgsSingleSymbolRendererWidget {#qgis_api_break_3_0_QgsSingleSymbolRendere
- sizeScaleFieldChanged() and scaleMethodChanged() were removed. These settings are no longer exposed in the widget's GUI.
- The Mode enum was removed.

QgsSlider {#qgis_api_break_3_0_QgsSlider}

- The protected valueChanged slot was removed.

QgsSnapper {#qgis_api_break_3_0_QgsSnapper}
@@ -2125,13 +2170,14 @@ Processing {#qgis_api_break_3_0_Processing}

- Algorithm providers now subclass the c++ QgsProcessingProvider class, and must be adapted to the API for QgsProcessingProvider. Specifically,
getName() should be replaced with id(), getDescription() with name(), and getIcon with icon().
getName() should be replaced with id(), getDescription() with name(), and getIcon with icon(). AlgorithmProvider was removed.
- Algorithm's processAlgorithm method now passes a QgsProcessingFeedback object instead of the loosely defined progress parameter. Algorithms will
need to update their use of the progress argument to utilize the QgsProcessingFeedback API.
- Similarly, Python processing scripts no longer have access to a progress variable for reporting their progress. Instead they have a feedback
object of type QgsProcessingFeedback, and will need to adapt their use of progress reporting to the QgsProcessingFeedback API.
- SilentProgress was removed. Use the base QgsProcessingFeedback class instead.

- algList was removed. Use QgsApplication.processingRegistry() instead.
- Processing.algs was removed. QgsApplication.processingRegistry().algorithms() instead.

Triangulation {#qgis_api_break_3_0_Triangulation}
@@ -0,0 +1,19 @@
SET CREATOR=%APPDATA%\QtProject\qtcreator
SET WIZARDS=%CREATOR%\templates\wizards
mkdir "%WIZARDS%"

mklink /J "%WIZARDS%\qgis" %CD%\templates\wizards\qgis

mkdir "%CODESTYLES%"

IF NOT EXIST "%CODESTYLES%\qgis_code_style.xml" (
mklink "%CODESTYLES%\qgis_code_style.xml" %CD%\qgis_code_style.xml
File renamed without changes.
File renamed without changes.
@@ -0,0 +1,25 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "">
<svg version="1.1" xmlns="" xmlns:xlink="" x="0" y="0" width="256" height="256" viewBox="0, 0, 256, 256">
<g id="Background">
<rect x="0" y="0" width="256" height="256" fill="#FFFFFF"/>
<linearGradient id="Gradient_1" gradientUnits="userSpaceOnUse" x1="200.788" y1="249.007" x2="197.17" y2="11.232">
<stop offset="0" stop-color="#589632"/>
<stop offset="1" stop-color="#93B023"/>
<linearGradient id="Gradient_2" gradientUnits="userSpaceOnUse" x1="129.939" y1="252.718" x2="126.351" y2="16.928">
<stop offset="0" stop-color="#589632"/>
<stop offset="1" stop-color="#93B023"/>
<g id="Background"/>
<g id="Layer_1">
<path d="M137.607,136.899 L172.044,136.899 L142.898,108.083 L107.19,108.083 L107.19,142.392 L137.607,172.708 z" fill="#EE7913" id="polygon3"/>
<path d="M248.061,212.048 L186.618,151.306 L152.01,151.306 L152.01,187.067 L210.891,245.749 L248.061,245.749 z" fill="url(#Gradient_1)" id="polygon10"/>
<path d="M152.01,151.306 L186.618,151.306 L172.044,136.899 L137.607,136.899 L137.607,172.708 L152.01,187.067 z" fill="#F0E64A" id="polygon12"/>
<path d="M144.826,199.3 C139.606,200.502 134.183,201.154 128.588,201.154 C88.561,201.154 54.516,168.24 54.516,125.564 C54.516,82.887 88.182,50.695 128.588,50.695 C168.989,50.695 201.158,82.882 201.158,125.564 C201.158,132.501 200.295,139.183 198.697,145.509 L235.744,182.551 C245.296,165.815 250.64,146.354 250.64,125.277 C250.64,59.499 198.147,10.251 127.839,10.251 C57.849,10.251 5.36,59.178 5.36,125.277 C5.36,191.698 57.849,241.598 127.839,241.598 C145.905,241.598 162.791,238.275 177.916,232.227 L144.826,199.3 z" fill="url(#Gradient_2)" id="path19"/>
<path d="M107.19,108.083 L248.061,245.749 L248.061,212.048 L186.618,151.306 L172.044,136.898 L142.898,108.083 z" fill="#FFFFFF" fill-opacity="0.172" id="polygon4153"/>
@@ -0,0 +1,61 @@
%{SrcFileName} - %{CN}
begin : %{CurrentDate:dd-MM-yyyy}
@if %{HostOs:isWindows}
copyright : (C) %{CurrentDate:yyyy} by %{Env:USERNAME}
copyright : (C) %{CurrentDate:yyyy} by %{Env:USER}
email : [ YOUR EMAIL]

* *
* This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
* the Free Software Foundation; either version 2 of the License, or *
* (at your option) any later version. *
* *

#include "qgstest.h"
#include <QObject>
#include <qgsapplication.h>

class %{CN}: public QObject


private slots:
void initTestCase(); // will be called before the first testfunction is executed.
void cleanupTestCase(); // will be called after the last testfunction was executed.
void init(); // will be called before each testfunction is executed.
void cleanup(); // will be called after every testfunction.

// Add your test methods here

void %{CN}::initTestCase()


void %{CN}::cleanupTestCase()


void %{CN}::init()


void %{CN}::cleanup()


#include "%{JS: Cpp.classToFileName('%{Class}', '.moc')}"

0 comments on commit 410e8e7

Please sign in to comment.