qiurui
/
qtdeclarative
mirror of https://github.com/qt/qtdeclarative.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Quick: Don't qualify OpenGL includes 

The headers are moving from QtGui to QtOpenGL. By avoiding the
qualification we can keep them compiling either way. Also, add
opengl-private to make the types available.

Also removed the QGraphicsRotation hack to get access to the projected
rotation function of QMatrix4x4. The function is public now.

Task-number: QTBUG-74409
Change-Id: I216e8ca09f8e247f96627b081308e3a57c55c29c
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
This commit is contained in:
Ulf Hermann 2020-01-24 14:11:53 +01:00 committed by Simon Hausmann
parent 936811f91e
commit 406f15ce0e
33 changed files with 59 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
examples/quick/quickwidgets/quickwidget/fbitem.cpp
View File

@ -49,9 +49,9 @@
****************************************************************************/ ****************************************************************************/
#include "fbitem.h" #include "fbitem.h"
#include <QtGui/QOpenGLFramebufferObject> #include <QOpenGLFramebufferObject>
#include <QtGui/QOpenGLContext> #include <QOpenGLContext>
#include <QtGui/QOpenGLFunctions> #include <QOpenGLFunctions>
#include <QtCore/QDebug> #include <QtCore/QDebug>
#if QT_CONFIG(opengl) #if QT_CONFIG(opengl)

2
examples/quick/scenegraph/fboitem/fboinsgrenderer.cpp
View File

@ -51,7 +51,7 @@
#include "fboinsgrenderer.h" #include "fboinsgrenderer.h"
#include "logorenderer.h" #include "logorenderer.h"
#include <QtGui/QOpenGLFramebufferObject> #include <QOpenGLFramebufferObject>
#include <QtQuick/QQuickWindow> #include <QtQuick/QQuickWindow>
#include <qsgsimpletexturenode.h> #include <qsgsimpletexturenode.h>

4
examples/quick/scenegraph/openglunderqml/squircle.cpp
View File

@ -51,8 +51,8 @@
#include "squircle.h" #include "squircle.h"
#include <QtQuick/qquickwindow.h> #include <QtQuick/qquickwindow.h>
#include <QtGui/QOpenGLShaderProgram> #include <QOpenGLShaderProgram>
#include <QtGui/QOpenGLContext> #include <QOpenGLContext>
#include <QtCore/QRunnable> #include <QtCore/QRunnable>
//! [7] //! [7]

4
examples/quick/scenegraph/openglunderqml/squircle.h
View File

@ -52,8 +52,8 @@
#define SQUIRCLE_H #define SQUIRCLE_H
#include <QtQuick/QQuickItem> #include <QtQuick/QQuickItem>
#include <QtGui/QOpenGLShaderProgram> #include <QOpenGLShaderProgram>
#include <QtGui/QOpenGLFunctions> #include <QOpenGLFunctions>

4
examples/quick/scenegraph/textureinthread/threadrenderer.cpp
View File

@ -54,8 +54,8 @@
#include <QtCore/QMutex> #include <QtCore/QMutex>
#include <QtCore/QThread> #include <QtCore/QThread>
#include <QtGui/QOpenGLContext> #include <QOpenGLContext>
#include <QtGui/QOpenGLFramebufferObject> #include <QOpenGLFramebufferObject>
#include <QtGui/QGuiApplication> #include <QtGui/QGuiApplication>
#include <QtGui/QOffscreenSurface> #include <QtGui/QOffscreenSurface>

4
examples/quick/scenegraph/twotextureproviders/xorblender.cpp
View File

@ -52,8 +52,8 @@
#include <QtCore/QPointer> #include <QtCore/QPointer>
#include <QtGui/QOpenGLContext> #include <QOpenGLContext>
#include <QtGui/QOpenGLFunctions> #include <QOpenGLFunctions>
#include <QtQuick/QSGMaterial> #include <QtQuick/QSGMaterial>
#include <QtQuick/QSGTexture> #include <QtQuick/QSGTexture>

2
src/quick/designer/qquickdesignerwindowmanager_p.h
View File

@ -58,7 +58,7 @@
#include <private/qsgcontext_p.h> #include <private/qsgcontext_p.h>
#if QT_CONFIG(opengl) #if QT_CONFIG(opengl)
# include <QtGui/QOpenGLContext> # include <QOpenGLContext>
#endif #endif
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE

