From c035e02bbd789744baa9727bd0b5c71f08ad7741 Mon Sep 17 00:00:00 2001
From: nowrep <nowrep@gmail.com>
Date: Mon, 20 May 2013 14:12:48 +0200
Subject: [PATCH] [Building] Correctly detect whether to build keyring plugins.

---
 .../GnomeKeyringPasswords.pro                 | 20 +++++++++----------
 .../KWalletPasswords/KWalletPasswords.pro     | 18 ++++++++---------
 src/plugins/plugins.pro                       |  7 +++++++
 3 files changed, 24 insertions(+), 21 deletions(-)

diff --git a/src/plugins/GnomeKeyringPasswords/GnomeKeyringPasswords.pro b/src/plugins/GnomeKeyringPasswords/GnomeKeyringPasswords.pro
index c2cf2e52f..72c7122b2 100644
--- a/src/plugins/GnomeKeyringPasswords/GnomeKeyringPasswords.pro
+++ b/src/plugins/GnomeKeyringPasswords/GnomeKeyringPasswords.pro
@@ -1,20 +1,18 @@
 include(../../defines.pri)
 
-!mac:unix:contains(DEFINES, "GNOME_INTEGRATION"):system(pkg-config --exists gnome-keyring-1) {
-    TARGET = $$qtLibraryTarget(GnomeKeyringPasswords)
+TARGET = $$qtLibraryTarget(GnomeKeyringPasswords)
 
-    SOURCES += gnomekeyringplugin.cpp \
-        gnomekeyringpasswordbackend.cpp
+SOURCES += gnomekeyringplugin.cpp \
+    gnomekeyringpasswordbackend.cpp
 
-    HEADERS += gnomekeyringplugin.h \
-        gnomekeyringpasswordbackend.h
+HEADERS += gnomekeyringplugin.h \
+    gnomekeyringpasswordbackend.h
 
-    RESOURCES += gnomekeyringpasswords.qrc
+RESOURCES += gnomekeyringpasswords.qrc
 
-    TRANSLATIONS = translations/cs_CZ.ts \
+TRANSLATIONS = translations/cs_CZ.ts \
 
-    LIBS += $$system(pkg-config --libs gnome-keyring-1)
-    QMAKE_CXXFLAGS += $$system(pkg-config --cflags gnome-keyring-1)
-}
+LIBS += $$system(pkg-config --libs gnome-keyring-1)
+QMAKE_CXXFLAGS += $$system(pkg-config --cflags gnome-keyring-1)
 
 include(../../plugins.pri)
diff --git a/src/plugins/KWalletPasswords/KWalletPasswords.pro b/src/plugins/KWalletPasswords/KWalletPasswords.pro
index c559d2792..5d5280906 100644
--- a/src/plugins/KWalletPasswords/KWalletPasswords.pro
+++ b/src/plugins/KWalletPasswords/KWalletPasswords.pro
@@ -1,19 +1,17 @@
 include(../../defines.pri)
 
-!mac:unix:contains(DEFINES, "KDE_INTEGRATION") {
-    TARGET = $$qtLibraryTarget(KWalletPasswords)
+TARGET = $$qtLibraryTarget(KWalletPasswords)
 
-    SOURCES += kwalletplugin.cpp \
-        kwalletpasswordbackend.cpp
+SOURCES += kwalletplugin.cpp \
+    kwalletpasswordbackend.cpp
 
-    HEADERS += kwalletplugin.h \
-        kwalletpasswordbackend.h
+HEADERS += kwalletplugin.h \
+    kwalletpasswordbackend.h
 
-    RESOURCES += kwalletpasswords.qrc
+RESOURCES += kwalletpasswords.qrc
 
-    TRANSLATIONS = translations/cs_CZ.ts \
+TRANSLATIONS = translations/cs_CZ.ts \
 
-    LIBS += -lkdeui
-}
+LIBS += -lkdeui
 
 include(../../plugins.pri)
diff --git a/src/plugins/plugins.pro b/src/plugins/plugins.pro
index c08a0ad9d..f5afe16bf 100644
--- a/src/plugins/plugins.pro
+++ b/src/plugins/plugins.pro
@@ -20,3 +20,10 @@ outOfDirPlugins = $$(QUPZILLA_PLUGINS_SRCDIR)
 
 # TestPlugin only in debug build
 !CONFIG(debug, debug|release): SUBDIRS -= $$PWD/TestPlugin
+
+# KWalletPasswords only with KDE_INTEGRATION
+!contains(DEFINES, "KDE_INTEGRATION"): SUBDIRS -= $$PWD/KWalletPasswords
+
+# GnomeKeyringPasswords only with GNOME_INTEGRATION
+!contains(DEFINES, "GNOME_INTEGRATION"): SUBDIRS -= $$PWD/GnomeKeyringPasswords
+!system(pkg-config --exists gnome-keyring-1): SUBDIRS -= $$PWD/GnomeKeyringPasswords