Merge remote-tracking branch 'origin/9.0'

Change-Id: I69ebd63cbd780ed4edb3873acfc8aac208933032
zatochi · Nov 23, 2022 · adc064d · adc064d
2 parents 918c7ca + 373200a
commit adc064d
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 10 deletions.
diff --git a/dist/changelog/changes-9.0.0.md b/dist/changelog/changes-9.0.0.md
@@ -42,6 +42,7 @@ Editing
 * Fixed saving files with non-breaking spaces (QTCREATORBUG-17875)
 * Fixed `Rewrap Paragraph` for Doxygen comments (QTCREATORBUG-9739)
 * Fixed MIME type matching for generic highlighting with MIME type aliases
+* Fixed annotation painting when scrolling horizontally (QTCREATORBUG-28411)
 
 ### C++
 
@@ -55,13 +56,15 @@ Editing
   action (QTCREATORBUG-28099)
 * Fixed that selection was not considered for refactoring actions
   (QTCREATORBUG-27886)
+* Fixed generation of function definitions with `unsigned` (QTCREATORBUG-28378)
 * Fixed code style preview editor size (QTCREATORBUG-27267)
 * Clangd
     * Added option for using single Clangd instance for the whole session
       (QTCREATORBUG-26526)
     * Added option for indexing priority (`--background-index-priority`)
     * Added option for maximum number of completion results (default 100)
       (QTCREATORBUG-27152)
+    * Added `"`, `<` and `/` to auto-completion triggers (QTCREATORBUG-28203)
     * Added option for document specific preprocessor directives
       (QTCREATORBUG-20423)
     * Fixed semantic highlighting for `__func__`
@@ -109,6 +112,7 @@ Projects
   directory to build directory
 * Fixed that local environment was used when inspecting GCC toolchain on remote
 * Fixed stopping terminal process (QTCREATORBUG-28365)
+* Fixed automatic popup of `Issues` (QTCREATORBUG-28330)
 
 ### CMake
 
@@ -141,11 +145,17 @@ Projects
 Debugging
 ---------
 
+### C++
+
+* Improved type name lookup performance for heavily templated code
+* Improved display performance for large array-like data (QTCREATORBUG-28111)
 * Added warning for missing QML debugging functionality for mobile and embedded
   devices
 * Fixed display of strings with characters more than 2 bytes long
-* Improved type name lookup performance for heavily templated code
-* Improved display performance for large array-like data (QTCREATORBUG-28111)
+
+### QML
+
+* Fixed interrupting
 
 Analyzer
 --------
@@ -155,9 +165,15 @@ Analyzer
 * Fixed error when analyzing non-desktop targets (QTCREATORBUG-25615)
 * Fixed wrong failure count display (QTCREATORBUG-27330)
 
+### Perf
+
+* Fixed wrong working directory (QTCREATORBUG-28462)
+
 Version Control Systems
 -----------------------
 
+* Fixed that `--password` argument was shown in plain text (QTCREATORBUG-28413)
+
 ### Git
 
 * Added support for user-configured comment character (QTCREATORBUG-28042)
@@ -208,6 +224,7 @@ Platforms
 * Fixed emulator operations when the deprecated `SDK Tools` is installed in
   addition to `SDK Command-line Tools` (QTCREATORBUG-28196)
 * Fixed debugging over WiFi (QTCREATORBUG-28342)
+* Worked around QML debugging not being enabled by default with NDK 24 and 25
 
 ### iOS
 
@@ -223,6 +240,7 @@ Platforms
 ### Boot to Qt
 
 * Fixed that `rsync` was not available for deployment (QTCREATORBUG-24731)
+* Fixed default deployment method
 
 ### Docker
 

