From c0c0d51b2515e65bb6fce3ffecd35bfe7efda17c Mon Sep 17 00:00:00 2001
From: nowrep <nowrep@gmail.com>
Date: Sat, 2 Feb 2013 13:54:26 +0100
Subject: [PATCH] Little cleanups in code.

Show WebGL enabled with QtWebKit 2.3 only on Linux.
---
 src/defines.pri                                       |  6 +++++-
 src/lib/cookies/cookiejar.cpp                         |  3 +--
 src/lib/lib.pro                                       | 11 ++++++++---
 .../network/schemehandlers/qupzillaschemehandler.cpp  |  2 +-
 4 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/src/defines.pri b/src/defines.pri
index ea32e7465..743894ff3 100644
--- a/src/defines.pri
+++ b/src/defines.pri
@@ -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) {
diff --git a/src/lib/cookies/cookiejar.cpp b/src/lib/cookies/cookiejar.cpp
index 40d4f9619..4c20c9134 100644
--- a/src/lib/cookies/cookiejar.cpp
+++ b/src/lib/cookies/cookiejar.cpp
@@ -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);
             }
         }
diff --git a/src/lib/lib.pro b/src/lib/lib.pro
index 32d38e64f..68f795dab 100644
--- a/src/lib/lib.pro
+++ b/src/lib/lib.pro
@@ -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\
diff --git a/src/lib/network/schemehandlers/qupzillaschemehandler.cpp b/src/lib/network/schemehandlers/qupzillaschemehandler.cpp
index 2dc5eb017..e67ff84aa 100644
--- a/src/lib/network/schemehandlers/qupzillaschemehandler.cpp
+++ b/src/lib/network/schemehandlers/qupzillaschemehandler.cpp
@@ -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)