Merge remote-tracking branch 'origin/release' into stable
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Thu, 12 Dec 2013 17:06:30 +0000 (18:06 +0100)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Thu, 12 Dec 2013 17:06:30 +0000 (18:06 +0100)
commit82913414623f36acb3d2c07d6c124af9f61fcdb4
tree610f66dd1fcb487e20bbf18587e8cfad38a40826
parentd34098d8981d9103626ff7264e7b5ec084bfb63e
parentf95fdacb3a12e4f0d37d3c32b34326f2bd1536de
Merge remote-tracking branch 'origin/release' into stable

Conflicts:
src/qml/qml/qqmlcompiler.cpp

Change-Id: I802731139d47c5b733dd805f7bf432d67d7331e1
src/qml/jsruntime/qv4jsonobject.cpp
src/qml/qml/qqmlcompiler.cpp
src/qml/qml/qqmlengine.cpp
src/qml/qml/qqmltypeloader.cpp
src/quick/scenegraph/qsgthreadedrenderloop.cpp
src/quick/util/qquickpixmapcache.cpp