diff options
author | kh1 <qt-info@nokia.com> | 2011-08-09 13:22:51 +0200 |
---|---|---|
committer | kh1 <qt-info@nokia.com> | 2011-08-09 13:54:42 +0200 |
commit | 3603979f2548287b12bb12f6926f4797abe0b511 (patch) | |
tree | 44818ab622f893cb190d35d192470035b5e52467 /installerbuilder | |
parent | 013c56e24053441c6bd4365227dbb6b535562c12 (diff) |
IsUninstaller() was evaluated to early.
Fixes the problem that the button and label was not shown
in case the tool started as uninstaller and later switched
to package manager or updater mode. This happens because
of the initalization order of the pages.
Reviewed-by: Niels Weber
Diffstat (limited to 'installerbuilder')
-rw-r--r-- | installerbuilder/libinstaller/packagemanagergui.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/installerbuilder/libinstaller/packagemanagergui.cpp b/installerbuilder/libinstaller/packagemanagergui.cpp index a692556af..b9f3818bd 100644 --- a/installerbuilder/libinstaller/packagemanagergui.cpp +++ b/installerbuilder/libinstaller/packagemanagergui.cpp @@ -1439,11 +1439,6 @@ ReadyForInstallationPage::ReadyForInstallationPage(PackageManagerCore *core) bottomLayout->setStretch(1, 10); baseLayout->addLayout(bottomLayout); - if (packageManagerCore()->isUninstaller()) { - m_taskDetailsButton->setVisible(false); - m_taskDetailsBrowser->setVisible(false); - } - setLayout(baseLayout); } @@ -1457,6 +1452,8 @@ void ReadyForInstallationPage::entering() const QString target = packageManagerCore()->value(scTargetDir); if (packageManagerCore()->isUninstaller()) { + m_taskDetailsButton->setVisible(false); + m_taskDetailsBrowser->setVisible(false); setButtonText(QWizard::CommitButton, tr("U&ninstall")); setTitle(titleForPage(objectName(), tr("Ready to Uninstall"))); m_msgLabel->setText(tr("Setup is now ready to begin removing %1 from your computer.<br>" |