[QGIS Commit] r15073 - trunk/qgis/src/python

[svn_qgis at osgeo.org]

Author: jef
Date: 2011-01-24 16:43:57 -0800 (Mon, 24 Jan 2011)
New Revision: 15073

Modified:
   trunk/qgis/src/python/qgspythonutilsimpl.cpp
Log:
don't split QGIS_PLUGINPATH at colon on windows

Modified: trunk/qgis/src/python/qgspythonutilsimpl.cpp
===================================================================
--- trunk/qgis/src/python/qgspythonutilsimpl.cpp	2011-01-24 21:48:40 UTC (rev 15072)
+++ trunk/qgis/src/python/qgspythonutilsimpl.cpp	2011-01-25 00:43:57 UTC (rev 15073)
@@ -441,12 +441,14 @@
     return QStringList();
 
   QString paths = QString::fromLocal8Bit( cpaths );
-  if ( paths.contains( ';' ) ) // keep windows users happy
+#ifndef Q_OS_WIN
+  if ( paths.contains( ':' ) )
+    return paths.split( ':' );
+#endif
+  if ( paths.contains( ';' ) )
     return paths.split( ';' );
-  else if ( paths.contains( ':' ) ) // keep unix users happy
-    return paths.split( ':' );
   else
-    return QStringList( paths ); // just one path
+    return QStringList( paths );
 }