Liang Qi 25eb97d2d4 Merge remote-tracking branch 'origin/5.13' into dev ... Conflicts: .qmake.conf src/network/ssl/qsslsocket_openssl.cpp Done-With: Timur Pocheptsov <timur.pocheptsov@qt.io> Change-Id: Ibb57a0548b4977797b400637487a56245ac1c024		2019-06-27 14:38:03 +02:00
..
ioutils.cpp	QRegExp include cleanup	2019-04-19 21:21:17 +00:00
ioutils.h	qmake: minor fixups to ioutils for building in qt creator context	2018-03-29 18:15:35 +00:00
proitems.cpp	Add QDebug streaming operator for ProString	2019-06-24 17:40:07 +02:00
proitems.h	Merge remote-tracking branch 'origin/5.13' into dev	2019-06-27 14:38:03 +02:00
qmake_global.h	Updated license headers	2016-01-21 18:55:18 +00:00
qmakebuiltins.cpp	qmake: use std names on a linked list	2019-05-13 16:39:22 +00:00
qmakeevaluator_p.h	QRegExp include cleanup	2019-04-19 21:21:17 +00:00
qmakeevaluator.cpp	qmake: Let evaluateFunction() return error for infinite recursion	2019-06-18 11:23:03 +02:00
qmakeevaluator.h	qmake: replace QLinkedList with std::list	2019-05-13 19:18:59 +00:00
qmakeglobals.cpp	QRegExp include cleanup	2019-04-19 21:21:17 +00:00
qmakeglobals.h	qmake: updates to the parsing code of external properties	2018-03-29 18:15:29 +00:00
qmakeparser.cpp	qmake: fix file id mapping lifetime management	2018-08-24 12:16:37 +00:00
qmakeparser.h	qmake: fix file id mapping lifetime management	2018-08-24 12:16:37 +00:00
qmakevfs.cpp	Fix crash in qmake parsing	2018-11-29 07:46:02 +00:00
qmakevfs.h	Merge remote-tracking branch 'origin/5.11' into 5.12	2018-11-09 10:34:33 +01:00
registry_p.h	qmake: add $$read_registry() function	2019-01-05 20:33:07 +00:00
registry.cpp	qmake: add $$read_registry() function	2019-01-05 20:33:07 +00:00