Merge remote-tracking branch 'origin/5.6' into dev

Conflicts:
	src/corelib/io/io.pri
	src/corelib/io/qdatastream.cpp
	src/corelib/io/qdatastream.h
	src/network/socket/qabstractsocket.cpp
	src/plugins/platforminputcontexts/ibus/qibusplatforminputcontext.cpp
	src/plugins/platforms/cocoa/qcocoaaccessibilityelement.h
	src/widgets/styles/qgtkstyle.cpp
	tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-cache/qmimedatabase-cache.pro
	tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-xml/qmimedatabase-xml.pro
	tests/auto/dbus/qdbusconnection/qdbusconnection.pro
	tests/auto/dbus/qdbuspendingcall/tst_qdbuspendingcall.cpp
	tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp

Change-Id: I347549a024eb5bfa986699e0a11f96cc55c797a7

21 files changed, 201 insertions, 179 deletions

diff --git a/src/corelib/io/io.pri b/src/corelib/io/io.pri
index d8cc004168..7be1e5883e 100644
--- a/src/corelib/io/io.pri
+++ b/src/corelib/io/io.pri
@@ -155,6 +155,8 @@ win32 {
                 OBJECTIVE_SOURCES += io/qfilesystemwatcher_fsevents.mm
                 HEADERS += io/qfilesystemwatcher_fsevents_p.h
                 LIBS += -framework DiskArbitration -framework IOKit
+            } else:ios {
+                LIBS += -framework MobileCoreServices
             }
         } else:blackberry {
             SOURCES += \
diff --git a/src/corelib/io/qabstractfileengine.cpp b/src/corelib/io/qabstractfileengine.cpp
index 07270eb790..2ab789e0af 100644
--- a/src/corelib/io/qabstractfileengine.cpp
+++ b/src/corelib/io/qabstractfileengine.cpp
@@ -891,7 +891,6 @@ bool QAbstractFileEngine::unmap(uchar *address)
 /*!
     \typedef QAbstractFileEngine::Iterator
     \since 4.3
-    \relates QAbstractFileEngine
 
     Synonym for QAbstractFileEngineIterator.
 */
diff --git a/src/corelib/io/qdatastream.cpp b/src/corelib/io/qdatastream.cpp
index 1471f10ea6..c32df4c8a6 100644
--- a/src/corelib/io/qdatastream.cpp
+++ b/src/corelib/io/qdatastream.cpp
@@ -526,8 +526,8 @@ void QDataStream::setByteOrder(ByteOrder bo)
     \value Qt_5_3 Same as Qt_5_2
     \value Qt_5_4 Version 16 (Qt 5.4)
     \value Qt_5_5 Same as Qt_5_4
-    \value Qt_5_6 Same as Qt_5_4
-    \value Qt_5_7 Same as Qt_5_4
+    \value Qt_5_6 Version 17 (Qt 5.6)
+    \value Qt_5_7 Same as Qt_5_6
     \omitvalue Qt_DefaultCompiledVersion
 
     \sa setVersion(), version()
diff --git a/src/corelib/io/qdatastream.h b/src/corelib/io/qdatastream.h
index db6fc5334e..744829c659 100644
--- a/src/corelib/io/qdatastream.h
+++ b/src/corelib/io/qdatastream.h
@@ -83,8 +83,8 @@ public:
         Qt_5_3 = Qt_5_2,
         Qt_5_4 = 16,
         Qt_5_5 = Qt_5_4,
-        Qt_5_6 = Qt_5_5,
-        Qt_5_7 = Qt_5_5,
+        Qt_5_6 = 17,
+        Qt_5_7 = Qt_5_6,
 #if QT_VERSION >= 0x050800
 #error Add the datastream version for this Qt version and update Qt_DefaultCompiledVersion
 #endif
diff --git a/src/corelib/io/qdebug.cpp b/src/corelib/io/qdebug.cpp
index 54a705b72b..13eccce9da 100644
--- a/src/corelib/io/qdebug.cpp
+++ b/src/corelib/io/qdebug.cpp
@@ -697,7 +697,7 @@ QDebug &QDebug::resetFormat()
 
 /*!
     \class QDebugStateSaver
-
+    \inmodule QtCore
     \brief Convenience class for custom QDebug operators
 
     Saves the settings used by QDebug, and restores them upon destruction,
diff --git a/src/corelib/io/qfileinfo.cpp b/src/corelib/io/qfileinfo.cpp
index 8a86ec5858..51b39b1114 100644
--- a/src/corelib/io/qfileinfo.cpp
+++ b/src/corelib/io/qfileinfo.cpp
@@ -263,6 +263,7 @@ QDateTime &QFileInfoPrivate::getFileTime(QAbstractFileEngine::FileTime request)
     groupId(). You can examine a file's permissions and ownership in a
     single statement using the permission() function.
 
+    \target NTFS permissions
     \note On NTFS file systems, ownership and permissions checking is
     disabled by default for performance reasons. To enable it,
     include the following line:
@@ -893,6 +894,9 @@ QDir QFileInfo::absoluteDir() const
 /*!
     Returns \c true if the user can read the file; otherwise returns \c false.
 
+    \note If the \l{NTFS permissions} check has not been enabled, the result
+    on Windows will merely reflect whether the file exists.
+
     \sa isWritable(), isExecutable(), permission()
 */
 bool QFileInfo::isReadable() const
@@ -911,6 +915,9 @@ bool QFileInfo::isReadable() const
 /*!
     Returns \c true if the user can write to the file; otherwise returns \c false.
 
+    \note If the \l{NTFS permissions} check has not been enabled, the result on
+    Windows will merely reflect whether the file is marked as Read Only.
+
     \sa isReadable(), isExecutable(), permission()
 */
 bool QFileInfo::isWritable() const
@@ -1137,7 +1144,8 @@ QString QFileInfo::readLink() const
     returned.
 
     This function can be time consuming under Unix (in the order of
-    milliseconds).
+    milliseconds). On Windows, it will return an empty string unless
+    the \l{NTFS permissions} check has been enabled.
 
     \sa ownerId(), group(), groupId()
 */
