diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-02-10 04:15:58 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-02-10 04:15:58 (GMT) |
| commit | 50bb35a5ca48816f7563d1055071b4caa7791056 (patch) | |
| tree | 07767ff9365d4f44291bab87ed9f5c8471d13040 /src/declarative/qml/qdeclarativeengine.cpp | |
| parent | d28ca0cfc3d26b5cd4c48ce027063a27347e1b12 (diff) | |
| parent | d7e42d7c5b0eb6513526d0c21025939a467e8d68 (diff) | |
| download | Qt-50bb35a5ca48816f7563d1055071b4caa7791056.zip Qt-50bb35a5ca48816f7563d1055071b4caa7791056.tar.gz Qt-50bb35a5ca48816f7563d1055071b4caa7791056.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Update modules-related tests and docs
CLeanup registers after AddString
Diffstat (limited to 'src/declarative/qml/qdeclarativeengine.cpp')
| -rw-r--r-- | src/declarative/qml/qdeclarativeengine.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/declarative/qml/qdeclarativeengine.cpp b/src/declarative/qml/qdeclarativeengine.cpp index a0633a6..854d910 100644 --- a/src/declarative/qml/qdeclarativeengine.cpp +++ b/src/declarative/qml/qdeclarativeengine.cpp @@ -2113,10 +2113,11 @@ QVariant QDeclarativeEnginePrivate::scriptValueToVariant(const QScriptValue &val /*! Adds \a path as a directory where the engine searches for installed modules in a URL-based directory structure. + The \a path may be a local filesystem directory or a URL. The newly added \a path will be first in the importPathList(). - \sa setImportPathList() + \sa setImportPathList(), \l {QML Modules} */ void QDeclarativeEngine::addImportPath(const QString& path) { |