diff options
author | Kevin Funk <kevin.funk@kdab.com> | 2017-09-18 10:36:49 +0200 |
---|---|---|
committer | Kevin Funk <kevin.funk@kdab.com> | 2017-09-19 11:53:42 +0000 |
commit | 47c92fbb0b588b443cead18a5aad5a2b5ad9e4d7 (patch) | |
tree | 330914ff8225867e19b9ed5e049813d9f1e5ec08 /util/glgen | |
parent | 93dd85141b35460a83dac86083581ba1c1975927 (diff) |
Replace Q_DECL_OVERRIDE with override where possible
Remaining uses of Q_DECL_OVERRIDE are in:
src/corelib/global/qcompilerdetection.h
src/corelib/global/qglobal.cpp
doc/global/qt-cpp-defines.qdocconf
(definition and documentation of Q_DECL_OVERRIDE)
tests/manual/qcursor/qcursorhighdpi/main.cpp
(a test executable compilable both under Qt4 and Qt5)
Change-Id: Ib9b05d829add69e98a86238274b6a1fcb19b49ba
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io>
Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
Diffstat (limited to 'util/glgen')
-rw-r--r-- | util/glgen/codegenerator.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/util/glgen/codegenerator.cpp b/util/glgen/codegenerator.cpp index 70cd3a7931..9fbfc3bd8d 100644 --- a/util/glgen/codegenerator.cpp +++ b/util/glgen/codegenerator.cpp @@ -530,7 +530,7 @@ void CodeGenerator::writePublicClassDeclaration(const QString &baseFileName, stream << QStringLiteral("public:") << endl; stream << QString(QStringLiteral(" %1();")).arg(className) << endl; stream << QString(QStringLiteral(" ~%1();")).arg(className) << endl << endl; - stream << QStringLiteral(" bool initializeOpenGLFunctions() Q_DECL_OVERRIDE;") << endl << endl; + stream << QStringLiteral(" bool initializeOpenGLFunctions() override;") << endl << endl; // Get the functions needed for this class and declare them FunctionCollection functionSet = functionCollection(versionProfile); |