diff options
author | Liang Qi <liang.qi@qt.io> | 2016-05-24 20:00:08 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2016-05-24 20:00:08 +0200 |
commit | e91b9713cc956770a38c1ba4db996c24612c4fa4 (patch) | |
tree | 47ef9c6f270268545c775572fc5c8c1417555678 | |
parent | 13a8c4eb9977a962fd70a91c6e5801f7a6506900 (diff) | |
parent | 02af08a705ada1ca2dac839a026a816a8e70def5 (diff) |
Merge remote-tracking branch 'origin/5.7' into dev
Change-Id: I05e7c35760c0caf0a8b71823210dc0d78c1784ce
-rw-r--r-- | qtdatavis3d.pro | 12 | ||||
-rw-r--r-- | src/datavisualization/datavisualization.pro | 5 | ||||
-rw-r--r-- | src/datavisualization/doc/qtdatavis3d.qdocconf (renamed from src/datavisualization/doc/qtdatavisualization.qdocconf) | 2 |
3 files changed, 7 insertions, 12 deletions
diff --git a/qtdatavis3d.pro b/qtdatavis3d.pro index ab70c061..5284069b 100644 --- a/qtdatavis3d.pro +++ b/qtdatavis3d.pro @@ -1,13 +1,9 @@ requires(qtHaveModule(widgets)) -load(qt_parts) - # We need opengl, minimum es2 or desktop -!contains(QT_CONFIG, opengl) { - error(QtDataVisualization requires OpenGL!) -} -contains(QT_CONFIG, opengles1) { - error(QtDataVisualization does not support OpenGL ES 1!) -} +requires(contains(QT_CONFIG, opengl)) +requires(!contains(QT_CONFIG, opengles1)) + +load(qt_parts) OTHER_FILES += README dist/* .qmake.conf diff --git a/src/datavisualization/datavisualization.pro b/src/datavisualization/datavisualization.pro index 4407ad78..9ee9ae72 100644 --- a/src/datavisualization/datavisualization.pro +++ b/src/datavisualization/datavisualization.pro @@ -9,7 +9,7 @@ static: MODULE_DEFINES += QT_DATAVISUALIZATION_STATICLIB MODULE_INCNAME = QtDataVisualization -QMAKE_DOCS = $$PWD/doc/qtdatavisualization.qdocconf +QMAKE_DOCS = $$PWD/doc/qtdatavis3d.qdocconf load(qt_module) @@ -24,9 +24,8 @@ include($$PWD/axis/axis.pri) include($$PWD/data/data.pri) include($$PWD/input/input.pri) -OTHER_FILES += doc/qtdatavisualization.qdocconf \ +OTHER_FILES += doc/qtdatavis3d.qdocconf \ doc/src/* \ doc/images/* \ doc/snippets/* \ global/*.qdoc - diff --git a/src/datavisualization/doc/qtdatavisualization.qdocconf b/src/datavisualization/doc/qtdatavis3d.qdocconf index 873e33a0..f95ecacf 100644 --- a/src/datavisualization/doc/qtdatavisualization.qdocconf +++ b/src/datavisualization/doc/qtdatavis3d.qdocconf @@ -18,7 +18,7 @@ depends = qtcore qtgui qtqml qtquick qtmultimedia qtdoc qhp.projects = QtDataVisualization -qhp.QtDataVisualization.file = qtdatavisualization.qhp +qhp.QtDataVisualization.file = qtdatavis3d.qhp qhp.QtDataVisualization.namespace = org.qt-project.qtdatavisualization.$QT_VERSION_TAG qhp.QtDataVisualization.virtualFolder = qtdatavisualization qhp.QtDataVisualization.indexTitle = Qt Data Visualization |