Qt Forward Merge Bot 75c0ffaf6d Merge remote-tracking branch 'origin/5.15' into dev ... Conflicts: examples/network/bearermonitor/CMakeLists.txt examples/network/CMakeLists.txt src/corelib/tools/qlinkedlist.h src/sql/kernel/qsqldriver_p.h src/sql/kernel/qsqlresult_p.h src/widgets/kernel/qwidget.cpp src/widgets/kernel/qwidget_p.h tests/auto/network/socket/platformsocketengine/tst_platformsocketengine.cpp tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp tests/auto/tools/moc/allmocs_baseline_in.json Change-Id: I21a3c34570ae79ea9d30107fae71759d7eac17d9		2020-02-26 18:39:21 +01:00
..
mac	Xcode: Use output directory as SYMROOT when shadow-building	2019-12-12 14:56:31 +01:00
unix	Merge remote-tracking branch 'origin/5.14' into 5.15	2020-02-18 09:26:53 +01:00
win32	Merge remote-tracking branch 'origin/5.14' into 5.15	2020-02-18 09:26:53 +01:00
makefile.cpp	Purge the dep_cd_cmd parameter from callExtraCompilerDependCommand	2020-01-24 13:25:06 +01:00
makefile.h	Purge the dep_cd_cmd parameter from callExtraCompilerDependCommand	2020-01-24 13:25:06 +01:00
makefiledeps.cpp	Fix developer build with -Werror	2019-10-15 10:46:06 +00:00
makefiledeps.h	Fix developer build with -Werror	2019-10-15 10:46:06 +00:00
metamakefile.cpp	qmake: Avoid writing glue project file when only generating prl files	2019-10-09 02:10:03 +02:00
metamakefile.h	qmake: Apply modernize-use-nullptr	2018-08-08 17:30:32 +00:00
projectgenerator.cpp	Merge remote-tracking branch 'origin/5.13' into 5.14	2019-09-04 07:03:54 +02:00
projectgenerator.h	Merge remote-tracking branch 'origin/5.13' into dev	2019-06-14 13:45:18 +02:00
xmloutput.cpp	Merge remote-tracking branch 'origin/5.13' into dev	2019-08-16 01:00:33 +02:00
xmloutput.h	Updated license headers	2016-01-21 18:55:18 +00:00