From 88658bd9e36710d8dffdf4eea890fec4fa670bde Mon Sep 17 00:00:00 2001 From: Jan Mulder Date: Thu, 18 Jan 2018 15:30:55 +0100 Subject: [PATCH] Use different preference file for mobile This is a change mainly for developers working on both mobile and desktop application. As the current setup is that all preferences are stored in one file (Subsurface.conf), for both mobile and desktop, the unwary developer might get confused that the things tested on mobile-on-desktop are not working on mobile-on-device. As we share a lot of code between the desktop and the mobile code, also our fairly extensive set of preferences play a significant role in the inner workings of our applications. So, this commit introduces an own preferences file for mobile (on desktop) resulting in the preferences between the plain desktop apllication now invisible to the mobile-on-desktop application and vise versa. Making the mobile-on-desktop a much more realistic test plaform for mobile development. Signed-off-by: Jan Mulder --- core/qt-init.cpp | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/core/qt-init.cpp b/core/qt-init.cpp index aae24bda4..f35c6a670 100644 --- a/core/qt-init.cpp +++ b/core/qt-init.cpp @@ -27,10 +27,22 @@ void init_qt_late() // enable user specific settings (based on command line argument) if (settings_suffix) { if (verbose) +#if defined(SUBSURFACE_MOBILE) && ((defined(Q_OS_LINUX) && !defined(Q_OS_ANDROID)) || (defined(Q_OS_DARWIN) && !defined(Q_OS_IOS))) + qDebug() << "using custom config for" << QString("Subsurface-Mobile-%1").arg(settings_suffix); +#else qDebug() << "using custom config for" << QString("Subsurface-%1").arg(settings_suffix); +#endif +#if defined(SUBSURFACE_MOBILE) && ((defined(Q_OS_LINUX) && !defined(Q_OS_ANDROID)) || (defined(Q_OS_DARWIN) && !defined(Q_OS_IOS))) + QCoreApplication::setApplicationName(QString("Subsurface-Mobile-%1").arg(settings_suffix)); +#else QCoreApplication::setApplicationName(QString("Subsurface-%1").arg(settings_suffix)); +#endif } else { +#if defined(SUBSURFACE_MOBILE) && ((defined(Q_OS_LINUX) && !defined(Q_OS_ANDROID)) || (defined(Q_OS_DARWIN) && !defined(Q_OS_IOS))) + QCoreApplication::setApplicationName("Subsurface-Mobile"); +#else QCoreApplication::setApplicationName("Subsurface"); +#endif } // find plugins installed in the application directory (without this SVGs don't work on Windows) SettingsObjectWrapper::instance()->load();