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

Change-Id: If7b9ae7b6f77025c775e6b654837b5f041f1aab9

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)