From 6e4f21930c2b146ba51b6557b8b99a3bcea2822a Mon Sep 17 00:00:00 2001
From: nowrep <nowrep@gmail.com>
Date: Sun, 19 May 2013 10:52:44 +0200
Subject: [PATCH] [Building] Rename KDE flag to KDE_INTEGRATION

---
 BUILDING                                       | 18 ++++++++++++++----
 src/defines.pri                                |  4 +++-
 .../schemehandlers/qupzillaschemehandler.cpp   |  2 +-
 .../KWalletPasswords/KWalletPasswords.pro      |  2 +-
 4 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/BUILDING b/BUILDING
index 7c6440285..71f1e2982 100644
--- a/BUILDING
+++ b/BUILDING
@@ -31,7 +31,16 @@ Microsoft Windows
 Linux / Unix
 ----------------------------------------------------------------------------------
 
-  There is no extra dependency, you only need Qt tools.
+  There is no required extra dependency, you only need Qt tools.
+
+  To build spellcheck plugin, you need:
+     - QtWebKit 2.3 or higher
+     - pkg-config installed
+     - libhunspell-dev installed
+
+  To build KWallet plugin, you need:
+     - kdelibs-dev installed
+     - set KDE_INTEGRATION build flag
 
 MAC OS X
 ----------------------------------------------------------------------------------
@@ -133,12 +142,12 @@ Available Defines
                           example:
                           $ export NO_X11="true"
 
-     KDE                  Enable KDE integration.
+     KDE_INTEGRATION      Enable KDE integration.
                           Currently it enables building of KWallet Password plugin,
                           which provides support for storing passwords in KWallet.
 
                           example:
-                          $ export KDE="true"
+                          $ export KDE_INTEGRATION="true"
 
      USE_LIBPATH          By default, /usr/lib/ is used for libQupZilla and /usr/lib/qupzilla
                           for plugins.
@@ -165,7 +174,8 @@ Available Defines
                           example:
                           $ export QUPZILLA_PREFIX="/usr/"
 
-     DISABLE_DBUS         Build without QtDBus module. Native desktop notifications will be disabled.
+     DISABLE_DBUS         Build without QtDBus module. Native desktop notifications
+                          will be disabled.
 
                           example:
                           $ export DISABLE_DBUS="true"
diff --git a/src/defines.pri b/src/defines.pri
index 4424de4c7..69145a8d5 100644
--- a/src/defines.pri
+++ b/src/defines.pri
@@ -65,7 +65,8 @@ CONFIG(debug, debug|release): DEFINES *= QUPZILLA_DEBUG_BUILD
 d_no_system_datapath = $$(NO_SYSTEM_DATAPATH)
 d_use_webgl = $$(USE_WEBGL)
 d_w7api = $$(W7API)
-d_kde = $$(KDE)
+d_kde = $$(KDE) # Backwards compatibility
+d_kde_integration = $$(KDE_INTEGRATION)
 d_nox11 = $$(NO_X11)
 d_portable = $$(PORTABLE_BUILD)
 d_nonblock_dialogs = $$(NONBLOCK_JS_DIALOGS)
@@ -79,6 +80,7 @@ win32-msvc* {
     equals(d_w7api, "true") { DEFINES *= W7API }
 }
 equals(d_kde, "true") { DEFINES *= KDE }
+equals(d_kde_integration, "true") { DEFINES *= KDE }
 equals(d_nox11, "true") { DEFINES *= NO_X11 }
 equals(d_portable, "true") { DEFINES *= PORTABLE_BUILD }
 equals(d_nonblock_dialogs, "true") { DEFINES *= NONBLOCK_JS_DIALOGS }
diff --git a/src/lib/network/schemehandlers/qupzillaschemehandler.cpp b/src/lib/network/schemehandlers/qupzillaschemehandler.cpp
index 46bfc85be..5894aa474 100644
--- a/src/lib/network/schemehandlers/qupzillaschemehandler.cpp
+++ b/src/lib/network/schemehandlers/qupzillaschemehandler.cpp
@@ -412,7 +412,7 @@ QString QupZillaSchemeReply::configPage()
         QString w7APIEnabled = tr("Disabled");
 #endif
 
-#if defined(QZ_WS_X11) && defined(KDE)
+#if defined(QZ_WS_X11) && defined(KDE_INTEGRATION)
         QString KDEIntegration = tr("<b>Enabled</b>");
 #else
         QString KDEIntegration = tr("Disabled");
diff --git a/src/plugins/KWalletPasswords/KWalletPasswords.pro b/src/plugins/KWalletPasswords/KWalletPasswords.pro
index eb1dbce30..0b49d5a63 100644
--- a/src/plugins/KWalletPasswords/KWalletPasswords.pro
+++ b/src/plugins/KWalletPasswords/KWalletPasswords.pro
@@ -1,6 +1,6 @@
 include(../../defines.pri)
 
-contains(DEFINES, "KDE") {
+contains(DEFINES, "KDE_INTEGRATION") {
     TARGET = $$qtLibraryTarget(KWalletPasswords)
 
     SOURCES += kwalletplugin.cpp \