AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix instances of !var & const that should be !(var & const)

Browse Source 
GCC recently started warning about these.

Change-Id: I7b30c79f7f2b66b99e54354224700d54ace6ebec
Reviewed-by: Jens Bache-Wiig <jensbw@gmail.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
Reviewed-by: Gunnar Sletta <gunnar@sletta.org>
This commit is contained in:
Marc Mutz 2014-10-15 21:21:08 +02:00
parent b1cf07f495
commit ef96489ede
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/painting/qpainter.cpp
View File

@ -6362,7 +6362,7 @@ void QPainterPrivate::drawTextItem(const QPointF &p, const QTextItem &_ti, QText
return; return;
const QPainter::RenderHints oldRenderHints = state->renderHints; const QPainter::RenderHints oldRenderHints = state->renderHints;
if (!state->renderHints & QPainter::Antialiasing && state->matrix.type() >= QTransform::TxScale) { if (!(state->renderHints & QPainter::Antialiasing) && state->matrix.type() >= QTransform::TxScale) {
// draw antialias decoration (underline/overline/strikeout) with // draw antialias decoration (underline/overline/strikeout) with
// transformed text // transformed text

2
src/widgets/styles/qgtkstyle.cpp
View File

@ -1049,7 +1049,7 @@ void QGtkStyle::drawPrimitive(PrimitiveElement element,
// The reason for this is that a lot of code that relies on custom item delegates will look odd having // The reason for this is that a lot of code that relies on custom item delegates will look odd having
// a gradient on the branch but a flat shaded color on the item itself. // a gradient on the branch but a flat shaded color on the item itself.
QCommonStyle::drawPrimitive(element, option, painter, widget); QCommonStyle::drawPrimitive(element, option, painter, widget);
if (!option->state & State_Selected) { if (!(option->state & State_Selected)) {
break; break;
} else { } else {
if (const QAbstractItemView *view = qobject_cast<const QAbstractItemView*>(widget)) { if (const QAbstractItemView *view = qobject_cast<const QAbstractItemView*>(widget)) {