aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/types/qqmlinstantiator.cpp
diff options
context:
space:
mode:
authorMartin Smith <martin.smith@digia.com>2013-10-01 13:03:28 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-10-02 14:40:01 +0200
commit4706b1ceff9af9141044ed3cf020ce5624bfa40f (patch)
tree43672217a945512ddd1704468d1fd4b6e9c153c7 /src/qml/types/qqmlinstantiator.cpp
parent4f50ab594aa2fb1d38981127beca634ad3396489 (diff)
qdoc: no longer recognizes the version nr in QML refs
All QML references of the form <QML-module-name><QML-module-version>::<QML-type>::<member-name> have had the <QML-module-version> removed i. Task-number: QTBUG-33776 Change-Id: Idde279e0f254cd24ea44f9841662dd81a2c5bbc6 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Diffstat (limited to 'src/qml/types/qqmlinstantiator.cpp')
-rw-r--r--src/qml/types/qqmlinstantiator.cpp18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/qml/types/qqmlinstantiator.cpp b/src/qml/types/qqmlinstantiator.cpp
index 4173813154..f7b2f9254a 100644
--- a/src/qml/types/qqmlinstantiator.cpp
+++ b/src/qml/types/qqmlinstantiator.cpp
@@ -212,7 +212,7 @@ QQmlInstantiator::~QQmlInstantiator()
}
/*!
- \qmlsignal QtQml2::Instantiator::onObjectAdded(int index, QtObject object)
+ \qmlsignal QtQml::Instantiator::onObjectAdded(int index, QtObject object)
This handler is called when an object is added to the Instantiator. The \a index
parameter holds the index which the object has been given, and the \a object
@@ -220,7 +220,7 @@ QQmlInstantiator::~QQmlInstantiator()
*/
/*!
- \qmlsignal QtQml2::Instantiator::onObjectRemoved(int index, QtObject object)
+ \qmlsignal QtQml::Instantiator::onObjectRemoved(int index, QtObject object)
This handler is called when an object is added to the Instantiator. The \a index
parameter holds the index which the object had been given, and the \a object
@@ -230,7 +230,7 @@ QQmlInstantiator::~QQmlInstantiator()
in these cases it will be deleted shortly after the handler is called.
*/
/*!
- \qmlproperty bool QtQml2::Instantiator::active
+ \qmlproperty bool QtQml::Instantiator::active
When active is true, and the delegate component is ready, the Instantiator will
create objects according to the model. When active is false, no objects
@@ -255,7 +255,7 @@ void QQmlInstantiator::setActive(bool newVal)
}
/*!
- \qmlproperty bool QtQml2::Instantiator::asynchronous
+ \qmlproperty bool QtQml::Instantiator::asynchronous
When asynchronous is true the Instantiator will attempt to create objects
asynchronously. This means that objects may not be available immediately,
@@ -282,7 +282,7 @@ void QQmlInstantiator::setAsync(bool newVal)
/*!
- \qmlproperty int QtQml2::Instantiator::count
+ \qmlproperty int QtQml::Instantiator::count
The number of objects the Instantiator is currently managing.
*/
@@ -294,7 +294,7 @@ int QQmlInstantiator::count() const
}
/*!
- \qmlproperty QtQml2::Component QtQml2::Instantiator::delegate
+ \qmlproperty QtQml::Component QtQml::Instantiator::delegate
\default
The component used to create all objects.
@@ -331,7 +331,7 @@ void QQmlInstantiator::setDelegate(QQmlComponent* c)
}
/*!
- \qmlproperty variant QtQml2::Instantiator::model
+ \qmlproperty variant QtQml::Instantiator::model
This property can be set to any of the supported \l {qml-data-models}{data models}:
@@ -405,7 +405,7 @@ void QQmlInstantiator::setModel(const QVariant &v)
}
/*!
- \qmlproperty QtQml2::QtObject QtQml2::Instantiator::object
+ \qmlproperty QtQml::QtObject QtQml::Instantiator::object
This is a reference to the first created object, intended as a convenience
for the case where only one object has been created.
@@ -419,7 +419,7 @@ QObject *QQmlInstantiator::object() const
}
/*!
- \qmlmethod QtQml2::QtObject QtQml2::Instantiator::objectAt
+ \qmlmethod QtQml::QtObject QtQml::Instantiator::objectAt
Returns a reference to the object with the given \a index.
*/