Merge remote-tracking branch 'origin/stable' into dev
authorSimon Hausmann <simon.hausmann@digia.com>
Fri, 17 Jan 2014 06:11:26 +0000 (07:11 +0100)
committerSimon Hausmann <simon.hausmann@digia.com>
Fri, 17 Jan 2014 06:12:23 +0000 (07:12 +0100)
commitf596553e03c3969f6e7cb5344c05591da6e70dfb
tree8aef667749e1adc015cbc9c5ec5b5af9c6d4c15c
parente32845b137834ef46d68345a0029d4af7c1d85bb
parent7030adff1869e850a7b983e88d7a773d5d594886
Merge remote-tracking branch 'origin/stable' into dev

Conflicts:
.qmake.conf
src/imports/dialogs/DefaultFileDialog.qml
src/imports/widgets/qquickqfiledialog.cpp

Change-Id: I00de6dd05cb773f01254061d585a82c90b229acd
src/qml/compiler/qv4regalloc.cpp
src/qml/jsruntime/qv4context.cpp
src/qml/jsruntime/qv4context_p.h
src/qml/jsruntime/qv4engine.cpp
src/qml/jsruntime/qv4functionobject.cpp
src/qml/jsruntime/qv4mm.cpp
src/quick/items/qquickitem.cpp
src/quick/scenegraph/coreapi/qsgbatchrenderer.cpp
tests/auto/quick/qquickview/tst_qquickview.cpp