Fix build and add bits to project test to understand fail on mac

qgis · May 13, 2017 · dfcfadc · dfcfadc
1 parent 8dd5886
commit dfcfadc
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/src/core/qgsrulebasedlabeling.h b/src/core/qgsrulebasedlabeling.h
@@ -239,6 +239,7 @@ class CORE_EXPORT QgsRuleBasedLabeling : public QgsAbstractVectorLayerLabeling
         /**
          * Create a rule from an XML definition
          * \param ruleElem  The XML rule element
+         * \param context reading context
          * \returns A new rule
          */
         static Rule *create( const QDomElement &ruleElem, const QgsReadWriteContext &context );

diff --git a/tests/src/core/testqgsproject.cpp b/tests/src/core/testqgsproject.cpp
@@ -213,6 +213,10 @@ void TestQgsProject::testPathResolverSvg()
   project.addMapLayers( QList<QgsMapLayer *>() << layer1 << layer2 << layer3 );
   project.write( projectFilename );
 
+  // make sure the path resolver works with relative paths (enabled by default)
+  QCOMPARE( project.pathResolver().readPath( "./a.txt" ), dir.path() + "/a.txt" );
+  QCOMPARE( project.pathResolver().writePath( dir.path() + "/a.txt" ), QString( "./a.txt" ) );
+
   // check that the saved paths are relative
 
   // key = layer name, value = svg path