Falkon/falkonOfficial
Falkon/falkonOfficial
1
Fork 0
mirror of https://invent.kde.org/network/falkon.git synced 2024-12-20 02:36:34 +01:00
Code Releases Activity

Properly fixed page background color with dark themes.

Browse Source 
Also fixed building with Qt 4.7
This commit is contained in:
nowrep 2013-01-31 11:54:42 +01:00
parent b97d1eeef5
commit a97ef7d627
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/lib/webview/webpage.cpp
View File

@ -106,10 +106,9 @@ WebPage::WebPage(QupZilla* mainClass)
#if QTWEBKIT_FROM_2_3
connect(this, SIGNAL(applicationCacheQuotaExceeded(QWebSecurityOrigin*, quint64, quint64)),
this, SLOT(appCacheQuotaExceeded(QWebSecurityOrigin*, quint64)));
#else
#elif QTWEBKIT_FROM_2_2
connect(this, SIGNAL(applicationCacheQuotaExceeded(QWebSecurityOrigin*, quint64)),
this, SLOT(appCacheQuotaExceeded(QWebSecurityOrigin*, quint64)));
#endif
@ -419,6 +418,7 @@ void WebPage::dbQuotaExceeded(QWebFrame* frame)
frame->securityOrigin().setDatabaseQuota(oldQuota * 2);
}
#if QTWEBKIT_FROM_2_2
void WebPage::appCacheQuotaExceeded(QWebSecurityOrigin* origin, quint64 originalQuota)
{
if (!origin) {
@ -428,7 +428,6 @@ void WebPage::appCacheQuotaExceeded(QWebSecurityOrigin* origin, quint64 original
origin->setApplicationCacheQuota(originalQuota * 2);
}
#if QTWEBKIT_FROM_2_2
void WebPage::featurePermissionRequested(QWebFrame* frame, const QWebPage::Feature &feature)
{
mApp->html5permissions()->requestPermissions(this, frame, feature);

3
src/lib/webview/webpage.h
View File

@ -23,6 +23,7 @@
#include "qz_namespace.h"
class QWebSecurityOrigin;
class QFileSystemWatcher;
class QEventLoop;
@ -97,9 +98,9 @@ private slots:
void windowCloseRequested();
void dbQuotaExceeded(QWebFrame* frame);
void appCacheQuotaExceeded(QWebSecurityOrigin* origin, quint64 originalQuota);
#ifdef USE_QTWEBKIT_2_2
void appCacheQuotaExceeded(QWebSecurityOrigin* origin, quint64 originalQuota);
void featurePermissionRequested(QWebFrame* frame, const QWebPage::Feature &feature);
#endif

3
src/lib/webview/webtab.cpp
View File

@ -1,6 +1,6 @@
/* ============================================================
* QupZilla - WebKit based browser
* Copyright (C) 2010-2012 David Rosca <nowrep@gmail.com>
* Copyright (C) 2010-2013 David Rosca <nowrep@gmail.com>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@ -84,7 +84,6 @@ WebTab::WebTab(QupZilla* mainClass, LocationBar* locationBar)
m_layout->addWidget(m_view);
setLayout(m_layout);
setAutoFillBackground(true); // We don't want this transparent
connect(m_view, SIGNAL(showNotification(QWidget*)), this, SLOT(showNotification(QWidget*)));
connect(m_view, SIGNAL(iconChanged()), m_locationBar.data(), SLOT(siteIconChanged()));