Liang Qi bc5f45052f Merge remote-tracking branch 'origin/5.9' into 5.10 ... Conflicts: src/corelib/global/qconfig-bootstrapped.h src/corelib/global/qglobal.h src/corelib/tools/qcryptographichash.cpp src/corelib/tools/qcryptographichash.h src/corelib/tools/qmessageauthenticationcode.cpp src/plugins/platforms/windows/qwindowswindow.h tests/auto/gui/kernel/qwindow/BLACKLIST tests/auto/widgets/itemviews/qitemdelegate/BLACKLIST Change-Id: Ib68112de985a3d714c2071f47c10e907e4f0229a		2017-10-04 13:41:04 +02:00
..
doc	Merge remote-tracking branch 'origin/5.9' into 5.10	2017-10-04 13:41:04 +02:00
generators	Merge remote-tracking branch 'origin/5.9' into dev	2017-08-31 14:31:31 +02:00
library	Merge remote-tracking branch 'origin/5.9' into dev	2017-08-31 14:31:31 +02:00
cachekeys.h
main.cpp	Win: Handle installation of read-only target files correctly	2017-09-13 12:45:35 +00:00
Makefile.unix	Move the readlink(2) wrapper to qcore_unix.cpp	2017-07-08 02:18:16 +00:00
Makefile.unix.macos	Merge remote-tracking branch 'origin/5.8' into dev	2016-12-13 09:39:20 +01:00
Makefile.unix.mingw	configure: put more of the makefile contents into template files	2016-11-23 09:38:14 +00:00
Makefile.unix.unix	Move the readlink(2) wrapper to qcore_unix.cpp	2017-07-08 02:18:16 +00:00
Makefile.unix.win32	QFileSystemEngine: Remove the remainder of Windows XP functions	2017-07-25 01:01:02 +00:00
Makefile.win32	QFileSystemEngine: Remove the remainder of Windows XP functions	2017-07-25 01:01:02 +00:00
meta.cpp
meta.h
option.cpp	Mark an unlikely test as such and condition in positive order	2017-07-07 18:09:44 +00:00
option.h	bump qmake version	2016-11-15 22:43:51 +00:00
project.cpp	qmake: use new QString::arg(QStringView) overload	2017-04-07 18:33:23 +00:00
project.h	Merge remote-tracking branch 'origin/5.7' into dev	2016-07-19 20:14:40 +02:00
property.cpp	move generation of qconfig.cpp (and qt.conf) to qmake-based configure	2016-12-13 18:56:12 +00:00
property.h	move generation of qconfig.cpp (and qt.conf) to qmake-based configure	2016-12-13 18:56:12 +00:00
qmake_pch.h
qmake-aux.pro	revert to building qmake with qconfig.cpp	2017-01-06 20:09:08 +00:00
qmake.pri	QFileSystemEngine: Remove the remainder of Windows XP functions	2017-07-25 01:01:02 +00:00
qmake.pro	configure: delete some dead code and outdated comments	2016-11-23 09:38:09 +00:00