aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/kreadconfig/kreadconfig.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/kreadconfig/kreadconfig.cpp b/src/kreadconfig/kreadconfig.cpp
index a74bcbe8..9b5b0bd4 100644
--- a/src/kreadconfig/kreadconfig.cpp
+++ b/src/kreadconfig/kreadconfig.cpp
@@ -39,6 +39,7 @@ static KCmdLineOptions options[] =
{ "key <key>", I18N_NOOP("Key to look for"), 0 },
{ "default <default>", I18N_NOOP("Default value"), 0 },
{ "type <type>", I18N_NOOP("Type of variable"), 0 },
+ { "merged", I18N_NOOP("Ensure kiosk settings are honored (slow)"), "KDE" },
KCmdLineLastOption
};
int main(int argc, char **argv)
@@ -72,7 +73,7 @@ int main(int argc, char **argv)
konfig = KGlobal::config();
else
{
- konfig = new KConfig(file, true, false);
+ konfig = new KConfig(file, true, args->isSet("merged"));
configMustDeleted=true;
}
konfig->setGroup(group);