feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlDesigner: Fix compile before Qt5.10

Browse Source 
QString::back() was introduced in Qt5.10.
Beside this fix the signature change of void checkNode().

Change-Id: I4945e618274e1a67fc36d33e875c14284a4b160c
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
Christian Stenger
2018-03-09 06:55:34 +01:00
parent 37ef24114c
commit 32188f448a
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/qmldesigner/designercore/model/rewriterview.cpp
View File

@@ -482,7 +482,7 @@ QString RewriterView::auxiliaryDataAsQML() const
} }
} }
if (str.back() == ';') if (str.endsWith(';'))
str.chop(1); str.chop(1);
str += "}"; str += "}";

4
tests/auto/qml/qmldesigner/coretests/tst_testcore.cpp
View File

@@ -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) void static checkChildNodes(QmlJS::SimpleReaderNode::Ptr node, TestRewriterView *view)
{ {
@@ -8217,7 +8217,7 @@ void static checkChildNodes(QmlJS::SimpleReaderNode::Ptr node, TestRewriterView
checkNode(child, view); 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);
QVERIFY(node->propertyNames().contains("i")); QVERIFY(node->propertyNames().contains("i"));