From 2de4b26b711352e7cc4f594c0822edfcbbebe021 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luis=20=C3=81ngel=20San=20Mart=C3=ADn?= Date: Fri, 1 Oct 2021 19:54:41 +0200 Subject: [PATCH] Start supporting Qt6 Everything is broken but we want to start fixing as much as possible --- YACReader/YACReader.pro | 2 ++ YACReaderLibrary/YACReaderLibrary.pro | 2 ++ YACReaderLibraryServer/YACReaderLibraryServer.pro | 2 ++ config.pri | 4 ---- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/YACReader/YACReader.pro b/YACReader/YACReader.pro index 067e78e3..fe2f6c7b 100644 --- a/YACReader/YACReader.pro +++ b/YACReader/YACReader.pro @@ -70,6 +70,8 @@ macx { QT += network widgets core multimedia svg +greaterThan(QT_MAJOR_VERSION, 5): QT += openglwidgets core5compat + #CONFIG += release CONFIG -= flat diff --git a/YACReaderLibrary/YACReaderLibrary.pro b/YACReaderLibrary/YACReaderLibrary.pro index 0ff05782..17a6a94c 100644 --- a/YACReaderLibrary/YACReaderLibrary.pro +++ b/YACReaderLibrary/YACReaderLibrary.pro @@ -71,6 +71,8 @@ macx { CONFIG -= flat QT += sql network widgets svg +greaterThan(QT_MAJOR_VERSION, 5): QT += openglwidgets core5compat + # Input HEADERS += comic_flow.h \ ../common/concurrent_queue.h \ diff --git a/YACReaderLibraryServer/YACReaderLibraryServer.pro b/YACReaderLibraryServer/YACReaderLibraryServer.pro index e84ab29a..54fb3431 100644 --- a/YACReaderLibraryServer/YACReaderLibraryServer.pro +++ b/YACReaderLibraryServer/YACReaderLibraryServer.pro @@ -37,6 +37,8 @@ unix:haiku { CONFIG -= flat QT += core sql network +greaterThan(QT_MAJOR_VERSION, 5): QT += core5compat + # Source files HEADERS += ../YACReaderLibrary/library_creator.h \ ../YACReaderLibrary/package_manager.h \ diff --git a/config.pri b/config.pri index 3b14f8c2..3553c277 100644 --- a/config.pri +++ b/config.pri @@ -35,10 +35,6 @@ defineTest(minQtVersion) { error(YACReader requires Qt 5.9 or newer but $$[QT_VERSION] was detected) } -minQtVersion(6, 0, 0) { - error(YACReader does not support building with Qt6 (yet)) -} - DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x050900 DEFINES += QT_DEPRECATED_WARNINGS