[Pkg-owncloud-commits] [owncloud-client] 319/333: Include correct QtKeychain headers

[Sandro Knauß]

This is an automated email from the git hooks/post-receive script.

hefee-guest pushed a commit to branch master
in repository owncloud-client.

commit 69bdccfd2fc9e095c55ec13856d6e790a17fafdb
Author: Daniel Molkentin <danimo at owncloud.com>
Date:   Mon Apr 7 17:46:06 2014 +0200

    Include correct QtKeychain headers
    
    ..depending on Qt version
---
 src/creds/httpcredentials.cpp       | 4 ++++
 src/creds/shibbolethcredentials.cpp | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/src/creds/httpcredentials.cpp b/src/creds/httpcredentials.cpp
index 6a8512a..3021a09 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 57ea986..90a413c 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;
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-client.git