diff options
| author | Arttu Tarkiainen <arttu.tarkiainen@qt.io> | 2023-01-27 09:59:10 +0200 |
|---|---|---|
| committer | Arttu Tarkiainen <arttu.tarkiainen@qt.io> | 2023-01-27 10:38:55 +0000 |
| commit | f5c48c86d3670240fc5c36c2f406196fc23527d5 (patch) | |
| tree | 1823d302c330bf513908fdf68005d03ce5848f82 /tests/auto | |
| parent | 476b6d6fffaf6841adaf68889e8b8ddae17dd382 (diff) | |
| parent | 50575212455fbd3109adbe92d8509fca3c51850a (diff) | |
Merge remote-tracking branch 'origin/4.5'
Change-Id: I07baba6a0e64b6022e6a933708e199551be7dd2f
Diffstat (limited to 'tests/auto')
| -rw-r--r-- | tests/auto/installer/brokeninstaller/tst_brokeninstaller.cpp | 4 | ||||
| -rw-r--r-- | tests/auto/installer/packagemanagercore/tst_packagemanagercore.cpp | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/tests/auto/installer/brokeninstaller/tst_brokeninstaller.cpp b/tests/auto/installer/brokeninstaller/tst_brokeninstaller.cpp index b52e0e9f6..9fbc12c41 100644 --- a/tests/auto/installer/brokeninstaller/tst_brokeninstaller.cpp +++ b/tests/auto/installer/brokeninstaller/tst_brokeninstaller.cpp @@ -1,6 +1,6 @@ /************************************************************************** ** -** Copyright (C) 2022 The Qt Company Ltd. +** Copyright (C) 2023 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. @@ -145,7 +145,7 @@ private slots: Component *componentDependingOnMissingDependency = core.componentByName("componentd"); componentDependingOnMissingDependency->addDependency("componentmissingdependency"); - core.componentsToInstallNeedsRecalculation(); + core.recalculateAllComponents(); model->reset(components); testModelState(model, m_checkedComponentsWithMissingDependency, m_partiallyCheckedComponentsWithBrokenScript, m_uncheckedComponentsWithMissingDependency); diff --git a/tests/auto/installer/packagemanagercore/tst_packagemanagercore.cpp b/tests/auto/installer/packagemanagercore/tst_packagemanagercore.cpp index 44dc65960..cc2e069ea 100644 --- a/tests/auto/installer/packagemanagercore/tst_packagemanagercore.cpp +++ b/tests/auto/installer/packagemanagercore/tst_packagemanagercore.cpp @@ -1,6 +1,6 @@ /************************************************************************** ** -** Copyright (C) 2021 The Qt Company Ltd. +** Copyright (C) 2022 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. @@ -260,7 +260,6 @@ private slots: root->setInstalled(); child1->setInstalled(); child2->setUninstalled(); - core.componentsToInstallNeedsRecalculation(); core.calculateComponentsToInstall(); QCOMPARE(core.requiredDiskSpace(), 250ULL); } |