summaryrefslogtreecommitdiffstats
path: root/src/libs/installer/packagemanagercore.cpp
diff options
context:
space:
mode:
authorKai Koehne <kai.koehne@theqtcompany.com>2015-03-17 11:53:59 +0100
committerKai Koehne <kai.koehne@theqtcompany.com>2015-03-17 11:54:06 +0100
commit8b6098d7b5a3ca4407071dc0d692aa17f88fba47 (patch)
tree364d370c820b7776c257c525ea2b01a466ae8bfd /src/libs/installer/packagemanagercore.cpp
parente23402879f3d68243ed8f708b06a96416c980d6a (diff)
parent45b05a4a4a9cd04a58279089b69ed23e83f82b70 (diff)
Merge remote-tracking branch 'origin/2.0'
Diffstat (limited to 'src/libs/installer/packagemanagercore.cpp')
-rw-r--r--src/libs/installer/packagemanagercore.cpp7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/libs/installer/packagemanagercore.cpp b/src/libs/installer/packagemanagercore.cpp
index 0cf21bfe4..45bb9baf8 100644
--- a/src/libs/installer/packagemanagercore.cpp
+++ b/src/libs/installer/packagemanagercore.cpp
@@ -77,6 +77,11 @@
/*!
\namespace QInstaller
\inmodule QtInstallerFramework
+
+ \keyword qinstaller-module
+
+ \brief Contains classes to implement the core functionality of the Qt
+ Installer Framework and the installer UI.
*/
/*!
@@ -1283,7 +1288,7 @@ QList<Component *> PackageManagerCore::componentsMarkedForInstallation() const
foreach (Component *component, relevant) {
// ask for all components which will be installed to get all dependencies
// even dependencies which are changed without an increased version
- if (component->installationRequested()
+ if (component->isSelectedForInstallation()
|| (component->isInstalled()
&& !component->uninstallationRequested())) {
markedForInstallation.append(component);