4
src/quick/items/context2d/qquickcontext2dcommandbuffer.cpp
View File

@ -44,8 +44,8 @@
#include <QtQuick/qsgtexture.h> #include <QtQuick/qsgtexture.h>
#include <QtGui/QPaintEngine> #include <QtGui/QPaintEngine>
#if QT_CONFIG(opengl) #if QT_CONFIG(opengl)
# include <QtGui/QOpenGLContext> # include <QOpenGLContext>
# include <QtGui/private/qopenglpaintengine_p.h> # include <private/qopenglpaintengine_p.h>
#endif #endif
#define HAS_SHADOW(offsetX, offsetY, blur, color) (color.isValid() && color.alpha() && (blur || offsetX || offsetY)) #define HAS_SHADOW(offsetX, offsetY, blur, color) (color.isValid() && color.alpha() && (blur || offsetX || offsetY))

4
src/quick/items/context2d/qquickcontext2dtexture.cpp
View File

@ -43,12 +43,12 @@
#include <private/qquickitem_p.h> #include <private/qquickitem_p.h>
#include <QtQuick/private/qsgplaintexture_p.h> #include <QtQuick/private/qsgplaintexture_p.h>
#include "qquickcontext2dcommandbuffer_p.h" #include "qquickcontext2dcommandbuffer_p.h"
#include <QOpenGLPaintDevice>
#if QT_CONFIG(opengl) #if QT_CONFIG(opengl)
#include <QOpenGLPaintDevice>
#include <QOpenGLFramebufferObject> #include <QOpenGLFramebufferObject>
#include <QOpenGLFramebufferObjectFormat> #include <QOpenGLFramebufferObjectFormat>
#include <QOpenGLFunctions> #include <QOpenGLFunctions>
#include <QtGui/private/qopenglextensions_p.h> #include <private/qopenglextensions_p.h>
#endif #endif
#include <QtCore/QThread> #include <QtCore/QThread>
#include <QtGui/QGuiApplication> #include <QtGui/QGuiApplication>

4
src/quick/items/qquickframebufferobject.cpp
View File

@ -39,8 +39,8 @@
#include "qquickframebufferobject.h" #include "qquickframebufferobject.h"
#include <QtGui/QOpenGLFramebufferObject> #include <QOpenGLFramebufferObject>
#include <QtGui/QOpenGLFunctions> #include <QOpenGLFunctions>
#include <private/qquickitem_p.h> #include <private/qquickitem_p.h>
#include <private/qsgadaptationlayer_p.h> #include <private/qsgadaptationlayer_p.h>
#include <qsgtextureprovider.h> #include <qsgtextureprovider.h>

10
src/quick/items/qquicktranslate.cpp
View File

@ -434,14 +434,6 @@ void QQuickRotation::setAxis(Qt::Axis axis)
} }
} }
class QGraphicsRotation {
public:
static inline void projectedRotate(QMatrix4x4 *matrix, qreal angle, qreal x, qreal y, qreal z)
{
matrix->projectedRotate(angle, x, y, z);
}
};
void QQuickRotation::applyTo(QMatrix4x4 *matrix) const void QQuickRotation::applyTo(QMatrix4x4 *matrix) const
{ {
Q_D(const QQuickRotation); Q_D(const QQuickRotation);
@ -450,7 +442,7 @@ void QQuickRotation::applyTo(QMatrix4x4 *matrix) const
return; return;
matrix->translate(d->origin); matrix->translate(d->origin);
QGraphicsRotation::projectedRotate(matrix, d->angle, d->axis.x(), d->axis.y(), d->axis.z()); matrix->projectedRotate(d->angle, d->axis.x(), d->axis.y(), d->axis.z());
matrix->translate(-d->origin); matrix->translate(-d->origin);
} }

2
src/quick/quick.pro
View File

@ -3,6 +3,8 @@ TARGET = QtQuick
QT = core-private gui-private qml-private qmlmodels-private QT = core-private gui-private qml-private qmlmodels-private
qtConfig(qml-network): \ qtConfig(qml-network): \
QT_PRIVATE += network QT_PRIVATE += network
qtConfig(opengl): \
QT_PRIVATE += opengl-private
TRACEPOINT_PROVIDER = $$PWD/qtquick.tracepoints TRACEPOINT_PROVIDER = $$PWD/qtquick.tracepoints
CONFIG += qt_tracepoints CONFIG += qt_tracepoints

