Merge remote-tracking branch 'origin/5.6' into 5.7v5.7.0-beta1

Change-Id: I49a57527be78cb30692467b2e227aa8afc49dd7d

4 files changed, 6 insertions, 4 deletions

diff --git a/src/designer/src/components/formeditor/formwindow.cpp b/src/designer/src/components/formeditor/formwindow.cpp
index 3d09740ad..f1ed2933e 100644
--- a/src/designer/src/components/formeditor/formwindow.cpp
+++ b/src/designer/src/components/formeditor/formwindow.cpp
@@ -1551,6 +1551,8 @@ void FormWindow::handleArrowKeyEvent(int key, Qt::KeyboardModifiers modifiers)
             selection.append(w);
     }
 
+    simplifySelection(&selection);
+
     if (selection.isEmpty())
         return;
 
diff --git a/src/designer/src/lib/sdk/abstractdialoggui.cpp b/src/designer/src/lib/sdk/abstractdialoggui.cpp
index 08a6c0841..0bad7248a 100644
--- a/src/designer/src/lib/sdk/abstractdialoggui.cpp
+++ b/src/designer/src/lib/sdk/abstractdialoggui.cpp
@@ -140,7 +140,7 @@ QString QDesignerDialogGuiInterface::getOpenImageFileName(QWidget *parent, const
 
 QStringList QDesignerDialogGuiInterface::getOpenImageFileNames(QWidget *parent, const QString &caption, const QString &dir, const QString &filter, QString *selectedFilter, QFileDialog::Options options)
 {
-    return getOpenImageFileNames(parent, caption, dir, filter, selectedFilter, options);
+    return getOpenFileNames(parent, caption, dir, filter, selectedFilter, options);
 }
 
 /*!
diff --git a/src/linguist/lupdate/cpp.cpp b/src/linguist/lupdate/cpp.cpp
index 37927c447..f67abfae0 100644
--- a/src/linguist/lupdate/cpp.cpp
+++ b/src/linguist/lupdate/cpp.cpp
@@ -842,7 +842,7 @@ CppParser::TokenType CppParser::getToken()
 
                 forever {
                     if (yyCh == EOF || yyCh == '\n') {
-                        yyMsg() << "Unterminated C++ character\n";
+                        yyMsg() << qPrintable(LU::tr("Unterminated C++ character\n"));
                         break;
                     }
                     yyCh = getChar();
@@ -1861,7 +1861,7 @@ void CppParser::parseInternal(ConversionData &cd, const QStringList &includeStac
                     // Forward-declared class definitions can be namespaced.
                     NamespaceList nsl;
                     if (!fullyQualify(namespaces, quali, true, &nsl, 0)) {
-                        yyMsg() << "Ignoring definition of undeclared qualified class\n";
+                        yyMsg() << qPrintable(LU::tr("Ignoring definition of undeclared qualified class\n"));
                         break;
                     }
                     namespaceDepths.push(namespaces.count());
diff --git a/src/qdoc/generator.cpp b/src/qdoc/generator.cpp
index 4286aa692..f68b578d3 100644
--- a/src/qdoc/generator.cpp
+++ b/src/qdoc/generator.cpp
@@ -1648,7 +1648,7 @@ void Generator::generateOverloadedSignal(const Node* node, CodeMarker* marker)
          << Atom(Atom::FormattingLeft,ATOM_FORMATTING_BOLD)
          << "Note:"
          << Atom(Atom::FormattingRight,ATOM_FORMATTING_BOLD)
-         << "Signal "
+         << " Signal "
          << Atom(Atom::FormattingLeft,ATOM_FORMATTING_ITALIC)
          << node->name()
          << Atom(Atom::FormattingRight,ATOM_FORMATTING_ITALIC)