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

Little cleanups in code.

Browse Source 
Show WebGL enabled with QtWebKit 2.3 only on Linux.
This commit is contained in:
nowrep 2013-02-02 13:54:26 +01:00
parent 886b4202c8
commit c0c0d51b25
4 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/defines.pri
View File

@ -16,7 +16,7 @@ win32-msvc* {
}
# Check for pkg-config availability
system(pkg-config --version) {
system(pkg-config --version > /dev/null) {
QTWEBKIT_VERSION = $$system(pkg-config --modversion QtWebKit)
QTWEBKIT_VERSION_MAJOR = $$section(QTWEBKIT_VERSION, ".", 0, 0)
QTWEBKIT_VERSION_MINOR = $$section(QTWEBKIT_VERSION, ".", 1, 1)
@ -24,6 +24,10 @@ system(pkg-config --version) {
greaterThan(QTWEBKIT_VERSION_MAJOR, 3):greaterThan(QTWEBKIT_VERSION_MINOR, 8) {
DEFINES *= USE_QTWEBKIT_2_2
}
greaterThan(QTWEBKIT_VERSION_MAJOR, 3):greaterThan(QTWEBKIT_VERSION_MINOR, 9) {
DEFINES *= USE_QTWEBKIT_2_3
}
}
else {
isEqual(QT_VERSION, 4.8.0)|greaterThan(QT_VERSION, 4.8.0) {

3
src/lib/cookies/cookiejar.cpp
View File

@ -146,9 +146,8 @@ void CookieJar::saveCookies()
for (int i = 0; i < count; i++) {
const QNetworkCookie &cookie = cookies.at(i);
int result = listMatchesDomain(m_whitelist, cookie.domain());
if (result == 1) {
if (listMatchesDomain(m_whitelist, cookie.domain())) {
allCookies.append(cookie);
}
}

11
src/lib/lib.pro
View File

@ -9,14 +9,19 @@ TEMPLATE = lib
DEFINES *= QUPZILLA_SHAREDLIBRARY
isEqual(QT_MAJOR_VERSION, 5) {
include(3rdparty/qftp.pri)
}
include(3rdparty/qtsingleapplication.pri)
include(../defines.pri)
include(../../translations/translations.pri)
#include(../../tests/modeltest/modeltest.pri)
isEqual(QT_MAJOR_VERSION, 5) {
include(3rdparty/qftp.pri)
}
contains(DEFINES, USE_QTWEBKIT_2_2) {
include(plugins/qtwebkit/qtwebkit-plugins.pri)
}
unix:!contains(DEFINES, "DISABLE_DBUS") QT += dbus
INCLUDEPATH += 3rdparty\

2
src/lib/network/schemehandlers/qupzillaschemehandler.cpp
View File

@ -390,7 +390,7 @@ QString QupZillaSchemeReply::configPage()
#ifdef QUPZILLA_DEBUG_BUILD
debugBuild = tr("<b>Enabled</b>");
#endif
#if defined (USE_WEBGL) || QTWEBKIT_FROM_2_3
#if defined (USE_WEBGL) || (QTWEBKIT_FROM_2_3 && defined(QZ_WS_X11))
webGLEnabled = tr("<b>Enabled</b>");
#endif
#if defined(Q_OS_WIN) && defined(W7API)