Merge remote-tracking branch 'origin/5.5' into dev
authorLiang Qi <liang.qi@theqtcompany.com>
Tue, 30 Jun 2015 07:08:35 +0000 (09:08 +0200)
committerLiang Qi <liang.qi@theqtcompany.com>
Tue, 30 Jun 2015 07:08:35 +0000 (09:08 +0200)
commit5112821a37ab749f758e354e84703df2d09d5471
tree8f19ba6e7661109675b5e1e9b0ddae94b4c96d4f
parent5d2ea1d5e9d6e29a16d0e9333cfc2dc8e7c5b677
parenta3f686cf7cc14ff481b972b1170a7ff76d0e0fd0
Merge remote-tracking branch 'origin/5.5' into dev

Conflicts:
.qmake.conf
src/qml/qml/qqmlengine.cpp
src/quick/items/qquickitemsmodule.cpp
tools/qml/main.cpp

Change-Id: Ida8daf6b4d7e675385f2f5514c446e52dedaf136
18 files changed:
src/qml/compiler/qqmltypecompiler.cpp
src/qml/debugger/qqmldebug.h
src/qml/debugger/qqmldebugserver.cpp
src/qml/qml/qqmlcomponent.cpp
src/qml/qml/qqmlvaluetype.cpp
src/qml/qml/qqmlvaluetype_p.h
src/qml/qml/qqmlvaluetypewrapper.cpp
src/quick/items/qquickimage_p.h
src/quick/items/qquickimagebase.cpp
src/quick/items/qquickimagebase_p.h
src/quick/items/qquickitemsmodule.cpp
src/quick/items/qquicklistview.cpp
src/quick/items/qquickloader.cpp
src/quick/scenegraph/qsgdefaultglyphnode_p.cpp
src/quick/scenegraph/util/qsgatlastexture.cpp
src/quickwidgets/qquickwidget.cpp
tests/auto/quick/qquicklistview/tst_qquicklistview.cpp
tools/qml/main.cpp