From 3cb4bbfc2644724cfcc0267b84f8979ceb7b08e6 Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Fri, 21 Apr 2017 23:45:48 +0200 Subject: QPixmap/X11: fix compilation with C++17 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- src/plugins/platforms/xcb/nativepainting/qpixmap_x11.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/plugins') 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 -- cgit v1.2.3