summaryrefslogtreecommitdiffstats
path: root/src/opengl
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@intel.com>2015-07-09 15:20:59 -0700
committerThiago Macieira <thiago.macieira@intel.com>2022-02-24 12:07:00 -0800
commit75e0d1b5c193cb1d421c44ef2be04d5f43739a91 (patch)
tree07cc9d6054476121c4ec62805e7c7bd5f06efcd9 /src/opengl
parent51ff94ec9224e35669428ec700bf17a1d4a094a8 (diff)
Make sure all qtbase private headers include at least one other
See script in qtbase/util/includeprivate for the rules. Since these files are being touched anyway, I also ran the updatecopyright.pl script too. Change-Id: Ib056b47dde3341ef9a52ffff13ef677e471674b6 Reviewed-by: Marc Mutz <marc.mutz@qt.io>
Diffstat (limited to 'src/opengl')
-rw-r--r--src/opengl/qopenglcompositor_p.h3
-rw-r--r--src/opengl/qopenglcompositorbackingstore_p.h3
-rw-r--r--src/opengl/qopenglcustomshaderstage_p.h3
-rw-r--r--src/opengl/qopenglpaintdevice_p.h3
-rw-r--r--src/opengl/qopenglshadercache_p.h3
-rw-r--r--src/opengl/qopengltexturehelper_p.h1
-rw-r--r--src/opengl/qopenglvertexarrayobject_p.h3
-rw-r--r--src/opengl/qvkconvenience_p.h1
8 files changed, 14 insertions, 6 deletions
diff --git a/src/opengl/qopenglcompositor_p.h b/src/opengl/qopenglcompositor_p.h
index d0d1c9303d..27ede567a8 100644
--- a/src/opengl/qopenglcompositor_p.h
+++ b/src/opengl/qopenglcompositor_p.h
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2020 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
**
** This file is part of the plugins of the Qt Toolkit.
@@ -56,6 +56,7 @@
#include <QtCore/QTimer>
#include <QtOpenGL/QOpenGLTextureBlitter>
#include <QtGui/QMatrix4x4>
+#include <QtCore/private/qglobal_p.h>
QT_BEGIN_NAMESPACE
diff --git a/src/opengl/qopenglcompositorbackingstore_p.h b/src/opengl/qopenglcompositorbackingstore_p.h
index fcce75ab4e..6c61ab1bff 100644
--- a/src/opengl/qopenglcompositorbackingstore_p.h
+++ b/src/opengl/qopenglcompositorbackingstore_p.h
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2020 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
**
** This file is part of the plugins of the Qt Toolkit.
@@ -56,6 +56,7 @@
#include <qpa/qplatformbackingstore.h>
#include <QImage>
#include <QRegion>
+#include <private/qglobal_p.h>
QT_BEGIN_NAMESPACE
diff --git a/src/opengl/qopenglcustomshaderstage_p.h b/src/opengl/qopenglcustomshaderstage_p.h
index 255c115e3c..0e63acbcaa 100644
--- a/src/opengl/qopenglcustomshaderstage_p.h
+++ b/src/opengl/qopenglcustomshaderstage_p.h
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2019 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
**
** This file is part of the QtOpenGL module of the Qt Toolkit.
@@ -53,6 +53,7 @@
#include <QtOpenGL/qtopenglglobal.h>
#include <QOpenGLShaderProgram>
+#include <private/qglobal_p.h>
QT_BEGIN_NAMESPACE
diff --git a/src/opengl/qopenglpaintdevice_p.h b/src/opengl/qopenglpaintdevice_p.h
index f4f02e7b57..a23d89252f 100644
--- a/src/opengl/qopenglpaintdevice_p.h
+++ b/src/opengl/qopenglpaintdevice_p.h
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2019 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
**
** This file is part of the QtOpenGL module of the Qt Toolkit.
@@ -52,6 +52,7 @@
//
#include <qopenglpaintdevice.h>
+#include <private/qglobal_p.h>
QT_BEGIN_NAMESPACE
diff --git a/src/opengl/qopenglshadercache_p.h b/src/opengl/qopenglshadercache_p.h
index 88efa34216..15ea6d2015 100644
--- a/src/opengl/qopenglshadercache_p.h
+++ b/src/opengl/qopenglshadercache_p.h
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2019 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
**
** This file is part of the QtOpenGL module of the Qt Toolkit.
@@ -52,6 +52,7 @@
#define QOPENGLSHADERCACHE_P_H
#include <QtOpenGL/qtopenglglobal.h>
+#include <QtCore/private/qglobal_p.h>
QT_BEGIN_NAMESPACE
diff --git a/src/opengl/qopengltexturehelper_p.h b/src/opengl/qopengltexturehelper_p.h
index d3c17c33a4..62a6fb5639 100644
--- a/src/opengl/qopengltexturehelper_p.h
+++ b/src/opengl/qopengltexturehelper_p.h
@@ -52,6 +52,7 @@
//
#include <QtOpenGL/qtopenglglobal.h>
+#include <QtCore/private/qglobal_p.h>
#ifndef QT_NO_OPENGL
diff --git a/src/opengl/qopenglvertexarrayobject_p.h b/src/opengl/qopenglvertexarrayobject_p.h
index bd50d86073..c1517dcae8 100644
--- a/src/opengl/qopenglvertexarrayobject_p.h
+++ b/src/opengl/qopenglvertexarrayobject_p.h
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2014 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.com, author Sean Harmer <sean.harmer@kdab.com>
+** Copyright (C) 2020 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.com, author Sean Harmer <sean.harmer@kdab.com>
** Contact: https://www.qt.io/licensing/
**
** This file is part of the QtOpenGL module of the Qt Toolkit.
@@ -54,6 +54,7 @@
#include <QtOpenGL/qtopenglglobal.h>
#include <QtGui/qopengl.h>
+#include <QtCore/private/qglobal_p.h>
QT_BEGIN_NAMESPACE
diff --git a/src/opengl/qvkconvenience_p.h b/src/opengl/qvkconvenience_p.h
index bc8694979b..d4ac489d1a 100644
--- a/src/opengl/qvkconvenience_p.h
+++ b/src/opengl/qvkconvenience_p.h
@@ -53,6 +53,7 @@
#include <QtOpenGL/qtopenglglobal.h>
#include <qvulkaninstance.h>
+#include <private/qglobal_p.h>
QT_BEGIN_NAMESPACE