Merge remote-tracking branch 'gerrit/release' into stable

Conflicts:
	configure
	mkspecs/features/qt_module_headers.prf
	mkspecs/features/qt_tool.prf
	src/angle/angle.pro
	src/tools/bootstrap/bootstrap.pro
	tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp

Change-Id: Ide5759fe419a50f1c944211a48f7c66f662684e0

11 files changed, 200 insertions, 161 deletions

diff --git a/src/angle/angle.pro b/src/angle/angle.pro
index 371e39868f..721caf880a 100644
--- a/src/angle/angle.pro
+++ b/src/angle/angle.pro
@@ -6,5 +6,5 @@ SUBDIRS += src
 #  2) If we made a 'QtANGLE' module, the include directory would be flattened which won't work since
 #     we need to support "#include <GLES2/gl2.h>"
 CONFIG += minimal_syncqt
-QMAKE_SYNCQT_OPTIONS = -module KHR -module EGL -module GLES2
+QMAKE_SYNCQT_OPTIONS = -module KHR -module EGL -module GLES2 -version none
 load(qt_module_headers)
diff --git a/src/corelib/kernel/qvariant.cpp b/src/corelib/kernel/qvariant.cpp
index ed1a8a4974..c1bb460e7b 100644
--- a/src/corelib/kernel/qvariant.cpp
+++ b/src/corelib/kernel/qvariant.cpp
@@ -1940,9 +1940,10 @@ inline T qVariantToHelper(const QVariant::Private &d, const HandlersManager &han
 /*!
     \fn QStringList QVariant::toStringList() const
 
-    Returns the variant as a QStringList if the variant has type()
-    StringList, \l String, or \l List of a type that can be converted
-    to QString; otherwise returns an empty list.
+    Returns the variant as a QStringList if the variant has userType()
+    \l QMetaType::QStringList, \l QMetaType::QString, or
+    \l QMetaType::QVariantList of a type that can be converted to QString;
+    otherwise returns an empty list.
 
     \sa canConvert(), convert()
 */
@@ -1952,10 +1953,12 @@ QStringList QVariant::toStringList() const
 }
 
 /*!
-    Returns the variant as a QString if the variant has type() \l
-    String, \l Bool, \l ByteArray, \l Char, \l Date, \l DateTime, \l
-    Double, \l Int, \l LongLong, \l StringList, \l Time, \l UInt, or
-    \l ULongLong; otherwise returns an empty string.
+    Returns the variant as a QString if the variant has userType() \l
+    QMetaType::QString, \l QMetaType::Bool, \l QMetaType::QByteArray,
+    \l QMetaType::QChar, \l QMetaType::QDate, \l QMetaType::QDateTime,
+    \l QMetaType::Double, \l QMetaType::Int, \l QMetaType::LongLong,
+    \l QMetaType::QStringList, \l QMetaType::QTime, \l QMetaType::UInt, or
+    \l QMetaType::ULongLong; otherwise returns an empty string.
 
     \sa canConvert(), convert()
 */
@@ -1966,7 +1969,7 @@ QString QVariant::toString() const
 
 /*!
     Returns the variant as a QMap<QString, QVariant> if the variant
-    has type() \l Map; otherwise returns an empty map.
+    has type() \l QMetaType::QVariantMap; otherwise returns an empty map.
 
     \sa canConvert(), convert()
 */
@@ -1977,7 +1980,7 @@ QVariantMap QVariant::toMap() const
 
 /*!
     Returns the variant as a QHash<QString, QVariant> if the variant
-    has type() \l Hash; otherwise returns an empty map.
+    has type() \l QMetaType::QVariantHash; otherwise returns an empty map.
 
     \sa canConvert(), convert()
 */
@@ -1989,11 +1992,12 @@ QVariantHash QVariant::toHash() const
 /*!
     \fn QDate QVariant::toDate() const
 
-    Returns the variant as a QDate if the variant has type() \l Date,
-    \l DateTime, or \l String; otherwise returns an invalid date.
+    Returns the variant as a QDate if the variant has userType()
+    \l QMetaType::QDate, \l QMetaType::QDateTime, or \l QMetaType::QString;
+    otherwise returns an invalid date.
 
-    If the type() is \l String, an invalid date will be returned if the
-    string cannot be parsed as a Qt::ISODate format date.
+    If the type() is \l QMetaType::QString, an invalid date will be returned if
+    the string cannot be parsed as a Qt::ISODate format date.
 
     \sa canConvert(), convert()
 */
@@ -2005,10 +2009,11 @@ QDate QVariant::toDate() const
 /*!
     \fn QTime QVariant::toTime() const
 
-    Returns the variant as a QTime if the variant has type() \l Time,
-    \l DateTime, or \l String; otherwise returns an invalid time.
+    Returns the variant as a QTime if the variant has userType()
+    \l QMetaType::QTime, \l QMetaType::QDateTime, or \l QMetaType::QString;
+    otherwise returns an invalid time.
 
-    If the type() is \l String, an invalid time will be returned if
+    If the type() is \l QMetaType::QString, an invalid time will be returned if
     the string cannot be parsed as a Qt::ISODate format time.
 
     \sa canConvert(), convert()
@@ -2021,12 +2026,12 @@ QTime QVariant::toTime() const
 /*!
     \fn QDateTime QVariant::toDateTime() const
 
-    Returns the variant as a QDateTime if the variant has type() \l
-    DateTime, \l Date, or \l String; otherwise returns an invalid
-    date/time.
+    Returns the variant as a QDateTime if the variant has userType()
+    \l QMetaType::QDateTime, \l QMetaType::QDate, or \l QMetaType::QString;
+    otherwise returns an invalid date/time.
 
-    If the type() is \l String, an invalid date/time will be returned
-    if the string cannot be parsed as a Qt::ISODate format date/time.
+    If the type() is \l QMetaType::QString, an invalid date/time will be
+    returned if the string cannot be parsed as a Qt::ISODate format date/time.
 
     \sa canConvert(), convert()
 */
