qmlscene can start with either an Item or Window as the qml root
authorShawn Rutledge <shawn.rutledge@digia.com>
Mon, 5 Nov 2012 10:04:21 +0000 (11:04 +0100)
committerThe Qt Project <gerrit-noreply@qt-project.org>
Mon, 5 Nov 2012 17:09:26 +0000 (18:09 +0100)
commita3220e460bdcb9bc878bfe37721a7798ac8c2d64
treed7549624410ebde94c920314c4d5d80f3dbef0d8
parent0b019fcc52560d0a7016f733cb2bea3e03893ec0
qmlscene can start with either an Item or Window as the qml root

Before, it assumed that the root is an Item and needs to have a
Window created.  But it's useful for an application to have a Window
as the root, and it was already possible by writing a different C++
main function (see qtdeclarative/examples/window/window/window.cpp).
It doesn't take much to give qmlscene this flexibility too.

Change-Id: Ie808e78a42074e13aa9d3c87723ec9ac8fdbaf4a
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
src/quick/items/qquickview.cpp
src/quick/items/qquickview.h
tests/auto/qml/debugger/qqmldebugjs/tst_qqmldebugjs.cpp
tests/auto/qml/debugger/qqmlinspector/data/window.qml [new file with mode: 0644]
tests/auto/qml/debugger/qqmlinspector/tst_qqmlinspector.cpp
tools/qmlscene/main.cpp