summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAntti Määttä <antti.maatta@qt.io>2020-01-30 08:46:04 +0200
committerAntti Määttä <antti.maatta@qt.io>2020-01-30 08:57:52 +0200
commitfe3ffda451732ebca0bdd7ecd19099f4cbfcfa75 (patch)
tree3c7c3b6656206276294d2dc67691246406c56405
parentaee9f758b2fe152d95dcd7ac9776b4e0cd765d0c (diff)
Fix crash in autotestv2.6.02.6
Task-number: QT3DS-4053 Change-Id: Ie0723839c5c56f6978ec7a4a1258acf311d89d57 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
-rw-r--r--src/runtime/Qt3DSQmlElementHelper.cpp2
-rw-r--r--src/runtime/Qt3DSQmlEngine.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/runtime/Qt3DSQmlElementHelper.cpp b/src/runtime/Qt3DSQmlElementHelper.cpp
index 4dad315..0becf4f 100644
--- a/src/runtime/Qt3DSQmlElementHelper.cpp
+++ b/src/runtime/Qt3DSQmlElementHelper.cpp
@@ -80,7 +80,7 @@ TElement *CQmlElementHelper::GetElement(qt3ds::runtime::IApplication &inApplicat
TElement *theElement = inStartElement;
if (delimIndex > 0) {
thePresentation = inApplication.LoadAndGetPresentationById(path.left(delimIndex));
- path = path.right(delimIndex + 1);
+ path = path.right(path.length() - delimIndex - 1);
}
if (thePresentation == nullptr)
diff --git a/src/runtime/Qt3DSQmlEngine.cpp b/src/runtime/Qt3DSQmlEngine.cpp
index d6c563a..fa2a5d7 100644
--- a/src/runtime/Qt3DSQmlEngine.cpp
+++ b/src/runtime/Qt3DSQmlEngine.cpp
@@ -2114,7 +2114,7 @@ TElement *CQmlEngineImpl::getTarget(const QString &component) {
target = CQmlElementHelper::GetElement(
*m_Application,
m_Application->LoadAndGetPresentationById(component.left(delimIndex)),
- component.right(delimIndex + 1), NULL);
+ component.right(component.length() - delimIndex - 1), NULL);
} else {
target = CQmlElementHelper::GetElement(
*m_Application,