6
src/quick/scenegraph/compressedtexture/qsgcompressedatlastexture.cpp
View File

@ -43,13 +43,13 @@
#include <QtCore/QElapsedTimer> #include <QtCore/QElapsedTimer>
#include <QtCore/QtMath> #include <QtCore/QtMath>
#include <QtGui/QOpenGLContext> #include <QOpenGLContext>
#include <QtGui/QGuiApplication> #include <QtGui/QGuiApplication>
#include <QtGui/QScreen> #include <QtGui/QScreen>
#include <QtGui/QSurface> #include <QtGui/QSurface>
#include <QtGui/QWindow> #include <QtGui/QWindow>
#include <QtGui/QOpenGLFunctions> #include <QOpenGLFunctions>
#include <QtGui/QOpenGLTexture> #include <QOpenGLTexture>
#include <QDebug> #include <QDebug>
#include <private/qqmlglobal_p.h> #include <private/qqmlglobal_p.h>

8
src/quick/scenegraph/coreapi/qsgbatchrenderer.cpp
View File

@ -50,10 +50,10 @@
#include <QtCore/QtNumeric> #include <QtCore/QtNumeric>
#include <QtGui/QGuiApplication> #include <QtGui/QGuiApplication>
#include <QtGui/QOpenGLFramebufferObject> #include <QOpenGLFramebufferObject>
#include <QtGui/QOpenGLVertexArrayObject> #include <QOpenGLVertexArrayObject>
#include <QtGui/QOpenGLFunctions_1_0> #include <QOpenGLFunctions_1_0>
#include <QtGui/QOpenGLFunctions_3_2_Core> #include <QOpenGLFunctions_3_2_Core>
#include <private/qnumeric_p.h> #include <private/qnumeric_p.h>
#include <private/qquickprofiler_p.h> #include <private/qquickprofiler_p.h>

2
src/quick/scenegraph/coreapi/qsgbatchrenderer_p.h
View File

@ -62,7 +62,7 @@
#include <QtCore/QBitArray> #include <QtCore/QBitArray>
#include <QtCore/QStack> #include <QtCore/QStack>
#include <QtGui/QOpenGLFunctions> #include <QOpenGLFunctions>
#include <QtGui/private/qrhi_p.h> #include <QtGui/private/qrhi_p.h>

4
src/quick/scenegraph/qsgdefaultcontext.cpp
View File

@ -57,8 +57,8 @@
#endif #endif
#include <QtQuick/private/qsgrhishadereffectnode_p.h> #include <QtQuick/private/qsgrhishadereffectnode_p.h>
#include <QtGui/QOpenGLContext> #include <QOpenGLContext>
#include <QtGui/QOpenGLFramebufferObject> #include <QOpenGLFramebufferObject>
#include <QtQuick/private/qquickwindow_p.h> #include <QtQuick/private/qquickwindow_p.h>

2
src/quick/scenegraph/qsgdefaultglyphnode_p_p.h
View File

@ -52,7 +52,7 @@
// //
#include <qcolor.h> #include <qcolor.h>
#include <QtGui/private/qopengltextureglyphcache_p.h> #include <private/qopengltextureglyphcache_p.h>
#include <QtQuick/qsgmaterial.h> #include <QtQuick/qsgmaterial.h>
#include <QtQuick/qsgtexture.h> #include <QtQuick/qsgtexture.h>
#include <QtQuick/qsggeometry.h> #include <QtQuick/qsggeometry.h>

2
src/quick/scenegraph/qsgdefaultrendercontext.cpp
View File

@ -40,7 +40,7 @@
#include "qsgdefaultrendercontext_p.h" #include "qsgdefaultrendercontext_p.h"
#include <QtGui/QGuiApplication> #include <QtGui/QGuiApplication>
#include <QtGui/QOpenGLFramebufferObject> #include <QOpenGLFramebufferObject>
#include <QtQuick/private/qsgbatchrenderer_p.h> #include <QtQuick/private/qsgbatchrenderer_p.h>
#include <QtQuick/private/qsgrenderer_p.h> #include <QtQuick/private/qsgrenderer_p.h>

2
src/quick/scenegraph/qsgdefaultspritenode.cpp
View File

