diff options
author | Liang Qi <liang.qi@qt.io> | 2018-01-18 18:03:53 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2018-01-18 18:12:00 +0100 |
commit | 1a9158bfbdd8dd01bac591c11bb0d0bf46514ddb (patch) | |
tree | 9eaac1ebe4084af206560347508ab75f995940c3 | |
parent | e94108a9b45a5a972e9111a45a27476665484c82 (diff) | |
parent | e078c5e237142270f5d85a22a1e8adc969668695 (diff) |
Merge remote-tracking branch 'origin/5.9' into 5.10
Conflicts:
.qmake.conf
Change-Id: I817d5980ab3132256894b04ddc8daf79d8fc0495
-rw-r--r-- | .gitignore | 2 | ||||
-rw-r--r-- | dist/changes-5.9.4 | 25 | ||||
-rw-r--r-- | src/virtualkeyboard/content/layouts.qrc | 42 | ||||
-rw-r--r-- | src/virtualkeyboard/content/layouts_hangul.qrc | 12 | ||||
-rw-r--r-- | src/virtualkeyboard/content/layouts_japanese.qrc | 12 | ||||
-rw-r--r-- | src/virtualkeyboard/content/layouts_pinyin.qrc | 12 | ||||
-rw-r--r-- | src/virtualkeyboard/content/layouts_traditional_chinese.qrc | 12 |
7 files changed, 27 insertions, 90 deletions
@@ -35,3 +35,5 @@ Makefile* tst_* !tst_*.* tst_*.exe + +.DS_Store diff --git a/dist/changes-5.9.4 b/dist/changes-5.9.4 new file mode 100644 index 00000000..d49a42f5 --- /dev/null +++ b/dist/changes-5.9.4 @@ -0,0 +1,25 @@ +Qt 5.9.4 is a bug-fix release. It maintains both forward and backward +compatibility (source and binary) with Qt 5.9.0. + +For more details, refer to the online documentation included in this +distribution. The documentation is also available online: + +http://doc.qt.io/qt-5/index.html + +The Qt version 5.9 series is binary compatible with the 5.8.x series. +Applications compiled for 5.8 will continue to run with 5.9. + +Some of the changes listed in this file include issue tracking numbers +corresponding to tasks in the Qt Bug Tracker: + +https://bugreports.qt.io/ + +Each of these identifiers can be entered in the bug tracker to obtain more +information about a particular change. + +**************************************************************************** +* Qt 5.9.4 Changes * +**************************************************************************** + + - This release contains only minor code improvements. + 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> |