summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKatja Marttila <katja.marttila@qt.io>2019-01-14 10:16:23 +0200
committerKatja Marttila <katja.marttila@qt.io>2019-01-17 08:07:58 +0000
commit7c3c796cbfb13afcf01755d189e01ac392ec9b2b (patch)
tree69bd02281126b733a2a973c4c120539682e4468c
parentcd5168de39b0791bc2e62acc36aa6f77f75f3398 (diff)
Allow unstable components when categories are used
Unstable component means that the component has unresolved dependency, script error etc. Installer cannot recover if we are already in component selection view and fetch new packages from a category which has unstable components if AllowUnstableComponent is false. Fixed so that allowing unstable components is forced when categories are used. Ideal solution would be to recover and rollback the install tree if unstable components are found but that requires huge changes to IFW. Task-id: QTIFW-1257 Change-Id: I786df1b8b54c238f50e15b94a06005e244417c97 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
-rw-r--r--doc/installerfw.qdoc6
-rw-r--r--src/libs/installer/packagemanagergui.cpp1
2 files changed, 6 insertions, 1 deletions
diff --git a/doc/installerfw.qdoc b/doc/installerfw.qdoc
index 6c2825154..1ef42a91e 100644
--- a/doc/installerfw.qdoc
+++ b/doc/installerfw.qdoc
@@ -1139,7 +1139,11 @@
By default, only repositories with no category are shown in the component selection widget. Checking one or
several repositories and pressing \uicontrol Fetch will update the widget to show content also
- from the selected categorized repositories.
+ from the selected categorized repositories. Components in the repository
+ categories are marked as \e unstable meaning that you can install other
+ components although some components have missing dependencies, script
+ errors and so on. For more information about \e unstable components, see
+ \l {Summary of Configuration File Elements}.
Example of creating a repository category:
diff --git a/src/libs/installer/packagemanagergui.cpp b/src/libs/installer/packagemanagergui.cpp
index dfa7542c6..a053e9bff 100644
--- a/src/libs/installer/packagemanagergui.cpp
+++ b/src/libs/installer/packagemanagergui.cpp
@@ -1913,6 +1913,7 @@ void ComponentSelectionPage::entering()
if (core->settings().repositoryCategories().count() > 0 && !core->isOfflineOnly()
&& !core->isUpdater()) {
d->showCategoryLayout(true);
+ core->settings().setAllowUnstableComponents(true);
} else {
d->showCategoryLayout(false);
}