diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-04-13 09:46:15 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-04-13 09:46:15 +0200 |
| commit | 4b72f48637a87c95deedcc501cd9cc8f717117fa (patch) | |
| tree | 80f00ade2cc3f3845e0f309f39a2649040d203e3 /src/qml/doc/src/qmlfunctions.qdoc | |
| parent | 3d30c6d7b40ce86f49bc7bdc5c2c74ce180bb3dd (diff) | |
| parent | f7e1f7b2f1f1577fd94dfffb93ef15ded5d09031 (diff) | |
Merge remote-tracking branch 'origin/5.5' into dev
Conflicts:
src/quick/util/qquickpixmapcache.cpp
tests/auto/quick/qquickwindow/BLACKLIST
Change-Id: Ie81612f2884f8ea508c48ba2735ec54ea1c2eca5
Diffstat (limited to 'src/qml/doc/src/qmlfunctions.qdoc')
| -rw-r--r-- | src/qml/doc/src/qmlfunctions.qdoc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qml/doc/src/qmlfunctions.qdoc b/src/qml/doc/src/qmlfunctions.qdoc index 4a6ed2fc84..5732be6b26 100644 --- a/src/qml/doc/src/qmlfunctions.qdoc +++ b/src/qml/doc/src/qmlfunctions.qdoc @@ -183,7 +183,7 @@ \a versionMinor. While the type has a name and a type, it cannot be created, and the - given error \a message will result if creation is attempted. + given error \a reason will result if creation is attempted. This is useful where the type is only intended for providing attached properties, enum values or an abstract base class with its extension. |