diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2016-10-13 14:39:47 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2016-10-13 14:40:30 +0200 |
| commit | 042640042491106a2f5cbb6a93bbf8c0cade0b9d (patch) | |
| tree | 259e412414fc86508b4c066a928d7b01c3d3a0b6 /src/qml/jsruntime/qv4persistent.cpp | |
| parent | 6df6c10e1af827d06a387e7422176dd310cf83be (diff) | |
| parent | f720242419cd73529277173e43e9f7a8ed367ad3 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.8
Change-Id: I175b27337b534c0b8f46a4a792d2c43cde73ffc4
Diffstat (limited to 'src/qml/jsruntime/qv4persistent.cpp')
| -rw-r--r-- | src/qml/jsruntime/qv4persistent.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qml/jsruntime/qv4persistent.cpp b/src/qml/jsruntime/qv4persistent.cpp index 7ca0692804..a892194df3 100644 --- a/src/qml/jsruntime/qv4persistent.cpp +++ b/src/qml/jsruntime/qv4persistent.cpp @@ -139,7 +139,7 @@ PersistentValueStorage::Iterator &PersistentValueStorage::Iterator::operator++() while (p) { while (index < kEntriesPerPage - 1) { ++index; - if (static_cast<Page *>(p)->values[index].tag() != QV4::Value::Empty_Type) + if (!static_cast<Page *>(p)->values[index].isEmpty()) return *this; } index = -1; |