Merge remote-tracking branch 'origin/4.15'

Change-Id: I75ffc79eeb8d73296a2271a636fae48e35427947
2021-05-05 11:46:19 +02:00
parent 103aa8be7c 97744a071a
commit b3a893e9b8
33 changed files with 455 additions and 68 deletions
--- a/src/plugins/qmlprofiler/qmlevent.h
+++ b/src/plugins/qmlprofiler/qmlevent.h
@@ -34,6 +34,7 @@
 #include <QMetaType>

 #include <initializer_list>
+#include <limits>
 #include <type_traits>

 namespace QmlProfiler {