diff options
| author | Katja Marttila <katja.marttila@qt.io> | 2020-03-12 15:07:09 +0200 |
|---|---|---|
| committer | Katja Marttila <katja.marttila@qt.io> | 2020-03-20 15:20:32 +0200 |
| commit | 4d7c5d092e95f2eb2113780971027e0adfa41440 (patch) | |
| tree | 4f1ef3c430ac5ea93c15afab3769221165b19a1c /src/libs/installer/packagemanagergui.cpp | |
| parent | 559a6b4ed5b23fee084929f9f62fabe223294f49 (diff) | |
Separate maintenance tool writing for testing purpose
Some unit tests wont work as installer wants to unpack maintenance tool
from the installer. As unit tests are not normal installers we need to
separate the maintenance unpacking when running tests.
Change-Id: I5f2bb60e775a42d1b8dd6ee088ff4f2a694a7a09
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Diffstat (limited to 'src/libs/installer/packagemanagergui.cpp')
| -rw-r--r-- | src/libs/installer/packagemanagergui.cpp | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/src/libs/installer/packagemanagergui.cpp b/src/libs/installer/packagemanagergui.cpp index 793519416..771b2720c 100644 --- a/src/libs/installer/packagemanagergui.cpp +++ b/src/libs/installer/packagemanagergui.cpp @@ -1,6 +1,6 @@ /************************************************************************** ** -** Copyright (C) 2017 The Qt Company Ltd. +** Copyright (C) 2020 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. @@ -2519,6 +2519,12 @@ void PerformInstallationPage::entering() { setComplete(false); + m_performInstallationForm->enableDetails(); + emit setAutomatedPageSwitchEnabled(true); + + if (isVerbose()) { + m_performInstallationForm->toggleDetails(); + } if (packageManagerCore()->isUninstaller()) { setButtonText(QWizard::CommitButton, tr("U&ninstall")); setColoredTitle(tr("Uninstalling %1").arg(productName())); @@ -2533,14 +2539,11 @@ void PerformInstallationPage::entering() setButtonText(QWizard::CommitButton, tr("&Install")); setColoredTitle(tr("Installing %1").arg(productName())); - QTimer::singleShot(30, packageManagerCore(), SLOT(runInstaller())); + if (packageManagerCore()->runInstaller()) { + packageManagerCore()->writeMaintenanceTool(); + emit packageManagerCore()->installationFinished(); + } } - - m_performInstallationForm->enableDetails(); - emit setAutomatedPageSwitchEnabled(true); - - if (isVerbose()) - m_performInstallationForm->toggleDetails(); } /*! |