Liang Qi 3c662bf13c Merge remote-tracking branch 'origin/5.13.0' into 5.13 ... Conflicts: src/plugins/platforms/wasm/qwasmintegration.cpp src/plugins/platforms/wasm/qwasmintegration.h Change-Id: Idf4c7936513fb1f21daa8f6105b8545f13447bb8		2019-06-11 10:30:48 +02:00
..
unixmake.cpp	Make sure .pc, .prl and .la files are created for header_only modules	2019-06-03 15:06:29 +02:00
unixmake.h	qmake: fix the precedence of QMAKE_LIBDIR_POST	2018-10-12 18:06:49 +00:00
unixmake2.cpp	Merge remote-tracking branch 'origin/5.13.0' into 5.13	2019-06-11 10:30:48 +02:00