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

Conflicts:
	examples/xml/htmlinfo/simpleexample.html
	examples/xml/rsslisting/rsslisting.cpp
	qmake/generators/win32/msbuild_objectmodel.cpp
	src/3rdparty/harfbuzz-ng/src/hb-private.hh
	src/corelib/global/qlogging.cpp
	src/corelib/io/qstorageinfo_unix.cpp
	src/corelib/thread/qwaitcondition_unix.cpp
	src/gui/kernel/qguiapplication.cpp
	src/plugins/platforms/linuxfb/qlinuxfbintegration.cpp
	src/testlib/doc/src/qt-webpages.qdoc
	tests/auto/other/qaccessibility/tst_qaccessibility.cpp

Change-Id: Ib272ff0bc30a1a5d51275eb3cd2f201dc82c11ff

3 files changed, 5 insertions, 5 deletions

diff --git a/src/corelib/doc/qtcore.qdocconf b/src/corelib/doc/qtcore.qdocconf
index 5a14ba9088..f3aff83a8b 100644
--- a/src/corelib/doc/qtcore.qdocconf
+++ b/src/corelib/doc/qtcore.qdocconf
@@ -25,7 +25,7 @@ qhp.QtCore.subprojects.classes.sortPages = true
 
 tagfile                 = ../../../doc/qtcore/qtcore.tags
 
-depends                 += activeqt qtdbus qtgui qtwidgets qtnetwork qtdoc qtmacextras qtquick qtlinguist qtdesigner qtconcurrent qtxml qmake
+depends                 += activeqt qtdbus qtgui qtwidgets qtnetwork qtdoc qtmacextras qtquick qtlinguist qtdesigner qtconcurrent qtxml qmake qtwinextras
 # depends               += qtqml # Qt namespace collides with QtQml::Qt, see QTBUG-38630
 
 headerdirs  += ..
diff --git a/src/corelib/doc/src/animation.qdoc b/src/corelib/doc/src/animation.qdoc
index e70553090a..e5e67cf503 100644
--- a/src/corelib/doc/src/animation.qdoc
+++ b/src/corelib/doc/src/animation.qdoc
@@ -48,7 +48,7 @@
 
     The animation framework aims to provide an easy way for creating animated
     and smooth GUIs. By animating Qt properties, the framework provides great
-    freedom for animating widgets and other {QObject}s. The framework can
+    freedom for animating widgets and other \l{QObject}s. The framework can
     also be used with the Graphics View framework. Many of the concepts
     available in the animation framework are also available in \l{Qt Quick},
     where it offers a declarative way of defining animations. Much of the
@@ -57,7 +57,7 @@
 
     In this overview, we explain the basics of its architecture. We
     also show examples of the most common techniques that the
-    framework allows for animating {QObject}s and graphics items.
+    framework allows for animating \l{QObject}s and graphics items.
 
     \tableofcontents
 
@@ -85,7 +85,7 @@
     over the property using an easing curve. So when you want to
     animate a value, you can declare it as a property and make your
     class a QObject. Note that this gives us great freedom in
-    animating already existing widgets and other {QObject}s.
+    animating already existing widgets and other \l{QObject}s.
 
     Complex animations can be constructed by building a tree structure
     of \l{QAbstractAnimation}s. The tree is built by using
diff --git a/src/corelib/doc/src/filestorage.qdoc b/src/corelib/doc/src/filestorage.qdoc
index 62fb68ccdc..0cdb6b56ae 100644
--- a/src/corelib/doc/src/filestorage.qdoc
+++ b/src/corelib/doc/src/filestorage.qdoc
@@ -87,7 +87,7 @@ There are three general ways to use QTextStream when reading text files:
 
 \list
     \li Chunk by chunk, by calling \l{QBuffer::readLine()}{readLine()} or \l{QBuffer::readAll()}{readAll()}.
-    \li Word by word. QTextStream supports streaming into {QString}s, {QByteArray}s
+    \li Word by word. QTextStream supports streaming into \l{QString}s, \l{QByteArray}s
         and char* buffers. Words are delimited by space, and leading white space
         is automatically skipped.
     \li Character by character, by streaming into QChar or char types. This