From 2b51e2d5ca312111f59c4f5c1187ba1ef1c1ae38 Mon Sep 17 00:00:00 2001 From: David Rosca Date: Wed, 17 Sep 2014 10:00:27 +0200 Subject: [PATCH] KWalletPasswords: Add support for KF5 KWallet --- CHANGELOG | 1 + src/plugins/KWalletPasswords/KWalletPasswords.pro | 6 +++++- src/plugins/plugins.pro | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index cb9a60c70..424586500 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -9,6 +9,7 @@ Version 1.7.0 * support for shadow builds with Qt Creator * GreaseMonkey: correctly load scripts in frames * GreaseMonkey: fix rare issue that userscripts won't load on some sites + * KWalletPasswords: support for KF5 KWallet Version 1.6.6 * released 12 May 2014 diff --git a/src/plugins/KWalletPasswords/KWalletPasswords.pro b/src/plugins/KWalletPasswords/KWalletPasswords.pro index ef68fd856..4e0fca133 100644 --- a/src/plugins/KWalletPasswords/KWalletPasswords.pro +++ b/src/plugins/KWalletPasswords/KWalletPasswords.pro @@ -49,7 +49,11 @@ TRANSLATIONS += \ translations/zh_CN.ts \ translations/zh_TW.ts \ -LIBS += -lkdeui +qtHaveModule(KWallet) { + QT += KWallet +} else { + LIBS += -lkdeui +} PLUGIN_DIR = $$PWD include(../../plugins.pri) diff --git a/src/plugins/plugins.pro b/src/plugins/plugins.pro index dfddd66a1..84c32f708 100644 --- a/src/plugins/plugins.pro +++ b/src/plugins/plugins.pro @@ -33,7 +33,7 @@ outOfDirPlugins = $$(QUPZILLA_PLUGINS_SRCDIR) !CONFIG(debug, debug|release): disablePlugin(TestPlugin) # 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 !contains(DEFINES, GNOME_INTEGRATION) | !system(pkg-config --exists gnome-keyring-1): disablePlugin(GnomeKeyringPasswords)