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>
bb10
Friedemann Kleint 2012-04-16 10:30:47 +02:00 committed by Qt by Nokia
parent 16b53b2f0e
commit 7e0beba891
2 changed files with 7 additions and 0 deletions

View File

@ -387,6 +387,9 @@ 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));
@ -394,6 +397,7 @@ void tst_QDialog::toolDialogPosition()
dialog.show();
const QPoint afterShowPosition = dialog.pos();
QCOMPARE(afterShowPosition, beforeShowPosition);
}
class Dialog : public QDialog

View File

@ -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();