Liang Qi 6a772fd201 Merge remote-tracking branch 'origin/5.9' into dev ... Conflicts: .qmake.conf mkspecs/common/msvc-desktop.conf mkspecs/win32-g++/qmake.conf mkspecs/win32-icc/qmake.conf src/platformsupport/fontdatabases/mac/coretext.pri src/plugins/platforms/cocoa/qcocoawindow.h src/plugins/platforms/cocoa/qcocoawindow.mm Change-Id: I74a6f7705c9547ed8bbac7260eb4645543e32655		2017-05-29 10:54:41 +02:00
..
.gitignore	Moving relevant tests to corelib/kernel	2011-09-01 12:42:14 +02:00
BLACKLIST	Blacklist tst_QTimer::remainingTime() on Windows and macOS	2017-02-14 13:30:12 +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