From 0f81129eec69b11ed7910be2bf4ce200f4f7932f Mon Sep 17 00:00:00 2001 From: Martin Rotter Date: Sun, 8 Oct 2017 20:30:35 +0200 Subject: [PATCH] Now launches WITH FUCKING ANDROID!!! --- src/miscellaneous/application.cpp | 8 ++++++++ src/miscellaneous/settings.cpp | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/miscellaneous/application.cpp b/src/miscellaneous/application.cpp index 6bf472a83..f8dce995d 100755 --- a/src/miscellaneous/application.cpp +++ b/src/miscellaneous/application.cpp @@ -209,7 +209,11 @@ QString Application::userDataHomeFolder() { return home_folder; } else { +#if defined (Q_OS_ANDROID) + return IOFactory::getSystemFolder(QStandardPaths::GenericDataLocation) + QDir::separator() + QSL(APP_NAME); +#else return configFolder() + QDir::separator() + QSL(APP_NAME); +#endif } } @@ -222,7 +226,11 @@ QString Application::documentsFolder() { } QString Application::homeFolder() { +#if defined (Q_OS_ANDROID) + return IOFactory::getSystemFolder(QStandardPaths::GenericDataLocation); +#else return IOFactory::getSystemFolder(QStandardPaths::HomeLocation); +#endif } void Application::backupDatabaseSettings(bool backup_database, bool backup_settings, diff --git a/src/miscellaneous/settings.cpp b/src/miscellaneous/settings.cpp index b8b6ca9a5..a725c9e36 100755 --- a/src/miscellaneous/settings.cpp +++ b/src/miscellaneous/settings.cpp @@ -427,7 +427,7 @@ SettingsProperties Settings::determineProperties() { // We will use PORTABLE settings only and only if it is available and NON-PORTABLE // settings was not initialized before. -#if defined (Q_OS_LINUX) || defined (Q_OS_MACOS) +#if defined (Q_OS_LINUX) || defined (Q_OS_ANDROID) || defined (Q_OS_MACOS) // DO NOT use portable settings for Linux, it is really not used on that platform. const bool will_we_use_portable_settings = false;