diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-01-20 22:46:19 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-01-20 22:46:39 +0100 |
| commit | d3f40bea1b424f60b178faf6bcb45927ce56e083 (patch) | |
| tree | e6b45cad5d67b5f6d9c2c88457da9f56c58c6a9c /src/virtualkeyboard/content/layouts_japanese.qrc | |
| parent | 5714b7dea100bb4874d17e2f422ff24752c17f18 (diff) | |
| parent | 1a9158bfbdd8dd01bac591c11bb0d0bf46514ddb (diff) | |
Merge remote-tracking branch 'origin/5.10' into dev
Conflicts:
.qmake.conf
Change-Id: I84cccac7024c1c48b6419838bb424e45cb2557d4
Diffstat (limited to 'src/virtualkeyboard/content/layouts_japanese.qrc')
| -rw-r--r-- | src/virtualkeyboard/content/layouts_japanese.qrc | 12 |
1 files changed, 0 insertions, 12 deletions
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> |