Commit 015f0362 authored by Leander Schulten's avatar Leander Schulten
Browse files

fix bug in Settings where for the compiler settings no localSettings from settings.ini will be used

parent a6b2246a
......@@ -12,10 +12,10 @@ Settings::Settings(QObject *parent) : QObject(parent), settings("Turmstraße 1 e
Settings::Settings(const QFileInfo &settingsFile, QObject *parent) : QObject(parent), settings("Turmstraße 1 e.V.","Lichtsteuerung"), localSettings(QVariant::fromValue(new QSettings(settingsFile.filePath(),QSettings::IniFormat)))
{
localSettings.value<QSettings*>()->setIniCodec("UTF-8");
Modules::Compiler::compilerCmd = settings.value("compilerCmd",Modules::Compiler::compilerCmd).toString();
Modules::Compiler::compilerFlags = settings.value("compilerFlags",Modules::Compiler::compilerFlags).toString();
Modules::Compiler::compilerLibraryFlags = settings.value("compilerLibraryFlags",Modules::Compiler::compilerLibraryFlags).toString();
Modules::Compiler::includePath = settings.value("includePath",Modules::Compiler::includePath).toString();
Modules::Compiler::compilerCmd = value("compilerCmd",Modules::Compiler::compilerCmd).toString();
Modules::Compiler::compilerFlags = value("compilerFlags",Modules::Compiler::compilerFlags).toString();
Modules::Compiler::compilerLibraryFlags = value("compilerLibraryFlags",Modules::Compiler::compilerLibraryFlags).toString();
Modules::Compiler::includePath = value("includePath",Modules::Compiler::includePath).toString();
}
void Settings::setValue(const QString &key, const QVariant &value){
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment