Qt Forward Merge Bot 58c69df4d3 Merge remote-tracking branch 'origin/5.15' into dev ... Conflicts: src/corelib/tools/qhash.h src/gui/kernel/qevent.h src/widgets/kernel/qshortcut.cpp src/widgets/kernel/qshortcut.h Change-Id: If61c206ee43ad1d97f5b07f58ac93c4583ce5620		2019-11-25 11:30:04 +01:00
..
doc	Doc: Fix QMAKE_EXTRA_TARGETS snippet description	2019-10-10 14:43:15 +02:00
generators	Merge remote-tracking branch 'origin/5.15' into dev	2019-11-25 11:30:04 +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 qinstall on Windows for directories containing read-only files	2019-08-15 09:24:14 +02:00
Makefile.unix	Make QList an alias to QVector	2019-10-30 11:52:48 +01:00
Makefile.unix.macos
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	qmake: add $$read_registry() function	2019-01-05 20:33:07 +00:00
Makefile.win32	Merge remote-tracking branch 'origin/5.15' into dev	2019-11-25 11:30:04 +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	Remove leftovers from QML1	2019-10-10 11:28:19 +02: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	revert to building qmake with qconfig.cpp	2017-01-06 20:09:08 +00:00
qmake.pro	Reimplement JSON support on top of Cbor	2019-10-21 19:12:51 +02:00