Merge branch 'v0.6' into qt5-wip #2237

Open
kashikoibumi wants to merge 38 commits from kashikoibumi/qt5-wip into v0.6
Showing only changes of commit 1368013a4e - Show all commits

View File

@ -168,7 +168,7 @@ def detectOSRelease():
pass pass
if detectOS.result == "Ubuntu" and ver < 14: if detectOS.result == "Ubuntu" and ver < 14:
detectOS.result = "Ubuntu 12" detectOS.result = "Ubuntu 12"
elif detectOS.result == "Ubuntu" and version >= 20: elif detectOS.result == "Ubuntu" and ver >= 20:
detectOS.result = "Ubuntu 20" detectOS.result = "Ubuntu 20"