diff options
| author | kh <karsten.heimrich@theqtcompany.com> | 2014-11-25 16:18:26 +0100 |
|---|---|---|
| committer | Kai Koehne <kai.koehne@theqtcompany.com> | 2014-12-10 08:54:18 +0100 |
| commit | 4853be33e29654304af4209b38137541068c1662 (patch) | |
| tree | 71ea26e92db160ecdffc0bcc8b8c621bab9a4cf4 /tests | |
| parent | 7c2d08ca09875224ee7dca480d91a07bcc7719a6 (diff) | |
Add possibility to specify a control script.
Right now we support control scripts just as command line argument,
but now we can also bundle it in the binary as well. This helps e.g.
with running scripts during uninstallation, enables the possibility
to modify the introduction page or enables headless installer builds.
Task-number: QTIFW-495
Task-number: QTIFW-166
Change-Id: I6fee6a55db78ed28b1eeb8257a4febaa2703c04e
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/installer/settings/data/full_config.xml | 2 | ||||
| -rw-r--r-- | tests/auto/installer/settings/tst_settings.cpp | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/tests/auto/installer/settings/data/full_config.xml b/tests/auto/installer/settings/data/full_config.xml index 52e18c904..e2cae369e 100644 --- a/tests/auto/installer/settings/data/full_config.xml +++ b/tests/auto/installer/settings/data/full_config.xml @@ -53,4 +53,6 @@ File should contain all elements we allow in a config.xml <Translation>de_de</Translation> <Translation>qt_de</Translation> </Translations> + + <ControlScript>controlscript.js</ControlScript> </Installer> diff --git a/tests/auto/installer/settings/tst_settings.cpp b/tests/auto/installer/settings/tst_settings.cpp index 24095c966..626acfab1 100644 --- a/tests/auto/installer/settings/tst_settings.cpp +++ b/tests/auto/installer/settings/tst_settings.cpp @@ -84,6 +84,7 @@ void tst_Settings::loadTutorialConfig() QCOMPARE(settings.httpProxy(), QNetworkProxy()); QCOMPARE(settings.translations(), QStringList()); + QCOMPARE(settings.controlScript(), QString()); } void tst_Settings::loadFullConfig() |