diff options
| -rw-r--r-- | src/widgets/widgets/qdatetimeedit.cpp | 4 | ||||
| -rw-r--r-- | tests/auto/widgets/widgets/qdatetimeedit/tst_qdatetimeedit.cpp | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/src/widgets/widgets/qdatetimeedit.cpp b/src/widgets/widgets/qdatetimeedit.cpp index 3c9d166dee..897e0dce06 100644 --- a/src/widgets/widgets/qdatetimeedit.cpp +++ b/src/widgets/widgets/qdatetimeedit.cpp @@ -2480,7 +2480,7 @@ void QDateTimeEditPrivate::init(const QVariant &var) Q_Q(QDateTimeEdit); switch (var.userType()) { case QMetaType::QDate: - value = var.toDate().startOfDay(); + value = var.toDate().startOfDay(spec); updateTimeSpec(); q->setDisplayFormat(defaultDateFormat); if (sectionNodes.isEmpty()) // ### safeguard for broken locale @@ -2494,7 +2494,7 @@ void QDateTimeEditPrivate::init(const QVariant &var) q->setDisplayFormat("dd/MM/yyyy hh:mm:ss"_L1); break; case QMetaType::QTime: - value = QDateTime(QDATETIMEEDIT_DATE_INITIAL, var.toTime()); + value = QDateTime(QDATETIMEEDIT_DATE_INITIAL, var.toTime(), spec); updateTimeSpec(); q->setDisplayFormat(defaultTimeFormat); if (sectionNodes.isEmpty()) // ### safeguard for broken locale diff --git a/tests/auto/widgets/widgets/qdatetimeedit/tst_qdatetimeedit.cpp b/tests/auto/widgets/widgets/qdatetimeedit/tst_qdatetimeedit.cpp index 1328e11f03..fe20de9d86 100644 --- a/tests/auto/widgets/widgets/qdatetimeedit/tst_qdatetimeedit.cpp +++ b/tests/auto/widgets/widgets/qdatetimeedit/tst_qdatetimeedit.cpp @@ -506,7 +506,6 @@ void tst_QDateTimeEdit::constructor_qdate() { QDateEdit dte(parameter); dte.show(); - QEXPECT_FAIL("", "QTBUG-105322: constructors use wrong spec", Continue); if (QByteArrayView(QTest::currentDataTag()) == "invalid") QCOMPARE(dte.date(), QDate(2000, 1, 1)); else @@ -546,7 +545,6 @@ void tst_QDateTimeEdit::constructor_qtime() { QTimeEdit dte(parameter); dte.show(); - QEXPECT_FAIL("", "QTBUG-105322: constructors use wrong spec", Abort); if (QByteArrayView(QTest::currentDataTag()) == "invalid") QCOMPARE(dte.time(), QTime(0, 0)); else |