Falkon/falkonOfficial
Falkon/falkonOfficial
1
Fork 0
mirror of https://invent.kde.org/network/falkon.git synced 2024-11-14 19:12:11 +01:00
Code Releases Activity

Properly test for USE_QTWEBKIT_2_2 define

Browse Source
This commit is contained in:
nowrep 2013-06-17 21:03:45 +02:00
parent eac8af1b51
commit 136452ad2a
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/lib/tools/html5permissions/html5permissionsnotification.cpp
View File

@ -23,7 +23,7 @@
#include <QWebFrame> #include <QWebFrame>
#if USE_QTWEBKIT_2_2 #ifdef USE_QTWEBKIT_2_2
HTML5PermissionsNotification::HTML5PermissionsNotification(const QString &host, QWebFrame* frame, const QWebPage::Feature &feature) HTML5PermissionsNotification::HTML5PermissionsNotification(const QString &host, QWebFrame* frame, const QWebPage::Feature &feature)
: AnimatedWidget(AnimatedWidget::Down, 300, 0) : AnimatedWidget(AnimatedWidget::Down, 300, 0)
, ui(new Ui::HTML5PermissionsNotification) , ui(new Ui::HTML5PermissionsNotification)
@ -93,4 +93,4 @@ HTML5PermissionsNotification::~HTML5PermissionsNotification()
{ {
delete ui; delete ui;
} }
#endif // QTWEBKIT_FROM_2_2 #endif // USE_QTWEBKIT_2_2

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

@ -433,7 +433,7 @@ void WebPage::dbQuotaExceeded(QWebFrame* frame)
frame->securityOrigin().setDatabaseQuota(oldQuota * 2); frame->securityOrigin().setDatabaseQuota(oldQuota * 2);
} }
#if USE_QTWEBKIT_2_2 #ifdef USE_QTWEBKIT_2_2
void WebPage::appCacheQuotaExceeded(QWebSecurityOrigin* origin, quint64 originalQuota) void WebPage::appCacheQuotaExceeded(QWebSecurityOrigin* origin, quint64 originalQuota)
{ {
if (!origin) { if (!origin) {
@ -447,7 +447,7 @@ void WebPage::featurePermissionRequested(QWebFrame* frame, const QWebPage::Featu
{ {
mApp->html5permissions()->requestPermissions(this, frame, feature); mApp->html5permissions()->requestPermissions(this, frame, feature);
} }
#endif #endif // USE_QTWEBKIT_2_2
bool WebPage::event(QEvent* event) bool WebPage::event(QEvent* event)
{ {