diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2018-05-14 09:52:58 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2018-05-14 09:52:58 +0200 |
| commit | e7123b140eb7e5d392542d087cdf5320336dec8a (patch) | |
| tree | e4bb5d4d0461fcacb724c4f3f15c5843d16c982f /tests/auto | |
| parent | f6d1d5b41e13600d5dd9ae0de80827f8ec57d44c (diff) | |
| parent | 2278ebed1e0d290861a5616f4238eeec68607443 (diff) | |
Merge remote-tracking branch 'origin/4.7'
Change-Id: I9d433fa6ce4f60a2acfbdb21da9f727cac8d7526
Diffstat (limited to 'tests/auto')
| -rw-r--r-- | tests/auto/qml/qmldesigner/coretests/tst_testcore.cpp | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/tests/auto/qml/qmldesigner/coretests/tst_testcore.cpp b/tests/auto/qml/qmldesigner/coretests/tst_testcore.cpp index 4408e9fa190..af4723c8729 100644 --- a/tests/auto/qml/qmldesigner/coretests/tst_testcore.cpp +++ b/tests/auto/qml/qmldesigner/coretests/tst_testcore.cpp @@ -64,14 +64,6 @@ #include <QPlainTextEdit> -#if QT_VERSION >= 0x050000 -#define MSKIP_SINGLE(x) QSKIP(x) -#define MSKIP_ALL(x) QSKIP(x); -#else -#define MSKIP_SINGLE(x) QSKIP(x, SkipSingle) -#define MSKIP_ALL(x) QSKIP(x, SkipAll) -#endif - //TESTED_COMPONENT=src/plugins/qmldesigner/designercore using namespace QmlDesigner; @@ -1392,7 +1384,7 @@ void tst_TestCore::testBasicStatesQtQuick20() qDebug() << rootModelNode.nodeListProperty("states").toModelNodeList().first().metaInfo().majorVersion(); qDebug() << rootModelNode.nodeListProperty("states").toModelNodeList().first().metaInfo().typeName(); - MSKIP_ALL("No qml2puppet"); + QSKIP("No qml2puppet"); QScopedPointer<TestView> view(new TestView(model.data())); QVERIFY(view.data()); @@ -8013,7 +8005,7 @@ void tst_TestCore::loadTestFiles() QCOMPARE(rootModelNode.nodeListProperty("states").toModelNodeList().count(), 2); } - MSKIP_ALL("Fails because the text editor model doesn't know about components"); + QSKIP("Fails because the text editor model doesn't know about components"); { //usingbutton.qml QFile file(":/fx/usingbutton.qml"); QVERIFY(file.open(QIODevice::ReadOnly | QIODevice::Text)); |