summaryrefslogtreecommitdiffstats
path: root/src/corelib/kernel/qvariant.h
diff options
context:
space:
mode:
authorStephen Kelly <stephen.kelly@kdab.com>2012-01-08 20:21:34 +0100
committerQt by Nokia <qt-info@nokia.com>2012-01-10 01:44:13 +0100
commit7226630d29e4aed25fee2476a50c7e4bb1d43203 (patch)
treed7c2c47a5193f955257828f85a798952c5358a95 /src/corelib/kernel/qvariant.h
parentae9afa6b9ebcdbaef5e0fea5091aab1a667fa3ac (diff)
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>
Diffstat (limited to 'src/corelib/kernel/qvariant.h')
-rw-r--r--src/corelib/kernel/qvariant.h4
1 files changed, 2 insertions, 2 deletions
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;