summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKatja Marttila <katja.marttila@qt.io>2021-10-06 13:13:41 +0300
committerKatja Marttila <katja.marttila@qt.io>2022-01-24 12:46:58 +0200
commitee15c70f87c761ba8b168af36a35d46926e87b69 (patch)
treeb9469f9854f074c550f8b876fa418045a56acad0
parentfa1b0a6d3dc08bb30c367b9c19a7d511c06ab20b (diff)
Fix changeuserinterface example
Example was setting the value for RejectLicense checkbox which is removed and connecting to pageWidget even when using CLI install Change-Id: Icd8cba2e27e7bc6e081d93f8e125d46fcc7a7ee6 Reviewed-by: Arttu Tarkiainen <arttu.tarkiainen@qt.io>
-rw-r--r--examples/changeuserinterface/packages/org.qtproject.ifw.example.changeuserinterface/meta/installscript.qs6
-rw-r--r--examples/doc/changeuserinterface.qdoc8
-rw-r--r--examples/doc/images/qtifw-examples-changeuserinterface.pngbin41473 -> 44627 bytes
3 files changed, 7 insertions, 7 deletions
diff --git a/examples/changeuserinterface/packages/org.qtproject.ifw.example.changeuserinterface/meta/installscript.qs b/examples/changeuserinterface/packages/org.qtproject.ifw.example.changeuserinterface/meta/installscript.qs
index b40bcb1fe..b987e1f99 100644
--- a/examples/changeuserinterface/packages/org.qtproject.ifw.example.changeuserinterface/meta/installscript.qs
+++ b/examples/changeuserinterface/packages/org.qtproject.ifw.example.changeuserinterface/meta/installscript.qs
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2017 The Qt Company Ltd.
+** Copyright (C) 2022 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
**
** This file is part of the FOO module of the Qt Toolkit.
@@ -28,12 +28,12 @@
function Component()
{
- gui.pageWidgetByObjectName("LicenseAgreementPage").entered.connect(changeLicenseLabels);
+ if (!installer.isCommandLineInstance())
+ gui.pageWidgetByObjectName("LicenseAgreementPage").entered.connect(changeLicenseLabels);
}
changeLicenseLabels = function()
{
page = gui.pageWidgetByObjectName("LicenseAgreementPage");
page.AcceptLicenseLabel.setText("Yes I do!");
- page.RejectLicenseLabel.setText("No I don't!");
}
diff --git a/examples/doc/changeuserinterface.qdoc b/examples/doc/changeuserinterface.qdoc
index 970ca5bc8..27c8e9de1 100644
--- a/examples/doc/changeuserinterface.qdoc
+++ b/examples/doc/changeuserinterface.qdoc
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2017 The Qt Company Ltd.
+** Copyright (C) 2022 The Qt Company Ltd.
** Contact: http://www.qt.io/licensing/
**
** This file is part of the Qt Installer Framework.
@@ -35,7 +35,7 @@
\image qtifw-examples-changeuserinterface.png
\e {Change Installer UI} demonstrates how to use the \c Component() function
- to modify the default text for the radio button labels on the
+ to modify the default text for the check box label on the
\l{License Agreement Page}{license check page}. This example does not install
any components, but we specify a dummy component in the package information
file, because installers without components are not allowed.
@@ -68,8 +68,8 @@
\skipto Component()
\printuntil }
- We use the \c changeLicenseLabels function to change the text labels for the
- accept and reject license radio buttons on the page:
+ We use the \c changeLicenseLabels function to change the text label for the
+ accept license check box on the page:
\printuntil }
diff --git a/examples/doc/images/qtifw-examples-changeuserinterface.png b/examples/doc/images/qtifw-examples-changeuserinterface.png
index c9bfad983..83d871f3c 100644
--- a/examples/doc/images/qtifw-examples-changeuserinterface.png
+++ b/examples/doc/images/qtifw-examples-changeuserinterface.png
Binary files differ