diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-03-20 03:00:43 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-03-20 03:00:43 +0100 |
| commit | ffc64f07ade1d3c80e7d20e4f73210cca2b1181a (patch) | |
| tree | 270b28c670c9a9e8ecdc124f018177c8dc39a56a /src/quickcontrols2 | |
| parent | 7dbe1348cc7270a28026b012610f5a2bbe7ae429 (diff) | |
| parent | ce5b33c350cb7aa4a649088d85e48be08b632b69 (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: I69ada9110df30ea5f20710a2d1e6ac6b6a448b21
Diffstat (limited to 'src/quickcontrols2')
| -rw-r--r-- | src/quickcontrols2/qquickstyle.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/quickcontrols2/qquickstyle.cpp b/src/quickcontrols2/qquickstyle.cpp index 967cf6f0..90e2d897 100644 --- a/src/quickcontrols2/qquickstyle.cpp +++ b/src/quickcontrols2/qquickstyle.cpp @@ -323,7 +323,8 @@ void QQuickStylePrivate::init(const QUrl &baseUrl) void QQuickStylePrivate::reset() { - styleSpec()->reset(); + if (styleSpec()) + styleSpec()->reset(); } QString QQuickStylePrivate::configFilePath() |