Merge branch 'master' into unvirtualize-setdatasource

qgis · May 5, 2021 · ef3d9a2 · ef3d9a2
2 parents 81ed419 + 02685f1
commit ef3d9a2
Show file tree

Hide file tree

Showing 489 changed files with 15,015 additions and 1,963 deletions.
diff --git a/.github/workflows/backport.yml b/.github/workflows/backport.yml
@@ -13,6 +13,6 @@ jobs:
       - name: Backport Bot
         id: backport
         if: github.event.pull_request.merged && ( ( github.event.action == 'closed' && contains( join( github.event.pull_request.labels.*.name ), 'backport') ) || contains( github.event.label.name, 'backport' ) )
-        uses: m-kuhn/backport@v1.1.1
+        uses: m-kuhn/backport@v1.2.2
         with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
+          github_token: ${{ secrets.GH_TOKEN_BOT }}
diff --git a/.github/workflows/build-docker.yml b/.github/workflows/build-docker.yml
@@ -64,7 +64,7 @@ jobs:
 
       - name: Cache
         id: cache
-        uses: actions/cache@v2.1.4
+        uses: actions/cache@v2.1.5
         with:
           path: ~/.ccache
           key: docker-build-${{ matrix.branch }}-${{ github.sha }}

diff --git a/.github/workflows/code_layout.yml b/.github/workflows/code_layout.yml
@@ -5,6 +5,7 @@ on:
     branches:
       - master
       - release-**
+      - queued_ltr_backports
   pull_request:
 
 jobs:
@@ -14,7 +15,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v2
       - name: Set up Python 3.7
-        uses: actions/setup-python@v2.2.1
+        uses: actions/setup-python@v2.2.2
         with:
           python-version: 3.7
       - name: Install Requirements
@@ -159,7 +160,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Set up Python 3.7
-        uses: actions/setup-python@v2.2.1
+        uses: actions/setup-python@v2.2.2
         with:
           python-version: 3.7
       - name: Install Requirements

diff --git a/.github/workflows/flake8.yml b/.github/workflows/flake8.yml
@@ -14,14 +14,14 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Setup Python
-        uses: actions/setup-python@v2.2.1
+        uses: actions/setup-python@v2.2.2
         with:
           python-version: 3.7
           architecture: x64
       - name: Checkout
         uses: actions/checkout@v2
       - name: Run flake8
-        uses: julianwachholz/flake8-action@v1.1.0
+        uses: julianwachholz/flake8-action@v2.0.0
         with:
           checkName: 'Python Lint'
         env:

diff --git a/.github/workflows/macos-build.yml b/.github/workflows/macos-build.yml
@@ -4,6 +4,7 @@ on:
     branches:
       - master
       - release-**
+      - queued_ltr_backports
     paths:
     - 'src/**'
     - 'external/**'

diff --git a/.github/workflows/mingw64.yml b/.github/workflows/mingw64.yml
@@ -5,6 +5,7 @@ on:
     branches:
       - master
       - release-**
+      - queued_ltr_backports
     paths:
     - 'src/**'
     - 'external/**'
@@ -98,13 +99,13 @@ jobs:
           (cd $DEBUGROOT && zip -r - *) > qgis-portable-win64-debugsym.zip
 
       - name: Upload QGIS for Windows 64bit
-        uses: actions/upload-artifact@v2.2.2
+        uses: actions/upload-artifact@v2.2.3
         with:
           name: QGIS for Windows 64bit
           path: qgis-portable-win64.zip
 
       - name: Upload QGIS for Windows 64bit Debug Symbols
-        uses: actions/upload-artifact@v2.2.2
+        uses: actions/upload-artifact@v2.2.3
         with:
           name: QGIS for Windows 64bit Debug Symbols
           path: qgis-portable-win64-debugsym.zip
diff --git a/.github/workflows/ogc.yml b/.github/workflows/ogc.yml
@@ -5,6 +5,7 @@ on:
     branches:
       - master
       - release-**
+      - queued_ltr_backports
     paths:
     - 'src/core/**'
     - 'src/auth/**'

diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
@@ -5,6 +5,7 @@ on:
     branches:
       - master
       - release-**
+      - queued_ltr_backports
     paths:
     - 'src/**'
     - 'external/**'
@@ -38,8 +39,6 @@ jobs:
         include:
           - ubuntu-base: '20.04'
             run-tests: true
-          - ubuntu-base: '20.10'
-            run-tests: false
           - ubuntu-base: '21.04'
             run-tests: false
       fail-fast: false
@@ -136,7 +135,7 @@ jobs:
         if: ${{ matrix.run-tests }}
         run: tar --exclude='*.o' -cvzf build.tgz build
 
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v2.2.3
         if: ${{ matrix.run-tests }}
         with:
           name: build.tgz

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -681,8 +681,8 @@ else()
 endif()
 
 if(MSVC)
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /utf-8")
-  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /utf-8")
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /utf-8 /std:c++17")
+  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /utf-8 /std:c++17")
   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()

diff --git a/INSTALL.md b/INSTALL.md
@@ -95,7 +95,7 @@ Required build tools:
 * CMake >= 3.10.0
 * Flex >= 2.5.6
 * Bison >= 2.4
-* Python >= 3.6
+* Python >= 3.7
 
 Required build dependencies:
 

diff --git a/cmake_templates/qgsconfig.h.in b/cmake_templates/qgsconfig.h.in
@@ -46,6 +46,11 @@
 
 #define QT_PLUGINS_DIR "${QT_PLUGINS_DIR}"
 
