From b855240b782395f94315f43ea3e7e182299fac48 Mon Sep 17 00:00:00 2001 From: Matthew Vogt Date: Thu, 16 Feb 2012 14:43:03 +1000 Subject: Rename QDeclarative symbols to QQuick and QQml Symbols beginning with QDeclarative are already exported by the quick1 module. Users can apply the bin/rename-qtdeclarative-symbols.sh script to modify client code using the previous names of the renamed symbols. Task-number: QTBUG-23737 Change-Id: Ifaa482663767634931e8711a8e9bf6e404859e66 Reviewed-by: Martin Jones --- doc/src/qml/c++models.qdoc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'doc/src/qml/c++models.qdoc') diff --git a/doc/src/qml/c++models.qdoc b/doc/src/qml/c++models.qdoc index e2498134fe..943c79c184 100644 --- a/doc/src/qml/c++models.qdoc +++ b/doc/src/qml/c++models.qdoc @@ -57,7 +57,7 @@ models. \bold{Note:} There is no way for the view to know that the contents of a QStringList have changed. If the QStringList changes, it will be necessary to reset - the model by calling QDeclarativeContext::setContextProperty() again. + the model by calling QQmlContext::setContextProperty() again. \section1 QObjectList-based model @@ -92,7 +92,7 @@ models. Note: There is no way for the view to know that the contents of a QList have changed. If the QList changes, it will be necessary to reset - the model by calling QDeclarativeContext::setContextProperty() again. + the model by calling QQmlContext::setContextProperty() again. \section1 QAbstractItemModel @@ -160,10 +160,10 @@ models. \section1 Exposing C++ Data Models to QML -The above examples use QDeclarativeContext::setContextProperty() to set +The above examples use QQmlContext::setContextProperty() to set model values directly in QML components. An alternative to this is to register the C++ model class as a QML type from a QML C++ plugin using -QDeclarativeExtensionPlugin. This would allow the model classes to be +QQmlExtensionPlugin. This would allow the model classes to be created directly as elements within QML: \table @@ -171,7 +171,7 @@ created directly as elements within QML: \o \code -class MyModelPlugin : public QDeclarativeExtensionPlugin +class MyModelPlugin : public QQmlExtensionPlugin { public: void registerTypes(const char *uri) -- cgit v1.2.3