Fixed compile against Qt 6.8.2

In Qt 6.8.2, a forward declaration was added for the QStringRef class from Qt 5, which breaks compilation because it is incompatible with the "using QStringRef = QStringView" line I was using for compatibility between Qt 5 and 6. Fortunately, as of Qt 5.15.2, the QStringView API is complete enough, so by raising the minimum required Qt version we no longer need QStringRef at all.
mapeditor · Feb 3, 2025 · 776d3b6 · 776d3b6 · svenstaro · Feb 14, 2025
1 parent 339b504
commit 776d3b6
Show file tree

Hide file tree

Showing 23 changed files with 24 additions and 134 deletions.
diff --git a/NEWS.md b/NEWS.md
@@ -3,7 +3,7 @@
 * Added support for SVG 1.2 / CSS blending modes to layers (#3932)
 * AutoMapping: Don't match rules based on empty input indexes
 * AutoMapping: Optimized reloading of rule maps and load rule maps on-demand
-* Raised minimum supported Qt version from 5.12 to 5.15
+* Raised minimum supported Qt version from 5.12 to 5.15.2
 
 ### Tiled 1.11.2 (28 Jan 2025)
 

diff --git a/src/libtiled/libtiled.qbs b/src/libtiled/libtiled.qbs
@@ -5,7 +5,7 @@ DynamicLibrary {
     cpp.dynamicLibraryPrefix: "lib"
 
     Depends { name: "cpp" }
-    Depends { name: "Qt"; submodules: "gui"; versionAtLeast: "5.15" }
+    Depends { name: "Qt"; submodules: "gui"; versionAtLeast: "5.15.2" }
 
     Probes.PkgConfigProbe {
         id: pkgConfigZstd

diff --git a/src/libtiled/mapreader.cpp b/src/libtiled/mapreader.cpp
@@ -103,14 +103,14 @@ class MapReaderPrivate
     void readTileLayerData(TileLayer &tileLayer);
     void readTileLayerRect(TileLayer &tileLayer,
                            Map::LayerDataFormat layerDataFormat,
-                           QStringRef encoding,
+                           QStringView encoding,
                            QRect bounds);
     void decodeBinaryLayerData(TileLayer &tileLayer,
                                const QByteArray &data,
                                Map::LayerDataFormat format,
                                QRect bounds);
     void decodeCSVLayerData(TileLayer &tileLayer,
-                            QStringRef text,
+                            QStringView text,
                             QRect bounds);
 
     /**
@@ -511,9 +511,9 @@ void MapReaderPrivate::readTilesetTile(Tileset &tileset)
 
     // Read tile quadrant terrain ids as Wang IDs. This is possible because the
     // terrain types (loaded as WangSet) are always stored before the tiles.
-    const QStringRef terrain = atts.value(QLatin1String("terrain"));
+    const auto terrain = atts.value(QLatin1String("terrain"));
     if (!terrain.isEmpty() && tileset.wangSetCount() > 0) {
-        QVector<QStringRef> quadrants = terrain.split(QLatin1Char(','));
+        const auto quadrants = terrain.split(QLatin1Char(','));
         WangId wangId;
         if (quadrants.size() == 4) {
             for (int i = 0; i < 4; ++i) {
@@ -777,7 +777,7 @@ void MapReaderPrivate::readTilesetWangSets(Tileset &tileset)
                 } else if (xml.name() == QLatin1String("wangtile")) {
                     const QXmlStreamAttributes tileAtts = xml.attributes();
                     const int tileId = tileAtts.value(QLatin1String("tileid")).toInt();
-                    const QStringRef wangIdString = tileAtts.value(QLatin1String("wangid"));
+                    const auto wangIdString = tileAtts.value(QLatin1String("wangid"));
 
                     bool ok = true;
                     WangId wangId;
@@ -965,7 +965,7 @@ void MapReaderPrivate::readTileLayerData(TileLayer &tileLayer)
 
 void MapReaderPrivate::readTileLayerRect(TileLayer &tileLayer,
                                          Map::LayerDataFormat layerDataFormat,
-                                         QStringRef encoding,
+                                         QStringView encoding,
                                          QRect bounds)
 {
     Q_ASSERT(xml.isStartElement() && (xml.name() == QLatin1String("data") ||
@@ -1046,7 +1046,7 @@ void MapReaderPrivate::decodeBinaryLayerData(TileLayer &tileLayer,
 }
 
 void MapReaderPrivate::decodeCSVLayerData(TileLayer &tileLayer,
-                                          QStringRef text,
+                                          QStringView text,
                                           QRect bounds)
 {
     int currentIndex = 0;
@@ -1289,21 +1289,12 @@ QPolygonF MapReaderPrivate::readPolygon()
             break;
         }
 
-#if QT_VERSION >= QT_VERSION_CHECK(6,0,0)
         const qreal x = QStringView(point).left(commaPos).toDouble(&ok);
         if (!ok)
             break;
         const qreal y = QStringView(point).mid(commaPos + 1).toDouble(&ok);
         if (!ok)
             break;
-#else
-        const qreal x = point.leftRef(commaPos).toDouble(&ok);
-        if (!ok)
-            break;
-        const qreal y = point.midRef(commaPos + 1).toDouble(&ok);
-        if (!ok)
-            break;
-#endif
 
         polygon.append(QPointF(x, y));
     }

diff --git a/src/libtiled/propertytype.cpp b/src/libtiled/propertytype.cpp
@@ -171,12 +171,7 @@ QVariant EnumPropertyType::toPropertyValue(const QVariant &value, const ExportCo
         if (valuesAsFlags) {
             int flags = 0;
 
-#if QT_VERSION < QT_VERSION_CHECK(6,0,0)
-            const QVector<QStringRef> stringValues = stringValue.splitRef(QLatin1Char(','), Qt::SkipEmptyParts);
-#else
-            const QList<QStringView> stringValues = QStringView(stringValue).split(QLatin1Char(','), Qt::SkipEmptyParts);
-#endif
-
+            const auto stringValues = QStringView(stringValue).split(QLatin1Char(','), Qt::SkipEmptyParts);
             for (const auto &stringValue : stringValues) {
                 const int index = indexOf(values, stringValue);
 

diff --git a/src/libtiled/qtcompat_p.h b/src/libtiled/qtcompat_p.h
diff --git a/src/libtiled/wangset.cpp b/src/libtiled/wangset.cpp
@@ -321,7 +321,7 @@ unsigned WangId::toUint() const
     return id;
 }
 
-WangId WangId::fromString(QStringRef string, bool *ok)
+WangId WangId::fromString(QStringView string, bool *ok)
 {
     WangId id;
 

diff --git a/src/libtiled/wangset.h b/src/libtiled/wangset.h
@@ -37,8 +37,6 @@
 #include <QString>
 #include <QList>
 
-#include "qtcompat_p.h"
-
 namespace Tiled {
 
 class TILEDSHARED_EXPORT WangId
@@ -134,7 +132,7 @@ class TILEDSHARED_EXPORT WangId
     static WangId fromUint(unsigned id);
     unsigned toUint() const;
 
-    static WangId fromString(QStringRef string, bool *ok = nullptr);
+    static WangId fromString(QStringView string, bool *ok = nullptr);
     QString toString() const;
 
 private:

diff --git a/src/libtiled/world.cpp b/src/libtiled/world.cpp
@@ -103,14 +103,8 @@ QRect World::mapRect(const QString &fileName) const
     for (const WorldPattern &pattern : patterns) {
         QRegularExpressionMatch match = pattern.regexp.match(fileName);
         if (match.hasMatch()) {
-#if QT_VERSION >= QT_VERSION_CHECK(6,0,0)
             const int x = match.capturedView(1).toInt();
             const int y = match.capturedView(2).toInt();
-#else
-            const int x = match.capturedRef(1).toInt();
-            const int y = match.capturedRef(2).toInt();
-#endif
-
             return QRect(QPoint(x * pattern.multiplierX,
                                 y * pattern.multiplierY) + pattern.offset,
                          pattern.mapSize);
@@ -132,13 +126,8 @@ QVector<WorldMapEntry> World::allMaps() const
             for (const QString &fileName : entries) {
                 QRegularExpressionMatch match = pattern.regexp.match(fileName);
                 if (match.hasMatch()) {
-#if QT_VERSION >= QT_VERSION_CHECK(6,0,0)
                     const int x = match.capturedView(1).toInt();
                     const int y = match.capturedView(2).toInt();
-#else
-                    const int x = match.capturedRef(1).toInt();
-                    const int y = match.capturedRef(2).toInt();
-#endif
 
                     WorldMapEntry entry;
                     entry.fileName = dir.filePath(fileName);

diff --git a/src/plugins/flare/flareplugin.cpp b/src/plugins/flare/flareplugin.cpp
@@ -36,9 +36,7 @@
 #include <QDir>
 #include <QFileInfo>
 #include <QStringList>
-#if QT_VERSION >= QT_VERSION_CHECK(6,0,0)
 #include <QStringView>
-#endif
 #include <QTextStream>
 
 #include <memory>
@@ -88,12 +86,7 @@ std::unique_ptr<Tiled::Map> FlarePlugin::read(const QString &fileName)
 
     while (!stream.atEnd()) {
         line = stream.readLine();
-#if QT_VERSION >= QT_VERSION_CHECK(6,0,0)
         const QStringView lineView(line);
-#else
-        const QStringRef lineView(&line);
-#endif
-
         if (!line.length())
             continue;
 

diff --git a/src/plugins/rpmap/rpmapplugin.cpp b/src/plugins/rpmap/rpmapplugin.cpp
@@ -34,9 +34,7 @@
 #include <QDir>
 #include <QFileInfo>
 #include <QStringList>
-#if QT_VERSION >= QT_VERSION_CHECK(6,0,0)
 #include <QStringView>
-#endif
 #include <QTextStream>
 #include <QXmlStreamWriter>
 #include <QUuid>

diff --git a/src/plugins/tbin/tbinplugin.cpp b/src/plugins/tbin/tbinplugin.cpp
@@ -33,9 +33,7 @@
 
 #include <QCoreApplication>
 #include <QDir>
-#if QT_VERSION >= QT_VERSION_CHECK(6,0,0)
 #include <QStringView>
-#endif
 
 #include <cmath>
 #include <fstream>
@@ -183,11 +181,7 @@ std::unique_ptr<Tiled::Map> TbinMapFormat::read(const QString &fileName)
                     continue;
 
                 const QString name = QString::fromStdString(prop.first);
-#if QT_VERSION >= QT_VERSION_CHECK(6,0,0)
                 const auto strs = QStringView(name).split(QLatin1Char('@'));
-#else
-                const auto strs = name.splitRef('@');
-#endif
                 if (strs[1] == QLatin1String("TileIndex")) {
                     int index = strs[2].toInt();
                     tbin::Properties dummyProps;

diff --git a/src/plugins/tengine/tengineplugin.cpp b/src/plugins/tengine/tengineplugin.cpp
@@ -31,15 +31,11 @@
 #include <QCoreApplication>
 #include <QHash>
 #include <QList>
-#if QT_VERSION >= QT_VERSION_CHECK(6,0,0)
 #include <QStringView>
-#endif
 #include <QTextStream>
 
 #include <QtMath>
 
-#include "qtcompat_p.h"
-
 using namespace Tengine;
 
 TenginePlugin::TenginePlugin()
@@ -61,11 +57,7 @@ bool TenginePlugin::write(const Tiled::Map *map, const QString &fileName, Option
 
     // Write the header
     const QString header = map->property("header").toString();
-#if QT_VERSION >= QT_VERSION_CHECK(6,0,0)
     const auto lines = QStringView(header).split(QStringLiteral("\\n"));
-#else
-    const auto lines = header.splitRef("\\n");
-#endif
     for (const auto &line : lines)
         out << line << Qt::endl;
 

diff --git a/src/tiled/actionsearch.cpp b/src/tiled/actionsearch.cpp
@@ -91,22 +91,13 @@ void ActionMatchDelegate::paint(QPainter *painter,
     painter->save();
 
     const QString name = index.data().toString();
-
-#if QT_VERSION < QT_VERSION_CHECK(6,0,0)
-    const auto ranges = Utils::matchingRanges(mWords, &name);
-#else
     const auto ranges = Utils::matchingRanges(mWords, name);
-#endif
 
     QString nameHtml;
     int nameIndex = 0;
 
-    auto nameRange = [&] (int first, int last) -> QStringRef {
-#if QT_VERSION >= QT_VERSION_CHECK(6,0,0)
+    auto nameRange = [&] (int first, int last) -> QStringView {
         return QStringView(name).mid(first, last - first + 1);
-#else
-        return name.midRef(first, last - first + 1);
-#endif
     };
 
     for (const auto &range : ranges) {
@@ -261,12 +252,7 @@ QVector<ActionLocatorSource::Match> ActionLocatorSource::findActions(const QStri
         QString sanitizedText = action->text();
         sanitizedText.replace(re, QString());
 
-#if QT_VERSION >= QT_VERSION_CHECK(6,0,0)
         const int totalScore = Utils::matchingScore(words, sanitizedText);
-#else
-        const int totalScore = Utils::matchingScore(words, &sanitizedText);
-#endif
-
         if (totalScore > 0) {
             result.append(Match {
                               totalScore,

diff --git a/src/tiled/automappingmanager.cpp b/src/tiled/automappingmanager.cpp
@@ -242,11 +242,10 @@ bool AutomappingManager::loadRulesFile(const QString &filePath)
         if (trimmedLine.startsWith(QLatin1Char('[')) && trimmedLine.endsWith(QLatin1Char(']'))) {
 #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
             auto filter = trimmedLine.mid(1, trimmedLine.length() - 2);
-            mMapNameFilter.setPattern(QRegularExpression::wildcardToRegularExpression(filter.toString()));
 #else
             auto filter = trimmedLine.sliced(1, trimmedLine.length() - 2);
-            mMapNameFilter.setPattern(QRegularExpression::wildcardToRegularExpression(filter));
 #endif
+            mMapNameFilter.setPattern(QRegularExpression::wildcardToRegularExpression(filter));
             continue;
         }
 

diff --git a/src/tiled/libtilededitor.qbs b/src/tiled/libtilededitor.qbs
@@ -8,7 +8,7 @@ DynamicLibrary {
     Depends { name: "libtiled" }
     Depends { name: "translations" }
     Depends { name: "qtsingleapplication" }
-    Depends { name: "Qt"; submodules: ["core", "widgets", "concurrent", "qml", "svg"]; versionAtLeast: "5.15" }
+    Depends { name: "Qt"; submodules: ["core", "widgets", "concurrent", "qml", "svg"]; versionAtLeast: "5.15.2" }
     Depends { name: "Qt.openglwidgets"; condition: Qt.core.versionMajor >= 6; required: false }
     Depends { name: "Qt.dbus"; condition: qbs.targetOS.contains("linux") && project.dbus; required: false }
     Depends { name: "Qt.gui-private"; condition: qbs.targetOS.contains("windows") && Qt.core.versionMajor >= 6 }

diff --git a/src/tiled/locatorwidget.cpp b/src/tiled/locatorwidget.cpp
@@ -100,11 +100,7 @@ void FileMatchDelegate::paint(QPainter *painter,
 
     QString filePath = index.data().toString();
     const int lastSlash = filePath.lastIndexOf(QLatin1Char('/'));
-#if QT_VERSION < QT_VERSION_CHECK(6,0,0)
-    const auto ranges = Utils::matchingRanges(mWords, &filePath);
-#else
     const auto ranges = Utils::matchingRanges(mWords, filePath);
-#endif
 
     filePath = QDir::toNativeSeparators(filePath);
 

diff --git a/src/tiled/projectmodel.cpp b/src/tiled/projectmodel.cpp
@@ -82,11 +82,7 @@ static void findFiles(const FolderEntry &entry, int offset, const QStringList &w
 {
     for (const auto &childEntry : entry.entries) {
         if (childEntry->entries.empty()) {
-#if QT_VERSION >= QT_VERSION_CHECK(6,0,0)
             const auto relativePath = QStringView(childEntry->filePath).mid(offset);
-#else
-            const auto relativePath = childEntry->filePath.midRef(offset);
-#endif
             const int totalScore = Utils::matchingScore(words, relativePath);
 
             if (totalScore > 0) {

diff --git a/src/tiled/scriptmanager.cpp b/src/tiled/scriptmanager.cpp
@@ -304,11 +304,7 @@ bool ScriptManager::checkError(QJSValue value, const QString &program)
     QString errorString = value.toString();
     QString stack = value.property(QStringLiteral("stack")).toString();
 
-#if QT_VERSION >= QT_VERSION_CHECK(6,0,0)
     const auto stackEntries = QStringView(stack).split(QLatin1Char('\n'));
-#else
-    const auto stackEntries = stack.splitRef(QLatin1Char('\n'));
-#endif
     if (stackEntries.size() > 0 && !stackEntries.first().startsWith(QLatin1String("%entry@"))) {
         // Add stack if there were more than one entries
         errorString.append(QLatin1Char('\n'));

diff --git a/src/tiled/tiledproxystyle.cpp b/src/tiled/tiledproxystyle.cpp
@@ -811,11 +811,8 @@ void TiledProxyStyle::drawControl(ControlElement element,
 
             QRect textRect(xpos, y + windowsItemVMargin, w - xm - windowsRightBorder - tab + 1, h - 2 * windowsItemVMargin);
             QRect vTextRect = visualRect(opt->direction, menuitem->rect, textRect);
-#if QT_VERSION >= QT_VERSION_CHECK(6,0,0)
             QStringView s(menuitem->text);
-#else
-            QStringRef s(&menuitem->text);
-#endif
+
             if (!s.isEmpty()) {                     // draw text
                 p->save();
                 int t = s.indexOf(QLatin1Char('\t'));