From 8715fc14d987d22fae0c230e32e048b8f655533b Mon Sep 17 00:00:00 2001 From: Andy Shaw Date: Thu, 9 Nov 2017 22:46:09 +0100 Subject: Add clarifying documentation about QDesktopServices::openUrl Change-Id: I2edca269b6f90511f4d41570a1ad08b7cc9d2f6a Reviewed-by: Leena Miettinen Reviewed-by: Niels Weber --- doc/scripting-api/qdesktopservices.qdoc | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'doc') 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. */ /*! -- cgit v1.2.3 From 29e394792d4414e61e2ce7907e04cc23cbc37efc Mon Sep 17 00:00:00 2001 From: Katja Marttila Date: Fri, 1 Dec 2017 12:01:55 +0200 Subject: Fix readFile documentation readFile method returns string and not boolean. Fix it to documentation. Change-Id: I8454b423a01e93c747087de662e6795a72db26bd Reviewed-by: Karim Pinter Reviewed-by: Leena Miettinen Reviewed-by: Iikka Eklund --- doc/scripting-api/packagemanagercore.qdoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'doc') 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 -- cgit v1.2.3 From 4fd983952981395ba583dfcb45544e71c4a4883e Mon Sep 17 00:00:00 2001 From: Katja Marttila Date: Thu, 14 Dec 2017 11:26:34 +0200 Subject: Fix custom pages documentation Task-number: QTIFW-1061 Change-Id: Ib7e8317eb718ecb3e22b89bbef0414f48502992e Reviewed-by: Antti Kokko --- doc/noninteractive.qdoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'doc') 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 -- cgit v1.2.3 From e3ddb89442eeb6a085456363216b982e466f9626 Mon Sep 17 00:00:00 2001 From: Katja Marttila Date: Tue, 23 Jan 2018 08:56:02 +0200 Subject: Set correct proxy type From Qt 5.8 onwards system proxy might be used by default. Checked if that is the case and updated settings accordingly. Task-number: QTBUG-65143 Change-Id: Ibe8f3173636c57f73addcc576afdd37a68ec1d03 Reviewed-by: Kai Koehne --- doc/installerfw-using.qdoc | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'doc') 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" -- cgit v1.2.3