@@ -1217,6 +1225,9 @@ uint QFileInfo::groupId() const
     On systems where files do not have permissions this function
     always returns \c true.
 
+    \note The result might be inaccurate on Windows if the
+    \l{NTFS permissions} check has not been enabled.
+
     Example:
     \snippet code/src_corelib_io_qfileinfo.cpp 10
 
@@ -1240,6 +1251,9 @@ bool QFileInfo::permission(QFile::Permissions permissions) const
 /*!
     Returns the complete OR-ed together combination of
     QFile::Permissions for the file.
+
+    \note The result might be inaccurate on Windows if the
+    \l{NTFS permissions} check has not been enabled.
 */
 QFile::Permissions QFileInfo::permissions() const
 {
diff --git a/src/corelib/io/qfilesystemengine.cpp b/src/corelib/io/qfilesystemengine.cpp
index df41457a18..e4dec2b7fb 100644
--- a/src/corelib/io/qfilesystemengine.cpp
+++ b/src/corelib/io/qfilesystemengine.cpp
@@ -264,7 +264,7 @@ void QFileSystemMetaData::fillFromStatBuf(const QT_STATBUF &statBuffer)
     // Attributes
     entryFlags |= QFileSystemMetaData::ExistsAttribute;
     size_ = statBuffer.st_size;
-#if defined(Q_OS_MACX)
+#if defined(Q_OS_DARWIN)
     if (statBuffer.st_flags & UF_HIDDEN) {
         entryFlags |= QFileSystemMetaData::HiddenAttribute;
         knownFlagsMask |= QFileSystemMetaData::HiddenAttribute;
diff --git a/src/corelib/io/qfilesystemengine_p.h b/src/corelib/io/qfilesystemengine_p.h
index 06d5db637a..6db9319836 100644
--- a/src/corelib/io/qfilesystemengine_p.h
+++ b/src/corelib/io/qfilesystemengine_p.h
@@ -76,7 +76,7 @@ public:
     static QString resolveGroupName(uint groupId);
 #endif
 
-#if defined(Q_OS_MACX)
+#if defined(Q_OS_DARWIN)
     static QString bundleName(const QFileSystemEntry &entry);
 #else
     static QString bundleName(const QFileSystemEntry &entry) { Q_UNUSED(entry) return QString(); }
diff --git a/src/corelib/io/qfilesystemengine_unix.cpp b/src/corelib/io/qfilesystemengine_unix.cpp
index 2c9fed530b..7bc2293b0d 100644
--- a/src/corelib/io/qfilesystemengine_unix.cpp
+++ b/src/corelib/io/qfilesystemengine_unix.cpp
@@ -51,26 +51,38 @@
 # include <CoreFoundation/CFBundle.h>
 #endif
 
+#ifdef Q_OS_OSX
+#include <CoreServices/CoreServices.h>
+#endif
+
+#ifdef Q_OS_IOS
+#include <MobileCoreServices/MobileCoreServices.h>
+#endif
+
 QT_BEGIN_NAMESPACE
 
-#if defined(Q_OS_MACX)
-static inline bool _q_isMacHidden(const char *nativePath)
+#if defined(Q_OS_DARWIN)
+static inline bool hasResourcePropertyFlag(const QFileSystemMetaData &data,
+                                           const QFileSystemEntry &entry,
+                                           CFStringRef key)
 {
-    OSErr err;
-
-    FSRef fsRef;
-    err = FSPathMakeRefWithOptions(reinterpret_cast<const UInt8 *>(nativePath),
-            kFSPathMakeRefDoNotFollowLeafSymlink, &fsRef, 0);
-    if (err != noErr)
+    QCFString path = CFStringCreateWithFileSystemRepresentation(0,
+        entry.nativeFilePath().constData());
+    if (!path)
         return false;
 
-    FSCatalogInfo catInfo;
-    err = FSGetCatalogInfo(&fsRef, kFSCatInfoFinderInfo, &catInfo, NULL, NULL, NULL);
-    if (err != noErr)
+    QCFType<CFURLRef> url = CFURLCreateWithFileSystemPath(0, path, kCFURLPOSIXPathStyle,
+        data.hasFlags(QFileSystemMetaData::DirectoryType));
+    if (!url)
         return false;
 
-    FileInfo * const fileInfo = reinterpret_cast<FileInfo*>(&catInfo.finderInfo);
-    return (fileInfo->finderFlags & kIsInvisible);
+    CFBooleanRef value;
+    if (CFURLCopyResourcePropertyForKey(url, key, &value, NULL)) {
+        if (value == kCFBooleanTrue)
+            return true;
+    }
+
+    return false;
 }
 
 static bool isPackage(const QFileSystemMetaData &data, const QFileSystemEntry &entry)
@@ -97,6 +109,7 @@ static bool isPackage(const QFileSystemMetaData &data, const QFileSystemEntry &e
         if (CFBundleGetPackageInfoInDirectory(url, &type, &creator))
             return true;
 
+#ifdef Q_OS_OSX
         // Find if an application other than Finder claims to know how to handle the package
         QCFType<CFURLRef> application;
         LSGetApplicationForURL(url,
@@ -111,30 +124,11 @@ static bool isPackage(const QFileSystemMetaData &data, const QFileSystemEntry &e
             if (applicationId != QLatin1String("com.apple.finder"))
                 return true;
         }
+#endif
     }
 
     // Third step: check if the directory has the package bit set
-    FSRef packageRef;
-    FSPathMakeRef((UInt8 *)entry.nativeFilePath().constData(), &packageRef, NULL);
-
-    FSCatalogInfo catalogInfo;
-    FSGetCatalogInfo(&packageRef,
-                     kFSCatInfoFinderInfo,
-                     &catalogInfo,
-                     NULL,
-                     NULL,
-                     NULL);
-
-    FolderInfo *folderInfo = reinterpret_cast<FolderInfo *>(catalogInfo.finderInfo);
-    return folderInfo->finderFlags & kHasBundle;
-}
-
-#else
-static inline bool _q_isMacHidden(const char *nativePath)
-{
-    Q_UNUSED(nativePath);
-    // no-op
-    return false;
+    return hasResourcePropertyFlag(data, entry, kCFURLIsPackageKey);
 }
 #endif
 
@@ -194,21 +188,34 @@ QFileSystemEntry QFileSystemEngine::getLinkTarget(const QFileSystemEntry &link,
             ret.chop(1);
         return QFileSystemEntry(ret);
     }
-#if defined(Q_OS_MACX)
+#if defined(Q_OS_DARWIN)
     {
-        FSRef fref;
-        if (FSPathMakeRef((const UInt8 *)QFile::encodeName(QDir::cleanPath(link.filePath())).data(), &fref, 0) == noErr) {
-            // TODO get the meta data info from the QFileSystemMetaData object
-            Boolean isAlias, isFolder;
-            if (FSResolveAliasFile(&fref, true, &isFolder, &isAlias) == noErr && isAlias) {
-                AliasHandle alias;
-                if (FSNewAlias(0, &fref, &alias) == noErr && alias) {
-                    QCFString cfstr;
-                    if (FSCopyAliasInfo(alias, 0, 0, &cfstr, 0, 0) == noErr)
-                        return QFileSystemEntry(QCFString::toQString(cfstr));
-                }
-            }
-        }
+        QCFString path = CFStringCreateWithFileSystemRepresentation(0,
+            QFile::encodeName(QDir::cleanPath(link.filePath())).data());
+        if (!path)
+            return QFileSystemEntry();
+
+        QCFType<CFURLRef> url = CFURLCreateWithFileSystemPath(0, path, kCFURLPOSIXPathStyle,
+            data.hasFlags(QFileSystemMetaData::DirectoryType));
+        if (!url)
+            return QFileSystemEntry();
+
+        QCFType<CFDataRef> bookmarkData = CFURLCreateBookmarkDataFromFile(0, url, NULL);
+        if (!bookmarkData)
+            return QFileSystemEntry();
+
+        QCFType<CFURLRef> resolvedUrl = CFURLCreateByResolvingBookmarkData(0,
+            bookmarkData,
+            (CFURLBookmarkResolutionOptions)(kCFBookmarkResolutionWithoutUIMask
+                | kCFBookmarkResolutionWithoutMountingMask), NULL, NULL, NULL, NULL);
+        if (!resolvedUrl)
+            return QFileSystemEntry();
+
+        QCFString cfstr(CFURLCopyFileSystemPath(resolvedUrl, kCFURLPOSIXPathStyle));
+        if (!cfstr)
+            return QFileSystemEntry();
+
+        return QFileSystemEntry(QCFString::toQString(cfstr));
     }
 #endif
     return QFileSystemEntry();
@@ -226,31 +233,14 @@ QFileSystemEntry QFileSystemEngine::canonicalName(const QFileSystemEntry &entry,
     return QFileSystemEntry(slowCanonicalized(absoluteName(entry).filePath()));
 #else
     char *ret = 0;
-# if defined(Q_OS_MACX)
-    // When using -mmacosx-version-min=10.4, we get the legacy realpath implementation,
-    // which does not work properly with the realpath(X,0) form. See QTBUG-28282.
-    if (QSysInfo::MacintoshVersion >= QSysInfo::MV_10_6) {
-        ret = (char*)malloc(PATH_MAX + 1);
-        if (ret && realpath(entry.nativeFilePath().constData(), (char*)ret) == 0) {
-            const int savedErrno = errno; // errno is checked below, and free() might change it
-            free(ret);
-            errno = savedErrno;
-            ret = 0;
-        }
-    } else {
-        // on 10.5 we can use FSRef to resolve the file path.
-        QString path = QDir::cleanPath(entry.filePath());
-        FSRef fsref;
-        if (FSPathMakeRef((const UInt8 *)path.toUtf8().data(), &fsref, 0) == noErr) {
-            CFURLRef urlref = CFURLCreateFromFSRef(NULL, &fsref);
-            CFStringRef canonicalPath = CFURLCopyFileSystemPath(urlref, kCFURLPOSIXPathStyle);
-            QString ret = QCFString::toQString(canonicalPath);
-            CFRelease(canonicalPath);
-            CFRelease(urlref);
-            return QFileSystemEntry(ret);
-        }
+# if defined(Q_OS_DARWIN)
+    ret = (char*)malloc(PATH_MAX + 1);
+    if (ret && realpath(entry.nativeFilePath().constData(), (char*)ret) == 0) {
+        const int savedErrno = errno; // errno is checked below, and free() might change it
+        free(ret);
+        errno = savedErrno;
+        ret = 0;
     }
-
 # elif defined(Q_OS_ANDROID)
     // On some Android versions, realpath() will return a path even if it does not exist
     // To work around this, we check existence in advance.
@@ -406,7 +396,7 @@ QString QFileSystemEngine::resolveGroupName(uint groupId)
     return QString();
 }
 
-#if defined(Q_OS_MACX)
+#if defined(Q_OS_DARWIN)
 //static
 QString QFileSystemEngine::bundleName(const QFileSystemEntry &entry)
 {
@@ -426,7 +416,7 @@ QString QFileSystemEngine::bundleName(const QFileSystemEntry &entry)
 bool QFileSystemEngine::fillMetaData(const QFileSystemEntry &entry, QFileSystemMetaData &data,
         QFileSystemMetaData::MetaDataFlags what)
 {
-#if defined(Q_OS_MACX)
+#if defined(Q_OS_DARWIN)
     if (what & QFileSystemMetaData::BundleType) {
         if (!data.hasFlags(QFileSystemMetaData::DirectoryType))
             what |= QFileSystemMetaData::DirectoryType;
@@ -435,7 +425,7 @@ bool QFileSystemEngine::fillMetaData(const QFileSystemEntry &entry, QFileSystemM
         // OS X >= 10.5: st_flags & UF_HIDDEN
         what |= QFileSystemMetaData::PosixStatFlags;
     }
-#endif // defined(Q_OS_MACX)
+#endif // defined(Q_OS_DARWIN)
 
     if (what & QFileSystemMetaData::PosixStatFlags)
         what |= QFileSystemMetaData::PosixStatFlags;
@@ -496,19 +486,11 @@ bool QFileSystemEngine::fillMetaData(const QFileSystemEntry &entry, QFileSystemM
             | QFileSystemMetaData::ExistsAttribute;
     }
 
-#if defined(Q_OS_MACX)
+#if defined(Q_OS_DARWIN)
     if (what & QFileSystemMetaData::AliasType)
     {
-        if (entryExists) {
-            FSRef fref;
-            if (FSPathMakeRef((const UInt8 *)nativeFilePath, &fref, NULL) == noErr) {
-                Boolean isAlias, isFolder;
-                if (FSIsAliasFile(&fref, &isAlias, &isFolder) == noErr) {
-                    if (isAlias)
-                        data.entryFlags |= QFileSystemMetaData::AliasType;
-                }
-            }
-        }
+        if (entryExists && hasResourcePropertyFlag(data, entry, kCFURLIsAliasFileKey))
+            data.entryFlags |= QFileSystemMetaData::AliasType;
         data.knownFlagsMask |= QFileSystemMetaData::AliasType;
     }
 #endif
@@ -537,12 +519,15 @@ bool QFileSystemEngine::fillMetaData(const QFileSystemEntry &entry, QFileSystemM
             && !data.isHidden()) {
         QString fileName = entry.fileName();
         if ((fileName.size() > 0 && fileName.at(0) == QLatin1Char('.'))
-                || (entryExists && _q_isMacHidden(nativeFilePath)))
+#if defined(Q_OS_DARWIN)
+                || (entryExists && hasResourcePropertyFlag(data, entry, kCFURLIsHiddenKey))
+#endif
+                )
             data.entryFlags |= QFileSystemMetaData::HiddenAttribute;
         data.knownFlagsMask |= QFileSystemMetaData::HiddenAttribute;
     }
 
-#if defined(Q_OS_MACX)
+#if defined(Q_OS_DARWIN)
     if (what & QFileSystemMetaData::BundleType) {
         if (entryExists && isPackage(data, entry))
             data.entryFlags |= QFileSystemMetaData::BundleType;
diff --git a/src/corelib/io/qfilesystemmetadata_p.h b/src/corelib/io/qfilesystemmetadata_p.h
index da9576b5f8..828b5b329c 100644
--- a/src/corelib/io/qfilesystemmetadata_p.h
+++ b/src/corelib/io/qfilesystemmetadata_p.h
@@ -93,7 +93,7 @@ public:
         LinkType            = 0x00010000,
         FileType            = 0x00020000,
         DirectoryType       = 0x00040000,
-#if defined(Q_OS_MACX)
+#if defined(Q_OS_DARWIN)
         BundleType          = 0x00080000,
         AliasType           = 0x08000000,
 #else
@@ -243,7 +243,7 @@ private:
 
 Q_DECLARE_OPERATORS_FOR_FLAGS(QFileSystemMetaData::MetaDataFlags)
 
-#if defined(Q_OS_MACX)
+#if defined(Q_OS_DARWIN)
 inline bool QFileSystemMetaData::isBundle() const                   { return (entryFlags & BundleType); }
 inline bool QFileSystemMetaData::isAlias() const                    { return (entryFlags & AliasType); }
 #else
diff --git a/src/corelib/io/qloggingcategory.cpp b/src/corelib/io/qloggingcategory.cpp
index 1d06e2a912..b51085ef42 100644
--- a/src/corelib/io/qloggingcategory.cpp
+++ b/src/corelib/io/qloggingcategory.cpp
@@ -157,6 +157,7 @@ static void setBoolLane(QBasicAtomicInt *atomic, bool enable, int shift)
 
     Order of evaluation:
     \list
+    \li [QLibraryInfo::DataPath]/qtlogging.ini
     \li QtProject/qtlogging.ini
     \li \l setFilterRules()
     \li \c QT_LOGGING_CONF
diff --git a/src/corelib/io/qloggingregistry.cpp b/src/corelib/io/qloggingregistry.cpp
index f0b72cd9be..b53e251102 100644
--- a/src/corelib/io/qloggingregistry.cpp
+++ b/src/corelib/io/qloggingregistry.cpp
@@ -34,6 +34,7 @@
 #include "qloggingregistry_p.h"
 
 #include <QtCore/qfile.h>
+#include <QtCore/qlibraryinfo.h>
 #include <QtCore/qstandardpaths.h>
 #include <QtCore/qtextstream.h>
 #include <QtCore/qdir.h>
@@ -247,6 +248,21 @@ static bool qtLoggingDebug()
     return debugEnv;
 }
 
+static QVector<QLoggingRule> loadRulesFromFile(const QString &filePath)
+{
+    QFile file(filePath);
+    if (file.open(QIODevice::ReadOnly | QIODevice::Text)) {
+        if (qtLoggingDebug())
+            debugMsg("Loading \"%s\" ...",
+                     QDir::toNativeSeparators(file.fileName()).toUtf8().constData());
+        QTextStream stream(&file);
+        QLoggingSettingsParser parser;
+        parser.setContent(stream);
+        return parser.rules();
+    }
+    return QVector<QLoggingRule>();
+}
+
 /*!
     \internal
     Initializes the rules database by loading
@@ -256,18 +272,9 @@ void QLoggingRegistry::init()
 {
     // get rules from environment
     const QByteArray rulesFilePath = qgetenv("QT_LOGGING_CONF");
-    if (!rulesFilePath.isEmpty()) {
-        QFile file(QFile::decodeName(rulesFilePath));
-        if (file.open(QIODevice::ReadOnly | QIODevice::Text)) {
-            if (qtLoggingDebug())
-                debugMsg("Loading \"%s\" ...",
-                         QDir::toNativeSeparators(file.fileName()).toUtf8().constData());
-            QTextStream stream(&file);
-            QLoggingSettingsParser parser;
-            parser.setContent(stream);
-            envRules = parser.rules();
-        }
-    }
+    if (!rulesFilePath.isEmpty())
+        envRules = loadRulesFromFile(QFile::decodeName(rulesFilePath));
+
     const QByteArray rulesSrc = qgetenv("QT_LOGGING_RULES").replace(';', '\n');
     if (!rulesSrc.isEmpty()) {
          QTextStream stream(rulesSrc);
@@ -277,23 +284,22 @@ void QLoggingRegistry::init()
          envRules += parser.rules();
     }
 
-    // get rules from qt configuration
-    QString envPath = QStandardPaths::locate(QStandardPaths::GenericConfigLocation,
-                                             QStringLiteral("QtProject/qtlogging.ini"));
-    if (!envPath.isEmpty()) {
-        QFile file(envPath);
-        if (file.open(QIODevice::ReadOnly | QIODevice::Text)) {
-            if (qtLoggingDebug())
-                debugMsg("Loading \"%s\" ...",
-                         QDir::toNativeSeparators(envPath).toUtf8().constData());
-            QTextStream stream(&file);
-            QLoggingSettingsParser parser;
-            parser.setContent(stream);
-            configRules = parser.rules();
-        }
-    }
+    const QString configFileName = QStringLiteral("qtlogging.ini");
+
+#if !defined(QT_BOOTSTRAPPED)
+    // get rules from Qt data configuration path
+    const QString qtConfigPath
+            = QDir(QLibraryInfo::location(QLibraryInfo::DataPath)).absoluteFilePath(configFileName);
+    qtConfigRules = loadRulesFromFile(qtConfigPath);
+#endif
+
+    // get rules from user's/system configuration
+    const QString envPath = QStandardPaths::locate(QStandardPaths::GenericConfigLocation,
+                                                   QString::fromLatin1("QtProject/") + configFileName);
+    if (!envPath.isEmpty())
+        configRules = loadRulesFromFile(envPath);
 
-    if (!envRules.isEmpty() || !configRules.isEmpty()) {
+    if (!envRules.isEmpty() || !qtConfigRules.isEmpty() || !configRules.isEmpty()) {
         QMutexLocker locker(&registryMutex);
         updateRules();
     }
@@ -356,7 +362,7 @@ void QLoggingRegistry::updateRules()
     if (categoryFilter != defaultCategoryFilter)
         return;
 
-    rules = configRules + apiRules + envRules;
+    rules = qtConfigRules + configRules + apiRules + envRules;
 
     foreach (QLoggingCategory *cat, categories.keys())
         (*categoryFilter)(cat);
diff --git a/src/corelib/io/qloggingregistry_p.h b/src/corelib/io/qloggingregistry_p.h
index 718e09d9bb..bb32a4996d 100644
--- a/src/corelib/io/qloggingregistry_p.h
+++ b/src/corelib/io/qloggingregistry_p.h
@@ -122,6 +122,7 @@ private:
 
     QMutex registryMutex;
 
+    QVector<QLoggingRule> qtConfigRules;
     QVector<QLoggingRule> configRules;
     QVector<QLoggingRule> envRules;
     QVector<QLoggingRule> apiRules;
diff --git a/src/corelib/io/qprocess.cpp b/src/corelib/io/qprocess.cpp
index 09a471e7db..ecda86a91d 100644
--- a/src/corelib/io/qprocess.cpp
+++ b/src/corelib/io/qprocess.cpp
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
 ** Copyright (C) 2015 The Qt Company Ltd.
-** Copyright (C) 2014 Intel Corporation
+** Copyright (C) 2015 Intel Corporation
 ** Contact: http://www.qt.io/licensing/
 **
 ** This file is part of the QtCore module of the Qt Toolkit.
@@ -139,7 +139,7 @@ QT_BEGIN_NAMESPACE
     Unix environment allows both variable names and contents to contain arbitrary
     binary data (except for the NUL character). QProcessEnvironment will preserve
     such variables, but does not support manipulating variables whose names or
-    values are not encodable by the current locale settings (see
+    values cannot be encoded by the current locale settings (see
     QTextCodec::codecForLocale).
 
     On Windows, the variable names are case-insensitive, but case-preserving.
@@ -395,8 +395,8 @@ QString QProcessEnvironment::value(const QString &name, const QString &defaultVa
     Use with the QProcess::setEnvironment function is not recommended due to
     potential encoding problems under Unix, and worse performance.
 
-    \sa systemEnvironment(), QProcess::systemEnvironment(), QProcess::environment(),
-        QProcess::setEnvironment()
+    \sa systemEnvironment(), QProcess::systemEnvironment(),
+        QProcess::setProcessEnvironment()
 */
 QStringList QProcessEnvironment::toStringList() const
 {
@@ -545,7 +545,7 @@ void QProcessPrivate::Channel::clear()
     QProcess can merge the two output channels, so that standard
     output and standard error data from the running process both use
     the standard output channel. Call setProcessChannelMode() with
-    MergedChannels before starting the process to activative
+    MergedChannels before starting the process to activate
     this feature. You also have the option of forwarding the output of
     the running process to the calling, main process, by passing
     ForwardedChannels as the argument. It is also possible to forward
@@ -556,7 +556,7 @@ void QProcessPrivate::Channel::clear()
 
     Certain processes need special environment settings in order to
     operate. You can set environment variables for your process by
-    calling setEnvironment(). To set a working directory, call
+    calling setProcessEnvironment(). To set a working directory, call
     setWorkingDirectory(). By default, processes are run in the
     current working directory of the calling process.
 
@@ -1328,7 +1328,7 @@ QProcess::InputChannelMode QProcess::inputChannelMode() const
 /*!
     \since 5.2
 
-    Sets the channel mode of the QProcess standard intput
+    Sets the channel mode of the QProcess standard input
     channel to the \a mode specified.
     This mode will be used the next time start() is called.
 
@@ -2195,6 +2195,7 @@ void QProcessPrivate::start(QIODevice::OpenMode mode)
     qDebug() << "QProcess::start(" << program << ',' << arguments << ',' << mode << ')';
 #endif
 
+    stdinChannel.buffer.clear();
     stdoutChannel.buffer.clear();
     stderrChannel.buffer.clear();
 
@@ -2393,7 +2394,7 @@ void QProcess::setArguments(const QStringList &arguments)
     The process may not exit as a result of calling this function (it is given
     the chance to prompt the user for any unsaved files, etc).
 
-    On Windows, terminate() posts a WM_CLOSE message to all toplevel windows
+    On Windows, terminate() posts a WM_CLOSE message to all top-level windows
     of the process and then to the main thread of the process itself. On Unix
     and OS X the \c SIGTERM signal is sent.
 
@@ -2589,14 +2590,14 @@ QT_END_INCLUDE_NAMESPACE
 
     This function does not cache the system environment. Therefore, it's
     possible to obtain an updated version of the environment if low-level C
-    library functions like \tt setenv ot \tt putenv have been called.
+    library functions like \tt setenv or \tt putenv have been called.
 
     However, note that repeated calls to this function will recreate the
     list of environment variables, which is a non-trivial operation.
 
     \note For new code, it is recommended to use QProcessEnvironment::systemEnvironment()
 
-    \sa QProcessEnvironment::systemEnvironment(), environment(), setEnvironment()
+    \sa QProcessEnvironment::systemEnvironment(), setProcessEnvironment()
 */
 QStringList QProcess::systemEnvironment()
 {
@@ -2619,7 +2620,7 @@ QStringList QProcess::systemEnvironment()
     It is returned as a QProcessEnvironment. This function does not
     cache the system environment. Therefore, it's possible to obtain
     an updated version of the environment if low-level C library
-    functions like \tt setenv ot \tt putenv have been called.
+    functions like \tt setenv or \tt putenv have been called.
 
     However, note that repeated calls to this function will recreate the
     QProcessEnvironment object, which is a non-trivial operation.
diff --git a/src/corelib/io/qprocess_win.cpp b/src/corelib/io/qprocess_win.cpp
index 5c9db05eff..e77249975c 100644
--- a/src/corelib/io/qprocess_win.cpp
+++ b/src/corelib/io/qprocess_win.cpp
@@ -694,13 +694,15 @@ bool QProcessPrivate::waitForBytesWritten(int msecs)
             return true;
 
         // If we wouldn't write anything, check if we can read stdout.
-        if (bytesAvailableInChannel(&stdoutChannel) != 0) {
+        if (stdoutChannel.pipe[0] != INVALID_Q_PIPE
+                && bytesAvailableInChannel(&stdoutChannel) != 0) {
             tryReadFromChannel(&stdoutChannel);
             timer.resetIncrements();
         }
 
         // Check if we can read stderr.
-        if (bytesAvailableInChannel(&stderrChannel) != 0) {
+        if (stderrChannel.pipe[0] != INVALID_Q_PIPE
+                && bytesAvailableInChannel(&stderrChannel) != 0) {
             tryReadFromChannel(&stderrChannel);
             timer.resetIncrements();
         }
diff --git a/src/corelib/io/qsettings.cpp b/src/corelib/io/qsettings.cpp
index d4143c4035..654d688c53 100644
--- a/src/corelib/io/qsettings.cpp
+++ b/src/corelib/io/qsettings.cpp
@@ -453,14 +453,23 @@ QString QSettingsPrivate::variantToString(const QVariant &v)
 
         default: {
 #ifndef QT_NO_DATASTREAM
+            QDataStream::Version version;
+            const char *typeSpec;
+            if (v.type() == QVariant::DateTime) {
+                version = QDataStream::Qt_5_6;
+                typeSpec = "@DateTime(";
+            } else {
+                version = QDataStream::Qt_4_0;
+                typeSpec = "@Variant(";
+            }
             QByteArray a;
             {
                 QDataStream s(&a, QIODevice::WriteOnly);
-                s.setVersion(QDataStream::Qt_4_0);
+                s.setVersion(version);
                 s << v;
             }
 
-            result = QLatin1String("@Variant(");
+            result = QLatin1String(typeSpec);
             result += QString::fromLatin1(a.constData(), a.size());
             result += QLatin1Char(')');
 #else
@@ -480,11 +489,21 @@ QVariant QSettingsPrivate::stringToVariant(const QString &s)
         if (s.endsWith(QLatin1Char(')'))) {
             if (s.startsWith(QLatin1String("@ByteArray("))) {
                 return QVariant(s.toLatin1().mid(11, s.size() - 12));
-            } else if (s.startsWith(QLatin1String("@Variant("))) {
+            } else if (s.startsWith(QLatin1String("@Variant("))
+                       || s.startsWith(QLatin1String("@DateTime("))) {
 #ifndef QT_NO_DATASTREAM
-                QByteArray a(s.toLatin1().mid(9));
+                QDataStream::Version version;
+                int offset;
+                if (s.at(1) == QLatin1Char('D')) {
+                    version = QDataStream::Qt_5_6;
+                    offset = 10;
+                } else {
+                    version = QDataStream::Qt_4_0;
+                    offset = 9;
+                }
+                QByteArray a(s.toLatin1().mid(offset));
                 QDataStream stream(&a, QIODevice::ReadOnly);
-                stream.setVersion(QDataStream::Qt_4_0);
+                stream.setVersion(version);
                 QVariant result;
                 stream >> result;
                 return result;
diff --git a/src/corelib/io/qstorageinfo_mac.cpp b/src/corelib/io/qstorageinfo_mac.cpp
index 1ef9983918..64ca6d7175 100644
--- a/src/corelib/io/qstorageinfo_mac.cpp
+++ b/src/corelib/io/qstorageinfo_mac.cpp
@@ -147,32 +147,24 @@ void QStorageInfoPrivate::retrieveUrlProperties(bool initRootPath)
 
 void QStorageInfoPrivate::retrieveLabel()
 {
-#if !defined(Q_OS_IOS)
-    // deprecated since 10.8
-    FSRef ref;
-    FSPathMakeRef(reinterpret_cast<const UInt8*>(QFile::encodeName(rootPath).constData()),
-                  &ref,
-                  Q_NULLPTR);
-
-    // deprecated since 10.8
-    FSCatalogInfo catalogInfo;
-    OSErr error;
-    error = FSGetCatalogInfo(&ref, kFSCatInfoVolume, &catalogInfo, Q_NULLPTR, Q_NULLPTR, Q_NULLPTR);
-    if (error != noErr)
+    QCFString path = CFStringCreateWithFileSystemRepresentation(0,
+        QFile::encodeName(rootPath).constData());
+    if (!path)
         return;
 
-    // deprecated (use CFURLCopyResourcePropertiesForKeys for 10.7 and higher)
-    HFSUniStr255 volumeName;
-    error = FSGetVolumeInfo(catalogInfo.volume,
-                            0,
-                            Q_NULLPTR,
-                            kFSVolInfoFSInfo,
-                            Q_NULLPTR,
-                            &volumeName,
-                            Q_NULLPTR);
-    if (error == noErr)
-        name = QCFString(FSCreateStringFromHFSUniStr(Q_NULLPTR, &volumeName));
-#endif
+    QCFType<CFURLRef> url = CFURLCreateWithFileSystemPath(0, path, kCFURLPOSIXPathStyle, true);
+    if (!url)
+        return;
+
+    QCFType<CFURLRef> volumeUrl;
+    if (!CFURLCopyResourcePropertyForKey(url, kCFURLVolumeURLKey, &volumeUrl, NULL))
+        return;
+
+    QCFString volumeName;
+    if (!CFURLCopyResourcePropertyForKey(url, kCFURLNameKey, &volumeName, NULL))
+        return;
+
+    name = volumeName;
 }
 
 QList<QStorageInfo> QStorageInfoPrivate::mountedVolumes()
diff --git a/src/corelib/io/qstorageinfo_unix.cpp b/src/corelib/io/qstorageinfo_unix.cpp
index 83c52dbf2c..54a2855239 100644
--- a/src/corelib/io/qstorageinfo_unix.cpp
+++ b/src/corelib/io/qstorageinfo_unix.cpp
@@ -507,9 +507,9 @@ void QStorageInfoPrivate::retrieveVolumeInfo()
         valid = true;
         ready = true;
 
-        bytesTotal = statfs_buf.f_blocks * statfs_buf.f_bsize;
-        bytesFree = statfs_buf.f_bfree * statfs_buf.f_bsize;
-        bytesAvailable = statfs_buf.f_bavail * statfs_buf.f_bsize;
+        bytesTotal = statfs_buf.f_blocks * statfs_buf.f_frsize;
+        bytesFree = statfs_buf.f_bfree * statfs_buf.f_frsize;
+        bytesAvailable = statfs_buf.f_bavail * statfs_buf.f_frsize;
         blockSize = statfs_buf.f_bsize;
 #if defined(Q_OS_ANDROID) || defined (Q_OS_BSD4)
 #if defined(_STATFS_F_FLAGS)
diff --git a/src/corelib/io/qtextstream.cpp b/src/corelib/io/qtextstream.cpp
index 8ad1c2852c..ca3be9b7e0 100644
--- a/src/corelib/io/qtextstream.cpp
+++ b/src/corelib/io/qtextstream.cpp
@@ -121,7 +121,7 @@ static const int QTEXTSTREAM_BUFFERSIZE = 16384;
     digits of the generated number. Some extra number formatting
     options are also available through setNumberFlags().
 
-    \keyword QTextStream manipulators
+    \target QTextStream manipulators
 
     Like \c <iostream> in the standard C++ library, QTextStream also
     defines several global manipulator functions:
@@ -2800,7 +2800,7 @@ QTextStream &scientific(QTextStream &stream)
     Calls QTextStream::setFieldAlignment(QTextStream::AlignLeft)
     on \a stream and returns \a stream.
 
-    \sa right(), center(), {QTextStream manipulators}
+    \sa {QTextStream::}{right()}, {QTextStream::}{center()}, {QTextStream manipulators}
 */
 QTextStream &left(QTextStream &stream)
 {
@@ -2814,7 +2814,7 @@ QTextStream &left(QTextStream &stream)
     Calls QTextStream::setFieldAlignment(QTextStream::AlignRight)
     on \a stream and returns \a stream.
 
-    \sa left(), center(), {QTextStream manipulators}
+    \sa {QTextStream::}{left()}, {QTextStream::}{center()}, {QTextStream manipulators}
 */
 QTextStream &right(QTextStream &stream)
 {
@@ -2828,7 +2828,7 @@ QTextStream &right(QTextStream &stream)
     Calls QTextStream::setFieldAlignment(QTextStream::AlignCenter)
     on \a stream and returns \a stream.
 
-    \sa left(), right(), {QTextStream manipulators}
+    \sa {QTextStream::}{left()}, {QTextStream::}{right()}, {QTextStream manipulators}
 */
 QTextStream &center(QTextStream &stream)
 {
diff --git a/src/corelib/io/qurlidna.cpp b/src/corelib/io/qurlidna.cpp
index f9a0acf41a..46553d38a5 100644
--- a/src/corelib/io/qurlidna.cpp
+++ b/src/corelib/io/qurlidna.cpp
@@ -1503,7 +1503,7 @@ static bool isMappedToNothing(uint uc)
 static bool containsProhibitedOuptut(const QString *str, int from)
 {
     const ushort *in = reinterpret_cast<const ushort *>(str->begin() + from);
-    const ushort *end = (ushort *)str->data() + str->size();
+    const ushort *end = (const ushort *)str->data() + str->size();
     for ( ; in < end; ++in) {
         uint uc = *in;
         if (QChar(uc).isHighSurrogate() && in < end - 1) {
diff --git a/src/corelib/io/qwindowspipewriter.cpp b/src/corelib/io/qwindowspipewriter.cpp
index add2ac94da..57053f129a 100644
--- a/src/corelib/io/qwindowspipewriter.cpp
+++ b/src/corelib/io/qwindowspipewriter.cpp
@@ -85,7 +85,7 @@ qint64 QWindowsPipeWriter::write(const char *ptr, qint64 maxlen)
         return -1;
 
     QMutexLocker locker(&lock);
-    data.append(QByteArray(ptr, maxlen));
+    data.append(ptr, maxlen);
     waitCondition.wakeOne();
     return maxlen;
 }