Liang Qi c2b224a758 Merge remote-tracking branch 'origin/5.9' into dev ... Conflicts: src/corelib/io/qprocess_unix.cpp src/plugins/platforms/xcb/qxcbconnection.cpp src/plugins/platforms/xcb/qxcbwindow.cpp src/widgets/util/util.pri tests/auto/corelib/thread/qthread/qthread.pro tests/auto/corelib/thread/qthread/tst_qthread.cpp Change-Id: I5c45ab54d46d3c75a5c6c116777ebf5bc47a871b		2017-07-04 16:05:53 +02:00
..
.gitignore
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-07-04 16:05:53 +02:00