From f56250624fa72374da62c280fd61a8031db5dfba Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Tue, 5 Sep 2023 15:34:04 +0200
Subject: [PATCH] netinstall: adjust to Qt6

---
 src/modules/netinstall/CMakeLists.txt     | 4 ++--
 src/modules/netinstall/Config.cpp         | 5 +++--
 src/modules/netinstall/PackageModel.cpp   | 5 +++--
 src/modules/netinstall/groupstreeview.cpp | 5 +++++
 4 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/src/modules/netinstall/CMakeLists.txt b/src/modules/netinstall/CMakeLists.txt
index e605905c4..1f8d11e22 100644
--- a/src/modules/netinstall/CMakeLists.txt
+++ b/src/modules/netinstall/CMakeLists.txt
@@ -17,7 +17,7 @@ calamares_add_plugin(netinstall
     UI
         page_netinst.ui
     LINK_PRIVATE_LIBRARIES
-        Qt5::Network
+        ${qtname}::Network
     SHARED_LIB
 )
 
@@ -25,6 +25,6 @@ if(KF5CoreAddons_FOUND)
     calamares_add_test(
         netinstalltest
         SOURCES Tests.cpp Config.cpp LoaderQueue.cpp PackageTreeItem.cpp PackageModel.cpp
-        LIBRARIES Qt5::Gui Qt5::Network KF5::CoreAddons
+        LIBRARIES ${qtname}::Gui ${qtname}::Network KF5::CoreAddons
     )
 endif()
diff --git a/src/modules/netinstall/Config.cpp b/src/modules/netinstall/Config.cpp
index c163d72a0..9d92324a9 100644
--- a/src/modules/netinstall/Config.cpp
+++ b/src/modules/netinstall/Config.cpp
@@ -16,6 +16,7 @@
 
 #include "GlobalStorage.h"
 #include "JobQueue.h"
+#include "compat/Variant.h"
 #include "network/Manager.h"
 #include "packages/Globals.h"
 #include "utils/Logger.h"
@@ -137,11 +138,11 @@ Config::setConfigurationMap( const QVariantMap& configurationMap )
     const QString key = QStringLiteral( "groupsUrl" );
     const auto& groupsUrlVariant = configurationMap.value( key );
     m_queue = new LoaderQueue( this );
-    if ( groupsUrlVariant.type() == QVariant::String )
+    if ( Calamares::typeOf( groupsUrlVariant ) == Calamares::StringVariantType )
     {
         m_queue->append( SourceItem::makeSourceItem( groupsUrlVariant.toString(), configurationMap ) );
     }
-    else if ( groupsUrlVariant.type() == QVariant::List )
+    else if ( Calamares::typeOf( groupsUrlVariant ) == Calamares::ListVariantType )
     {
         for ( const auto& s : groupsUrlVariant.toStringList() )
         {
diff --git a/src/modules/netinstall/PackageModel.cpp b/src/modules/netinstall/PackageModel.cpp
index 4e48d3d09..68ed784d6 100644
--- a/src/modules/netinstall/PackageModel.cpp
+++ b/src/modules/netinstall/PackageModel.cpp
@@ -10,6 +10,7 @@
 
 #include "PackageModel.h"
 
+#include "compat/Variant.h"
 #include "utils/Logger.h"
 #include "utils/Variant.h"
 #include "utils/Yaml.h"
@@ -279,7 +280,7 @@ PackageModel::setupModelData( const QVariantList& groupList, PackageTreeItem* pa
         {
             for ( const auto& packageName : groupMap.value( "packages" ).toList() )
             {
-                if ( packageName.type() == QVariant::String )
+                if ( Calamares::typeOf( packageName ) == Calamares::StringVariantType )
                 {
                     item->appendChild( new PackageTreeItem( packageName.toString(), item ) );
                 }
@@ -301,7 +302,7 @@ PackageModel::setupModelData( const QVariantList& groupList, PackageTreeItem* pa
         {
             bool haveWarned = false;
             const auto& subgroupValue = groupMap.value( "subgroups" );
-            if ( !subgroupValue.canConvert( QVariant::List ) )
+            if ( !subgroupValue.canConvert< QVariantList >() )
             {
                 cWarning() << "*subgroups* under" << item->name() << "is not a list.";
                 haveWarned = true;
diff --git a/src/modules/netinstall/groupstreeview.cpp b/src/modules/netinstall/groupstreeview.cpp
index 4e5ab8c8d..f8b98eb13 100644
--- a/src/modules/netinstall/groupstreeview.cpp
+++ b/src/modules/netinstall/groupstreeview.cpp
@@ -22,7 +22,12 @@ GroupsTreeView::drawBranches( QPainter* painter, const QRect& rect, const QModel
     const QString s = index.data().toString();
     if ( s.isEmpty() )
     {
+#if QT_VERSION < QT_VERSION_CHECK( 6, 0, 0 )
         QStyleOptionViewItem opt = viewOptions();
+#else
+        QStyleOptionViewItem opt;
+        initViewItemOption( &opt );
+#endif
         opt.state = QStyle::State_Sibling;
         opt.rect = QRect( !isRightToLeft() ? rect.left() : rect.right() + 1, rect.top(), indentation(), rect.height() );
         painter->eraseRect( opt.rect );