diff options
| -rw-r--r-- | tests/auto/quick/qquicktableview/tst_qquicktableview.cpp | 3 | ||||
| -rw-r--r-- | tests/auto/quick/qquickvisualdatamodel/tst_qquickvisualdatamodel.cpp | 2 | ||||
| -rw-r--r-- | tests/auto/shared/qqmljsastdumper.cpp | 1 |
3 files changed, 2 insertions, 4 deletions
diff --git a/tests/auto/quick/qquicktableview/tst_qquicktableview.cpp b/tests/auto/quick/qquicktableview/tst_qquicktableview.cpp index e9c9505d6c..ce77028841 100644 --- a/tests/auto/quick/qquicktableview/tst_qquicktableview.cpp +++ b/tests/auto/quick/qquicktableview/tst_qquicktableview.cpp @@ -2714,10 +2714,7 @@ void tst_QQuickTableView::checkSyncView_pageFlicking() // needs to rebuild. This, in turn, will eventually rebuild the // sync children as well when they sync up later. LOAD_TABLEVIEW("syncviewsimple.qml"); - GET_QML_TABLEVIEW(tableViewH); - GET_QML_TABLEVIEW(tableViewV); GET_QML_TABLEVIEW(tableViewHV); - QQuickTableView *views[] = {tableViewH, tableViewV, tableViewHV}; auto model = TestModelAsVariant(100, 100); diff --git a/tests/auto/quick/qquickvisualdatamodel/tst_qquickvisualdatamodel.cpp b/tests/auto/quick/qquickvisualdatamodel/tst_qquickvisualdatamodel.cpp index 8bc9700fbe..746f27447b 100644 --- a/tests/auto/quick/qquickvisualdatamodel/tst_qquickvisualdatamodel.cpp +++ b/tests/auto/quick/qquickvisualdatamodel/tst_qquickvisualdatamodel.cpp @@ -4373,7 +4373,7 @@ void tst_qquickvisualdatamodel::readFromProxyObject() auto *window = qobject_cast<QQuickWindow *>(obj.get()); QVERIFY(window); - QCOMPARE(window->property("name").type(), QMetaType::QString); + QCOMPARE(window->property("name").metaType(), QMetaType(QMetaType::QString)); QTRY_VERIFY(window->property("name").toString() != QLatin1String("wrong")); } diff --git a/tests/auto/shared/qqmljsastdumper.cpp b/tests/auto/shared/qqmljsastdumper.cpp index 9573e9bec1..3ffb7519e3 100644 --- a/tests/auto/shared/qqmljsastdumper.cpp +++ b/tests/auto/shared/qqmljsastdumper.cpp @@ -423,6 +423,7 @@ void AstDumper::endVisit(UiAnnotationList *) { stop("UiAnnotationList"); } // QQmlJS bool AstDumper::visit(AST::TypeExpression *el) { + Q_UNUSED(el); start("TypeExpression"); return true; } |