backports

c77e393 legend: truncate excessively long tooltips (fixes #21737) 8851328 fix removal of temporary directories (fixes #21292) 95bd748 postgres provider: use st_estimatedextent only when 'use estimated metadata' is enabled (fixes #21718) f1dbcc3 processing: fix grass' r.quantile parameter (fixes #21751) c638255 don't relink object if just the shared objects/DLL is changed 9aaaad3 trim crssync include directories (followup 8851328)
qgis · Apr 6, 2019 · ff16662 · ff16662
1 parent 6a43d69
commit ff16662
Show file tree

Hide file tree

Showing 21 changed files with 41 additions and 24 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -8,6 +8,9 @@ SET(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake ${CMAKE_MODULE_PATH})
 CMAKE_POLICY (SET CMP0048 NEW)
 CMAKE_POLICY (SET CMP0053 NEW)
 
+# don't relink if only the shared object changes
+SET(CMAKE_LINK_DEPENDS_NO_SHARED ON)
+
 #############################################################
 # Project and version
 SET(CPACK_PACKAGE_VERSION_MAJOR "3")

diff --git a/python/core/auto_generated/qgsarchive.sip.in b/python/core/auto_generated/qgsarchive.sip.in
@@ -9,6 +9,7 @@
 
 
 
+
 class QgsArchive
 {
 %Docstring

diff --git a/python/core/auto_generated/qgsnetworkcontentfetcherregistry.sip.in b/python/core/auto_generated/qgsnetworkcontentfetcherregistry.sip.in
@@ -11,8 +11,6 @@
 
 
 
-
-
 class QgsFetchedContent : QObject
 {
 %Docstring

diff --git a/python/plugins/processing/algs/grass7/description/r.quantile.txt b/python/plugins/processing/algs/grass7/description/r.quantile.txt
@@ -6,4 +6,4 @@ QgsProcessingParameterNumber|quantiles|Number of quantiles|QgsProcessingParamete
 QgsProcessingParameterString|percentiles|List of percentiles|None|False|True
 QgsProcessingParameterNumber|bins|Number of bins to use|QgsProcessingParameterNumber.Integer|1000000|True|1|None
 *QgsProcessingParameterBoolean|-r|Generate recode rules based on quantile-defined intervals|False
-QgsProcessingParameterFileDestination|html|Quantiles|Html files (*.html)|report.html|False
+QgsProcessingParameterFileDestination|file|Quantiles|Html files (*.html)|report.html|False
diff --git a/src/core/layertree/qgslayertreemodel.cpp b/src/core/layertree/qgslayertreemodel.cpp
@@ -325,7 +325,13 @@ QVariant QgsLayerTreeModel::data( const QModelIndex &index, int role ) const
           parts << QString();
         }
 
-        parts << "<i>" + layer->publicSource().toHtmlEscaped() + "</i>";
+        QString source( layer->publicSource() );
+        if ( source.size() > 1024 )
+        {
+          source = source.left( 1023 ) + QStringLiteral( "…" );
+        }
+
+        parts << "<i>" + source.toHtmlEscaped() + "</i>";
 
         return parts.join( QStringLiteral( "<br/>" ) );
       }

diff --git a/src/core/qgsapplication.cpp b/src/core/qgsapplication.cpp
@@ -126,6 +126,7 @@ const char *QgsApplication::QGIS_ORGANIZATION_DOMAIN = "qgis.org";
 const char *QgsApplication::QGIS_APPLICATION_NAME = "QGIS3";
 
 QgsApplication::ApplicationMembers *QgsApplication::sApplicationMembers = nullptr;
+QgsAuthManager *QgsApplication::sAuthManager = nullptr;
 
 QgsApplication::QgsApplication( int &argc, char **argv, bool GUIenabled, const QString &profileFolder, const QString &platformName )
   : QApplication( argc, argv, GUIenabled )
@@ -1159,7 +1160,6 @@ QgsAuthManager *QgsApplication::authManager()
   else
   {
     // no QgsApplication instance
-    static QgsAuthManager *sAuthManager = nullptr;
     if ( !sAuthManager )
       sAuthManager = QgsAuthManager::instance();
     return sAuthManager;
@@ -1169,7 +1169,11 @@ QgsAuthManager *QgsApplication::authManager()
 
 void QgsApplication::exitQgis()
 {
-  delete QgsApplication::authManager();
+  // don't create to delete
+  if ( instance() )
+    delete instance()->mAuthManager;
+  else
+    delete sAuthManager;
 
   //Ensure that all remaining deleteLater QObjects are actually deleted before we exit.
   //This isn't strictly necessary (since we're exiting anyway) but doing so prevents a lot of

diff --git a/src/core/qgsapplication.h b/src/core/qgsapplication.h
@@ -882,6 +882,8 @@ class CORE_EXPORT QgsApplication : public QApplication
     // ... but in case QgsApplication is never instantiated (eg with custom designer widgets), we fall back to static members
     static ApplicationMembers *sApplicationMembers;
 
+    static QgsAuthManager *sAuthManager;
+
     static ApplicationMembers *members();
 };
 

diff --git a/src/core/qgsarchive.cpp b/src/core/qgsarchive.cpp
@@ -20,7 +20,6 @@
 #include "qgsziputils.h"
 #include "qgsmessagelog.h"
 #include "qgsauxiliarystorage.h"
-#include <iostream>
 
 #include <QStandardPaths>
 #include <QUuid>
@@ -32,7 +31,7 @@ QgsArchive::QgsArchive()
 
 QgsArchive::QgsArchive( const QgsArchive &other )
   : mFiles( other.mFiles )
-  ,  mDir( new QTemporaryDir() )
+  , mDir( new QTemporaryDir() )
 {
 }
 

diff --git a/src/core/qgsarchive.h b/src/core/qgsarchive.h
@@ -20,6 +20,7 @@
 #define QGSARCHIVE_H
 
 #include "qgis_core.h"
+
 #include <QStringList>
 #include <QTemporaryFile>
 #include <QTemporaryDir>

diff --git a/src/core/qgscoordinatereferencesystem.cpp b/src/core/qgscoordinatereferencesystem.cpp
@@ -21,7 +21,6 @@
 #include <cmath>
 
 #include <QDir>
-#include <QTemporaryFile>
 #include <QDomNode>
 #include <QDomElement>
 #include <QFileInfo>

diff --git a/src/core/qgsnetworkcontentfetcherregistry.h b/src/core/qgsnetworkcontentfetcherregistry.h
@@ -23,15 +23,12 @@
 #include <QMap>
 #include <QMutex>
 #include <QNetworkReply>
-#include <QTemporaryFile>
 
 #include "qgis_core.h"
-
-class QTemporaryFile;
-
 #include "qgstaskmanager.h"
 #include "qgsnetworkcontentfetchertask.h"
 
+class QTemporaryFile;
 
 /**
  * \class QgsFetchedContent

diff --git a/src/core/qgsproject.h b/src/core/qgsproject.h
@@ -1458,6 +1458,9 @@ class CORE_EXPORT QgsProject : public QObject, public QgsExpressionContextGenera
 
     friend class QgsProjectDirtyBlocker;
 
+    // Required to avoid creating a new project in it's destructor
+    friend class QgsProviderRegistry;
+
     // Required by QGIS Server for switching the current project instance
     friend class QgsConfigCache;
 };

diff --git a/src/core/qgsproviderregistry.cpp b/src/core/qgsproviderregistry.cpp
@@ -246,7 +246,9 @@ typedef void cleanupProviderFunction_t();
 
 void QgsProviderRegistry::clean()
 {
-  QgsProject::instance()->removeAllMapLayers();
+  // avoid recreating a new project just to clean it
+  if ( QgsProject::sProject )
+    QgsProject::instance()->removeAllMapLayers();
 
   Providers::const_iterator it = mProviders.begin();
 

diff --git a/src/core/qgssettings.cpp b/src/core/qgssettings.cpp
@@ -15,6 +15,7 @@
 
 
 #include <cstdlib>
+
 #include <QFileInfo>
 #include <QSettings>
 #include <QDir>

diff --git a/src/crssync/CMakeLists.txt b/src/crssync/CMakeLists.txt
@@ -3,7 +3,6 @@ ADD_EXECUTABLE(crssync main.cpp)
 INCLUDE_DIRECTORIES(
   ../core
   ../core/geometry
-  ../core/metadata
   ${CMAKE_BINARY_DIR}/src/core
 )
 INCLUDE_DIRECTORIES(SYSTEM

diff --git a/src/crssync/main.cpp b/src/crssync/main.cpp
@@ -84,5 +84,7 @@ int main( int argc, char **argv )
     std::cout << -res << " CRSs could not be updated." << std::endl;
   }
 
-  exit( 0 );
+  QgsApplication::exitQgis();
+
+  return 0;
 }
diff --git a/src/gui/qgscolorbutton.cpp b/src/gui/qgscolorbutton.cpp
@@ -24,7 +24,6 @@
 #include "qgssettings.h"
 
 #include <QPainter>
-#include <QTemporaryFile>
 #include <QMouseEvent>
 #include <QMenu>
 #include <QClipboard>

diff --git a/src/gui/qgscolorbutton.h b/src/gui/qgscolorbutton.h
@@ -17,7 +17,6 @@
 
 #include <QColorDialog>
 #include <QToolButton>
-#include <QTemporaryFile>
 #include "qgis_gui.h"
 #include "qgis.h"
 

diff --git a/src/gui/symbology/qgsstyleexportimportdialog.cpp b/src/gui/symbology/qgsstyleexportimportdialog.cpp
@@ -32,8 +32,11 @@
 #include <QCloseEvent>
 #include <QFileDialog>
 #include <QMessageBox>
+#include <QProgressDialog>
 #include <QPushButton>
 #include <QStandardItemModel>
+#include <QNetworkAccessManager>
+#include <QNetworkReply>
 
 
 QgsStyleExportImportDialog::QgsStyleExportImportDialog( QgsStyle *style, QWidget *parent, Mode mode )

diff --git a/src/gui/symbology/qgsstyleexportimportdialog.h b/src/gui/symbology/qgsstyleexportimportdialog.h
@@ -19,11 +19,6 @@
 
 #include <QDialog>
 #include <QUrl>
-#include <QProgressDialog>
-#include <QTemporaryFile>
-#include <QNetworkAccessManager>
-#include <QNetworkReply>
-#include <QStandardItem>
 
 #include "ui_qgsstyleexportimportdialogbase.h"
 #include "qgis_gui.h"
@@ -34,6 +29,10 @@ class QgsStyle;
 class QgsStyleGroupSelectionDialog;
 class QgsTemporaryCursorOverride;
 class QgsStyleModel;
+class QTemporaryFile;
+class QProgressDialog;
+class QNetworkAccessManager;
+class QNetworkReply;
 
 /**
  * \ingroup gui

diff --git a/src/providers/postgres/qgspostgresprovider.cpp b/src/providers/postgres/qgspostgresprovider.cpp
@@ -3234,7 +3234,7 @@ QgsRectangle QgsPostgresProvider::extent() const
     QString ext;
 
     // get the extents
-    if ( !mIsQuery && ( mUseEstimatedMetadata || mSqlWhereClause.isEmpty() ) )
+    if ( !mIsQuery && mUseEstimatedMetadata )
     {
       // do stats exists?
       sql = QStringLiteral( "SELECT count(*) FROM pg_stats WHERE schemaname=%1 AND tablename=%2 AND attname=%3" )