Merge c19416bb78a666ea85e8d897e8973dc4a52627e5 into 810c1a07eb729f4fccb5acd2ae4bb57d820a2914

CMakeLists.txt

@@ -451,9 +451,6 @@ if(WITH_CORE)
   message(STATUS "Found GDAL: ${GDAL_VERSION} ${GDAL_DIR}")
   find_package(EXPAT REQUIRED)
   find_package(Spatialindex REQUIRED)
-  if(SPATIALINDEX_VERSION VERSION_GREATER_EQUAL "2.1")
-    message(FATAL_ERROR "Cannot build QGIS using libspatialindex >= 2.1, see https://github.com/libspatialindex/libspatialindex/issues/276")
-  endif()
   find_package(LibZip REQUIRED)
   set (WITH_INTERNAL_NLOHMANN_JSON ${PREFER_INTERNAL_LIBS} CACHE BOOL "Determines whether the vendored copy of nlohmann-json should be used")
   find_package(nlohmann_json REQUIRED)

cmake/FindSpatialindex.cmake

@@ -8,7 +8,7 @@
 # SPATIALINDEX_FOUND       = system has Spatialindex lib
 # SPATIALINDEX_LIBRARY     = full path to the Spatialindex library
 # SPATIALINDEX_INCLUDE_DIR = where to find headers
