diff options
| author | Jędrzej Nowacki <jedrzej.nowacki@digia.com> | 2014-07-10 13:43:18 +0200 |
|---|---|---|
| committer | Mitch Curtis <mitch.curtis@digia.com> | 2014-07-14 00:11:35 +0200 |
| commit | 607462019a1da6241d3f4b6bf6356b7dc0a413d0 (patch) | |
| tree | c34f680205b4309bfff5e35b6141a76718ea314a | |
| parent | b6bce68a64ac25489b5cca825ab6840e3fca21ee (diff) | |
Speedup qDebug() << QDate(...)
We really do not need to do string parsing there.
Change-Id: Ie2277d9ff0d0445285b7108023941af111d9baca
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| -rw-r--r-- | src/corelib/tools/qdatetime.cpp | 2 | ||||
| -rw-r--r-- | tests/auto/corelib/tools/qdate/tst_qdate.cpp | 9 |
2 files changed, 10 insertions, 1 deletions
diff --git a/src/corelib/tools/qdatetime.cpp b/src/corelib/tools/qdatetime.cpp index d6f1d6c942..2dce60c1d5 100644 --- a/src/corelib/tools/qdatetime.cpp +++ b/src/corelib/tools/qdatetime.cpp @@ -4976,7 +4976,7 @@ QDataStream &operator>>(QDataStream &in, QDateTime &dateTime) #if !defined(QT_NO_DEBUG_STREAM) && !defined(QT_NO_DATESTRING) QDebug operator<<(QDebug dbg, const QDate &date) { - dbg.nospace() << "QDate(" << date.toString(QStringLiteral("yyyy-MM-dd")) << ')'; + dbg.nospace() << "QDate(" << date.toString(Qt::ISODate) << ')'; return dbg.space(); } diff --git a/tests/auto/corelib/tools/qdate/tst_qdate.cpp b/tests/auto/corelib/tools/qdate/tst_qdate.cpp index 807dcf5cbe..97787e9cbd 100644 --- a/tests/auto/corelib/tools/qdate/tst_qdate.cpp +++ b/tests/auto/corelib/tools/qdate/tst_qdate.cpp @@ -104,6 +104,7 @@ private slots: void longMonthName() const; void standaloneLongMonthName() const; void roundtrip() const; + void qdebug() const; private: QDate defDate() const { return QDate(1900, 1, 1); } QDate invalidDate() const { return QDate(); } @@ -1476,5 +1477,13 @@ void tst_QDate::roundtrip() const } } +void tst_QDate::qdebug() const +{ + QTest::ignoreMessage(QtDebugMsg, "QDate(\"\")"); + qDebug() << QDate(); + QTest::ignoreMessage(QtDebugMsg, "QDate(\"1983-08-07\")"); + qDebug() << QDate(1983, 8, 7); +} + QTEST_APPLESS_MAIN(tst_QDate) #include "tst_qdate.moc" |