summaryrefslogtreecommitdiffstats
path: root/src/declarative/qml
diff options
context:
space:
mode:
authorWarwick Allison <warwick.allison@nokia.com>2010-04-20 06:39:38 (GMT)
committerWarwick Allison <warwick.allison@nokia.com>2010-04-20 06:39:38 (GMT)
commit7d196d3558321623de2de0b6c145239dd475b749 (patch)
tree1b33b44511cb1cb2e7de42e8978ada4c44c9d3a3 /src/declarative/qml
parentb0fd95e035888bbfc474814bc6796a4acbf6e958 (diff)
downloadQt-7d196d3558321623de2de0b6c145239dd475b749.zip
Qt-7d196d3558321623de2de0b6c145239dd475b749.tar.gz
Qt-7d196d3558321623de2de0b6c145239dd475b749.tar.bz2
doc
Diffstat (limited to 'src/declarative/qml')
-rw-r--r--src/declarative/qml/qdeclarativecontext.cpp6
-rw-r--r--src/declarative/qml/qdeclarativeengine.cpp5
2 files changed, 10 insertions, 1 deletions
diff --git a/src/declarative/qml/qdeclarativecontext.cpp b/src/declarative/qml/qdeclarativecontext.cpp
index 2041e0a..ae4223e 100644
--- a/src/declarative/qml/qdeclarativecontext.cpp
+++ b/src/declarative/qml/qdeclarativecontext.cpp
@@ -208,6 +208,12 @@ QDeclarativeContext::~QDeclarativeContext()
d->data->destroy();
}
+/*!
+ Returns whether the context is valid.
+
+ To be valid, a context must have a engine, and it's contextObject(), if any,
+ must not have been deleted.
+*/
bool QDeclarativeContext::isValid() const
{
Q_D(const QDeclarativeContext);
diff --git a/src/declarative/qml/qdeclarativeengine.cpp b/src/declarative/qml/qdeclarativeengine.cpp
index 9cd6b3c..dc80ac4 100644
--- a/src/declarative/qml/qdeclarativeengine.cpp
+++ b/src/declarative/qml/qdeclarativeengine.cpp
@@ -2031,7 +2031,8 @@ QStringList QDeclarativeEngine::pluginPathList() const
/*!
Sets the list of directories where the engine searches for
- native plugins for imported modules (referenced in the \c qmldir file).
+ native plugins for imported modules (referenced in the \c qmldir file)
+ to \a paths.
By default, the list contains only \c ., i.e. the engine searches
in the directory of the \c qmldir file itself.
@@ -2049,6 +2050,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.
+ On failure and if non-null, *\a errorString will be set to a message describing the failure.
+
The plugin has to be a Qt plugin which implements the QDeclarativeExtensionPlugin interface.
*/
bool QDeclarativeEngine::importPlugin(const QString &filePath, const QString &uri, QString *errorString)