aboutsummaryrefslogtreecommitdiffstats
path: root/src/imports/controls/qtlabscontrolsplugin.cpp
diff options
context:
space:
mode:
authorJ-P Nurmi <jpnurmi@theqtcompany.com>2015-12-01 18:05:05 +0100
committerJ-P Nurmi <jpnurmi@theqtcompany.com>2015-12-02 16:16:45 +0000
commitcd4467753105e69b967d3aad8e6d890609dc830b (patch)
tree56633d70f422fde85741382ab4fde847de78c7e7 /src/imports/controls/qtlabscontrolsplugin.cpp
parent4d05ededdd5730af746b6c5dd5f7625ff80533d4 (diff)
QQuickStyleSelector: don't inherit QObject
Fixes the "QObject: Cannot create children for a parent that is in a different thread." -warnings. Change-Id: I94ed34c6c4c7a6b6507e91e74a354630b0ad6d04 Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
Diffstat (limited to 'src/imports/controls/qtlabscontrolsplugin.cpp')
-rw-r--r--src/imports/controls/qtlabscontrolsplugin.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/imports/controls/qtlabscontrolsplugin.cpp b/src/imports/controls/qtlabscontrolsplugin.cpp
index 39525ee6..079d843d 100644
--- a/src/imports/controls/qtlabscontrolsplugin.cpp
+++ b/src/imports/controls/qtlabscontrolsplugin.cpp
@@ -64,7 +64,7 @@ void QtLabsControlsPlugin::registerTypes(const char *uri)
qmlRegisterType<QQuickButtonGroupAttached>();
// TODO: read the style from application manifest file
- QQuickStyleSelector *selector = QQuickStyleSelector::instance(this);
+ QQuickStyleSelector *selector = QQuickStyleSelector::instance();
selector->setBaseUrl(baseUrl());
qmlRegisterType(selector->select(QStringLiteral("/ApplicationWindow.qml")), uri, 1, 0, "ApplicationWindow");