mirror/yacreader
1
0
Fork 0
mirror of https://github.com/YACReader/yacreader synced 2025-06-03 09:08:20 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #18 from selmf/9.5.0_fixes

Browse Source 
9.5.0 fixes
This commit is contained in:
Felix Kauselmann 2018-07-21 07:54:10 +00:00 committed by GitHub
commit 4f6618c096
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
YACReader/main.cpp
View File

@ -83,8 +83,14 @@ int main(int argc, char * argv[])
QCommandLineOption comicId("comicId", "", "comicId"); QCommandLineOption comicId("comicId", "", "comicId");
QCommandLineOption libraryId("libraryId", "", "libraryId"); QCommandLineOption libraryId("libraryId", "", "libraryId");
// hide comicId and libraryId from help // hide comicId and libraryId from help
#if QT_VERSION >= 0x050800
comicId.setFlags(QCommandLineOption::HiddenFromHelp); comicId.setFlags(QCommandLineOption::HiddenFromHelp);
libraryId.setFlags(QCommandLineOption::HiddenFromHelp); libraryId.setFlags(QCommandLineOption::HiddenFromHelp);
#else
comicId.setHidden(true);
libraryId.setHidden(true);
#endif
// process // process
parser.addOption(comicId); parser.addOption(comicId);
parser.addOption(libraryId); parser.addOption(libraryId);

7
config.pri
View File

@ -11,11 +11,8 @@ QT_VER_MIN = $$member(QT_VERSION, 1)
lessThan(QT_VER_MAJ, 5) { lessThan(QT_VER_MAJ, 5) {
error(YACReader requires Qt 5 or newer but Qt $$[QT_VERSION] was detected.) error(YACReader requires Qt 5 or newer but Qt $$[QT_VERSION] was detected.)
} }
lessThan(QT_VER_MIN, 6) { lessThan(QT_VER_MIN, 6):!CONFIG(no_opengl) {
warning ("Qt < 5.6 detected. Compilation will probably work, but some qml based components in YACReaderLibrary (GridView, InfoView) will fail at runtime.") error ("You need at least Qt 5.6 to compile YACReader or YACReaderLibrary.")
}
lessThan(QT_VER_MIN, 4):!CONFIG(no_opengl) {
error ("You need at least Qt 5.4 to compile YACReader or YACReaderLibrary.")
} }
# Disable coverflow for arm targets # Disable coverflow for arm targets