From fe3ffda451732ebca0bdd7ecd19099f4cbfcfa75 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antti=20M=C3=A4=C3=A4tt=C3=A4?= Date: Thu, 30 Jan 2020 08:46:04 +0200 Subject: Fix crash in autotest MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Task-number: QT3DS-4053 Change-Id: Ie0723839c5c56f6978ec7a4a1258acf311d89d57 Reviewed-by: Tomi Korpipää --- src/runtime/Qt3DSQmlElementHelper.cpp | 2 +- src/runtime/Qt3DSQmlEngine.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src') 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, -- cgit v1.2.3