Keep the user set order for svg paths

qgis · Oct 4, 2016 · 3abded3 · 3abded3
1 parent a2166bd
commit 3abded3
Showing 1 changed file with 14 additions and 2 deletions.
diff --git a/src/core/qgsapplication.cpp b/src/core/qgsapplication.cpp
@@ -714,8 +714,20 @@ QStringList QgsApplication::svgPaths()
     myPathList = myPaths.split( '|' );
   }
 
-  myPathList << ABISYM( mDefaultSvgPaths );
-  return myPathList.toSet().toList();
+  // maintain user set order while stripping duplicates
+  QStringList paths;
+  Q_FOREACH ( const QString& path, myPathList )
+  {
+    if ( !paths.contains( path ) )
+      paths.append( path );
+  }
+  Q_FOREACH ( const QString& path, ABISYM( mDefaultSvgPaths ) )
+  {
+    if ( !paths.contains( path ) )
+      paths.append( path );
+  }
+
+  return paths;
 }
 
 /*!