Merge remote-tracking branch 'origin/5.5' into 5.6
authorLiang Qi <liang.qi@theqtcompany.com>
Mon, 24 Aug 2015 14:18:23 +0000 (16:18 +0200)
committerLiang Qi <liang.qi@theqtcompany.com>
Mon, 24 Aug 2015 14:18:23 +0000 (16:18 +0200)
commitc9425926e13fcfbd8fe5b69d658fadab928f1d16
tree05e7f0ed43882bd9f8dd30ecd38df25906f45656
parentf587983764be7d127305d350c76702b7e28ea0f1
parent56e7af096e889d56ef67baabf38529c0ccb8d8b5
Merge remote-tracking branch 'origin/5.5' into 5.6

Conflicts:
qt3d
qtactiveqt
qtandroidextras
qtbase
qtcanvas3d
qtconnectivity
qtdeclarative
qtdoc
qtenginio
qtgraphicaleffects
qtimageformats
qtlocation
qtmacextras
qtmultimedia
qtqa
qtquick1
qtquickcontrols
qtrepotools
qtscript
qtsensors
qtserialport
qtsvg
qttools
qttranslations
qtwayland
qtwebchannel
qtwebengine
qtwebkit
qtwebkit-examples
qtwebsockets
qtwinextras
qtx11extras
qtxmlpatterns

Change-Id: I7410d9be5775ab276fb5a57adb397f4f92d77a50