Merge default branch

This commit is contained in:
Felix Kauselmann
2018-02-18 17:17:14 +01:00
parent 1815ba64a1
commit 09c8125f87
36 changed files with 2014 additions and 1897 deletions

View File

@ -27,7 +27,7 @@ lessThan(QT_VER_MIN, 3) {
isEmpty(QMAKE_TARGET.arch) {
QMAKE_TARGET.arch = $$QMAKE_HOST.arch
}
contains(QMAKE_TARGET.arch, arm.*) {
contains(QMAKE_TARGET.arch, arm.*)|contains(QMAKE_TARGET.arch, aarch.*) {
message("Building for ARM architecture. Disabling OpenGL coverflow ...")
CONFIG += no_opengl
}