diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-07-04 15:32:50 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-07-04 15:32:51 +0200 |
| commit | 81077291e3ae1fe8819cf58471ee09ad66c9cad1 (patch) | |
| tree | c0e7a482affcdfa38ee9a2ec305d02b543ad25d8 /src/qml/doc | |
| parent | ea045d82a3a837f83fec82462feebf2bc262f9d9 (diff) | |
| parent | 9422bb302882bfe9e3123d8f1542507c6b6577f4 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: I15cb7460171b38d11d66367aeb0831ec6e3ca933
Diffstat (limited to 'src/qml/doc')
| -rw-r--r-- | src/qml/doc/src/whatsnew.qdoc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/qml/doc/src/whatsnew.qdoc b/src/qml/doc/src/whatsnew.qdoc index f1c69160b6..9ad8c23a42 100644 --- a/src/qml/doc/src/whatsnew.qdoc +++ b/src/qml/doc/src/whatsnew.qdoc @@ -115,6 +115,8 @@ has now been replaced by the new \l {Qt QML} and \l {Qt Quick} modules. See the \list \li Arbitrary functionality may be provided in a namespace through a singleton type. See qmlRegisterSingletonType() for more information. \li JavaScript (.js) files may now import QML modules and other JavaScript files using the ".import" syntax. +\li Plugins may now use QQmlExtensionPlugin::baseUrl to get the directory from which the plugin is loaded. + This will be useful if the plugin needs to load QML or other assets from the same directory. \endlist \section2 Other |