Skip to content

Commit dfcfadc

Browse files
committed
Fix build and add bits to project test to understand fail on mac
1 parent 8dd5886 commit dfcfadc

File tree

2 files changed

+5
-0
lines changed

2 files changed

+5
-0
lines changed

src/core/qgsrulebasedlabeling.h

+1
Original file line numberDiff line numberDiff line change
@@ -239,6 +239,7 @@ class CORE_EXPORT QgsRuleBasedLabeling : public QgsAbstractVectorLayerLabeling
239239
/**
240240
* Create a rule from an XML definition
241241
* \param ruleElem The XML rule element
242+
* \param context reading context
242243
* \returns A new rule
243244
*/
244245
static Rule *create( const QDomElement &ruleElem, const QgsReadWriteContext &context );

tests/src/core/testqgsproject.cpp

+4
Original file line numberDiff line numberDiff line change
@@ -213,6 +213,10 @@ void TestQgsProject::testPathResolverSvg()
213213
project.addMapLayers( QList<QgsMapLayer *>() << layer1 << layer2 << layer3 );
214214
project.write( projectFilename );
215215

216+
// make sure the path resolver works with relative paths (enabled by default)
217+
QCOMPARE( project.pathResolver().readPath( "./a.txt" ), dir.path() + "/a.txt" );
218+
QCOMPARE( project.pathResolver().writePath( dir.path() + "/a.txt" ), QString( "./a.txt" ) );
219+
216220
// check that the saved paths are relative
217221

218222
// key = layer name, value = svg path

0 commit comments

Comments
 (0)