diff options
author | Tomi Korpipää <tomi.korpipaa@digia.com> | 2014-02-28 13:24:14 +0200 |
---|---|---|
committer | Tomi Korpipää <tomi.korpipaa@digia.com> | 2014-02-28 13:24:50 +0200 |
commit | 478b96d840750abaadbc6bdfcbcd7c9c04449117 (patch) | |
tree | 128bf71d5da7f4db160d46031186c814e3818e85 /src/datavisualizationqml2/abstractdeclarative_p.h | |
parent | dbeedae6e4e8463732ae86d3ba4828c559681b5b (diff) |
Mac shared context bug fix
Change-Id: I3c3865eca8c2aadbb1de871e477f29495244b5a4
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
Diffstat (limited to 'src/datavisualizationqml2/abstractdeclarative_p.h')
-rw-r--r-- | src/datavisualizationqml2/abstractdeclarative_p.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/datavisualizationqml2/abstractdeclarative_p.h b/src/datavisualizationqml2/abstractdeclarative_p.h index ac8bf9be..cfe62e3c 100644 --- a/src/datavisualizationqml2/abstractdeclarative_p.h +++ b/src/datavisualizationqml2/abstractdeclarative_p.h @@ -29,25 +29,25 @@ #ifndef ABSTRACTDECLARATIVE_P_H #define ABSTRACTDECLARATIVE_P_H -#if !defined(Q_OS_MAC) && !defined(Q_OS_ANDROID) -#define USE_SHARED_CONTEXT -#endif - #include "datavisualizationglobal_p.h" #include "abstract3dcontroller_p.h" #include "qabstract3dinputhandler.h" #include "declarativescene_p.h" -#ifndef USE_SHARED_CONTEXT -#include "glstatestore_p.h" -#endif - #include <QtCore/QAbstractItemModel> #include <QtQuick/QQuickItem> #include <QtQuick/QQuickWindow> #include <QtCore/QPointer> #include <QtCore/QThread> +#if !defined(Q_OS_MAC) && !defined(Q_OS_ANDROID) +#define USE_SHARED_CONTEXT +#endif + +#ifndef USE_SHARED_CONTEXT +#include "glstatestore_p.h" +#endif + QT_BEGIN_NAMESPACE_DATAVISUALIZATION class DeclarativeRenderNode; |