diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-11-25 23:35:34 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-11-25 23:35:34 +0100 |
| commit | cc1c3d0e2be6dfea6befebdc5f25e519e3fe79b2 (patch) | |
| tree | f160486b34c9157f42e12b23f2e0a3dd9aa2ef1b /src/qml/qml/v8/qqmlbuiltinfunctions.cpp | |
| parent | 7fa08472d32055a3d6e8b775b843f38ef65e9ce6 (diff) | |
| parent | 4fae8ff1e73eeb48734b28a9c846fbdff1c2ffe1 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.75.7
Conflicts:
src/qml/compiler/qv4ssa.cpp
src/qml/qml/v8/qqmlbuiltinfunctions.cpp
src/quick/util/qquickprofiler_p.h
Change-Id: I11a89c2a166115d6697adfba09928805643e709e
Diffstat (limited to 'src/qml/qml/v8/qqmlbuiltinfunctions.cpp')
| -rw-r--r-- | src/qml/qml/v8/qqmlbuiltinfunctions.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qml/qml/v8/qqmlbuiltinfunctions.cpp b/src/qml/qml/v8/qqmlbuiltinfunctions.cpp index b9fb1f4ffe..a86538d119 100644 --- a/src/qml/qml/v8/qqmlbuiltinfunctions.cpp +++ b/src/qml/qml/v8/qqmlbuiltinfunctions.cpp @@ -999,7 +999,7 @@ ReturnedValue QtObject::method_quit(CallContext *ctx) /*! \qmlmethod object Qt::createQmlObject(string qml, object parent, string filepath) -Returns a new object created from the given \a string of QML which will have the specified \a parent, +Returns a new object created from the given \a qml string which will have the specified \a parent, or \c null if there was an error in creating the object. If \a filepath is specified, it will be used for error reporting for the created object. |