Merge remote-tracking branch 'origin/master' into api_changes

Conflicts:
	configure
	src/corelib/io/qurl.cpp
	src/gui/kernel/qwindow.cpp
	src/tools/moc/generator.cpp
	src/widgets/kernel/qwidget_qpa.cpp
	src/widgets/styles/qstyle.h
	src/widgets/widgets/qtabbar.cpp
	tests/auto/corelib/codecs/utf8/tst_utf8.cpp

Change-Id: Ia457228d6f684ec8184e13e8fcc9d25857b1751e

3 files changed, 123 insertions, 14 deletions

diff --git a/src/network/kernel/kernel.pri b/src/network/kernel/kernel.pri
index a5508af31f..f38980910d 100644
--- a/src/network/kernel/kernel.pri
+++ b/src/network/kernel/kernel.pri
@@ -33,7 +33,7 @@ win32: {
 }
 integrity:SOURCES += kernel/qdnslookup_unix.cpp kernel/qhostinfo_unix.cpp kernel/qnetworkinterface_unix.cpp
 
-mac:LIBS_PRIVATE += -framework SystemConfiguration -framework CoreFoundation
-mac:SOURCES += kernel/qnetworkproxy_mac.cpp
+mac:LIBS_PRIVATE += -framework SystemConfiguration -framework CoreFoundation -framework CoreServices
+mac:contains(QT_CONFIG, coreservices):SOURCES += kernel/qnetworkproxy_mac.cpp
 else:win32:SOURCES += kernel/qnetworkproxy_win.cpp
 else:SOURCES += kernel/qnetworkproxy_generic.cpp
