From 7226630d29e4aed25fee2476a50c7e4bb1d43203 Mon Sep 17 00:00:00 2001
From: Stephen Kelly <stephen.kelly@kdab.com>
Date: Sun, 8 Jan 2012 20:21:34 +0100
Subject: C++11 delete some contructors which are not wanted.

Change-Id: I844a0872e81f1824928814edb8d21c0b6384283d
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
---
 src/corelib/kernel/qvariant.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/corelib/kernel/qvariant.h b/src/corelib/kernel/qvariant.h
index 28bddc14d2..12a512f0dd 100644
--- a/src/corelib/kernel/qvariant.h
+++ b/src/corelib/kernel/qvariant.h
@@ -389,10 +389,10 @@ public:
 
 private:
     // force compile error, prevent QVariant(bool) to be called
-    inline QVariant(void *) { Q_ASSERT(false); }
+    inline QVariant(void *) Q_DECL_EQ_DELETE;
 #ifdef QT_NO_CAST_FROM_ASCII
     // force compile error when implicit conversion is not wanted
-    inline QVariant(const char *) { Q_ASSERT(false); }
+    inline QVariant(const char *) Q_DECL_EQ_DELETE;
 #endif
 public:
     typedef Private DataPtr;
-- 
cgit v1.2.3