diff options
Diffstat (limited to 'src/datavisualization')
4 files changed, 15 insertions, 10 deletions
diff --git a/src/datavisualization/datavisualization.pro b/src/datavisualization/datavisualization.pro index 87857062..bfb07440 100644 --- a/src/datavisualization/datavisualization.pro +++ b/src/datavisualization/datavisualization.pro @@ -1,7 +1,10 @@ -TARGET = QtDataVisualization -QT = core gui +# Target can't start with 'Qt' as it gets major version number inserted into it in that case, +# which we don't want. +TARGET = DataVisualization +QT = core gui DEFINES += QT_DATAVISUALIZATION_LIBRARY +MODULE_INCNAME = QtDataVisualization QMAKE_DOCS = $$PWD/doc/qtdatavisualization.qdocconf diff --git a/src/datavisualization/doc/qtdatavisualization.qdocconf b/src/datavisualization/doc/qtdatavisualization.qdocconf index e3189604..82a5d8c4 100644 --- a/src/datavisualization/doc/qtdatavisualization.qdocconf +++ b/src/datavisualization/doc/qtdatavisualization.qdocconf @@ -2,7 +2,7 @@ include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf) project = QtDataVisualization description = Qt Data Visualization Reference Documentation -version = 1.0.0 +version = 0.1.0 exampledirs += ../../../examples \ snippets @@ -18,14 +18,14 @@ depends += qtcore \ qhp.projects = qtdatavisualization qhp.qtdatavisualization.file = qtdatavisualization.qhp -qhp.qtdatavisualization.namespace = org.qt-project.qtdatavisualization.1.0.0 +qhp.qtdatavisualization.namespace = org.qt-project.qtdatavisualization.0.1.0 qhp.qtdatavisualization.virtualFolder = qtdatavisualization qhp.qtdatavisualization.indexTitle = Qt Data Visualization qhp.qtdatavisualization.indexRoot = -qhp.qtdatavisualization.filterAttributes = qtdatavisualization 1.0.0 qtrefdoc -qhp.qtdatavisualization.customFilters.Qt.name = QtDataVisualization 1.0.0 -qhp.qtdatavisualization.customFilters.Qt.filterAttributes = qtdatavisualization 1.0.0 +qhp.qtdatavisualization.filterAttributes = qtdatavisualization 0.1.0 qtrefdoc +qhp.qtdatavisualization.customFilters.Qt.name = QtDataVisualization 0.1.0 +qhp.qtdatavisualization.customFilters.Qt.filterAttributes = qtdatavisualization 0.1.0 qhp.qtdatavisualization.subprojects = classes qhp.qtdatavisualization.subprojects.classes.title = C++ Classes qhp.qtdatavisualization.subprojects.classes.indexTitle = Qt Data Visualization C++ Classes diff --git a/src/datavisualization/doc/snippets/doc_src_qtdatavisualization.cpp b/src/datavisualization/doc/snippets/doc_src_qtdatavisualization.cpp index 2f3d6a98..d32bde0e 100644 --- a/src/datavisualization/doc/snippets/doc_src_qtdatavisualization.cpp +++ b/src/datavisualization/doc/snippets/doc_src_qtdatavisualization.cpp @@ -82,11 +82,13 @@ QItemModelSurfaceDataProxy *proxy = new QItemModelSurfaceDataProxy(customModel, //! [6] qmake make +make install //! [6] //! [7] qmake CONFIG+=static make +make install //! [7] //! [8] diff --git a/src/datavisualization/global/qdatavisualizationglobal.h b/src/datavisualization/global/qdatavisualizationglobal.h index ac734960..eefa2888 100644 --- a/src/datavisualization/global/qdatavisualizationglobal.h +++ b/src/datavisualization/global/qdatavisualizationglobal.h @@ -21,13 +21,13 @@ #include <qglobal.h> -#define QT_DATAVISUALIZATION_VERSION_STR "0.0.1" +#define QT_DATAVISUALIZATION_VERSION_STR "0.1.0" /* QT_DATAVISUALIZATION_VERSION is (major << 16) + (minor << 8) + patch. */ -#define QT_DATAVISUALIZATION_VERSION 0x000001 +#define QT_DATAVISUALIZATION_VERSION 0x000100 /* - can be used like #if (QT_DATAVISUALIZATION_VERSION >= QT_DATAVISUALIZATION_VERSION_CHECK(1, 1, 0)) + can be used like #if (QT_DATAVISUALIZATION_VERSION >= QT_DATAVISUALIZATION_VERSION_CHECK(1, 0, 0)) */ #define QT_DATAVISUALIZATION_VERSION_CHECK(major, minor, patch) ((major<<16)|(minor<<8)|(patch)) |