Skip to content

Commit

Permalink
Fix build and add bits to project test to understand fail on mac
Browse files Browse the repository at this point in the history
  • Loading branch information
wonder-sk committed May 13, 2017
1 parent 8dd5886 commit dfcfadc
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 0 deletions.
1 change: 1 addition & 0 deletions src/core/qgsrulebasedlabeling.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 );
Expand Down
4 changes: 4 additions & 0 deletions tests/src/core/testqgsproject.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit dfcfadc

Please sign in to comment.