Merge remote-tracking branch 'origin/7.0'

Change-Id: I1574de12ff58be4fdcffd29a5abdbdc8704b0453

src/plugins/coreplugin/versiondialog.cpp

@@ -73,25 +73,29 @@ VersionDialog::VersionDialog(QWidget *parent)
     const QString additionalInfo =
             QStringList(Utils::transform(additionalInfoLines, &QString::toHtmlEscaped)).join(br);
 
-    const QString description = tr(
+    const QString description
-        "<h3>%1</h3>"
+        = tr("<h3>%1</h3>"
-        "%2<br/>"
+             "%2<br/>"
-        "%3"
+             "%3"
-        "%4"
+             "%4"
-        "%5"
+             "%5"
-        "<br/>"
+             "<br/>"
-        "Copyright 2008-%6 %7. All rights reserved.<br/>"
+             "Copyright 2008-%6 %7. All rights reserved.<br/>"
-        "<br/>"
+             "<br/>"
-        "The program is provided AS IS with NO WARRANTY OF ANY KIND, "
+             "The program is provided AS IS with NO WARRANTY OF ANY KIND, "
-        "INCLUDING THE WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A "
+             "INCLUDING THE WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A "
-        "PARTICULAR PURPOSE.<br/>")
+             "PARTICULAR PURPOSE.<br/>")
-        .arg(ICore::versionString(),
+              .arg(ICore::versionString(),
-             ICore::buildCompatibilityString(),
+                   ICore::buildCompatibilityString(),
-             buildDateInfo,
+                   buildDateInfo,
-             ideRev,
+                   ideRev,
-             additionalInfo.isEmpty() ? QString() : br + additionalInfo + br,
+                   additionalInfo.isEmpty() ? QString() : br + additionalInfo + br,
-             QLatin1String(Constants::IDE_YEAR),
+                   QLatin1String(Constants::IDE_YEAR),
-             QLatin1String(Constants::IDE_AUTHOR));
+                   QLatin1String(Constants::IDE_AUTHOR))
+          + "<br/>"
+          + tr("The Qt logo as well as Qt®, Qt Quick®, Built with Qt®, Boot to Qt®, "
+               "Qt Quick Compiler®, Qt Enterprise®, Qt Mobile® and Qt Embedded® are "
+               "registered trademarks of The Qt Company Ltd.");
 
     QLabel *copyRightLabel = new QLabel(description);
     copyRightLabel->setWordWrap(true);

src/plugins/qmldesigner/components/navigator/navigatorsearchwidget.h

@@ -27,7 +27,9 @@
 
 #include <QLineEdit>
 
+QT_BEGIN_NAMESPACE
 class QToolButton;
+QT_END_NAMESPACE
 
 namespace QmlDesigner {