Fix the 'Reset' command in debug builds (on Windows)

This commit is contained in:
Joan Karadimov 2017-03-06 19:18:34 +02:00 committed by Matthew Horan
parent 01c1a064f5
commit b98d288be8
3 changed files with 13 additions and 4 deletions

View File

@ -41,10 +41,7 @@ WebPage::WebPage(WebPageManager *manager, QObject *parent) : QWebPage(parent) {
settings()->setAttribute(QWebSettings::JavascriptCanCloseWindows, true);
settings()->setAttribute(QWebSettings::LocalStorageDatabaseEnabled, true);
if(QFileInfo("tmp").isDir()) {
settings()->setAttribute(QWebSettings::OfflineWebApplicationCacheEnabled, true);
settings()->setOfflineWebApplicationCachePath("tmp");
}
manager->initOfflineWebApplicationCache();
createWindow();
}

View File

@ -7,12 +7,14 @@
#include "MissingContentHeaderRequestHandler.h"
#include "UnknownUrlHandler.h"
#include "NetworkRequestFactory.h"
#include <QWebSettings>
WebPageManager::WebPageManager(QObject *parent) : QObject(parent) {
m_ignoreSslErrors = false;
m_cookieJar = new NetworkCookieJar(this);
m_success = true;
m_loggingEnabled = false;
m_isCacheInitialized = false;
m_ignoredOutput = new QFile(this);
m_timeout = -1;
m_customHeadersRequestHandler = new CustomHeadersRequestHandler(
@ -217,3 +219,11 @@ void WebPageManager::allowUrl(const QString &url) {
void WebPageManager::blockUrl(const QString &url) {
m_blacklistedRequestHandler->blockUrl(url);
}
void WebPageManager::initOfflineWebApplicationCache() {
if (!m_isCacheInitialized && QFileInfo("tmp").isDir()) {
QWebSettings::globalSettings()->setAttribute(QWebSettings::OfflineWebApplicationCacheEnabled, true);
QWebSettings::globalSettings()->setOfflineWebApplicationCachePath("tmp");
m_isCacheInitialized = true;
}
}

View File

@ -42,6 +42,7 @@ class WebPageManager : public QObject {
void setUnknownUrlMode(UnknownUrlHandler::Mode);
void allowUrl(const QString &);
void blockUrl(const QString &);
void initOfflineWebApplicationCache();
public slots:
void emitLoadStarted();
@ -66,6 +67,7 @@ class WebPageManager : public QObject {
QSet<WebPage *> m_started;
bool m_success;
bool m_loggingEnabled;
bool m_isCacheInitialized;
QFile *m_ignoredOutput;
int m_timeout;
NetworkAccessManager *m_networkAccessManager;