Merge remote-tracking branch 'origin/5.6' into dev

Change-Id: I11ea57222ba5aa683b7bfd7735fbc1d2cf86e875

2 files changed, 5 insertions, 4 deletions

diff --git a/tools/qmleasing/segmentproperties.cpp b/tools/qmleasing/segmentproperties.cpp
index cfc10b7f54..cf49b2488c 100644
--- a/tools/qmleasing/segmentproperties.cpp
+++ b/tools/qmleasing/segmentproperties.cpp
@@ -103,7 +103,7 @@ void SegmentProperties::invalidate()
 {
     m_blockSignals = true;
 
-     m_ui_pane_p.label->setText(QLatin1String("p") + QString::number(m_segment));
+     m_ui_pane_p.label->setText(QLatin1Char('p') + QString::number(m_segment));
      m_ui_pane_p.smooth->setChecked(m_smooth);
      m_ui_pane_p.smooth->parentWidget()->setEnabled(!m_last);
 
diff --git a/tools/qmleasing/splineeditor.cpp b/tools/qmleasing/splineeditor.cpp
index 56444f6b3b..2ae4d11309 100644
--- a/tools/qmleasing/splineeditor.cpp
+++ b/tools/qmleasing/splineeditor.cpp
@@ -293,10 +293,11 @@ QString SplineEditor::generateCode()
 {
     QString s = QLatin1String("[");
     foreach (const QPointF &point, m_controlPoints) {
-        s += QString::number(point.x(), 'g', 2) + "," + QString::number(point.y(), 'g', 3) + ",";
+        s += QString::number(point.x(), 'g', 2) + QLatin1Char(',')
+             + QString::number(point.y(), 'g', 3) + QLatin1Char(',');
     }
     s.chop(1); //removing last ","
-    s += "]";
+    s += QLatin1Char(']');
 
     return s;
 }
@@ -675,7 +676,7 @@ void SplineEditor::setEasingCurve(const QString &code)
 {
     if (m_block)
         return;
-    if (code.left(1) == QLatin1String("[") && code.right(1) == QLatin1String("]")) {
+    if (code.startsWith(QLatin1Char('[')) && code.endsWith(QLatin1Char(']'))) {
         QString cleanCode = code;
         cleanCode.remove(0, 1);
         cleanCode.chop(1);