From df8d59e4b4a486c189263d008d69e4f6c2467d12 Mon Sep 17 00:00:00 2001 From: Sami Nurmenniemi Date: Mon, 7 May 2018 14:13:44 +0300 Subject: Fix tst_qquickitem::qtBug60123 Fixes: - Call to waitForWindowExposed() is needed after change c9b46a130ec7f874a564bff1c9a70083705fc25b landed to qtbase. - Simplify geometry Task-number: QTBUG-66866 Change-Id: Id504fdf372292eb6cc76e387ae421096875863fd Reviewed-by: Simon Hausmann --- tests/auto/quick/qquickitem/BLACKLIST | 3 --- tests/auto/quick/qquickitem/tst_qquickitem.cpp | 14 ++++++++------ 2 files changed, 8 insertions(+), 9 deletions(-) (limited to 'tests/auto') diff --git a/tests/auto/quick/qquickitem/BLACKLIST b/tests/auto/quick/qquickitem/BLACKLIST index 85c4df4feb..d94a3ef102 100644 --- a/tests/auto/quick/qquickitem/BLACKLIST +++ b/tests/auto/quick/qquickitem/BLACKLIST @@ -1,5 +1,2 @@ [contains:hollow square: testing points inside] xcb - -[qtBug60123] -offscreen diff --git a/tests/auto/quick/qquickitem/tst_qquickitem.cpp b/tests/auto/quick/qquickitem/tst_qquickitem.cpp index ee9d36560d..7e132f97b6 100644 --- a/tests/auto/quick/qquickitem/tst_qquickitem.cpp +++ b/tests/auto/quick/qquickitem/tst_qquickitem.cpp @@ -2105,32 +2105,34 @@ void tst_qquickitem::shortcutOverride() void tst_qquickitem::qtBug60123() { QMainWindow main; + main.resize(400, 200); QQuickView window; QQuickView window2; window.setSource(testFileUrl("mainWindowQtBug60123.qml")); window2.setSource(testFileUrl("mainWindowQtBug60123.qml")); + // Create central widget for the main window QWidget *baseWidget = new QWidget(&main); - main.resize(400, 200); baseWidget->resize(400, 200); baseWidget->setMaximumHeight(200); baseWidget->setMaximumWidth(400); + main.setCentralWidget(baseWidget); // Create container widgets for both windows QWidget *containers = QWidget::createWindowContainer(&window, baseWidget); - containers->setGeometry(0, 0, 400, 200); - QWidget* containers2 = QWidget::createWindowContainer(&window2, baseWidget); - containers2->setGeometry(50, 50, 300, 150); + QWidget *containers2 = QWidget::createWindowContainer(&window2, baseWidget); + containers->setGeometry(0, 0, 100, 100); + containers2->setGeometry(100, 100, 100, 100); // Show and activate the main window main.show(); - QTest::qWaitForWindowActive(&main); + QVERIFY(QTest::qWaitForWindowExposed(&main)); // Activate window, test press and release events auto activateWindowAndTestPress = [] (QQuickView* testWindow) { testWindow->requestActivate(); - QTest::qWaitForWindowActive(testWindow); + QVERIFY(QTest::qWaitForWindowActive(testWindow)); QTest::mousePress(testWindow, Qt::LeftButton, Qt::NoModifier, QPoint(10, 10)); QCOMPARE(testWindow->rootObject()->property("lastEvent").toString(), QString("pressed")); QTest::mouseRelease(testWindow, Qt::LeftButton, Qt::NoModifier, QPoint(10, 10)); -- cgit v1.2.3