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
..
data	Account for QPolygonF type when loading/saving the QVariant	2013-10-15 08:14:48 +02:00
stream	Split the QGuiVariant test from the Core one.	2012-07-25 00:48:33 +02:00
black2.png	Compare QIcon QVariants by their cache key	2013-10-09 13:15:54 +02:00
black.png	Compare QIcon QVariants by their cache key	2013-10-09 13:15:54 +02:00
qguivariant.qrc	Account for QPolygonF type when loading/saving the QVariant	2013-10-15 08:14:48 +02:00
test.pro	Tests: Remove CONFIG += parallel_test.	2015-09-05 07:16:50 +00:00
tst_qguivariant.cpp	Merge remote-tracking branch 'origin/5.6' into dev	2015-12-02 23:33:06 +01:00
tst_qguivariant.qrc	Compare QIcon QVariants by their cache key	2013-10-09 13:15:54 +02:00