diff options
Diffstat (limited to 'tests/auto/widgets/dialogs')
-rw-r--r-- | tests/auto/widgets/dialogs/qcolordialog/tst_qcolordialog.cpp | 10 | ||||
-rw-r--r-- | tests/auto/widgets/dialogs/qfiledialog/tst_qfiledialog.cpp | 3 |
2 files changed, 10 insertions, 3 deletions
diff --git a/tests/auto/widgets/dialogs/qcolordialog/tst_qcolordialog.cpp b/tests/auto/widgets/dialogs/qcolordialog/tst_qcolordialog.cpp index fa50d10488..e4e4fda1ca 100644 --- a/tests/auto/widgets/dialogs/qcolordialog/tst_qcolordialog.cpp +++ b/tests/auto/widgets/dialogs/qcolordialog/tst_qcolordialog.cpp @@ -60,6 +60,7 @@ private slots: void defaultOkButton(); void native_activeModalWidget(); void task247349_alpha(); + void QTBUG_43548_initialColor(); }; class TestNativeDialog : public QColorDialog @@ -162,5 +163,14 @@ void tst_QColorDialog::task247349_alpha() QCOMPARE(alpha, qAlpha(dialog.currentColor().rgba())); } +void tst_QColorDialog::QTBUG_43548_initialColor() +{ + QColorDialog dialog; + dialog.setOption(QColorDialog::DontUseNativeDialog); + dialog.setCurrentColor(QColor(Qt::red)); + QColor a(Qt::red); + QCOMPARE(a, dialog.currentColor()); +} + QTEST_MAIN(tst_QColorDialog) #include "tst_qcolordialog.moc" diff --git a/tests/auto/widgets/dialogs/qfiledialog/tst_qfiledialog.cpp b/tests/auto/widgets/dialogs/qfiledialog/tst_qfiledialog.cpp index 92200618d6..92f768586a 100644 --- a/tests/auto/widgets/dialogs/qfiledialog/tst_qfiledialog.cpp +++ b/tests/auto/widgets/dialogs/qfiledialog/tst_qfiledialog.cpp @@ -1299,9 +1299,6 @@ void tst_QFiledialog::clearLineEdit() #endif QTest::qWait(2000); -#ifdef Q_OS_MAC - QEXPECT_FAIL("", "QTBUG-23703", Abort); -#endif QVERIFY(fd.directory().absolutePath() != QDir::home().absolutePath()); QVERIFY(!lineEdit->text().isEmpty()); |