Fix north arrow with embedded svgs

nyalldawson · nyalldawson · commit 2fc366cbd848 · 2018-07-24T03:54:44.000+10:00
diff --git a/src/app/qgsdecorationnortharrow.cpp b/src/app/qgsdecorationnortharrow.cpp
@@ -93,6 +93,9 @@ void QgsDecorationNorthArrow::run()
 
 QString QgsDecorationNorthArrow::svgPath()
 {
+  if ( mSvgPath.startsWith( QStringLiteral( "base64:" ), Qt::CaseInsensitive ) )
+    return mSvgPath;
+
   if ( !mSvgPath.isEmpty() )
   {
     QString resolvedPath = QgsSymbolLayerUtils::svgSymbolNameToPath( mSvgPath, QgsProject::instance()->pathResolver() );

Original file line number	Diff line number	Diff line change
`@@ -93,6 +93,9 @@ void QgsDecorationNorthArrow::run()`
`93`	`93`
`94`	`94`	`QString QgsDecorationNorthArrow::svgPath()`
`95`	`95`	`{`
	`96`	`+ if ( mSvgPath.startsWith( QStringLiteral( "base64:" ), Qt::CaseInsensitive ) )`
	`97`	`+ return mSvgPath;`
	`98`	`+`
`96`	`99`	`if ( !mSvgPath.isEmpty() )`
`97`	`100`	`{`
`98`	`101`	`QString resolvedPath = QgsSymbolLayerUtils::svgSymbolNameToPath( mSvgPath, QgsProject::instance()->pathResolver() );`