feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

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

Browse Source 
Change-Id: Ifbb14e33104b39de8ca2e1495301a53e71496ef9
This commit is contained in:
Eike Ziller
2023-04-24 08:10:39 +02:00
parent 1e02f6bf98 d1d893f098
commit 5125ccf03f
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp
View File

@@ -1469,7 +1469,7 @@ CMakeBuildConfiguration::CMakeBuildConfiguration(Target *target, Id id)
// Android magic: // Android magic:
if (DeviceTypeKitAspect::deviceTypeId(k) == Android::Constants::ANDROID_DEVICE_TYPE) { if (DeviceTypeKitAspect::deviceTypeId(k) == Android::Constants::ANDROID_DEVICE_TYPE) {
buildSteps()->appendStep(Android::Constants::ANDROID_BUILD_APK_ID); 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=" cmd.addArg("-DANDROID_PLATFORM:STRING="
+ bs->data(Android::Constants::AndroidNdkPlatform).toString()); + bs->data(Android::Constants::AndroidNdkPlatform).toString());
auto ndkLocation = bs->data(Android::Constants::NdkLocation).value<FilePath>(); auto ndkLocation = bs->data(Android::Constants::NdkLocation).value<FilePath>();

4
src/plugins/texteditor/texteditor.cpp
View File

@@ -2913,9 +2913,9 @@ void TextEditorWidget::insertCodeSnippet(const QTextCursor &cursor_arg,
d->m_document->autoIndent(cursor); d->m_document->autoIndent(cursor);
cursor.endEditBlock(); cursor.endEditBlock();
const QColor &occurrencesColor const QColor occurrencesColor
= textDocument()->fontSettings().toTextCharFormat(C_OCCURRENCES).background().color(); = textDocument()->fontSettings().toTextCharFormat(C_OCCURRENCES).background().color();
const QColor &renameColor const QColor renameColor
= textDocument()->fontSettings().toTextCharFormat(C_OCCURRENCES_RENAME).background().color(); = textDocument()->fontSettings().toTextCharFormat(C_OCCURRENCES_RENAME).background().color();
for (const CursorPart &part : cursorParts) { for (const CursorPart &part : cursorParts) {

2
src/plugins/texteditor/textmark.cpp
View File

@@ -133,7 +133,7 @@ void TextMark::paintAnnotation(QPainter &painter,
const QColor &markColor = annotationColor(); const QColor &markColor = annotationColor();
const FontSettings &fontSettings = m_baseTextDocument->fontSettings(); const FontSettings &fontSettings = m_baseTextDocument->fontSettings();
const AnnotationColors &colors = AnnotationColors::getAnnotationColors( const AnnotationColors colors = AnnotationColors::getAnnotationColors(
markColor.isValid() ? markColor : painter.pen().color(), markColor.isValid() ? markColor : painter.pen().color(),
fontSettings.toTextCharFormat(C_TEXT).background().color()); fontSettings.toTextCharFormat(C_TEXT).background().color());

2
src/plugins/valgrind/callgrindvisualisation.cpp
View File

@@ -155,7 +155,7 @@ void FunctionGraphicsItem::paint(QPainter *painter,
painter->save(); painter->save();
QRectF rect = this->rect(); QRectF rect = this->rect();
const QColor &color = brush().color(); const QColor color = brush().color();
if (option->state & QStyle::State_Selected) { if (option->state & QStyle::State_Selected) {
QLinearGradient gradient(0, 0, rect.width(), 0); QLinearGradient gradient(0, 0, rect.width(), 0);
gradient.setColorAt(0, color.darker(100)); gradient.setColorAt(0, color.darker(100));