From c887fbd79503824882df08365e39d27580164ac9 Mon Sep 17 00:00:00 2001
From: Marc Mutz <marc.mutz@kdab.com>
Date: Wed, 13 Nov 2013 12:37:20 +0100
Subject: QOpenGLTexture: mark (QImage) ctor explicit

Disables implicit conversions from QImage to QOpenGLTexture.

Change-Id: I09b4d236dde8eae5258e6a954f4e02b4451990bd
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
---
 src/gui/opengl/qopengltexture.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/gui/opengl/qopengltexture.h b/src/gui/opengl/qopengltexture.h
index b761d63775..3428f0d74a 100644
--- a/src/gui/opengl/qopengltexture.h
+++ b/src/gui/opengl/qopengltexture.h
@@ -97,7 +97,7 @@ public:
     };
 
     explicit QOpenGLTexture(Target target);
-    QOpenGLTexture(const QImage& image, MipMapGeneration genMipMaps = GenerateMipMaps);
+    explicit QOpenGLTexture(const QImage& image, MipMapGeneration genMipMaps = GenerateMipMaps);
     ~QOpenGLTexture();
 
     // Creation and destruction
-- 
cgit v1.2.3