From 00cea51b0b9431b1952cd9f771dc59f7b5de99a0 Mon Sep 17 00:00:00 2001 From: ConfuSomu Date: Mon, 27 Nov 2023 20:40:33 -0500 Subject: Fix Qt 6 compilation Compilation would fail due to QtConcurrent changes in Qt 6. See the following on Qt's website: https://doc.qt.io/qt-6/concurrent-changes-qt6.html#qtconcurrent-run --- src/mainwindow.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index 12a71b8..04182ec 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -252,7 +252,11 @@ void MainWindow::open_file(const QString &filename) { data_archive = Archive::create_archive(ArchiveType::MASTODON, filename); if (not data_archive) return; - QFuture> parse_error = QtConcurrent::run(data_archive, &Archive::init); +#if (QT_VERSION >= QT_VERSION_CHECK(6,0,0)) + QFuture parse_error = QtConcurrent::run(&Archive::init, data_archive); +#else + QFuture parse_error = QtConcurrent::run(data_archive, &Archive::init); +#endif archive_thread_watcher.setFuture(parse_error); } -- cgit v1.2.3-54-g00ecf