review.tizen.org Git - platform/upstream/qtdeclarative.git/commit

projects / platform / upstream / qtdeclarative.git / commit

author	Frederik Gladhorn <frederik.gladhorn@digia.com>
	Fri, 9 May 2014 14:25:58 +0000 (16:25 +0200)
committer	Gunnar Sletta <gunnar.sletta@jollamobile.com>
	Sat, 10 May 2014 09:53:47 +0000 (11:53 +0200)
commit	66646dd8c37adb488a79ab274b2396a649674e6d
tree	b0f5ac752a52cec3de1d47692e09295197622dcd	tree \| snapshot
parent	da15ea0f3b5805db657f13060c21efa78f10cde2	commit \| diff
parent	d82a17b929dd88fe76258b0f801beaa1b2ee343e	commit \| diff

Merge remote-tracking branch 'origin/stable' into dev

Conflicts:
.qmake.conf
src/plugins/accessible/quick/quick.pro
src/quick/items/qquickpincharea.cpp
src/quick/scenegraph/coreapi/qsgbatchrenderer.cpp
src/quick/scenegraph/qsgthreadedrenderloop.cpp

Manually adjusted for TestHTTPServer constructor change:
tests/auto/quick/qquickimage/tst_qquickimage.cpp

Change-Id: I5e58a7c08ea92d6fc5e3bce98571c54f7b2ce08f

27 files changed:

src/imports/folderlistmodel/qquickfolderlistmodel.cpp	diff1 \|	diff2 \|	blob \| history
src/qml/compiler/qqmltypecompiler.cpp	diff1 \|	diff2 \|	blob \| history
src/quick/items/qquickitem.cpp	diff1 \|	diff2 \|	blob \| history
src/quick/items/qquickitemsmodule.cpp	diff1 \|	diff2 \|	blob \| history
src/quick/items/qquickmousearea.cpp	diff1 \|	diff2 \|	blob \| history
src/quick/items/qquickpincharea.cpp	diff1 \|	diff2 \|	blob \| history
src/quick/items/qquickrendercontrol.cpp	diff1 \|	diff2 \|	blob \| history
src/quick/items/qquicktextinput.cpp	diff1 \|	diff2 \|	blob \| history
src/quick/items/qquicktextinput_p.h	diff1 \|	diff2 \|	blob \| history
src/quick/items/qquickwindow.cpp	diff1 \|	diff2 \|	blob \| history
src/quick/scenegraph/coreapi/qsgbatchrenderer.cpp	diff1 \|	diff2 \|	blob \| history
src/quick/scenegraph/coreapi/qsgbatchrenderer_p.h	diff1 \|	diff2 \|	blob \| history
src/quick/scenegraph/qsgrenderloop.cpp	diff1 \|	diff2 \|	blob \| history
src/quick/scenegraph/qsgthreadedrenderloop.cpp	diff1 \|	diff2 \|	blob \| history
src/quick/scenegraph/qsgthreadedrenderloop_p.h	diff1 \|	diff2 \|	blob \| history
src/quick/scenegraph/qsgwindowsrenderloop.cpp	diff1 \|	diff2 \|	blob \| history
src/quick/scenegraph/util/qsgatlastexture.cpp	diff1 \|	diff2 \|	blob \| history
src/quick/scenegraph/util/qsgsimpletexturenode.cpp	diff1 \|	diff2 \|	blob \| history
tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp	diff1 \|	diff2 \|	blob \| history
tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp	diff1 \|	diff2 \|	blob \| history
tests/auto/quick/qquickimage/tst_qquickimage.cpp	diff1 \|	diff2 \|	blob \| history
tests/auto/quick/qquickitem/tst_qquickitem.cpp	diff1 \|	diff2 \|	blob \| history
tests/auto/quick/qquickitem2/tst_qquickitem.cpp	diff1 \|	diff2 \|	blob \| history
tests/auto/quick/qquicktextedit/tst_qquicktextedit.cpp	diff1 \|	diff2 \|	blob \| history
tests/auto/quick/qquicktextinput/tst_qquicktextinput.cpp	diff1 \|	diff2 \|	blob \| history
tests/auto/quick/qquickwindow/qquickwindow.pro	diff1 \|	diff2 \|	blob \| history
tests/auto/quick/qquickwindow/tst_qquickwindow.cpp	diff1 \|	diff2 \|	blob \| history

Domain: UI Framework / Qt;

RSS Atom

src/imports/folderlistmodel/qquickfolderlistmodel.cpp	diff1 \|	diff2 \|	blob \| history
src/qml/compiler/qqmltypecompiler.cpp	diff1 \|	diff2 \|	blob \| history
src/quick/items/qquickitem.cpp	diff1 \|	diff2 \|	blob \| history
src/quick/items/qquickitemsmodule.cpp	diff1 \|	diff2 \|	blob \| history
src/quick/items/qquickmousearea.cpp	diff1 \|	diff2 \|	blob \| history
src/quick/items/qquickpincharea.cpp	diff1 \|	diff2 \|	blob \| history
src/quick/items/qquickrendercontrol.cpp	diff1 \|	diff2 \|	blob \| history
src/quick/items/qquicktextinput.cpp	diff1 \|	diff2 \|	blob \| history
src/quick/items/qquicktextinput_p.h	diff1 \|	diff2 \|	blob \| history
src/quick/items/qquickwindow.cpp	diff1 \|	diff2 \|	blob \| history
src/quick/scenegraph/coreapi/qsgbatchrenderer.cpp	diff1 \|	diff2 \|	blob \| history
src/quick/scenegraph/coreapi/qsgbatchrenderer_p.h	diff1 \|	diff2 \|	blob \| history
src/quick/scenegraph/qsgrenderloop.cpp	diff1 \|	diff2 \|	blob \| history
src/quick/scenegraph/qsgthreadedrenderloop.cpp	diff1 \|	diff2 \|	blob \| history
src/quick/scenegraph/qsgthreadedrenderloop_p.h	diff1 \|	diff2 \|	blob \| history
src/quick/scenegraph/qsgwindowsrenderloop.cpp	diff1 \|	diff2 \|	blob \| history
src/quick/scenegraph/util/qsgatlastexture.cpp	diff1 \|	diff2 \|	blob \| history
src/quick/scenegraph/util/qsgsimpletexturenode.cpp	diff1 \|	diff2 \|	blob \| history
tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp	diff1 \|	diff2 \|	blob \| history
tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp	diff1 \|	diff2 \|	blob \| history
tests/auto/quick/qquickimage/tst_qquickimage.cpp	diff1 \|	diff2 \|	blob \| history
tests/auto/quick/qquickitem/tst_qquickitem.cpp	diff1 \|	diff2 \|	blob \| history
tests/auto/quick/qquickitem2/tst_qquickitem.cpp	diff1 \|	diff2 \|	blob \| history
tests/auto/quick/qquicktextedit/tst_qquicktextedit.cpp	diff1 \|	diff2 \|	blob \| history
tests/auto/quick/qquicktextinput/tst_qquicktextinput.cpp	diff1 \|	diff2 \|	blob \| history
tests/auto/quick/qquickwindow/qquickwindow.pro	diff1 \|	diff2 \|	blob \| history
tests/auto/quick/qquickwindow/tst_qquickwindow.cpp	diff1 \|	diff2 \|	blob \| history