[Pkg-owncloud-commits] [qtkeychain] 52/115: Fix Qt5 build on Mac

Sandro Knauß hefee-guest at moszumanska.debian.org
Sat Mar 15 19:25:45 UTC 2014


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

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

commit 468e3b0eaf251797a9fa6f5ea4102dadf82162a1
Author: Frank Osterfeld <frank.osterfeld at kdab.com>
Date:   Wed Jan 23 10:29:07 2013 +0100

    Fix Qt5 build on Mac
    
    Q_WS_MAC doesn't exist in Qt5 anymore, use Q_OS_DARWIN instead
---
 keychain_p.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/keychain_p.h b/keychain_p.h
index 2bf5d09..9b87d08 100644
--- a/keychain_p.h
+++ b/keychain_p.h
@@ -15,7 +15,7 @@
 #include <QSettings>
 #include <QVector>
 
-#if defined(Q_OS_UNIX) && !defined(Q_WS_MAC)
+#if defined(Q_OS_UNIX) && !defined(Q_OS_DARWIN)
 
 #include <QDBusPendingCallWatcher>
 
@@ -65,7 +65,7 @@ public:
     };
     DataType dataType;
 
-#if defined(Q_OS_UNIX) && !defined(Q_WS_MAC)
+#if defined(Q_OS_UNIX) && !defined(Q_OS_DARWIN)
     org::kde::KWallet* iface;
     friend class QKeychain::JobExecutor;
 
@@ -99,7 +99,7 @@ public:
     QByteArray binaryData;
     QString textData;
 
-#if defined(Q_OS_UNIX) && !defined(Q_WS_MAC)
+#if defined(Q_OS_UNIX) && !defined(Q_OS_DARWIN)
     org::kde::KWallet* iface;
     friend class QKeychain::JobExecutor;
 

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



More information about the Pkg-owncloud-commits mailing list