Reduce the scope of the preprocessor branches with the help of a union

Change-Id: I195589565920e795cdae99f837b51917b3831228
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>

1 files changed, 6 insertions, 12 deletions

diff --git a/src/datavisualizationqml2/abstractdeclarative_p.h b/src/datavisualizationqml2/abstractdeclarative_p.h
index f49da398..18cca6e2 100644
--- a/src/datavisualizationqml2/abstractdeclarative_p.h
+++ b/src/datavisualizationqml2/abstractdeclarative_p.h
@@ -50,13 +50,7 @@
 #include <QtCore/QMutex>
 #include <QtCore/QSharedPointer>
 
-#if !defined(Q_OS_MAC) && !defined(Q_OS_ANDROID) && !defined(Q_OS_WINRT)
-#define USE_SHARED_CONTEXT
-#endif
-
-#ifndef USE_SHARED_CONTEXT
-#include "glstatestore_p.h"
-#endif
+class GLStateStore;
 
 QT_BEGIN_NAMESPACE_DATAVISUALIZATION
 
@@ -297,11 +291,11 @@ private:
     int m_samples;
     int m_windowSamples;
     QSize m_initialisedSize;
-#ifdef USE_SHARED_CONTEXT
-    QOpenGLContext *m_context;
-#else
-    GLStateStore *m_stateStore;
-#endif
+    union {
+        QObject *m_contextOrStateStore;
+        QOpenGLContext *m_context;
+        GLStateStore *m_stateStore;
+    };
     QPointer<QOpenGLContext> m_qtContext;
     QThread *m_mainThread;
     QThread *m_contextThread;