diff options
author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2014-01-27 13:10:44 +0200 |
---|---|---|
committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2014-01-27 13:13:58 +0200 |
commit | b368e57e59351736f9ad06834a743a7c1b49d368 (patch) | |
tree | 3b7d42569905d8cde0ca7571cd664428354a50dd /src/datavisualization/global/qdatavisualizationglobal.h | |
parent | eb3d0514ca886db33776522ea00f27b69bc86ad1 (diff) | |
parent | 05d06fbc61f07e400b519a9b020c2473398627c1 (diff) |
Merge branch 'develop'v1.0.0-beta1
Change-Id: I1c9a255eb8f30a24b665856d3711f0abe77c6ef4
Diffstat (limited to 'src/datavisualization/global/qdatavisualizationglobal.h')
-rw-r--r-- | src/datavisualization/global/qdatavisualizationglobal.h | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/src/datavisualization/global/qdatavisualizationglobal.h b/src/datavisualization/global/qdatavisualizationglobal.h index 1c118664..d7e71265 100644 --- a/src/datavisualization/global/qdatavisualizationglobal.h +++ b/src/datavisualization/global/qdatavisualizationglobal.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc +** Copyright (C) 2014 Digia Plc ** All rights reserved. ** For any questions to Digia, please use contact form at http://qt.digia.com ** @@ -52,16 +52,7 @@ # define QT_DATAVISUALIZATION_AUTOTEST_EXPORT #endif -#define QT_DATAVISUALIZATION_NAMESPACE QtDataVisualization +#define QT_BEGIN_NAMESPACE_DATAVISUALIZATION namespace QtDataVisualization { +#define QT_END_NAMESPACE_DATAVISUALIZATION } -#ifdef QT_DATAVISUALIZATION_NAMESPACE -# define QT_DATAVISUALIZATION_BEGIN_NAMESPACE namespace QT_DATAVISUALIZATION_NAMESPACE { -# define QT_DATAVISUALIZATION_END_NAMESPACE } -# define QT_DATAVISUALIZATION_USE_NAMESPACE using namespace QT_DATAVISUALIZATION_NAMESPACE; -#else -# define QT_DATAVISUALIZATION_BEGIN_NAMESPACE -# define QT_DATAVISUALIZATION_END_NAMESPACE -# define QT_DATAVISUALIZATION_USE_NAMESPACE #endif - -#endif // QVIS3DGLOBAL_H |