Merge remote-tracking branch 'origin/5.5' into 5.6
authorLiang Qi <liang.qi@theqtcompany.com>
Wed, 26 Aug 2015 18:06:57 +0000 (20:06 +0200)
committerLiang Qi <liang.qi@theqtcompany.com>
Wed, 26 Aug 2015 18:06:57 +0000 (20:06 +0200)
commitafab1546a7665bac2a8d7a6452e6aea46bfd2127
treed616a7559c54a40e35a12b464f606774c9b0475b
parent06b457c693f207e392d3021d77a0ab18cd78da92
parent53ecaade10319ecc1d8115521ae6d8eba1ee55c1
Merge remote-tracking branch 'origin/5.5' into 5.6

Conflicts:
qmake/doc/snippets/code/doc_src_qmake-manual.pro
qmake/doc/src/qmake-manual.qdoc
src/corelib/io/qstorageinfo_unix.cpp
src/corelib/tools/qbytearray.cpp
src/widgets/kernel/qwidgetwindow.cpp
tests/auto/corelib/io/qprocess/tst_qprocess.cpp
tests/auto/corelib/mimetypes/qmimedatabase/tst_qmimedatabase.cpp
tests/auto/network/access/qnetworkreply/BLACKLIST

Change-Id: I9efcd7e1cce1c394eed425c43aa6fce7d2edf31c
51 files changed:
mkspecs/common/msvc-desktop.conf
qmake/doc/snippets/code/doc_src_qmake-manual.pro
qmake/doc/src/qmake-manual.qdoc
qmake/generators/unix/unixmake2.cpp
qmake/generators/win32/msvc_vcproj.cpp
src/corelib/global/qnamespace.qdoc
src/corelib/io/qprocess.cpp
src/corelib/io/qprocess_win.cpp
src/corelib/io/qstorageinfo_unix.cpp
src/corelib/kernel/qobject.cpp
src/corelib/mimetypes/qmimeprovider.cpp
src/corelib/tools/qchar.cpp
src/corelib/tools/qregexp.cpp
src/corelib/tools/qregularexpression.cpp
src/gui/image/qimage.cpp
src/gui/kernel/qguiapplication.cpp
src/gui/opengl/qopenglshaderprogram.cpp
src/gui/painting/qimagescale.cpp
src/gui/text/qfontengine_p.h
src/gui/text/qtextlayout.cpp
src/network/access/qhttpnetworkconnection.cpp
src/network/access/qhttpnetworkconnectionchannel.cpp
src/network/access/qhttpnetworkreply.cpp
src/network/bearer/qnetworkconfigmanager_p.cpp
src/network/socket/qabstractsocket.cpp
src/network/ssl/qsslsocket_openssl.cpp
src/platformsupport/eglconvenience/qeglplatformcontext.cpp
src/plugins/platforms/cocoa/qnsview.mm
src/plugins/platforms/ios/qiostextresponder.mm
src/plugins/platforms/ios/qiosviewcontroller.mm
src/plugins/platforms/windows/qwindowsinputcontext.cpp
src/plugins/platforms/windows/qwindowswindow.cpp
src/plugins/platforms/xcb/qxcbconnection_xi2.cpp
src/plugins/platforms/xcb/qxcbwindow.cpp
src/widgets/graphicsview/qgraphicsitem.cpp
src/widgets/kernel/qapplication.cpp
src/widgets/kernel/qwidget.cpp
src/widgets/kernel/qwidgetwindow.cpp
src/widgets/styles/qmacstyle_mac.mm
src/widgets/widgets/qcombobox.cpp
src/widgets/widgets/qlineedit_p.cpp
src/widgets/widgets/qlineedit_p.h
src/widgets/widgets/qmenubar.cpp
tests/auto/corelib/io/qprocess/tst_qprocess.cpp
tests/auto/corelib/mimetypes/qmimedatabase/tst_qmimedatabase.cpp
tests/auto/corelib/tools/qregularexpression/tst_qregularexpression.cpp
tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp
tests/auto/network/socket/qudpsocket/tst_qudpsocket.cpp
tests/auto/other/qaccessibility/tst_qaccessibility.cpp
tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp
tests/auto/widgets/widgets/qmenubar/tst_qmenubar.cpp