diff options
author | J-P Nurmi <jpnurmi@gmail.com> | 2018-01-31 19:38:45 +0200 |
---|---|---|
committer | J-P Nurmi <jpnurmi@gmail.com> | 2018-01-31 19:39:19 +0200 |
commit | a73307c58cde0a4503a43be94f3892745f68500e (patch) | |
tree | 0d9aab78fa7e6c320a225dd1c69ff80ac8baaa2f /examples | |
parent | 3323ca8e627db560665edb667e52d52233c05601 (diff) | |
parent | 5d27e14e4ca49263d9c3309b5e93d4cb386063cc (diff) |
Merge remote-tracking branch 'origin/5.10' into 5.11
Change-Id: I7c0333dbf959124f6cf5be7837a305b65c08d290
Diffstat (limited to 'examples')
-rw-r--r-- | examples/quickcontrols2/imagine/automotive/qtquickcontrols2.conf | 2 | ||||
-rw-r--r-- | examples/quickcontrols2/imagine/musicplayer/qtquickcontrols2.conf | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/examples/quickcontrols2/imagine/automotive/qtquickcontrols2.conf b/examples/quickcontrols2/imagine/automotive/qtquickcontrols2.conf index c8bcdd40..c7fc7a61 100644 --- a/examples/quickcontrols2/imagine/automotive/qtquickcontrols2.conf +++ b/examples/quickcontrols2/imagine/automotive/qtquickcontrols2.conf @@ -2,7 +2,7 @@ Style=Imagine [Imagine] -Path=qrc:/imagine-assets +Path=:/imagine-assets [Imagine\Palette] Text=#6affcd diff --git a/examples/quickcontrols2/imagine/musicplayer/qtquickcontrols2.conf b/examples/quickcontrols2/imagine/musicplayer/qtquickcontrols2.conf index 2fc304eb..33eab6a5 100644 --- a/examples/quickcontrols2/imagine/musicplayer/qtquickcontrols2.conf +++ b/examples/quickcontrols2/imagine/musicplayer/qtquickcontrols2.conf @@ -2,7 +2,7 @@ Style=Imagine [Imagine] -Path=qrc:/imagine-assets +Path=:/imagine-assets [Imagine\Palette] Text=#6b7b89 |