diff options
author | Katja Marttila <katja.marttila@qt.io> | 2018-01-30 09:28:23 +0200 |
---|---|---|
committer | Katja Marttila <katja.marttila@qt.io> | 2018-02-08 12:55:47 +0200 |
commit | fff2c98f4a7d8e4e903232b08f72aeffd5e0cda1 (patch) | |
tree | 901763a343a2085b6c21c314f1b789290ceaeb63 /doc | |
parent | 0797935d299d0da007cae0ab89ee9ceadc41d670 (diff) | |
parent | e6c28c7fe32de1dca539c987e1c0a26f48ab0483 (diff) |
Merge remote-tracking branch 'origin/3.0' into master
Change-Id: I8d0c8b9faa9537b50e989ec264ed7bfe8d2e358b
Diffstat (limited to 'doc')
-rw-r--r-- | doc/installerfw-using.qdoc | 7 | ||||
-rw-r--r-- | doc/noninteractive.qdoc | 2 | ||||
-rw-r--r-- | doc/scripting-api/packagemanagercore.qdoc | 2 | ||||
-rw-r--r-- | doc/scripting-api/qdesktopservices.qdoc | 5 |
4 files changed, 10 insertions, 6 deletions
diff --git a/doc/installerfw-using.qdoc b/doc/installerfw-using.qdoc index 36df3bed9..178957dbd 100644 --- a/doc/installerfw-using.qdoc +++ b/doc/installerfw-using.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2017 The Qt Company Ltd. +** Copyright (C) 2018 The Qt Company Ltd. ** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. @@ -349,9 +349,8 @@ \section1 Specifying Proxy Settings - By default, the installer does not use any proxy settings. End users can - select to use the system proxy settings or specify the proxy settings - manually. + By default, the installer uses system proxy settings. End users can + select to use no proxy or specify the proxy settings manually. \image ifw-settings-network.png "Network tab on Settings page" diff --git a/doc/noninteractive.qdoc b/doc/noninteractive.qdoc index a2bb5f901..887b32ad3 100644 --- a/doc/noninteractive.qdoc +++ b/doc/noninteractive.qdoc @@ -436,7 +436,7 @@ installer.addWizardPage(component, "SomePageWidget", QInstaller.TargetDirectory) } - Controller.prototype.DynamicSomePageWidgetCallback() + Controller.prototype.DynamicSomePageWidgetCallback = function() { var page = gui.pageWidgetByObjectName("DynamicSomePageWidget"); page.myButton.click, //direct child of the UI file's widget diff --git a/doc/scripting-api/packagemanagercore.qdoc b/doc/scripting-api/packagemanagercore.qdoc index ed1972e13..b4fe4c0fb 100644 --- a/doc/scripting-api/packagemanagercore.qdoc +++ b/doc/scripting-api/packagemanagercore.qdoc @@ -334,7 +334,7 @@ */ /*! - \qmlmethod boolean installer::readFile(string filePath, string codecName) + \qmlmethod string installer::readFile(string filePath, string codecName) Returns the contents of the file \a filePath using the encoding specified by \a codecName. The file is read in the text mode, that is, end-of-line diff --git a/doc/scripting-api/qdesktopservices.qdoc b/doc/scripting-api/qdesktopservices.qdoc index 4fa403dbd..037a0b6dd 100644 --- a/doc/scripting-api/qdesktopservices.qdoc +++ b/doc/scripting-api/qdesktopservices.qdoc @@ -80,6 +80,11 @@ Uses the URL scheme \c file to open the specified \a url with a suitable application. + + \warning A return value of \c true indicates that the installer has successfully + requested the operating system to open the URL in an external application. It may + still fail to launch or fail to open the requested URL. This result will not be + reported back to the installer. */ /*! |