Merge pull request #3187

cd054f6c docker: fix Android build, update to Qt 5.15, README.md build steps (xiphon) d6cb9b6c docker: move Android Dockerfile to root (xiphon)
2020-10-28 00:42:35 -07:00
parent ddcee95b88 cd054f6c26
commit c9fd9634ee
7 changed files with 267 additions and 285 deletions
--- a/src/main/main.cpp
+++ b/src/main/main.cpp
@@ -156,8 +156,6 @@ int main(int argc, char *argv[])
    // platform dependant settings
 #if !defined(Q_OS_ANDROID) && !defined(Q_OS_IOS)
    bool isDesktop = true;
-#elif defined(Q_OS_LINUX)
-    bool isLinux = true;
 #elif defined(Q_OS_ANDROID)
    bool isAndroid = true;
 #elif defined(Q_OS_IOS)