Liang Qi 7cbee56296 Merge remote-tracking branch 'origin/5.9' into dev ... Conflicts: src/widgets/widgets/qmenu.cpp Change-Id: I6d3baf56eb24501cddb129a3cb6b958ccc25a308		2017-06-07 14:02:43 +02:00
..
.gitignore	Moving relevant tests to corelib/kernel	2011-09-01 12:42:14 +02:00
BLACKLIST	Blacklist tst_QTimer::basic_chrono on macOS	2017-06-01 07:27:59 +00:00
qtimer.pro	Adapt to the C++ SIC introduced by P0021: noexcept overloading	2017-01-14 03:24:30 +00:00
tst_qtimer.cpp	Merge remote-tracking branch 'origin/5.9' into dev	2017-05-29 10:54:41 +02:00