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
..
unixmake.cpp	Merge remote-tracking branch 'origin/5.13' into dev	2019-06-14 13:45:18 +02:00
unixmake.h	Clean up class definitions of makefile generators	2019-05-16 11:36:22 +00:00
unixmake2.cpp	Merge remote-tracking branch 'origin/5.13' into dev	2019-06-14 13:45:18 +02:00