diff options
| author | Richard Dale <richard.dale@codethink.co.uk> | 2013-07-04 09:56:26 +0100 |
|---|---|---|
| committer | Richard Dale <richard.dale@codethink.co.uk> | 2013-07-04 09:56:26 +0100 |
| commit | 774d0310883a9526210c4530bbb9d0af26d88699 (patch) | |
| tree | d79e075f964ef213a31ee290c00d9438f3b139dc /tools/qmlscene/main.cpp | |
| parent | 9b3d0a24b65f6a0725951a4df0239ef19a8d3f64 (diff) | |
| parent | 811337a73c160447e5218ae55e93df99ac3d9edd (diff) | |
| download | qtdeclarative-774d0310883a9526210c4530bbb9d0af26d88699.tar.gz | |
Merge v5.1.0 releasebaserock/morph
Diffstat (limited to 'tools/qmlscene/main.cpp')
| -rw-r--r-- | tools/qmlscene/main.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/tools/qmlscene/main.cpp b/tools/qmlscene/main.cpp index d572487218..8a48445d63 100644 --- a/tools/qmlscene/main.cpp +++ b/tools/qmlscene/main.cpp @@ -483,7 +483,9 @@ int main(int argc, char ** argv) QObject *topLevel = component->create(); QQuickWindow *window = qobject_cast<QQuickWindow *>(topLevel); QQuickView* qxView = 0; - if (!window) { + if (window) { + engine.setIncubationController(window->incubationController()); + } else { QQuickItem *contentItem = qobject_cast<QQuickItem *>(topLevel); if (contentItem) { qxView = new QQuickView(&engine, NULL); |