Typo and SIP_SKIP

qgis · Jun 15, 2018 · 65c1ed2 · 65c1ed2
1 parent a2718da
commit 65c1ed2
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 5 deletions.
diff --git a/src/core/qgsproject.h b/src/core/qgsproject.h
@@ -109,17 +109,14 @@ class CORE_EXPORT QgsProject : public QObject, public QgsExpressionContextGenera
 
     ~QgsProject() override;
 
-#ifndef SIP_RUN
-
     /**
      * 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 );
-#endif
+    static void setInstance( QgsProject *project ) SIP_SKIP;
 
     /**
      * Sets the project's title.

diff --git a/tests/src/python/test_qgsserver_wms_getfeatureinfo.py b/tests/src/python/test_qgsserver_wms_getfeatureinfo.py
@@ -287,7 +287,7 @@ def testGetFeatureInfoFilter(self):
                                  'wms_getfeatureinfo_filter_no_width')
 
     def test_value_relation(self):
-        """Test wether value relations are resolved: regression 18518"""
+        """Test whether value relations are resolved: regression 18518"""
         self.wms_request_compare('GetFeatureInfo',
                                  '&BBOX=537912.30469845747575164,4975501.92125043831765652,577227.89428471261635423,4996610.36656293831765652' +
                                  '&CRS=EPSG:32632' +

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