diff options
| author | Marc Mutz <marc.mutz@kdab.com> | 2014-07-29 23:51:45 +0200 |
|---|---|---|
| committer | Marc Mutz <marc.mutz@kdab.com> | 2014-08-06 14:55:36 +0200 |
| commit | 18bb58a5a6f6669d6e55cc1e58b45a3437610185 (patch) | |
| tree | c58263dd1014183c3db997b1a065f23531ac84d3 /tests/auto/widgets/dialogs/qprogressdialog/tst_qprogressdialog.cpp | |
| parent | 53b781cb120d1f6f70746e065c9b7fb64123e874 (diff) | |
QProgressDialog: fix setBar() not properly adopting the new QProgressBar
The "adoption" code is taken from setLabel().
Task-number: QTBUG-40503
Change-Id: Id512b28eb756b4a80e5701e599e2cbdf5346ff62
Reviewed-by: David Faure <david.faure@kdab.com>
Diffstat (limited to 'tests/auto/widgets/dialogs/qprogressdialog/tst_qprogressdialog.cpp')
| -rw-r--r-- | tests/auto/widgets/dialogs/qprogressdialog/tst_qprogressdialog.cpp | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/tests/auto/widgets/dialogs/qprogressdialog/tst_qprogressdialog.cpp b/tests/auto/widgets/dialogs/qprogressdialog/tst_qprogressdialog.cpp index 86b9d7eee2..4e54c445b8 100644 --- a/tests/auto/widgets/dialogs/qprogressdialog/tst_qprogressdialog.cpp +++ b/tests/auto/widgets/dialogs/qprogressdialog/tst_qprogressdialog.cpp @@ -218,7 +218,6 @@ void tst_QProgressDialog::settingCustomWidgets() QVERIFY(!dlg.isAncestorOf(bar)); dlg.setBar(bar); - QEXPECT_FAIL("", "QProgressBar doesn't adopt custom progress bar as children", Continue); QVERIFY(dlg.isAncestorOf(bar)); QTest::ignoreMessage(QtWarningMsg, "QProgressDialog::setBar: Attempt to set the same progress bar again"); dlg.setBar(bar); // setting the same widget again should not crash @@ -227,13 +226,7 @@ void tst_QProgressDialog::settingCustomWidgets() QVERIFY(!l); QVERIFY(!btn); -#if 0 - QEXPECT_FAIL("", "QProgressBar doesn't clean up custom progress bars", Continue); QVERIFY(!bar); -#else - // make cleanup() pass - delete bar; -#endif } class QTestTranslator : public QTranslator |