diff options
| author | Gabriel de Dietrich <gabriel.dedietrich@qt.io> | 2017-07-13 16:34:32 -0700 |
|---|---|---|
| committer | Gabriel de Dietrich <gabriel.dedietrich@qt.io> | 2017-07-13 16:36:10 -0700 |
| commit | d38fe875c7850ca2c6ca28f91e94ae276735fac8 (patch) | |
| tree | e5c92cef74e0853490d77cf0139b23f00d548a6e /src/gui/painting/qdrawhelper_p.h | |
| parent | ac4e848c9802377b7c4ff673180f28b9ca76b746 (diff) | |
| parent | 627f0a7f7d775ecd263b95dd07fca44bfcb0c5cf (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
src/widgets/widgets/qmainwindowlayout.cpp
Change-Id: I306b4f5ad11bceb336c9091241b468d455fe6bb6
Diffstat (limited to 'src/gui/painting/qdrawhelper_p.h')
| -rw-r--r-- | src/gui/painting/qdrawhelper_p.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/painting/qdrawhelper_p.h b/src/gui/painting/qdrawhelper_p.h index 91f3bc368d..2be10d2cfb 100644 --- a/src/gui/painting/qdrawhelper_p.h +++ b/src/gui/painting/qdrawhelper_p.h @@ -885,7 +885,7 @@ do { \ case 1: *--_d = *--_s; \ } while (--n > 0); \ } \ -} while (0) +} while (false) #define QT_MEMCPY_USHORT(dest, src, length) \ do { \ @@ -905,7 +905,7 @@ do { \ case 1: *_d++ = *_s++; \ } while (--n > 0); \ } \ -} while (0) +} while (false) inline ushort qConvertRgb32To16(uint c) { |