diff options
author | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2024-01-22 22:31:51 +0200 |
---|---|---|
committer | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2024-01-22 22:31:51 +0200 |
commit | 67934c103800bae50c2ec1977758d40fa8e4e507 (patch) | |
tree | 77a44eb54a75a35bd10f3c63be588889b697e451 /examples/opengl/openglwindow | |
parent | 694575a59b5370afc494fbf700eee8db1d1ec091 (diff) | |
parent | ca128e25119c0b259d083567c796bfa67b100a42 (diff) |
Merge remote-tracking branch 'origin/tqtc/lts-6.2.8' into tqtc/lts-6.2-opensource
Conflicts solved in a file:
src/corelib/io/qstandardpaths_android.cpp
Change-Id: Ie8cef36c1379679ca358df50c56b3c25aa15c5d6
Diffstat (limited to 'examples/opengl/openglwindow')
-rw-r--r-- | examples/opengl/openglwindow/openglwindow.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/examples/opengl/openglwindow/openglwindow.h b/examples/opengl/openglwindow/openglwindow.h index 8db943ddde..f824c22c9f 100644 --- a/examples/opengl/openglwindow/openglwindow.h +++ b/examples/opengl/openglwindow/openglwindow.h @@ -48,6 +48,9 @@ ** ****************************************************************************/ +#ifndef OPENGLWINDOW_H +#define OPENGLWINDOW_H + #include <QWindow> #include <QOpenGLFunctions> @@ -89,3 +92,4 @@ private: }; //! [1] +#endif // OPENGLWINDOW_H |