Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-08-07 19:21:16 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

change the default config path to system config path

Browse source
This commit is contained in:
Stephen Birarda 2014-09-25 14:50:07 -07:00
parent 769586ef30
commit a684191cf1
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
libraries/shared/src/HifiConfigVariantMap.cpp
View file

@ -15,6 +15,7 @@
#include <QtCore/QJsonDocument> #include <QtCore/QJsonDocument>
#include <QtCore/QJsonArray> #include <QtCore/QJsonArray>
#include <QtCore/QJsonObject> #include <QtCore/QJsonObject>
#include <QtCore/QStandardPaths>
#include <QtCore/QVariant> #include <QtCore/QVariant>
#include "HifiConfigVariantMap.h" #include "HifiConfigVariantMap.h"
@ -75,8 +76,10 @@ QVariantMap HifiConfigVariantMap::mergeCLParametersWithJSONConfig(const QStringL
// we have a config file - try and read it // we have a config file - try and read it
configFilePath = argumentList[configIndex + 1]; configFilePath = argumentList[configIndex + 1];
} else { } else {
// no config file - try to read a file at resources/config.json // no config file - try to read a file config.json at the system config path
configFilePath = QCoreApplication::applicationDirPath() + "/resources/config.json"; configFilePath = QString("%1/%2/%3/config.json").arg(QStandardPaths::writableLocation(QStandardPaths::ConfigLocation),
QCoreApplication::organizationName(),
QCoreApplication::applicationName());
} }
QFile configFile(configFilePath); QFile configFile(configFilePath);