diff options
Diffstat (limited to 'util')
| -rwxr-xr-x | util/edid/qedidvendortable.py | 9 | ||||
| -rw-r--r-- | util/glgen/codegenerator.cpp | 4 |
2 files changed, 11 insertions, 2 deletions
diff --git a/util/edid/qedidvendortable.py b/util/edid/qedidvendortable.py index 6d30f3a60d..500abf0890 100755 --- a/util/edid/qedidvendortable.py +++ b/util/edid/qedidvendortable.py @@ -82,6 +82,15 @@ header = """ #ifndef QEDIDVENDORTABLE_P_H #define QEDIDVENDORTABLE_P_H +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// + QT_BEGIN_NAMESPACE typedef struct VendorTable { diff --git a/util/glgen/codegenerator.cpp b/util/glgen/codegenerator.cpp index 70cd3a7931..4627daa48b 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); @@ -989,7 +989,7 @@ void CodeGenerator::writeExtensionClassDeclaration(QTextStream &stream, const QS stream << QStringLiteral(" ") << className << QStringLiteral("();") << endl << endl; // Base class virtual function(s) - QString resolveFunction = QStringLiteral(" bool initializeOpenGLFunctions() Q_DECL_FINAL;"); + QString resolveFunction = QStringLiteral(" bool initializeOpenGLFunctions() final;"); stream << resolveFunction << endl << endl; } |