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

Check for QtWebKit 2.2 availability with pkg-config.

Browse Source 
Fixes issues with building with QtWebKit 2.2 and Qt 4.7
This commit is contained in:
nowrep 2013-01-31 20:27:37 +01:00
parent f17f9f89b4
commit 4f3c8b0d00
3 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/defines.pri
View File

@ -15,8 +15,20 @@ win32-msvc* {
LIBS += User32.lib Ole32.lib Shell32.lib ShlWapi.lib Gdi32.lib ComCtl32.lib LIBS += User32.lib Ole32.lib Shell32.lib ShlWapi.lib Gdi32.lib ComCtl32.lib
} }
isEqual(QT_VERSION, 4.8.0)|greaterThan(QT_VERSION, 4.8.0) { # Check for pkg-config availability
DEFINES *= USE_QTWEBKIT_2_2 system(pkg-config --version) {
QTWEBKIT_VERSION = $$system(pkg-config --modversion QtWebKit)
QTWEBKIT_VERSION_MAJOR = $$section(QTWEBKIT_VERSION, ".", 0, 0)
QTWEBKIT_VERSION_MINOR = $$section(QTWEBKIT_VERSION, ".", 1, 1)
greaterThan(QTWEBKIT_VERSION_MAJOR, 3):greaterThan(QTWEBKIT_VERSION_MINOR, 8) {
DEFINES *= USE_QTWEBKIT_2_2
}
}
else {
isEqual(QT_VERSION, 4.8.0)|greaterThan(QT_VERSION, 4.8.0) {
DEFINES *= USE_QTWEBKIT_2_2
}
} }
DEFINES *= QT_NO_URL_CAST_FROM_STRING DEFINES *= QT_NO_URL_CAST_FROM_STRING

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

@ -23,7 +23,7 @@
#include <QWebFrame> #include <QWebFrame>
#if QTWEBKIT_FROM_2_2 #if 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)

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

@ -418,7 +418,7 @@ void WebPage::dbQuotaExceeded(QWebFrame* frame)
frame->securityOrigin().setDatabaseQuota(oldQuota * 2); frame->securityOrigin().setDatabaseQuota(oldQuota * 2);
} }
#if QTWEBKIT_FROM_2_2 #if USE_QTWEBKIT_2_2
void WebPage::appCacheQuotaExceeded(QWebSecurityOrigin* origin, quint64 originalQuota) void WebPage::appCacheQuotaExceeded(QWebSecurityOrigin* origin, quint64 originalQuota)
{ {
if (!origin) { if (!origin) {