aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorChristian Stenger <christian.stenger@qt.io>2018-02-13 09:08:20 +0100
committerThomas Hartmann <thomas.hartmann@qt.io>2018-02-13 08:47:45 +0000
commitcafb0760f648905b36c8349116de8ec76022e6ca (patch)
tree09d21abbd8cb977827fb30f96bee319618ce92db /tests
parent3874b6b6ece1904a6e2a5e2c920a59a399a64454 (diff)
Tests: Fix compile with Qt5.11
Function to convert char[] into QString has been deleted. Change-Id: Iedf5db322b907d4ea1a20cc5c70394388d54f214 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/qml/qmldesigner/coretests/tst_testcore.cpp28
1 files changed, 14 insertions, 14 deletions
diff --git a/tests/auto/qml/qmldesigner/coretests/tst_testcore.cpp b/tests/auto/qml/qmldesigner/coretests/tst_testcore.cpp
index 25fd1008d3..25eca2c3ce 100644
--- a/tests/auto/qml/qmldesigner/coretests/tst_testcore.cpp
+++ b/tests/auto/qml/qmldesigner/coretests/tst_testcore.cpp
@@ -1266,7 +1266,7 @@ void tst_TestCore::testBasicStates()
Exception::setShouldAssert(true);
QPlainTextEdit textEdit;
- textEdit.setPlainText(qmlString);
+ textEdit.setPlainText(QLatin1String(qmlString));
NotIndentingTextEditModifier textModifier(&textEdit);
QScopedPointer<Model> model(Model::create("QtQuick.Item"));
@@ -1372,7 +1372,7 @@ void tst_TestCore::testBasicStatesQtQuick20()
Exception::setShouldAssert(true);
QPlainTextEdit textEdit;
- textEdit.setPlainText(qmlString);
+ textEdit.setPlainText(QLatin1String(qmlString));
NotIndentingTextEditModifier textModifier(&textEdit);
QScopedPointer<Model> model(Model::create("QtQuick.Item"));
@@ -2530,7 +2530,7 @@ void tst_TestCore::testRewriterId()
"}\n";
QPlainTextEdit textEdit;
- textEdit.setPlainText(qmlString);
+ textEdit.setPlainText(QLatin1String(qmlString));
NotIndentingTextEditModifier textModifier(&textEdit);
QScopedPointer<Model> model(Model::create("QtQuick.Item"));
@@ -2574,7 +2574,7 @@ void tst_TestCore::testRewriterNodeReparentingTransaction1()
"}\n";
QPlainTextEdit textEdit;
- textEdit.setPlainText(qmlString);
+ textEdit.setPlainText(QLatin1String(qmlString));
NotIndentingTextEditModifier textModifier(&textEdit);
QScopedPointer<Model> model(Model::create("QtQuick.Item", 2, 0));
@@ -2619,7 +2619,7 @@ void tst_TestCore::testRewriterNodeReparentingTransaction2()
"}\n";
QPlainTextEdit textEdit;
- textEdit.setPlainText(qmlString);
+ textEdit.setPlainText(QLatin1String(qmlString));
NotIndentingTextEditModifier textModifier(&textEdit);
QScopedPointer<Model> model(Model::create("QtQuick.Item", 2, 0));
@@ -2685,7 +2685,7 @@ void tst_TestCore::testRewriterNodeReparentingTransaction3()
"}\n";
QPlainTextEdit textEdit;
- textEdit.setPlainText(qmlString);
+ textEdit.setPlainText(QLatin1String(qmlString));
NotIndentingTextEditModifier textModifier(&textEdit);
QScopedPointer<Model> model(Model::create("QtQuick.Item", 2, 0));
@@ -2735,7 +2735,7 @@ void tst_TestCore::testRewriterNodeReparentingTransaction4()
"}\n";
QPlainTextEdit textEdit;
- textEdit.setPlainText(qmlString);
+ textEdit.setPlainText(QLatin1String(qmlString));
NotIndentingTextEditModifier textModifier(&textEdit);
QScopedPointer<Model> model(Model::create("QtQuick.Item",2,0));
@@ -2786,7 +2786,7 @@ void tst_TestCore::testRewriterAddNodeTransaction()
"}\n";
QPlainTextEdit textEdit;
- textEdit.setPlainText(qmlString);
+ textEdit.setPlainText(QLatin1String(qmlString));
NotIndentingTextEditModifier textModifier(&textEdit);
QScopedPointer<Model> model(Model::create("QtQuick.Item", 2, 0));
@@ -2833,7 +2833,7 @@ void tst_TestCore::testRewriterComponentId()
"}\n";
QPlainTextEdit textEdit;
- textEdit.setPlainText(qmlString);
+ textEdit.setPlainText(QLatin1String(qmlString));
NotIndentingTextEditModifier textModifier(&textEdit);
QScopedPointer<Model> model(Model::create("QtQuick.Item", 2, 0));
@@ -2864,7 +2864,7 @@ void tst_TestCore::testRewriterTransactionRewriter()
"}\n";
QPlainTextEdit textEdit;
- textEdit.setPlainText(qmlString);
+ textEdit.setPlainText(QLatin1String(qmlString));
NotIndentingTextEditModifier textModifier(&textEdit);
QScopedPointer<Model> model(Model::create("QtQuick.Item", 2, 0));
@@ -2936,7 +2936,7 @@ void tst_TestCore::testRewriterPropertyDeclarations()
"}\n";
QPlainTextEdit textEdit;
- textEdit.setPlainText(qmlString);
+ textEdit.setPlainText(QLatin1String(qmlString));
NotIndentingTextEditModifier textModifier(&textEdit);
QScopedPointer<Model> model(Model::create("QtQuick.Item"));
@@ -2998,7 +2998,7 @@ void tst_TestCore::testRewriterPropertyAliases()
"}\n";
QPlainTextEdit textEdit;
- textEdit.setPlainText(qmlString);
+ textEdit.setPlainText(QLatin1String(qmlString));
NotIndentingTextEditModifier textModifier(&textEdit);
QScopedPointer<Model> model(Model::create("QtQuick.Item"));
@@ -3981,7 +3981,7 @@ char qmlString[] = "import QtQuick 2.1\n"
"}\n";
QPlainTextEdit textEdit;
- textEdit.setPlainText(qmlString);
+ textEdit.setPlainText(QLatin1String(qmlString));
NotIndentingTextEditModifier textModifier(&textEdit);
QScopedPointer<Model> model(Model::create("QtQuick.Item"));
@@ -4237,7 +4237,7 @@ void tst_TestCore::testMetaInfoQtQuick1Vs2()
"}\n";
QPlainTextEdit textEdit;
- textEdit.setPlainText(qmlString);
+ textEdit.setPlainText(QLatin1String(qmlString));
NotIndentingTextEditModifier textModifier(&textEdit);
QScopedPointer<Model> model(Model::create("QtQuick.Item"));