Merge remote-tracking branch 'origin/5.9' into 5.10

 Conflicts:
	.qmake.conf

Change-Id: I817d5980ab3132256894b04ddc8daf79d8fc0495

5 files changed, 0 insertions, 90 deletions

diff --git a/src/virtualkeyboard/content/layouts.qrc b/src/virtualkeyboard/content/layouts.qrc
deleted file mode 100644
index b8ed28cd..00000000
--- a/src/virtualkeyboard/content/layouts.qrc
+++ /dev/null
@@ -1,42 +0,0 @@
-<RCC>
-    <qresource prefix="/QtQuick/VirtualKeyboard/content">
-        <file>layouts/ar_AR/digits.qml</file>
-        <file>layouts/ar_AR/main.qml</file>
-        <file>layouts/ar_AR/numbers.qml</file>
-        <file>layouts/ar_AR/symbols.qml</file>
-        <file>layouts/da_DK/main.qml</file>
-        <file>layouts/da_DK/symbols.qml</file>
-        <file>layouts/de_DE/main.qml</file>
-        <file>layouts/de_DE/symbols.qml</file>
-        <file>layouts/en_GB/dialpad.qml</file>
-        <file>layouts/en_GB/digits.qml</file>
-        <file>layouts/en_GB/handwriting.qml</file>
-        <file>layouts/en_GB/main.qml</file>
-        <file>layouts/en_GB/numbers.qml</file>
-        <file>layouts/en_GB/symbols.qml</file>
-        <file>layouts/es_ES/main.qml</file>
-        <file>layouts/es_ES/symbols.qml</file>
-        <file>layouts/fa_FA/digits.qml</file>
-        <file>layouts/fa_FA/main.qml</file>
-        <file>layouts/fa_FA/numbers.qml</file>
-        <file>layouts/fa_FA/symbols.qml</file>
-        <file>layouts/fi_FI/main.qml</file>
-        <file>layouts/fi_FI/symbols.qml</file>
-        <file>layouts/fr_FR/main.qml</file>
-        <file>layouts/fr_FR/symbols.qml</file>
-        <file>layouts/hi_IN/main.qml</file>
-        <file>layouts/hi_IN/symbols.qml</file>
-        <file>layouts/it_IT/main.qml</file>
-        <file>layouts/it_IT/symbols.qml</file>
-        <file>layouts/nb_NO/main.qml</file>
-        <file>layouts/nb_NO/symbols.qml</file>
-        <file>layouts/pl_PL/main.qml</file>
-        <file>layouts/pl_PL/symbols.qml</file>
-        <file>layouts/pt_PT/main.qml</file>
-        <file>layouts/pt_PT/symbols.qml</file>
-        <file>layouts/ru_RU/main.qml</file>
-        <file>layouts/ru_RU/symbols.qml</file>
-        <file>layouts/sv_SE/main.qml</file>
-        <file>layouts/sv_SE/symbols.qml</file>
-    </qresource>
-</RCC>
diff --git a/src/virtualkeyboard/content/layouts_hangul.qrc b/src/virtualkeyboard/content/layouts_hangul.qrc
deleted file mode 100644
index 610348ab..00000000
--- a/src/virtualkeyboard/content/layouts_hangul.qrc
+++ /dev/null
@@ -1,12 +0,0 @@
-<RCC>
-    <qresource prefix="/QtQuick/VirtualKeyboard/content">
-        <file>layouts/ko_KR/main.qml</file>
-        <file>layouts/ko_KR/symbols.qml</file>
-        <file>layouts/en_GB/dialpad.qml</file>
-        <file>layouts/en_GB/digits.qml</file>
-        <file>layouts/en_GB/handwriting.qml</file>
-        <file>layouts/en_GB/main.qml</file>
-        <file>layouts/en_GB/numbers.qml</file>
-        <file>layouts/en_GB/symbols.qml</file>
-    </qresource>
-</RCC>
diff --git a/src/virtualkeyboard/content/layouts_japanese.qrc b/src/virtualkeyboard/content/layouts_japanese.qrc
deleted file mode 100644
index 2d837f4e..00000000
--- a/src/virtualkeyboard/content/layouts_japanese.qrc
+++ /dev/null
@@ -1,12 +0,0 @@
-<RCC>
-    <qresource prefix="/QtQuick/VirtualKeyboard/content">
-        <file>layouts/ja_JP/main.qml</file>
-        <file>layouts/ja_JP/symbols.qml</file>
-        <file>layouts/en_GB/dialpad.qml</file>
-        <file>layouts/en_GB/digits.qml</file>
-        <file>layouts/en_GB/handwriting.qml</file>
-        <file>layouts/en_GB/main.qml</file>
-        <file>layouts/en_GB/numbers.qml</file>
-        <file>layouts/en_GB/symbols.qml</file>
-    </qresource>
-</RCC>
diff --git a/src/virtualkeyboard/content/layouts_pinyin.qrc b/src/virtualkeyboard/content/layouts_pinyin.qrc
deleted file mode 100644
index fe451d0c..00000000
--- a/src/virtualkeyboard/content/layouts_pinyin.qrc
+++ /dev/null
@@ -1,12 +0,0 @@
-<RCC>
-    <qresource prefix="/QtQuick/VirtualKeyboard/content">
-        <file>layouts/zh_CN/main.qml</file>
-        <file>layouts/zh_CN/symbols.qml</file>
-        <file>layouts/en_GB/dialpad.qml</file>
-        <file>layouts/en_GB/digits.qml</file>
-        <file>layouts/en_GB/handwriting.qml</file>
-        <file>layouts/en_GB/main.qml</file>
-        <file>layouts/en_GB/numbers.qml</file>
-        <file>layouts/en_GB/symbols.qml</file>
-    </qresource>
-</RCC>
diff --git a/src/virtualkeyboard/content/layouts_traditional_chinese.qrc b/src/virtualkeyboard/content/layouts_traditional_chinese.qrc
deleted file mode 100644
index 6fd7a208..00000000
--- a/src/virtualkeyboard/content/layouts_traditional_chinese.qrc
+++ /dev/null
@@ -1,12 +0,0 @@
-<RCC>
-    <qresource prefix="/QtQuick/VirtualKeyboard/content">
-        <file>layouts/zh_TW/main.qml</file>
-        <file>layouts/zh_TW/symbols.qml</file>
-        <file>layouts/en_GB/dialpad.qml</file>
-        <file>layouts/en_GB/digits.qml</file>
-        <file>layouts/en_GB/handwriting.qml</file>
-        <file>layouts/en_GB/main.qml</file>
-        <file>layouts/en_GB/numbers.qml</file>
-        <file>layouts/en_GB/symbols.qml</file>
-    </qresource>
-</RCC>