Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui

4 files changed, 6 insertions, 17 deletions

diff --git a/src/declarative/qml/qmlcontext.cpp b/src/declarative/qml/qmlcontext.cpp
index 365c0e8..61850c3 100644
--- a/src/declarative/qml/qmlcontext.cpp
+++ b/src/declarative/qml/qmlcontext.cpp
@@ -339,7 +339,7 @@ QmlContext *QmlContext::parentContext() const
 }
 
 /*!
-    Add a default \a object to this context.  The object will be added after
+    Add \a defaultObject to this context.  The object will be added after
     any existing default objects.
 */
 void QmlContext::addDefaultObject(QObject *defaultObject)
@@ -417,7 +417,7 @@ void QmlContext::setContextProperty(const QString &name, QObject *value)
     Resolves the URL \a src relative to the URL of the
     containing component.
 
-    \sa QmlEngine::componentUrl(), setBaseUrl()
+    \sa QmlEngine::baseUrl(), setBaseUrl()
 */
 QUrl QmlContext::resolvedUrl(const QUrl &src)
 {
@@ -441,13 +441,12 @@ QUrl QmlContext::resolvedUrl(const QUrl &src)
 }
 
 /*!
-    Explicitly sets the url both resolveUri() and resolveUrl() will
-    use for relative references to \a baseUrl.
+    Explicitly sets the url resolveUrl() will use for relative references to \a baseUrl.
 
     Calling this function will override the url of the containing
     component used by default.
 
-    \sa resolvedUrl(), resolvedUri()
+    \sa resolvedUrl()
 */
 void QmlContext::setBaseUrl(const QUrl &baseUrl)
 {
diff --git a/src/declarative/qml/qmlengine.cpp b/src/declarative/qml/qmlengine.cpp
index 5902c99..0a05094 100644
--- a/src/declarative/qml/qmlengine.cpp
+++ b/src/declarative/qml/qmlengine.cpp
@@ -532,15 +532,6 @@ void QmlDeclarativeData::destroyed(QObject *object)
     delete this;
 }
 
-/*! \internal */
-/*
-QScriptEngine *QmlEngine::scriptEngine()
-{
-    Q_D(QmlEngine);
-    return &d->scriptEngine;
-}
-*/
-
 /*!
     Creates a QScriptValue allowing you to use \a object in QML script.
     \a engine is the QmlEngine it is to be created in.
diff --git a/src/declarative/qml/qmlengine.h b/src/declarative/qml/qmlengine.h
index 6066059..8caa505 100644
--- a/src/declarative/qml/qmlengine.h
+++ b/src/declarative/qml/qmlengine.h
@@ -74,7 +74,6 @@ public:
 
     void clearComponentCache();
 
-
     void addImportPath(const QString& dir);
 
     void setNetworkAccessManager(QNetworkAccessManager *);
diff --git a/src/declarative/qml/qmlmetaproperty.cpp b/src/declarative/qml/qmlmetaproperty.cpp
index e69746e..99f9f0c 100644
--- a/src/declarative/qml/qmlmetaproperty.cpp
+++ b/src/declarative/qml/qmlmetaproperty.cpp
@@ -540,10 +540,10 @@ QmlAbstractBinding *QmlMetaProperty::binding() const
 }
 
 /*!
-    Set the binding associated with this property to \a binding.  Returns
+    Set the binding associated with this property to \a newBinding.  Returns
     the existing binding (if any), otherwise 0.
 
-    \a binding will be enabled, and the returned binding (if any) will be
+    \a newBinding will be enabled, and the returned binding (if any) will be
     disabled.
 */
 QmlAbstractBinding *