diff options
| author | Jochen Seemann <seemann.jochen@gmail.com> | 2015-03-09 23:43:20 +0100 |
|---|---|---|
| committer | Jochen Seemann <seemann.jochen@gmail.com> | 2015-04-07 15:37:45 +0000 |
| commit | e1218178f40b9e644184d3ac56e18311e084c951 (patch) | |
| tree | b783bbda0b6e352f54aca4a35d336732f2cff2dd /src/controls/Private/qquickcontrolsettings.cpp | |
| parent | 074daa9195f41326513e6b92cf0e7c365e4bd2ce (diff) | |
| download | qtquickcontrols-e1218178f40b9e644184d3ac56e18311e084c951.tar.gz | |
WinRT: fix style loading from plugin/library
qt_quick_controls_style_path doesn't store the complete path to
the style dir on WinRT. Since f0c227f8a9a5c5e3ed83f86702626092457175aa,
m_name (="WinRT") is not appended anymore. Also, m_path is not
set when loading style from a plugin/library.
Task-number: QTBUG-44880
Change-Id: I4e5c6503984e70cb9ad74e57e0f1c5a63211f510
Reviewed-by: Andrew Knight <qt@panimo.net>
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@theqtcompany.com>
Diffstat (limited to 'src/controls/Private/qquickcontrolsettings.cpp')
| -rw-r--r-- | src/controls/Private/qquickcontrolsettings.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/controls/Private/qquickcontrolsettings.cpp b/src/controls/Private/qquickcontrolsettings.cpp index 0c76d8c4..d683ddf0 100644 --- a/src/controls/Private/qquickcontrolsettings.cpp +++ b/src/controls/Private/qquickcontrolsettings.cpp @@ -239,6 +239,7 @@ bool QQuickControlSettings::resolveCurrentStylePath() if (pathFunc) { styleData.m_styleDirPath = QString::fromLocal8Bit(pathFunc()); m_styleMap[m_name] = styleData; + m_path = styleData.m_styleDirPath; } return true; |