Merge 5.4 into 5.4.1v5.4.1

Change-Id: Id1f12a225d975ba3a2c244e90c00126b9e90368a

7 files changed, 17 insertions, 35 deletions

diff --git a/src/assistant/assistant/main.cpp b/src/assistant/assistant/main.cpp
index e4d5a4f38..6b049d3ba 100644
--- a/src/assistant/assistant/main.cpp
+++ b/src/assistant/assistant/main.cpp
@@ -93,16 +93,6 @@ updateLastPagesOnUnregister(QHelpEngineCore& helpEngine, const QString& nsName)
     }
 }
 
-bool
-updateUserCollection(QHelpEngineCore& user, const QHelpEngineCore& caller)
-{
-    TRACE_OBJ
-    if (!CollectionConfiguration::isNewer(caller, user))
-        return false;
-    CollectionConfiguration::copyConfiguration(caller, user);
-    return true;
-}
-
 void stripNonexistingDocs(QHelpEngineCore& collection)
 {
     TRACE_OBJ
diff --git a/src/designer/data/generate_header.xsl b/src/designer/data/generate_header.xsl
index 579e01eae..c9a2b0afb 100644
--- a/src/designer/data/generate_header.xsl
+++ b/src/designer/data/generate_header.xsl
@@ -388,12 +388,11 @@
 #ifndef UI4_H
 #define UI4_H
 
-#include <QtCore/QList>
-#include <QtCore/QString>
-#include <QtCore/QStringList>
-#include <QtCore/QXmlStreamReader>
-#include <QtCore/QXmlStreamWriter>
-#include <QtCore/qglobal.h>
+#include <qlist.h>
+#include <qstring.h>
+#include <qstringlist.h>
+#include <qxmlstream.h>
+#include <qglobal.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/designer/src/lib/shared/actioneditor.cpp b/src/designer/src/lib/shared/actioneditor.cpp
index 07ffee2b6..91297ebd7 100644
--- a/src/designer/src/lib/shared/actioneditor.cpp
+++ b/src/designer/src/lib/shared/actioneditor.cpp
@@ -474,11 +474,6 @@ void ActionEditor::slotNewAction()
     }
 }
 
-static inline bool isSameIcon(const QIcon &i1, const QIcon &i2)
-{
-    return i1.cacheKey() == i2.cacheKey();
-}
-
 // return a FormWindow command to apply an icon or a reset command in case it
 //  is empty.
 
diff --git a/src/designer/src/lib/shared/zoomwidget.cpp b/src/designer/src/lib/shared/zoomwidget.cpp
index aa3c3f2a7..c95bd3a30 100644
--- a/src/designer/src/lib/shared/zoomwidget.cpp
+++ b/src/designer/src/lib/shared/zoomwidget.cpp
@@ -55,11 +55,6 @@ enum { debugZoomWidget = 0 };
 
 static const int menuZoomList[] = { 100, 25, 50, 75, 125, 150 , 175, 200 };
 
-static inline QSize qCeiling(const QSizeF &s)
-{
-    return QSize(qCeil(s.width()), qCeil(s.height()));
-}
-
 namespace qdesigner_internal {
 
 // ---------- ZoomMenu
diff --git a/src/designer/src/lib/uilib/ui4_p.h b/src/designer/src/lib/uilib/ui4_p.h
index 5828900bc..51a70749c 100644
--- a/src/designer/src/lib/uilib/ui4_p.h
+++ b/src/designer/src/lib/uilib/ui4_p.h
@@ -47,12 +47,11 @@
 #ifndef UI4_H
 #define UI4_H
 
-#include <QtCore/QList>
-#include <QtCore/QString>
-#include <QtCore/QStringList>
-#include <QtCore/QXmlStreamReader>
-#include <QtCore/QXmlStreamWriter>
-#include <QtCore/qglobal.h>
+#include <qlist.h>
+#include <qstring.h>
+#include <qstringlist.h>
+#include <qxmlstream.h>
+#include <qglobal.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/linguist/linguist/doc/src/linguist-manual.qdoc b/src/linguist/linguist/doc/src/linguist-manual.qdoc
index c0d1b07ed..c442eb211 100644
--- a/src/linguist/linguist/doc/src/linguist-manual.qdoc
+++ b/src/linguist/linguist/doc/src/linguist-manual.qdoc
@@ -151,7 +151,7 @@
     \nextpage Qt Linguist Manual: Translators
 
     Two tools are provided for the release manager, lupdate and
-    lrelease. These tools can process \l qmake project files, or operate
+    lrelease. These tools can process \l {qmake Manual}{qmake} project files, or operate
     directly on the file system.
 
     \section1 Creating Translation Files
@@ -972,7 +972,7 @@
 
     However, it is not necessary to always deploy all of Qt 5's \c .qm files.
     We recommend concatenating the \c .qm files of the modules required to
-    one file matching the meta catalog file name using the tool \l lconvert in
+    one file matching the meta catalog file name using the tool \c lconvert in
     the deploy step. For example, to create a German translation file for an
     application using the modules \l{Qt Core}, \l {Qt GUI}, and \l {Qt Quick},
     run:
diff --git a/src/windeployqt/main.cpp b/src/windeployqt/main.cpp
index a1568fa5b..1b46957dc 100644
--- a/src/windeployqt/main.cpp
+++ b/src/windeployqt/main.cpp
@@ -712,8 +712,12 @@ static inline quint64 qtModuleForPlugin(const QString &subDirName)
         return QtMultimediaModule;
     if (subDirName == QLatin1String("printsupport"))
         return QtPrintSupportModule;
+    if (subDirName == QLatin1String("scenegraph"))
+        return QtQuickModule;
     if (subDirName == QLatin1String("qmltooling"))
-        return QtDeclarativeModule | QtQuickModule | QtQmlToolingModule;
+        return QtQuickModule | QtQmlToolingModule;
+    if (subDirName == QLatin1String("qml1tooling"))
+        return QtDeclarativeModule;
     if (subDirName == QLatin1String("position"))
         return QtPositioningModule;
     if (subDirName == QLatin1String("sensors") || subDirName == QLatin1String("sensorgestures"))