diff options
| author | Erik Verbruggen <erik.verbruggen@digia.com> | 2013-11-01 12:38:32 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-11-04 02:16:04 +0100 |
| commit | a79e400150e9d550cc4ddc0c0497778d8b78fe5d (patch) | |
| tree | 5a66670d4c31aaf0d356042b6fe607728e237b5b /src/qml/jsapi | |
| parent | b5991ce2a61219bda5a7fa6e33f323158d1eb78b (diff) | |
Fix various compiler warnings in order to remove warn_off in the near future
Change-Id: Ic0492fbe31a1e134674bc6c20381f735dd6d5b7a
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/jsapi')
| -rw-r--r-- | src/qml/jsapi/qjsvalue.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/qml/jsapi/qjsvalue.cpp b/src/qml/jsapi/qjsvalue.cpp index 9031187d7e..4035fb9fa6 100644 --- a/src/qml/jsapi/qjsvalue.cpp +++ b/src/qml/jsapi/qjsvalue.cpp @@ -712,11 +712,12 @@ void QJSValue::setPrototype(const QJSValue& prototype) */ QJSValue& QJSValue::operator=(const QJSValue& other) { - if (d == other.d) - return *this; - d->deref(); - d = other.d; - d->ref(); + if (d != other.d) { + d->deref(); + d = other.d; + d->ref(); + } + return *this; } /*! |