diff options
| author | Marc Mutz <marc.mutz@qt.io> | 2022-05-04 11:27:09 +0200 |
|---|---|---|
| committer | Marc Mutz <marc.mutz@qt.io> | 2022-05-04 12:30:18 +0200 |
| commit | 2c4258caec02bc66c79fc53351bf7c90e791279a (patch) | |
| tree | fa938503e4991a25c270452971bbf642248c2926 /src/imports | |
| parent | 729961eff5e84106f78f1f05ce8e4aed53448f6c (diff) | |
QGfxShaderBuilder: re-do includemocs after adding missing QT_{BEGIN,END}_NAMESPACE
The includemocs script relies on QT_END_NAMESPACE being present to add
the include after it. If the macro is missing, the moc-file include is
silently not added. I've fixed the script to print a warning in that
case and simply append.
Pick-to: 6.3 6.2
Change-Id: Iace45a98b6d7bfad54eb0f5003787566b21c2d28
Reviewed-by: Sona Kurazyan <sona.kurazyan@qt.io>
Diffstat (limited to 'src/imports')
| -rw-r--r-- | src/imports/graphicaleffects5/private/qgfxshaderbuilder.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/imports/graphicaleffects5/private/qgfxshaderbuilder.cpp b/src/imports/graphicaleffects5/private/qgfxshaderbuilder.cpp index 5f19b01..5003477 100644 --- a/src/imports/graphicaleffects5/private/qgfxshaderbuilder.cpp +++ b/src/imports/graphicaleffects5/private/qgfxshaderbuilder.cpp @@ -54,6 +54,8 @@ #include <qmath.h> #include <qnumeric.h> +QT_BEGIN_NAMESPACE + #ifndef GL_MAX_VARYING_COMPONENTS #define GL_MAX_VARYING_COMPONENTS 0x8B4B #endif @@ -518,3 +520,6 @@ QUrl QGfxShaderBuilder::buildShader(const QByteArray &code, return QUrl::fromLocalFile(output->fileName()); } +QT_END_NAMESPACE + +#include "moc_qgfxshaderbuilder_p.cpp" |