From 8ca74c76ab24534aefc890763ba3b0fce457d67c Mon Sep 17 00:00:00 2001 From: Niels Weber Date: Tue, 13 Jan 2015 12:52:13 +0100 Subject: Fix space shown for already installed components After 71490cfe450165271a78e519d24ed39217bc440e the change in 8382a7e1ee11d7d408177c9d40a12474ff7fdef2 was wrong. Also update comment for requiredDiskSpace() that it only shows additional required space. Change-Id: I2bd12e9632a635b30d14c3655421790d21ea8b19 Reviewed-by: Jarek Kobus --- src/libs/installer/component.cpp | 2 +- src/libs/installer/packagemanagercore.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/libs/installer/component.cpp b/src/libs/installer/component.cpp index 3436678c9..8df8e8db3 100644 --- a/src/libs/installer/component.cpp +++ b/src/libs/installer/component.cpp @@ -342,7 +342,7 @@ quint64 Component::updateUncompressedSize() { quint64 size = 0; - if (installationRequested() || updateRequested()) + if (isSelected()) size = d->m_vars.value(scUncompressedSize).toLongLong(); foreach (Component* comp, d->m_allChildComponents) diff --git a/src/libs/installer/packagemanagercore.cpp b/src/libs/installer/packagemanagercore.cpp index 2f06b0fbb..4190efd18 100644 --- a/src/libs/installer/packagemanagercore.cpp +++ b/src/libs/installer/packagemanagercore.cpp @@ -476,7 +476,7 @@ quint64 size(QInstaller::Component *component, const QString &value) /*! \qmlmethod float installer::requiredDiskSpace() - Returns the estimated amount of disk space in bytes required after installation. + Returns the additional estimated amount of disk space in bytes required after installation. \sa requiredTemporaryDiskSpace */ -- cgit v1.2.3