summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorIan Dean <ian@mediator-software.com>2012-04-23 16:10:57 +0100
committerQt by Nokia <qt-info@nokia.com>2012-04-26 17:52:12 +0200
commit5a1c67c6570285cabdf91a81ad2f3095ded38736 (patch)
tree02b72f9e3845724e1c8590d4b85bd78325338b0a /src
parentf1212ddc62a919001fcd5aebcb37e63170c475fe (diff)
Fixed iOS compilation issues.
Put MacOS-specific code in #ifdef blocks so that it is not compiled for iOS. Change-Id: I303b7dbb63eb298e92351951731868df6a38bffa Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
Diffstat (limited to 'src')
-rw-r--r--src/network/access/qnetworkaccessmanager.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/network/access/qnetworkaccessmanager.cpp b/src/network/access/qnetworkaccessmanager.cpp
index 8d68f439f1..7e95fc547d 100644
--- a/src/network/access/qnetworkaccessmanager.cpp
+++ b/src/network/access/qnetworkaccessmanager.cpp
@@ -82,7 +82,7 @@ Q_GLOBAL_STATIC(QNetworkAccessFtpBackendFactory, ftpBackend)
Q_GLOBAL_STATIC(QNetworkAccessDebugPipeBackendFactory, debugpipeBackend)
#endif
-#ifdef Q_OS_MAC
+#if defined(Q_OS_MAC) && !defined(Q_OS_IOS)
#include <CoreServices/CoreServices.h>
#include <SystemConfiguration/SystemConfiguration.h>
@@ -1186,7 +1186,7 @@ void QNetworkAccessManagerPrivate::authenticationRequired(QAuthenticator *authen
return;
}
}
-#ifdef Q_OS_MAC
+#if defined(Q_OS_MAC) && !defined(Q_OS_IOS)
//now we try to get the username and password from keychain
//if not successful signal will be emitted
QString username;