+#define PYTHON_VERSION "${Python_VERSION}"
+#define PYTHON_VERSION_MAJOR "${Python_VERSION_MAJOR}"
+#define PYTHON_VERSION_MINOR "${Python_VERSION_MINOR}"
+#define PYTHON_VERSION_PATCH "${Python_VERSION_PATCH}"
+
 #cmakedefine USING_NMAKE
 
 #cmakedefine USING_NINJA

diff --git a/external/o2/README.md b/external/o2/README.md
@@ -180,7 +180,7 @@ That's it. Tweets using the O2 library!
 
 ### Storing OAuth Tokens
 
-O2 provides simple storage classes for writing OAuth tokens in a peristent location. Currently, a QSettings based backing store **O2SettingsStore** is provided in O2. O2SettingsStore keeps all token values in an encrypted form. You have to specify the encryption key to use while constructing the object:
+O2 provides simple storage classes for writing OAuth tokens in a persistent location. Currently, a QSettings based backing store **O2SettingsStore** is provided in O2. O2SettingsStore keeps all token values in an encrypted form. You have to specify the encryption key to use while constructing the object:
 
     O0SettingsStore settings = new O0SettingsStore("myencryptionkey");
     // Set the store before starting OAuth, i.e before calling link()

diff --git a/external/untwine/api/QgisUntwine.cpp b/external/untwine/api/QgisUntwine.cpp
@@ -1,4 +1,5 @@
 #include <iostream>
+#include <algorithm>
 
 #include "QgisUntwine.hpp"
 

diff --git a/external/untwine/untwine/MapFile.cpp b/external/untwine/untwine/MapFile.cpp
@@ -49,10 +49,10 @@ MapContext mapFile(const std::string& filename, bool readOnly,
         return ctx;
     }
 
-#ifndef WIN32
+#ifndef _WIN32
     ctx.m_fd = ::open(filename.c_str(), readOnly ? O_RDONLY : O_RDWR);
 #else
-    ctx.m_fd = ::_open(filename.c_str(), readOnly ? O_RDONLY : O_RDWR);
+    ctx.m_fd = ::_open(filename.c_str(), readOnly ? _O_RDONLY : _O_RDWR);
 #endif
 
     if (ctx.m_fd == -1)

diff --git a/external/wintoast/README.md b/external/wintoast/README.md
@@ -148,8 +148,8 @@ A common example of usage is to check while initializing the library or showing
 
 ```cpp
 WinToast::WinToastError error;
-const bool succedded = WinToast::instance()->initialize(&error);
-if (!succedded) {  
+const bool succeeded = WinToast::instance()->initialize(&error);
+if (!succeeded) {  
     std::wcout << L"Error, could not initialize the lib. Error number: " 
     << error << std::endl;
 }

diff --git a/images/images.qrc b/images/images.qrc
@@ -913,6 +913,8 @@
         <file>themes/default/console/iconSyntaxErrorConsoleParams.svg</file>
         <file>themes/default/mIconSnappingEndpoint.svg</file>
         <file>themes/default/mActionStreamingDigitize.svg</file>
+        <file>themes/default/mActionEditHtml.svg</file>
+        <file>themes/default/mIndicatorNotes.svg</file>
     </qresource>
     <qresource prefix="/images/tips">
         <file alias="symbol_levels.png">qgis_tips/symbol_levels.png</file>

diff --git a/images/themes/default/mActionEditHtml.svg b/images/themes/default/mActionEditHtml.svg
diff --git a/images/themes/default/mIndicatorNotes.svg b/images/themes/default/mIndicatorNotes.svg
diff --git a/python/3d/auto_generated/qgspointcloudlayer3drenderer.sip.in b/python/3d/auto_generated/qgspointcloudlayer3drenderer.sip.in
@@ -11,7 +11,6 @@
 
 
 
-
 class QgsPointCloudLayer3DRenderer : QgsAbstract3DRenderer
 {
 %Docstring(signature="appended")

diff --git a/python/analysis/auto_generated/vector/qgsgeometrysnapper.sip.in b/python/analysis/auto_generated/vector/qgsgeometrysnapper.sip.in
@@ -10,6 +10,7 @@
 
 
 
+
 class QgsGeometrySnapper : QObject
 {
 %Docstring(signature="appended")

diff --git a/python/core/__init__.py.in b/python/core/__init__.py.in
@@ -34,7 +34,7 @@ from .additions.qgsfeature import mapping_feature
 from .additions.qgsfunction import register_function, qgsfunction
 from .additions.qgsgeometry import _geometryNonZero, mapping_geometry
 from .additions.qgssettings import _qgssettings_enum_value, _qgssettings_set_enum_value, _qgssettings_flag_value
-from .additions.qgssettingsentry import PyQgsSettingsEntryEnum, PyQgsSettingsEntryFlag
+from .additions.qgssettingsentry import PyQgsSettingsEntryEnumFlag
 from .additions.qgstaskwrapper import QgsTaskWrapper
 from .additions.readwritecontextentercategory import ReadWriteContextEnterCategory
 from .additions.runtimeprofiler import ScopedRuntimeProfileContextManager
@@ -59,8 +59,7 @@ QgsDateTimeRange.__repr__ = datetime_range_repr
 QgsDateRange.__repr__ = date_range_repr
 
 # Classes patched
-QgsSettingsEntryEnum = PyQgsSettingsEntryEnum
-QgsSettingsEntryFlag = PyQgsSettingsEntryFlag
+QgsSettingsEntryEnumFlag = PyQgsSettingsEntryEnumFlag
 
 # Classes patched using a derived class
 QgsProviderMetadata = PyProviderMetadata