diff options
| author | Tomi Korpipää <tomi.korpipaa@digia.com> | 2013-08-16 07:14:35 +0300 |
|---|---|---|
| committer | Tomi Korpipää <tomi.korpipaa@digia.com> | 2013-08-16 07:14:35 +0300 |
| commit | 6c0334496d50aaf4e11dcda7ed642fac565d6145 (patch) | |
| tree | aa6e7aeef9b00ba46910c30bd85fedbc53df39a0 /src/datavis3dqml2/datavis3dqml2.pro | |
| parent | 3288b23502c195d03e097cb372a22f3a1ac4ba87 (diff) | |
| parent | 29f6433606cebe3299e9915ae32bae7dfaed2770 (diff) | |
Merge remote-tracking branch 'origin/develop'
Change-Id: I544af544ecd946cdcccfe9c17d03e47f8d0c1151
Diffstat (limited to 'src/datavis3dqml2/datavis3dqml2.pro')
| -rw-r--r-- | src/datavis3dqml2/datavis3dqml2.pro | 30 |
1 files changed, 18 insertions, 12 deletions
diff --git a/src/datavis3dqml2/datavis3dqml2.pro b/src/datavis3dqml2/datavis3dqml2.pro index 59abef57..c994c5be 100644 --- a/src/datavis3dqml2/datavis3dqml2.pro +++ b/src/datavis3dqml2/datavis3dqml2.pro @@ -6,27 +6,33 @@ CONFIG += qt plugin TARGET = $$qtLibraryTarget($$TARGET) uri = com.digia.QtDataVis3D -staticlib:DEFINES+=QTENTERPRISE_DATAVIS3D_STATICLIB +static { + DEFINES += QT_DATAVIS3D_STATICLIB + CONFIG -= static staticlib +} # Input -INCLUDEPATH += ../datavis3d/engine +INCLUDEPATH += ../datavis3d/engine \ + ../datavis3d/global \ + ../datavis3d/data SOURCES += \ datavis3dqml2_plugin.cpp \ declarativebars.cpp \ - declarativemaps.cpp #\ - #declarativedataitem.cpp \ - #declarativedatarow.cpp \ - #declarativedataset.cpp + declarativebarsrenderer.cpp \ + declarativescatter.cpp \ + declarativescatterrenderer.cpp \ + declarativemaps.cpp \ + declarativemapsrenderer.cpp HEADERS += \ datavis3dqml2_plugin.h \ - declarativebars.h \ - declarativemaps.h \ #\ - declarativebars_p.h - #declarativedataitem.h \ - #declarativedatarow.h \ - #declarativedataset.h + declarativebars_p.h \ + declarativebarsrenderer_p.h \ + declarativescatter_p.h \ + declarativescatterrenderer_p.h \ + declarativemaps_p.h \ + declarativemapsrenderer_p.h OTHER_FILES = qmldir |