From e9b3442ef9c15076d010678cd9332d709a8e7228 Mon Sep 17 00:00:00 2001
From: nowrep <nowrep@gmail.com>
Date: Wed, 30 Jan 2013 12:18:07 +0100
Subject: [PATCH] Use different network cache folders for each WebKit version

Fixed crashes when using cache from older QtWebKit in 2.3 version
---
 src/lib/app/mainapplication.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/lib/app/mainapplication.cpp b/src/lib/app/mainapplication.cpp
index 4ac2cd55f..aa10b3318 100644
--- a/src/lib/app/mainapplication.cpp
+++ b/src/lib/app/mainapplication.cpp
@@ -70,6 +70,10 @@
 #define NO_SYSTEM_DATAPATH
 #endif
 
+#if QT_VERSION < 0x050000
+#include "qwebkitversion.h"
+#endif
+
 MainApplication::MainApplication(int &argc, char** argv)
     : QtSingleApplication(argc, argv)
     , m_cookiemanager(0)
@@ -790,8 +794,9 @@ SearchEnginesManager* MainApplication::searchEnginesManager()
 QNetworkDiskCache* MainApplication::networkCache()
 {
     if (!m_networkCache) {
+        const QString &cachePath = "networkcache/" + qWebKitVersion() + "/";
         m_networkCache = new QNetworkDiskCache(this);
-        m_networkCache->setCacheDirectory(m_activeProfil + "/networkcache");
+        m_networkCache->setCacheDirectory(m_activeProfil + cachePath);
     }
 
     return m_networkCache;