summaryrefslogtreecommitdiffstats
path: root/examples/applicationmanager/custom-appman/custom-appman.cpp
diff options
context:
space:
mode:
authorRobert Griebl <robert.griebl@qt.io>2020-09-08 17:10:13 +0200
committerRobert Griebl <robert.griebl@qt.io>2020-09-24 08:17:50 +0200
commit5b0efa000260fb993016c396ddf7421cb024f4c3 (patch)
tree787f199c6b3af3b1cb425dff09390a89fe0f6f1a /examples/applicationmanager/custom-appman/custom-appman.cpp
parent01102cbf25e6479192a59e23e68165d81f365420 (diff)
Fix lists not being merged when using multiple config files
Also adds a complete auto-test to not only test the generic, low-level YAML parsing and merging, but also the concrete implementation in Configuration. Change-Id: Idd7057af39423a57aa7b5100b41cb7c34a0da336 Task-number: AUTOSUITE-1620 Reviewed-by: Bernd Weimer <bernd.weimer@pelagicore.com>
Diffstat (limited to 'examples/applicationmanager/custom-appman/custom-appman.cpp')
-rw-r--r--examples/applicationmanager/custom-appman/custom-appman.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/examples/applicationmanager/custom-appman/custom-appman.cpp b/examples/applicationmanager/custom-appman/custom-appman.cpp
index 924afadd..0220991b 100644
--- a/examples/applicationmanager/custom-appman/custom-appman.cpp
+++ b/examples/applicationmanager/custom-appman/custom-appman.cpp
@@ -74,7 +74,7 @@ Q_DECL_EXPORT int main(int argc, char *argv[])
Main a(argc, argv);
Configuration cfg;
- cfg.parse();
+ cfg.parseWithArguments(QCoreApplication::arguments());
a.setup(&cfg);
a.loadQml(cfg.loadDummyData());