From 1fbf1195b997c11509afce8d4a7322e7561ab301 Mon Sep 17 00:00:00 2001 From: Felix Kauselmann Date: Sun, 1 Jul 2018 14:39:46 +0200 Subject: [PATCH 1/2] Fix YACReader build for Qt <= 5.7 --- YACReader/main.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/YACReader/main.cpp b/YACReader/main.cpp index c6bf9c38..7e318cee 100644 --- a/YACReader/main.cpp +++ b/YACReader/main.cpp @@ -83,8 +83,14 @@ int main(int argc, char * argv[]) QCommandLineOption comicId("comicId", "", "comicId"); QCommandLineOption libraryId("libraryId", "", "libraryId"); // hide comicId and libraryId from help + #if QT_VERSION >= 0x050800 comicId.setFlags(QCommandLineOption::HiddenFromHelp); libraryId.setFlags(QCommandLineOption::HiddenFromHelp); + #else + comicId.setHidden(true); + libraryId.setHidden(true); + #endif + // process parser.addOption(comicId); parser.addOption(libraryId); From cc9161acb00b7ec4534c0a7f777e9c5562f55326 Mon Sep 17 00:00:00 2001 From: Felix Kauselmann Date: Tue, 10 Jul 2018 20:35:42 +0200 Subject: [PATCH 2/2] Enforce Qt 5.6 --- config.pri | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/config.pri b/config.pri index f693dcb1..b98dc094 100644 --- a/config.pri +++ b/config.pri @@ -11,11 +11,8 @@ QT_VER_MIN = $$member(QT_VERSION, 1) lessThan(QT_VER_MAJ, 5) { error(YACReader requires Qt 5 or newer but Qt $$[QT_VERSION] was detected.) } -lessThan(QT_VER_MIN, 6) { - warning ("Qt < 5.6 detected. Compilation will probably work, but some qml based components in YACReaderLibrary (GridView, InfoView) will fail at runtime.") - } -lessThan(QT_VER_MIN, 4):!CONFIG(no_opengl) { - error ("You need at least Qt 5.4 to compile YACReader or YACReaderLibrary.") +lessThan(QT_VER_MIN, 6):!CONFIG(no_opengl) { + error ("You need at least Qt 5.6 to compile YACReader or YACReaderLibrary.") } # Disable coverflow for arm targets