Merge remote-tracking branch 'origin/9.0' into 10.0

Change-Id: Ifbb14e33104b39de8ca2e1495301a53e71496ef9

4 files changed, 5 insertions, 5 deletions

diff --git a/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp b/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp
index 9113c40700e..494d7ee67d7 100644
--- a/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp
@@ -1469,7 +1469,7 @@ CMakeBuildConfiguration::CMakeBuildConfiguration(Target *target, Id id)
         // Android magic:
         if (DeviceTypeKitAspect::deviceTypeId(k) == Android::Constants::ANDROID_DEVICE_TYPE) {
             buildSteps()->appendStep(Android::Constants::ANDROID_BUILD_APK_ID);
-            const auto &bs = buildSteps()->steps().constLast();
+            const auto bs = buildSteps()->steps().constLast();
             cmd.addArg("-DANDROID_PLATFORM:STRING="
                    + bs->data(Android::Constants::AndroidNdkPlatform).toString());
             auto ndkLocation = bs->data(Android::Constants::NdkLocation).value<FilePath>();
diff --git a/src/plugins/texteditor/texteditor.cpp b/src/plugins/texteditor/texteditor.cpp
index 326be45d7fc..2dc05317537 100644
--- a/src/plugins/texteditor/texteditor.cpp
+++ b/src/plugins/texteditor/texteditor.cpp
@@ -2913,9 +2913,9 @@ void TextEditorWidget::insertCodeSnippet(const QTextCursor &cursor_arg,
     d->m_document->autoIndent(cursor);
     cursor.endEditBlock();
 
-    const QColor &occurrencesColor
+    const QColor occurrencesColor
         = textDocument()->fontSettings().toTextCharFormat(C_OCCURRENCES).background().color();
-    const QColor &renameColor
+    const QColor renameColor
         = textDocument()->fontSettings().toTextCharFormat(C_OCCURRENCES_RENAME).background().color();
 
     for (const CursorPart &part : cursorParts) {
diff --git a/src/plugins/texteditor/textmark.cpp b/src/plugins/texteditor/textmark.cpp
index 4a8320de57b..37be854d9b9 100644
--- a/src/plugins/texteditor/textmark.cpp
+++ b/src/plugins/texteditor/textmark.cpp
@@ -133,7 +133,7 @@ void TextMark::paintAnnotation(QPainter &painter,
     const QColor &markColor = annotationColor();
 
     const FontSettings &fontSettings = m_baseTextDocument->fontSettings();
-    const AnnotationColors &colors = AnnotationColors::getAnnotationColors(
+    const AnnotationColors colors = AnnotationColors::getAnnotationColors(
                 markColor.isValid() ? markColor : painter.pen().color(),
                 fontSettings.toTextCharFormat(C_TEXT).background().color());
 
diff --git a/src/plugins/valgrind/callgrindvisualisation.cpp b/src/plugins/valgrind/callgrindvisualisation.cpp
index f049a92e354..4120dc53de2 100644
--- a/src/plugins/valgrind/callgrindvisualisation.cpp
+++ b/src/plugins/valgrind/callgrindvisualisation.cpp
@@ -155,7 +155,7 @@ void FunctionGraphicsItem::paint(QPainter *painter,
     painter->save();
 
     QRectF rect = this->rect();
-    const QColor &color = brush().color();
+    const QColor color = brush().color();
     if (option->state & QStyle::State_Selected) {
         QLinearGradient gradient(0, 0, rect.width(), 0);
         gradient.setColorAt(0, color.darker(100));