diff options
| author | Tomi Korpipää <tomi.korpipaa@digia.com> | 2013-05-20 08:37:20 +0300 |
|---|---|---|
| committer | Tomi Korpipää <tomi.korpipaa@digia.com> | 2013-05-20 09:02:54 +0300 |
| commit | 9891c9494797cb87f93dd50a430d604fee1af5df (patch) | |
| tree | da932e71f88c6a543ffec723895df61c23aae650 | |
| parent | 97e3308019b560e062e291f1f53034b4ab4bf85d (diff) | |
Mac fix
Different initialization order not needed anymore.
Causes crash if used.
Change-Id: I5c58f57c5352ea0e18719d6b569b22385e62be50
Change-Id: I5c58f57c5352ea0e18719d6b569b22385e62be50
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
| -rw-r--r-- | src/datavis3d/engine/q3dwindow.cpp | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/src/datavis3d/engine/q3dwindow.cpp b/src/datavis3d/engine/q3dwindow.cpp index a172e7b6..2db3d964 100644 --- a/src/datavis3d/engine/q3dwindow.cpp +++ b/src/datavis3d/engine/q3dwindow.cpp @@ -68,11 +68,9 @@ Q3DWindow::Q3DWindow(QWindow *parent) d_ptr->m_context->setFormat(requestedFormat()); d_ptr->m_context->create(); -#if !defined(Q_OS_MAC) - // These are required here for windows (and linux?), but cause errors on mac d_ptr->m_context->makeCurrent(this); initializeOpenGLFunctions(); -#endif + initialize(); } @@ -131,9 +129,6 @@ void Q3DWindow::renderNow() d_ptr->m_context->makeCurrent(this); if (needsInit) { -#if defined(Q_OS_MAC) - initializeOpenGLFunctions(); -#endif initialize(); needsInit = false; } |