Refactor resource paths

This change modifies the internal resource paths and makes them unique
in the global context to avoid conflict with the application namespace.

Change-Id: I72b17b744e07f5a94bb5ba99f3632d7f67b307ae
Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>

11 files changed, 12 insertions, 12 deletions

diff --git a/src/virtualkeyboard/content/components/Keyboard.qml b/src/virtualkeyboard/content/components/Keyboard.qml
index ea47ed44..9f5742cb 100644
--- a/src/virtualkeyboard/content/components/Keyboard.qml
+++ b/src/virtualkeyboard/content/components/Keyboard.qml
@@ -320,8 +320,8 @@ Item {
         id: layoutsModel
         nameFilters: ["$"]
         Component.onCompleted: {
-            if (InputContext.fileExists("qrc:/content/layouts"))
-                layoutsModel.folder = "qrc:/content/layouts"
+            if (InputContext.fileExists("qrc:/QtQuick/Enterprise/VirtualKeyboard/content/layouts"))
+                layoutsModel.folder = "qrc:/QtQuick/Enterprise/VirtualKeyboard/content/layouts"
             else
                 layoutsModel.folder = "../layouts"
         }
diff --git a/src/virtualkeyboard/content/content.qrc b/src/virtualkeyboard/content/content.qrc
index f302501b..ee406a73 100644
--- a/src/virtualkeyboard/content/content.qrc
+++ b/src/virtualkeyboard/content/content.qrc
@@ -1,5 +1,5 @@
 <RCC>
-    <qresource prefix="/content">
+    <qresource prefix="/QtQuick/Enterprise/VirtualKeyboard/content">
         <file>InputPanel.qml</file>
         <file>HandwritingInputPanel.qml</file>
         <file>components/AlternativeKeys.qml</file>
diff --git a/src/virtualkeyboard/content/layouts.qrc b/src/virtualkeyboard/content/layouts.qrc
index 4265a5cb..91d59b30 100644
--- a/src/virtualkeyboard/content/layouts.qrc
+++ b/src/virtualkeyboard/content/layouts.qrc
@@ -1,5 +1,5 @@
 <RCC>
-    <qresource prefix="/content">
+    <qresource prefix="/QtQuick/Enterprise/VirtualKeyboard/content">
         <file>layouts/ar_AR/digits.qml</file>
         <file>layouts/ar_AR/main.qml</file>
         <file>layouts/ar_AR/numbers.qml</file>
diff --git a/src/virtualkeyboard/content/layouts_hangul.qrc b/src/virtualkeyboard/content/layouts_hangul.qrc
index 4f3db948..a222c1b8 100644
--- a/src/virtualkeyboard/content/layouts_hangul.qrc
+++ b/src/virtualkeyboard/content/layouts_hangul.qrc
@@ -1,5 +1,5 @@
 <RCC>
-    <qresource prefix="/content">
+    <qresource prefix="/QtQuick/Enterprise/VirtualKeyboard/content">
         <file>layouts/ko_KR/main.qml</file>
         <file>layouts/ko_KR/symbols.qml</file>
         <file>layouts/en_GB/dialpad.qml</file>
diff --git a/src/virtualkeyboard/content/layouts_japanese.qrc b/src/virtualkeyboard/content/layouts_japanese.qrc
index 864e7f39..3b70168c 100644
--- a/src/virtualkeyboard/content/layouts_japanese.qrc
+++ b/src/virtualkeyboard/content/layouts_japanese.qrc
@@ -1,5 +1,5 @@
 <RCC>
-    <qresource prefix="/content">
+    <qresource prefix="/QtQuick/Enterprise/VirtualKeyboard/content">
         <file>layouts/ja_JP/main.qml</file>
         <file>layouts/ja_JP/symbols.qml</file>
         <file>layouts/en_GB/dialpad.qml</file>
diff --git a/src/virtualkeyboard/content/layouts_pinyin.qrc b/src/virtualkeyboard/content/layouts_pinyin.qrc
index 92afc65c..0b8bf8c0 100644
--- a/src/virtualkeyboard/content/layouts_pinyin.qrc
+++ b/src/virtualkeyboard/content/layouts_pinyin.qrc
@@ -1,5 +1,5 @@
 <RCC>
-    <qresource prefix="/content">
+    <qresource prefix="/QtQuick/Enterprise/VirtualKeyboard/content">
         <file>layouts/zh_CN/main.qml</file>
         <file>layouts/zh_CN/symbols.qml</file>
         <file>layouts/en_GB/dialpad.qml</file>
diff --git a/src/virtualkeyboard/content/layouts_traditional_chinese.qrc b/src/virtualkeyboard/content/layouts_traditional_chinese.qrc
index 6850cf84..98100014 100644
--- a/src/virtualkeyboard/content/layouts_traditional_chinese.qrc
+++ b/src/virtualkeyboard/content/layouts_traditional_chinese.qrc
@@ -1,5 +1,5 @@
 <RCC>
-    <qresource prefix="/content">
+    <qresource prefix="/QtQuick/Enterprise/VirtualKeyboard/content">
         <file>layouts/zh_TW/main.qml</file>
         <file>layouts/zh_TW/symbols.qml</file>
         <file>layouts/en_GB/dialpad.qml</file>
diff --git a/src/virtualkeyboard/content/styles/default/default_style.qrc b/src/virtualkeyboard/content/styles/default/default_style.qrc
index c6762b54..ef2f2bfa 100644
--- a/src/virtualkeyboard/content/styles/default/default_style.qrc
+++ b/src/virtualkeyboard/content/styles/default/default_style.qrc
@@ -1,5 +1,5 @@
 <RCC>
-    <qresource prefix="/content/styles/default">
+    <qresource prefix="/QtQuick/Enterprise/VirtualKeyboard/content/styles/default">
         <file>style.qml</file>
         <file>images/backspace-868482.svg</file>
         <file>images/check-868482.svg</file>
diff --git a/src/virtualkeyboard/content/styles/default/style.qml b/src/virtualkeyboard/content/styles/default/style.qml
index a3e47da9..d81b6c3a 100644
--- a/src/virtualkeyboard/content/styles/default/style.qml
+++ b/src/virtualkeyboard/content/styles/default/style.qml
@@ -30,7 +30,7 @@ KeyboardStyle {
     readonly property real keyBackgroundMargin: Math.round(13 * scaleHint)
     readonly property real keyContentMargin: Math.round(45 * scaleHint)
     readonly property real keyIconScale: scaleHint * 0.6
-    readonly property string resourcePrefix: "qrc:/content/styles/default/"
+    readonly property string resourcePrefix: "qrc:/QtQuick/Enterprise/VirtualKeyboard/content/styles/default/"
 
     readonly property string inputLocale: InputContext.locale
     property color inputLocaleIndicatorColor: "white"
diff --git a/src/virtualkeyboard/content/styles/retro/retro_style.qrc b/src/virtualkeyboard/content/styles/retro/retro_style.qrc
index 0de3a9f9..2a8f0aa8 100644
--- a/src/virtualkeyboard/content/styles/retro/retro_style.qrc
+++ b/src/virtualkeyboard/content/styles/retro/retro_style.qrc
@@ -1,5 +1,5 @@
 <RCC>
-    <qresource prefix="/content/styles/retro">
+    <qresource prefix="/QtQuick/Enterprise/VirtualKeyboard/content/styles/retro">
         <file>style.qml</file>
         <file>images/key154px_black.png</file>
         <file>images/key154px_black_long.png</file>
diff --git a/src/virtualkeyboard/content/styles/retro/style.qml b/src/virtualkeyboard/content/styles/retro/style.qml
index 08680bd2..ebe9d343 100644
--- a/src/virtualkeyboard/content/styles/retro/style.qml
+++ b/src/virtualkeyboard/content/styles/retro/style.qml
@@ -30,7 +30,7 @@ KeyboardStyle {
     readonly property real keyBackgroundMargin: Math.round(9 * scaleHint)
     readonly property real keyContentMargin: Math.round(50 * scaleHint)
     readonly property real keyIconScale: scaleHint * 0.6
-    readonly property string resourcePath: "content/styles/retro/"
+    readonly property string resourcePath: "QtQuick/Enterprise/VirtualKeyboard/content/styles/retro/"
     readonly property string resourcePrefix: "qrc:/" + resourcePath
 
     readonly property string inputLocale: InputContext.locale