path: root/src/imports/controls
diff options
authorVitaly Fanaskov <vitaly.fanaskov@qt.io>2019-07-18 10:51:31 +0200
committerVitaly Fanaskov <vitaly.fanaskov@qt.io>2019-07-19 10:29:03 +0200
commit045527ed8a9dbe68240d26cd024e93d3112017d4 (patch)
tree5fe723458cb02f0a8e2da74051e4341c5ecbb745 /src/imports/controls
parent38073512c2a9ee48b47eadd7aa3cead2758d6c25 (diff)
Remove redundant code
Reasons: 1) Qt::TexturePattern has never set by any code (this branch is unreachable); 2) There is no knowleage about any brushes in QML (this method is supposed to be invoked from QML only). Palette is used for colors only; 3) Even if brush style has been set somehow, it will be erased during palettes resolving process after assigning a new "window color". Looks like this code was copied from widgets styling and has been compiling only because of the current design. In light of redesigning palette class this code also makes no sense. Bringing knowledge about brushes and its styles to QML requires additional job. Change-Id: I555d062335593ad945b024136750dcd548cd9f16 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> Reviewed-by: Nils Jeisecke <nils.jeisecke@saltation.com>
Diffstat (limited to 'src/imports/controls')
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);