From 4e69dbe204d90f4709960bbf4558e4038b55bcd9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomi=20Korpip=C3=A4=C3=A4?= Date: Wed, 26 Feb 2014 09:51:03 +0200 Subject: Context sharing disabled for mac only MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I291cb7b7fe8fa08f769a941e1e9328f2af33e263 Change-Id: I291cb7b7fe8fa08f769a941e1e9328f2af33e263 Reviewed-by: Tomi Korpipää --- src/datavisualizationqml2/abstractdeclarative.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/datavisualizationqml2/abstractdeclarative.cpp b/src/datavisualizationqml2/abstractdeclarative.cpp index 5364325a..c260f1db 100644 --- a/src/datavisualizationqml2/abstractdeclarative.cpp +++ b/src/datavisualizationqml2/abstractdeclarative.cpp @@ -51,7 +51,7 @@ AbstractDeclarative::AbstractDeclarative(QQuickItem *parent) : AbstractDeclarative::~AbstractDeclarative() { -#if 0 //!defined(Q_OS_MAC) +#if !defined(Q_OS_MAC) // Context can be in another thread, don't delete it directly in that case if (m_context && m_context->thread() != QThread::currentThread()) m_context->deleteLater(); @@ -213,7 +213,7 @@ void AbstractDeclarative::setSharedController(Abstract3DController *controller) void AbstractDeclarative::activateOpenGLContext(QQuickWindow *window) { -#if 0 //!defined(Q_OS_MAC) +#if !defined(Q_OS_MAC) if (!m_context || m_contextWindow != window) { m_contextWindow = window; delete m_context; @@ -231,7 +231,7 @@ void AbstractDeclarative::activateOpenGLContext(QQuickWindow *window) void AbstractDeclarative::doneOpenGLContext(QQuickWindow *window) { -#if 0 //!defined(Q_OS_MAC) +#if !defined(Q_OS_MAC) m_qtContext->makeCurrent(window); #else Q_UNUSED(window) -- cgit v1.2.3