qt5base-lts/qmake
Liang Qi b9585277e7 Merge remote-tracking branch 'origin/5.14' into 5.15
Conflicts:
	src/corelib/tools/qlinkedlist.h
	src/plugins/platforms/wasm/qwasmintegration.cpp
	src/plugins/platforms/wasm/qwasmscreen.cpp

Change-Id: Iefca7f9f4966bdc20e7052aca736874861055738
2020-02-18 09:26:53 +01:00
..
doc Doc: Document some missing CONFIG values 2020-02-13 11:34:01 +08:00
generators Merge remote-tracking branch 'origin/5.14' into 5.15 2020-02-18 09:26:53 +01:00
library qmake: Don't call QDir::count() over and over 2019-10-30 09:23:24 +01:00
cachekeys.h
main.cpp Fix qmake's sed functionality for input containing CR+LF newlines 2019-12-05 13:34:18 +01:00
Makefile.unix Split cborstream feature in two 2019-12-12 10:42:27 +01:00
Makefile.unix.macos
Makefile.unix.mingw
Makefile.unix.unix
Makefile.unix.win32 qmake: add $$read_registry() function 2019-01-05 20:33:07 +00:00
Makefile.win32 Split cborstream feature in two 2019-12-12 10:42:27 +01:00
meta.cpp qmake: Remove dead code 2019-04-05 07:48:34 +00:00
meta.h qmake: Remove dead code 2019-04-05 07:48:34 +00:00
option.cpp Make Qt relocatable 2019-09-07 20:02:45 +02:00
option.h Remove QMake's -createstub option 2019-08-03 14:48:10 +02:00
project.cpp qmake: use std names on a linked list 2019-05-13 16:39:22 +00:00
project.h qmake: use std names on a linked list 2019-05-13 16:39:22 +00:00
property.cpp Compile with QT_STRICT_ITERATORS defined 2018-11-26 07:04:24 +00:00
property.h
qmake_pch.h qmake: move QT_BEGIN_NAMESPACE to correct place 2018-12-19 19:21:35 +00:00
qmake-aux.pro
qmake.pro Split cborstream feature in two 2019-12-12 10:42:27 +01:00