diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-04-20 11:19:14 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-04-20 12:31:27 +0200 |
| commit | 7950b6b283549c98f1e0f981c84b68071a13b616 (patch) | |
| tree | cf7281872045ebd57c68e10064ff0f400084aa13 /src/gui/text/qplatformfontdatabase.cpp | |
| parent | 58d2927861d3e57cac4f6db599e209d2bfb17a2c (diff) | |
| parent | 0794d61c822585530243f638687b8a75f0a15d0c (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
src/corelib/tools/qbytearray.h
src/corelib/tools/qdatetime.h
src/corelib/tools/qstring.h
src/corelib/tools/qversionnumber.h
src/plugins/platforms/android/qandroidplatformintegration.cpp
tests/auto/corelib/tools/qhashfunctions/tst_qhashfunctions.cpp
Change-Id: Iefd92a435e687a76cd593099e40d9a9620a1454d
Diffstat (limited to 'src/gui/text/qplatformfontdatabase.cpp')
| -rw-r--r-- | src/gui/text/qplatformfontdatabase.cpp | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/src/gui/text/qplatformfontdatabase.cpp b/src/gui/text/qplatformfontdatabase.cpp index 599b18ac05..4ad826e87b 100644 --- a/src/gui/text/qplatformfontdatabase.cpp +++ b/src/gui/text/qplatformfontdatabase.cpp @@ -45,6 +45,7 @@ #include <qpa/qplatformscreen.h> #include <QtCore/QLibraryInfo> #include <QtCore/QDir> +#include <QtCore/QMetaEnum> #include <algorithm> #include <iterator> @@ -201,6 +202,26 @@ QSupportedWritingSystems &QSupportedWritingSystems::operator=(const QSupportedWr return *this; } +#ifndef QT_NO_DEBUG_STREAM +QDebug operator<<(QDebug debug, const QSupportedWritingSystems &sws) +{ + QMetaObject mo = QFontDatabase::staticMetaObject; + QMetaEnum me = mo.enumerator(mo.indexOfEnumerator("WritingSystem")); + + QDebugStateSaver saver(debug); + debug.nospace() << "QSupportedWritingSystems("; + int i = sws.d->vector.indexOf(true); + while (i > 0) { + debug << me.valueToKey(i); + i = sws.d->vector.indexOf(true, i + 1); + if (i > 0) + debug << ", "; + } + debug << ")"; + return debug; +} +#endif + /*! Destroys the supported writing systems object. */ |