Make setInstance private and QgsConfigCache a friend

qgis · Jun 17, 2018 · 9c85457 · 9c85457
1 parent 65c1ed2
commit 9c85457
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 18 deletions.
diff --git a/python/core/auto_generated/qgsproject.sip.in b/python/core/auto_generated/qgsproject.sip.in
@@ -46,7 +46,6 @@ Most of the time you want to use QgsProject.instance() instead as many component
 
     ~QgsProject();
 
-
     void setTitle( const QString &title );
 %Docstring
 Sets the project's title.

diff --git a/src/core/qgsproject.h b/src/core/qgsproject.h
@@ -110,23 +110,14 @@ class CORE_EXPORT QgsProject : public QObject, public QgsExpressionContextGenera
     ~QgsProject() override;
 
     /**
-     * Set the current project instance to \a project
-     *
-     * \note this is used mainly by the server, which caches the projects and (potentially) needs to switch the current instance on every request
-     * \see instance()
-     * \since QGIS 3.2
-     */
-    static void setInstance( QgsProject *project ) SIP_SKIP;
-
-    /**
-     * Sets the project's title.
-     * \param title new title
-     *
-     * \note Since QGIS 3.2 this is just a shortcut to setting the title in the project's metadata().
-     *
-     * \see title()
-     * \since QGIS 2.4
-     */
+    * Sets the project's title.
+    * \param title new title
+    *
+    * \note Since QGIS 3.2 this is just a shortcut to setting the title in the project's metadata().
+    *
+    * \see title()
+    * \since QGIS 2.4
+    */
     void setTitle( const QString &title );
 
     /**
@@ -1266,6 +1257,16 @@ class CORE_EXPORT QgsProject : public QObject, public QgsExpressionContextGenera
 
     static QgsProject *sProject;
 
+    /**
+     * Set the current project instance to \a project
+     *
+     * \note this is used mainly by the server, which caches the projects and (potentially) needs to switch the current instance on every request
+     * \see instance()
+     * \note not available in Python bindings
+     * \since QGIS 3.2
+     */
+    static void setInstance( QgsProject *project ) SIP_SKIP;
+
     /**
      * Read map layers from project file.
      * \param doc DOM document to parse
@@ -1371,6 +1372,9 @@ class CORE_EXPORT QgsProject : public QObject, public QgsExpressionContextGenera
     QgsProjectMetadata mMetadata;
 
     friend class QgsProjectDirtyBlocker;
+
+    // Required by QGIS Server for switching the current project instance
+    friend class QgsConfigCache;
 };
 
 /**

diff --git a/tests/testdata/qgis_server/value_relation.gpkg b/tests/testdata/qgis_server/value_relation.gpkg