diff options
| author | J-P Nurmi <jpnurmi@theqtcompany.com> | 2015-12-14 16:20:45 +0100 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@theqtcompany.com> | 2015-12-14 16:03:45 +0000 |
| commit | 8c3316aeea5f061e5b1be5605d69b8777345dd98 (patch) | |
| tree | c2dda31267eb1da0df71d2af91338694f79d132e /src/controls/qquickstyleselector.cpp | |
| parent | cd0c04c630b6924d444f0e84e1b63477e4346aeb (diff) | |
Remove QQuickStyleSelector::instance()
It was a bad idea to share the same instance, because non-thread-safe
instance() ends up being called from multiple threads. Let the style
plugins create their own instances instead, QQuickStyleSelector ctor
is not that heavy and there's no such shared state as originally was
anticipated.
Change-Id: Ie23091c6dd50f5d7abbab3b996da4471054da89a
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
Diffstat (limited to 'src/controls/qquickstyleselector.cpp')
| -rw-r--r-- | src/controls/qquickstyleselector.cpp | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/src/controls/qquickstyleselector.cpp b/src/controls/qquickstyleselector.cpp index 8c67cdce..61d7136e 100644 --- a/src/controls/qquickstyleselector.cpp +++ b/src/controls/qquickstyleselector.cpp @@ -179,12 +179,6 @@ QUrl QQuickStyleSelector::baseUrl() const return d->baseUrl; } -QQuickStyleSelector *QQuickStyleSelector::instance() -{ - static QQuickStyleSelector self; - return &self; -} - void QQuickStyleSelectorPrivate::updateSelectors() { if (!sharedData->staticSelectors.isEmpty()) |