Liang Qi 9d67bf6e96 Merge remote-tracking branch 'origin/5.12' into 5.13 ... Conflicts: src/corelib/tools/qlocale.qdoc tests/auto/corelib/io/qfileinfo/tst_qfileinfo.cpp Done-with: Edward Welbourne <edward.welbourne@qt.io> Done-with: Volker Hilsheimer <volker.hilsheimer@qt.io> Change-Id: I88e0757b2d020f0a244714c87844631df4b3fd13		2019-04-16 09:34:50 +02:00
..
cmake	Merge remote-tracking branch 'origin/5.12' into 5.13	2019-04-16 09:34:50 +02:00
mac	macOS: Fix Objective-C namespaceing with Xcode 10	2018-12-03 20:13:13 +00:00
unix	findclasslist.pl: namespaces can be exported too	2016-10-13 08:29:02 +00:00
configure.json	configure: log -I and -L before doing first library check	2018-11-21 23:07:34 +00:00
dummy.cpp	Implement a more direct headersclean check	2015-04-17 00:54:45 +00:00
dumpvcvars.bat	qmake: rewrite msvc/nmake cross-build environment setup	2019-01-05 20:33:24 +00:00
macros.cpp	qmake: add default path and version detection for ghs toolchain	2018-08-17 15:07:00 +00:00