diff options
author | kh1 <qt-info@nokia.com> | 2011-04-19 16:20:20 +0200 |
---|---|---|
committer | kh1 <qt-info@nokia.com> | 2011-04-19 16:20:20 +0200 |
commit | 40148dcc875c6d99e938ad34ab4b1b32c3f4ffcf (patch) | |
tree | bf3540121b85c6366930c9b308470b19c97be101 /installerbuilder/installerbase/tabcontroller.cpp | |
parent | 1efe0f8f4ecc19b194d9347012020a896d2cf847 (diff) |
Always write the uninstaller.
Remove superluous signal.
It is not written anyway in case of un/installer.
Diffstat (limited to 'installerbuilder/installerbase/tabcontroller.cpp')
-rw-r--r-- | installerbuilder/installerbase/tabcontroller.cpp | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/installerbuilder/installerbase/tabcontroller.cpp b/installerbuilder/installerbase/tabcontroller.cpp index 470ead036..c165ce6a7 100644 --- a/installerbuilder/installerbase/tabcontroller.cpp +++ b/installerbuilder/installerbase/tabcontroller.cpp @@ -92,6 +92,7 @@ TabController::TabController(QObject *parent) TabController::~TabController() { + d->m_installer->writeUninstaller(); delete d; } @@ -138,10 +139,8 @@ int TabController::init() engine->newQObject(this)); } - if (!d->m_installer->isInstaller()) { - connect(d->m_installer, SIGNAL(aboutToShutdown()), this, SLOT(finished())); + if (!d->m_installer->isInstaller()) d->m_gui->setWindowTitle(d->m_installer->value(QLatin1String("MaintenanceTitle"))); - } IntroductionPageImpl *introPage = qobject_cast<IntroductionPageImpl*>(d->m_gui->page(Installer::Introduction)); @@ -259,11 +258,6 @@ int TabController::initPackageManager() // -- private slots -void TabController::finished() -{ - d->m_installer->writeUninstaller(); -} - void TabController::restartWizard() { d->m_installer->reset(d->m_params); |