aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/declarative/qml/v8/qjsvalue.cpp10
-rw-r--r--src/declarative/qml/v8/qjsvalue.h3
2 files changed, 2 insertions, 11 deletions
diff --git a/src/declarative/qml/v8/qjsvalue.cpp b/src/declarative/qml/v8/qjsvalue.cpp
index 8be6a40e16..e0a925c3bb 100644
--- a/src/declarative/qml/v8/qjsvalue.cpp
+++ b/src/declarative/qml/v8/qjsvalue.cpp
@@ -162,16 +162,6 @@ QJSValue::QJSValue(const char *value)
#endif
/*!
- Block automatic convertion to bool
- \internal
-*/
-QJSValue::QJSValue(void* d)
-{
- Q_UNUSED(d);
- Q_ASSERT(false);
-}
-
-/*!
Constructs a new QJSValue from private
\internal
*/
diff --git a/src/declarative/qml/v8/qjsvalue.h b/src/declarative/qml/v8/qjsvalue.h
index ebb9c8be8e..bfe0ec0951 100644
--- a/src/declarative/qml/v8/qjsvalue.h
+++ b/src/declarative/qml/v8/qjsvalue.h
@@ -123,7 +123,8 @@ public:
private:
// force compile error, prevent QJSValue(bool) to be called
- QJSValue(void *);
+
+ QJSValue(void *) Q_DECL_EQ_DELETE;
QJSValue(QJSValuePrivate*);
QJSValue(QScriptPassPointer<QJSValuePrivate>);