diff options
| author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2012-04-16 10:30:47 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-04-17 10:38:28 +0200 |
| commit | 7e0beba891cb963a1d535bd45b0be78b43b8d07f (patch) | |
| tree | 66c49d81039cecc1e2b0866c59324e77934886e5 | |
| parent | 16b53b2f0e3f8f64a59c465493a6209eb7f9ab47 (diff) | |
Skip tests toolbar-dialog/widget_window.
To enable merging the api_changes branch.
Task-number: QTBUG-25331
Change-Id: I90d32ca0bd96eed62bae5f01316d6360a3b435c8
Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
| -rw-r--r-- | tests/auto/widgets/dialogs/qdialog/tst_qdialog.cpp | 4 | ||||
| -rw-r--r-- | tests/auto/widgets/kernel/qwidget_window/tst_qwidget_window.cpp | 3 |
2 files changed, 7 insertions, 0 deletions
diff --git a/tests/auto/widgets/dialogs/qdialog/tst_qdialog.cpp b/tests/auto/widgets/dialogs/qdialog/tst_qdialog.cpp index e46d905022..0e19e88793 100644 --- a/tests/auto/widgets/dialogs/qdialog/tst_qdialog.cpp +++ b/tests/auto/widgets/dialogs/qdialog/tst_qdialog.cpp @@ -388,12 +388,16 @@ void tst_QDialog::toolDialogPosition() #if defined(Q_OS_WINCE) QSKIP("No real support for Qt::Tool on WinCE"); #endif +#ifdef Q_OS_WIN + QSKIP("QTBUG-25331 - positioning failure"); +#endif QDialog dialog(0, Qt::Tool); dialog.move(QPoint(100,100)); const QPoint beforeShowPosition = dialog.pos(); dialog.show(); const QPoint afterShowPosition = dialog.pos(); QCOMPARE(afterShowPosition, beforeShowPosition); + } class Dialog : public QDialog diff --git a/tests/auto/widgets/kernel/qwidget_window/tst_qwidget_window.cpp b/tests/auto/widgets/kernel/qwidget_window/tst_qwidget_window.cpp index 78d9d36bc9..be33381620 100644 --- a/tests/auto/widgets/kernel/qwidget_window/tst_qwidget_window.cpp +++ b/tests/auto/widgets/kernel/qwidget_window/tst_qwidget_window.cpp @@ -91,6 +91,9 @@ void tst_QWidget_window::cleanupTestCase() void tst_QWidget_window::tst_move_show() { +#ifdef Q_OS_WIN + QSKIP("QTBUG-25331"); +#endif QWidget w; w.move(100, 100); w.show(); |