diff options
author | kh1 <qt-info@nokia.com> | 2011-08-10 13:01:37 +0200 |
---|---|---|
committer | kh1 <qt-info@nokia.com> | 2011-08-10 13:39:23 +0200 |
commit | dd59146f9d4f6a8deb95096acb71b5f4cfc4d022 (patch) | |
tree | 4f87dde77d82a91508ec39f0767b6e65808c125a /installerbuilder/libinstaller/packagemanagercore.cpp | |
parent | 70dc0bfe77bfce6ce28e026c541a966f994f6f2c (diff) |
Revert: 308dc03e a1a130b9 5fb0f4ac
The proper fix for 308dc03e would have been to check if we
run in installer mode and only than check default components
initially. Not sure how a1a130b9 could state that the code
would work as expected, as proper testing would have revealed
that the "Next" button now was enabled always enabled in
package manager mode and always disabled in updater mode...
Fixes also the problem seen by Niels that in package manager
case components would have been scheduled for uninstall even
if we just selected a new component without removing an other.
Reviewed-By: Niels Weber
Diffstat (limited to 'installerbuilder/libinstaller/packagemanagercore.cpp')
-rw-r--r-- | installerbuilder/libinstaller/packagemanagercore.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/installerbuilder/libinstaller/packagemanagercore.cpp b/installerbuilder/libinstaller/packagemanagercore.cpp index 9ec9dd6ce..2ea580dac 100644 --- a/installerbuilder/libinstaller/packagemanagercore.cpp +++ b/installerbuilder/libinstaller/packagemanagercore.cpp @@ -1444,9 +1444,11 @@ bool PackageManagerCore::fetchAllPackages(const PackagesList &remotes, const Loc foreach (QInstaller::Component *component, components) { component->loadComponentScript(); - // set the checked state for all components without child(means without tristate) + // set the checked state for all components without child (means without tristate) if (component->isCheckable() && !component->isTristate()) { - if (component->isInstalled()) + if (component->isDefault() && isInstaller()) + component->setCheckState(Qt::Checked); + else if (component->isInstalled()) component->setCheckState(Qt::Checked); } } |