summaryrefslogtreecommitdiff
path: root/src/main-lib/configuration.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/main-lib/configuration.cpp')
-rw-r--r--src/main-lib/configuration.cpp16
1 files changed, 13 insertions, 3 deletions
diff --git a/src/main-lib/configuration.cpp b/src/main-lib/configuration.cpp
index 39ffe3da..5e77430e 100644
--- a/src/main-lib/configuration.cpp
+++ b/src/main-lib/configuration.cpp
@@ -401,7 +401,7 @@ void Configuration::parseWithArguments(const QStringList &arguments)
}
-const quint32 ConfigurationData::DataStreamVersion = 6;
+const quint32 ConfigurationData::DataStreamVersion = 7;
ConfigurationData *ConfigurationData::loadFromCache(QDataStream &ds)
@@ -463,7 +463,8 @@ ConfigurationData *ConfigurationData::loadFromCache(QDataStream &ds)
>> cd->flags.forceSingleProcess
>> cd->wayland.socketName
>> cd->wayland.extraSockets
- >> cd->flags.allowUnsignedPackages;
+ >> cd->flags.allowUnsignedPackages
+ >> cd->flags.allowUnknownUiClients;
return cd;
}
@@ -526,7 +527,8 @@ void ConfigurationData::saveToCache(QDataStream &ds) const
<< flags.forceSingleProcess
<< wayland.socketName
<< wayland.extraSockets
- << flags.allowUnsignedPackages;
+ << flags.allowUnsignedPackages
+ << flags.allowUnknownUiClients;
}
template <typename T> void mergeField(T &into, const T &from, const T &def)
@@ -627,6 +629,7 @@ void ConfigurationData::mergeFrom(const ConfigurationData *from)
MERGE_FIELD(wayland.socketName);
MERGE_FIELD(wayland.extraSockets);
MERGE_FIELD(flags.allowUnsignedPackages);
+ MERGE_FIELD(flags.allowUnknownUiClients);
}
QByteArray ConfigurationData::substituteVars(const QByteArray &sourceContent, const QString &fileName)
@@ -849,6 +852,8 @@ ConfigurationData *ConfigurationData::loadFromSource(QIODevice *source, const QS
cd->flags.noUiWatchdog = p->parseScalar().toBool(); } },
{ "allowUnsignedPackages", false, YamlParser::Scalar, [&cd](YamlParser *p) {
cd->flags.allowUnsignedPackages = p->parseScalar().toBool(); } },
+ { "allowUnknownUiClients", false, YamlParser::Scalar, [&cd](YamlParser *p) {
+ cd->flags.allowUnknownUiClients = p->parseScalar().toBool(); } },
}); } },
{ "wayland", false, YamlParser::Map, [&cd](YamlParser *p) {
p->parseFields({
@@ -1094,6 +1099,11 @@ bool Configuration::allowUnsignedPackages() const
return m_data->flags.allowUnsignedPackages;
}
+bool Configuration::allowUnknownUiClients() const
+{
+ return m_data->flags.allowUnknownUiClients;
+}
+
bool Configuration::noUiWatchdog() const
{
return value<bool>("no-ui-watchdog", m_data->flags.noUiWatchdog);