qt5base-lts/tests/auto/widgets/kernel/qshortcut
Liang Qi 158a3a4159 Merge remote-tracking branch 'origin/5.6' into dev
Conflicts:
	src/corelib/io/qiodevice_p.h
	src/corelib/kernel/qvariant_p.h
	src/corelib/tools/qsimd.cpp
	src/gui/kernel/qguiapplication.cpp
	tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp

Change-Id: I742a093cbb231b282b43e463ec67173e0d29f57a
2016-01-21 08:17:21 +01:00
..
.gitignore Move tst_qshortcut.cpp to QtWidgets 2012-03-12 21:38:51 +01:00
qshortcut.pro QtWidgets tests: Remove DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 2013-03-28 02:02:14 +01:00
tst_qshortcut.cpp Merge remote-tracking branch 'origin/5.6' into dev 2016-01-21 08:17:21 +01:00