diff options
| author | J-P Nurmi <jpnurmi@theqtcompany.com> | 2015-12-01 18:05:05 +0100 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@theqtcompany.com> | 2015-12-02 16:16:45 +0000 |
| commit | cd4467753105e69b967d3aad8e6d890609dc830b (patch) | |
| tree | 56633d70f422fde85741382ab4fde847de78c7e7 /src/controls/qquickstyleselector_p_p.h | |
| parent | 4d05ededdd5730af746b6c5dd5f7625ff80533d4 (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/controls/qquickstyleselector_p_p.h')
| -rw-r--r-- | src/controls/qquickstyleselector_p_p.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/controls/qquickstyleselector_p_p.h b/src/controls/qquickstyleselector_p_p.h index bf11fd1c..b0de326b 100644 --- a/src/controls/qquickstyleselector_p_p.h +++ b/src/controls/qquickstyleselector_p_p.h @@ -60,15 +60,14 @@ struct QQuickStyleSelectorSharedData //Not QSharedData because currently is just QStringList preloadedStatics; }; -class QQuickStyleSelectorPrivate : QObjectPrivate +class QQuickStyleSelectorPrivate { - Q_DECLARE_PUBLIC(QQuickStyleSelector) public: static void updateSelectors(); static QStringList platformSelectors(); static void addStatics(const QStringList &); //For loading GUI statics from other Qt modules QQuickStyleSelectorPrivate(); - QString select(const QString &filePath) const; + QString select(const QString &filePath, const QStringList &allSelectors) const; QString style; QUrl baseUrl; |