diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2016-08-27 11:59:57 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2016-08-27 11:59:57 +0000 |
| commit | 67f67f2cc6de160ddea4aa76afc56e86415ed99b (patch) | |
| tree | 215ffb3e3716db58360bcc1b09f36f49d5d2bf00 /src/quickcontrols2/qquickstyleplugin.cpp | |
| parent | b588ad9e45477a23d1ebd024a4b0a0ae49b7c7d5 (diff) | |
| parent | bbc9b308db0476d77a67e8c896883410d4660acf (diff) | |
Merge "Merge remote-tracking branch 'origin/5.7' into 5.8" into refs/staging/5.8v5.8.0-alpha1
Diffstat (limited to 'src/quickcontrols2/qquickstyleplugin.cpp')
| -rw-r--r-- | src/quickcontrols2/qquickstyleplugin.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/quickcontrols2/qquickstyleplugin.cpp b/src/quickcontrols2/qquickstyleplugin.cpp index 7f6e1323..3a4a0952 100644 --- a/src/quickcontrols2/qquickstyleplugin.cpp +++ b/src/quickcontrols2/qquickstyleplugin.cpp @@ -60,6 +60,11 @@ void QQuickStylePlugin::initializeEngine(QQmlEngine *engine, const char *uri) Q_UNUSED(engine); Q_UNUSED(uri); + // make sure not to re-create the proxy theme if initializeEngine() + // is called multiple times, like in case of qml2puppet (QTBUG-54995) + if (!m_theme.isNull()) + return; + const QString style = name(); if (!style.isEmpty() && style.compare(QQuickStyle::name(), Qt::CaseInsensitive) == 0) { m_theme.reset(createTheme()); |