Liang Qi 8559bf934d Merge remote-tracking branch 'origin/5.11' into dev ... Conflicts: src/corelib/global/qconfig-bootstrapped.h src/plugins/platforms/xcb/qxcbbackingstore.cpp Done-with: Gatis Paeglis <gatis.paeglis@qt.io> Change-Id: I4af138ffb2f5306373244523768209e8873b2798		2018-08-16 18:48:59 +02:00
..
doc	Merge branch '5.11' into dev	2018-07-31 13:33:14 +02:00
generators	Merge remote-tracking branch 'origin/5.11' into dev	2018-08-16 18:48:59 +02:00
library	qmake: Apply modernize-use-nullptr	2018-08-08 17:30:32 +00:00
cachekeys.h
main.cpp	qmake: Apply modernize-use-nullptr	2018-08-08 17:30:32 +00:00
Makefile.unix	Add qbswap for a memory region	2018-07-04 03:04:40 +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	fix "make clean" of qmake in a builddir with spaces on mingw	2017-12-14 18:06:31 +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	Fix builds with some MinGW distributions	2018-08-02 07:10:00 +00:00
Makefile.win32	Merge branch '5.11' into dev	2018-07-31 13:33:14 +02:00
meta.cpp	qmake: refactor QMakeMetaInfo::findLib() interface	2018-07-16 15:44:23 +00:00
meta.h	qmake: refactor QMakeMetaInfo::findLib() interface	2018-07-16 15:44:23 +00:00
option.cpp	qmake: Apply modernize-use-nullptr	2018-08-08 17:30:32 +00:00
option.h	qmake: Apply modernize-use-nullptr	2018-08-08 17:30:32 +00:00
project.cpp	qmake: make argument validation of built-ins data driven	2018-06-27 17:23:57 +00:00
project.h	Merge remote-tracking branch 'origin/5.7' into dev	2016-07-19 20:14:40 +02:00
property.cpp	qmake: Apply modernize-use-nullptr	2018-08-08 17:30:32 +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.pro	qmake: improve the fake project	2018-08-06 10:25:50 +00:00