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
..
dialogs	Merge remote-tracking branch 'origin/5.6' into dev	2015-10-14 15:45:35 +02:00
doc	Doc: Update examplesinstallpath to include the repository name	2015-10-21 09:50:16 +00:00
kernel	Merge remote-tracking branch 'origin/5.6' into dev	2015-12-02 23:33:06 +01:00
widgets	Make QWidget *=0, Qt::WindowFlags f=0 functions use Q_NULLPTR	2015-07-04 06:03:52 +00:00
printsupport.pro	Revert "Automatically link printsupport plugins to static applications."	2014-04-18 07:44:57 +02:00