Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7

3 files changed, 12 insertions, 6 deletions

diff --git a/src/declarative/graphicsitems/qdeclarativetextinput.cpp b/src/declarative/graphicsitems/qdeclarativetextinput.cpp
index ff79256..e00d333 100644
--- a/src/declarative/graphicsitems/qdeclarativetextinput.cpp
+++ b/src/declarative/graphicsitems/qdeclarativetextinput.cpp
@@ -611,8 +611,8 @@ void QDeclarativeTextInput::setAutoScroll(bool b)
     This element provides a validator, which counts as valid any string which
     matches a specified regular expression.
 */
-/*
-   \qmlproperty string RegExpValidator::regExp
+/*!
+   \qmlproperty regExp RegExpValidator::regExp
 
    This property holds the regular expression used for validation.
 
diff --git a/src/declarative/qml/qdeclarativeengine.cpp b/src/declarative/qml/qdeclarativeengine.cpp
index f621af5..c5afe92 100644
--- a/src/declarative/qml/qdeclarativeengine.cpp
+++ b/src/declarative/qml/qdeclarativeengine.cpp
@@ -1949,6 +1949,8 @@ void QDeclarativeEngine::setPluginPathList(const QStringList &paths)
 /*!
   Imports the plugin named \a filePath with the \a uri provided.
   Returns true if the plugin was successfully imported; otherwise returns false.
+
+  The plugin has to be a Qt plugin which implements the QDeclarativeExtensionPlugin interface.
 */
 bool QDeclarativeEngine::importPlugin(const QString &filePath, const QString &uri, QString *errorString)
 {
diff --git a/src/declarative/qml/qdeclarativeextensionplugin.cpp b/src/declarative/qml/qdeclarativeextensionplugin.cpp
index 5b7f1e8..762c642d 100644
--- a/src/declarative/qml/qdeclarativeextensionplugin.cpp
+++ b/src/declarative/qml/qdeclarativeextensionplugin.cpp
@@ -55,17 +55,21 @@ QT_BEGIN_NAMESPACE
     applications using the QDeclarativeEngine class.
 
     Writing a QML extension plugin is achieved by subclassing this
-    base class, reimplementing the pure virtual initialize()
+    base class, reimplementing the pure virtual registerTypes()
     function, and exporting the class using the Q_EXPORT_PLUGIN2()
-    macro. See \l {How to Create Qt Plugins} for details.
+    macro.
 
-    \sa QDeclarativeEngine::importExtension()
+    See \l {Extending QML in C++} for details how to write a QML extension plugin.
+    See \l {How to Create Qt Plugins} for general Qt plugin documentation.
+
+    \sa QDeclarativeEngine::importPlugin()
 */
 
 /*!
     \fn void QDeclarativeExtensionPlugin::registerTypes(const char *uri)
 
-    Registers the QML types in the given \a uri.
+    Registers the QML types in the given \a uri. Here you call qmlRegisterType() for
+    all types which are provided by the extension plugin.
 */
 
 /*!