@@ -2039,8 +2044,8 @@ QDateTime QVariant::toDateTime() const
     \since 4.7
     \fn QEasingCurve QVariant::toEasingCurve() const
 
-    Returns the variant as a QEasingCurve if the variant has type() \l
-    EasingCurve; otherwise returns a default easing curve.
+    Returns the variant as a QEasingCurve if the variant has userType()
+    \l QMetaType::QEasingCurve; otherwise returns a default easing curve.
 
     \sa canConvert(), convert()
 */
@@ -2054,9 +2059,9 @@ QEasingCurve QVariant::toEasingCurve() const
 /*!
     \fn QByteArray QVariant::toByteArray() const
 
-    Returns the variant as a QByteArray if the variant has type() \l
-    ByteArray or \l String (converted using QString::fromUtf8());
-    otherwise returns an empty byte array.
+    Returns the variant as a QByteArray if the variant has userType()
+    \l QMetaType::QByteArray or \l QMetaType::QString (converted using
+    QString::fromUtf8()); otherwise returns an empty byte array.
 
     \sa canConvert(), convert()
 */
@@ -2069,8 +2074,9 @@ QByteArray QVariant::toByteArray() const
 /*!
     \fn QPoint QVariant::toPoint() const
 
-    Returns the variant as a QPoint if the variant has type()
-    \l Point or \l PointF; otherwise returns a null QPoint.
+    Returns the variant as a QPoint if the variant has userType()
+    \l QMetaType::QPointF or \l QMetaType::QPointF; otherwise returns a null
+    QPoint.
 
     \sa canConvert(), convert()
 */
@@ -2082,8 +2088,8 @@ QPoint QVariant::toPoint() const
 /*!
     \fn QRect QVariant::toRect() const
 
-    Returns the variant as a QRect if the variant has type() \l Rect;
-    otherwise returns an invalid QRect.
+    Returns the variant as a QRect if the variant has userType()
+    \l QMetaType::QRect; otherwise returns an invalid QRect.
 
     \sa canConvert(), convert()
 */
@@ -2095,8 +2101,8 @@ QRect QVariant::toRect() const
 /*!
     \fn QSize QVariant::toSize() const
 
-    Returns the variant as a QSize if the variant has type() \l Size;
-    otherwise returns an invalid QSize.
+    Returns the variant as a QSize if the variant has userType()
+    \l QMetaType::QSize; otherwise returns an invalid QSize.
 
     \sa canConvert(), convert()
 */
@@ -2108,8 +2114,8 @@ QSize QVariant::toSize() const
 /*!
     \fn QSizeF QVariant::toSizeF() const
 
-    Returns the variant as a QSizeF if the variant has type() \l
-    SizeF; otherwise returns an invalid QSizeF.
+    Returns the variant as a QSizeF if the variant has userType() \l
+    QMetaType::QSizeF; otherwise returns an invalid QSizeF.
 
     \sa canConvert(), convert()
 */
@@ -2121,8 +2127,9 @@ QSizeF QVariant::toSizeF() const
 /*!
     \fn QRectF QVariant::toRectF() const
 
-    Returns the variant as a QRectF if the variant has type() \l Rect
-    or \l RectF; otherwise returns an invalid QRectF.
+    Returns the variant as a QRectF if the variant has userType()
+    \l QMetaType::QRect or \l QMetaType::QRectF; otherwise returns an invalid
+    QRectF.
 
     \sa canConvert(), convert()
 */
@@ -2134,8 +2141,8 @@ QRectF QVariant::toRectF() const
 /*!
     \fn QLineF QVariant::toLineF() const
 
-    Returns the variant as a QLineF if the variant has type() \l
-    LineF; otherwise returns an invalid QLineF.
+    Returns the variant as a QLineF if the variant has userType()
+    \l QMetaType::QLineF; otherwise returns an invalid QLineF.
 
     \sa canConvert(), convert()
 */
@@ -2147,8 +2154,8 @@ QLineF QVariant::toLineF() const
 /*!
     \fn QLine QVariant::toLine() const
 
-    Returns the variant as a QLine if the variant has type() \l Line;
-    otherwise returns an invalid QLine.
+    Returns the variant as a QLine if the variant has userType()
+    \l QMetaType::QLine; otherwise returns an invalid QLine.
 
     \sa canConvert(), convert()
 */
@@ -2160,8 +2167,9 @@ QLine QVariant::toLine() const
 /*!
     \fn QPointF QVariant::toPointF() const
 
-    Returns the variant as a QPointF if the variant has type() \l
-    Point or \l PointF; otherwise returns a null QPointF.
+    Returns the variant as a QPointF if the variant has userType() \l
+    QMetaType::QPoint or \l QMetaType::QPointF; otherwise returns a null
+    QPointF.
 
     \sa canConvert(), convert()
 */
