diff options
| author | Laszlo Agocs <laszlo.agocs@theqtcompany.com> | 2016-06-10 09:32:24 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2016-06-10 09:32:24 +0000 |
| commit | c9d8b85ec9efd90f9bd8071a58dc04f54c2c365d (patch) | |
| tree | 34179a1dfbb17de5affde7ac6305b4a9d295fc82 /src/quick/designer/qquickdesignerwindowmanager.cpp | |
| parent | 4de6c1bc6cc1894f9f60cfef6d403a933d2c18cd (diff) | |
| parent | 272b9a8ad6d1a1c3ea3e4aa64fb9f94d163a562f (diff) | |
Merge "Merge remote-tracking branch 'origin/wip/scenegraphng' into dev" into refs/staging/dev
Diffstat (limited to 'src/quick/designer/qquickdesignerwindowmanager.cpp')
| -rw-r--r-- | src/quick/designer/qquickdesignerwindowmanager.cpp | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/quick/designer/qquickdesignerwindowmanager.cpp b/src/quick/designer/qquickdesignerwindowmanager.cpp index efa3bcb51a..2d37db08e7 100644 --- a/src/quick/designer/qquickdesignerwindowmanager.cpp +++ b/src/quick/designer/qquickdesignerwindowmanager.cpp @@ -39,8 +39,9 @@ #include "qquickdesignerwindowmanager_p.h" #include "private/qquickwindow_p.h" -#include <QtGui/QOpenGLContext> - +#ifndef QT_NO_OPENGL +# include <QtQuick/private/qsgdefaultrendercontext_p.h> +#endif #include <QtQuick/QQuickWindow> QT_BEGIN_NAMESPACE @@ -48,7 +49,7 @@ QT_BEGIN_NAMESPACE QQuickDesignerWindowManager::QQuickDesignerWindowManager() : m_sgContext(QSGContext::createDefaultContext()) { - m_renderContext.reset(new QSGRenderContext(m_sgContext.data())); + m_renderContext.reset(m_sgContext.data()->createRenderContext()); } void QQuickDesignerWindowManager::show(QQuickWindow *window) @@ -66,6 +67,7 @@ void QQuickDesignerWindowManager::windowDestroyed(QQuickWindow *) void QQuickDesignerWindowManager::makeOpenGLContext(QQuickWindow *window) { +#ifndef QT_NO_OPENGL if (!m_openGlContext) { m_openGlContext.reset(new QOpenGLContext()); m_openGlContext->setFormat(window->requestedFormat()); @@ -76,6 +78,9 @@ void QQuickDesignerWindowManager::makeOpenGLContext(QQuickWindow *window) } else { m_openGlContext->makeCurrent(window); } +#else + Q_UNUSED(window) +#endif } void QQuickDesignerWindowManager::exposureChanged(QQuickWindow *) |