diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2014-07-26 09:14:44 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2014-07-26 13:21:16 +0200 |
| commit | 75d8ebb3e6925f500ddeefe2ab491be2ae83264c (patch) | |
| tree | 6874c91386434f4a1934a9555a3f1d5daf69434c /src/qmltest | |
| parent | fcb40ff6d71f4561401e6b2bd4d7fc706fff8eee (diff) | |
| parent | ba8416b80f42c81387170620472194e7a76429b8 (diff) | |
Merge remote-tracking branch 'origin/5.3' into dev
Conflicts:
src/qml/compiler/qv4ssa.cpp
src/qml/jsruntime/qv4arrayobject.cpp
src/qml/jsruntime/qv4engine.cpp
Change-Id: Ie3ef6202b6a3a8521971e1be10c40c6a2db6989c
Diffstat (limited to 'src/qmltest')
| -rw-r--r-- | src/qmltest/quicktestresult.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qmltest/quicktestresult.cpp b/src/qmltest/quicktestresult.cpp index ab37be3c95..3329fd72e6 100644 --- a/src/qmltest/quicktestresult.cpp +++ b/src/qmltest/quicktestresult.cpp @@ -685,7 +685,7 @@ void QuickTestResult::stopBenchmark() QObject *QuickTestResult::grabImage(QQuickItem *item) { - if (item) { + if (item && item->window()) { QQuickWindow *window = item->window(); QImage grabbed = window->grabWindow(); QRectF rf(item->x(), item->y(), item->width(), item->height()); |