diff options
| author | Jędrzej Nowacki <jedrzej.nowacki@nokia.com> | 2012-01-31 10:03:56 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-07 11:45:56 +0100 |
| commit | 54a2a4ee656134874990d5657dfe921d98c6c028 (patch) | |
| tree | f672dc0eddc082338e41350a5727fc8793435353 | |
| parent | 5e42176970c05c015685194aecf954aaac5d9e1e (diff) | |
Mark constructor of QJSValue as deletable.
This constructor is there only to force compile time error.
Change-Id: Ia2e059e0c7fa516949a166da8856543a5608d217
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
| -rw-r--r-- | src/declarative/qml/v8/qjsvalue.cpp | 10 | ||||
| -rw-r--r-- | src/declarative/qml/v8/qjsvalue.h | 3 |
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>); |