Skip to content

Commit 47d9219

Browse files
committed
LP-419 add handling of os specific default GCS configuration file
if a os specific file (for example default_linux.xml) is found it will be loaded alongside the common default.xml file. no os specific dfault files are provided yet...
1 parent f00e40d commit 47d9219

1 file changed

Lines changed: 16 additions & 6 deletions

File tree

ground/gcs/src/libs/utils/settingsutils.cpp

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636

3737
namespace Utils {
3838
static const QString DEFAULT_CONFIG_DIRNAME = "configurations";
39+
3940
static const QString DEFAULT_CONFIG_FILENAME = "default.xml";
4041

4142
const QLatin1String CONFIG_OPTION("-D");
@@ -196,16 +197,25 @@ void initSettings(const QString &factoryDefaultsFileName)
196197

197198
QStringList files;
198199

199-
// defaults
200+
// common default
200201
files << fileName;
201202

203+
// OS specific default
204+
#ifdef Q_OS_MAC
205+
files << directory.absoluteFilePath("default_macos.xml");
206+
#elif defined(Q_OS_LINUX)
207+
files << directory.absoluteFilePath("default_linux.xml");
208+
#else
209+
files << directory.absoluteFilePath("default_windows.xml");
210+
#endif
211+
202212
foreach(QString file, files) {
203213
file = checkFile(file);
204-
205-
QSettings const *settings = new QSettings(file, XmlConfig::XmlFormat);
206-
qDebug() << "settings - loaded factory defaults" << file;
207-
208-
factorySettingsList.append(settings);
214+
if (!file.isEmpty()) {
215+
QSettings const *settings = new QSettings(file, XmlConfig::XmlFormat);
216+
qDebug() << "settings - loaded factory defaults" << file;
217+
factorySettingsList.append(settings);
218+
}
209219
}
210220
}
211221

0 commit comments

Comments
 (0)