@ -40,7 +40,7 @@
#include "qsgdefaultspritenode_p.h" #include "qsgdefaultspritenode_p.h"
#include <QtQuick/QSGMaterial> #include <QtQuick/QSGMaterial>
#include <QtGui/QOpenGLShaderProgram> #include <QOpenGLShaderProgram>
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE

2
src/quick/scenegraph/qsgopengldistancefieldglyphcache.cpp
View File

@ -45,7 +45,7 @@
#include <QtQml/qqmlfile.h> #include <QtQml/qqmlfile.h>
#include <QtGui/private/qdistancefield_p.h> #include <QtGui/private/qdistancefield_p.h>
#include <QtGui/private/qopenglcontext_p.h> #include <private/qopenglcontext_p.h>
#include <QtQml/private/qqmlglobal_p.h> #include <QtQml/private/qqmlglobal_p.h>
#include <qopenglfunctions.h> #include <qopenglfunctions.h>
#include <qopenglframebufferobject.h> #include <qopenglframebufferobject.h>

2
src/quick/scenegraph/qsgopengldistancefieldglyphcache_p.h
View File

@ -56,7 +56,7 @@
#include <qopenglshaderprogram.h> #include <qopenglshaderprogram.h>
#include <qopenglbuffer.h> #include <qopenglbuffer.h>
#include <qopenglvertexarrayobject.h> #include <qopenglvertexarrayobject.h>
#include <QtGui/private/qopenglengineshadersource_p.h> #include <private/qopenglengineshadersource_p.h>
#include <private/qsgareaallocator_p.h> #include <private/qsgareaallocator_p.h>
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE

6
src/quick/scenegraph/qsgopengllayer.cpp
View File

@ -42,9 +42,9 @@
#include <private/qsgrenderer_p.h> #include <private/qsgrenderer_p.h>
#include <private/qsgdefaultrendercontext_p.h> #include <private/qsgdefaultrendercontext_p.h>
#include <QtGui/QOpenGLFramebufferObject> #include <QOpenGLFramebufferObject>
#include <QtGui/QOpenGLFunctions> #include <QOpenGLFunctions>
#include <QtGui/private/qopenglextensions_p.h> #include <private/qopenglextensions_p.h>
#include <QtQuick/private/qsgdepthstencilbuffer_p.h> #include <QtQuick/private/qsgdepthstencilbuffer_p.h>

2
src/quick/scenegraph/qsgrenderloop.cpp
View File

@ -65,7 +65,7 @@
#include <private/qsgrhishadereffectnode_p.h> #include <private/qsgrhishadereffectnode_p.h>
#if QT_CONFIG(opengl) #if QT_CONFIG(opengl)
#include <QtGui/QOpenGLContext> #include <QOpenGLContext>
#if QT_CONFIG(quick_shadereffect) #if QT_CONFIG(quick_shadereffect)
#include <private/qquickopenglshadereffectnode_p.h> #include <private/qquickopenglshadereffectnode_p.h>
#endif #endif

2
src/quick/scenegraph/qsgthreadedrenderloop_p.h
View File

@ -52,7 +52,7 @@
// //
#include <QtCore/QThread> #include <QtCore/QThread>
#include <QtGui/QOpenGLContext> #include <QOpenGLContext>
#include <private/qsgcontext_p.h> #include <private/qsgcontext_p.h>
#include "qsgrenderloop_p.h" #include "qsgrenderloop_p.h"

2
src/quick/scenegraph/qsgwindowsrenderloop_p.h
View File

@ -54,7 +54,7 @@
#include <QtCore/QObject> #include <QtCore/QObject>
#include <QtCore/QElapsedTimer> #include <QtCore/QElapsedTimer>
#include <QtGui/QOpenGLContext> #include <QOpenGLContext>
#include "qsgrenderloop_p.h" #include "qsgrenderloop_p.h"

4
src/quick/scenegraph/util/qsgdepthstencilbuffer_p.h
View File

@ -52,8 +52,8 @@
// //
#include <QtCore/qsize.h> #include <QtCore/qsize.h>
#include <QtGui/private/qopenglcontext_p.h> #include <private/qopenglcontext_p.h>
#include <QtGui/private/qopenglextensions_p.h> #include <private/qopenglextensions_p.h>
#include <QtCore/qsharedpointer.h> #include <QtCore/qsharedpointer.h>
#include <QtCore/qhash.h> #include <QtCore/qhash.h>

