mirrors/mumble
2
0
Fork 0
mirror of https://github.com/mumble-voip/mumble.git synced 2025-10-26 11:19:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge PR #2816: LCD: drop workaround for Qt >= 5.6.2.

Browse Source
This commit is contained in:
Mikkel Krautz 2017-02-05 12:31:51 +01:00 committed by GitHub
commit 78ff4fc27f
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/mumble/LCD.cpp
View File

@ -189,7 +189,7 @@ LCD::LCD() : QObject() {
}
qiLogo = QIcon(QLatin1String("skin:mumble.svg")).pixmap(48,48).toImage().convertToFormat(QImage::Format_MonoLSB);
#if QT_VERSION >= 0x050600
#if QT_VERSION >= 0x050600 && QT_VERSION <= 0x050601
// Don't invert the logo image when using Qt 5.6.
// See mumble-voip/mumble#2429
#else
@ -250,7 +250,7 @@ void LCD::updateUserView() {
QPainter painter(img);
painter.setRenderHints(QPainter::Antialiasing | QPainter::TextAntialiasing, false);
#if QT_VERSION >= 0x050600
#if QT_VERSION >= 0x050600 && QT_VERSION <= 0x050601
// Use Qt::white instead of Qt::color1 on Qt 5.6.
// See mumble-voip/mumble#2429
painter.setPen(Qt::white);