From ed252c553436562004297b8bdb23301ffa518724 Mon Sep 17 00:00:00 2001 From: David Rosca Date: Fri, 19 Sep 2014 13:22:27 +0200 Subject: [PATCH] Autotests: Fix building with KF5 KWallet --- tests/autotests/autotests.pro | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/tests/autotests/autotests.pro b/tests/autotests/autotests.pro index c57850044..191669371 100644 --- a/tests/autotests/autotests.pro +++ b/tests/autotests/autotests.pro @@ -15,9 +15,11 @@ TARGET = autotests QMAKE_LFLAGS+=$${QMAKE_LFLAGS_RPATH}$$PWD/../../bin # KWallet plugin -isEqual(QT_MAJOR_VERSION, 4):exists($$PWD/../../bin/plugins/libKWalletPasswords.so) { - LIBS += $$PWD/../../bin/plugins/libKWalletPasswords.so - DEFINES += HAVE_KDE_PASSWORDS_PLUGIN +exists($$PWD/../../bin/plugins/libKWalletPasswords.so) { + isEqual(QT_MAJOR_VERSION, 4) | qtHaveModule(KWallet) { + LIBS += $$PWD/../../bin/plugins/libKWalletPasswords.so + DEFINES += HAVE_KDE_PASSWORDS_PLUGIN + } } # GnomeKeyring plugin @@ -26,8 +28,7 @@ exists($$PWD/../../bin/plugins/libGnomeKeyringPasswords.so) { DEFINES += HAVE_GNOME_PASSWORDS_PLUGIN } - -DESTDIR = +DESTDIR = OBJECTS_DIR = build MOC_DIR = build RCC_DIR = build