Liang Qi b1a216649e Merge remote-tracking branch 'origin/5.13' into dev ... Conflicts: qmake/generators/makefile.cpp qmake/generators/unix/unixmake2.cpp src/corelib/thread/qthread_unix.cpp tests/auto/corelib/tools/qsharedpointer/tst_qsharedpointer.cpp Change-Id: I1df0d4ba20685de7f9300bf07458c13376493408		2019-06-14 13:45:18 +02:00
..
.gitignore	Moved tests into integrationtests/ and widgets/	2011-10-20 19:45:41 +02:00
BLACKLIST	tst_QItemDelegate: try to stabilize combobox test	2019-01-25 14:47:17 +00:00
qitemdelegate.pro	Migrate Windows system libs to external dependencies	2019-05-08 08:30:02 +00:00
tst_qitemdelegate.cpp	Merge remote-tracking branch 'origin/5.12' into 5.13	2019-06-07 13:19:27 +02:00