From bb419ad87c646af4eff003675be174da5f00758c Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Wed, 4 Sep 2013 21:24:19 -0700 Subject: [PATCH] Fix new change-of-sign warning detected by ICC 14. qpainter.cpp(1656): error #68: integer conversion resulted in a change of sign tmp->changeFlags &= ~(QPaintEngine::DirtyClipPath | QPaintEngine::DirtyClipRegion); tmp->changeFlags is uint, but QPaintEngine::DirtyFlag is backed by int. That means the bitwise NOT sets the sign bit, which makes it negative. Change-Id: Id8dfc2c7012b519cc5f5799d223cb95a79ccd401 Reviewed-by: Gunnar Sletta --- src/gui/painting/qpainter.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gui/painting/qpainter.cpp b/src/gui/painting/qpainter.cpp index f65a46f0db..d12e0ebb15 100644 --- a/src/gui/painting/qpainter.cpp +++ b/src/gui/painting/qpainter.cpp @@ -1653,7 +1653,7 @@ void QPainter::restore() //Since we've updated the clip region anyway, pretend that the clip path hasn't changed: d->state->dirtyFlags &= ~(QPaintEngine::DirtyClipPath | QPaintEngine::DirtyClipRegion); - tmp->changeFlags &= ~(QPaintEngine::DirtyClipPath | QPaintEngine::DirtyClipRegion); + tmp->changeFlags &= ~uint(QPaintEngine::DirtyClipPath | QPaintEngine::DirtyClipRegion); tmp->changeFlags |= QPaintEngine::DirtyTransform; }