diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-11-30 03:06:26 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-11-30 03:06:26 +0100 |
| commit | 5571928b379f71ccfa78e961755d24b4fdff1ab9 (patch) | |
| tree | f5261f50d15cd8125a8a4b38e705f9597c376b34 /src/script/api/qscriptvalueiterator.cpp | |
| parent | 0145e2e4ad12988a3d2789e245289848dc448dbe (diff) | |
| parent | ee32a6b5a0ba187606b9ad3cdfcf73cbbc1ce02f (diff) | |
| download | qtscript-5571928b379f71ccfa78e961755d24b4fdff1ab9.tar.gz | |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: I877de1443eb671738a5f4ece19ac49feb4c062f5
Diffstat (limited to 'src/script/api/qscriptvalueiterator.cpp')
| -rw-r--r-- | src/script/api/qscriptvalueiterator.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/script/api/qscriptvalueiterator.cpp b/src/script/api/qscriptvalueiterator.cpp index a1e3b21..8a038f5 100644 --- a/src/script/api/qscriptvalueiterator.cpp +++ b/src/script/api/qscriptvalueiterator.cpp @@ -323,7 +323,7 @@ QScriptValue::PropertyFlags QScriptValueIterator::flags() const { Q_D(const QScriptValueIterator); if (!d || !d->initialized || !d->engine()) - return 0; + return {}; QScript::APIShim shim(d->engine()); return d->object()->propertyFlags(*d->current); } |