diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2023-09-12 15:32:51 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2023-09-18 22:45:36 +0200 |
| commit | 62eaaeb4f58388dc56cb1b23beae892e2fd6df89 (patch) | |
| tree | 16436f8c5ec774d5e06ee0b069c5df76492d0957 /examples/opengl/hellogl2/window.cpp | |
| parent | 6f8398c8eb5476a6e98126d5b63421896b874271 (diff) | |
hellogl2 example: Decouple mainwindow from window
The circular dependency cannot be ported to the corresponding Python
example.
Task-number: PYSIDE-2206
Pick-to: 6.6 6.5
Change-Id: I031b3fffdd7bd677d2fc55e132975a65f66ad128
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
Diffstat (limited to 'examples/opengl/hellogl2/window.cpp')
| -rw-r--r-- | examples/opengl/hellogl2/window.cpp | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/examples/opengl/hellogl2/window.cpp b/examples/opengl/hellogl2/window.cpp index 2f9c33b24e0..5a7ddf826fd 100644 --- a/examples/opengl/hellogl2/window.cpp +++ b/examples/opengl/hellogl2/window.cpp @@ -1,9 +1,8 @@ // Copyright (C) 2016 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause -#include "glwidget.h" #include "window.h" -#include "mainwindow.h" +#include "glwidget.h" #include <QSlider> #include <QVBoxLayout> #include <QHBoxLayout> @@ -11,9 +10,18 @@ #include <QPushButton> #include <QApplication> #include <QMessageBox> +#include <QMainWindow> + +static QMainWindow *findMainWindow() +{ + for (auto *w : QApplication::topLevelWidgets()) { + if (auto *mw = qobject_cast<QMainWindow *>(w)) + return mw; + } + return nullptr; +} -Window::Window(MainWindow *mw) - : mainWindow(mw) +Window::Window() { glWidget = new GLWidget; @@ -77,7 +85,8 @@ void Window::dockUndock() void Window::dock() { - if (!mainWindow->isVisible()) { + auto *mainWindow = findMainWindow(); + if (mainWindow == nullptr || !mainWindow->isVisible()) { QMessageBox::information(this, tr("Cannot Dock"), tr("Main window already closed")); return; |