Merge branch 'calamares' of https://github.com/calamares/calamares into development

CHANGES

@@ -7,6 +7,18 @@ contributors are listed. Note that Calamares does not have a historical
 changelog -- this log starts with version 3.2.0. The release notes on the
 website will have to do for older versions.
 
+# 3.2.33 (unreleased) #
+
+This release contains contributions from (alphabetically by first name):
+ - No external contributors yet
+
+## Core ##
+ - No core changes yet
+
+## Modules ##
+ - No module changes yet
+
+
 # 3.2.32.1 (2020-10-17) #
 
 This is a release to address source-incompatible changes in KPMcore 4.2.0,

CMakeLists.txt

@@ -41,10 +41,10 @@
 # TODO:3.3: Require CMake 3.12
 cmake_minimum_required( VERSION 3.3 FATAL_ERROR )
 project( CALAMARES
-    VERSION 3.2.32.1
+    VERSION 3.2.33
     LANGUAGES C CXX )
 
-set( CALAMARES_VERSION_RC 0 )  # Set to 0 during release cycle, 1 during development
+set( CALAMARES_VERSION_RC 1 )  # Set to 0 during release cycle, 1 during development
 
 ### OPTIONS
 #

src/modules/netinstall/PackageModel.cpp

@@ -267,9 +267,14 @@ PackageModel::setupModelData( const QVariantList& groupList, PackageTreeItem* pa
                 setupModelData( subgroups, item );
                 // The children might be checked while the parent isn't (yet).
                 // Children are added to their parent (below) without affecting
-                // the checked-state -- do it manually.
+                // the checked-state -- do it manually. Items with subgroups
+                // but no children have only hidden children -- those get
+                // handled specially.
+                if ( item->childCount() > 0 )
+                {
                     item->updateSelected();
                 }
+            }
             else
             {
                 if ( !haveWarned )