diff options
| author | J-P Nurmi <jpnurmi@digia.com> | 2014-03-03 18:02:32 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-03-04 09:23:59 +0100 |
| commit | c584c92cc2c1ccb97e68207c701051306cdf025b (patch) | |
| tree | 3e5f926e68784fd3354b9341a24b42b2cbf6daae /tests | |
| parent | 42a9312f055cc8371c0b52b8ff4ffdae9a9c8691 (diff) | |
| download | qtquickcontrols-c584c92cc2c1ccb97e68207c701051306cdf025b.tar.gz | |
Fix tst_applicationwindow::test_minimumHeight()
QQuickWindow::contentItem is now resized in resizeEvent() so
the window must be visible if a test relies on content item's
size.
Change-Id: If354306d80bd2fcf47114d726fa5987c60399b2e
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/controls/data/tst_applicationwindow.qml | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/auto/controls/data/tst_applicationwindow.qml b/tests/auto/controls/data/tst_applicationwindow.qml index 590231f4..a428fe97 100644 --- a/tests/auto/controls/data/tst_applicationwindow.qml +++ b/tests/auto/controls/data/tst_applicationwindow.qml @@ -58,6 +58,7 @@ TestCase { var test_control = 'import QtQuick 2.1; \ import QtQuick.Controls 1.1; \ ApplicationWindow { \ + visible: true; \ width: 100; height: 100; \ property alias contentArea: rect; \ statusBar: StatusBar { \ @@ -80,7 +81,7 @@ TestCase { } ' var window = Qt.createQmlObject(test_control, container, '') - wait(0) + waitForRendering(window.contentItem) var contentArea = window.contentArea var oldHeight = contentArea.height compare(contentArea.height, 100) |