diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2022-11-23 11:20:15 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2022-11-23 11:20:15 +0100 |
| commit | adc064d5022d673898db9f0c26aaca8b675c0ca7 (patch) | |
| tree | 3902b822791360bfcc21edd5e4f8676d92f69cdd /src/libs | |
| parent | 918c7ca52ddbb446cb4af9bac1ee017fed85b738 (diff) | |
| parent | 373200accf6401f1b5fee7d93e87ab7841c50a6d (diff) | |
Merge remote-tracking branch 'origin/9.0'
Change-Id: I69ebd63cbd780ed4edb3873acfc8aac208933032
Diffstat (limited to 'src/libs')
| -rw-r--r-- | src/libs/tracing/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | src/libs/utils/stylehelper.cpp | 7 |
2 files changed, 8 insertions, 3 deletions
diff --git a/src/libs/tracing/CMakeLists.txt b/src/libs/tracing/CMakeLists.txt index 3b8eed445a..c7f5979819 100644 --- 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 index ade12533db..b60a35c33f 100644 --- 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); |