aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2018-01-20 22:46:19 +0100
committerLiang Qi <liang.qi@qt.io>2018-01-20 22:46:39 +0100
commitd3f40bea1b424f60b178faf6bcb45927ce56e083 (patch)
treee6b45cad5d67b5f6d9c2c88457da9f56c58c6a9c
parent5714b7dea100bb4874d17e2f422ff24752c17f18 (diff)
parent1a9158bfbdd8dd01bac591c11bb0d0bf46514ddb (diff)
Merge remote-tracking branch 'origin/5.10' into dev
Conflicts: .qmake.conf Change-Id: I84cccac7024c1c48b6419838bb424e45cb2557d4
-rw-r--r--.gitignore2
-rw-r--r--dist/changes-5.10.056
-rw-r--r--dist/changes-5.9.324
-rw-r--r--dist/changes-5.9.425
-rw-r--r--src/virtualkeyboard/content/layouts.qrc42
-rw-r--r--src/virtualkeyboard/content/layouts_hangul.qrc12
-rw-r--r--src/virtualkeyboard/content/layouts_japanese.qrc12
-rw-r--r--src/virtualkeyboard/content/layouts_pinyin.qrc12
-rw-r--r--src/virtualkeyboard/content/layouts_traditional_chinese.qrc12
-rw-r--r--src/virtualkeyboard/doc/qtvirtualkeyboard.qdocconf3
-rw-r--r--src/virtualkeyboard/inputcontext.cpp2
-rw-r--r--tests/auto/inputpanel/BLACKLIST8
-rw-r--r--tests/auto/inputpanel/data/tst_inputpanel.qml4
13 files changed, 123 insertions, 91 deletions
diff --git a/.gitignore b/.gitignore
index 9bcb4a1..8f13f03 100644
--- a/.gitignore
+++ b/.gitignore
@@ -35,3 +35,5 @@ Makefile*
tst_*
!tst_*.*
tst_*.exe
+
+.DS_Store
diff --git a/dist/changes-5.10.0 b/dist/changes-5.10.0
new file mode 100644
index 0000000..129c825
--- /dev/null
+++ b/dist/changes-5.10.0
@@ -0,0 +1,56 @@
+Qt 5.10 introduces many new features and improvements as well as bugfixes
+over the 5.9.x series. 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.10 series is binary compatible with the 5.9.x series.
+Applications compiled for 5.9 will continue to run with 5.10.
+
+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.10.0 Changes *
+****************************************************************************
+
+New Features
+------------
+
+ - Added new component (InputModeKey) for input mode switch.
+
+New Keyboard Layouts
+--------------------
+
+ - Added Bulgarian keyboard layout.
+ - Added Croatian keyboard layout.
+ - Added Czech keyboard layout.
+ - Added Dutch keyboard layout.
+ - Added Estonian keyboard layout.
+ - Added Greek keyboard layout.
+ - Added Hebrew keyboard layout.
+ - Added Hungarian keyboard layout.
+ - Added Serbian keyboard layout.
+
+ Handwriting Recognition
+ -----------------------
+
+ - Added Arabic handwriting recognition.
+ - Added Farsi handwriting recognition.
+ - Added support for CJK (Chinese/Japanese/Korean) handwriting
+ via T9 Write.
+
+ Important Behavior Changes
+--------------------------
+
+ - Ensure the default value of Key.key property is uppercase.
+
+OpenWNN
+-------
+
+ - Fixed and optimized OpenWNN engine (Japanese keyboard input)
diff --git a/dist/changes-5.9.3 b/dist/changes-5.9.3
new file mode 100644
index 0000000..bb5db63
--- /dev/null
+++ b/dist/changes-5.9.3
@@ -0,0 +1,24 @@
+Qt 5.9.3 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.3 Changes *
+****************************************************************************
+
+ - This release contains only minor code improvements.
diff --git a/dist/changes-5.9.4 b/dist/changes-5.9.4
new file mode 100644
index 0000000..d49a42f
--- /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 b8ed28c..0000000
--- 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 610348a..0000000
--- 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 2d837f4..0000000
--- 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 fe451d0..0000000
--- 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 6fd7a20..0000000
--- 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>
diff --git a/src/virtualkeyboard/doc/qtvirtualkeyboard.qdocconf b/src/virtualkeyboard/doc/qtvirtualkeyboard.qdocconf
index 2698378..fbb0d46 100644
--- a/src/virtualkeyboard/doc/qtvirtualkeyboard.qdocconf
+++ b/src/virtualkeyboard/doc/qtvirtualkeyboard.qdocconf
@@ -13,6 +13,9 @@ excludedirs += ../content/layouts \
exampledirs += ../../../examples/virtualkeyboard \
snippets
examplesinstallpath = virtualkeyboard
+
+manifestmeta.highlighted.names = "QtVirtualKeyboard/Qt Quick Virtual Keyboard - Basic Example"
+
imagedirs += images
depends += qtdoc qtcore qtgui qtqml qtquick
diff --git a/src/virtualkeyboard/inputcontext.cpp b/src/virtualkeyboard/inputcontext.cpp
index 06521a4..2c2c8fc 100644
--- a/src/virtualkeyboard/inputcontext.cpp
+++ b/src/virtualkeyboard/inputcontext.cpp
@@ -560,7 +560,7 @@ bool InputContext::fileExists(const QUrl &fileUrl)
} else {
fileName = fileUrl.toLocalFile();
}
- return QFile::exists(fileName);
+ return !fileName.isEmpty() && QFile::exists(fileName);
#endif
}
diff --git a/tests/auto/inputpanel/BLACKLIST b/tests/auto/inputpanel/BLACKLIST
index b814578..462882f 100644
--- a/tests/auto/inputpanel/BLACKLIST
+++ b/tests/auto/inputpanel/BLACKLIST
@@ -4,3 +4,11 @@
[tst_plugin::test_wclAutoCommitWordSetting:row 0]
b2qt
+# QTBUG-65507
+[tst_plugin::test_inputMethodHints:row 8]
+b2qt
+
+# QTBUG-65507
+[tst_plugin::test_shiftCapsLock:row 1]
+b2qt
+
diff --git a/tests/auto/inputpanel/data/tst_inputpanel.qml b/tests/auto/inputpanel/data/tst_inputpanel.qml
index f9164f9..0b9f11f 100644
--- a/tests/auto/inputpanel/data/tst_inputpanel.qml
+++ b/tests/auto/inputpanel/data/tst_inputpanel.qml
@@ -1199,6 +1199,10 @@ Rectangle {
}
function test_hwrSpellCorrectionSuggestions(data) {
+ if (Qt.platform.pluginName === "offscreen") {
+ skip("QTBUG-65507");
+ }
+
prepareTest(data)
if (!inputPanel.setHandwritingMode(true))