diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-02-13 22:56:02 +0100 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-02-13 22:56:03 +0100 |
commit | 9c055e8e47d9411a8f34abe6872e4bfd942cc372 (patch) | |
tree | 895e139477c88a064a993f035afec614de9dafc7 /src/widgets/styles/qcommonstyle.cpp | |
parent | d08e0e861acadf3a354d3833dd5623ef71fa7a4b (diff) | |
parent | 76010f4af8c9a59a20c489d70c7f99b802f9721f (diff) |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: Iaec2e57d6bf33355ddfa61d25133580a8740335f
Diffstat (limited to 'src/widgets/styles/qcommonstyle.cpp')
-rw-r--r-- | src/widgets/styles/qcommonstyle.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/widgets/styles/qcommonstyle.cpp b/src/widgets/styles/qcommonstyle.cpp index 14a18a13e9..06590afe72 100644 --- a/src/widgets/styles/qcommonstyle.cpp +++ b/src/widgets/styles/qcommonstyle.cpp @@ -6290,7 +6290,7 @@ QPixmap QCommonStyle::generatedIconPixmap(QIcon::Mode iconMode, const QPixmap &p // High intensity colors needs dark shifting in the color table, while // low intensity colors needs light shifting. This is to increase the - // percieved contrast. + // perceived contrast. if ((red - factor > green && red - factor > blue) || (green - factor > red && green - factor > blue) || (blue - factor > red && blue - factor > green)) |