diff options
| author | Antti Kokko <antti.kokko@qt.io> | 2020-02-10 08:31:00 +0200 |
|---|---|---|
| committer | Antti Kokko <antti.kokko@qt.io> | 2020-02-10 08:31:39 +0200 |
| commit | 1c68b3f7e000fbb3e04e5183781b96f8a6223370 (patch) | |
| tree | e20629d2fd6f1890840374c0c1eb7f551dc8fe65 | |
| parent | 12f4d0fee51e5e19eb82f9ded798a661629c132c (diff) | |
| parent | fe3ffda451732ebca0bdd7ecd19099f4cbfcfa75 (diff) | |
Merge branch '2.6'
Change-Id: If10420b5b0ab59abb5238e0dddf903b98d8ccbd3
| -rw-r--r-- | src/runtime/Qt3DSQmlElementHelper.cpp | 2 | ||||
| -rw-r--r-- | src/runtime/Qt3DSQmlEngine.cpp | 2 |
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 16675d8..1cadb3d 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, |