[patch] Patch correcting storage location for Unix systems

datalocation.patch (text/plain), 1.64 KB, created by Christian Apeltauer on 2015-04-19 09:31:15 UTC

diff -Naur QtWeb-b108.orig/src/browserapplication.cpp QtWeb-b108/src/browserapplication.cpp
--- QtWeb-b108.orig/src/browserapplication.cpp	2013-09-09 14:38:29.000000000 +0200
+++ QtWeb-b108/src/browserapplication.cpp	2015-04-18 20:33:45.000000000 +0200
@@ -240,12 +240,12 @@
             if (!tested_ok || !is_writable)
             {
                 // Copy settings from base template to temporary storage
-                QDir temp_dir(QDir::temp());
+                QDir temp_dir(dataLocation());
                 bool res = temp_dir.mkdir(settings.organizationName());
                 res = temp_dir.cd(settings.organizationName());
                 res = QFile::copy(  settings.fileName(), temp_dir.absolutePath() + QDir::separator() + settings.applicationName() + ".ini" );
                 // Change path to settings to the temp storage
-                QSettings::setPath(QSettings::IniFormat, QSettings::UserScope, QDir::temp().tempPath());
+                QSettings::setPath(QSettings::IniFormat, QSettings::UserScope, dataLocation());
             }
 
         }
@@ -932,17 +932,7 @@
 
 QString BrowserApplication::dataLocation()
 {
-    if (s_portableRunMode)
-    {
-        QDir dir(QCoreApplication::applicationDirPath());
-        if (!dir.exists("QtWebCache"))
-            if (!dir.mkdir("QtWebCache"))
-                return "";
-
-        return QCoreApplication::applicationDirPath()+ "/QtWebCache";
-    }
-    else
-        return QDesktopServices::storageLocation(QDesktopServices::DataLocation);
+     return QDesktopServices::storageLocation(QDesktopServices::DataLocation);
 }
 
 QString BrowserApplication::downloadsLocation(bool create_dir)