@@ -2176,8 +2184,8 @@ QPointF QVariant::toPointF() const
 /*!
     \fn QUrl QVariant::toUrl() const
 
-    Returns the variant as a QUrl if the variant has type()
-    \l Url; otherwise returns an invalid QUrl.
+    Returns the variant as a QUrl if the variant has userType()
+    \l QMetaType::QUrl; otherwise returns an invalid QUrl.
 
     \sa canConvert(), convert()
 */
@@ -2190,8 +2198,8 @@ QUrl QVariant::toUrl() const
 /*!
     \fn QLocale QVariant::toLocale() const
 
-    Returns the variant as a QLocale if the variant has type()
-    \l Locale; otherwise returns an invalid QLocale.
+    Returns the variant as a QLocale if the variant has userType()
+    \l QMetaType::QLocale; otherwise returns an invalid QLocale.
 
     \sa canConvert(), convert()
 */
@@ -2204,8 +2212,8 @@ QLocale QVariant::toLocale() const
     \fn QRegExp QVariant::toRegExp() const
     \since 4.1
 
-    Returns the variant as a QRegExp if the variant has type() \l
-    RegExp; otherwise returns an empty QRegExp.
+    Returns the variant as a QRegExp if the variant has userType()
+    \l QMetaType::QRegExp; otherwise returns an empty QRegExp.
 
     \sa canConvert(), convert()
 */
@@ -2221,7 +2229,7 @@ QRegExp QVariant::toRegExp() const
     \fn QRegularExpression QVariant::toRegularExpression() const
     \since 5.0
 
-    Returns the variant as a QRegularExpression if the variant has type() \l
+    Returns the variant as a QRegularExpression if the variant has userType() \l
     QRegularExpression; otherwise returns an empty QRegularExpression.
 
     \sa canConvert(), convert()
@@ -2236,7 +2244,7 @@ QRegularExpression QVariant::toRegularExpression() const
 /*!
     \since 5.0
 
-    Returns the variant as a QUuid if the variant has type() \l
+    Returns the variant as a QUuid if the variant has userType() \l
     QUuid; otherwise returns a default constructed QUuid.
 
     \sa canConvert(), convert()
@@ -2249,7 +2257,7 @@ QUuid QVariant::toUuid() const
 /*!
     \since 5.0
 
-    Returns the variant as a QModelIndex if the variant has type() \l
+    Returns the variant as a QModelIndex if the variant has userType() \l
     QModelIndex; otherwise returns a default constructed QModelIndex.
 
     \sa canConvert(), convert()
@@ -2262,7 +2270,7 @@ QModelIndex QVariant::toModelIndex() const
 /*!
     \since 5.0
 
-    Returns the variant as a QJsonValue if the variant has type() \l
+    Returns the variant as a QJsonValue if the variant has userType() \l
     QJsonValue; otherwise returns a default constructed QJsonValue.
 
     \sa canConvert(), convert()
@@ -2275,7 +2283,7 @@ QJsonValue QVariant::toJsonValue() const
 /*!
     \since 5.0
 
-    Returns the variant as a QJsonObject if the variant has type() \l
+    Returns the variant as a QJsonObject if the variant has userType() \l
     QJsonObject; otherwise returns a default constructed QJsonObject.
 
     \sa canConvert(), convert()
@@ -2288,7 +2296,7 @@ QJsonObject QVariant::toJsonObject() const
 /*!
     \since 5.0
 
-    Returns the variant as a QJsonArray if the variant has type() \l
+    Returns the variant as a QJsonArray if the variant has userType() \l
     QJsonArray; otherwise returns a default constructed QJsonArray.
 
     \sa canConvert(), convert()
@@ -2301,7 +2309,7 @@ QJsonArray QVariant::toJsonArray() const
 /*!
     \since 5.0
 
-    Returns the variant as a QJsonDocument if the variant has type() \l
+    Returns the variant as a QJsonDocument if the variant has userType() \l
     QJsonDocument; otherwise returns a default constructed QJsonDocument.
 
     \sa canConvert(), convert()
@@ -2315,8 +2323,9 @@ QJsonDocument QVariant::toJsonDocument() const
 /*!
     \fn QChar QVariant::toChar() const
 
-    Returns the variant as a QChar if the variant has type() \l Char,
-    \l Int, or \l UInt; otherwise returns an invalid QChar.
+    Returns the variant as a QChar if the variant has userType()
+    \l QMetaType::QChar, \l QMetaType::Int, or \l QMetaType::UInt; otherwise
+    returns an invalid QChar.
 
     \sa canConvert(), convert()
 */
@@ -2326,8 +2335,8 @@ QChar QVariant::toChar() const
 }
 
 /*!
-    Returns the variant as a QBitArray if the variant has type()
-    \l BitArray; otherwise returns an empty bit array.
+    Returns the variant as a QBitArray if the variant has userType()
+    \l QMetaType::QBitArray; otherwise returns an empty bit array.
 
     \sa canConvert(), convert()
 */
