1
mirror of https://invent.kde.org/network/falkon.git synced 2024-12-20 02:36:34 +01:00

[Building] Rename KDE flag to KDE_INTEGRATION

This commit is contained in:
nowrep 2013-05-19 10:52:44 +02:00
parent c1e70db731
commit 6e4f21930c
4 changed files with 19 additions and 7 deletions

View File

@ -31,7 +31,16 @@ Microsoft Windows
Linux / Unix 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 MAC OS X
---------------------------------------------------------------------------------- ----------------------------------------------------------------------------------
@ -133,12 +142,12 @@ Available Defines
example: example:
$ export NO_X11="true" $ export NO_X11="true"
KDE Enable KDE integration. KDE_INTEGRATION Enable KDE integration.
Currently it enables building of KWallet Password plugin, Currently it enables building of KWallet Password plugin,
which provides support for storing passwords in KWallet. which provides support for storing passwords in KWallet.
example: example:
$ export KDE="true" $ export KDE_INTEGRATION="true"
USE_LIBPATH By default, /usr/lib/ is used for libQupZilla and /usr/lib/qupzilla USE_LIBPATH By default, /usr/lib/ is used for libQupZilla and /usr/lib/qupzilla
for plugins. for plugins.
@ -165,7 +174,8 @@ Available Defines
example: example:
$ export QUPZILLA_PREFIX="/usr/" $ 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: example:
$ export DISABLE_DBUS="true" $ export DISABLE_DBUS="true"

View File

@ -65,7 +65,8 @@ CONFIG(debug, debug|release): DEFINES *= QUPZILLA_DEBUG_BUILD
d_no_system_datapath = $$(NO_SYSTEM_DATAPATH) d_no_system_datapath = $$(NO_SYSTEM_DATAPATH)
d_use_webgl = $$(USE_WEBGL) d_use_webgl = $$(USE_WEBGL)
d_w7api = $$(W7API) d_w7api = $$(W7API)
d_kde = $$(KDE) d_kde = $$(KDE) # Backwards compatibility
d_kde_integration = $$(KDE_INTEGRATION)
d_nox11 = $$(NO_X11) d_nox11 = $$(NO_X11)
d_portable = $$(PORTABLE_BUILD) d_portable = $$(PORTABLE_BUILD)
d_nonblock_dialogs = $$(NONBLOCK_JS_DIALOGS) d_nonblock_dialogs = $$(NONBLOCK_JS_DIALOGS)
@ -79,6 +80,7 @@ win32-msvc* {
equals(d_w7api, "true") { DEFINES *= W7API } equals(d_w7api, "true") { DEFINES *= W7API }
} }
equals(d_kde, "true") { DEFINES *= KDE } equals(d_kde, "true") { DEFINES *= KDE }
equals(d_kde_integration, "true") { DEFINES *= KDE }
equals(d_nox11, "true") { DEFINES *= NO_X11 } equals(d_nox11, "true") { DEFINES *= NO_X11 }
equals(d_portable, "true") { DEFINES *= PORTABLE_BUILD } equals(d_portable, "true") { DEFINES *= PORTABLE_BUILD }
equals(d_nonblock_dialogs, "true") { DEFINES *= NONBLOCK_JS_DIALOGS } equals(d_nonblock_dialogs, "true") { DEFINES *= NONBLOCK_JS_DIALOGS }

View File

@ -412,7 +412,7 @@ QString QupZillaSchemeReply::configPage()
QString w7APIEnabled = tr("Disabled"); QString w7APIEnabled = tr("Disabled");
#endif #endif
#if defined(QZ_WS_X11) && defined(KDE) #if defined(QZ_WS_X11) && defined(KDE_INTEGRATION)
QString KDEIntegration = tr("<b>Enabled</b>"); QString KDEIntegration = tr("<b>Enabled</b>");
#else #else
QString KDEIntegration = tr("Disabled"); QString KDEIntegration = tr("Disabled");

View File

@ -1,6 +1,6 @@
include(../../defines.pri) include(../../defines.pri)
contains(DEFINES, "KDE") { contains(DEFINES, "KDE_INTEGRATION") {
TARGET = $$qtLibraryTarget(KWalletPasswords) TARGET = $$qtLibraryTarget(KWalletPasswords)
SOURCES += kwalletplugin.cpp \ SOURCES += kwalletplugin.cpp \