summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike Krus <mike.krus@kdab.com>2017-02-09 13:10:37 +0000
committerSean Harmer <sean.harmer@kdab.com>2017-02-11 13:54:36 +0000
commit4ec16f079604f16eeb0703bc9ee3d696707995b6 (patch)
treec983332d458e7520427d5b1ad67ddc1e6564dcc7
parent5b890620adfd4f554eb8eed54a05cd53be9ac809 (diff)
Fix Clang warnings: use of deprecated api
Change-Id: I72f92bfcbbd253cb3912c6dc51db9612d695fee9 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
-rw-r--r--src/animation/frontend/qmorphinganimation.cpp2
-rw-r--r--src/animation/frontend/qvertexblendanimation.cpp2
-rw-r--r--src/render/picking/qeventforward_p.h2
3 files changed, 3 insertions, 3 deletions
diff --git a/src/animation/frontend/qmorphinganimation.cpp b/src/animation/frontend/qmorphinganimation.cpp
index 2ac09464f..4463f6cbf 100644
--- a/src/animation/frontend/qmorphinganimation.cpp
+++ b/src/animation/frontend/qmorphinganimation.cpp
@@ -124,7 +124,7 @@ void QMorphingAnimationPrivate::setTargetInterpolated(int morphTarget)
if (target != m_currentTarget) {
for (int i = 0; i < m_attributeNames.size(); ++i) {
QString targetName = m_attributeNames.at(i);
- targetName.append("Target");
+ targetName.append(QLatin1String("Target"));
targetAttributes[i]->setName(targetName);
geometry->addAttribute(targetAttributes.at(i));
}
diff --git a/src/animation/frontend/qvertexblendanimation.cpp b/src/animation/frontend/qvertexblendanimation.cpp
index cd8f95f73..4f7388087 100644
--- a/src/animation/frontend/qvertexblendanimation.cpp
+++ b/src/animation/frontend/qvertexblendanimation.cpp
@@ -121,7 +121,7 @@ void QVertexBlendAnimationPrivate::updateAnimation(float position)
for (int i = 0; i < baseAttributes.size(); ++i) {
const QString baseName = attributeNames.at(i);
QString targetName = baseName;
- targetName.append("Target");
+ targetName.append(QLatin1String("Target"));
baseAttributes[i]->setName(baseName);
geometry->addAttribute(baseAttributes.at(i));
diff --git a/src/render/picking/qeventforward_p.h b/src/render/picking/qeventforward_p.h
index c087bc8f5..d3c3018e0 100644
--- a/src/render/picking/qeventforward_p.h
+++ b/src/render/picking/qeventforward_p.h
@@ -65,7 +65,7 @@ public:
QEventForwardPrivate()
: QNodePrivate()
, m_target(nullptr)
- , m_attribute("default")
+ , m_attribute(QLatin1String("default"))
, m_forwardMouseEvents(true)
, m_forwardKeyboardEvents(false)
, m_focus(false)