diff options
| author | Kai Koehne <kai.koehne@qt.io> | 2018-08-13 09:31:07 +0200 |
|---|---|---|
| committer | Kai Koehne <kai.koehne@qt.io> | 2018-08-14 09:34:21 +0000 |
| commit | 4bbc782fc70f30e8b1530e87c85a8f453deb051d (patch) | |
| tree | 4eb807c6feba3dc6e8bde3fbff6a68e940c620c7 /tools | |
| parent | e75a541dbb27119c31ffd6dd36c38cd8a81f2431 (diff) | |
Adapt to QMetaObjectPrivate changes in qtbase
Commit 1c623bc6d1c0a7c in qtbase bumped
QMetaObjectPrivate::OutputRevision, which caused qtactiveqt builds
to fail.
Task-number: QTBUG-69911
Change-Id: I40be892d8c80fdc4706ae176bbafb302fdd00921
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/dumpcpp/main.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/dumpcpp/main.cpp b/tools/dumpcpp/main.cpp index 2baad0e..caf4009 100644 --- a/tools/dumpcpp/main.cpp +++ b/tools/dumpcpp/main.cpp @@ -692,7 +692,7 @@ void generateMethodParameters(QTextStream &out, const QMetaObject *mo, const QMe void generateClassImpl(QTextStream &out, const QMetaObject *mo, const QByteArray &className, const QByteArray &nameSpace, ObjectCategories category) { - Q_STATIC_ASSERT_X(QMetaObjectPrivate::OutputRevision == 7, "dumpcpp should generate the same version as moc"); + Q_STATIC_ASSERT_X(QMetaObjectPrivate::OutputRevision == 7 || QMetaObjectPrivate::OutputRevision == 8, "dumpcpp should generate the same version as moc"); QByteArray qualifiedClassName; if (!nameSpace.isEmpty()) |