From 2584998c66f866770e0d4237828f119213aae663 Mon Sep 17 00:00:00 2001 From: Edward Welbourne Date: Mon, 20 Jul 2020 16:59:55 +0200 Subject: Follow through on ### Qt6 comments in qglobal.h MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Left the translation NOOP for later, pending advice on how to fix QIODevice, which doesn't compile without them. Task-number: QTBUG-85700 Change-Id: Icc423ecabb43714d98b5d9b0f9a96c5bb6ef1d78 Reviewed-by: Martin Storsjö Reviewed-by: Lars Knoll --- src/tools/moc/generator.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/tools') diff --git a/src/tools/moc/generator.cpp b/src/tools/moc/generator.cpp index 06b2ffc06f..b09e567b59 100644 --- a/src/tools/moc/generator.cpp +++ b/src/tools/moc/generator.cpp @@ -537,7 +537,7 @@ void Generator::generateCode() // // Finally create and initialize the static meta object // - fprintf(out, "QT_INIT_METAOBJECT const QMetaObject %s::staticMetaObject = { {\n", cdef->qualified.constData()); + fprintf(out, "const QMetaObject %s::staticMetaObject = { {\n", cdef->qualified.constData()); if (isQObject) fprintf(out, " nullptr,\n"); -- cgit v1.2.3