diff options
| author | Tomi Korpipää <tomi.korpipaa@digia.com> | 2014-02-26 09:51:03 +0200 |
|---|---|---|
| committer | Tomi Korpipää <tomi.korpipaa@digia.com> | 2014-02-26 09:51:40 +0200 |
| commit | 4e69dbe204d90f4709960bbf4558e4038b55bcd9 (patch) | |
| tree | d65af637a6fa6de49a2a4bafc09fdbcfe58746f2 | |
| parent | 419bc4159e41c1a303c4d6be23efbe7a0f3fc791 (diff) | |
Context sharing disabled for mac only
Change-Id: I291cb7b7fe8fa08f769a941e1e9328f2af33e263
Change-Id: I291cb7b7fe8fa08f769a941e1e9328f2af33e263
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
| -rw-r--r-- | src/datavisualizationqml2/abstractdeclarative.cpp | 6 |
1 files 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) |