diff options
| author | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com> | 2013-04-12 15:08:02 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-04-15 15:32:40 +0200 |
| commit | aec1bcf6a36a61ae7bad8f733ac4bd2211e6eb2b (patch) | |
| tree | 90a218af146e4aea5eaa40ab0cd6ce0e13902bf2 /src | |
| parent | 6e0f55495d84f5bfb4362847943c740ddedfb137 (diff) | |
eglfs: Make sure virtual functions are not called from ctor
We want to override some of them in a subclass.
Change-Id: Ic7a22d7bc4589199b3f764157125094a4ff6ec28
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/plugins/platforms/eglfs/qeglfsintegration.cpp | 3 | ||||
| -rw-r--r-- | src/plugins/platforms/eglfs/qeglfswindow.cpp | 6 |
2 files changed, 4 insertions, 5 deletions
diff --git a/src/plugins/platforms/eglfs/qeglfsintegration.cpp b/src/plugins/platforms/eglfs/qeglfsintegration.cpp index 64e11b4e07..615b69f7d9 100644 --- a/src/plugins/platforms/eglfs/qeglfsintegration.cpp +++ b/src/plugins/platforms/eglfs/qeglfsintegration.cpp @@ -145,7 +145,8 @@ bool QEglFSIntegration::hasCapability(QPlatformIntegration::Capability cap) cons QPlatformWindow *QEglFSIntegration::createPlatformWindow(QWindow *window) const { - QPlatformWindow *w = new QEglFSWindow(window); + QEglFSWindow *w = new QEglFSWindow(window); + w->create(); w->requestActivateWindow(); return w; } diff --git a/src/plugins/platforms/eglfs/qeglfswindow.cpp b/src/plugins/platforms/eglfs/qeglfswindow.cpp index 68cef6253e..ebf8e4af85 100644 --- a/src/plugins/platforms/eglfs/qeglfswindow.cpp +++ b/src/plugins/platforms/eglfs/qeglfswindow.cpp @@ -59,10 +59,6 @@ QEglFSWindow::QEglFSWindow(QWindow *w) #ifdef QEGL_EXTRA_DEBUG qWarning("QEglWindow %p: %p 0x%x\n", this, w, uint(m_winid)); #endif - - setWindowState(Qt::WindowFullScreen); - - create(); } QEglFSWindow::~QEglFSWindow() @@ -72,6 +68,8 @@ QEglFSWindow::~QEglFSWindow() void QEglFSWindow::create() { + setWindowState(Qt::WindowFullScreen); + if (m_window) return; |