6
src/quick/scenegraph/util/qsgopenglatlastexture.cpp
View File

@ -43,9 +43,9 @@
#include <QtCore/QElapsedTimer> #include <QtCore/QElapsedTimer>
#include <QtCore/QtMath> #include <QtCore/QtMath>
#include <QtGui/QOpenGLContext> #include <QOpenGLContext>
#include <QtGui/QOpenGLTexture> #include <QOpenGLTexture>
#include <QtGui/QOpenGLFunctions> #include <QOpenGLFunctions>
#include <QtGui/QGuiApplication> #include <QtGui/QGuiApplication>
#include <QtGui/QScreen> #include <QtGui/QScreen>
#include <QtGui/QSurface> #include <QtGui/QSurface>

6
src/quick/scenegraph/util/qsgplaintexture.cpp
View File

@ -45,9 +45,9 @@
#include <QtGui/qguiapplication.h> #include <QtGui/qguiapplication.h>
#include <QtGui/qpa/qplatformnativeinterface.h> #include <QtGui/qpa/qplatformnativeinterface.h>
#if QT_CONFIG(opengl) #if QT_CONFIG(opengl)
# include <QtGui/qopenglcontext.h> # include <qopenglcontext.h>
# include <QtGui/qopenglfunctions.h> # include <qopenglfunctions.h>
# include <QtGui/private/qopengltextureuploader_p.h> # include <private/qopengltextureuploader_p.h>
# include <private/qsgdefaultrendercontext_p.h> # include <private/qsgdefaultrendercontext_p.h>
#endif #endif
#include <QtGui/private/qrhi_p.h> #include <QtGui/private/qrhi_p.h>

2
src/quickshapes/qquickshapegenericrenderer.cpp
View File

@ -49,7 +49,7 @@
#if QT_CONFIG(opengl) #if QT_CONFIG(opengl)
#include <QOpenGLContext> #include <QOpenGLContext>
#include <QOffscreenSurface> #include <QOffscreenSurface>
#include <QtGui/private/qopenglextensions_p.h> #include <private/qopenglextensions_p.h>
#endif #endif
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE

6
src/quickwidgets/qquickwidget.cpp
View File

@ -59,9 +59,9 @@
#include <QtGui/qpa/qplatformintegration.h> #include <QtGui/qpa/qplatformintegration.h>
#if QT_CONFIG(opengl) #if QT_CONFIG(opengl)
#include <QtGui/QOpenGLContext> #include <QOpenGLContext>
#include <QtGui/QOpenGLFunctions> #include <QOpenGLFunctions>
#include <QtGui/private/qopenglextensions_p.h> #include <private/qopenglextensions_p.h>
#endif #endif
#include <QtGui/QPainter> #include <QtGui/QPainter>

2
tests/auto/quick/nodes/tst_nodestest.cpp
View File

@ -30,7 +30,7 @@
#include <QtTest/QtTest> #include <QtTest/QtTest>
#include <QtGui/QOffscreenSurface> #include <QtGui/QOffscreenSurface>
#include <QtGui/QOpenGLContext> #include <QOpenGLContext>
#include <QtQuick/qsgnode.h> #include <QtQuick/qsgnode.h>
#include <QtQuick/private/qsgbatchrenderer_p.h> #include <QtQuick/private/qsgbatchrenderer_p.h>
#include <QtQuick/private/qsgnodeupdater_p.h> #include <QtQuick/private/qsgnodeupdater_p.h>

2
tests/auto/quick/nokeywords/nokeywords.pro
View File

@ -7,3 +7,5 @@ SOURCES += tst_nokeywords.cpp
CONFIG+=parallel_test CONFIG+=parallel_test
QT += quick core-private gui-private qml-private quick-private testlib QT += quick core-private gui-private qml-private quick-private testlib
qtConfig(opengl): \
QT_PRIVATE += opengl-private

2
tools/qmlscene/main.cpp
View File

@ -36,7 +36,7 @@
#include <QtCore/qregularexpression.h> #include <QtCore/qregularexpression.h>
#include <QtGui/QGuiApplication> #include <QtGui/QGuiApplication>
#include <QtGui/QOpenGLFunctions> #include <QOpenGLFunctions>
#include <QtQml/qqml.h> #include <QtQml/qqml.h>
#include <QtQml/qqmlengine.h> #include <QtQml/qqmlengine.h>