diff options
| author | Robert Griebl <robert.griebl@qt.io> | 2021-02-10 15:53:41 +0100 |
|---|---|---|
| committer | Robert Griebl <robert.griebl@qt.io> | 2021-04-23 12:22:13 +0000 |
| commit | 0f8d4513c0ad7423d1643385049afd70fa9b30ce (patch) | |
| tree | 057a994953f639a0ef506ab8964b5a6cd5896268 /src/main-lib | |
| parent | d744705d5498c38ede36dbbdaade2b0ab7046ae9 (diff) | |
| download | qtapplicationmanager-0f8d4513c0ad7423d1643385049afd70fa9b30ce.tar.gz | |
Ignore unparseable info.yaml manifest file
Otherwise a broken 3rd party manifest could prevent the startup of the
system-ui. This is a regression that was introduced when we implemented
the caching mechanism for manifests.
Change-Id: I723a2fa741afff95fbe7f54b46cbed61ecc5b37e
Pick-to: 5.15
Reviewed-by: Dominik Holland <dominik.holland@qt.io>
Diffstat (limited to 'src/main-lib')
| -rw-r--r-- | src/main-lib/configuration.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/main-lib/configuration.cpp b/src/main-lib/configuration.cpp index 7d85eff5..be364f4f 100644 --- a/src/main-lib/configuration.cpp +++ b/src/main-lib/configuration.cpp @@ -332,6 +332,8 @@ void Configuration::parseWithArguments(const QStringList &arguments) try { cache.parse(); m_data.reset(cache.takeMergedResult()); + if (m_data.isNull()) + m_data.reset(new ConfigurationData()); } catch (const Exception &e) { showParserMessage(e.errorString() + qL1C('\n'), ErrorMessage); exit(1); |