Falkon/falkonOfficial
Falkon/falkonOfficial
1
Fork 0
mirror of https://invent.kde.org/network/falkon.git synced 2024-12-20 02:36:34 +01:00
Code Releases Activity

KWalletPasswords: Add support for KF5 KWallet

Browse Source
This commit is contained in:
David Rosca 2014-09-17 10:00:27 +02:00
parent 795bb04acc
commit 2b51e2d5ca
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG
View File

@ -9,6 +9,7 @@ Version 1.7.0
* support for shadow builds with Qt Creator * support for shadow builds with Qt Creator
* GreaseMonkey: correctly load scripts in frames * GreaseMonkey: correctly load scripts in frames
* GreaseMonkey: fix rare issue that userscripts won't load on some sites * GreaseMonkey: fix rare issue that userscripts won't load on some sites
* KWalletPasswords: support for KF5 KWallet
Version 1.6.6 Version 1.6.6
* released 12 May 2014 * released 12 May 2014

4
src/plugins/KWalletPasswords/KWalletPasswords.pro
View File

@ -49,7 +49,11 @@ TRANSLATIONS += \
translations/zh_CN.ts \ translations/zh_CN.ts \
translations/zh_TW.ts \ translations/zh_TW.ts \
qtHaveModule(KWallet) {
QT += KWallet
} else {
LIBS += -lkdeui LIBS += -lkdeui
}
PLUGIN_DIR = $$PWD PLUGIN_DIR = $$PWD
include(../../plugins.pri) include(../../plugins.pri)

2
src/plugins/plugins.pro
View File

@ -33,7 +33,7 @@ outOfDirPlugins = $$(QUPZILLA_PLUGINS_SRCDIR)
!CONFIG(debug, debug|release): disablePlugin(TestPlugin) !CONFIG(debug, debug|release): disablePlugin(TestPlugin)
# KWalletPasswords only with KDE_INTEGRATION # KWalletPasswords only with KDE_INTEGRATION
!contains(DEFINES, KDE_INTEGRATION) | equals(QT_MAJOR_VERSION, 5): disablePlugin(KWalletPasswords) !contains(DEFINES, KDE_INTEGRATION) | !qtHaveModule(KWallet): disablePlugin(KWalletPasswords)
# GnomeKeyringPasswords only with GNOME_INTEGRATION # GnomeKeyringPasswords only with GNOME_INTEGRATION
!contains(DEFINES, GNOME_INTEGRATION) | !system(pkg-config --exists gnome-keyring-1): disablePlugin(GnomeKeyringPasswords) !contains(DEFINES, GNOME_INTEGRATION) | !system(pkg-config --exists gnome-keyring-1): disablePlugin(GnomeKeyringPasswords)