summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMiikka Heikkinen <miikka.heikkinen@digia.com>2013-11-01 08:43:09 +0200
committerMiikka Heikkinen <miikka.heikkinen@digia.com>2013-11-01 12:07:25 +0200
commit3ceb6079f5b30a124acefaa0a98263f7999f8fb1 (patch)
tree79b3eb933f444b9585876a20433f4838275d7f68
parentadb0b8e45aba264b6f89801f27d2a4003ed212dd (diff)
Remove com.digia. from QML import
Change-Id: Ic9c44d9af34d602a017ef274cc73fb6ad51f59d8 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
-rw-r--r--examples/examples.pri2
-rw-r--r--examples/qmlbars/qml/qmlbars/axes.qml2
-rw-r--r--examples/qmlbars/qml/qmlbars/data.qml2
-rw-r--r--examples/qmlbars/qml/qmlbars/main.qml2
-rw-r--r--examples/qmlscatter/qml/qmlscatter/data.qml2
-rw-r--r--examples/qmlscatter/qml/qmlscatter/main.qml2
-rw-r--r--examples/qmlsurface/qml/qmlsurface/data.qml2
-rw-r--r--examples/qmlsurface/qml/qmlsurface/main.qml2
-rw-r--r--src/datavisualization/axis/q3dabstractaxis.cpp4
-rw-r--r--src/datavisualization/axis/q3dcategoryaxis.cpp4
-rw-r--r--src/datavisualization/axis/q3dvalueaxis.cpp4
-rw-r--r--src/datavisualization/data/qabstractdataproxy.cpp4
-rw-r--r--src/datavisualization/data/qbardataproxy.cpp4
-rw-r--r--src/datavisualization/data/qheightmapsurfacedataproxy.cpp4
-rw-r--r--src/datavisualization/data/qitemmodelbardatamapping.cpp4
-rw-r--r--src/datavisualization/data/qitemmodelbardataproxy.cpp4
-rw-r--r--src/datavisualization/data/qitemmodelscatterdatamapping.cpp4
-rw-r--r--src/datavisualization/data/qitemmodelscatterdataproxy.cpp4
-rw-r--r--src/datavisualization/data/qitemmodelsurfacedatamapping.cpp4
-rw-r--r--src/datavisualization/data/qitemmodelsurfacedataproxy.cpp4
-rw-r--r--src/datavisualization/data/qscatterdataproxy.cpp4
-rw-r--r--src/datavisualization/data/qsurfacedataproxy.cpp4
-rw-r--r--src/datavisualization/doc/snippets/doc_src_qmldatavisualization.cpp2
-rw-r--r--src/datavisualization/doc/src/qtdatavisualization-qml-abstractdeclarative.qdoc4
-rw-r--r--src/datavisualization/doc/src/qtdatavisualization-qml-bars3d.qdoc4
-rw-r--r--src/datavisualization/doc/src/qtdatavisualization-qml-colorgradient.qdoc8
-rw-r--r--src/datavisualization/doc/src/qtdatavisualization-qml-scatter3d.qdoc4
-rw-r--r--src/datavisualization/doc/src/qtdatavisualization-qml-surface3d.qdoc4
-rw-r--r--src/datavisualization/doc/src/qtdatavisualization.qdoc2
-rw-r--r--src/datavisualizationqml2/datavisualizationqml2.pro2
-rw-r--r--src/datavisualizationqml2/datavisualizationqml2_plugin.cpp2
-rw-r--r--src/datavisualizationqml2/qmldir2
-rw-r--r--tests/qmlcamera/qml/qmlcamera/Axes.qml2
-rw-r--r--tests/qmlcamera/qml/qmlcamera/Data.qml2
-rw-r--r--tests/qmlcamera/qml/qmlcamera/main.qml2
-rw-r--r--tests/tests.pri2
36 files changed, 57 insertions, 57 deletions
diff --git a/examples/examples.pri b/examples/examples.pri
index dc4add12..10d452c3 100644
--- a/examples/examples.pri
+++ b/examples/examples.pri
@@ -18,7 +18,7 @@ TEMPLATE = app
QT += datavisualization
contains(TARGET, qml.*) {
- uri = com.digia.QtDataVisualization
+ uri = QtDataVisualization
lib_name = datavisualizationqml2
uri_replaced = $$replace(uri, \\., $$QMAKE_DIR_SEP)
diff --git a/examples/qmlbars/qml/qmlbars/axes.qml b/examples/qmlbars/qml/qmlbars/axes.qml
index 66be99a0..b6134e09 100644
--- a/examples/qmlbars/qml/qmlbars/axes.qml
+++ b/examples/qmlbars/qml/qmlbars/axes.qml
@@ -17,7 +17,7 @@
****************************************************************************/
import QtQuick 2.1
-import com.digia.QtDataVisualization 1.0
+import QtDataVisualization 1.0
Item {
property alias column: columnAxis
diff --git a/examples/qmlbars/qml/qmlbars/data.qml b/examples/qmlbars/qml/qmlbars/data.qml
index ecb05030..210eedde 100644
--- a/examples/qmlbars/qml/qmlbars/data.qml
+++ b/examples/qmlbars/qml/qmlbars/data.qml
@@ -17,7 +17,7 @@
****************************************************************************/
import QtQuick 2.1
-import com.digia.QtDataVisualization 1.0
+import QtDataVisualization 1.0
Item {
property alias mapping: valueMapping
diff --git a/examples/qmlbars/qml/qmlbars/main.qml b/examples/qmlbars/qml/qmlbars/main.qml
index 3d8aa7e0..db28d569 100644
--- a/examples/qmlbars/qml/qmlbars/main.qml
+++ b/examples/qmlbars/qml/qmlbars/main.qml
@@ -18,7 +18,7 @@
import QtQuick 2.1
import QtQuick.Controls 1.0
-import com.digia.QtDataVisualization 1.0
+import QtDataVisualization 1.0
import "."
Item {
diff --git a/examples/qmlscatter/qml/qmlscatter/data.qml b/examples/qmlscatter/qml/qmlscatter/data.qml
index 37b0dc61..4ad9d7fc 100644
--- a/examples/qmlscatter/qml/qmlscatter/data.qml
+++ b/examples/qmlscatter/qml/qmlscatter/data.qml
@@ -17,7 +17,7 @@
****************************************************************************/
import QtQuick 2.1
-import com.digia.QtDataVisualization 1.0
+import QtDataVisualization 1.0
Item {
//! [3]
diff --git a/examples/qmlscatter/qml/qmlscatter/main.qml b/examples/qmlscatter/qml/qmlscatter/main.qml
index e5f1de62..7fd4ec84 100644
--- a/examples/qmlscatter/qml/qmlscatter/main.qml
+++ b/examples/qmlscatter/qml/qmlscatter/main.qml
@@ -18,7 +18,7 @@
//! [0]
import QtQuick 2.1
-import com.digia.QtDataVisualization 1.0
+import QtDataVisualization 1.0
import "."
//! [0]
diff --git a/examples/qmlsurface/qml/qmlsurface/data.qml b/examples/qmlsurface/qml/qmlsurface/data.qml
index 80ed471a..e5678669 100644
--- a/examples/qmlsurface/qml/qmlsurface/data.qml
+++ b/examples/qmlsurface/qml/qmlsurface/data.qml
@@ -17,7 +17,7 @@
****************************************************************************/
import QtQuick 2.1
-import com.digia.QtDataVisualization 1.0
+import QtDataVisualization 1.0
Item {
property alias mapping: surfaceMapping
diff --git a/examples/qmlsurface/qml/qmlsurface/main.qml b/examples/qmlsurface/qml/qmlsurface/main.qml
index b4ea17f6..ab266c56 100644
--- a/examples/qmlsurface/qml/qmlsurface/main.qml
+++ b/examples/qmlsurface/qml/qmlsurface/main.qml
@@ -17,7 +17,7 @@
****************************************************************************/
import QtQuick 2.1
-import com.digia.QtDataVisualization 1.0
+import QtDataVisualization 1.0
import "."
Item {
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
diff --git a/tests/qmlcamera/qml/qmlcamera/Axes.qml b/tests/qmlcamera/qml/qmlcamera/Axes.qml
index b0ba3eb2..5da1e680 100644
--- a/tests/qmlcamera/qml/qmlcamera/Axes.qml
+++ b/tests/qmlcamera/qml/qmlcamera/Axes.qml
@@ -17,7 +17,7 @@
****************************************************************************/
import QtQuick 2.1
-import com.digia.QtDataVisualization 1.0
+import QtDataVisualization 1.0
Item {
property alias column: columnAxis
diff --git a/tests/qmlcamera/qml/qmlcamera/Data.qml b/tests/qmlcamera/qml/qmlcamera/Data.qml
index fff568cc..8b7057d5 100644
--- a/tests/qmlcamera/qml/qmlcamera/Data.qml
+++ b/tests/qmlcamera/qml/qmlcamera/Data.qml
@@ -17,7 +17,7 @@
****************************************************************************/
import QtQuick 2.1
-import com.digia.QtDataVisualization 1.0
+import QtDataVisualization 1.0
Item {
property alias mapping: valueMapping
diff --git a/tests/qmlcamera/qml/qmlcamera/main.qml b/tests/qmlcamera/qml/qmlcamera/main.qml
index dbe11b8e..4fff55e7 100644
--- a/tests/qmlcamera/qml/qmlcamera/main.qml
+++ b/tests/qmlcamera/qml/qmlcamera/main.qml
@@ -18,7 +18,7 @@
import QtQuick 2.1
import QtQuick.Controls 1.0
-import com.digia.QtDataVisualization 1.0
+import QtDataVisualization 1.0
import "."
Item {
diff --git a/tests/tests.pri b/tests/tests.pri
index 815ce4dd..04115f06 100644
--- a/tests/tests.pri
+++ b/tests/tests.pri
@@ -18,7 +18,7 @@ TEMPLATE = app
QT += datavisualization
contains(TARGET, qml.*) {
- uri = com.digia.QtDataVisualization
+ uri = QtDataVisualization
lib_name = datavisualizationqml2
uri_replaced = $$replace(uri, \\., $$QMAKE_DIR_SEP)