chris/OSCAR-code
1
0
Fork 0
mirror of https://gitlab.com/pholy/OSCAR-code.git synced 2025-04-04 18:20:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update version checking to allow QT 6

Browse Source
This commit is contained in:
Guy Scharf 2021-04-02 17:17:50 -07:00
parent e358d31f26
commit e699ea182d
2 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
OSCAR_QT.pro
View File

@ -1,7 +1,13 @@
lessThan(QT_MAJOR_VERSION,5)|lessThan(QT_MINOR_VERSION,9) { lessThan(QT_MAJOR_VERSION,5) {
message("You need to Qt 5.9 or newer to build OSCAR with Help Pages") error("You need Qt 5.7 or newer to build OSCAR");
lessThan(QT_MAJOR_VERSION,5)|lessThan(QT_MINOR_VERSION,7) { }
error("You need Qt 5.7 or newer to build OSCAR")
if (equals(QT_MAJOR_VERSION,5)) {
lessThan(QT_MINOR_VERSION,9) {
message("You need Qt 5.9 to build OSCAR with Help Pages")
}
lessThan(QT_MINOR_VERSION,7) {
error("You need Qt 5.7 or newer to build OSCAR");
} }
} }

12
oscar/oscar.pro
View File

@ -6,12 +6,18 @@
message(Platform is $$QMAKESPEC ) message(Platform is $$QMAKESPEC )
lessThan(QT_MAJOR_VERSION,5)|lessThan(QT_MINOR_VERSION,9) { lessThan(QT_MAJOR_VERSION,5) {
error("You need Qt 5.7 or newer to build OSCAR");
}
if (equals(QT_MAJOR_VERSION,5)) {
lessThan(QT_MINOR_VERSION,9) {
message("You need Qt 5.9 to build OSCAR with Help Pages") message("You need Qt 5.9 to build OSCAR with Help Pages")
DEFINES += helpless DEFINES += helpless
} }
lessThan(QT_MAJOR_VERSION,5)|lessThan(QT_MINOR_VERSION,7) { lessThan(QT_MINOR_VERSION,7) {
error("You need Qt 5.7 or newer to build OSCAR"); error("You need Qt 5.7 or newer to build OSCAR");
}
} }
# get rid of the help browser, at least for now # get rid of the help browser, at least for now