diff options
author | J-P Nurmi <jpnurmi@qt.io> | 2016-11-28 16:00:04 +0100 |
---|---|---|
committer | Jani Heikkinen <jani.heikkinen@qt.io> | 2016-12-15 10:48:53 +0000 |
commit | b1e9db69064fb7b30cdc3d9321c81684b2f56090 (patch) | |
tree | 40b2948c69ee57fa897b38bb7e6a8de78a2da510 /src/imports/controls/Container.qml | |
parent | cce0aadcd7a15f026c265b23b6e9dbe3310b70b1 (diff) |
Allow specifying a relative style path in qtquickcontrols2.conf
The style path is resolved relative to the location of config file.
Even though qtquickcontrols2.conf is normally located in the root of
resources, Quick Designer uses QT_QUICK_CONTROLS_CONF to set a custom
location for the preview, where the standard config location is not
feasible.
This patch extends the config and style lookup further by allowing
to specify a relative path to a custom style for the Quick Designer
preview.
This is a cherry-pick of 5efd4b6a61498f0668d7367d620275367894140e,
which fixes the style lookup so that QTBUG-57618 gets resolved.
Change-Id: I7b656c42cb6aca0914ad20c94c7b527bea74cb16
Task-number: QTBUG-57618
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'src/imports/controls/Container.qml')
0 files changed, 0 insertions, 0 deletions