@@ -2353,16 +2362,19 @@ inline T qNumVariantToHelper(const QVariant::Private &d,
 }
 
 /*!
-    Returns the variant as an int if the variant has type() \l Int,
-    \l Bool, \l ByteArray, \l Char, \l Double, \l LongLong, \l
-    String, \l UInt, or \l ULongLong; otherwise returns 0.
+    Returns the variant as an int if the variant has userType()
+    \l QMetaType::Int, \l QMetaType::Bool, \l QMetaType::QByteArray,
+    \l QMetaType::QChar, \l QMetaType::Double, \l QMetaType::LongLong,
+    \l QMetaType::QString, \l QMetaType::UInt, or \l QMetaType::ULongLong;
+    otherwise returns 0.
 
     If \a ok is non-null: \c{*}\a{ok} is set to true if the value could be
     converted to an int; otherwise \c{*}\a{ok} is set to false.
 
-    \b{Warning:} If the value is convertible to a \l LongLong but is too
-    large to be represented in an int, the resulting arithmetic overflow will
-    not be reflected in \a ok. A simple workaround is to use QString::toInt().
+    \b{Warning:} If the value is convertible to a \l QMetaType::LongLong but is
+    too large to be represented in an int, the resulting arithmetic overflow
+    will not be reflected in \a ok. A simple workaround is to use
+    QString::toInt().
 
     \sa canConvert(), convert()
 */
@@ -2372,16 +2384,19 @@ int QVariant::toInt(bool *ok) const
 }
 
 /*!
-    Returns the variant as an unsigned int if the variant has type()
-    \l UInt,  \l Bool, \l ByteArray, \l Char, \l Double, \l Int, \l
-    LongLong, \l String, or \l ULongLong; otherwise returns 0.
+    Returns the variant as an unsigned int if the variant has userType()
+    \l QMetaType::UInt, \l QMetaType::Bool, \l QMetaType::QByteArray,
+    \l QMetaType::QChar, \l QMetaType::Double, \l QMetaType::Int,
+    \l QMetaType::LongLong, \l QMetaType::QString, or \l QMetaType::ULongLong;
+    otherwise returns 0.
 
     If \a ok is non-null: \c{*}\a{ok} is set to true if the value could be
     converted to an unsigned int; otherwise \c{*}\a{ok} is set to false.
 
-    \b{Warning:} If the value is convertible to a \l ULongLong but is too
-    large to be represented in an unsigned int, the resulting arithmetic overflow will
-    not be reflected in \a ok. A simple workaround is to use QString::toUInt().
+    \b{Warning:} If the value is convertible to a \l QMetaType::ULongLong but is
+    too large to be represented in an unsigned int, the resulting arithmetic
+    overflow will not be reflected in \a ok. A simple workaround is to use
+    QString::toUInt().
 
     \sa canConvert(), convert()
 */
@@ -2391,9 +2406,11 @@ uint QVariant::toUInt(bool *ok) const
 }
 
 /*!
-    Returns the variant as a long long int if the variant has type()
-    \l LongLong, \l Bool, \l ByteArray, \l Char, \l Double, \l Int,
-    \l String, \l UInt, or \l ULongLong; otherwise returns 0.
+    Returns the variant as a long long int if the variant has userType()
+    \l QMetaType::LongLong, \l QMetaType::Bool, \l QMetaType::QByteArray,
+    \l QMetaType::QChar, \l QMetaType::Double, \l QMetaType::Int,
+    \l QMetaType::QString, \l QMetaType::UInt, or \l QMetaType::ULongLong;
+    otherwise returns 0.
 
     If \a ok is non-null: \c{*}\c{ok} is set to true if the value could be
     converted to an int; otherwise \c{*}\c{ok} is set to false.
@@ -2407,9 +2424,10 @@ qlonglong QVariant::toLongLong(bool *ok) const
 
 /*!
     Returns the variant as as an unsigned long long int if the
-    variant has type() \l ULongLong, \l Bool, \l ByteArray, \l Char,
-    \l Double, \l Int, \l LongLong, \l String, or \l UInt; otherwise
-    returns 0.
+    variant has type() \l QMetaType::ULongLong, \l QMetaType::Bool,
+    \l QMetaType::QByteArray, \l QMetaType::QChar, \l QMetaType::Double,
+    \l QMetaType::Int, \l QMetaType::LongLong, \l QMetaType::QString, or
+    \l QMetaType::UInt; otherwise returns 0.
 
     If \a ok is non-null: \c{*}\a{ok} is set to true if the value could be
     converted to an int; otherwise \c{*}\a{ok} is set to false.
@@ -2422,13 +2440,14 @@ qulonglong QVariant::toULongLong(bool *ok) const
 }
 
 /*!
-    Returns the variant as a bool if the variant has type() Bool.
+    Returns the variant as a bool if the variant has userType() Bool.
 
-    Returns true if the variant has type() \l Bool, \l Char, \l Double,
-    \l Int, \l LongLong, \l UInt, or \l ULongLong and the value is
-    non-zero, or if the variant has type \l String or \l ByteArray and
-    its lower-case content is not one of the following: empty, "0"
-    or "false"; otherwise returns false.
+    Returns true if the variant has userType() \l QMetaType::Bool,
+    \l QMetaType::QChar, \l QMetaType::Double, \l QMetaType::Int,
+    \l QMetaType::LongLong, \l QMetaType::UInt, or \l QMetaType::ULongLong and
+    the value is non-zero, or if the variant has type \l QMetaType::QString or
+    \l QMetaType::QByteArray and its lower-case content is not one of the
+    following: empty, "0" or "false"; otherwise returns false.
 
     \sa canConvert(), convert()
 */
