diff options
-rw-r--r-- | src/quick/items/qquickwindow.cpp | 28 | ||||
-rw-r--r-- | src/quick/items/qquickwindow.h | 1 | ||||
-rw-r--r-- | src/quick/items/qquickwindow_p.h | 1 | ||||
-rw-r--r-- | tools/qml/main.cpp | 30 | ||||
-rw-r--r-- | tools/qmlscene/main.cpp | 36 |
5 files changed, 1 insertions, 95 deletions
diff --git a/src/quick/items/qquickwindow.cpp b/src/quick/items/qquickwindow.cpp index 90009c0f06..4e15aedf7d 100644 --- a/src/quick/items/qquickwindow.cpp +++ b/src/quick/items/qquickwindow.cpp @@ -4658,34 +4658,6 @@ QQmlIncubationController *QQuickWindow::incubationController() const */ /*! - \fn void QQuickWindow::openglContextCreated(QOpenGLContext *context) - - This signal is emitted on the gui thread when the OpenGL \a context - for this window is created, before it is made current. - - Some implementations will share the same OpenGL context between - multiple QQuickWindow instances. The openglContextCreated() signal - will in this case only be emitted for the first window, when the - OpenGL context is actually created. - - QQuickWindow::openglContext() will still return 0 for this window - until after the QQuickWindow::sceneGraphInitialized() has been - emitted. - - \note - This signal will only be emmited when using the default OpenGL scene - graph adaptation. - - \since 5.3 - */ - -/*! - \qmlsignal QtQuick.Window::Window::openglContextCreated() - \internal - \since 5.3 - */ - -/*! \fn void QQuickWindow::sceneGraphAboutToStop() This signal is emitted on the render thread when the scene graph is diff --git a/src/quick/items/qquickwindow.h b/src/quick/items/qquickwindow.h index 5266debec5..f701cd1deb 100644 --- a/src/quick/items/qquickwindow.h +++ b/src/quick/items/qquickwindow.h @@ -201,7 +201,6 @@ public: Q_SIGNALS: void frameSwapped(); - Q_REVISION(2, 2) void openglContextCreated(QOpenGLContext *context); // ### Qt 6 remove void sceneGraphInitialized(); void sceneGraphInvalidated(); void beforeSynchronizing(); diff --git a/src/quick/items/qquickwindow_p.h b/src/quick/items/qquickwindow_p.h index 9adbdeec51..6c16504ff7 100644 --- a/src/quick/items/qquickwindow_p.h +++ b/src/quick/items/qquickwindow_p.h @@ -257,7 +257,6 @@ public: void updateDirtyNode(QQuickItem *); void fireFrameSwapped() { Q_EMIT q_func()->frameSwapped(); } - void fireOpenGLContextCreated(QOpenGLContext *context) { Q_EMIT q_func()->openglContextCreated(context); } void fireAboutToStop() { Q_EMIT q_func()->sceneGraphAboutToStop(); } QSGRenderContext *context; diff --git a/tools/qml/main.cpp b/tools/qml/main.cpp index a38a3d599f..71bd104596 100644 --- a/tools/qml/main.cpp +++ b/tools/qml/main.cpp @@ -35,8 +35,6 @@ #include <QGuiApplication> #include <QWindow> #include <QFileOpenEvent> -#include <QOpenGLContext> -#include <QOpenGLFunctions> #include <QSurfaceFormat> #ifdef QT_WIDGETS_LIB #include <QApplication> @@ -258,10 +256,6 @@ public Q_SLOTS: returnCode = retCode; } -#if defined(QT_GUI_LIB) && QT_CONFIG(opengl) - void onOpenGlContextCreated(QOpenGLContext *context); -#endif - private: void contain(QObject *o, const QUrl &containPath); void checkForWindow(QObject *o); @@ -289,35 +283,13 @@ void LoadWatcher::contain(QObject *o, const QUrl &containPath) void LoadWatcher::checkForWindow(QObject *o) { #if defined(QT_GUI_LIB) && QT_CONFIG(opengl) - if (o->isWindowType() && o->inherits("QQuickWindow")) { + if (o->isWindowType() && o->inherits("QQuickWindow")) haveWindow = true; - if (verboseMode) - connect(o, SIGNAL(openglContextCreated(QOpenGLContext*)), - this, SLOT(onOpenGlContextCreated(QOpenGLContext*))); - } #else Q_UNUSED(o) #endif // QT_GUI_LIB && !QT_NO_OPENGL } -#if defined(QT_GUI_LIB) && QT_CONFIG(opengl) -void LoadWatcher::onOpenGlContextCreated(QOpenGLContext *context) -{ - context->makeCurrent(qobject_cast<QWindow *>(sender())); - QOpenGLFunctions functions(context); - QByteArray output = "Vendor : "; - output += reinterpret_cast<const char *>(functions.glGetString(GL_VENDOR)); - output += "\nRenderer: "; - output += reinterpret_cast<const char *>(functions.glGetString(GL_RENDERER)); - output += "\nVersion : "; - output += reinterpret_cast<const char *>(functions.glGetString(GL_VERSION)); - output += "\nLanguage: "; - output += reinterpret_cast<const char *>(functions.glGetString(GL_SHADING_LANGUAGE_VERSION)); - puts(output.constData()); - context->doneCurrent(); -} -#endif // QT_GUI_LIB && !QT_NO_OPENGL - void quietMessageHandler(QtMsgType type, const QMessageLogContext &ctxt, const QString &msg) { Q_UNUSED(ctxt); diff --git a/tools/qmlscene/main.cpp b/tools/qmlscene/main.cpp index b0635a7e87..cc48fb7b0b 100644 --- a/tools/qmlscene/main.cpp +++ b/tools/qmlscene/main.cpp @@ -36,7 +36,6 @@ #include <QtCore/qregularexpression.h> #include <QtGui/QGuiApplication> -#include <QOpenGLFunctions> #include <QtQml/qqml.h> #include <QtQml/qqmlengine.h> @@ -378,37 +377,6 @@ static void usage() puts(" "); exit(1); } -#if QT_CONFIG(opengl) -// Listen on GL context creation of the QQuickWindow in order to print diagnostic output. -class DiagnosticGlContextCreationListener : public QObject { - Q_OBJECT -public: - explicit DiagnosticGlContextCreationListener(QQuickWindow *window) : QObject(window) - { - connect(window, &QQuickWindow::openglContextCreated, - this, &DiagnosticGlContextCreationListener::onOpenGlContextCreated); - } - -private slots: - void onOpenGlContextCreated(QOpenGLContext *context) - { - context->makeCurrent(qobject_cast<QQuickWindow *>(parent())); - QOpenGLFunctions functions(context); - QByteArray output = "Vendor : "; - output += reinterpret_cast<const char *>(functions.glGetString(GL_VENDOR)); - output += "\nRenderer: "; - output += reinterpret_cast<const char *>(functions.glGetString(GL_RENDERER)); - output += "\nVersion : "; - output += reinterpret_cast<const char *>(functions.glGetString(GL_VERSION)); - output += "\nLanguage: "; - output += reinterpret_cast<const char *>(functions.glGetString(GL_SHADING_LANGUAGE_VERSION)); - puts(output.constData()); - context->doneCurrent(); - deleteLater(); - } - -}; -#endif static void setWindowTitle(bool verbose, const QObject *topLevel, QWindow *window) { @@ -680,10 +648,6 @@ int main(int argc, char ** argv) if (window) { setWindowTitle(options.verbose, topLevel, window.data()); -#if QT_CONFIG(opengl) - if (options.verbose) - new DiagnosticGlContextCreationListener(window.data()); -#endif if (options.transparent) { window->setClearBeforeRendering(true); window->setColor(QColor(Qt::transparent)); |