diff options
| author | David Faure <david.faure@kdab.com> | 2016-06-18 15:21:24 +0200 |
|---|---|---|
| committer | David Faure <david.faure@kdab.com> | 2016-07-06 17:20:28 +0000 |
| commit | 0ea4a2cd207540c6936c6cf16bc5b371d6bcd09d (patch) | |
| tree | ce738f1f7cd0696229d0454b64891ed27b19b0d0 /src/controls/Private/qquickcontrolsettings_p.h | |
| parent | 535f520685c2af471fd5d8d83da95f4321f171bb (diff) | |
| download | qtquickcontrols-0ea4a2cd207540c6936c6cf16bc5b371d6bcd09d.tar.gz | |
Find custom styles stored in qrc.
The unittest was showing that it was looking in
<CURRENTDIR>/qrc:/qt-project.org/imports/QtQuick/Controls/Styles
which makes no sense.
In addition, the code was only listing the directory where
the default style is found. When the custom style is elsewhere,
it needs to be looked up in addition.
Change-Id: I93eddab73672c575cd92037e1d0b366cf17540ef
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
Diffstat (limited to 'src/controls/Private/qquickcontrolsettings_p.h')
| -rw-r--r-- | src/controls/Private/qquickcontrolsettings_p.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/controls/Private/qquickcontrolsettings_p.h b/src/controls/Private/qquickcontrolsettings_p.h index aa3e4b2d..bfa44f2f 100644 --- a/src/controls/Private/qquickcontrolsettings_p.h +++ b/src/controls/Private/qquickcontrolsettings_p.h @@ -106,6 +106,7 @@ private: QString m_name; QString m_path; QHash<QString, StyleData> m_styleMap; + QQmlEngine *m_engine; }; QT_END_NAMESPACE |