diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-04-16 12:29:42 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-04-16 12:33:27 +0200 |
| commit | 9c8edb91f2c6c7de8228e018dbd1ae7a656b3097 (patch) | |
| tree | 717b1df74793af50bd6daaa6775b923a74b05063 /src/qml/qml/v8 | |
| parent | 5870667929ac5f45805b1e1e656fec81b9b22337 (diff) | |
| parent | 2b3c2339616680537145a9cc2e7567575add1abb (diff) | |
Merge remote-tracking branch 'origin/5.4' into 5.5
Conflicts:
tests/auto/qml/debugger/qv4profilerservice/qv4profilerservice.pro
tests/auto/qml/debugger/qqmldebuggingenabler/qqmldebuggingenabler.pro
Change-Id: I76d87e3df97ebdba902ca3d7488c1582eca2a83c
Diffstat (limited to 'src/qml/qml/v8')
| -rw-r--r-- | src/qml/qml/v8/qqmlbuiltinfunctions.cpp | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/src/qml/qml/v8/qqmlbuiltinfunctions.cpp b/src/qml/qml/v8/qqmlbuiltinfunctions.cpp index 0522e4c0ed..09a113dcc9 100644 --- a/src/qml/qml/v8/qqmlbuiltinfunctions.cpp +++ b/src/qml/qml/v8/qqmlbuiltinfunctions.cpp @@ -814,8 +814,15 @@ ReturnedValue QtObject::method_formatDateTime(QV4::CallContext *ctx) } /*! -\qmlmethod bool Qt::openUrlExternally(url target) -Attempts to open the specified \c target url in an external application, based on the user's desktop preferences. Returns true if it succeeds, and false otherwise. + \qmlmethod bool Qt::openUrlExternally(url target) + + Attempts to open the specified \c target url in an external application, based on the user's + desktop preferences. Returns true if it succeeds, and false otherwise. + + \warning A return value of \c true indicates that the application has successfully requested + the operating system to open the URL in an external application. The external application may + still fail to launch or fail to open the requested URL. This result will not be reported back + to the application. */ ReturnedValue QtObject::method_openUrlExternally(QV4::CallContext *ctx) { |