diff options
| -rw-r--r-- | src/widgets/widgets/qdatetimeedit.cpp | 4 | ||||
| -rw-r--r-- | tests/auto/widgets/widgets/qdatetimeedit/tst_qdatetimeedit.cpp | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/src/widgets/widgets/qdatetimeedit.cpp b/src/widgets/widgets/qdatetimeedit.cpp index 5e61a87fd7..3c9d166dee 100644 --- a/src/widgets/widgets/qdatetimeedit.cpp +++ b/src/widgets/widgets/qdatetimeedit.cpp @@ -1597,7 +1597,7 @@ QTimeEdit::QTimeEdit(QWidget *parent) */ QTimeEdit::QTimeEdit(QTime time, QWidget *parent) - : QDateTimeEdit(time, QMetaType::QTime, parent) + : QDateTimeEdit(time.isValid() ? time : QDATETIMEEDIT_TIME_MIN, QMetaType::QTime, parent) { connect(this, &QTimeEdit::timeChanged, this, &QTimeEdit::userTimeChanged); } @@ -1667,7 +1667,7 @@ QDateEdit::QDateEdit(QWidget *parent) */ QDateEdit::QDateEdit(QDate date, QWidget *parent) - : QDateTimeEdit(date, QMetaType::QDate, parent) + : QDateTimeEdit(date.isValid() ? date : QDATETIMEEDIT_DATE_INITIAL, QMetaType::QDate, parent) { connect(this, &QDateEdit::dateChanged, this, &QDateEdit::userDateChanged); } diff --git a/tests/auto/widgets/widgets/qdatetimeedit/tst_qdatetimeedit.cpp b/tests/auto/widgets/widgets/qdatetimeedit/tst_qdatetimeedit.cpp index 48955bc8a0..1328e11f03 100644 --- a/tests/auto/widgets/widgets/qdatetimeedit/tst_qdatetimeedit.cpp +++ b/tests/auto/widgets/widgets/qdatetimeedit/tst_qdatetimeedit.cpp @@ -506,8 +506,7 @@ void tst_QDateTimeEdit::constructor_qdate() { QDateEdit dte(parameter); dte.show(); - QEXPECT_FAIL("normal", "QTBUG-105322: constructors use wrong spec", Continue); - QEXPECT_FAIL("invalid", "Constructor neglects default replacement of invalid", Continue); + QEXPECT_FAIL("", "QTBUG-105322: constructors use wrong spec", Continue); if (QByteArrayView(QTest::currentDataTag()) == "invalid") QCOMPARE(dte.date(), QDate(2000, 1, 1)); else |