diff options
| author | Marc Mutz <marc.mutz@kdab.com> | 2017-04-21 23:45:48 +0200 |
|---|---|---|
| committer | Marc Mutz <marc.mutz@kdab.com> | 2017-04-22 06:04:08 +0000 |
| commit | 3cb4bbfc2644724cfcc0267b84f8979ceb7b08e6 (patch) | |
| tree | 1f8d4017c70e91bb912d38fe1d0dd934de528dac /src/plugins/platforms | |
| parent | a611a9f537f1187825339c2a2214c8ec4a23680f (diff) | |
QPixmap/X11: fix compilation with C++17
C++11 deprecated 'register' as a storage specifier, and C++17 removes
it.
Fixes GCC 7.0 warning-turned-error:
nativepainting/qpixmap_x11.cpp:2013:25: error: ISO C++1z does not allow ‘register’ storage class specifier [-Werror=register]
Amends 07942adb77f60738a6043665673d51fc7991233b.
Change-Id: Ideb674d903e5e6eb5ae92cfc3979ff59b243520c
Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
Diffstat (limited to 'src/plugins/platforms')
| -rw-r--r-- | src/plugins/platforms/xcb/nativepainting/qpixmap_x11.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/platforms/xcb/nativepainting/qpixmap_x11.cpp b/src/plugins/platforms/xcb/nativepainting/qpixmap_x11.cpp index 72fe1cd05d..6f970f6d6d 100644 --- a/src/plugins/platforms/xcb/nativepainting/qpixmap_x11.cpp +++ b/src/plugins/platforms/xcb/nativepainting/qpixmap_x11.cpp @@ -2010,7 +2010,7 @@ QImage QX11PlatformPixmap::toImage(const QXImageWrapper &xiWrapper, const QRect image.setColor(0, qRgb(255,255,255)); image.setColor(1, qRgb(0,0,0)); } else if (!trucol) { // pixmap with colormap - register uchar *p; + uchar *p; uchar *end; uchar use[256]; // pixel-in-use table uchar pix[256]; // pixel translation table |