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

Change-Id: If7b9ae7b6f77025c775e6b654837b5f041f1aab9

29 files changed, 15 insertions, 2 deletions

diff --git a/src/assistant/assistant/assistant.icns b/src/assistant/assistant/assistant.icns
index 6291dd397..1dbfc6a15 100644
--- a/src/assistant/assistant/assistant.icns
+++ b/src/assistant/assistant/assistant.icns
diff --git a/src/assistant/assistant/assistant.ico b/src/assistant/assistant/assistant.ico
index 9e1b83f1b..f34505532 100644
--- a/src/assistant/assistant/assistant.ico
+++ b/src/assistant/assistant/assistant.ico
diff --git a/src/assistant/assistant/assistant_images.qrc b/src/assistant/assistant/assistant_images.qrc
index 4596b568d..948de970f 100644
--- a/src/assistant/assistant/assistant_images.qrc
+++ b/src/assistant/assistant/assistant_images.qrc
@@ -1,6 +1,5 @@
 <RCC>
     <qresource prefix="/qt-project.org/assistant">
-        <file>images/qt-logo.png</file>
         <file>images/assistant-128.png</file>
         <file>images/assistant.png</file>
         <file>images/wrap.png</file>
diff --git a/src/assistant/assistant/images/assistant-128.png b/src/assistant/assistant/images/assistant-128.png
index f05949f6d..7b9f47477 100644
--- a/src/assistant/assistant/images/assistant-128.png
+++ b/src/assistant/assistant/images/assistant-128.png
diff --git a/src/assistant/assistant/images/assistant.png b/src/assistant/assistant/images/assistant.png
index ea4d1e70c..2d7c47744 100644
--- a/src/assistant/assistant/images/assistant.png
+++ b/src/assistant/assistant/images/assistant.png
diff --git a/src/assistant/assistant/images/qt-logo.png b/src/assistant/assistant/images/qt-logo.png
deleted file mode 100644
index c53e744ca..000000000
--- a/src/assistant/assistant/images/qt-logo.png
+++ /dev/null
diff --git a/src/assistant/help/qhelpcontentwidget.cpp b/src/assistant/help/qhelpcontentwidget.cpp
index 8f38bcfd3..1deaaf95a 100644
--- a/src/assistant/help/qhelpcontentwidget.cpp
+++ b/src/assistant/help/qhelpcontentwidget.cpp
@@ -219,6 +219,11 @@ void QHelpContentProvider::stopCollecting()
         m_abort = true;
         m_mutex.unlock();
         wait();
+        // we need to force-set m_abort to false, because the thread might either have
+        // finished between the isRunning() check and the "m_abort = true" above, or the
+        // isRunning() check might already happen after the "m_abort = false" in the run() method,
+        // either way never resetting m_abort to false from within the run() method
+        m_abort = false;
     }
     qDeleteAll(m_rootItems);
     m_rootItems.clear();
