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

Conflicts:
	LICENSE.LGPLv21
	LICENSE.LGPLv3
	src/assistant/assistant/mainwindow.cpp
	src/designer/src/designer/versiondialog.cpp
	src/linguist/linguist/mainwindow.cpp
	src/linguist/lrelease/lrelease.1
	src/linguist/lupdate/lupdate.1
	src/qconfig/main.cpp
	src/qdbus/qdbusviewer/mainwindow.cpp

Change-Id: I8644f68ff02f00a377f82ea0b7520aa308f0a0df

diff --cc src/androiddeployqt/main.cpp
Simple merge

diff --cc src/assistant/assistant/mainwindow.cpp
index 6590df8,f040c22..7ed4aec
--- 1/src/assistant/assistant/mainwindow.cpp
--- 2/src/assistant/assistant/mainwindow.cpp
+++ b/src/assistant/assistant/mainwindow.cpp
@@@ -891,17 -891,11 +891,17 @@@ void MainWindow::showAboutDialog(
          aboutDia.setWindowTitle(aboutDia.documentTitle());
      } else {
          QByteArray resources;
 +#if defined(BROWSER_QTWEBKIT)
 +        const QString browser = QStringLiteral("Qt WebKit");
 +#else
 +        const QString browser = QStringLiteral("QTextBrowser");
 +#endif
          aboutDia.setText(tr("<center>"
              "<h3>%1</h3>"
 -            "<p>Version %2</p></center>"
 -            "<p>Copyright (C) %3 Digia Plc and/or its subsidiary(-ies).</p>")
 -            .arg(tr("Qt Assistant"), QLatin1String(QT_VERSION_STR), QStringLiteral("2015")),
 +            "<p>Version %2</p>"
 +            "<p>Browser: %3</p></center>"
 +            "<p>Copyright (C) %4 Digia Plc and/or its subsidiary(-ies).</p>")
-             .arg(tr("Qt Assistant"), QLatin1String(QT_VERSION_STR), browser, QStringLiteral("2014")),
++            .arg(tr("Qt Assistant"), QLatin1String(QT_VERSION_STR), browser, QStringLiteral("2015")),
              resources);
          QLatin1String path(":/qt-project.org/assistant/images/assistant-128.png");
          aboutDia.setPixmap(QString(path));

diff --cc src/designer/src/designer/versiondialog.cpp
Simple merge

diff --cc src/designer/src/lib/sdk/abstractformwindow.cpp
Simple merge

diff --cc src/linguist/linguist/mainwindow.cpp
Simple merge

diff --cc src/linguist/lupdate/main.cpp
Simple merge

diff --cc src/linguist/shared/po.cpp
Simple merge

diff --cc src/macdeployqt/macdeployqt/main.cpp
Simple merge

diff --cc src/macdeployqt/shared/shared.cpp
Simple merge

diff --cc src/qdbus/qdbusviewer/mainwindow.cpp
Simple merge

diff --cc src/qtdiag/qtdiag.cpp
Simple merge