diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-08-01 09:16:51 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-08-01 09:16:51 +0200 |
| commit | 2523056490c3f7a35d176deb583ba46899fe260b (patch) | |
| tree | 0a38f955248b467227e4fca5aa6e161472cec2b2 /src/datavisualization/datavisualization.pro | |
| parent | 1533ffc6d8afe46df72a05ecd571fd7dcb1bd397 (diff) | |
| parent | 4d4a9609fab58da304e4c13b9a37531116a4fadb (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7v5.7.1
Conflicts:
src/datavisualization/datavisualization.pro
Change-Id: Ie79d1c1e959bac9a674a9031c36e7914252805b9
Diffstat (limited to 'src/datavisualization/datavisualization.pro')
| -rw-r--r-- | src/datavisualization/datavisualization.pro | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/datavisualization/datavisualization.pro b/src/datavisualization/datavisualization.pro index 9ee9ae72..e85a1e47 100644 --- a/src/datavisualization/datavisualization.pro +++ b/src/datavisualization/datavisualization.pro @@ -2,17 +2,11 @@ TARGET = QtDataVisualization QT += core gui osx: QT += gui-private -DEFINES += QT_DATAVISUALIZATION_LIBRARY - -# Fix exports in static builds for applications linking datavisualization module -static: MODULE_DEFINES += QT_DATAVISUALIZATION_STATICLIB MODULE_INCNAME = QtDataVisualization QMAKE_DOCS = $$PWD/doc/qtdatavis3d.qdocconf -load(qt_module) - QMAKE_TARGET_PRODUCT = "Qt Data Visualization (Qt $$QT_VERSION)" QMAKE_TARGET_DESCRIPTION = "3D Data Visualization component for Qt." @@ -29,3 +23,5 @@ OTHER_FILES += doc/qtdatavis3d.qdocconf \ doc/images/* \ doc/snippets/* \ global/*.qdoc + +load(qt_module) |