From 96aa59558d651b9b74d9b6c2f8292d9b838c2e34 Mon Sep 17 00:00:00 2001 From: Jarek Kobus Date: Thu, 26 Feb 2015 11:24:04 +0100 Subject: Drop underscore in quit_installer example Change-Id: I06291cf5ec09e5281f4a9554bb4145a2974042a1 Reviewed-by: Niels Weber Reviewed-by: Karsten Heimrich --- .../doc/images/qtifw-examples-quit_installer.png | Bin 19682 -> 0 bytes .../doc/images/qtifw-examples-quitinstaller.png | Bin 0 -> 19682 bytes examples/doc/quit_installer.qdoc | 78 --------------------- examples/doc/quitinstaller.qdoc | 78 +++++++++++++++++++++ examples/examples.pro | 2 +- examples/quit_installer/README | 6 -- examples/quit_installer/config/config.xml | 9 --- .../meta/installscript.js | 52 -------------- .../meta/package.xml | 9 --- examples/quit_installer/quit_installer.pro | 13 ---- examples/quitinstaller/README | 6 ++ examples/quitinstaller/config/config.xml | 9 +++ .../meta/installscript.js | 52 ++++++++++++++ .../meta/package.xml | 9 +++ examples/quitinstaller/quitinstaller.pro | 13 ++++ 15 files changed, 168 insertions(+), 168 deletions(-) delete mode 100644 examples/doc/images/qtifw-examples-quit_installer.png create mode 100644 examples/doc/images/qtifw-examples-quitinstaller.png delete mode 100644 examples/doc/quit_installer.qdoc create mode 100644 examples/doc/quitinstaller.qdoc delete mode 100644 examples/quit_installer/README delete mode 100644 examples/quit_installer/config/config.xml delete mode 100644 examples/quit_installer/packages/org.qtproject.ifw.example.quitinstaller/meta/installscript.js delete mode 100644 examples/quit_installer/packages/org.qtproject.ifw.example.quitinstaller/meta/package.xml delete mode 100644 examples/quit_installer/quit_installer.pro create mode 100644 examples/quitinstaller/README create mode 100644 examples/quitinstaller/config/config.xml create mode 100644 examples/quitinstaller/packages/org.qtproject.ifw.example.quitinstaller/meta/installscript.js create mode 100644 examples/quitinstaller/packages/org.qtproject.ifw.example.quitinstaller/meta/package.xml create mode 100644 examples/quitinstaller/quitinstaller.pro (limited to 'examples') diff --git a/examples/doc/images/qtifw-examples-quit_installer.png b/examples/doc/images/qtifw-examples-quit_installer.png deleted file mode 100644 index 12e94f0a1..000000000 Binary files a/examples/doc/images/qtifw-examples-quit_installer.png and /dev/null differ diff --git a/examples/doc/images/qtifw-examples-quitinstaller.png b/examples/doc/images/qtifw-examples-quitinstaller.png new file mode 100644 index 000000000..12e94f0a1 Binary files /dev/null and b/examples/doc/images/qtifw-examples-quitinstaller.png differ diff --git a/examples/doc/quit_installer.qdoc b/examples/doc/quit_installer.qdoc deleted file mode 100644 index e4d23e671..000000000 --- a/examples/doc/quit_installer.qdoc +++ /dev/null @@ -1,78 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the Qt Installer Framework. -** -** $QT_BEGIN_LICENSE:FDL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Free Documentation License Usage -** Alternatively, this file may be used under the terms of the GNU Free -** Documentation License version 1.3 as published by the Free Software -** Foundation and appearing in the file included in the packaging of -** this file. Please review the following information to ensure -** the GNU Free Documentation License version 1.3 requirements -** will be met: http://www.gnu.org/copyleft/fdl.html. -** $QT_END_LICENSE$ -** -****************************************************************************/ - -/*! - \example quit_installer - \ingroup qtifwexamples - \title Quit Installer Example - - \image qtifw-examples-quit_installer.png - - \brief Using a component script to quit an installer. - - \e{Quit Installer} illustrates how to use the \c Component() function to - display a message box to end users for quitting the installation if some - requirements for the installation are not met. - - \include installerfw-examples-configuring.qdocinc - - \quotefile quit_installer/config/config.xml - - \include installerfw-examples-packaging.qdocinc - - \list - \li The \c element is set to \c true to preselect the - component in the installer. - \li The \c - diff --git a/examples/quit_installer/quit_installer.pro b/examples/quit_installer/quit_installer.pro deleted file mode 100644 index 415df49d5..000000000 --- a/examples/quit_installer/quit_installer.pro +++ /dev/null @@ -1,13 +0,0 @@ -TEMPLATE = aux - -INSTALLER = installer - -INPUT = $$PWD/config/config.xml $$PWD/packages -example.input = INPUT -example.output = $$INSTALLER -example.commands = ../../bin/binarycreator -c $$PWD/config/config.xml -p $$PWD/packages ${QMAKE_FILE_OUT} -example.CONFIG += target_predeps no_link combine - -QMAKE_EXTRA_COMPILERS += example - -OTHER_FILES = README diff --git a/examples/quitinstaller/README b/examples/quitinstaller/README new file mode 100644 index 000000000..ffcbb4f54 --- /dev/null +++ b/examples/quitinstaller/README @@ -0,0 +1,6 @@ +Shows how to quit an installer from script side. + +Generate installer with + +binarycreator --offline-only -c config/config.xml -p packages installer + diff --git a/examples/quitinstaller/config/config.xml b/examples/quitinstaller/config/config.xml new file mode 100644 index 000000000..910757b58 --- /dev/null +++ b/examples/quitinstaller/config/config.xml @@ -0,0 +1,9 @@ + + + Quit Installer Example + 1.0.0 + Quit Installer Example + Qt-Project + Qt IFW Examples + @HomeDir@/IfwExamples/quitinstaller + diff --git a/examples/quitinstaller/packages/org.qtproject.ifw.example.quitinstaller/meta/installscript.js b/examples/quitinstaller/packages/org.qtproject.ifw.example.quitinstaller/meta/installscript.js new file mode 100644 index 000000000..463554675 --- /dev/null +++ b/examples/quitinstaller/packages/org.qtproject.ifw.example.quitinstaller/meta/installscript.js @@ -0,0 +1,52 @@ +/************************************************************************** +** +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the Qt Installer Framework. +** +** $QT_BEGIN_LICENSE:LGPL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 or version 3 as published by the Free +** Software Foundation and appearing in the file LICENSE.LGPLv21 and +** LICENSE.LGPLv3 included in the packaging of this file. Please review the +** following information to ensure the GNU Lesser General Public License +** requirements will be met: https://www.gnu.org/licenses/lgpl.html and +** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** +** $QT_END_LICENSE$ +** +**************************************************************************/ + +function Component() +{ + var result = QMessageBox["question"]("test.quit", "Installer", "Do you want to quit the installer?
" + + "This message box was created using JavaScript.", QMessageBox.Ok | QMessageBox.Cancel); + if (result == QMessageBox.Ok) { + installer.setValue("FinishedText", "The installer was quit."); + installer.setDefaultPageVisible(QInstaller.TargetDirectory, false); + installer.setDefaultPageVisible(QInstaller.ReadyForInstallation, false); + installer.setDefaultPageVisible(QInstaller.ComponentSelection, false); + installer.setDefaultPageVisible(QInstaller.StartMenuSelection, false); + installer.setDefaultPageVisible(QInstaller.PerformInstallation, false); + installer.setDefaultPageVisible(QInstaller.LicenseCheck, false); + gui.clickButton(buttons.NextButton); + } else { + installer.setValue("FinishedText", + "The installer was not quit by JavaScript."); + } +} diff --git a/examples/quitinstaller/packages/org.qtproject.ifw.example.quitinstaller/meta/package.xml b/examples/quitinstaller/packages/org.qtproject.ifw.example.quitinstaller/meta/package.xml new file mode 100644 index 000000000..9362e7341 --- /dev/null +++ b/examples/quitinstaller/packages/org.qtproject.ifw.example.quitinstaller/meta/package.xml @@ -0,0 +1,9 @@ + + + Quit an installer + Quits the installer in a nice way, if there is something missing + 1.0.1 + 2013-02-27 + true + + diff --git a/examples/quitinstaller/quitinstaller.pro b/examples/quitinstaller/quitinstaller.pro new file mode 100644 index 000000000..415df49d5 --- /dev/null +++ b/examples/quitinstaller/quitinstaller.pro @@ -0,0 +1,13 @@ +TEMPLATE = aux + +INSTALLER = installer + +INPUT = $$PWD/config/config.xml $$PWD/packages +example.input = INPUT +example.output = $$INSTALLER +example.commands = ../../bin/binarycreator -c $$PWD/config/config.xml -p $$PWD/packages ${QMAKE_FILE_OUT} +example.CONFIG += target_predeps no_link combine + +QMAKE_EXTRA_COMPILERS += example + +OTHER_FILES = README -- cgit v1.2.3