summaryrefslogtreecommitdiffstats
path: root/installerbuilder
diff options
context:
space:
mode:
authorTim Jenssen <tim.jenssen@nokia.com>2011-07-29 11:38:05 +0200
committerTim Jenssen <tim.jenssen@nokia.com>2011-07-29 11:38:05 +0200
commitfc4194a12f7164d99646b55db936115b258d5b6f (patch)
tree3e65fca69be4dd337110eedc3fcb60402b04e5fd /installerbuilder
parent468e8892e14181c31475dc4c8d69aae164f59420 (diff)
fix uninstall crash
Diffstat (limited to 'installerbuilder')
-rw-r--r--installerbuilder/libinstaller/packagemanagergui.cpp41
1 files changed, 23 insertions, 18 deletions
diff --git a/installerbuilder/libinstaller/packagemanagergui.cpp b/installerbuilder/libinstaller/packagemanagergui.cpp
index f898894e5..24edf4452 100644
--- a/installerbuilder/libinstaller/packagemanagergui.cpp
+++ b/installerbuilder/libinstaller/packagemanagergui.cpp
@@ -1420,25 +1420,28 @@ ReadyForInstallationPage::ReadyForInstallationPage(PackageManagerCore *core)
topLayout->addWidget(m_msgLabel);
baseLayout->addLayout(topLayout);
- if (!packageManagerCore()->isUninstaller()) {
- m_taskDetailsButton = new QPushButton(tr("&Show Details"), this);
- m_taskDetailsButton->setObjectName(QLatin1String("TaskDetailsButton"));
- m_taskDetailsButton->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Fixed);
- connect(m_taskDetailsButton, SIGNAL(clicked()), this, SLOT(toggleDetails()));
- topLayout->addWidget(m_taskDetailsButton);
-
- QVBoxLayout *bottomLayout = new QVBoxLayout();
- bottomLayout->setObjectName(QLatin1String("BottomLayout"));
- bottomLayout->addStretch();
-
- m_taskDetailsBrowser = new QTextBrowser(this);
- m_taskDetailsBrowser->setReadOnly(true);
- m_taskDetailsBrowser->setObjectName(QLatin1String("TaskDetailsBrowser"));
- m_taskDetailsBrowser->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
+ m_taskDetailsButton = new QPushButton(tr("&Show Details"), this);
+ m_taskDetailsButton->setObjectName(QLatin1String("TaskDetailsButton"));
+ m_taskDetailsButton->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Fixed);
+ connect(m_taskDetailsButton, SIGNAL(clicked()), this, SLOT(toggleDetails()));
+ topLayout->addWidget(m_taskDetailsButton);
+
+ QVBoxLayout *bottomLayout = new QVBoxLayout();
+ bottomLayout->setObjectName(QLatin1String("BottomLayout"));
+ bottomLayout->addStretch();
+
+ m_taskDetailsBrowser = new QTextBrowser(this);
+ m_taskDetailsBrowser->setReadOnly(true);
+ m_taskDetailsBrowser->setObjectName(QLatin1String("TaskDetailsBrowser"));
+ m_taskDetailsBrowser->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
+ m_taskDetailsBrowser->setVisible(false);
+ bottomLayout->addWidget(m_taskDetailsBrowser);
+ bottomLayout->setStretch(1, 10);
+ baseLayout->addLayout(bottomLayout);
+
+ if (packageManagerCore()->isUninstaller()) {
+ m_taskDetailsButton->setVisible(false);
m_taskDetailsBrowser->setVisible(false);
- bottomLayout->addWidget(m_taskDetailsBrowser);
- bottomLayout->setStretch(1, 10);
- baseLayout->addLayout(bottomLayout);
}
setLayout(baseLayout);
@@ -1535,6 +1538,8 @@ void ReadyForInstallationPage::entering()
}
void ReadyForInstallationPage::refreshTaskDetailsBrowser()
{
+ if (packageManagerCore()->isUninstaller())
+ return;
QString htmlOutput;
QString lastInstallReason;