From e3ded6ffc138df0464161ce6f853f3c22d32ecbf Mon Sep 17 00:00:00 2001
From: Nick Korotysh <nick.korotysh@gmail.com>
Date: Tue, 28 Apr 2026 12:12:42 +0200
Subject: [PATCH] Qt6 compatibility patch 2

this patch resolves compatibility issues with QString::split()

- QRegExp -> QRegularExpression migration (in split() cases only)

  QString::split() accepting QRegExp is not available in Qt 6
  (also deprecated in Qt 5), so such cases must be migrated.
  there was only single such case, and it is 1:1 migration.

- QString::SplitBehavior -> Qt::SplitBehavior migration

  QString::SplitBehavior is obsolete since Qt 5.14, and was
  completely removed in Qt 6. use new values in the codebase
  and introduce compatibility layer for the older Qt versions.

these changes don't make build with Qt6 possible, but they don't
hurt Qt5 build either, and still move Qt6 migration forward.
---
 compat.h                           | 19 +++++++++++++++++++
 identifier/biomeidentifier.cpp     |  3 ++-
 identifier/dimensionidentifier.cpp |  3 ++-
 overlay/generatedstructure.cpp     |  4 +++-
 4 files changed, 26 insertions(+), 3 deletions(-)
 create mode 100644 compat.h

diff --git a/compat.h b/compat.h
new file mode 100644
index 00000000..a31a81ec
--- /dev/null
+++ b/compat.h
@@ -0,0 +1,19 @@
+// Copyright (c) 2026, Nick Korotysh
+#pragma once
+
+/*
+ * This file contains various compatibility stuff
+ * to support builds with both Qt 5 and Qt 6.
+ *
+ * It should be dropped with Qt 5 build support.
+ */
+
+#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0)
+#include <QString>
+// QString::SplitBehavior is obsolete since Qt 5.14,
+// and was completely removed in Qt 6.
+namespace Qt {
+// create aliases to emulate required values in old Qt
+constexpr auto SkipEmptyParts = QString::SkipEmptyParts;
+}
+#endif
diff --git a/identifier/biomeidentifier.cpp b/identifier/biomeidentifier.cpp
index dd959a2c..c000f6c3 100644
--- a/identifier/biomeidentifier.cpp
+++ b/identifier/biomeidentifier.cpp
@@ -9,6 +9,7 @@ Copyright (c) 2016, EtlamGit
 
 #include "biomeidentifier.h"
 #include "clamp.h"
+#include "compat.h"
 
 // --------- --------- --------- ---------
 // BiomeInfo
@@ -376,7 +377,7 @@ void BiomeIdentifier::parseBiomeDefinitions2800(QJsonArray data18, int pack) {
       else {
         // construct the name from NID
         QString nid = QString(biome->nid).replace("minecraft:","").replace("_"," ").replace(":",": ");
-        QStringList parts = nid.toLower().split(' ', QString::SkipEmptyParts);
+        QStringList parts = nid.toLower().split(' ', Qt::SkipEmptyParts);
         for (int i = 0; i < parts.size(); i++)
           parts[i].replace(0, 1, parts[i][0].toUpper());
         biome->name = parts.join(" ");
diff --git a/identifier/dimensionidentifier.cpp b/identifier/dimensionidentifier.cpp
index c5cff483..b037aab8 100644
--- a/identifier/dimensionidentifier.cpp
+++ b/identifier/dimensionidentifier.cpp
@@ -4,6 +4,7 @@
 
 #include "dimensionidentifier.h"
 #include "worldinfo.h"
+#include "compat.h"
 
 
 //-------------------------------------------------------------------------------------------------
@@ -73,7 +74,7 @@ int DimensionIdentifier::addDefinitions(QJsonArray defs, int pack) {
       dim->id = dimTag.value("id").toString();
       // construct a default name from ID
       QString nid = QString(dim->id).replace("minecraft:","").replace("_"," ");
-      QStringList parts = nid.toLower().split(' ', QString::SkipEmptyParts);
+      QStringList parts = nid.toLower().split(' ', Qt::SkipEmptyParts);
       for (int i = 0; i < parts.size(); i++)
         parts[i].replace(0, 1, parts[i][0].toUpper());
       dim->name = parts.join(" ");
diff --git a/overlay/generatedstructure.cpp b/overlay/generatedstructure.cpp
index 3f0c6862..695257be 100644
--- a/overlay/generatedstructure.cpp
+++ b/overlay/generatedstructure.cpp
@@ -1,8 +1,10 @@
 /** Copyright 2014 Rian Shelley */
 #include <QPainter>
+#include <QRegularExpression>
 
 #include "overlay/generatedstructure.h"
 #include "nbt/nbt.h"
+#include "compat.h"
 
 
 // parse structures in *.dat files
@@ -100,7 +102,7 @@ GeneratedStructure::tryParseSpawner(const Tag* tagSpawner) {
     mobType = tagSpawner->at("EntityId")->toString();
     // reformat CamelCase text to flattening
     // split at uppercase characters
-    QStringList tokens = mobType.split(QRegExp("(?<=[a-z])(?=[A-Z])"), QString::SkipEmptyParts);
+    QStringList tokens = mobType.split(QRegularExpression("(?<=[a-z])(?=[A-Z])"), Qt::SkipEmptyParts);
     mobType = tokens.join("_").toLower();
   }
   // after "The Flattening"