diff options
| author | Tim Jenssen <tim.jenssen@digia.com> | 2013-09-13 17:38:34 +0200 |
|---|---|---|
| committer | Karsten Heimrich <karsten.heimrich@digia.com> | 2013-09-13 17:40:33 +0200 |
| commit | ddf7700108046a2ffc5b04c16a1cd5f6c5918d61 (patch) | |
| tree | e96155fbcd97d1935e7094b3f410d95d1d0cc7a3 /src/libs/installer | |
| parent | 6e798a3a7a7e78ecf26ada95876e7672ef681b7f (diff) | |
convert FinishButton only at isUpdater and is isPackageManger
Task-number: QTIFW-362
Change-Id: Ia94e06ba7a5d8126b12935c33642b53bbd4563e9
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
Diffstat (limited to 'src/libs/installer')
| -rw-r--r-- | src/libs/installer/packagemanagergui.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/libs/installer/packagemanagergui.cpp b/src/libs/installer/packagemanagergui.cpp index 034b450e6..ae5300b38 100644 --- a/src/libs/installer/packagemanagergui.cpp +++ b/src/libs/installer/packagemanagergui.cpp @@ -307,8 +307,8 @@ void PackageManagerGui::clickButton(int wb, int delay) { // transform the FinishButton to CancelButton, because of the needed misuse of the // CancelButton as a FinishButton to have some more control of closing the wizard - if (!m_core->isInstaller() && currentId() == PackageManagerCore::InstallationFinished && - wb == QWizard::FinishButton) { + if ((m_core->isUpdater() || m_core->isPackageManager()) && currentId() == + PackageManagerCore::InstallationFinished && wb == QWizard::FinishButton) { wb = QWizard::CancelButton; } if (QAbstractButton *b = button(static_cast<QWizard::WizardButton>(wb) )) @@ -321,8 +321,8 @@ bool PackageManagerGui::isButtonEnabled(int wb) { // transform the FinishButton to CancelButton, because of the needed misuse of the // CancelButton as a FinishButton to have some more control of closing the wizard - if (!m_core->isInstaller() && currentId() == PackageManagerCore::InstallationFinished && - wb == QWizard::FinishButton) { + if ((m_core->isUpdater() || m_core->isPackageManager()) && currentId() == + PackageManagerCore::InstallationFinished && wb == QWizard::FinishButton) { wb = QWizard::CancelButton; } if (QAbstractButton *b = button(static_cast<QWizard::WizardButton>(wb) )) |