Fix SVG preview blocks QGIS (fix #14255)

Now SVG preview loading occurs in a background thread so that dialogs can open instantly Also guard against circular symbolic links in SVG selector widget (cherry-picked from c60c4f7)
qgis · Oct 6, 2016 · ffafafd · ffafafd
1 parent 20992f0
commit ffafafd
Show file tree

Hide file tree

Showing 6 changed files with 466 additions and 217 deletions.
diff --git a/src/core/qgsapplication.cpp b/src/core/qgsapplication.cpp
@@ -712,8 +712,20 @@ QStringList QgsApplication::svgPaths()
     myPathList = myPaths.split( '|' );
   }
 
-  myPathList << ABISYM( mDefaultSvgPaths );
-  return myPathList;
+  // 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;
 }
 
 /*!