diff options
| author | Katja Marttila <katja.marttila@qt.io> | 2017-03-14 14:30:09 +0200 |
|---|---|---|
| committer | Katja Marttila <katja.marttila@qt.io> | 2017-03-23 08:04:42 +0000 |
| commit | 7ee08852f38b1ff2ff3638af46fcfca64cd12df7 (patch) | |
| tree | 120439f321f3a9480fcfc5185904989ccbd630fc /src/libs/installer/installercalculator.h | |
| parent | 9772474dd97e5543035b5fd0dde4b731745e5057 (diff) | |
Make installer to check the dependency version
Installer was able to install dependency correctly. However, it ignored
the version dependency might have.
Dependencies>componentA->=4.0</Dependencies>
If there was already a dependency installed with lower version number,
the newer version, which was required by the selected component, was not
installed. Fixed so that maintenancetool will not only check if the
dependency is installed but also the installed version.
Change-Id: Ia26b5233cf8847bce73095d19a13c481318d27f2
Task-number: QTIFW-914
Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
Diffstat (limited to 'src/libs/installer/installercalculator.h')
| -rw-r--r-- | src/libs/installer/installercalculator.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libs/installer/installercalculator.h b/src/libs/installer/installercalculator.h index 08dd47f78..b2d05bdbe 100644 --- a/src/libs/installer/installercalculator.h +++ b/src/libs/installer/installercalculator.h @@ -64,8 +64,8 @@ private: void insertInstallReason(Component *component, InstallReasonType installReasonType, const QString &referencedComponentName = QString()); - void realAppendToInstallComponents(Component *component); - bool appendComponentToInstall(Component *components); + void realAppendToInstallComponents(Component *component, const QString &version = QString()); + bool appendComponentToInstall(Component *components, const QString &version = QString()); QString recursionError(Component *component); QList<Component*> m_allComponents; |