From 8d48dbbe02b152763afda62ba2ff1c90e0205897 Mon Sep 17 00:00:00 2001 From: Karsten Heimrich Date: Wed, 10 Jun 2020 13:47:12 +0200 Subject: Some minor fixes to build against latest Qt dev branch Change-Id: Ice7a1064c95fcb6a73904fdc188c9b0363f17150 Reviewed-by: Lars Knoll --- dependencies.yaml | 2 +- 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()) -- cgit v1.2.3