Progress on porting to Qt 6

* qHash changed signature
* qrand() was removed (replaced with QRandomGenerator)
* QDesktopWidget was removed (now using QWidget::screen)
* QDataStream open mode enum changed location
* Qt::AA_UseHighDpiPixmaps was removed
* Adjustments due to flags deleting operator+
* QWheelEvent API changed
* QWidget::enterEvent takes a custom QEnterEvent
* Qt::MidButton was removed (replaced with Qt::MiddleButton)
* QTextCodec was removed (replaced with encoding enum, but decided to
  remove TextFile.codec for now)
* QLinkedList deprecated (replaced with std::list)
* QMap::insertMulti removed (need to use QMultiMap)
* Need to depend on openglwidgets module for QOpenGLWidget

README.md

@@ -70,6 +70,13 @@ You can now run Tiled as follows:
 
     qbs run -p tiled
 
+Qt 6
+-------------------------------------------------------------------------------
+
+For compiling libtiledquick you'll need to install the Vulkan headers:
+
+* On Unbuntu/Debian: `sudo apt install libvulkan-dev`
+
 ### Working with Visual Studio 2017
 
 Once Qbs is set up (see previous instructions), it is possible to generate a

src/libtiled/imagecache.cpp

@@ -51,9 +51,13 @@ bool TilesheetParameters::operator==(const TilesheetParameters &other) const
             transparentColor == other.transparentColor;
 }
 
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
 uint qHash(const TilesheetParameters &key, uint seed) Q_DECL_NOTHROW
+#else
+size_t qHash(const TilesheetParameters &key, size_t seed) Q_DECL_NOTHROW
+#endif
 {
-    uint h = ::qHash(key.fileName, seed);
+    auto h = ::qHash(key.fileName, seed);
     h = ::qHash(key.tileWidth, h);
     h = ::qHash(key.tileHeight, h);
     h = ::qHash(key.margin, h);

src/libtiled/imagecache.h

@@ -51,7 +51,11 @@ struct TILEDSHARED_EXPORT TilesheetParameters
     bool operator==(const TilesheetParameters &other) const;
 };
 
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
 uint TILEDSHARED_EXPORT qHash(const TilesheetParameters &key, uint seed = 0) Q_DECL_NOTHROW;
