Package: qgis / 2.4.0-1

0001-server-fix-absolute-path-conversion-on-windows.patch Patch series | download
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
From e642231e70e05680e43539ae6a528cdd9f973120 Mon Sep 17 00:00:00 2001
From: "Juergen E. Fischer" <jef@norbit.de>
Date: Fri, 8 Aug 2014 17:07:54 +0200
Subject: server: fix absolute path conversion on windows
Origin: https://github.com/qgis/QGIS/commit/e642231e70e05680e43539ae6a528cdd9f973120


--- a/src/mapserver/qgsserverprojectparser.cpp
+++ b/src/mapserver/qgsserverprojectparser.cpp
@@ -103,14 +103,14 @@ QString QgsServerProjectParser::convertT
   bool uncPath = projPath.startsWith( "//" );
 #endif
 
-  QStringList srcElems = file.split( "/", QString::SkipEmptyParts );
-  QStringList projElems = mProjectPath.split( "/", QString::SkipEmptyParts );
+  QStringList srcElems = srcPath.split( "/", QString::SkipEmptyParts );
+  QStringList projElems = projPath.split( "/", QString::SkipEmptyParts );
 
 #if defined(Q_OS_WIN)
   if ( uncPath )
   {
-    projElems.insert( 0, "" );
-    projElems.insert( 0, "" );
+    projElems.prepend( "" );
+    projElems.prepend( "" );
   }
 #endif