@@ -2444,9 +2463,11 @@ bool QVariant::toBool() const
 }
 
 /*!
-    Returns the variant as a double if the variant has type() \l
-    Double, \l QMetaType::Float, \l Bool, \l ByteArray, \l Int, \l LongLong, \l String, \l
-    UInt, or \l ULongLong; otherwise returns 0.0.
+    Returns the variant as a double if the variant has userType()
+    \l QMetaType::Double, \l QMetaType::Float, \l QMetaType::Bool,
+    \l QMetaType::QByteArray, \l QMetaType::Int, \l QMetaType::LongLong,
+    \l QMetaType::QString, \l QMetaType::UInt, or \l QMetaType::ULongLong;
+    otherwise returns 0.0.
 
     If \a ok is non-null: \c{*}\a{ok} is set to true if the value could be
     converted to a double; otherwise \c{*}\a{ok} is set to false.
@@ -2459,9 +2480,11 @@ double QVariant::toDouble(bool *ok) const
 }
 
 /*!
-    Returns the variant as a float if the variant has type() \l
-    Double, \l QMetaType::Float, \l Bool, \l ByteArray, \l Int, \l LongLong, \l String, \l
-    UInt, or \l ULongLong; otherwise returns 0.0.
+    Returns the variant as a float if the variant has userType()
+    \l QMetaType::Double, \l QMetaType::Float, \l QMetaType::Bool,
+    \l QMetaType::QByteArray, \l QMetaType::Int, \l QMetaType::LongLong,
+    \l QMetaType::QString, \l QMetaType::UInt, or \l QMetaType::ULongLong;
+    otherwise returns 0.0.
 
     \since 4.6
 
@@ -2476,9 +2499,11 @@ float QVariant::toFloat(bool *ok) const
 }
 
 /*!
-    Returns the variant as a qreal if the variant has type() \l
-    Double, \l QMetaType::Float, \l Bool, \l ByteArray, \l Int, \l LongLong, \l String, \l
-    UInt, or \l ULongLong; otherwise returns 0.0.
+    Returns the variant as a qreal if the variant has userType()
+    \l QMetaType::Double, \l QMetaType::Float, \l QMetaType::Bool,
+    \l QMetaType::QByteArray, \l QMetaType::Int, \l QMetaType::LongLong,
+    \l QMetaType::QString, \l QMetaType::UInt, or \l QMetaType::ULongLong;
+    otherwise returns 0.0.
 
     \since 4.6
 
@@ -2493,8 +2518,9 @@ qreal QVariant::toReal(bool *ok) const
 }
 
 /*!
-    Returns the variant as a QVariantList if the variant has type()
-    \l List or \l StringList; otherwise returns an empty list.
+    Returns the variant as a QVariantList if the variant has userType()
+    \l QMetaType::QVariantList or \l QMetaType::QStringList; otherwise returns
+    an empty list.
 
     \sa canConvert(), convert()
 */
@@ -2633,27 +2659,51 @@ static bool canConvertMetaObject(int fromId, int toId, QObject *fromObject)
 
     \table
     \header \li Type \li Automatically Cast To
