diff options
| author | Tomi Korpipää <tomi.korpipaa@digia.com> | 2013-06-12 13:48:48 +0300 |
|---|---|---|
| committer | Tomi Korpipää <tomi.korpipaa@digia.com> | 2013-06-12 13:48:48 +0300 |
| commit | b185e2c557bb987197ee9147f088724f6a06f4a0 (patch) | |
| tree | 4c25116ae68193d14b18848d0db0ab1ed9780636 /src/datavis3d/global/qdatavis3dglobal.h | |
| parent | b61b63ff5e3b4ba7c4f4174c16b33bedadbfcfb8 (diff) | |
| parent | 317f3f15fed855cfaa31a9b558bf1279583832e6 (diff) | |
Merge remote-tracking branch 'origin/master' into develop
Conflicts:
examples/qmlbarchart/qml/qmlbarchart/main.qml
src/datavis3d/doc/snippets/doc_src_qtdatavis3d.pro
src/datavis3d/engine/q3dbars.cpp
src/datavis3d/engine/q3dwindow.cpp
src/datavis3dqml2/datavisview.cpp
Change-Id: Ida37fd44e7e58aec07af09a6d1dde4ac4adbd8a4
Diffstat (limited to 'src/datavis3d/global/qdatavis3dglobal.h')
| -rw-r--r-- | src/datavis3d/global/qdatavis3dglobal.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/datavis3d/global/qdatavis3dglobal.h b/src/datavis3d/global/qdatavis3dglobal.h index c57d5101..308e8607 100644 --- a/src/datavis3d/global/qdatavis3dglobal.h +++ b/src/datavis3d/global/qdatavis3dglobal.h @@ -18,8 +18,8 @@ ** ****************************************************************************/ -#ifndef QVIS3DGLOBAL_H -#define QVIS3DGLOBAL_H +#ifndef QDATAVIS3DGLOBAL_H +#define QDATAVIS3DGLOBAL_H #include <qglobal.h> |