diff options
| -rw-r--r-- | dependencies.yaml | 2 | ||||
| -rw-r--r-- | examples/activeqt/opengl/globjwin.cpp | 2 | ||||
| -rw-r--r-- | examples/activeqt/opengl/opengl.pro | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/dependencies.yaml b/dependencies.yaml index 0477d9d..2e75d8e 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -1,4 +1,4 @@ dependencies: ../qtbase: - ref: e0b89899e3c505edbdece60d6a2d2368a7ef9a01 + ref: 2eee9e6fcf9b70681c5d9202d1509d176e48fc31 required: true diff --git a/examples/activeqt/opengl/globjwin.cpp b/examples/activeqt/opengl/globjwin.cpp index dbb7e82..0324f06 100644 --- a/examples/activeqt/opengl/globjwin.cpp +++ b/examples/activeqt/opengl/globjwin.cpp @@ -110,7 +110,7 @@ GLObjectWindow::GLObjectWindow(QWidget *parent) // Put the GL widget inside the frame QHBoxLayout *flayout = new QHBoxLayout(f); - flayout->setMargin(0); + flayout->setContentsMargins(0, 0, 0, 0); flayout->addWidget(c, 1); hlayout->setMenuBar(m); diff --git a/examples/activeqt/opengl/opengl.pro b/examples/activeqt/opengl/opengl.pro index c62f700..1ece9b9 100644 --- a/examples/activeqt/opengl/opengl.pro +++ b/examples/activeqt/opengl/opengl.pro @@ -2,7 +2,7 @@ TEMPLATE = app TARGET = openglax CONFIG += warn_off -QT += widgets axserver +QT += widgets axserver opengl openglwidgets HEADERS = glbox.h \ globjwin.h |