diff options
| author | Edward Welbourne <edward.welbourne@qt.io> | 2020-07-20 16:59:55 +0200 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2020-08-18 12:55:38 +0200 |
| commit | 2584998c66f866770e0d4237828f119213aae663 (patch) | |
| tree | 22c2482dfeb08ae468687a3555208325656156d6 /src/tools | |
| parent | 5247af96e3bdf2f28f6e18007fb7e3a7458e0103 (diff) | |
| download | qtbase-2584998c66f866770e0d4237828f119213aae663.tar.gz | |
Follow through on ### Qt6 comments in qglobal.h
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ö <martin@martin.st>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/moc/generator.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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"); |