From 32188f448ab9cfc0e7ed3da4f95c3f9ce2953795 Mon Sep 17 00:00:00 2001 From: Christian Stenger Date: Fri, 9 Mar 2018 06:55:34 +0100 Subject: [PATCH] QmlDesigner: Fix compile before Qt5.10 QString::back() was introduced in Qt5.10. Beside this fix the signature change of void checkNode(). Change-Id: I4945e618274e1a67fc36d33e875c14284a4b160c Reviewed-by: Orgad Shaneh --- src/plugins/qmldesigner/designercore/model/rewriterview.cpp | 2 +- tests/auto/qml/qmldesigner/coretests/tst_testcore.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/plugins/qmldesigner/designercore/model/rewriterview.cpp b/src/plugins/qmldesigner/designercore/model/rewriterview.cpp index 64e69a2d119..6bd5522d637 100644 --- a/src/plugins/qmldesigner/designercore/model/rewriterview.cpp +++ b/src/plugins/qmldesigner/designercore/model/rewriterview.cpp @@ -482,7 +482,7 @@ QString RewriterView::auxiliaryDataAsQML() const } } - if (str.back() == ';') + if (str.endsWith(';')) str.chop(1); str += "}"; diff --git a/tests/auto/qml/qmldesigner/coretests/tst_testcore.cpp b/tests/auto/qml/qmldesigner/coretests/tst_testcore.cpp index 33b275046bf..83cdaf3675a 100644 --- a/tests/auto/qml/qmldesigner/coretests/tst_testcore.cpp +++ b/tests/auto/qml/qmldesigner/coretests/tst_testcore.cpp @@ -8209,7 +8209,7 @@ void tst_TestCore::changeGradientId() } } -void checkNode(QmlJS::SimpleReaderNode::Ptr node, TestRewriterView *view); +static void checkNode(QmlJS::SimpleReaderNode::Ptr node, TestRewriterView *view); void static checkChildNodes(QmlJS::SimpleReaderNode::Ptr node, TestRewriterView *view) { @@ -8217,7 +8217,7 @@ void static checkChildNodes(QmlJS::SimpleReaderNode::Ptr node, TestRewriterView checkNode(child, view); } -void static checkNode(QmlJS::SimpleReaderNode::Ptr node, TestRewriterView *view) +static void checkNode(QmlJS::SimpleReaderNode::Ptr node, TestRewriterView *view) { QVERIFY(node); QVERIFY(node->propertyNames().contains("i"));