Merge remote-tracking branch 'origin/5.3' into dev
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Wed, 2 Jul 2014 07:58:13 +0000 (09:58 +0200)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Wed, 2 Jul 2014 08:32:33 +0000 (10:32 +0200)
commit41e924eb6e1c690bc81d095fc5e8f57244aae964
treeb459dfa150530443901be68471df88c69ca7a7d4
parentd51afdb74fdcb9a5c7e1fdaa763325c78d794d06
parent87a5889029aed8c53a4b02a42804d036614db36b
Merge remote-tracking branch 'origin/5.3' into dev

Conflicts:
.qmake.conf
examples/quick/scenegraph/openglunderqml/squircle.h
src/quick/doc/src/qmltypereference.qdoc
src/quick/scenegraph/qsgthreadedrenderloop.cpp

Change-Id: Ife4f4b897044a7ffcd0710493c6aed1d87cf1ef9
examples/quick/scenegraph/openglunderqml/squircle.cpp
examples/quick/scenegraph/openglunderqml/squircle.h
src/qml/compiler/qv4jsir.cpp
src/qml/jsruntime/qv4qobjectwrapper.cpp
src/qml/qml/qqmlcomponent.cpp
src/qml/qml/qqmlengine.cpp
src/qml/qml/qqmlobjectcreator.cpp
src/quick/doc/src/qmltypereference.qdoc
src/quick/items/qquickwindow.cpp
src/quick/scenegraph/qsgthreadedrenderloop.cpp
tests/auto/quick/qquickwindow/tst_qquickwindow.cpp