qt5base-lts/config.tests/arch
Liang Qi 44c393f9b6 Merge remote-tracking branch 'origin/5.12' into 5.13
Conflicts:
	config.tests/arch/write_info.pri
		Repair architecture config test for the WASM_OBJECT_FILES=1 build mode
	configure.pri
	tests/auto/gui/text/qtextdocument/tst_qtextdocument.cpp

Done-With: Jörg Bornemann <joerg.bornemann@qt.io>
Change-Id: I9e12088356eb5bc65b53211cd7a8e330cccd1bb4
2019-08-12 13:23:11 +02:00
..
arch_host.pro Fix host architecture detection for canadian cross builds 2019-08-08 14:26:11 +02:00
arch.cpp SIMD: Remove unused (and unlikely to be ever used) AVX-512 profiles 2018-06-25 18:49:33 +00:00
arch.pro Fix host architecture detection for canadian cross builds 2019-08-08 14:26:11 +02:00
write_info.pri Merge remote-tracking branch 'origin/5.12' into 5.13 2019-08-12 13:23:11 +02:00