+#else
+size_t TILEDSHARED_EXPORT qHash(const TilesheetParameters &key, size_t seed = 0) Q_DECL_NOTHROW;
+#endif
 
 struct LoadedImage
 {

src/libtiled/tilelayer.h

@@ -45,12 +45,14 @@
 
 #include <functional>
 
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
 inline uint qHash(QPoint key, uint seed = 0) Q_DECL_NOTHROW
 {
     uint h1 = qHash(key.x(), seed);
     uint h2 = qHash(key.y(), seed);
     return ((h1 << 16) | (h1 >> 16)) ^ h2 ^ seed;
 }
+#endif
 
 namespace Tiled {
 

src/tiled/automapper.cpp

@@ -38,6 +38,9 @@
 #include "tilelayer.h"
 
 #include <QDebug>
+#if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0)
+#include <QRandomGenerator>
+#endif
 
 #include "qtcompat_p.h"
 
@@ -746,6 +749,10 @@ QRect AutoMapper::applyRule(int ruleIndex, const QRect &where)
 
     const TileLayer dummy(QString(), 0, 0, mMapWork->width(), mMapWork->height());
 
+#if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0)
+    QRandomGenerator *randomGenerator = QRandomGenerator::global();
+#endif
+
     for (int y = minY; y <= maxY; ++y)
     for (int x = minX; x <= maxX; ++x) {
         bool anyMatch = false;
@@ -777,7 +784,11 @@ QRect AutoMapper::applyRule(int ruleIndex, const QRect &where)
 
         if (anyMatch) {
             // choose by chance which group of rule_layers should be used:
+#if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0)
+            const int r = randomGenerator->generate() % mLayerList.size();
+#else
             const int r = qrand() % mLayerList.size();
+#endif
             const RuleOutput &translationTable = mLayerList.at(r);
 
             if (mOptions.noOverlappingRules) {

src/tiled/imagecolorpickerwidget.cpp

@@ -24,7 +24,11 @@
 
 #include "utils.h"
 
+#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0)
 #include <QDesktopWidget>
+#else
+#include <QScreen>
+#endif
 #include <QMouseEvent>
 
 using namespace Tiled;
@@ -58,8 +62,13 @@ bool ImageColorPickerWidget::selectColor(const QString &image)
     mScaleX = 1;
     mScaleY = 1;
 
+#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0)
     QRectF rct = QApplication::desktop()->availableGeometry(this);
-    double maxW = rct.width() * (2.0/3.0), maxH = rct.height() * (2.0/3.0);
+#else
+    QRectF rct = screen()->availableGeometry();
+#endif
+    const qreal maxW = rct.width() * (2.0/3.0);
+    const qreal maxH = rct.height() * (2.0/3.0);
 
     if (mImage.width() > maxW || mImage.height() > maxH) {
         pix = pix.scaled((int)maxW, (int)maxH, Qt::KeepAspectRatio);
@@ -106,5 +115,9 @@ void ImageColorPickerWidget::onMouseRelease(QMouseEvent * event)
 
 void ImageColorPickerWidget::resizeEvent(QResizeEvent *)
 {
+#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0)
     move(QApplication::desktop()->availableGeometry(parentWidget()).center() - rect().center());
+#else
+    move(screen()->availableGeometry().center() - rect().center());
+#endif
 }

src/tiled/layermodel.cpp

@@ -255,7 +255,11 @@ QMimeData *LayerModel::mimeData(const QModelIndexList &indexes) const
 
     QMimeData *mimeData = new QMimeData;
     QByteArray encodedData;
+#if QT_VERSION < QT_VERSION_CHECK(6,0,0)
     QDataStream stream(&encodedData, QIODevice::WriteOnly);
+#else
+    QDataStream stream(&encodedData, QDataStream::WriteOnly);
+#endif
     QVector<Layer*> layers;
 
     for (const QModelIndex &index : indexes) {

src/tiled/main.cpp

@@ -347,7 +347,9 @@ int main(int argc, char *argv[])
     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)
     QCoreApplication::setAttribute(Qt::AA_UseHighDpiPixmaps);
+#endif
 #if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0)
     QCoreApplication::setAttribute(Qt::AA_DisableWindowContextHelpButton);
 #endif

src/tiled/mainwindow.cpp

@@ -83,6 +83,7 @@
 #include "macsupport.h"
 #endif
 
+#include <QActionGroup>
 #include <QCloseEvent>
 #include <QDesktopServices>
 #include <QFileDialog>
@@ -92,6 +93,7 @@
 #include <QRegularExpression>
 #include <QSessionManager>
 #include <QShortcut>
+#include <QStandardPaths>
 #include <QStatusBar>
 #include <QTextStream>
 #include <QToolBar>
@@ -810,7 +812,7 @@ MainWindow::MainWindow(QWidget *parent, Qt::WindowFlags flags)
     QShortcut *switchToLeftDocument = new QShortcut(Qt::ALT + Qt::Key_Left, this);
     connect(switchToLeftDocument, &QShortcut::activated,
             mDocumentManager, &DocumentManager::switchToLeftDocument);
-    QShortcut *switchToLeftDocument1 = new QShortcut(Qt::CTRL + Qt::SHIFT + Qt::Key_Tab, this);
+    QShortcut *switchToLeftDocument1 = new QShortcut((Qt::CTRL | Qt::SHIFT) + Qt::Key_Tab, this);
     connect(switchToLeftDocument1, &QShortcut::activated,
             mDocumentManager, &DocumentManager::switchToLeftDocument);
 

src/tiled/mapview.cpp

@@ -384,11 +384,11 @@ void MapView::wheelEvent(QWheelEvent *event)
     bool wheelZoomsByDefault = Preferences::instance()->wheelZoomsByDefault();
     bool control = event->modifiers() & Qt::ControlModifier;
 
-    if ((wheelZoomsByDefault != control) && event->orientation() == Qt::Vertical) {
+    if ((wheelZoomsByDefault != control) && event->angleDelta().y()) {
         // No automatic anchoring since we'll do it manually
         setTransformationAnchor(QGraphicsView::NoAnchor);
 
-        mZoomable->handleWheelDelta(event->delta());
+        mZoomable->handleWheelDelta(event->angleDelta().y());
         adjustCenterFromMousePosition(mLastMousePos);
 
         // Restore the centering anchor
@@ -430,7 +430,7 @@ void MapView::wheelEvent(QWheelEvent *event)
  */
 void MapView::mousePressEvent(QMouseEvent *event)
 {
-    if (event->button() == Qt::MidButton && isActiveWindow()) {
+    if (event->button() == Qt::MiddleButton && isActiveWindow()) {
         setHandScrolling(true);
         return;
     }
@@ -443,7 +443,7 @@ void MapView::mousePressEvent(QMouseEvent *event)
  */
 void MapView::mouseReleaseEvent(QMouseEvent *event)
 {
-    if (event->button() == Qt::MidButton) {
+    if (event->button() == Qt::MiddleButton) {
         setHandScrolling(false);
         return;
     }

src/tiled/minimap.cpp

@@ -195,7 +195,7 @@ void MiniMap::renderMapToImage()
     miniMapRenderer.renderToImage(mMapImage, mRenderFlags);
 }
 
-void MiniMap::centerViewOnLocalPixel(QPoint centerPos, int delta)
+void MiniMap::centerViewOnLocalPixel(const QPointF &centerPos, int delta)
 {
     MapView *mapView = DocumentManager::instance()->currentMapView();
     if (!mapView)
@@ -215,8 +215,12 @@ void MiniMap::redrawTimeout()
 
 void MiniMap::wheelEvent(QWheelEvent *event)
 {
-    if (event->orientation() == Qt::Vertical) {
-        centerViewOnLocalPixel(event->pos(), event->delta());
+    if (event->angleDelta().y()) {
+#if QT_VERSION < QT_VERSION_CHECK(5,15,0)
+        centerViewOnLocalPixel(event->pos(), event->angleDelta().y());
+#else
+        centerViewOnLocalPixel(event->position(), event->angleDelta().y());
+#endif
         return;
     }
 
@@ -302,7 +306,7 @@ QRect MiniMap::viewportRect() const
                  viewRect.height() / mapRect.height() * mImageRect.height());
 }
 
-QPointF MiniMap::mapToScene(QPoint p) const
+QPointF MiniMap::mapToScene(QPointF p) const
 {
     if (mImageRect.isEmpty())
         return QPointF();

src/tiled/minimap.h

@@ -71,10 +71,10 @@ public slots:
     MiniMapRenderer::RenderFlags mRenderFlags;
 
     QRect viewportRect() const;
-    QPointF mapToScene(QPoint p) const;
+    QPointF mapToScene(QPointF p) const;
     void updateImageRect();
     void renderMapToImage();
-    void centerViewOnLocalPixel(QPoint centerPos, int delta = 0);
+    void centerViewOnLocalPixel(const QPointF &centerPos, int delta = 0);
 };
 
 } // namespace Tiled

src/tiled/resizehelper.cpp

@@ -169,7 +169,7 @@ void ResizeHelper::mouseMoveEvent(QMouseEvent *event)
 
 void ResizeHelper::wheelEvent(QWheelEvent *event)
 {
-    if (event->delta() > 0)// zooming in
+    if (event->angleDelta().y() > 0)// zooming in
         mZoom += 0.2;
     else
         mZoom -= 0.2;

src/tiled/scriptfile.cpp

@@ -35,7 +35,9 @@
 #include <QFile>
 #include <QFileInfo>
 #include <QSaveFile>
+#if QT_VERSION < QT_VERSION_CHECK(6,0,0)
 #include <QTextCodec>
+#endif
 #include <QTextStream>
 
 namespace Tiled {
@@ -242,6 +244,7 @@ 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())
@@ -255,6 +258,7 @@ void ScriptTextFile::setCodec(const QString &codec)
         return;
     m_stream->setCodec(codec.toLatin1());
 }
+#endif
 
 QString ScriptTextFile::readLine()
 {

src/tiled/scriptfile.h

@@ -76,7 +76,10 @@ 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 {
@@ -93,8 +96,11 @@ class ScriptTextFile : public QObject
     ~ScriptTextFile() override;
 
     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/session.h

@@ -22,14 +22,14 @@
 
 #include <QDir>
 #include <QHash>
-#include <QLinkedList>
 #include <QPointF>
 #include <QSettings>
 #include <QSize>
 #include <QStringList>
 #include <QTimer>
 #include <QVariantMap>
 
+#include <list>
 #include <memory>
 
 namespace Tiled {
@@ -178,7 +178,7 @@ class Session : protected FileHelper
     QMap<QString, QVariantMap> fileStates;
 
     using ChangedCallback = std::function<void()>;
-    using Callbacks = QLinkedList<ChangedCallback>;
+    using Callbacks = std::list<ChangedCallback>;
     using CallbackIterator = Callbacks::iterator;
 
 private:
@@ -241,7 +241,7 @@ template<typename T>
 Session::CallbackIterator SessionOption<T>::onChange(const Session::ChangedCallback &callback)
 {
     Session::Callbacks &callbacks = Session::mChangedCallbacks[mKey];
-    callbacks.prepend(callback);
+    callbacks.push_front(callback);
     return callbacks.begin();
 }
 

src/tiled/shortcutsettingspage.cpp

@@ -125,7 +125,7 @@ void ActionsModel::refreshConflicts()
     if (!mConflictsDirty)
         return;
 
-    QMap<QKeySequence, Id> actionsByKey;
+    QMultiMap<QKeySequence, Id> actionsByKey;
 
     for (const auto &actionId : qAsConst(mActions)) {
         if (auto action = ActionManager::findAction(actionId))

src/tiled/tabbar.cpp

@@ -31,15 +31,15 @@ TabBar::TabBar(QWidget *parent)
 
 void TabBar::mousePressEvent(QMouseEvent *event)
 {
-    if (event->button() == Qt::MidButton)
+    if (event->button() == Qt::MiddleButton)
         mPressedIndex = tabAt(event->pos());
 
     QTabBar::mousePressEvent(event);
 }
 
 void TabBar::mouseReleaseEvent(QMouseEvent *event)
 {
-    if (event->button() == Qt::MidButton && tabsClosable()) {
+    if (event->button() == Qt::MiddleButton && tabsClosable()) {
         if (mPressedIndex != -1 && mPressedIndex == tabAt(event->pos())) {
             emit tabCloseRequested(mPressedIndex);
             return;
@@ -57,7 +57,7 @@ void TabBar::wheelEvent(QWheelEvent *event)
 
     int index = currentIndex();
     if (index != -1) {
-        index += event->delta() > 0 ? -1 : 1;
+        index += event->angleDelta().y() > 0 ? -1 : 1;
         if (index >= 0 && index < count())
             setCurrentIndex(index);
     }

src/tiled/tiled.qbs

@@ -14,6 +14,7 @@ QtGuiApplication {
     Depends { name: "qtsingleapplication" }
     Depends { name: "ib"; condition: qbs.targetOS.contains("macos") }
     Depends { name: "Qt"; submodules: ["core", "widgets", "qml"]; versionAtLeast: "5.6" }
+    Depends { name: "Qt.openglwidgets"; condition: Qt.core.versionMajor >= 6 }
 
     property bool qtcRunnable: true
 

src/tiled/tilesetdock.cpp

@@ -55,6 +55,7 @@
 #include "zoomable.h"
 
 #include <QAction>
+#include <QActionGroup>
 #include <QComboBox>
 #include <QDropEvent>
 #include <QFileDialog>