diff options
| author | Karsten Heimrich <karsten.heimrich@qt.io> | 2020-06-10 13:47:12 +0200 |
|---|---|---|
| committer | Karsten Heimrich <karsten.heimrich@qt.io> | 2020-06-10 14:03:55 +0200 |
| commit | 8d48dbbe02b152763afda62ba2ff1c90e0205897 (patch) | |
| tree | f6d012be31fd0ed369aa623e28b83c37bdb1688c | |
| parent | ec019ce68cf70d42d9857711923f28e79a07656e (diff) | |
Some minor fixes to build against latest Qt dev branch
Change-Id: Ice7a1064c95fcb6a73904fdc188c9b0363f17150
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
| -rw-r--r-- | dependencies.yaml | 2 | ||||
| -rw-r--r-- | tools/dumpcpp/main.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/dependencies.yaml b/dependencies.yaml index 2e75d8e..e02a885 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -1,4 +1,4 @@ dependencies: ../qtbase: - ref: 2eee9e6fcf9b70681c5d9202d1509d176e48fc31 + ref: 56f40cdca6b589beec5c2cb803633985ca4c59d1 required: true diff --git a/tools/dumpcpp/main.cpp b/tools/dumpcpp/main.cpp index baabdb4..414acf3 100644 --- a/tools/dumpcpp/main.cpp +++ b/tools/dumpcpp/main.cpp @@ -541,7 +541,7 @@ bool generateClassImpl(QTextStream &out, const QMetaObject *mo, const QByteArray const QByteArray &nameSpace, ObjectCategories category, QString *errorString) { - Q_STATIC_ASSERT_X(QMetaObjectPrivate::OutputRevision == 8, "dumpcpp should generate the same version as moc"); + Q_STATIC_ASSERT_X(QMetaObjectPrivate::OutputRevision == 9, "dumpcpp should generate the same version as moc"); QByteArray qualifiedClassName; if (!nameSpace.isEmpty()) |