diff --git a/src/libs/tracing/CMakeLists.txt b/src/libs/tracing/CMakeLists.txt
@@ -38,8 +38,8 @@ find_package(Qt6 COMPONENTS ShaderTools QUIET)
 add_qtc_library(Tracing
   CONDITION TARGET Qt6::ShaderTools AND TARGET Qt5::Quick
   FEATURE_INFO
-  DEPENDS Utils Qt5::Qml Qt5::Quick
-  PUBLIC_DEPENDS Qt5::Widgets
+  DEPENDS Utils Qt5::Quick
+  PUBLIC_DEPENDS Qt5::Widgets Qt5::Qml
   SOURCES
     ${TEST_SOURCES}
 )

diff --git a/src/libs/utils/stylehelper.cpp b/src/libs/utils/stylehelper.cpp
@@ -306,9 +306,14 @@ void StyleHelper::drawArrow(QStyle::PrimitiveElement element, QPainter *painter,
             static const QCommonStyle* const style = qobject_cast<QCommonStyle*>(QApplication::style());
             if (!style)
                 return;
+
+            // Workaround for QTCREATORBUG-28470
             QPalette pal = tweakedOption.palette;
+            pal.setBrush(QPalette::Base, pal.text()); // Base and Text differ, causing a detachment.
+                                                      // Inspired by tst_QPalette::cacheKey()
             pal.setColor(QPalette::ButtonText, color.rgb());
-            tweakedOption.palette = pal; // Workaround for QTCREATORBUG-28470
+
+            tweakedOption.palette = pal;
             tweakedOption.rect = rect;
             painter.setOpacity(color.alphaF());
             style->QCommonStyle::drawPrimitive(element, &tweakedOption, &painter);

diff --git a/src/plugins/coreplugin/manhattanstyle.cpp b/src/plugins/coreplugin/manhattanstyle.cpp
@@ -874,21 +874,24 @@ void ManhattanStyle::drawControl(ControlElement element, const QStyleOption *opt
                     editRect.adjust(0, 0, -13, 0);
                 }
 
+                Qt::TextElideMode elideMode = Qt::ElideRight;
+                if (widget && widget->dynamicPropertyNames().contains("elidemode"))
+                    elideMode = widget->property("elidemode").value<Qt::TextElideMode>();
+
                 QLatin1Char asterisk('*');
                 int elideWidth = editRect.width();
 
-                bool notElideAsterisk = widget && widget->property("notelideasterisk").toBool()
+                bool notElideAsterisk = elideMode == Qt::ElideRight && widget
+                                        && widget->property("notelideasterisk").toBool()
                                         && cb->currentText.endsWith(asterisk)
-                                        && option->fontMetrics.horizontalAdvance(cb->currentText) > elideWidth;
+                                        && option->fontMetrics.horizontalAdvance(cb->currentText)
+                                               > elideWidth;
 
                 QString text;
                 if (notElideAsterisk) {
                     elideWidth -= option->fontMetrics.horizontalAdvance(asterisk);
                     text = asterisk;
                 }
-                Qt::TextElideMode elideMode = Qt::ElideRight;
-                if (widget && widget->dynamicPropertyNames().contains("elidemode"))
-                    elideMode = widget->property("elidemode").value<Qt::TextElideMode>();
                 text.prepend(option->fontMetrics.elidedText(cb->currentText, elideMode, elideWidth));
 
                 if (creatorTheme()->flag(Theme::ComboBoxDrawTextShadow)

diff --git a/src/plugins/cppeditor/cppcodemodelsettingspage.cpp b/src/plugins/cppeditor/cppcodemodelsettingspage.cpp
@@ -244,6 +244,7 @@ ClangdSettingsWidget::ClangdSettingsWidget(const ClangdSettings::Data &settingsD
     d->useClangdCheckBox.setChecked(settings.useClangd());
     d->clangdChooser.setExpectedKind(Utils::PathChooser::ExistingCommand);
     d->clangdChooser.setFilePath(settings.clangdFilePath());
+    d->clangdChooser.setAllowPathFromDevice(true);
     d->clangdChooser.setEnabled(d->useClangdCheckBox.isChecked());
     using Priority = ClangdSettings::IndexingPriority;
     for (Priority prio : {Priority::Off, Priority::Background, Priority::Low, Priority::Normal}) {