diff options
author | The Qt Project <gerrit-noreply@qt-project.org> | 2023-04-24 06:51:40 +0000 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2023-04-24 06:51:40 +0000 |
commit | 05f80a132d38c34c747108192858b136870be789 (patch) | |
tree | 98c5b27c36242a22699e87c3365eac9e5a4cd789 | |
parent | b794e982335a9b9dbb986900ca44c84d40da2566 (diff) | |
parent | 5125ccf03f1d4c76183fd9afca12aa7cd59abcd4 (diff) |
Merge "Merge remote-tracking branch 'origin/9.0' into 10.0" into 10.0
-rw-r--r-- | src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp | 2 | ||||
-rw-r--r-- | src/plugins/texteditor/texteditor.cpp | 4 | ||||
-rw-r--r-- | src/plugins/texteditor/textmark.cpp | 2 | ||||
-rw-r--r-- | src/plugins/valgrind/callgrindvisualisation.cpp | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp b/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp index 9113c40700..494d7ee67d 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 326be45d7f..2dc0531753 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 4a8320de57..37be854d9b 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 f049a92e35..4120dc53de 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)); |