Remove interim compatibility measures
authorAlan Alpert <alan.alpert@nokia.com>
Tue, 7 Aug 2012 01:26:37 +0000 (11:26 +1000)
committerThe Qt Project <gerrit-noreply@qt-project.org>
Tue, 16 Oct 2012 05:24:06 +0000 (07:24 +0200)
commitf21e9ba6efa2b1c8169491db271f79b87b5b0ce4
tree6eabf1ad37e12247f210e3fe77f64abf6255aa56
parentcc39a7d7affe37741292989c634aec3f60660c0e
Remove interim compatibility measures

Also update some variables in qtdeclarative which failed to update
rootItem->contentItem.

Change-Id: Id34e29546a22a74a7ae2ad90ee3a8def6fc541d3
Reviewed-by: Alan Alpert <416365416c@gmail.com>
28 files changed:
examples/quick/scenegraph/openglunderqml/squircle.cpp
src/plugins/accessible/quick/qaccessiblequickview.cpp
src/plugins/qmltooling/qmldbg_qtquick2/highlight.cpp
src/plugins/qmltooling/qmldbg_qtquick2/inspecttool.cpp
src/plugins/qmltooling/qmldbg_qtquick2/inspecttool.h
src/plugins/qmltooling/qmldbg_qtquick2/qquickviewinspector.cpp
src/qmltest/quicktestresult.cpp
src/quick/items/items.pri
src/quick/items/qquickcanvas.h [deleted file]
src/quick/items/qquickitem.h
src/quick/items/qquickmousearea.cpp
src/quick/items/qquickview.cpp
src/quick/items/qquickwindow.cpp
src/quick/items/qquickwindow.h
src/quick/items/qquickwindow_p.h
tests/auto/quick/examples/tst_examples.cpp
tests/auto/quick/qquickapplication/tst_qquickapplication.cpp
tests/auto/quick/qquickdrag/tst_qquickdrag.cpp
tests/auto/quick/qquickdroparea/tst_qquickdroparea.cpp
tests/auto/quick/qquickfocusscope/tst_qquickfocusscope.cpp
tests/auto/quick/qquickitem/tst_qquickitem.cpp
tests/auto/quick/qquickitemlayer/tst_qquickitemlayer.cpp
tests/auto/quick/qquickpainteditem/tst_qquickpainteditem.cpp
tests/auto/quick/qquickpositioners/tst_qquickpositioners.cpp
tests/auto/quick/qquicktextedit/tst_qquicktextedit.cpp
tests/auto/quick/qquicktextinput/tst_qquicktextinput.cpp
tests/auto/quick/qquickvisualdatamodel/tst_qquickvisualdatamodel.cpp
tests/auto/quick/qquickwindow/tst_qquickwindow.cpp