diff options
Diffstat (limited to 'src')
24 files changed, 45 insertions, 45 deletions
diff --git a/src/datavisualization/axis/q3dabstractaxis.cpp b/src/datavisualization/axis/q3dabstractaxis.cpp index 8b07cd39..b0372adc 100644 --- a/src/datavisualization/axis/q3dabstractaxis.cpp +++ b/src/datavisualization/axis/q3dabstractaxis.cpp @@ -34,8 +34,8 @@ QT_DATAVISUALIZATION_BEGIN_NAMESPACE /*! * \qmltype AbstractAxis3D - * \inqmlmodule com.digia.QtDataVisualization - * \since com.digia.QtDataVisualization 1.0 + * \inqmlmodule QtDataVisualization + * \since QtDataVisualization 1.0 * \ingroup datavisualization_qml * \instantiates Q3DAbstractAxis * \brief AbstractAxis3D is base type for axes of a graph. diff --git a/src/datavisualization/axis/q3dcategoryaxis.cpp b/src/datavisualization/axis/q3dcategoryaxis.cpp index 866399f5..63026379 100644 --- a/src/datavisualization/axis/q3dcategoryaxis.cpp +++ b/src/datavisualization/axis/q3dcategoryaxis.cpp @@ -38,8 +38,8 @@ QT_DATAVISUALIZATION_BEGIN_NAMESPACE /*! * \qmltype CategoryAxis3D - * \inqmlmodule com.digia.QtDataVisualization - * \since com.digia.QtDataVisualization 1.0 + * \inqmlmodule QtDataVisualization + * \since QtDataVisualization 1.0 * \ingroup datavisualization_qml * \instantiates Q3DCategoryAxis * \inherits AbstractAxis3D diff --git a/src/datavisualization/axis/q3dvalueaxis.cpp b/src/datavisualization/axis/q3dvalueaxis.cpp index 1b18dadb..9865625c 100644 --- a/src/datavisualization/axis/q3dvalueaxis.cpp +++ b/src/datavisualization/axis/q3dvalueaxis.cpp @@ -38,8 +38,8 @@ QT_DATAVISUALIZATION_BEGIN_NAMESPACE /*! * \qmltype ValueAxis3D - * \inqmlmodule com.digia.QtDataVisualization - * \since com.digia.QtDataVisualization 1.0 + * \inqmlmodule QtDataVisualization + * \since QtDataVisualization 1.0 * \ingroup datavisualization_qml * \instantiates Q3DValueAxis * \inherits AbstractAxis3D diff --git a/src/datavisualization/data/qabstractdataproxy.cpp b/src/datavisualization/data/qabstractdataproxy.cpp index 2e4556fd..4a2f4ee5 100644 --- a/src/datavisualization/data/qabstractdataproxy.cpp +++ b/src/datavisualization/data/qabstractdataproxy.cpp @@ -33,8 +33,8 @@ QT_DATAVISUALIZATION_BEGIN_NAMESPACE /*! * \qmltype AbstractDataProxy - * \inqmlmodule com.digia.QtDataVisualization - * \since com.digia.QtDataVisualization 1.0 + * \inqmlmodule QtDataVisualization + * \since QtDataVisualization 1.0 * \ingroup datavisualization_qml * \instantiates QAbstractDataProxy * \brief Base type for all QtDataVisualization data proxies. diff --git a/src/datavisualization/data/qbardataproxy.cpp b/src/datavisualization/data/qbardataproxy.cpp index 08d8151b..13517b4b 100644 --- a/src/datavisualization/data/qbardataproxy.cpp +++ b/src/datavisualization/data/qbardataproxy.cpp @@ -74,8 +74,8 @@ QT_DATAVISUALIZATION_BEGIN_NAMESPACE /*! * \qmltype BarDataProxy - * \inqmlmodule com.digia.QtDataVisualization - * \since com.digia.QtDataVisualization 1.0 + * \inqmlmodule QtDataVisualization + * \since QtDataVisualization 1.0 * \ingroup datavisualization_qml * \instantiates QBarDataProxy * \inherits AbstractDataProxy diff --git a/src/datavisualization/data/qheightmapsurfacedataproxy.cpp b/src/datavisualization/data/qheightmapsurfacedataproxy.cpp index cd63e603..251ae70a 100644 --- a/src/datavisualization/data/qheightmapsurfacedataproxy.cpp +++ b/src/datavisualization/data/qheightmapsurfacedataproxy.cpp @@ -43,8 +43,8 @@ const float defaultMaxValue = 10.0f; /*! * \qmltype HeightMapSurfaceDataProxy - * \inqmlmodule com.digia.QtDataVisualization - * \since com.digia.QtDataVisualization 1.0 + * \inqmlmodule QtDataVisualization + * \since QtDataVisualization 1.0 * \ingroup datavisualization_qml * \instantiates QHeightMapSurfaceDataProxy * \inherits SurfaceDataProxy diff --git a/src/datavisualization/data/qitemmodelbardatamapping.cpp b/src/datavisualization/data/qitemmodelbardatamapping.cpp index 37bd7bf1..0e92680f 100644 --- a/src/datavisualization/data/qitemmodelbardatamapping.cpp +++ b/src/datavisualization/data/qitemmodelbardatamapping.cpp @@ -55,8 +55,8 @@ QT_DATAVISUALIZATION_BEGIN_NAMESPACE /*! * \qmltype BarDataMapping - * \inqmlmodule com.digia.QtDataVisualization - * \since com.digia.QtDataVisualization 1.0 + * \inqmlmodule QtDataVisualization + * \since QtDataVisualization 1.0 * \ingroup datavisualization_qml * \instantiates QItemModelBarDataMapping * \brief Item model mapping for Bars3D. diff --git a/src/datavisualization/data/qitemmodelbardataproxy.cpp b/src/datavisualization/data/qitemmodelbardataproxy.cpp index bee87606..a28e05e1 100644 --- a/src/datavisualization/data/qitemmodelbardataproxy.cpp +++ b/src/datavisualization/data/qitemmodelbardataproxy.cpp @@ -40,8 +40,8 @@ QT_DATAVISUALIZATION_BEGIN_NAMESPACE /*! * \qmltype ItemModelBarDataProxy - * \inqmlmodule com.digia.QtDataVisualization - * \since com.digia.QtDataVisualization 1.0 + * \inqmlmodule QtDataVisualization + * \since QtDataVisualization 1.0 * \ingroup datavisualization_qml * \instantiates QItemModelBarDataProxy * \inherits BarDataProxy diff --git a/src/datavisualization/data/qitemmodelscatterdatamapping.cpp b/src/datavisualization/data/qitemmodelscatterdatamapping.cpp index 6705588d..3d94d0ce 100644 --- a/src/datavisualization/data/qitemmodelscatterdatamapping.cpp +++ b/src/datavisualization/data/qitemmodelscatterdatamapping.cpp @@ -44,8 +44,8 @@ QT_DATAVISUALIZATION_BEGIN_NAMESPACE /*! * \qmltype ScatterDataMapping - * \inqmlmodule com.digia.QtDataVisualization - * \since com.digia.QtDataVisualization 1.0 + * \inqmlmodule QtDataVisualization + * \since QtDataVisualization 1.0 * \ingroup datavisualization_qml * \instantiates QItemModelScatterDataMapping * \brief Item model mapping for Scatter3D. diff --git a/src/datavisualization/data/qitemmodelscatterdataproxy.cpp b/src/datavisualization/data/qitemmodelscatterdataproxy.cpp index 147b16da..66a0a63b 100644 --- a/src/datavisualization/data/qitemmodelscatterdataproxy.cpp +++ b/src/datavisualization/data/qitemmodelscatterdataproxy.cpp @@ -39,8 +39,8 @@ QT_DATAVISUALIZATION_BEGIN_NAMESPACE /*! * \qmltype ItemModelScatterDataProxy - * \inqmlmodule com.digia.QtDataVisualization - * \since com.digia.QtDataVisualization 1.0 + * \inqmlmodule QtDataVisualization + * \since QtDataVisualization 1.0 * \ingroup datavisualization_qml * \instantiates QItemModelScatterDataProxy * \inherits ScatterDataProxy diff --git a/src/datavisualization/data/qitemmodelsurfacedatamapping.cpp b/src/datavisualization/data/qitemmodelsurfacedatamapping.cpp index eead9a8e..bfe62c6d 100644 --- a/src/datavisualization/data/qitemmodelsurfacedatamapping.cpp +++ b/src/datavisualization/data/qitemmodelsurfacedatamapping.cpp @@ -56,8 +56,8 @@ QT_DATAVISUALIZATION_BEGIN_NAMESPACE /*! * \qmltype SurfaceDataMapping - * \inqmlmodule com.digia.QtDataVisualization - * \since com.digia.QtDataVisualization 1.0 + * \inqmlmodule QtDataVisualization + * \since QtDataVisualization 1.0 * \ingroup datavisualization_qml * \instantiates QItemModelSurfaceDataMapping * \brief Item model mapping for Surface3D. diff --git a/src/datavisualization/data/qitemmodelsurfacedataproxy.cpp b/src/datavisualization/data/qitemmodelsurfacedataproxy.cpp index 750de4e2..d3f0f076 100644 --- a/src/datavisualization/data/qitemmodelsurfacedataproxy.cpp +++ b/src/datavisualization/data/qitemmodelsurfacedataproxy.cpp @@ -41,8 +41,8 @@ QT_DATAVISUALIZATION_BEGIN_NAMESPACE /*! * \qmltype ItemModelSurfaceDataProxy - * \inqmlmodule com.digia.QtDataVisualization - * \since com.digia.QtDataVisualization 1.0 + * \inqmlmodule QtDataVisualization + * \since QtDataVisualization 1.0 * \ingroup datavisualization_qml * \instantiates QItemModelSurfaceDataProxy * \inherits SurfaceDataProxy diff --git a/src/datavisualization/data/qscatterdataproxy.cpp b/src/datavisualization/data/qscatterdataproxy.cpp index 479fdd75..c9bd56d7 100644 --- a/src/datavisualization/data/qscatterdataproxy.cpp +++ b/src/datavisualization/data/qscatterdataproxy.cpp @@ -58,8 +58,8 @@ QT_DATAVISUALIZATION_BEGIN_NAMESPACE /*! * \qmltype ScatterDataProxy - * \inqmlmodule com.digia.QtDataVisualization - * \since com.digia.QtDataVisualization 1.0 + * \inqmlmodule QtDataVisualization + * \since QtDataVisualization 1.0 * \ingroup datavisualization_qml * \instantiates QScatterDataProxy * \inherits AbstractDataProxy diff --git a/src/datavisualization/data/qsurfacedataproxy.cpp b/src/datavisualization/data/qsurfacedataproxy.cpp index 1f152978..7fe44464 100644 --- a/src/datavisualization/data/qsurfacedataproxy.cpp +++ b/src/datavisualization/data/qsurfacedataproxy.cpp @@ -66,8 +66,8 @@ QT_DATAVISUALIZATION_BEGIN_NAMESPACE /*! * \qmltype SurfaceDataProxy - * \inqmlmodule com.digia.QtDataVisualization - * \since com.digia.QtDataVisualization 1.0 + * \inqmlmodule QtDataVisualization + * \since QtDataVisualization 1.0 * \ingroup datavisualization_qml * \instantiates QSurfaceDataProxy * \inherits AbstractDataProxy diff --git a/src/datavisualization/doc/snippets/doc_src_qmldatavisualization.cpp b/src/datavisualization/doc/snippets/doc_src_qmldatavisualization.cpp index f4446e17..204e1cee 100644 --- a/src/datavisualization/doc/snippets/doc_src_qmldatavisualization.cpp +++ b/src/datavisualization/doc/snippets/doc_src_qmldatavisualization.cpp @@ -17,7 +17,7 @@ ****************************************************************************/ //! [0] -import com.digia.QtDataVisualization 1.0 +import QtDataVisualization 1.0 //! [0] //! [1] diff --git a/src/datavisualization/doc/src/qtdatavisualization-qml-abstractdeclarative.qdoc b/src/datavisualization/doc/src/qtdatavisualization-qml-abstractdeclarative.qdoc index 6d85a1bd..59331bf9 100644 --- a/src/datavisualization/doc/src/qtdatavisualization-qml-abstractdeclarative.qdoc +++ b/src/datavisualization/doc/src/qtdatavisualization-qml-abstractdeclarative.qdoc @@ -18,8 +18,8 @@ /*! \qmltype AbstractGraph3D - \inqmlmodule com.digia.QtDataVisualization - \since com.digia.QtDataVisualization 1.0 + \inqmlmodule QtDataVisualization + \since QtDataVisualization 1.0 \ingroup datavisualization_qml \brief Base type for 3D visualizations. diff --git a/src/datavisualization/doc/src/qtdatavisualization-qml-bars3d.qdoc b/src/datavisualization/doc/src/qtdatavisualization-qml-bars3d.qdoc index 5d2178cf..c81e5aac 100644 --- a/src/datavisualization/doc/src/qtdatavisualization-qml-bars3d.qdoc +++ b/src/datavisualization/doc/src/qtdatavisualization-qml-bars3d.qdoc @@ -19,8 +19,8 @@ /*! * \qmltype Bars3D * \inherits AbstractGraph3D - * \inqmlmodule com.digia.QtDataVisualization - * \since com.digia.QtDataVisualization 1.0 + * \inqmlmodule QtDataVisualization + * \since QtDataVisualization 1.0 * \ingroup datavisualization_qml * \brief 3D bar graph. * diff --git a/src/datavisualization/doc/src/qtdatavisualization-qml-colorgradient.qdoc b/src/datavisualization/doc/src/qtdatavisualization-qml-colorgradient.qdoc index 5c823d25..b6f0781f 100644 --- a/src/datavisualization/doc/src/qtdatavisualization-qml-colorgradient.qdoc +++ b/src/datavisualization/doc/src/qtdatavisualization-qml-colorgradient.qdoc @@ -18,8 +18,8 @@ /*! \qmltype ColorGradientStop - \inqmlmodule com.digia.QtDataVisualization - \since com.digia.QtDataVisualization 1.0 + \inqmlmodule QtDataVisualization + \since QtDataVisualization 1.0 \ingroup datavisualization_qml \brief Defines the color at a position in ColorGradient. @@ -50,8 +50,8 @@ /*! \qmltype ColorGradient - \inqmlmodule com.digia.QtDataVisualization - \since com.digia.QtDataVisualization 1.0 + \inqmlmodule QtDataVisualization + \since QtDataVisualization 1.0 \ingroup datavisualization_qml \brief Defines a color gradient. diff --git a/src/datavisualization/doc/src/qtdatavisualization-qml-scatter3d.qdoc b/src/datavisualization/doc/src/qtdatavisualization-qml-scatter3d.qdoc index 3d367a77..e9661b60 100644 --- a/src/datavisualization/doc/src/qtdatavisualization-qml-scatter3d.qdoc +++ b/src/datavisualization/doc/src/qtdatavisualization-qml-scatter3d.qdoc @@ -19,8 +19,8 @@ /*! \qmltype Scatter3D \inherits AbstractGraph3D - \inqmlmodule com.digia.QtDataVisualization - \since com.digia.QtDataVisualization 1.0 + \inqmlmodule QtDataVisualization + \since QtDataVisualization 1.0 \ingroup datavisualization_qml \brief 3D scatter graph. diff --git a/src/datavisualization/doc/src/qtdatavisualization-qml-surface3d.qdoc b/src/datavisualization/doc/src/qtdatavisualization-qml-surface3d.qdoc index b47408f2..92b0e7d9 100644 --- a/src/datavisualization/doc/src/qtdatavisualization-qml-surface3d.qdoc +++ b/src/datavisualization/doc/src/qtdatavisualization-qml-surface3d.qdoc @@ -19,8 +19,8 @@ /*! \qmltype Surface3D \inherits AbstractGraph3D - \inqmlmodule com.digia.QtDataVisualization - \since com.digia.QtDataVisualization 1.0 + \inqmlmodule QtDataVisualization + \since QtDataVisualization 1.0 \ingroup datavisualization_qml \brief Describes the usage of the 3D surface graph. diff --git a/src/datavisualization/doc/src/qtdatavisualization.qdoc b/src/datavisualization/doc/src/qtdatavisualization.qdoc index 77596dfa..faae937d 100644 --- a/src/datavisualization/doc/src/qtdatavisualization.qdoc +++ b/src/datavisualization/doc/src/qtdatavisualization.qdoc @@ -27,7 +27,7 @@ */ /*! - \qmlmodule com.digia.QtDataVisualization 1.0 + \qmlmodule QtDataVisualization 1.0 \title Qt Data Visualization QML Types \ingroup qmlmodules diff --git a/src/datavisualizationqml2/datavisualizationqml2.pro b/src/datavisualizationqml2/datavisualizationqml2.pro index d5191c62..8cd19b4e 100644 --- a/src/datavisualizationqml2/datavisualizationqml2.pro +++ b/src/datavisualizationqml2/datavisualizationqml2.pro @@ -4,7 +4,7 @@ QT += qml quick datavisualization CONFIG += qt plugin TARGET = $$qtLibraryTarget($$TARGET) -uri = com.digia.QtDataVisualization +uri = QtDataVisualization static { DEFINES += QT_DATAVISUALIZATION_STATICLIB diff --git a/src/datavisualizationqml2/datavisualizationqml2_plugin.cpp b/src/datavisualizationqml2/datavisualizationqml2_plugin.cpp index b98f72ac..be50982d 100644 --- a/src/datavisualizationqml2/datavisualizationqml2_plugin.cpp +++ b/src/datavisualizationqml2/datavisualizationqml2_plugin.cpp @@ -24,7 +24,7 @@ QT_DATAVISUALIZATION_BEGIN_NAMESPACE void Datavis3Dqml2Plugin::registerTypes(const char *uri) { - // @uri com.digia.QtDataVisualization + // @uri QtDataVisualization qmlRegisterUncreatableType<const QAbstractItemModel>(uri, 1, 0, "AbstractItemModel", QLatin1String("Trying to create uncreatable: AbstractItemModel.")); qmlRegisterUncreatableType<QDataVis>(uri, 1, 0, "DataVis", diff --git a/src/datavisualizationqml2/qmldir b/src/datavisualizationqml2/qmldir index 1def2238..601861d8 100644 --- a/src/datavisualizationqml2/qmldir +++ b/src/datavisualizationqml2/qmldir @@ -1,3 +1,3 @@ -module com.digia.QtDataVisualization +module QtDataVisualization plugin datavisualizationqml2 |