Merge pull request #1694 from rryan/qtkeychain

Use qt5keychain when building with Qt 5.

1 files changed, 10 insertions, 1 deletions

diff --git a/src/preferences/broadcastprofile.cpp b/src/preferences/broadcastprofile.cpp
index f1c8081798..346a1f7d00 100644
--- a/src/preferences/broadcastprofile.cpp
+++ b/src/preferences/broadcastprofile.cpp
@@ -10,7 +10,11 @@
 #include <QStringList>
 
 #ifdef __QTKEYCHAIN__
+#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
+#include <qt5keychain/keychain.h>
+#else
 #include <qtkeychain/keychain.h>
+#endif
 using namespace QKeychain;
 #endif
 
@@ -215,7 +219,11 @@ void BroadcastProfile::copyValuesTo(BroadcastProfilePtr other) {
 }
 
 void BroadcastProfile::adoptDefaultValues() {
+#ifdef __QTKEYCHAIN__
+    m_secureCredentials = true;
+#else
     m_secureCredentials = false;
+#endif
     m_enabled = false;
 
     m_host = QString();
@@ -259,8 +267,9 @@ bool BroadcastProfile::loadValues(const QString& filename) {
     if (doc.childNodes().size() < 1)
         return false;
 
+#ifdef __QTKEYCHAIN__
     m_secureCredentials = (bool)XmlParse::selectNodeInt(doc, kSecureCredentials);
-#ifndef __QTKEYCHAIN__
+#else
     // Secure credentials storage can't be enabled nor disabled from the UI,
     // so force it to disabled to avoid issues if enabled.
     m_secureCredentials = false;