-    \row \li \l Bool \li \l Char, \l Double, \l Int, \l LongLong, \l String, \l UInt, \l ULongLong
-    \row \li \l ByteArray \li \l Double, \l Int, \l LongLong, \l String, \l UInt, \l ULongLong
-    \row \li \l Char \li \l Bool, \l Int, \l UInt, \l LongLong, \l ULongLong
-    \row \li \l Color \li \l String
-    \row \li \l Date \li \l DateTime, \l String
-    \row \li \l DateTime \li \l Date, \l String, \l Time
-    \row \li \l Double \li \l Bool, \l Int, \l LongLong, \l String, \l UInt, \l ULongLong
-    \row \li \l Font \li \l String
-    \row \li \l Int \li \l Bool, \l Char, \l Double, \l LongLong, \l String, \l UInt, \l ULongLong
-    \row \li \l KeySequence \li \l Int, \l String
-    \row \li \l List \li \l StringList (if the list's items can be converted to strings)
-    \row \li \l LongLong \li \l Bool, \l ByteArray, \l Char, \l Double, \l Int, \l String, \l UInt, \l ULongLong
-    \row \li \l Point \li PointF
-    \row \li \l Rect \li RectF
-    \row \li \l String \li \l Bool, \l ByteArray, \l Char, \l Color, \l Date, \l DateTime, \l Double,
-                         \l Font, \l Int, \l KeySequence, \l LongLong, \l StringList, \l Time, \l UInt,
-                         \l ULongLong
-    \row \li \l StringList \li \l List, \l String (if the list contains exactly one item)
-    \row \li \l Time \li \l String
-    \row \li \l UInt \li \l Bool, \l Char, \l Double, \l Int, \l LongLong, \l String, \l ULongLong
-    \row \li \l ULongLong \li \l Bool, \l Char, \l Double, \l Int, \l LongLong, \l String, \l UInt
+    \row \li \l QMetaType::Bool \li \l QMetaType::QChar, \l QMetaType::Double,
+        \l QMetaType::Int, \l QMetaType::LongLong, \l QMetaType::QString,
+        \l QMetaType::UInt, \l QMetaType::ULongLong
+    \row \li \l QMetaType::QByteArray \li \l QMetaType::Double,
+        \l QMetaType::Int, \l QMetaType::LongLong, \l QMetaType::QString,
+        \l QMetaType::UInt, \l QMetaType::ULongLong
+    \row \li \l QMetaType::QChar \li \l QMetaType::Bool, \l QMetaType::Int,
+        \l QMetaType::UInt, \l QMetaType::LongLong, \l QMetaType::ULongLong
+    \row \li \l QMetaType::QColor \li \l QMetaType::QString
+    \row \li \l QMetaType::QDate \li \l QMetaType::QDateTime,
+        \l QMetaType::QString
+    \row \li \l QMetaType::QDateTime \li \l QMetaType::QDate,
+        \l QMetaType::QString, \l QMetaType::QTime
+    \row \li \l QMetaType::Double \li \l QMetaType::Bool, \l QMetaType::Int,
+        \l QMetaType::LongLong, \l QMetaType::QString, \l QMetaType::UInt,
+        \l QMetaType::ULongLong
+    \row \li \l QMetaType::QFont \li \l QMetaType::QString
+    \row \li \l QMetaType::Int \li \l QMetaType::Bool, \l QMetaType::QChar,
+        \l QMetaType::Double, \l QMetaType::LongLong, \l QMetaType::QString,
+        \l QMetaType::UInt, \l QMetaType::ULongLong
+    \row \li \l QMetaType::QKeySequence \li \l QMetaType::Int,
+        \l QMetaType::QString
+    \row \li \l QMetaType::QVariantList \li \l QMetaType::QStringList (if the
+        list's items can be converted to QStrings)
+    \row \li \l QMetaType::LongLong \li \l QMetaType::Bool,
+        \l QMetaType::QByteArray, \l QMetaType::QChar, \l QMetaType::Double,
+        \l QMetaType::Int, \l QMetaType::QString, \l QMetaType::UInt,
+        \l QMetaType::ULongLong
+    \row \li \l QMetaType::QPoint \li QMetaType::QPointF
+    \row \li \l QMetaType::QRect \li QMetaType::QRectF
+    \row \li \l QMetaType::QString \li \l QMetaType::Bool,
+        \l QMetaType::QByteArray, \l QMetaType::QChar, \l QMetaType::QColor,
+        \l QMetaType::QDate, \l QMetaType::QDateTime, \l QMetaType::Double,
+        \l QMetaType::QFont, \l QMetaType::Int, \l QMetaType::QKeySequence,
+        \l QMetaType::LongLong, \l QMetaType::QStringList, \l QMetaType::QTime,
+        \l QMetaType::UInt, \l QMetaType::ULongLong
+    \row \li \l QMetaType::QStringList \li \l QMetaType::QVariantList,
+        \l QMetaType::QString (if the list contains exactly one item)
+    \row \li \l QMetaType::QTime \li \l QMetaType::QString
+    \row \li \l QMetaType::UInt \li \l QMetaType::Bool, \l QMetaType::QChar,
+        \l QMetaType::Double, \l QMetaType::Int, \l QMetaType::LongLong,
+        \l QMetaType::QString, \l QMetaType::ULongLong
+    \row \li \l QMetaType::ULongLong \li \l QMetaType::Bool,
+        \l QMetaType::QChar, \l QMetaType::Double, \l QMetaType::Int,
+        \l QMetaType::LongLong, \l QMetaType::QString, \l QMetaType::UInt
     \endtable
 
     A QVariant containing a pointer to a type derived from QObject will also return true for this
diff --git a/src/corelib/tools/qdatetime.cpp b/src/corelib/tools/qdatetime.cpp
index 31c870b012..07b617ee2e 100644
--- a/src/corelib/tools/qdatetime.cpp
+++ b/src/corelib/tools/qdatetime.cpp
@@ -260,8 +260,7 @@ static QString fmtDateTime(const QString& f, const QTime* dt = 0, const QDate* d
     If the specified date is invalid, the date is not set and
     isValid() returns false.
 
-    \warning Years 0 to 99 are interpreted as is, i.e., years
-             0-99.
+    \warning Years 1 to 99 are interpreted as is. Year 0 is invalid.
 
     \sa isValid()
 */
@@ -1483,10 +1482,7 @@ int QTime::msec() const
 
     If \a format is Qt::ISODate, the string format corresponds to the
     ISO 8601 extended specification for representations of dates,
-    which is also HH:MM:SS. (However, contrary to ISO 8601, dates
-    before 15 October 1582 are handled as Julian dates, not Gregorian
-    dates. See \l{QDate G and J} {Use of Gregorian and Julian
-    Calendars}. This might change in a future version of Qt.)
+    which is also HH:MM:SS.
 
     If the \a format is Qt::SystemLocaleShortDate or
     Qt::SystemLocaleLongDate, the string format depends on the locale
@@ -1555,9 +1551,9 @@ QString QTime::toString(Qt::DateFormat format) const
     \row \li z \li the milliseconds without leading zeroes (0 to 999)
     \row \li zzz \li the milliseconds with leading zeroes (000 to 999)
     \row \li AP or A
-         \li use AM/PM display. \e AP will be replaced by either "AM" or "PM".
+         \li use AM/PM display. \e A/AP will be replaced by either "AM" or "PM".
     \row \li ap or a
-         \li use am/pm display. \e ap will be replaced by either "am" or "pm".
+         \li use am/pm display. \e a/ap will be replaced by either "am" or "pm".
     \row \li t \li the timezone (for example "CEST")
     \endtable
 
@@ -3754,8 +3750,7 @@ static bool hasUnquotedAP(const QString &f)
     for (int i=0; i<max; ++i) {
         if (f.at(i) == quote) {
             inquote = !inquote;
-        } else if (!inquote && f.at(i).toUpper() == QLatin1Char('A')
-            && i + 1 < max && f.at(i + 1).toUpper() == QLatin1Char('P')) {
+        } else if (!inquote && f.at(i).toUpper() == QLatin1Char('A')) {
             return true;
         }
     }
diff --git a/src/corelib/tools/qstring.cpp b/src/corelib/tools/qstring.cpp
index a3f6a0b075..54b1a084b2 100644
--- a/src/corelib/tools/qstring.cpp
+++ b/src/corelib/tools/qstring.cpp
@@ -2953,7 +2953,7 @@ QString& QString::replace(const QRegExp &rx, const QString &after)
 QString &QString::replace(const QRegularExpression &re, const QString &after)
 {
     if (!re.isValid()) {
-        qWarning("QString::replace: invalid QRegularExpresssion object");
+        qWarning("QString::replace: invalid QRegularExpression object");
         return *this;
     }
 
@@ -3278,7 +3278,7 @@ int QString::count(const QRegExp& rx) const
 int QString::indexOf(const QRegularExpression& re, int from) const
 {
     if (!re.isValid()) {
-        qWarning("QString::indexOf: invalid QRegularExpresssion object");
+        qWarning("QString::indexOf: invalid QRegularExpression object");
         return -1;
     }
 
@@ -3304,7 +3304,7 @@ int QString::indexOf(const QRegularExpression& re, int from) const
 int QString::lastIndexOf(const QRegularExpression &re, int from) const
 {
     if (!re.isValid()) {
-        qWarning("QString::lastIndexOf: invalid QRegularExpresssion object");
+        qWarning("QString::lastIndexOf: invalid QRegularExpression object");
         return -1;
     }
 
@@ -3333,7 +3333,7 @@ int QString::lastIndexOf(const QRegularExpression &re, int from) const
 bool QString::contains(const QRegularExpression &re) const
 {
     if (!re.isValid()) {
-        qWarning("QString::contains: invalid QRegularExpresssion object");
+        qWarning("QString::contains: invalid QRegularExpression object");
         return false;
     }
     QRegularExpressionMatch match = re.match(*this);
@@ -3382,7 +3382,7 @@ bool QString::contains(const QRegularExpression &re, QRegularExpressionMatch *ma
 int QString::count(const QRegularExpression &re) const
 {
     if (!re.isValid()) {
-        qWarning("QString::count: invalid QRegularExpresssion object");
+        qWarning("QString::count: invalid QRegularExpression object");
         return 0;
     }
     int count = 0;
diff --git a/src/corelib/tools/tools.pri b/src/corelib/tools/tools.pri
index bb152987e6..40858e5336 100644
--- a/src/corelib/tools/tools.pri
+++ b/src/corelib/tools/tools.pri
@@ -128,8 +128,19 @@ contains(QT_CONFIG, zlib) {
 contains(QT_CONFIG,icu) {
     SOURCES += tools/qlocale_icu.cpp
     DEFINES += QT_USE_ICU
-    win32:LIBS_PRIVATE += -licuin -licuuc
-    else:LIBS_PRIVATE += -licui18n -licuuc
+    win32 {
+        CONFIG(static, static|shared) {
+            CONFIG(debug, debug|release) {
+                LIBS_PRIVATE += -lsicuind -lsicuucd -lsicudtd
+            } else {
+                LIBS_PRIVATE += -lsicuin -lsicuuc -lsicudt
+            }
+        } else {
+            LIBS_PRIVATE += -licuin -licuuc
+        }
+    } else {
+        LIBS_PRIVATE += -licui18n -licuuc
+    }
 }
 
 pcre {
diff --git a/src/gui/painting/qcosmeticstroker.cpp b/src/gui/painting/qcosmeticstroker.cpp
index 7f53bec52f..0f3cde3efd 100644
--- a/src/gui/painting/qcosmeticstroker.cpp
+++ b/src/gui/painting/qcosmeticstroker.cpp
@@ -290,14 +290,14 @@ void QCosmeticStroker::setup()
         ppl = buffer->bytesPerLine()>>2;
     }
 
-    // dashes are sensitive to clips, so we need to clip consistently when painting to the same device
-    QRect clipRect = strokeSelection & Dashed ? deviceRect : clip;
+    // line drawing produces different results with different clips, so
+    // we need to clip consistently when painting to the same device
 
     // setup FP clip bounds
-    xmin = clipRect.left() - 1;
-    xmax = clipRect.right() + 2;
-    ymin = clipRect.top() - 1;
-    ymax = clipRect.bottom() + 2;
+    xmin = deviceRect.left() - 1;
+    xmax = deviceRect.right() + 2;
+    ymin = deviceRect.top() - 1;
+    ymax = deviceRect.bottom() + 2;
 
     lastPixel.x = -1;
 }
diff --git a/src/plugins/platforms/windows/qwindowsdialoghelpers.cpp b/src/plugins/platforms/windows/qwindowsdialoghelpers.cpp
index 5cc5230832..8565bf0204 100644
--- a/src/plugins/platforms/windows/qwindowsdialoghelpers.cpp
+++ b/src/plugins/platforms/windows/qwindowsdialoghelpers.cpp
@@ -1340,7 +1340,9 @@ static inline QString appendSuffix(const QString &fileName, const QString &filte
     if (suffixPos < 0)
         return fileName;
     suffixPos += 3;
-    int endPos = filter.indexOf(QLatin1Char(';'), suffixPos + 1);
+    int endPos = filter.indexOf(QLatin1Char(' '), suffixPos + 1);
+    if (endPos < 0)
+        endPos = filter.indexOf(QLatin1Char(';'), suffixPos + 1);
     if (endPos < 0)
         endPos = filter.indexOf(QLatin1Char(')'), suffixPos + 1);
     if (endPos < 0)
diff --git a/src/plugins/platforms/xcb/qxcbcursor.cpp b/src/plugins/platforms/xcb/qxcbcursor.cpp
index ff40c6a9ab..3fd2ca70e3 100644
--- a/src/plugins/platforms/xcb/qxcbcursor.cpp
+++ b/src/plugins/platforms/xcb/qxcbcursor.cpp
@@ -490,7 +490,7 @@ xcb_cursor_t QXcbCursor::createFontCursor(int cshape)
                                 0xFFFF, 0xFFFF, 0xFFFF, 0, 0, 0);
     }
 
-    if (cursor && cshape >= 0 && cshape < Qt::LastCursor) {
+    if (cursor && cshape >= 0 && cshape < Qt::LastCursor && connection()->hasXFixes()) {
         const char *name = cursorNames[cshape];
         xcb_xfixes_set_cursor_name(conn, cursor, strlen(name), name);
     }
diff --git a/src/tools/bootstrap/bootstrap.pro b/src/tools/bootstrap/bootstrap.pro
index 8b69c715d2..8b28b09e00 100644
--- a/src/tools/bootstrap/bootstrap.pro
+++ b/src/tools/bootstrap/bootstrap.pro
@@ -42,6 +42,7 @@ CONFIG += minimal_syncqt
 QMAKE_SYNCQT_OPTIONS = -module QtCore -module QtDBus -module QtXml
 contains(QT_CONFIG, zlib): \
     QMAKE_SYNCQT_OPTIONS += -module QtZlib
+QMAKE_SYNCQT_OPTIONS += -version $$QT_VERSION
 
 load(qt_module)
 
diff --git a/src/widgets/graphicsview/qgraphicsitem.cpp b/src/widgets/graphicsview/qgraphicsitem.cpp
index 9aeee7c37a..62eab6a7a2 100644
--- a/src/widgets/graphicsview/qgraphicsitem.cpp
+++ b/src/widgets/graphicsview/qgraphicsitem.cpp
@@ -745,9 +745,6 @@
 #include <QtGui/qevent.h>
 #include <QtGui/qinputmethod.h>
 #include <QtWidgets/qgraphicseffect.h>
-#ifndef QT_NO_ACCESSIBILITY
-# include "qaccessible.h"
-#endif
 
 #include <private/qgraphicsitem_p.h>
 #include <private/qgraphicswidget_p.h>
@@ -7357,12 +7354,6 @@ void QGraphicsItem::updateMicroFocus()
                 if (scene()->views().at(i) == fw) {
                     if (qApp)
                         qApp->inputMethod()->update(Qt::ImQueryAll);
-
-#ifndef QT_NO_ACCESSIBILITY
-                    // ##### is this correct
-                    if (toGraphicsObject())
-                        QAccessible::updateAccessibility(toGraphicsObject(), 0, QAccessible::StateChanged);
-#endif
                     break;
                     }
                 }
diff --git a/src/widgets/graphicsview/qgraphicsscene.cpp b/src/widgets/graphicsview/qgraphicsscene.cpp
index ba59b15a54..2768c67134 100644
--- a/src/widgets/graphicsview/qgraphicsscene.cpp
+++ b/src/widgets/graphicsview/qgraphicsscene.cpp
@@ -245,9 +245,6 @@
 #include <QtGui/qtransform.h>
 #include <QtGui/qinputmethod.h>
 #include <QtWidgets/qgraphicseffect.h>
-#ifndef QT_NO_ACCESSIBILITY
-# include <QtGui/qaccessible.h>
-#endif
 #include <private/qapplication_p.h>
 #include <private/qobject_p.h>
 #include <private/qgraphicseffect_p.h>
@@ -866,14 +863,6 @@ void QGraphicsScenePrivate::setFocusItemHelper(QGraphicsItem *item,
         focusItem = item;
     updateInputMethodSensitivityInViews();
 
-#ifndef QT_NO_ACCESSIBILITY
-    if (focusItem) {
-        if (QGraphicsObject *focusObj = focusItem->toGraphicsObject()) {
-            QAccessibleEvent event(focusObj, QAccessible::Focus);
-            QAccessible::updateAccessibility(&event);
-        }
-    }
-#endif
     if (item) {
         QFocusEvent event(QEvent::FocusIn, focusReason);
         sendEvent(item, &event);