diff options
| author | Mitch Curtis <mitch.curtis@qt.io> | 2017-09-13 11:32:27 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2017-09-14 09:05:26 +0000 |
| commit | 7cbf3685565d7f62c9a01b090a4c1600b4abe220 (patch) | |
| tree | 20baffc826c01b9695d2d104c07b78f5196cf9c0 /src/imports/controls/imagine/Slider.qml | |
| parent | c829b2a8b4e80cf9b829b3ead0a69722c1b04a1a (diff) | |
Imagine: fix QRC paths
Using ApplicationWindow as an example, its NinePatchImage url is
assigned like so:
source: Imagine.path + "applicationwindow-background"
If Imagine.path is set to ":/images" by the user, then the final URL
would be:
QUrl("file:///home/user/qt/qtbase/qml/QtQuick/Controls.2/Imagine/:/images/applicationwindow-background")
We could use a QUrl for QQuickImagineStyle::path, but we don't
want to support anything other than local paths. Instead, we add
a private "url" property that returns a URL that we construct
correctly in C++ ourselves, and then the Imagine QML controls files
use that property.
Change-Id: Ic4d1910bbc7f7b6f80f257496ae6131777a19401
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
Diffstat (limited to 'src/imports/controls/imagine/Slider.qml')
| -rw-r--r-- | src/imports/controls/imagine/Slider.qml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/imports/controls/imagine/Slider.qml b/src/imports/controls/imagine/Slider.qml index 3d369865..af927806 100644 --- a/src/imports/controls/imagine/Slider.qml +++ b/src/imports/controls/imagine/Slider.qml @@ -56,7 +56,7 @@ T.Slider { x: control.leftPadding + (control.horizontal ? control.visualPosition * (control.availableWidth - width) : (control.availableWidth - width) / 2) y: control.topPadding + (control.horizontal ? (control.availableHeight - height) / 2 : control.visualPosition * (control.availableHeight - height)) - source: Imagine.path + "slider-handle" + source: Imagine.url + "slider-handle" ImageSelector on source { states: [ {"vertical": control.vertical}, @@ -76,7 +76,7 @@ T.Slider { height: control.height + topInset + bottomInset scale: control.horizontal && control.mirrored ? -1 : 1 - source: Imagine.path + "slider-background" + source: Imagine.url + "slider-background" NinePatchImageSelector on source { states: [ {"vertical": control.vertical}, @@ -101,7 +101,7 @@ T.Slider { ? control.handle.height / 2 + control.position * (parent.height - control.handle.height) : parent.height - source: Imagine.path + "slider-progress" + source: Imagine.url + "slider-progress" NinePatchImageSelector on source { states: [ {"vertical": control.vertical}, |