aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.qmake.conf2
-rw-r--r--dist/changes-5.13.018
-rw-r--r--dist/changes-5.13.120
-rw-r--r--src/import/import.pro2
-rw-r--r--src/import/plugins.qmltypes3
-rw-r--r--src/import/qtquickvirtualkeyboardplugin.cpp4
-rw-r--r--src/plugins/tcime/3rdparty/tcime/cangjiedictionary.cpp4
-rw-r--r--src/plugins/tcime/3rdparty/tcime/phrasedictionary.cpp4
-rw-r--r--src/settings/plugins.qmltypes2
-rw-r--r--src/settings/qtquickvirtualkeyboardsettingsplugin.cpp3
-rw-r--r--src/settings/settings.pro2
-rw-r--r--src/styles/plugins.qmltypes2
-rw-r--r--src/styles/qtquickvirtualkeyboardstylesplugin.cpp11
-rw-r--r--src/styles/styles.pro2
-rw-r--r--src/virtualkeyboard/doc/qtvirtualkeyboard.qdocconf1
-rw-r--r--src/virtualkeyboard/doc/src/qtvirtualkeyboard-index.qdoc12
-rw-r--r--src/virtualkeyboard/qvirtualkeyboardinputengine.cpp2
-rw-r--r--src/virtualkeyboard/qvirtualkeyboardselectionlistmodel.cpp9
-rw-r--r--src/virtualkeyboard/virtualkeyboardsettings.cpp8
19 files changed, 79 insertions, 32 deletions
diff --git a/.qmake.conf b/.qmake.conf
index b5454e50..cf9ee7e3 100644
--- a/.qmake.conf
+++ b/.qmake.conf
@@ -1,3 +1,3 @@
load(qt_build_config)
-MODULE_VERSION = 5.12.5
+MODULE_VERSION = 5.13.1 \ No newline at end of file
diff --git a/dist/changes-5.13.0 b/dist/changes-5.13.0
new file mode 100644
index 00000000..ebb4be18
--- /dev/null
+++ b/dist/changes-5.13.0
@@ -0,0 +1,18 @@
+Qt 5.13 introduces many new features and improvements as well as bugfixes
+over the 5.12.x series. For more details, refer to the online documentation
+included in this distribution. The documentation is also available online:
+
+https://doc.qt.io/qt-5/index.html
+
+The Qt version 5.13 series is binary compatible with the 5.12.x series.
+Applications compiled for 5.12 will continue to run with 5.13.
+
+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.
+
+ - This release contains only minor code improvements.
diff --git a/dist/changes-5.13.1 b/dist/changes-5.13.1
new file mode 100644
index 00000000..57ebdbeb
--- /dev/null
+++ b/dist/changes-5.13.1
@@ -0,0 +1,20 @@
+Qt 5.13.1 is a bug-fix release. It maintains both forward and backward
+compatibility (source and binary) with Qt 5.13.0.
+
+For more details, refer to the online documentation included in this
+distribution. The documentation is also available online:
+
+https://doc.qt.io/qt-5/index.html
+
+The Qt version 5.13 series is binary compatible with the 5.12.x series.
+Applications compiled for 5.12 will continue to run with 5.13.
+
+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.
+
+ - This release contains only minor code improvements.
diff --git a/src/import/import.pro b/src/import/import.pro
index c1045ffc..297efde4 100644
--- a/src/import/import.pro
+++ b/src/import/import.pro
@@ -1,6 +1,6 @@
TARGET = qtquickvirtualkeyboardplugin
TARGETPATH = QtQuick/VirtualKeyboard
-IMPORT_VERSION = 2.4
+IMPORT_VERSION = 2.$$QT_MINOR_VERSION
QT += qml quick virtualkeyboard-private
CONFIG += no_cxx_module
diff --git a/src/import/plugins.qmltypes b/src/import/plugins.qmltypes
index 6614d9c4..9edd38c8 100644
--- a/src/import/plugins.qmltypes
+++ b/src/import/plugins.qmltypes
@@ -4,7 +4,7 @@ import QtQuick.tooling 1.2
// It is used for QML tooling purposes only.
//
// This file was auto-generated by:
-// 'qmlplugindump -defaultplatform -nonrelocatable -dependencies dependencies.json QtQuick.VirtualKeyboard 2.4'
+// 'qmlplugindump -defaultplatform -nonrelocatable -dependencies dependencies.json QtQuick.VirtualKeyboard 2.13'
Module {
dependencies: [
@@ -39,6 +39,7 @@ Module {
Property { name: "cursorRectangle"; type: "QRectF"; isReadonly: true }
Property { name: "animating"; type: "bool" }
Property { name: "locale"; type: "string"; isReadonly: true }
+ Property { name: "inputItem"; type: "QObject"; isReadonly: true; isPointer: true }
Property {
name: "inputEngine"
type: "QVirtualKeyboardInputEngine"
diff --git a/src/import/qtquickvirtualkeyboardplugin.cpp b/src/import/qtquickvirtualkeyboardplugin.cpp
index 969884c2..ba866023 100644
--- a/src/import/qtquickvirtualkeyboardplugin.cpp
+++ b/src/import/qtquickvirtualkeyboardplugin.cpp
@@ -145,8 +145,8 @@ void QtQuickVirtualKeyboardPlugin::registerTypes(const char *uri)
qmlRegisterType(QUrl(componentsPath + QLatin1String("SelectionControl.qml")), uri, 2, 1, "SelectionControl");
qmlRegisterType(QUrl(componentsPath + QLatin1String("InputModeKey.qml")), uri, 2, 3, "InputModeKey");
- // New revisions in 5.12.
- qmlRegisterSingletonType<QVirtualKeyboardInputContext>(uri, 2, 4, "InputContext", createInputContextModule);
+ // Auto-increment the import to stay in sync with ALL future QtQuick minor versions
+ qmlRegisterModule(uri, 2, QT_VERSION_MINOR);
}
QT_END_NAMESPACE
diff --git a/src/plugins/tcime/3rdparty/tcime/cangjiedictionary.cpp b/src/plugins/tcime/3rdparty/tcime/cangjiedictionary.cpp
index 7326b839..b02c8fef 100644
--- a/src/plugins/tcime/3rdparty/tcime/cangjiedictionary.cpp
+++ b/src/plugins/tcime/3rdparty/tcime/cangjiedictionary.cpp
@@ -111,8 +111,8 @@ QStringList CangjieDictionary::searchWords(int secondaryIndex, const DictionaryE
DictionaryEntry::ConstIterator start = data.constBegin();
DictionaryEntry::ConstIterator end = start + length;
- DictionaryEntry::ConstIterator rangeStart = qBinaryFind(start, end, (DictionaryWord)secondaryIndex);
- if (rangeStart == end)
+ DictionaryEntry::ConstIterator rangeStart = std::lower_bound(start, end, (DictionaryWord)secondaryIndex);
+ if (rangeStart == end || *rangeStart != secondaryIndex)
return QStringList();
// There may be more than one words with the same index; look up words with
diff --git a/src/plugins/tcime/3rdparty/tcime/phrasedictionary.cpp b/src/plugins/tcime/3rdparty/tcime/phrasedictionary.cpp
index cdeaecdd..6bc62d84 100644
--- a/src/plugins/tcime/3rdparty/tcime/phrasedictionary.cpp
+++ b/src/plugins/tcime/3rdparty/tcime/phrasedictionary.cpp
@@ -47,8 +47,8 @@ QStringList PhraseDictionary::getWords(const QString &input) const
const DictionaryEntry &words = dict[0];
- DictionaryEntry::ConstIterator word = qBinaryFind(words, input.at(0));
- if (word == words.constEnd())
+ DictionaryEntry::ConstIterator word = std::lower_bound(words.begin(), words.end(), input.at(0));
+ if (word == words.constEnd() || *word != input.at(0))
return QStringList();
int index = word - words.constBegin();
diff --git a/src/settings/plugins.qmltypes b/src/settings/plugins.qmltypes
index 2278e05c..7ab07b88 100644
--- a/src/settings/plugins.qmltypes
+++ b/src/settings/plugins.qmltypes
@@ -4,7 +4,7 @@ import QtQuick.tooling 1.2
// It is used for QML tooling purposes only.
//
// This file was auto-generated by:
-// 'qmlplugindump -nonrelocatable -dependencies dependencies.json QtQuick.VirtualKeyboard.Settings 2.2'
+// 'qmlplugindump -nonrelocatable -dependencies dependencies.json QtQuick.VirtualKeyboard.Settings 2.13'
Module {
dependencies: []
diff --git a/src/settings/qtquickvirtualkeyboardsettingsplugin.cpp b/src/settings/qtquickvirtualkeyboardsettingsplugin.cpp
index 131696e1..db572243 100644
--- a/src/settings/qtquickvirtualkeyboardsettingsplugin.cpp
+++ b/src/settings/qtquickvirtualkeyboardsettingsplugin.cpp
@@ -48,6 +48,9 @@ void QtQuickVirtualKeyboardSettingsPlugin::registerTypes(const char *uri)
qmlRegisterSingletonType<VirtualKeyboardSettings>(uri, 2, 1, "VirtualKeyboardSettings", VirtualKeyboardSettings::registerSettingsModule);
qRegisterMetaType<WordCandidateListSettings *>("WordCandidateListSettings*");
qmlRegisterUncreatableType<WordCandidateListSettings>(uri, 2, 2, "WordCandidateListSettings", QLatin1String("Cannot create word candidate list settings"));
+
+ // Auto-increment the import to stay in sync with ALL future QtQuick minor versions
+ qmlRegisterModule(uri, 2, QT_VERSION_MINOR);
}
QT_END_NAMESPACE
diff --git a/src/settings/settings.pro b/src/settings/settings.pro
index ec5a5147..c4d97c16 100644
--- a/src/settings/settings.pro
+++ b/src/settings/settings.pro
@@ -1,6 +1,6 @@
TARGET = qtquickvirtualkeyboardsettingsplugin
TARGETPATH = QtQuick/VirtualKeyboard/Settings
-IMPORT_VERSION = 2.2
+IMPORT_VERSION = 2.$$QT_MINOR_VERSION
QT += qml quick virtualkeyboard-private
CONFIG += no_cxx_module
diff --git a/src/styles/plugins.qmltypes b/src/styles/plugins.qmltypes
index 04aa6867..d23105b2 100644
--- a/src/styles/plugins.qmltypes
+++ b/src/styles/plugins.qmltypes
@@ -4,7 +4,7 @@ import QtQuick.tooling 1.2
// It is used for QML tooling purposes only.
//
// This file was auto-generated by:
-// 'qmlplugindump -nonrelocatable QtQuick.VirtualKeyboard.Styles 2.2'
+// 'qmlplugindump -nonrelocatable QtQuick.VirtualKeyboard.Styles 2.13'
Module {
dependencies: ["QtQuick 2.0"]
diff --git a/src/styles/qtquickvirtualkeyboardstylesplugin.cpp b/src/styles/qtquickvirtualkeyboardstylesplugin.cpp
index f090974e..c52525aa 100644
--- a/src/styles/qtquickvirtualkeyboardstylesplugin.cpp
+++ b/src/styles/qtquickvirtualkeyboardstylesplugin.cpp
@@ -37,7 +37,7 @@
QT_BEGIN_NAMESPACE
/*!
- \qmlmodule QtQuick.VirtualKeyboard.Styles 2.2
+ \qmlmodule QtQuick.VirtualKeyboard.Styles 2.\QtMinorVersion
\title Qt Quick Virtual Keyboard Styles QML Types
\ingroup qmlmodules
@@ -46,9 +46,9 @@ QT_BEGIN_NAMESPACE
The QML types can be imported into your application using the following
import statements in your .qml file:
- \code
- import QtQuick.VirtualKeyboard.Styles 2.2
- \endcode
+ \qml \QtMinorVersion
+ import QtQuick.VirtualKeyboard.Styles 2.\1
+ \endqml
*/
void QtQuickVirtualKeyboardStylesPlugin::registerTypes(const char *uri)
@@ -73,6 +73,9 @@ void QtQuickVirtualKeyboardStylesPlugin::registerTypes(const char *uri)
qmlRegisterType(QUrl(path + QLatin1String("SelectionListItem.qml")), uri, 2, 0, "SelectionListItem");
qmlRegisterType(QUrl(path + QLatin1String("TraceInputKeyPanel.qml")), uri, 2, 0, "TraceInputKeyPanel");
qmlRegisterType(QUrl(path + QLatin1String("TraceCanvas.qml")), uri, 2, 0, "TraceCanvas");
+
+ // Auto-increment the import to stay in sync with ALL future QtQuick minor versions
+ qmlRegisterModule(uri, 2, QT_VERSION_MINOR);
}
void QtQuickVirtualKeyboardStylesPlugin::initializeEngine(QQmlEngine *engine, const char *uri)
diff --git a/src/styles/styles.pro b/src/styles/styles.pro
index aa7280e2..5d79fd9e 100644
--- a/src/styles/styles.pro
+++ b/src/styles/styles.pro
@@ -1,6 +1,6 @@
TARGET = qtquickvirtualkeyboardstylesplugin
TARGETPATH = QtQuick/VirtualKeyboard/Styles
-IMPORT_VERSION = 2.2
+IMPORT_VERSION = 2.$$QT_MINOR_VERSION
QT += qml quick svg virtualkeyboard-private
CONFIG += no_cxx_module
diff --git a/src/virtualkeyboard/doc/qtvirtualkeyboard.qdocconf b/src/virtualkeyboard/doc/qtvirtualkeyboard.qdocconf
index 27cec4b2..5391595a 100644
--- a/src/virtualkeyboard/doc/qtvirtualkeyboard.qdocconf
+++ b/src/virtualkeyboard/doc/qtvirtualkeyboard.qdocconf
@@ -1,4 +1,5 @@
include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf)
+include($QT_INSTALL_DOCS/config/exampleurl-qtvirtualkeyboard.qdocconf)
project = QtVirtualKeyboard
description = Qt Virtual Keyboard
diff --git a/src/virtualkeyboard/doc/src/qtvirtualkeyboard-index.qdoc b/src/virtualkeyboard/doc/src/qtvirtualkeyboard-index.qdoc
index 353afe6d..a3156cd0 100644
--- a/src/virtualkeyboard/doc/src/qtvirtualkeyboard-index.qdoc
+++ b/src/virtualkeyboard/doc/src/qtvirtualkeyboard-index.qdoc
@@ -109,7 +109,7 @@
*/
/*!
-\qmlmodule QtQuick.VirtualKeyboard 2.4
+\qmlmodule QtQuick.VirtualKeyboard 2.\QtMinorVersion
\title Qt Virtual Keyboard QML Types
\ingroup qmlmodules
\brief Provides QML types for an input framework and a reference keyboard front
@@ -118,11 +118,11 @@ end.
The QML types can be imported into your application using the following
import statements in your .qml file:
- \code
- import QtQuick.VirtualKeyboard 2.4
- import QtQuick.VirtualKeyboard.Styles 2.2
- import QtQuick.VirtualKeyboard.Settings 2.2
- \endcode
+ \qml \QtMinorVersion
+ import QtQuick.VirtualKeyboard 2.\1
+ import QtQuick.VirtualKeyboard.Styles 2.\1
+ import QtQuick.VirtualKeyboard.Settings 2.\1
+ \endqml
In addition to importing the types, the \c QT_IM_MODULE environment
variable must be set to \c qtvirtualkeyboard. For more information, see
diff --git a/src/virtualkeyboard/qvirtualkeyboardinputengine.cpp b/src/virtualkeyboard/qvirtualkeyboardinputengine.cpp
index c1675507..db38fb32 100644
--- a/src/virtualkeyboard/qvirtualkeyboardinputengine.cpp
+++ b/src/virtualkeyboard/qvirtualkeyboardinputengine.cpp
@@ -431,7 +431,7 @@ void QVirtualKeyboardInputEngine::setInputMode(QVirtualKeyboardInputEngine::Inpu
updateInputModes();
Q_ASSERT(cachedInputModes == d->inputModes);
#endif
- if (d->inputModes.contains(static_cast<const int>(inputMode))) {
+ if (d->inputModes.contains(static_cast<int>(inputMode))) {
d->inputMethod->setInputMode(d->inputContext->locale(), inputMode);
if (d->inputMode != inputMode) {
d->inputMode = inputMode;
diff --git a/src/virtualkeyboard/qvirtualkeyboardselectionlistmodel.cpp b/src/virtualkeyboard/qvirtualkeyboardselectionlistmodel.cpp
index c26d2a0b..69e8cfe1 100644
--- a/src/virtualkeyboard/qvirtualkeyboardselectionlistmodel.cpp
+++ b/src/virtualkeyboard/qvirtualkeyboardselectionlistmodel.cpp
@@ -147,10 +147,11 @@ QVirtualKeyboardSelectionListModel::QVirtualKeyboardSelectionListModel(QObject *
QAbstractListModel(*new QVirtualKeyboardSelectionListModelPrivate(), parent)
{
Q_D(QVirtualKeyboardSelectionListModel);
- d->roles[static_cast<const int>(Role::Display)] = "display";
- d->roles[static_cast<const int>(Role::WordCompletionLength)] = "wordCompletionLength";
- d->roles[static_cast<const int>(Role::Dictionary)] = "dictionary";
- d->roles[static_cast<const int>(Role::CanRemoveSuggestion)] = "canRemoveSuggestion";
+ d->roles =
+ {{static_cast<int>(Role::Display), "display"},
+ {static_cast<int>(Role::WordCompletionLength), "wordCompletionLength"},
+ {static_cast<int>(Role::Dictionary), "dictionary"},
+ {static_cast<int>(Role::CanRemoveSuggestion), "canRemoveSuggestion"}};
}
/*!
diff --git a/src/virtualkeyboard/virtualkeyboardsettings.cpp b/src/virtualkeyboard/virtualkeyboardsettings.cpp
index 5f9e82f0..d415c36c 100644
--- a/src/virtualkeyboard/virtualkeyboardsettings.cpp
+++ b/src/virtualkeyboard/virtualkeyboardsettings.cpp
@@ -95,7 +95,7 @@ public:
};
/*!
- \qmlmodule QtQuick.VirtualKeyboard.Settings 2.2
+ \qmlmodule QtQuick.VirtualKeyboard.Settings 2.\QtMinorVersion
\title Qt Quick Virtual Keyboard Settings QML Types
\ingroup qmlmodules
@@ -104,9 +104,9 @@ public:
The QML types can be imported into your application using the following
import statements in your .qml file:
- \code
- import QtQuick.VirtualKeyboard.Settings 2.2
- \endcode
+ \qml \QtMinorVersion
+ import QtQuick.VirtualKeyboard.Settings 2.\1
+ \endqml
*/
/*!
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-10 20:38:09 +0000