Merge remote-tracking branch 'origin/stable' into dev
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Mon, 19 Aug 2013 07:47:35 +0000 (09:47 +0200)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Mon, 19 Aug 2013 07:47:35 +0000 (09:47 +0200)
commitd2628d9d7015e4b75007471d150acedecaa0c6c1
tree00ab012c7ae190d5a64788ee945ca006e3759e41
parentb6a6a6387e279c431d520243345530fa19bd96c5
parent566afc2d2e4156712ffec081715f12307cf46628
Merge remote-tracking branch 'origin/stable' into dev

Conflicts:
tests/auto/quick/qquickgridview/qquickgridview.pro
tests/auto/quick/qquickitem/qquickitem.pro

Change-Id: Ic54cafbdda1ac22757d2ee65dcc63a1b167c7556
examples/quick/dialogs/systemdialogs/FileDialogs.qml
src/quick/items/context2d/qquickcanvasitem.cpp
src/quick/items/qquickflickable.cpp
src/quick/items/qquickitem.cpp
src/quick/items/qquickwindow.cpp
tests/auto/qml/qqmlmoduleplugin/tst_qqmlmoduleplugin.cpp
tests/auto/quick/qquickgridview/qquickgridview.pro
tests/auto/quick/qquickitem/qquickitem.pro
tests/auto/quick/qquicktextedit/qquicktextedit.pro