diff --git a/src/core/qgsapplication.cpp b/src/core/qgsapplication.cpp index a382aa38aaa..22dd2eebc67 100644 --- a/src/core/qgsapplication.cpp +++ b/src/core/qgsapplication.cpp @@ -111,8 +111,6 @@ const char *QgsApplication::QGIS_ORGANIZATION_DOMAIN = "qgis.org"; const char *QgsApplication::QGIS_APPLICATION_NAME = "QGIS3"; QgsApplication::ApplicationMembers *QgsApplication::sApplicationMembers = nullptr; -QgsAuthManager *QgsApplication::sAuthManager = nullptr; -QgsDataItemProviderRegistry *QgsApplication::sDataItemProviderRegistry = nullptr; QgsApplication::QgsApplication( int &argc, char **argv, bool GUIenabled, const QString &profileFolder, const QString &platformName ) : QApplication( argc, argv, GUIenabled ) @@ -903,6 +901,7 @@ QgsAuthManager *QgsApplication::authManager() else { // no QgsApplication instance + static QgsAuthManager *sAuthManager = nullptr; if ( !sAuthManager ) sAuthManager = QgsAuthManager::instance(); return sAuthManager; @@ -1572,6 +1571,7 @@ QgsDataItemProviderRegistry *QgsApplication::dataItemProviderRegistry() else { // no QgsApplication instance + static QgsDataItemProviderRegistry *sDataItemProviderRegistry = nullptr; if ( !sDataItemProviderRegistry ) sDataItemProviderRegistry = new QgsDataItemProviderRegistry(); return sDataItemProviderRegistry; diff --git a/src/core/qgsapplication.h b/src/core/qgsapplication.h index 4466a318cc8..2d5eb311366 100644 --- a/src/core/qgsapplication.h +++ b/src/core/qgsapplication.h @@ -749,12 +749,7 @@ class CORE_EXPORT QgsApplication : public QApplication QMap mIconCache; QgsDataItemProviderRegistry *mDataItemProviderRegistry = nullptr; - // ... but in case QgsApplication is never instantiated (eg with custom designer widgets), we fall back to static instance - static QgsDataItemProviderRegistry *sDataItemProviderRegistry; - QgsAuthManager *mAuthManager = nullptr; - // ... but in case QgsApplication is never instantiated (eg with custom designer widgets), we fall back to static instance - static QgsAuthManager *sAuthManager; struct ApplicationMembers {