From 4ee403ade29c341001ed769ad9bfcf34b37f32a3 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Thu, 31 Mar 2016 11:36:12 +0200 Subject: Qt Designer: Simplify selection when moving selections by arrow keys. Call FormWindow::simplifySelection() when moving with arrow keys as is done when moving using DND to prevent the geometry being applied to children. Task-number: QTBUG-52237 Change-Id: I94849636df6d94bc288982a601e44f54ec6c5cb9 Reviewed-by: Marko Kangas Reviewed-by: Jarek Kobus --- src/designer/src/components/formeditor/formwindow.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/designer/src/components/formeditor/formwindow.cpp b/src/designer/src/components/formeditor/formwindow.cpp index 4d1d0abd9..e8a92142f 100644 --- a/src/designer/src/components/formeditor/formwindow.cpp +++ b/src/designer/src/components/formeditor/formwindow.cpp @@ -1557,6 +1557,8 @@ void FormWindow::handleArrowKeyEvent(int key, Qt::KeyboardModifiers modifiers) selection.append(w); } + simplifySelection(&selection); + if (selection.isEmpty()) return; -- cgit v1.2.3 From f35d2e53eccf783aec3db59b7f24ff80b9333b9f Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Thu, 7 Apr 2016 16:04:35 +0200 Subject: QDesignerDialogGuiInterface: Remove endless recursion. Fix Clang warning: sdk\abstractdialoggui.cpp(142,1) : warning: all paths through this function will call itself [-Winfinite-recursion] The code did not have any effect since the function was overridden in a derived class. Change-Id: Iee86cc50b61b1329fe1997d2f412bfb9395ceed7 Reviewed-by: Jarek Kobus --- src/designer/src/lib/sdk/abstractdialoggui.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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); } /*! -- cgit v1.2.3 From 7e07164e4ce089255e413b4cd2b2d1378ce13e5c Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Wed, 6 Apr 2016 07:15:08 +0200 Subject: lupdate: Add two missing tr() Change-Id: Ie227da5bf2e79d72da188bb0f6ee47216fa76067 Reviewed-by: Oswald Buddenhagen --- src/linguist/lupdate/cpp.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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()); -- cgit v1.2.3 From b83999bfe04d185cbe45a81658bd21bb1b22a532 Mon Sep 17 00:00:00 2001 From: hjk Date: Thu, 7 Apr 2016 19:02:24 +0200 Subject: QDoc: Add a space between "Note:" and "Signal" ... in the "Note:Signal ... is overloaded in this class." hint. Change-Id: I4020a43613f655170cf88b03d1c689f3eb3584e3 Reviewed-by: Martin Smith --- src/qdoc/generator.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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) -- cgit v1.2.3