Fixed remaining compilation issues with Qt 6

* QSet::const_iterator no longer supports + operator
* Further adjusting to removal of QString::midRef / QStringRef
* QGuiApplication::setFallbackSessionManagementEnabled was removed
* Qt::AA_DisableWindowContextHelpButton was removed
* Shortcut modifiers no longer support + operator
* Re-introduced TextFile.codec based on QStringConverter, but supporting
  less encodings
* JSON binary data for tile stamps is no longer supported (but it appears
  Tiled never wrote these files in binary data, fortunately)
* QShortcut parent is now QObject* instead of QWidget*

Unfortunately, a linker issue remains when compiling with Qbs:

    /usr/bin/ld: cannot find -l-pthread

src/tiled/editpolygontool.cpp

@@ -657,7 +657,7 @@ void EditPolygonTool::showHandleContextMenu(QPoint screenPos)
 
     bool canDeleteSegment = false;
     if (n == 2) {
-        const PointHandle *secondHandle = *(mSelectedHandles.constBegin() + 1);
+        const PointHandle *secondHandle = *(++mSelectedHandles.constBegin());
         const MapObject *secondMapObject = secondHandle->mapObject();
 
         int indexDifference = std::abs(firstHandle->pointIndex() - secondHandle->pointIndex());
@@ -1005,8 +1005,8 @@ void EditPolygonTool::deleteSegment()
     if (mSelectedHandles.size() != 2)
         return;
 
-    const auto &firstHandle = *mSelectedHandles.begin();
-    const auto &secondHandle = *(mSelectedHandles.begin() + 1);
+    PointHandle *firstHandle = *mSelectedHandles.constBegin();
+    PointHandle *secondHandle = *(++mSelectedHandles.constBegin());
 
     MapObject *mapObject = firstHandle->mapObject();
 

src/tiled/geometry.h

@@ -22,6 +22,7 @@
 
 #include <QPoint>
 #include <QRegion>
+#include <QTransform>
 #include <QVector>
 
 namespace Tiled {

src/tiled/layermodel.cpp

@@ -298,8 +298,8 @@ bool LayerModel::dropMimeData(const QMimeData *data, Qt::DropAction action,
 
     GroupLayer *groupLayer = static_cast<GroupLayer*>(parentLayer);
 
-    QByteArray encodedData = data->data(QLatin1String(LAYERS_MIMETYPE));
-    QDataStream stream(&encodedData, QIODevice::ReadOnly);
+    const QByteArray encodedData = data->data(QLatin1String(LAYERS_MIMETYPE));
+    QDataStream stream(encodedData);
     QList<Layer*> layers;
 
     while (!stream.atEnd()) {

src/tiled/locatorwidget.cpp

@@ -71,7 +71,7 @@ QVariant MatchesModel::data(const QModelIndex &index, int role) const
     switch (role) {
     case Qt::DisplayRole: {
         const ProjectModel::Match &match = mMatches.at(index.row());
-        return match.path.mid(match.offset);
+        return match.relativePath().toString();
     }
     }
     return QVariant();
@@ -146,7 +146,11 @@ void MatchDelegate::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);
 
@@ -372,16 +376,23 @@ void LocatorWidget::setFilterText(const QString &text)
     if (currentIndex.isValid())
         previousSelected = mListModel->data(currentIndex).toString();
 
-    const QStringList words = QDir::fromNativeSeparators(text).split(QLatin1Char(' '),
-                                                                     QString::SkipEmptyParts);
+    const QString normalized = QDir::fromNativeSeparators(text);
+#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0)
+    const QStringList words = normalized.split(QLatin1Char(' '), QString::SkipEmptyParts);
+#else
+    const QStringList words = normalized.split(QLatin1Char(' '), Qt::SkipEmptyParts);
+#endif
 
     auto projectModel = ProjectManager::instance()->projectModel();
     auto matches = projectModel->findFiles(words);
 
     std::stable_sort(matches.begin(), matches.end(), [] (const ProjectModel::Match &a, const ProjectModel::Match &b) {
+        // Sort based on score first
         if (a.score != b.score)
             return a.score > b.score;
-        return a.path.midRef(a.offset).compare(b.path.midRef(b.offset), Qt::CaseInsensitive) < 0;
+
+        // If score is the same, sort alphabetically
+        return a.relativePath().compare(b.relativePath(), Qt::CaseInsensitive) < 0;
     });
 
     mDelegate->setWords(words);
@@ -396,7 +407,7 @@ void LocatorWidget::setFilterText(const QString &text)
 
         if (!previousSelected.isEmpty()) {
             auto it = std::find_if(matches.cbegin(), matches.cend(), [&] (const ProjectModel::Match &match) {
-                return match.path.midRef(match.offset) == previousSelected;
+                return match.relativePath() == previousSelected;
             });
             if (it != matches.cend())
                 row = std::distance(matches.cbegin(), it);

src/tiled/main.cpp

@@ -344,15 +344,18 @@ int main(int argc, char *argv[])
 
     qInstallMessageHandler(messagesToConsole);
 
-    QGuiApplication::setFallbackSessionManagementEnabled(false);
-
-    // Enable support for highres images (added in Qt 5.1, but off by default)
 #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
+    // Enable support for highres images (added in Qt 5.1, but off by default, always enabled in Qt 6)
     QCoreApplication::setAttribute(Qt::AA_UseHighDpiPixmaps);
-#endif
+
+    // Fallback session management was removed from Qt 6
+    QGuiApplication::setFallbackSessionManagementEnabled(false);
+
+    // Window context help buttons are disabled by default in Qt 6
 #if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0)
     QCoreApplication::setAttribute(Qt::AA_DisableWindowContextHelpButton);
 #endif
+#endif
 
 #ifdef Q_OS_MAC
     QCoreApplication::setAttribute(Qt::AA_DontShowIconsInMenus);

src/tiled/mapdocumentactionhandler.cpp

@@ -67,7 +67,7 @@ MapDocumentActionHandler::MapDocumentActionHandler(QObject *parent)
     mActionSelectInverse = new QAction(this);
     mActionSelectInverse->setShortcut(Qt::CTRL + Qt::Key_I);
     mActionSelectNone = new QAction(this);
-    mActionSelectNone->setShortcut(Qt::CTRL + Qt::SHIFT + Qt::Key_A);
+    mActionSelectNone->setShortcut((Qt::CTRL | Qt::SHIFT) + Qt::Key_A);
 
     mActionCropToSelection = new QAction(this);
     mActionAutocrop = new QAction(this);
@@ -92,13 +92,13 @@ MapDocumentActionHandler::MapDocumentActionHandler(QObject *parent)
     mActionLayerViaCopy->setShortcut(Qt::CTRL + Qt::Key_J);
 
     mActionLayerViaCut = new QAction(this);
-    mActionLayerViaCut->setShortcut(Qt::CTRL + Qt::SHIFT + Qt::Key_J);
+    mActionLayerViaCut->setShortcut((Qt::CTRL | Qt::SHIFT) + Qt::Key_J);
 
     mActionGroupLayers = new QAction(this);
     mActionUngroupLayers = new QAction(this);
 
     mActionDuplicateLayers = new QAction(this);
-    mActionDuplicateLayers->setShortcut(Qt::CTRL + Qt::SHIFT + Qt::Key_D);
+    mActionDuplicateLayers->setShortcut((Qt::CTRL | Qt::SHIFT) + Qt::Key_D);
     mActionDuplicateLayers->setIcon(
             QIcon(QLatin1String(":/images/16/stock-duplicate-16.png")));
 
@@ -115,12 +115,12 @@ MapDocumentActionHandler::MapDocumentActionHandler(QObject *parent)
     mActionSelectNextLayer->setShortcut(Qt::CTRL + Qt::Key_PageUp);
 
     mActionMoveLayersUp = new QAction(this);
-    mActionMoveLayersUp->setShortcut(Qt::CTRL + Qt::SHIFT + Qt::Key_Up);
+    mActionMoveLayersUp->setShortcut((Qt::CTRL | Qt::SHIFT) + Qt::Key_Up);
     mActionMoveLayersUp->setIcon(
             QIcon(QLatin1String(":/images/16/go-up.png")));
 
     mActionMoveLayersDown = new QAction(this);
-    mActionMoveLayersDown->setShortcut(Qt::CTRL + Qt::SHIFT + Qt::Key_Down);
+    mActionMoveLayersDown->setShortcut((Qt::CTRL | Qt::SHIFT) + Qt::Key_Down);
     mActionMoveLayersDown->setIcon(
             QIcon(QLatin1String(":/images/16/go-down.png")));
 
@@ -143,12 +143,12 @@ MapDocumentActionHandler::MapDocumentActionHandler(QObject *parent)
     mActionToggleLockSelectedLayers->setIcon(lockedIcon);
 
     mActionToggleOtherLayers = new QAction(this);
-    mActionToggleOtherLayers->setShortcut(Qt::CTRL + Qt::SHIFT + Qt::Key_H);
+    mActionToggleOtherLayers->setShortcut((Qt::CTRL | Qt::SHIFT) + Qt::Key_H);
     mActionToggleOtherLayers->setIcon(
             QIcon(QLatin1String(":/images/16/show_hide_others.png")));
 
     mActionToggleLockOtherLayers = new QAction(this);
-    mActionToggleLockOtherLayers->setShortcut(Qt::CTRL + Qt::SHIFT + Qt::Key_L);
+    mActionToggleLockOtherLayers->setShortcut((Qt::CTRL | Qt::SHIFT) + Qt::Key_L);
     mActionToggleLockOtherLayers->setIcon(lockedIcon);
 
     mActionLayerProperties = new QAction(this);

src/tiled/mapeditor.cpp

@@ -991,7 +991,7 @@ void MapEditor::setupQuickStamps()
         connect(createStamp, &QShortcut::activated, [=] { mTileStampManager->createQuickStamp(i); });
 
         // Set up shortcut for extending this quick stamp
-        QShortcut *extendStamp = new QShortcut(Qt::CTRL + Qt::SHIFT + key, mMainWindow);
+        QShortcut *extendStamp = new QShortcut((Qt::CTRL | Qt::SHIFT) + key, mMainWindow);
         connect(extendStamp, &QShortcut::activated, [=] { mTileStampManager->extendQuickStamp(i); });
     }
 

src/tiled/projectmodel.h

@@ -66,6 +66,12 @@ class ProjectModel : public QAbstractItemModel
         int score;
         int offset;
         QString path;
+
+#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0)
+        QStringRef relativePath() const { return path.midRef(offset); }
+#else
+        QStringView relativePath() const { return QStringView(path).mid(offset); }
+#endif
     };
 
     QVector<Match> findFiles(const QStringList &words) const;

src/tiled/scriptfile.cpp

@@ -244,21 +244,34 @@ QString ScriptTextFile::filePath() const
     return QFileInfo(m_file->fileName()).absoluteFilePath();
 }
 
-#if QT_VERSION < QT_VERSION_CHECK(6,0,0)
 QString ScriptTextFile::codec() const
 {
     if (checkForClosed())
         return {};
+#if QT_VERSION < QT_VERSION_CHECK(6,0,0)
     return QString::fromLatin1(m_stream->codec()->name());
+#else
+    return QString::fromLatin1(QStringConverter::nameForEncoding(m_stream->encoding()));
+#endif
 }
 
 void ScriptTextFile::setCodec(const QString &codec)
 {
     if (checkForClosed())
         return;
+#if QT_VERSION < QT_VERSION_CHECK(6,0,0)
     m_stream->setCodec(codec.toLatin1());
-}
+#else
+    auto encoding = QStringConverter::encodingForName(codec.toLatin1());
+    if (!encoding.has_value()) {
+        ScriptManager::instance().throwError(QCoreApplication::translate("Script Errors",
+                                                                         "Unsupported encoding: %1").arg(codec));
+        return;
+    }
+
+    m_stream->setEncoding(encoding.value());
 #endif
+}
 
 QString ScriptTextFile::readLine()
 {

src/tiled/scriptfile.h

@@ -76,10 +76,7 @@ class ScriptTextFile : public QObject
 
     Q_PROPERTY(QString filePath READ filePath)
     Q_PROPERTY(bool atEof READ atEof)
-
-#if QT_VERSION < QT_VERSION_CHECK(6,0,0)
     Q_PROPERTY(QString codec READ codec WRITE setCodec)
-#endif
 
 public:
     enum OpenMode {
@@ -97,10 +94,8 @@ class ScriptTextFile : public QObject
 
     QString filePath() const;
 
-#if QT_VERSION < QT_VERSION_CHECK(6,0,0)
     QString codec() const;
     void setCodec(const QString &codec);
-#endif
 
     Q_INVOKABLE QString readLine();
     Q_INVOKABLE QString readAll();

src/tiled/tiledproxystyle.cpp

@@ -795,7 +795,11 @@ void TiledProxyStyle::drawControl(ControlElement element,
             }
             int x, y, w, h;
             menuitem->rect.getRect(&x, &y, &w, &h);
+#if QT_VERSION >= QT_VERSION_CHECK(6,0,0)
+            int tab = menuitem->reservedShortcutWidth;
+#else
             int tab = menuitem->tabWidth;
+#endif
             QColor discol;
             if (dis) {
                 discol = menuitem->palette.text().color();

src/tiled/tilestampmanager.cpp

@@ -214,24 +214,19 @@ void TileStampManager::loadStamps()
         if (!stampFile.open(QIODevice::ReadOnly))
             continue;
 
-        QByteArray data = stampFile.readAll();
-
-        QJsonDocument document = QJsonDocument::fromBinaryData(data);
-        if (document.isNull()) {
-            // document not valid binary data, maybe it's an JSON text file
-            QJsonParseError error;
-            document = QJsonDocument::fromJson(data, &error);
-            if (error.error != QJsonParseError::NoError) {
-                qDebug().noquote() << "Failed to parse stamp file:" << error.errorString();
-                continue;
-            }
+        QJsonParseError error;
+        const QByteArray data = stampFile.readAll();
+        const QJsonDocument document = QJsonDocument::fromJson(data, &error);
+        if (error.error != QJsonParseError::NoError) {
+            qDebug().noquote() << "Failed to parse stamp file:" << error.errorString();
+            continue;
         }
 
         TileStamp stamp = TileStamp::fromJson(document.object(), stampsDir);
         if (stamp.isEmpty())
             continue;
 
-        stamp.setFileName(iterator.fileInfo().fileName());
+        stamp.setFileName(iterator.fileName());
 
         mTileStampModel->addStamp(stamp);
 

src/tiled/toolmanager.cpp

@@ -26,6 +26,7 @@
 
 #include <QAction>
 #include <QShortcut>
+#include <QWidget>
 
 using namespace Tiled;