diff --git a/src/network/kernel/qdnslookup_win.cpp b/src/network/kernel/qdnslookup_win.cpp
index 63f4377dfc..c798020f34 100644
--- a/src/network/kernel/qdnslookup_win.cpp
+++ b/src/network/kernel/qdnslookup_win.cpp
@@ -55,7 +55,8 @@ void QDnsLookupRunnable::query(const int requestType, const QByteArray &requestN
 {
     // Perform DNS query.
     PDNS_RECORD dns_records = 0;
-    const DNS_STATUS status = DnsQuery_UTF8(requestName, requestType, DNS_QUERY_STANDARD, NULL, &dns_records, NULL);
+    const QString requestNameUtf16 = QString::fromUtf8(requestName.data(), requestName.size());
+    const DNS_STATUS status = DnsQuery_W(reinterpret_cast<const wchar_t*>(requestNameUtf16.utf16()), requestType, DNS_QUERY_STANDARD, NULL, &dns_records, NULL);
     switch (status) {
     case ERROR_SUCCESS:
         break;
@@ -83,7 +84,7 @@ void QDnsLookupRunnable::query(const int requestType, const QByteArray &requestN
 
     // Extract results.
     for (PDNS_RECORD ptr = dns_records; ptr != NULL; ptr = ptr->pNext) {
-        const QString name = QUrl::fromAce((char*)ptr->pName);
+        const QString name = QUrl::fromAce( QString::fromWCharArray( ptr->pName ).toLatin1() );
         if (ptr->wType == QDnsLookup::A) {
             QDnsHostAddressRecord record;
             record.d->name = name;
@@ -103,12 +104,12 @@ void QDnsLookupRunnable::query(const int requestType, const QByteArray &requestN
             QDnsDomainNameRecord record;
             record.d->name = name;
             record.d->timeToLive = ptr->dwTtl;
-            record.d->value = QUrl::fromAce((char*)ptr->Data.Cname.pNameHost);
+            record.d->value = QUrl::fromAce(QString::fromWCharArray(ptr->Data.Cname.pNameHost).toLatin1());
             reply->canonicalNameRecords.append(record);
         } else if (ptr->wType == QDnsLookup::MX) {
             QDnsMailExchangeRecord record;
             record.d->name = name;
-            record.d->exchange = QUrl::fromAce((char*)ptr->Data.Mx.pNameExchange);
+            record.d->exchange = QUrl::fromAce(QString::fromWCharArray(ptr->Data.Mx.pNameExchange).toLatin1());
             record.d->preference = ptr->Data.Mx.wPreference;
             record.d->timeToLive = ptr->dwTtl;
             reply->mailExchangeRecords.append(record);
@@ -116,18 +117,18 @@ void QDnsLookupRunnable::query(const int requestType, const QByteArray &requestN
             QDnsDomainNameRecord record;
             record.d->name = name;
             record.d->timeToLive = ptr->dwTtl;
-            record.d->value = QUrl::fromAce((char*)ptr->Data.Ns.pNameHost);
+            record.d->value = QUrl::fromAce(QString::fromWCharArray(ptr->Data.Ns.pNameHost).toLatin1());
             reply->nameServerRecords.append(record);
         } else if (ptr->wType == QDnsLookup::PTR) {
             QDnsDomainNameRecord record;
             record.d->name = name;
             record.d->timeToLive = ptr->dwTtl;
-            record.d->value = QUrl::fromAce((char*)ptr->Data.Ptr.pNameHost);
+            record.d->value = QUrl::fromAce(QString::fromWCharArray(ptr->Data.Ptr.pNameHost).toLatin1());
             reply->pointerRecords.append(record);
         } else if (ptr->wType == QDnsLookup::SRV) {
             QDnsServiceRecord record;
             record.d->name = name;
-            record.d->target = QUrl::fromAce((char*)ptr->Data.Srv.pNameTarget);
+            record.d->target = QUrl::fromAce(QString::fromWCharArray(ptr->Data.Srv.pNameTarget).toLatin1());
             record.d->port = ptr->Data.Srv.wPort;
             record.d->priority = ptr->Data.Srv.wPriority;
             record.d->timeToLive = ptr->dwTtl;
@@ -138,7 +139,7 @@ void QDnsLookupRunnable::query(const int requestType, const QByteArray &requestN
             record.d->name = name;
             record.d->timeToLive = ptr->dwTtl;
             for (unsigned int i = 0; i < ptr->Data.Txt.dwStringCount; ++i) {
-                record.d->values << QByteArray((char*)ptr->Data.Txt.pStringArray[i]);
+                record.d->values << QString::fromWCharArray((ptr->Data.Txt.pStringArray[i])).toLatin1();;
             }
             reply->textRecords.append(record);
         }
diff --git a/src/network/kernel/qnetworkproxy_mac.cpp b/src/network/kernel/qnetworkproxy_mac.cpp
index d25917ee47..3e62c0f867 100644
--- a/src/network/kernel/qnetworkproxy_mac.cpp
+++ b/src/network/kernel/qnetworkproxy_mac.cpp
@@ -48,6 +48,7 @@
 
 #include <QtCore/QRegExp>
 #include <QtCore/QStringList>
+#include <QtCore/QUrl>
 #include <QtCore/qendian.h>
 #include <QtCore/qstringlist.h>
 #include "private/qcore_mac_p.h"
@@ -146,6 +147,66 @@ static QNetworkProxy proxyFromDictionary(CFDictionaryRef dict, QNetworkProxy::Pr
     return QNetworkProxy();
 }
 
+
+static QNetworkProxy proxyFromDictionary(CFDictionaryRef dict)
+{
+    QNetworkProxy::ProxyType proxyType = QNetworkProxy::DefaultProxy;
+    QString hostName;
+    quint16 port = 0;
+    QString user;
+    QString password;
+
+    CFStringRef cfProxyType = (CFStringRef)CFDictionaryGetValue(dict, kCFProxyTypeKey);
+    if (CFStringCompare(cfProxyType, kCFProxyTypeNone, 0) == kCFCompareEqualTo) {
+        proxyType = QNetworkProxy::NoProxy;
+    } else if (CFStringCompare(cfProxyType, kCFProxyTypeFTP, 0) == kCFCompareEqualTo) {
+        proxyType = QNetworkProxy::FtpCachingProxy;
+    } else if (CFStringCompare(cfProxyType, kCFProxyTypeHTTP, 0) == kCFCompareEqualTo) {
+        proxyType = QNetworkProxy::HttpProxy;
+    } else if (CFStringCompare(cfProxyType, kCFProxyTypeHTTPS, 0) == kCFCompareEqualTo) {
+        proxyType = QNetworkProxy::HttpProxy;
+    } else if (CFStringCompare(cfProxyType, kCFProxyTypeSOCKS, 0) == kCFCompareEqualTo) {
+        proxyType = QNetworkProxy::Socks5Proxy;
+    }
+
+    hostName = QCFString::toQString((CFStringRef)CFDictionaryGetValue(dict, kCFProxyHostNameKey));
+    user     = QCFString::toQString((CFStringRef)CFDictionaryGetValue(dict, kCFProxyUsernameKey));
+    password = QCFString::toQString((CFStringRef)CFDictionaryGetValue(dict, kCFProxyPasswordKey));
+
+    CFNumberRef portNumber = (CFNumberRef)CFDictionaryGetValue(dict, kCFProxyPortNumberKey);
+    if (portNumber) {
+        CFNumberGetValue(portNumber, kCFNumberSInt16Type, &port);
+    }
+
+    return QNetworkProxy(proxyType, hostName, port, user, password);
+}
+
+const char * cfurlErrorDescription(SInt32 errorCode)
+{
+    switch (errorCode) {
+        case kCFURLUnknownError:
+            return "Unknown Error";
+        case kCFURLUnknownSchemeError:
+            return "Unknown Scheme";
+        case kCFURLResourceNotFoundError:
+            return "Resource Not Found";
+        case kCFURLResourceAccessViolationError:
+            return "Resource Access Violation";
+        case kCFURLRemoteHostUnavailableError:
+            return "Remote Host Unavailable";
+        case kCFURLImproperArgumentsError:
+            return "Improper Arguments";
+        case kCFURLUnknownPropertyKeyError:
+            return "Unknown Property Key";
+        case kCFURLPropertyKeyUnavailableError:
+            return "Property Key Unavailable";
+        case kCFURLTimeoutError:
+            return "Timeout";
+        default:
+            return "Really Unknown Error";
+    }
+}
+
 QList<QNetworkProxy> macQueryInternal(const QNetworkProxyQuery &query)
 {
     QList<QNetworkProxy> result;
@@ -168,11 +229,58 @@ QList<QNetworkProxy> macQueryInternal(const QNetworkProxyQuery &query)
         int enabled;
         if (CFNumberGetValue(pacEnabled, kCFNumberIntType, &enabled) && enabled) {
             // PAC is enabled
-            CFStringRef pacUrl =
-                (CFStringRef)CFDictionaryGetValue(dict, kSCPropNetProxiesProxyAutoConfigURLString);
-            QString url = QCFString::toQString(pacUrl);
+            CFStringRef cfPacLocation = (CFStringRef)CFDictionaryGetValue(dict, kSCPropNetProxiesProxyAutoConfigURLString);
+
+#if (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5)
+            if (QSysInfo::MacintoshVersion >= QSysInfo::MV_10_5) {
+                QCFType<CFDataRef> pacData;
+                QCFType<CFURLRef> pacUrl = CFURLCreateWithString(kCFAllocatorDefault, cfPacLocation, NULL);
+                SInt32 errorCode;
+                if (!CFURLCreateDataAndPropertiesFromResource(kCFAllocatorDefault, pacUrl, &pacData, NULL, NULL, &errorCode)) {
+                    QString pacLocation = QCFString::toQString(cfPacLocation);
+                    qWarning("Unable to get the PAC script at \"%s\" (%s)", qPrintable(pacLocation), cfurlErrorDescription(errorCode));
+                    return result;
+                }
 
-            // ### TODO: Use PAC somehow
+                QCFType<CFStringRef> pacScript = CFStringCreateFromExternalRepresentation(kCFAllocatorDefault, pacData, kCFStringEncodingISOLatin1);
+                if (!pacScript) {
+                    // This should never happen, but the documentation says it may return NULL if there was a problem creating the object.
+                    QString pacLocation = QCFString::toQString(cfPacLocation);
+                    qWarning("Unable to read the PAC script at \"%s\"", qPrintable(pacLocation));
+                    return result;
+                }
+
+                QByteArray encodedURL = query.url().toEncoded(); // converted to UTF-8
+                if (encodedURL.isEmpty()) {
+                    return result; // Invalid URL, abort
+                }
+
+                QCFType<CFURLRef> targetURL = CFURLCreateWithBytes(kCFAllocatorDefault, (UInt8*)encodedURL.data(), encodedURL.size(), kCFStringEncodingUTF8, NULL);
+                if (!targetURL) {
+                    return result; // URL creation problem, abort
+                }
+
+                QCFType<CFErrorRef> pacError;
+                QCFType<CFArrayRef> proxies = CFNetworkCopyProxiesForAutoConfigurationScript(pacScript, targetURL, &pacError);
+                if (!proxies) {
+                    QString pacLocation = QCFString::toQString(cfPacLocation);
+                    QCFType<CFStringRef> pacErrorDescription = CFErrorCopyDescription(pacError);
+                    qWarning("Execution of PAC script at \"%s\" failed: %s", qPrintable(pacLocation), qPrintable(QCFString::toQString(pacErrorDescription)));
+                    return result;
+                }
+
+                CFIndex size = CFArrayGetCount(proxies);
+                for (CFIndex i = 0; i < size; ++i) {
+                    CFDictionaryRef proxy = (CFDictionaryRef)CFArrayGetValueAtIndex(proxies, i);
+                    result << proxyFromDictionary(proxy);
+                }
+                return result;
+            } else
+#endif
+            {
+                QString pacLocation = QCFString::toQString(cfPacLocation);
+                qWarning("Mac system proxy: PAC script at \"%s\" not handled", qPrintable(pacLocation));
+            }
         }
     }