From cf4daaa37a142c13eb5956dac96fc12f4643bcb8 Mon Sep 17 00:00:00 2001 From: nowrep Date: Tue, 26 Feb 2013 11:58:38 +0100 Subject: [PATCH] [Qt5] Fixed crash when using network cache from Qt 4 Network cache is now saved in %WEBKITVERSION%-Qt%QTVERSION% subdirectory. --- CHANGELOG | 1 + src/lib/app/mainapplication.cpp | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG b/CHANGELOG index 1298c277a..11e53d877 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -23,6 +23,7 @@ Version 1.4.0 * improved showing navigation toolbar in fullscreen * moved config directory into ~/.config/qupzilla * certificates bundle is now only used on windows + * reduced memory usage of AdBlock (saves up to 30MB with just EasyList) * GreaseMonkey: reload script if source file changed on disk * GreaseMonkey: fixed don't loading invalid scripts * fixed opening browser with url with ampersand (%26) as command line argument diff --git a/src/lib/app/mainapplication.cpp b/src/lib/app/mainapplication.cpp index e933b22f0..803e40053 100644 --- a/src/lib/app/mainapplication.cpp +++ b/src/lib/app/mainapplication.cpp @@ -876,7 +876,7 @@ QNetworkDiskCache* MainApplication::networkCache() const QString &basePath = settings.value("Web-Browser-Settings/CachePath", QString("%1networkcache/").arg(m_activeProfil)).toString(); - const QString &cachePath = basePath + "/" + qWebKitVersion() + "/"; + const QString &cachePath = QString("%1/%2-Qt%3/").arg(basePath, qWebKitVersion(), qVersion()); m_networkCache = new QNetworkDiskCache(this); m_networkCache->setCacheDirectory(cachePath); }