From a3cd1d4b7d35f4c12d2a26283fcd346126a535e7 Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Thu, 3 Mar 2016 14:06:07 +0100 Subject: qutils.h: pass the headerclean check C-style casts aren't allowed in public headers. Change-Id: I1c1d6efb534b767d2ac06ecfae782b7a34bf37eb Reviewed-by: Miikka Heikkinen --- src/datavisualization/utils/qutils.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/datavisualization/utils') diff --git a/src/datavisualization/utils/qutils.h b/src/datavisualization/utils/qutils.h index 6bf995b7..078a78df 100644 --- a/src/datavisualization/utils/qutils.h +++ b/src/datavisualization/utils/qutils.h @@ -66,7 +66,7 @@ static inline QSurfaceFormat qDefaultSurfaceFormat(bool antialias) #if (QT_VERSION >= QT_VERSION_CHECK(5, 4, 0)) // We support only ES2 emulation with software renderer for now const GLubyte *openGLVersion = ctx->functions()->glGetString(GL_VERSION); - QString versionStr = QString::fromLatin1((const char *)openGLVersion).toLower(); + QString versionStr = QString::fromLatin1(reinterpret_cast(openGLVersion)).toLower(); if (versionStr.contains(QStringLiteral("mesa")) || QCoreApplication::testAttribute(Qt::AA_UseSoftwareOpenGL)) { qWarning("Only OpenGL ES2 emulation is available for software rendering."); -- cgit v1.2.3 From 7d16c732127199bf2f26ef93d242b0d19b0d7944 Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Thu, 3 Mar 2016 13:59:37 +0100 Subject: Add explicit and make public headers compile with -Wzero-as-null-pointer-constant ... or equivalent. QtBase 5.6 headers already compile that way, so let the other modules follow suit. Added explicit where it was missing. This is not a source- incompatible change, because code that breaks by this is a bug. Let's not have this sitting around in an LTS. Change-Id: I579e8714f94884dc555b673c9f85508f17cdc99d Task-number: QTBUG-45291 Reviewed-by: Miikka Heikkinen --- src/datavisualization/utils/qutils.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/datavisualization/utils') diff --git a/src/datavisualization/utils/qutils.h b/src/datavisualization/utils/qutils.h index 078a78df..9920a00c 100644 --- a/src/datavisualization/utils/qutils.h +++ b/src/datavisualization/utils/qutils.h @@ -44,7 +44,7 @@ static inline QSurfaceFormat qDefaultSurfaceFormat(bool antialias) surfaceFormat.setRenderableType(QSurfaceFormat::DefaultRenderableType); QOpenGLContext *ctx = QOpenGLContext::currentContext(); - QOffscreenSurface *dummySurface = 0; + QOffscreenSurface *dummySurface = Q_NULLPTR; if (!ctx) { dummySurface = new QOffscreenSurface(); dummySurface->setFormat(surfaceFormat); -- cgit v1.2.3