diff --git a/src/assistant/qhelpconverter/assistant-128.png b/src/assistant/qhelpconverter/assistant-128.png
index f05949f6d..7b9f47477 100644
--- a/src/assistant/qhelpconverter/assistant-128.png
+++ b/src/assistant/qhelpconverter/assistant-128.png
diff --git a/src/assistant/qhelpconverter/assistant.png b/src/assistant/qhelpconverter/assistant.png
index ea4d1e70c..2d7c47744 100644
--- a/src/assistant/qhelpconverter/assistant.png
+++ b/src/assistant/qhelpconverter/assistant.png
diff --git a/src/designer/src/components/formeditor/images/qtlogo.png b/src/designer/src/components/formeditor/images/qtlogo.png
index 038fa2cc3..7d472572b 100644
--- a/src/designer/src/components/formeditor/images/qtlogo.png
+++ b/src/designer/src/components/formeditor/images/qtlogo.png
diff --git a/src/designer/src/designer/designer.icns b/src/designer/src/designer/designer.icns
index 9940214fc..c50830598 100644
--- a/src/designer/src/designer/designer.icns
+++ b/src/designer/src/designer/designer.icns
diff --git a/src/designer/src/designer/designer.ico b/src/designer/src/designer/designer.ico
index ef667333d..495e8d162 100644
--- a/src/designer/src/designer/designer.ico
+++ b/src/designer/src/designer/designer.ico
diff --git a/src/designer/src/designer/images/designer.png b/src/designer/src/designer/images/designer.png
index 0988fcee3..15086cb70 100644
--- a/src/designer/src/designer/images/designer.png
+++ b/src/designer/src/designer/images/designer.png
diff --git a/src/designer/src/designer/uifile.icns b/src/designer/src/designer/uifile.icns
index 2473ea4dc..030998785 100644
--- a/src/designer/src/designer/uifile.icns
+++ b/src/designer/src/designer/uifile.icns
diff --git a/src/linguist/linguist/images/appicon.png b/src/linguist/linguist/images/appicon.png
index d388cbd0b..6aa09fb7a 100644
--- a/src/linguist/linguist/images/appicon.png
+++ b/src/linguist/linguist/images/appicon.png
diff --git a/src/linguist/linguist/images/icons/linguist-128-32.png b/src/linguist/linguist/images/icons/linguist-128-32.png
index d108208fa..e9a44cbef 100644
--- a/src/linguist/linguist/images/icons/linguist-128-32.png
+++ b/src/linguist/linguist/images/icons/linguist-128-32.png
diff --git a/src/linguist/linguist/images/icons/linguist-16-32.png b/src/linguist/linguist/images/icons/linguist-16-32.png
index 8dfc97406..111b910b0 100644
--- a/src/linguist/linguist/images/icons/linguist-16-32.png
+++ b/src/linguist/linguist/images/icons/linguist-16-32.png
diff --git a/src/linguist/linguist/images/icons/linguist-32-32.png b/src/linguist/linguist/images/icons/linguist-32-32.png
index d388cbd0b..6aa09fb7a 100644
--- a/src/linguist/linguist/images/icons/linguist-32-32.png
+++ b/src/linguist/linguist/images/icons/linguist-32-32.png
diff --git a/src/linguist/linguist/images/icons/linguist-48-32.png b/src/linguist/linguist/images/icons/linguist-48-32.png
index ceb738759..b7e344485 100644
--- a/src/linguist/linguist/images/icons/linguist-48-32.png
+++ b/src/linguist/linguist/images/icons/linguist-48-32.png
diff --git a/src/linguist/linguist/images/icons/linguist-64-32.png b/src/linguist/linguist/images/icons/linguist-64-32.png
index 0cce805e3..6ea58ff42 100644
--- a/src/linguist/linguist/images/icons/linguist-64-32.png
+++ b/src/linguist/linguist/images/icons/linguist-64-32.png
diff --git a/src/linguist/linguist/images/splash.png b/src/linguist/linguist/images/splash.png
index 0e99a1cf0..baaed6181 100644
--- a/src/linguist/linguist/images/splash.png
+++ b/src/linguist/linguist/images/splash.png
diff --git a/src/linguist/linguist/linguist.icns b/src/linguist/linguist/linguist.icns
index 5918e001c..d37861567 100644
--- a/src/linguist/linguist/linguist.icns
+++ b/src/linguist/linguist/linguist.icns
diff --git a/src/linguist/linguist/linguist.ico b/src/linguist/linguist/linguist.ico
index 5bbdc485b..48cd31a17 100644
--- a/src/linguist/linguist/linguist.ico
+++ b/src/linguist/linguist/linguist.ico
diff --git a/src/qdbus/qdbusviewer/images/qdbusviewer-128.png b/src/qdbus/qdbusviewer/images/qdbusviewer-128.png
index 075491221..af940dcb5 100644
--- a/src/qdbus/qdbusviewer/images/qdbusviewer-128.png
+++ b/src/qdbus/qdbusviewer/images/qdbusviewer-128.png
diff --git a/src/qdbus/qdbusviewer/images/qdbusviewer.icns b/src/qdbus/qdbusviewer/images/qdbusviewer.icns
index b6f39b9c2..179a8238a 100644
--- a/src/qdbus/qdbusviewer/images/qdbusviewer.icns
+++ b/src/qdbus/qdbusviewer/images/qdbusviewer.icns
diff --git a/src/qdbus/qdbusviewer/images/qdbusviewer.ico b/src/qdbus/qdbusviewer/images/qdbusviewer.ico
index 49edb09f0..c5742ccf0 100644
--- a/src/qdbus/qdbusviewer/images/qdbusviewer.ico
+++ b/src/qdbus/qdbusviewer/images/qdbusviewer.ico
diff --git a/src/qdbus/qdbusviewer/images/qdbusviewer.png b/src/qdbus/qdbusviewer/images/qdbusviewer.png
index 5a8c5a341..b410aaf50 100644
--- a/src/qdbus/qdbusviewer/images/qdbusviewer.png
+++ b/src/qdbus/qdbusviewer/images/qdbusviewer.png
diff --git a/src/qtconfig/images/appicon.png b/src/qtconfig/images/appicon.png
index 009317778..02c803bff 100644
--- a/src/qtconfig/images/appicon.png
+++ b/src/qtconfig/images/appicon.png
diff --git a/src/windeployqt/main.cpp b/src/windeployqt/main.cpp
index c156519be..a1568fa5b 100644
--- a/src/windeployqt/main.cpp
+++ b/src/windeployqt/main.cpp
@@ -1302,7 +1302,16 @@ static bool deployWebEngine(const QMap<QString, QString> &qmakeVariables,
             return false;
         }
     }
-    return true;
+    const QFileInfo translations(qmakeVariables.value(QStringLiteral("QT_INSTALL_TRANSLATIONS"))
+                                 + QStringLiteral("/qtwebengine_locales"));
+    if (!translations.isDir()) {
+        std::wcerr << "Warning: Cannot find the translation files of the QtWebEngine module at "
+            << QDir::toNativeSeparators(translations.absoluteFilePath()) << '.';
+        return true;
+    }
+    // Missing translations may cause crashes, ignore --no-translations.
+    return updateFile(translations.absoluteFilePath(), options.directory,
+                      options.updateFileFlags, options.json, errorMessage);
 }
 
 int main(int argc, char **argv)