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

Conflicts:
	qmake/doc/snippets/code/doc_src_qmake-manual.pro
	qmake/doc/src/qmake-manual.qdoc
	src/corelib/io/qstorageinfo_unix.cpp
	src/corelib/tools/qbytearray.cpp
	src/widgets/kernel/qwidgetwindow.cpp
	tests/auto/corelib/io/qprocess/tst_qprocess.cpp
	tests/auto/corelib/mimetypes/qmimedatabase/tst_qmimedatabase.cpp
	tests/auto/network/access/qnetworkreply/BLACKLIST

Change-Id: I9efcd7e1cce1c394eed425c43aa6fce7d2edf31c

5 files changed, 41 insertions, 24 deletions

diff --git a/src/corelib/tools/qchar.cpp b/src/corelib/tools/qchar.cpp
index e6c246e8e6..5469eee14d 100644
--- a/src/corelib/tools/qchar.cpp
+++ b/src/corelib/tools/qchar.cpp
@@ -598,12 +598,22 @@ QT_BEGIN_NAMESPACE
     \fn QChar::QChar(char ch)
 
     Constructs a QChar corresponding to ASCII/Latin-1 character \a ch.
+
+    \note This constructor is not available when \c QT_NO_CAST_FROM_ASCII
+    is defined.
+
+    \sa QT_NO_CAST_FROM_ASCII
 */
 
 /*!
     \fn QChar::QChar(uchar ch)
 
     Constructs a QChar corresponding to ASCII/Latin-1 character \a ch.
+
+    \note This constructor is not available when \c QT_NO_CAST_FROM_ASCII
+    is defined.
+
+    \sa QT_NO_CAST_FROM_ASCII
 */
 
 /*!
diff --git a/src/corelib/tools/qdatetime.cpp b/src/corelib/tools/qdatetime.cpp
index e445055e1d..eb4eff32b4 100644
--- a/src/corelib/tools/qdatetime.cpp
+++ b/src/corelib/tools/qdatetime.cpp
@@ -1681,6 +1681,7 @@ bool QTime::setHMS(int h, int m, int s, int ms)
 
 QTime QTime::addSecs(int s) const
 {
+    s %= SECS_PER_DAY;
     return addMSecs(s * 1000);
 }
 
diff --git a/src/corelib/tools/qelapsedtimer_mac.cpp b/src/corelib/tools/qelapsedtimer_mac.cpp
index a355bf03e8..e946ac096f 100644
--- a/src/corelib/tools/qelapsedtimer_mac.cpp
+++ b/src/corelib/tools/qelapsedtimer_mac.cpp
@@ -59,8 +59,13 @@ static qint64 absoluteToNSecs(qint64 cpuTime)
 {
     if (info.denom == 0)
         mach_timebase_info(&info);
+#ifdef __LP64__
+    __uint128_t nsecs = static_cast<__uint128_t>(cpuTime) * info.numer / info.denom;
+    return static_cast<qint64>(nsecs);
+#else
     qint64 nsecs = cpuTime * info.numer / info.denom;
     return nsecs;
+#endif
 }
 
 static qint64 absoluteToMSecs(qint64 cpuTime)
diff --git a/src/corelib/tools/qregexp.cpp b/src/corelib/tools/qregexp.cpp
index 8000dc8688..c52e4b5a7c 100644
--- a/src/corelib/tools/qregexp.cpp
+++ b/src/corelib/tools/qregexp.cpp
@@ -116,6 +116,10 @@ int qFindString(const QChar *haystack, int haystackLen, int from,
     A good text on regexps is \e {Mastering Regular Expressions}
     (Third Edition) by Jeffrey E. F.  Friedl, ISBN 0-596-52812-4.
 
+    \note In Qt 5, the new QRegularExpression class provides a Perl
+    compatible implementation of regular expressions and is recommended
+    in place of QRegExp.
+
     \tableofcontents
 
     \section1 Introduction
diff --git a/src/corelib/tools/qregularexpression.cpp b/src/corelib/tools/qregularexpression.cpp
index 88a048d826..d8b0bf6e9f 100644
--- a/src/corelib/tools/qregularexpression.cpp
+++ b/src/corelib/tools/qregularexpression.cpp
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Giuseppe D'Angelo <dangelog@gmail.com>.
-** Copyright (C) 2012 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.com, author Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
+** Copyright (C) 2015 Giuseppe D'Angelo <dangelog@gmail.com>.
+** Copyright (C) 2015 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.com, author Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
 ** Copyright (C) 2015 The Qt Company Ltd.
 ** Contact: http://www.qt.io/licensing/
 **
@@ -1326,48 +1326,45 @@ QRegularExpressionMatchPrivate *QRegularExpressionPrivate::doMatch(const QString
     int * const captureOffsets = priv->capturedOffsets.data();
     const int captureOffsetsCount = priv->capturedOffsets.size();
 
-    int realOffset = offset + subjectStart;
-    const int realSubjectLength = subjectLength + subjectStart;
-
-    const unsigned short * const subjectUtf16 = subject.utf16();
+    const unsigned short * const subjectUtf16 = subject.utf16() + subjectStart;
 
     int result;
 
     if (!previousMatchWasEmpty) {
         result = pcre16SafeExec(compiledPattern, currentStudyData,
-                                subjectUtf16, realSubjectLength,
-                                realOffset, pcreOptions,
+                                subjectUtf16, subjectLength,
+                                offset, pcreOptions,
                                 captureOffsets, captureOffsetsCount);
     } else {
         result = pcre16SafeExec(compiledPattern, currentStudyData,
-                                subjectUtf16, realSubjectLength,
-                                realOffset, pcreOptions | PCRE_NOTEMPTY_ATSTART | PCRE_ANCHORED,
+                                subjectUtf16, subjectLength,
+                                offset, pcreOptions | PCRE_NOTEMPTY_ATSTART | PCRE_ANCHORED,
                                 captureOffsets, captureOffsetsCount);
 
         if (result == PCRE_ERROR_NOMATCH) {
-            ++realOffset;
+            ++offset;
 
             if (usingCrLfNewlines
-                    && realOffset < realSubjectLength
-                    && subjectUtf16[realOffset - 1] == QLatin1Char('\r')
-                    && subjectUtf16[realOffset] == QLatin1Char('\n')) {
-                ++realOffset;
-            } else if (realOffset < realSubjectLength
-                       && QChar::isLowSurrogate(subjectUtf16[realOffset])) {
-                ++realOffset;
+                    && offset < subjectLength
+                    && subjectUtf16[offset - 1] == QLatin1Char('\r')
+                    && subjectUtf16[offset] == QLatin1Char('\n')) {
+                ++offset;
+            } else if (offset < subjectLength
+                       && QChar::isLowSurrogate(subjectUtf16[offset])) {
+                ++offset;
             }
 
             result = pcre16SafeExec(compiledPattern, currentStudyData,
-                                    subjectUtf16, realSubjectLength,
-                                    realOffset, pcreOptions,
+                                    subjectUtf16, subjectLength,
+                                    offset, pcreOptions,
                                     captureOffsets, captureOffsetsCount);
         }
     }
 
 #ifdef QREGULAREXPRESSION_DEBUG
     qDebug() << "Matching" <<  pattern << "against" << subject
-             << "starting at" << subjectStart << "len" << subjectLength << "real len" << realSubjectLength
-             << "offset" << offset << "real offset" << realOffset
+             << "starting at" << subjectStart << "len" << subjectLength
+             << "offset" << offset
              << matchType << matchOptions << previousMatchWasEmpty
              << "result" << result;
 #endif
@@ -2057,7 +2054,7 @@ QString QRegularExpressionMatch::captured(int nth) const
     if (start == -1) // didn't capture
         return QString();
 
-    return d->subject.mid(start, capturedLength(nth));
+    return d->subject.mid(start + d->subjectStart, capturedLength(nth));
 }
 
 /*!
@@ -2078,7 +2075,7 @@ QStringRef QRegularExpressionMatch::capturedRef(int nth) const
     if (start == -1) // didn't capture
         return QStringRef();
 
-    return d->subject.midRef(start, capturedLength(nth));
+    return d->subject.midRef(start + d->subjectStart, capturedLength(nth));
 }
 
 /*!