diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-08-11 10:34:42 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-08-11 10:34:42 +0200 |
| commit | c472c2d1128962e12d0528ae6f9fa43cc6a7f147 (patch) | |
| tree | 353b270ed4e60be6cf3881bdb396dd8038d02870 /src/imports/controls/fusion | |
| parent | 82b64b8bec92212b90ee0987511179e14e1da071 (diff) | |
| parent | 92c827a2a4b7e56dcb6865fa35fba25b5d2eb87f (diff) | |
Merge remote-tracking branch 'origin/dev' into wip/qt6
Change-Id: I7c03e9e5227899188d4e16467f692419dc9e9c5b
Diffstat (limited to 'src/imports/controls/fusion')
| -rw-r--r-- | src/imports/controls/fusion/qquickfusionstyle.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/imports/controls/fusion/qquickfusionstyle.cpp b/src/imports/controls/fusion/qquickfusionstyle.cpp index 7797463a..364f8a75 100644 --- a/src/imports/controls/fusion/qquickfusionstyle.cpp +++ b/src/imports/controls/fusion/qquickfusionstyle.cpp @@ -80,8 +80,6 @@ QColor QQuickFusionStyle::highlightedText(const QPalette &palette) QColor QQuickFusionStyle::outline(const QPalette &palette) { - if (palette.window().style() == Qt::TexturePattern) - return QColor(0, 0, 0, 160); return palette.window().color().darker(140); } @@ -95,8 +93,6 @@ QColor QQuickFusionStyle::highlightedOutline(const QPalette &palette) QColor QQuickFusionStyle::tabFrameColor(const QPalette &palette) { - if (palette.window().style() == Qt::TexturePattern) - return QColor(255, 255, 255, 8); return buttonColor(palette).lighter(104); } |