Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/desktop.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDaniel Molkentin <danimo@owncloud.com>2014-04-07 19:46:06 +0400
committerDaniel Molkentin <danimo@owncloud.com>2014-04-07 19:46:06 +0400
commit69bdccfd2fc9e095c55ec13856d6e790a17fafdb (patch)
treea758f117f551cb9405cff3f2baf4cabc777bddf6 /src
parent9f8d867ce2ec38930b1c60ce0a7095ed9f6cd4f3 (diff)
Include correct QtKeychain headers
..depending on Qt version
Diffstat (limited to 'src')
-rw-r--r--src/creds/httpcredentials.cpp4
-rw-r--r--src/creds/shibbolethcredentials.cpp4
2 files changed, 8 insertions, 0 deletions
diff --git a/src/creds/httpcredentials.cpp b/src/creds/httpcredentials.cpp
index 6a8512a0a..3021a0971 100644
--- a/src/creds/httpcredentials.cpp
+++ b/src/creds/httpcredentials.cpp
@@ -19,7 +19,11 @@
#include <QSettings>
#include <QInputDialog>
+#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
+#include <qt5keychain/keychain.h>
+#else
#include <qtkeychain/keychain.h>
+#endif
#include "mirall/account.h"
#include "mirall/mirallaccessmanager.h"
diff --git a/src/creds/shibbolethcredentials.cpp b/src/creds/shibbolethcredentials.cpp
index 57ea98660..90a413c86 100644
--- a/src/creds/shibbolethcredentials.cpp
+++ b/src/creds/shibbolethcredentials.cpp
@@ -29,7 +29,11 @@
#include "mirall/account.h"
#include "mirall/theme.h"
+#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
+#include <qt5keychain/keychain.h>
+#else
#include <qtkeychain/keychain.h>
+#endif
using namespace QKeychain;