diff options
| author | Tomi Korpipää <tomi.korpipaa@digia.com> | 2014-02-28 13:19:38 +0200 |
|---|---|---|
| committer | Tomi Korpipää <tomi.korpipaa@digia.com> | 2014-02-28 13:20:41 +0200 |
| commit | dbeedae6e4e8463732ae86d3ba4828c559681b5b (patch) | |
| tree | dc8adcb566546a5da3073ccbef8d4ce03f478e8b | |
| parent | 5d224030a5295cd2f60a57887689c428dcfc2267 (diff) | |
Mac compilation fix
Change-Id: I9203e511d9d50af4d7bb2127af790df4c74fa9b2
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
| -rw-r--r-- | src/datavisualizationqml2/enumtostringmap.cpp | 4 | ||||
| -rw-r--r-- | src/datavisualizationqml2/enumtostringmap_p.h | 6 | ||||
| -rw-r--r-- | src/datavisualizationqml2/glstatestore_p.h | 4 |
3 files changed, 8 insertions, 6 deletions
diff --git a/src/datavisualizationqml2/enumtostringmap.cpp b/src/datavisualizationqml2/enumtostringmap.cpp index fd68c6bb..249fbae3 100644 --- a/src/datavisualizationqml2/enumtostringmap.cpp +++ b/src/datavisualizationqml2/enumtostringmap.cpp @@ -19,6 +19,8 @@ #include <QString> #include <QDebug> +#ifdef VERBOSE_STATE_STORE + static EnumToStringMap *theInstance = 0; static unsigned int theInstanceCount = 0; @@ -390,4 +392,4 @@ QString EnumToStringMap::lookUp(const GLuint value) const return QString("0x0%1").arg(value, 0, 16); } - +#endif diff --git a/src/datavisualizationqml2/enumtostringmap_p.h b/src/datavisualizationqml2/enumtostringmap_p.h index 2206f153..4ef9d32f 100644 --- a/src/datavisualizationqml2/enumtostringmap_p.h +++ b/src/datavisualizationqml2/enumtostringmap_p.h @@ -29,6 +29,10 @@ #ifndef ENUMTOSTRINGMAP_P_H #define ENUMTOSTRINGMAP_P_H +//#define VERBOSE_STATE_STORE + +#ifdef VERBOSE_STATE_STORE + #include <QtGui/qopengl.h> #include <QMap> #include <QString> @@ -45,5 +49,5 @@ private: QMap<int, QString> m_map; QString m_unknown; }; - +#endif #endif diff --git a/src/datavisualizationqml2/glstatestore_p.h b/src/datavisualizationqml2/glstatestore_p.h index 560598bf..14c46c43 100644 --- a/src/datavisualizationqml2/glstatestore_p.h +++ b/src/datavisualizationqml2/glstatestore_p.h @@ -29,14 +29,10 @@ #ifndef GLSTATESTORE_P_H #define GLSTATESTORE_P_H -//#define VERBOSE_STATE_STORE - #include <QObject> #include <QtGui/QOpenGLFunctions> #include <QtGui/QOpenGLContext> -#ifdef VERBOSE_STATE_STORE #include "enumtostringmap_p.h" -#endif class GLStateStore : public QObject, protected QOpenGLFunctions { |