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/Dialog.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/Dialog.qml')
| -rw-r--r-- | src/imports/controls/imagine/Dialog.qml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/imports/controls/imagine/Dialog.qml b/src/imports/controls/imagine/Dialog.qml index 80dd0896..e7a8cce5 100644 --- a/src/imports/controls/imagine/Dialog.qml +++ b/src/imports/controls/imagine/Dialog.qml @@ -65,7 +65,7 @@ T.Dialog { width: control.width + leftInset + rightInset height: control.height + topInset + bottomInset - source: Imagine.path + "dialog-background" + source: Imagine.url + "dialog-background" NinePatchImageSelector on source { states: [ {"modal": control.modal}, @@ -85,7 +85,7 @@ T.Dialog { width: parent.width height: parent.height - source: Imagine.path + "dialog-title" + source: Imagine.url + "dialog-title" NinePatchImageSelector on source { states: [ {"modal": control.modal}, @@ -100,7 +100,7 @@ T.Dialog { } T.Overlay.modal: NinePatchImage { - source: Imagine.path + "dialog-overlay" + source: Imagine.url + "dialog-overlay" NinePatchImageSelector on source { states: [ {"modal": true} @@ -109,7 +109,7 @@ T.Dialog { } T.Overlay.modeless: NinePatchImage { - source: Imagine.path + "dialog-overlay" + source: Imagine.url + "dialog-overlay" NinePatchImageSelector on source { states: [ {"modal": false} |