Now launches WITH FUCKING ANDROID!!!
This commit is contained in:
parent
7a6c826a8f
commit
0f81129eec
2 changed files with 9 additions and 1 deletions
|
@ -209,7 +209,11 @@ QString Application::userDataHomeFolder() {
|
||||||
return home_folder;
|
return home_folder;
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
|
#if defined (Q_OS_ANDROID)
|
||||||
|
return IOFactory::getSystemFolder(QStandardPaths::GenericDataLocation) + QDir::separator() + QSL(APP_NAME);
|
||||||
|
#else
|
||||||
return configFolder() + QDir::separator() + QSL(APP_NAME);
|
return configFolder() + QDir::separator() + QSL(APP_NAME);
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -222,7 +226,11 @@ QString Application::documentsFolder() {
|
||||||
}
|
}
|
||||||
|
|
||||||
QString Application::homeFolder() {
|
QString Application::homeFolder() {
|
||||||
|
#if defined (Q_OS_ANDROID)
|
||||||
|
return IOFactory::getSystemFolder(QStandardPaths::GenericDataLocation);
|
||||||
|
#else
|
||||||
return IOFactory::getSystemFolder(QStandardPaths::HomeLocation);
|
return IOFactory::getSystemFolder(QStandardPaths::HomeLocation);
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
void Application::backupDatabaseSettings(bool backup_database, bool backup_settings,
|
void Application::backupDatabaseSettings(bool backup_database, bool backup_settings,
|
||||||
|
|
|
@ -427,7 +427,7 @@ SettingsProperties Settings::determineProperties() {
|
||||||
|
|
||||||
// We will use PORTABLE settings only and only if it is available and NON-PORTABLE
|
// We will use PORTABLE settings only and only if it is available and NON-PORTABLE
|
||||||
// settings was not initialized before.
|
// 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.
|
// DO NOT use portable settings for Linux, it is really not used on that platform.
|
||||||
const bool will_we_use_portable_settings = false;
|
const bool will_we_use_portable_settings = false;
|
||||||
|
|
Loading…
Add table
Reference in a new issue