diff options
| author | Miikka Heikkinen <miikka.heikkinen@theqtcompany.com> | 2014-10-29 09:45:41 +0200 |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@theqtcompany.com> | 2014-10-29 09:45:41 +0200 |
| commit | e3a4f132ca2a42af3d4bb889d6a17948b88d26a2 (patch) | |
| tree | 554d2b8b3020dc71438301aa696dea1e9a36943a /src/datavisualization/data/data.pri | |
| parent | cc50608385cf77a0803431ece1385f341a400b75 (diff) | |
| parent | bf716cfdf0afecccdb1f2eabb2e6a172c620fbff (diff) | |
Merge branch 'develop'
Conflicts:
.qmake.conf
README
src/datavisualization/global/qdatavisualizationglobal.h
Change-Id: Ia6941dcf3e6aa17e2e9ebc6f60fac16ef5049f11
Diffstat (limited to 'src/datavisualization/data/data.pri')
| -rw-r--r-- | src/datavisualization/data/data.pri | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/datavisualization/data/data.pri b/src/datavisualization/data/data.pri index 73f398bf..e2bbd6eb 100644 --- a/src/datavisualization/data/data.pri +++ b/src/datavisualization/data/data.pri @@ -41,7 +41,9 @@ HEADERS += \ $$PWD/qcustom3ditem.h \ $$PWD/qcustom3ditem_p.h \ $$PWD/qcustom3dlabel.h \ - $$PWD/qcustom3dlabel_p.h + $$PWD/qcustom3dlabel_p.h \ + $$PWD/qcustom3dvolume.h \ + $$PWD/qcustom3dvolume_p.h SOURCES += \ $$PWD/labelitem.cpp \ @@ -69,4 +71,7 @@ SOURCES += \ $$PWD/qsurface3dseries.cpp \ $$PWD/customrenderitem.cpp \ $$PWD/qcustom3ditem.cpp \ - $$PWD/qcustom3dlabel.cpp + $$PWD/qcustom3dlabel.cpp \ + $$PWD/qcustom3dvolume.cpp + +INCLUDEPATH += $$PWD |