From 518a4cb5abdca788c4bb59e570e97c01e44587c8 Mon Sep 17 00:00:00 2001
From: David Faure <faure@kde.org>
Date: Sat, 24 Mar 2012 09:23:25 +0100
Subject: Restore Qt4 compat in QDesktopServices::DataLocation

"/data/" was appended to the base directory.

Change-Id: I220f2ce74c36b795bc49c7c84106feb0709d1547
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
---
 src/gui/util/qdesktopservices.h | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'src/gui/util/qdesktopservices.h')

diff --git a/src/gui/util/qdesktopservices.h b/src/gui/util/qdesktopservices.h
index 04a639437e..280acaf277 100644
--- a/src/gui/util/qdesktopservices.h
+++ b/src/gui/util/qdesktopservices.h
@@ -79,12 +79,14 @@ public:
     };
 
     QT_DEPRECATED static QString storageLocation(StandardLocation type) {
-        return QStandardPaths::writableLocation(static_cast<QStandardPaths::StandardLocation>(type));
+        return storageLocationImpl(type);
     }
     QT_DEPRECATED static QString displayName(StandardLocation type) {
         return QStandardPaths::displayName(static_cast<QStandardPaths::StandardLocation>(type));
     }
 #endif
+private:
+    static QString storageLocationImpl(StandardLocation type);
 };
 
 #endif // QT_NO_DESKTOPSERVICES
-- 
cgit v1.2.3