Fix erroneous signal emission in Loader
authorChris Adams <christopher.adams@nokia.com>
Thu, 29 Mar 2012 01:14:59 +0000 (11:14 +1000)
committerQt by Nokia <qt-info@nokia.com>
Thu, 5 Apr 2012 07:50:05 +0000 (09:50 +0200)
commit5f1b7bf39298dafdd07e576eec2a6a367e80b264
tree4ecbeb5377c6ed19f7d2a1905c96a27fe72258bf
parent99fb61587da6b7e4707858d4188f0ccd24077504
Fix erroneous signal emission in Loader

Previously, the incubator wasn't cleared when a Loader was
deactivated.  This commit clears it on deactivate, and also
ensures that the loadedSignal isn't emitted on error.

Finally, it re-enables a network-loading-related unit test.

Change-Id: I5dac92aead2c221c5d45011accf59077f7c9b402
Reviewed-by: Martin Jones <martin.jones@nokia.com>
src/quick/items/qquickloader.cpp
tests/auto/quick/qquickloader/data/RedRect.qml [new file with mode: 0644]
tests/auto/quick/qquickloader/data/loadedSignal.2.qml [new file with mode: 0644]
tests/auto/quick/qquickloader/data/loadedSignal.qml [new file with mode: 0644]
tests/auto/quick/qquickloader/tst_qquickloader.cpp