diff options
author | J-P Nurmi <jpnurmi@theqtcompany.com> | 2016-01-31 16:05:25 +0100 |
---|---|---|
committer | J-P Nurmi <jpnurmi@theqtcompany.com> | 2016-01-31 17:38:37 +0100 |
commit | 19b967506deea84a0d56375e5bcca48168a3cfc8 (patch) | |
tree | bf488dc01069b7850cceff182c2241ed13db69c6 /tests | |
parent | 8318deb165047d592523ec0b2fd10510d4953b37 (diff) | |
parent | 7fc567eda8a187e365f4c29c6e8f08440bf31218 (diff) |
Merge remote-tracking branch 'origin/5.6' into dev
Conflicts:
src/templates/qquickpopup.cpp
src/templates/qquickpopup_p_p.h
src/templates/qquickspinbox_p.h
Change-Id: Ief25ad2d27410f62e90879f60499ed87359406c3
Diffstat (limited to 'tests')
-rw-r--r-- | tests/auto/applicationwindow/tst_applicationwindow.cpp | 5 | ||||
-rw-r--r-- | tests/manual/gifs/data/qtlabscontrols-tabbar.qml | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/tests/auto/applicationwindow/tst_applicationwindow.cpp b/tests/auto/applicationwindow/tst_applicationwindow.cpp index 4b392e99..f78d1f66 100644 --- a/tests/auto/applicationwindow/tst_applicationwindow.cpp +++ b/tests/auto/applicationwindow/tst_applicationwindow.cpp @@ -437,6 +437,11 @@ void tst_applicationwindow::attachedProperties() QVERIFY(!childItem->property("attached_header").value<QQuickItem *>()); QVERIFY(!childItem->property("attached_footer").value<QQuickItem *>()); QVERIFY(!childItem->property("attached_overlay").value<QQuickItem *>()); + + // ### A temporary workaround to unblock the CI until the crash caused + // by https://codereview.qt-project.org/#/c/108517/ has been fixed... + window->hide(); + qApp->processEvents(); } void tst_applicationwindow::font() diff --git a/tests/manual/gifs/data/qtlabscontrols-tabbar.qml b/tests/manual/gifs/data/qtlabscontrols-tabbar.qml index 55bf5e27..8ca14721 100644 --- a/tests/manual/gifs/data/qtlabscontrols-tabbar.qml +++ b/tests/manual/gifs/data/qtlabscontrols-tabbar.qml @@ -43,7 +43,7 @@ import QtQuick.Window 2.0 import Qt.labs.controls 1.0 Window { - width: 200 + width: 300 height: tabBar.height visible: true |