diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-06-29 01:02:07 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-06-29 01:02:07 +0200 |
| commit | dd333172e2ade1db6d0af72b4ed44262c2b4d8c7 (patch) | |
| tree | 16301a9b938826cf4b78b751907378d96423c5d0 /src/qml/qml/qqmlmetatype_p.h | |
| parent | 3d266d90cb920375bb856844baea290e52355aad (diff) | |
| parent | ffeaac704efc9eb85464d0a401d98e28991ec4d3 (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: I800f39ea59efd6049d3226ec27b8ecb3f6e9ae28
Diffstat (limited to 'src/qml/qml/qqmlmetatype_p.h')
| -rw-r--r-- | src/qml/qml/qqmlmetatype_p.h | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/src/qml/qml/qqmlmetatype_p.h b/src/qml/qml/qqmlmetatype_p.h index 6df439cd7a..4a5e4ba266 100644 --- a/src/qml/qml/qqmlmetatype_p.h +++ b/src/qml/qml/qqmlmetatype_p.h @@ -155,7 +155,6 @@ public: static void protectNamespace(const QString &); static void setTypeRegistrationNamespace(const QString &); - static QStringList typeRegistrationFailures(); static QMutex *typeRegistrationLock(); @@ -361,6 +360,18 @@ private: int m_minor; }; +class Q_AUTOTEST_EXPORT QQmlMetaTypeRegistrationFailureRecorder +{ + QStringList _failures; + +public: + QQmlMetaTypeRegistrationFailureRecorder(); + ~QQmlMetaTypeRegistrationFailureRecorder(); + + QStringList failures() const + { return _failures; } +}; + QT_END_NAMESPACE #endif // QQMLMETATYPE_P_H |