From 9359977d8b27ae1ad1ca902426940ef1d882c902 Mon Sep 17 00:00:00 2001
From: David Rosca <nowrep@gmail.com>
Date: Sat, 1 Nov 2014 10:14:04 +0100
Subject: [PATCH] Cleanup displayed build configuration flags in
 qupzilla:config

Removed KDE Integration and WebGL. Both flags don't have much use now.
KDE Integration only enables KWallet plugin building (and only when
KWallet-dev is available).
WebGL is now enabled by default by any recent QtWebKit versions.

Also show Win7API flag only on Windows.
---
 .../schemehandlers/qupzillaschemehandler.cpp     | 16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)

diff --git a/src/lib/network/schemehandlers/qupzillaschemehandler.cpp b/src/lib/network/schemehandlers/qupzillaschemehandler.cpp
index 4cd340887..c66fede23 100644
--- a/src/lib/network/schemehandlers/qupzillaschemehandler.cpp
+++ b/src/lib/network/schemehandlers/qupzillaschemehandler.cpp
@@ -417,31 +417,21 @@ QString QupZillaSchemeReply::configPage()
         QString debugBuild = tr("Disabled");
 #endif
 
-#if defined (USE_WEBGL) || (QTWEBKIT_FROM_2_3 && defined(Q_OS_UNIX))
-        QString webGLEnabled = tr("<b>Enabled</b>");
-#else
-        QString webGLEnabled = tr("Disabled");
-#endif
-
+#ifdef Q_OS_WIN
 #if defined(Q_OS_WIN) && defined(W7API)
         QString w7APIEnabled = tr("<b>Enabled</b>");
 #else
         QString w7APIEnabled = tr("Disabled");
 #endif
-
-#if defined(Q_OS_UNIX) && defined(KDE_INTEGRATION)
-        QString KDEIntegration = tr("<b>Enabled</b>");
-#else
-        QString KDEIntegration = tr("Disabled");
 #endif
 
         QString portableBuild = mApp->isPortable() ? tr("<b>Enabled</b>") : tr("Disabled");
 
         cPage.replace(QLatin1String("%BUILD-CONFIG-TEXT%"),
                       QString("<dt>%1</dt><dd>%2<dd>").arg(tr("Debug build"), debugBuild) +
-                      QString("<dt>%1</dt><dd>%2<dd>").arg(tr("WebGL support"), webGLEnabled) +
+#ifdef Q_OS_WIN
                       QString("<dt>%1</dt><dd>%2<dd>").arg(tr("Windows 7 API"), w7APIEnabled) +
-                      QString("<dt>%1</dt><dd>%2<dd>").arg(tr("KDE integration"), KDEIntegration) +
+#endif
                       QString("<dt>%1</dt><dd>%2<dd>").arg(tr("Portable build"), portableBuild));
 
         cPage = QzTools::applyDirectionToPage(cPage);