Simon Hausmann ff922e7b87 Merge remote-tracking branch 'origin/5.15' into dev ... Conflicts: src/corelib/kernel/qmetatype.cpp Change-Id: I88eb0d3e9c9a38abf7241a51e370c655ae74e38a		2020-03-16 18:41:27 +01:00
..
qaction	Regenerate projects one last time before merge	2020-02-12 17:30:49 +00:00
qactiongroup	Merge remote-tracking branch 'origin/dev' into wip/cmake	2019-11-19 13:53:21 +01:00
qapplication	Regenerate projects one last time before merge	2020-02-12 17:30:49 +00:00
qboxlayout	Regenerate projects one last time before merge	2020-02-12 17:30:49 +00:00
qdesktopwidget	cmake: add widgets/kernel tests	2019-10-31 09:49:03 +00:00
qformlayout	Regenerate projects one last time before merge	2020-02-12 17:30:49 +00:00
qgesturerecognizer	Regenerate projects one last time before merge	2020-02-12 17:30:49 +00:00
qgridlayout	Regenerate projects one last time before merge	2020-02-12 17:30:49 +00:00
qlayout	Regenerate projects one last time before merge	2020-02-12 17:30:49 +00:00
qshortcut	Merge remote-tracking branch 'origin/dev' into merge-dev	2020-01-24 13:17:33 +01:00
qsizepolicy	Regenerate projects one last time before merge	2020-02-12 17:30:49 +00:00
qstackedlayout	Merge remote-tracking branch 'origin/dev' into wip/cmake	2019-11-19 13:53:21 +01:00
qtooltip	Merge remote-tracking branch 'origin/dev' into wip/cmake	2019-11-19 13:53:21 +01:00
qwidget	CMake: Regenerate tests projects	2020-03-12 11:41:39 +01:00
qwidget_window	Merge remote-tracking branch 'origin/5.15' into dev	2020-03-16 18:41:27 +01:00
qwidgetaction	Regenerate projects one last time before merge	2020-02-12 17:30:49 +00:00
qwidgetmetatype	cmake: add widgets/kernel tests	2019-10-31 09:49:03 +00:00
qwidgetsvariant	cmake: add widgets/kernel tests	2019-10-31 09:49:03 +00:00
qwindowcontainer	Merge remote-tracking branch 'origin/dev' into wip/cmake	2019-11-19 13:53:21 +01:00
CMakeLists.txt	cmake: add widgets/kernel tests	2019-10-31 09:49:03 +00:00
kernel.pro	Fix inversed qmake logic for widget action tests	2020-02-20 09:05:28 +01:00