-# SPATIALINDEX_VERSION     = version number
+#
 
 
 FIND_PATH(SPATIALINDEX_INCLUDE_DIR spatialindex/SpatialIndex.h PATHS
@@ -32,21 +32,8 @@ IF (SPATIALINDEX_INCLUDE_DIR AND SPATIALINDEX_LIBRARY)
 ENDIF (SPATIALINDEX_INCLUDE_DIR AND SPATIALINDEX_LIBRARY)
 
 IF (SPATIALINDEX_FOUND)
-  set(spatialindex_version_file
-      "${SPATIALINDEX_INCLUDE_DIR}/spatialindex/Version.h")
-  file(STRINGS "${spatialindex_version_file}" spatialindex_version_major REGEX "#define SIDX_VERSION_MAJOR")
-  list(GET spatialindex_version_major 0 spatialindex_version_major)
-  string(REGEX MATCH "[0-9]+" SPATIALINDEX_VERSION_MAJOR ${spatialindex_version_major} )
-  file(STRINGS "${spatialindex_version_file}" spatialindex_version_minor REGEX "#define SIDX_VERSION_MINOR")
-  list(GET spatialindex_version_minor 0 spatialindex_version_minor)
-  string(REGEX MATCH "[0-9]+" SPATIALINDEX_VERSION_MINOR ${spatialindex_version_minor} )
-  file(STRINGS "${spatialindex_version_file}" spatialindex_version_rev REGEX "#define SIDX_VERSION_REV")
-  list(GET spatialindex_version_rev 0 spatialindex_version_rev)
-  string(REGEX MATCH "[0-9]+" SPATIALINDEX_VERSION_REV ${spatialindex_version_rev} )
-  set(SPATIALINDEX_VERSION "${SPATIALINDEX_VERSION_MAJOR}.${SPATIALINDEX_VERSION_MINOR}.${SPATIALINDEX_VERSION_REV}")
-
   IF (NOT SPATIALINDEX_FIND_QUIETLY)
-    MESSAGE(STATUS "Found Spatialindex: ${SPATIALINDEX_LIBRARY} (${SPATIALINDEX_VERSION})")
+    MESSAGE(STATUS "Found Spatialindex: ${SPATIALINDEX_LIBRARY}")
   ENDIF (NOT SPATIALINDEX_FIND_QUIETLY)
 ELSE (SPATIALINDEX_FOUND)
   IF (SPATIALINDEX_FIND_REQUIRED)

python/plugins/processing/algs/gdal/merge.py

@@ -266,19 +266,6 @@ class merge(GdalAlgorithm):
         arguments.append(list_file)
 
         return [
-            self.commandName() + merge.command_ext(),
+            self.commandName() + (".bat" if isWindows() else ".py"),
             GdalUtils.escapeAndJoin(arguments),
         ]
-
-    @staticmethod
-    def command_ext() -> str:
-        """
-        Returns the gdal_merge command extension
-        """
-        if isWindows():
-            return ".bat"
-
-        if GdalUtils.version() < 3090000:
-            return ".py"
-
-        return ""

python/plugins/processing/tests/GdalAlgorithmsRasterTest.py

@@ -4556,8 +4556,6 @@ class TestGdalRasterAlgorithms(QgisTestCase, AlgorithmsTestBase.AlgorithmsTest):
         alg = merge()
         alg.initAlgorithm()
 
-        merge_command = alg.commandName() + alg.command_ext()
-
         with tempfile.TemporaryDirectory() as outdir:
             # this algorithm creates temporary text file with input layers
             # so we strip its path, leaving only filename
@@ -4569,7 +4567,7 @@ class TestGdalRasterAlgorithms(QgisTestCase, AlgorithmsTestBase.AlgorithmsTest):
             self.assertEqual(
                 cmd,
                 [
-                    merge_command,
+                    "gdal_merge.py",
                     "-ot Float32 -of GTiff "
                     + "-o "
                     + outdir
@@ -4588,7 +4586,7 @@ class TestGdalRasterAlgorithms(QgisTestCase, AlgorithmsTestBase.AlgorithmsTest):
             self.assertEqual(
                 cmd,
                 [
-                    merge_command,
+                    "gdal_merge.py",
                     "-separate -ot Float32 -of GTiff "
                     + "-o "
                     + outdir
@@ -4612,7 +4610,7 @@ class TestGdalRasterAlgorithms(QgisTestCase, AlgorithmsTestBase.AlgorithmsTest):
             self.assertEqual(
                 cmd,
                 [
-                    merge_command,
+                    "gdal_merge.py",
                     "-ot Float32 -of GTiff -tap -ps 0.1 0.1 "
                     + "-o "
                     + outdir
@@ -4636,7 +4634,7 @@ class TestGdalRasterAlgorithms(QgisTestCase, AlgorithmsTestBase.AlgorithmsTest):
             self.assertEqual(
                 cmd,
                 [
-                    merge_command,
+                    "gdal_merge.py",
                     "-a_nodata -9999.0 -ot Float32 -of GTiff "
                     + "-o "
                     + outdir

python/plugins/processing/tools/system.py

@@ -41,7 +41,7 @@ def userFolder():
 
 
 def defaultOutputFolder():
-    folder = os.path.join(QDir.homePath(), "processing")
+    folder = os.path.join(userFolder(), "outputs")
     if not QDir(folder).exists():
         QDir().mkpath(folder)
 

resources/themes/Blend of Gray/style.qss

@@ -988,11 +988,6 @@ QTreeView::item:selected, QTreeView::branch:selected {
     color: @text;
 }
 
-QTreeView::item:selected:disabled, QTreeView::branch:selected:disabled {
-    background-color: @itemalternativebackground;
-    color: @background;
-}
-
 QTreeView::branch:has-children:!has-siblings:closed,
 QTreeView::branch:closed:has-children:has-siblings {
     border-image: none;

resources/themes/Night Mapping/style.qss

@@ -1019,11 +1019,6 @@ QTreeView::item:selected, QTreeView::branch:selected {
     color: @textlight;
 }
 
-QTreeView::item:selected:disabled, QTreeView::branch:selected:disabled {
-    background-color: @itemdarkbackground;
-    color: @background;
-}
-
 QTreeView::branch:has-children:!has-siblings:closed,
 QTreeView::branch:closed:has-children:has-siblings {
     border-image: none;

src/core/qgsgenericspatialindex.h

@@ -77,16 +77,16 @@ class QgsGenericSpatialIndex
       catch ( Tools::Exception &e )
       {
         Q_UNUSED( e )
-        QgsDebugError( QStringLiteral( "Tools::Exception caught when inserting data to QgsGenericSpatialIndex: %1" ).arg( e.what().c_str() ) );
+        QgsDebugError( QStringLiteral( "Tools::Exception caught: " ).arg( e.what().c_str() ) );
       }
       catch ( const std::exception &e )
       {
         Q_UNUSED( e )
-        QgsDebugError( QStringLiteral( "std::exception caught when inserting data to QgsGenericSpatialIndex: %1" ).arg( e.what() ) );
+        QgsDebugError( QStringLiteral( "std::exception caught: " ).arg( e.what() ) );
       }
       catch ( ... )
       {
-        QgsDebugError( QStringLiteral( "unknown spatial index exception caught when inserting data to QgsGenericSpatialIndex" ) );
+        QgsDebugError( QStringLiteral( "unknown spatial index exception caught" ) );
       }
 
       return false;
@@ -126,25 +126,7 @@ class QgsGenericSpatialIndex
       const SpatialIndex::Region r = QgsSpatialIndexUtils::rectangleToRegion( bounds );
 
       const QMutexLocker locker( &mMutex );
-      try
-      {
-        mRTree->intersectsWithQuery( r, visitor );
-      }
-      catch ( Tools::Exception &e )
-      {
-        Q_UNUSED( e )
-        QgsDebugError( QStringLiteral( "Tools::Exception caught in QgsGenericSpatialIndex::intersects: %1" ).arg( e.what().c_str() ) );
-      }
-      catch ( const std::exception &e )
-      {
-        Q_UNUSED( e )
-        QgsDebugError( QStringLiteral( "std::exception caught in QgsGenericSpatialIndex::intersects: %1" ).arg( e.what() ) );
-      }
-      catch ( ... )
-      {
-        QgsDebugError( QStringLiteral( "unknown spatial index exception caught in QgsGenericSpatialIndex::intersects" ) );
-      }
-
+      mRTree->intersectsWithQuery( r, visitor );
       return true;
     }
 

src/core/qgsspatialindex.cpp

@@ -457,16 +457,16 @@ bool QgsSpatialIndex::addFeature( QgsFeatureId id, const QgsRectangle &bounds )
   catch ( Tools::Exception &e )
   {
     Q_UNUSED( e )
-    QgsDebugError( QStringLiteral( "Tools::Exception caught when adding feature to QgsSpatialIndex: %1" ).arg( e.what().c_str() ) );
+    QgsDebugError( QStringLiteral( "Tools::Exception caught: " ).arg( e.what().c_str() ) );
   }
   catch ( const std::exception &e )
   {
     Q_UNUSED( e )
-    QgsDebugError( QStringLiteral( "std::exception caught when adding feature to QgsSpatialIndex: %1" ).arg( e.what() ) );
+    QgsDebugError( QStringLiteral( "std::exception caught: " ).arg( e.what() ) );
   }
   catch ( ... )
   {
-    QgsDebugError( QStringLiteral( "unknown spatial index exception caught when adding feature to QgsSpatialIndex" ) );
+    QgsDebugError( QStringLiteral( "unknown spatial index exception caught" ) );
   }
 
   return false;

src/gui/processing/qgsprocessingoutputdestinationwidget.cpp

@@ -25,7 +25,6 @@
 #include "qgsprocessingcontext.h"
 #include "qgsprocessingalgorithm.h"
 #include "qgsfieldmappingwidget.h"
-#include "qgsapplication.h"
 #include <QMenu>
 #include <QFileDialog>
 #include <QInputDialog>
@@ -176,7 +175,7 @@ QVariant QgsProcessingLayerOutputDestinationWidget::value() const
     if ( folder == '.' )
     {
       // output name does not include a folder - use default
-      QString defaultFolder = settings.value( QStringLiteral( "/Processing/Configuration/OUTPUTS_FOLDER" ), QStringLiteral( "%1/processing" ).arg( QDir::homePath() ) ).toString();
+      QString defaultFolder = settings.value( QStringLiteral( "/Processing/Configuration/OUTPUTS_FOLDER" ) ).toString();
       key = QDir( defaultFolder ).filePath( key );
     }
   }

vcpkg/ports/libspatialindex/portfile.cmake

@@ -1,26 +0,0 @@
-vcpkg_from_github(
-    OUT_SOURCE_PATH SOURCE_PATH
-    REPO libspatialindex/libspatialindex
-    REF "${VERSION}"
-    SHA512 a508a9ed4019641bdaaa53533505531f3db440b046a9c7d9f78ed480293200c51796c2d826a6bb9b4f9543d60bb0fef9e4c885ec3f09326cfa4d2fb81c1593aa
-    HEAD_REF master
-)
-
-vcpkg_cmake_configure(
-    SOURCE_PATH "${SOURCE_PATH}"
-    WINDOWS_USE_MSBUILD
-    OPTIONS
-        -DCMAKE_DEBUG_POSTFIX=d
-        -DSIDX_BUILD_TESTS:BOOL=OFF
-)
-
-vcpkg_cmake_install()
-vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT})  
-vcpkg_fixup_pkgconfig()
-vcpkg_copy_pdbs()
-
-#Debug
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
-
-# Handle copyright
-file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)

vcpkg/ports/libspatialindex/vcpkg.json

@@ -1,18 +0,0 @@
-{
-  "name": "libspatialindex",
-  "version": "2.0.0",
-  "description": "C++ implementation of R*-tree, an MVR-tree and a TPR-tree with C API.",
-  "homepage": "http://libspatialindex.github.com",
-  "license": "MIT",
-  "dependencies": [
-    {
-      "name": "vcpkg-cmake",
-      "host": true
-    },
-    {
-      "name": "vcpkg-cmake-config",
-      "host": true
-    },
-    "zlib"
-  ]
-}