diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-01-17 13:22:37 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-01-17 13:22:37 (GMT) |
| commit | ae0455673c4d9721d8a26a3a01a1b56c7e5fac8f (patch) | |
| tree | 0e55c64668c4cc51c8c31ea99e0f2f5da5a6277d /src/script | |
| parent | 77c4df1325c4bae10c99978a325febada9fd82d0 (diff) | |
| parent | e7907b32c323400562607253ec293e814c015f7a (diff) | |
| download | Qt-ae0455673c4d9721d8a26a3a01a1b56c7e5fac8f.zip Qt-ae0455673c4d9721d8a26a3a01a1b56c7e5fac8f.tar.gz Qt-ae0455673c4d9721d8a26a3a01a1b56c7e5fac8f.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-air-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-air-staging:
Fix QScriptValueIterator::hasNext and QScriptValueIterator::hasPrevious
Diffstat (limited to 'src/script')
| -rw-r--r-- | src/script/api/qscriptvalueiterator.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/script/api/qscriptvalueiterator.cpp b/src/script/api/qscriptvalueiterator.cpp index c188945..5f53b46 100644 --- a/src/script/api/qscriptvalueiterator.cpp +++ b/src/script/api/qscriptvalueiterator.cpp @@ -162,7 +162,7 @@ QScriptValueIterator::~QScriptValueIterator() bool QScriptValueIterator::hasNext() const { Q_D(const QScriptValueIterator); - if (!d) + if (!d || !d->engine()) return false; const_cast<QScriptValueIteratorPrivate*>(d)->ensureInitialized(); @@ -198,7 +198,7 @@ void QScriptValueIterator::next() bool QScriptValueIterator::hasPrevious() const { Q_D(const QScriptValueIterator); - if (!d) + if (!d || !d->engine()) return false; const_cast<QScriptValueIteratorPrivate*>(d)->ensureInitialized(); |