diff options
author | Liang Qi <liang.qi@qt.io> | 2018-09-27 11:08:55 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2018-09-27 11:08:55 +0200 |
commit | d0fcaa7eaaae85ddbf0a78efa59b341380c101a4 (patch) | |
tree | 9b3422ae33ef9dfcda0af228c56c3d2eeed7b0c3 /src/testlib | |
parent | f6ce2d42b3cbe049ebcf1a2349a5cd4dde2c6d24 (diff) | |
parent | 5e64957ee4162ecf4456306a530a68761c2b127f (diff) |
Merge remote-tracking branch 'origin/5.11' into 5.12
Conflicts:
src/corelib/global/qconfig-bootstrapped.h
src/widgets/util/qcompleter.cpp
Change-Id: I4f44f0f074982530f2f2e750ce696230b2754cf3
Diffstat (limited to 'src/testlib')
-rw-r--r-- | src/testlib/qtest.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/testlib/qtest.h b/src/testlib/qtest.h index 927b68bd27..2578037946 100644 --- a/src/testlib/qtest.h +++ b/src/testlib/qtest.h @@ -87,7 +87,7 @@ template<> inline char *toString(const QByteArray &ba) return QTest::toPrettyCString(ba.constData(), ba.length()); } -#ifndef QT_NO_DATESTRING +#if QT_CONFIG(datestring) template<> inline char *toString(const QTime &time) { return time.isValid() @@ -108,7 +108,7 @@ template<> inline char *toString(const QDateTime &dateTime) ? qstrdup(qPrintable(dateTime.toString(QStringViewLiteral("yyyy/MM/dd hh:mm:ss.zzz[t]")))) : qstrdup("Invalid QDateTime"); } -#endif // QT_NO_DATESTRING +#endif // datestring template<> inline char *toString(const QChar &c) { |