diff options
| author | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2023-06-09 17:09:31 +0300 |
|---|---|---|
| committer | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2023-06-09 17:09:31 +0300 |
| commit | 5a1948ddc05bf44017ac12bd5c2b9bc79fbcb9a2 (patch) | |
| tree | c5db4c194338501864f2f0c302601a185c749072 | |
| parent | 0c1dcfe344c03d48d753aeb58f139bc990f2611c (diff) | |
| parent | 98b7ae3d9e3098639c15779a129d28b1737a3277 (diff) | |
Merge remote-tracking branch 'origin/tqtc/lts-5.15.11' into tqtc/lts-5.15-opensourcev5.15.11-lts-lgpl
Change-Id: I87c025b01577a69b4b4706f557d6578850c70571
| -rw-r--r-- | .qmake.conf | 2 | ||||
| -rw-r--r-- | src/xmlpatterns/acceltree/qacceltreeresourceloader.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/.qmake.conf b/.qmake.conf index c0e0d615..2e81da47 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -2,4 +2,4 @@ load(qt_build_config) CONFIG += warning_clean DEFINES += QT_NO_FOREACH -MODULE_VERSION = 5.15.10 +MODULE_VERSION = 5.15.11 diff --git a/src/xmlpatterns/acceltree/qacceltreeresourceloader.cpp b/src/xmlpatterns/acceltree/qacceltreeresourceloader.cpp index 8abd99cc..90cb3e87 100644 --- a/src/xmlpatterns/acceltree/qacceltreeresourceloader.cpp +++ b/src/xmlpatterns/acceltree/qacceltreeresourceloader.cpp @@ -366,7 +366,7 @@ bool AccelTreeResourceLoader::retrieveUnparsedText(const QUrl &uri, /* This code is a candidate for threading. Divide and conqueror. */ for(int i = 0; i < len; ++i) { - if(!QXmlUtils::isChar(result.at(i))) + if(!QXmlUtils::isChar(result.at(i).unicode())) { if(context) { |