Merge pull request #250 from Xpirix/remove_supportsQt6

Remove supportsQt6 check from metadata.txt and specific QGIS 4.0 conditions

Author: Xpirix

qgis-app/plugins/api.py

@@ -130,9 +130,6 @@ def plugin_upload(package, **kwargs):
             version_data["changelog"] = cleaned_data.get("changelog")
         if cleaned_data.get("qgisMaximumVersion"):
             version_data["max_qg_version"] = cleaned_data.get("qgisMaximumVersion")
-        if cleaned_data.get("supportsQt6"):
-            version_data["supports_qt6"] = cleaned_data.get("supportsQt6")
-
         new_version = PluginVersion(**version_data)
         new_version.clean()
         new_version.save()

qgis-app/plugins/forms.py

@@ -189,8 +189,6 @@ def clean(self):
         self.instance.changelog = self.cleaned_data.get("changelog")
         if "experimental" in self.cleaned_data:
             self.instance.experimental = self.cleaned_data.get("experimental")
-        if "supportsQt6" in self.cleaned_data:
-            self.instance.supports_qt6 = self.cleaned_data.get("supportsQt6")
         return super(PluginVersionForm, self).clean()
 
 

qgis-app/plugins/management/commands/update_qt6_support.py

@@ -0,0 +1,15 @@
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("plugins", "0018_pluginversionsecurityscan"),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name="pluginversion",
+            name="supports_qt6",
+        ),
+    ]

qgis-app/plugins/migrations/0019_remove_pluginversion_supports_qt6.py

@@ -109,8 +109,8 @@ class NewQgisMajorVersionReadyPlugins(BasePluginManager):
     """
     Shows only public plugins: i.e. those with "approved" flag set
     and with one version that is compatible with the new QGIS major version.
-    This is determined by checking if the max_qg_version is greater than
-    or equal to the current QGIS major version and has supports_qt6 flag set.
+    This is determined by checking if the max_qg_version is greater 
+    than or equal to the new QGIS major version.
     This manager filters out deprecated plugins as well.
     """
 
@@ -120,9 +120,8 @@ def get_queryset(self):
             .get_queryset()
             .filter(
                 pluginversion__approved=True,
-                pluginversion__min_qg_version__gte=f"{settings.CURRENT_QGIS_MAJOR_VERSION}.0",
-                pluginversion__supports_qt6=True,
-                deprecated=False,
+                pluginversion__max_qg_version__gte=f"{settings.NEW_QGIS_MAJOR_VERSION}.0",
+                deprecated=False
             )
             .distinct()
             .order_by("-created_on")
@@ -907,12 +906,6 @@ class PluginVersion(models.Model):
     max_qg_version = QGVersionZeroForcedField(
         _("Maximum QGIS version"), max_length=32, null=True, blank=True, db_index=True
     )
-    supports_qt6 = models.BooleanField(
-        _("Supports Qt6"),
-        default=False,
-        help_text=_("Check this box if this version supports Qt6."),
-        db_index=True,
-    )
     version = VersionField(_("Version"), max_length=32, db_index=True)
     changelog = models.TextField(_("Changelog"), null=True, blank=True)