Liang Qi 72f5867f14 Merge remote-tracking branch 'origin/5.6' into dev ... Conflicts: src/corelib/kernel/qcoreapplication.cpp src/corelib/kernel/qeventdispatcher_blackberry.cpp src/network/bearer/qnetworkconfiguration.cpp src/plugins/bearer/blackberry/qbbengine.cpp src/plugins/platforms/android/androidjnimain.cpp src/plugins/platforms/android/qandroidplatformtheme.cpp src/plugins/platforms/qnx/qqnxbpseventfilter.cpp src/plugins/platforms/qnx/qqnxfiledialoghelper_bb10.cpp src/plugins/platforms/qnx/qqnxinputcontext_imf.cpp src/plugins/platforms/qnx/qqnxintegration.cpp src/plugins/platforms/qnx/qqnxnavigatorbps.cpp src/plugins/platforms/qnx/qqnxvirtualkeyboardbps.cpp src/plugins/platforms/qnx/qqnxwindow.cpp src/widgets/kernel/qwidgetwindow.cpp src/widgets/styles/qwindowsvistastyle.cpp src/widgets/styles/qwindowsxpstyle.cpp src/widgets/widgets/qtoolbararealayout.cpp tests/auto/corelib/global/qflags/qflags.pro tests/auto/corelib/itemmodels/qitemmodel/modelstotest.cpp tests/auto/corelib/tools/qversionnumber/qversionnumber.pro tests/auto/widgets/dialogs/qfilesystemmodel/tst_qfilesystemmodel.cpp Change-Id: I37be88c6c185bb85404823353e027a0a6acdbce4		2015-12-02 23:33:06 +01:00
..
image	Merge remote-tracking branch 'origin/5.6' into dev	2015-12-02 23:33:06 +01:00
itemmodels	tests/auto/gui: Remove some placeholder formatting.	2015-10-19 08:06:53 +00:00
kernel	Merge remote-tracking branch 'origin/5.6' into dev	2015-12-02 23:33:06 +01:00
math3d	Tests: Fix single-character string literals.	2015-10-13 18:14:27 +00:00
painting	tests/auto/gui: Remove some placeholder formatting.	2015-10-19 08:06:53 +00:00
qopengl	Remove unneeded insignificant flag in qopengl	2015-11-24 11:02:37 +00:00
qopenglconfig	Merge remote-tracking branch 'origin/5.6' into dev	2015-09-25 14:02:04 +02:00
text	Remove insignificant flag for qstatictext test	2015-12-02 16:31:41 +00:00
util	Add flags to omit/reject padding in scientific notation exponents	2015-11-23 14:13:42 +00:00
gui.pro	Add qopenglconfig test.	2015-02-02 23:05:41 +00:00