diff options
| author | Tim Jenssen <tim.jenssen@qt.io> | 2022-10-04 15:21:56 +0200 |
|---|---|---|
| committer | Tim Jenssen <tim.jenssen@qt.io> | 2022-10-04 13:44:42 +0000 |
| commit | 964f539e559f0bb51204a10ad6147bda3a1924d0 (patch) | |
| tree | 056b43eeec5ea5cb4aac35fc6476089906ce5d21 /src/plugins/qmlprofiler/qmleventtype.h | |
| parent | 993fd2a92a9e90c9e06f161b40eb5b0201169ade (diff) | |
| parent | 47887da778215045831d8284cf896e8934e75cda (diff) | |
Merge remote-tracking branch 'origin/8.0' into 9.0
resolved conflicts:
* doc/qtdesignstudio/src/developers/studio-designer-developer-workflow.qdoc
* src/plugins/qmldesigner/components/edit3d/edit3dwidget.cpp
* src/plugins/qmldesigner/components/materialbrowser/materialbrowserview.cpp
* src/plugins/qmldesigner/components/navigator/choosefrompropertylistdialog.cpp
and compile fix in materialbrowserview.cpp
Change-Id: I686e7e93ded8ac1afc792942ded47cd9fe4341ed
Diffstat (limited to 'src/plugins/qmlprofiler/qmleventtype.h')
| -rw-r--r-- | src/plugins/qmlprofiler/qmleventtype.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/qmlprofiler/qmleventtype.h b/src/plugins/qmlprofiler/qmleventtype.h index e2d91c14f3..74aa91ba25 100644 --- a/src/plugins/qmlprofiler/qmleventtype.h +++ b/src/plugins/qmlprofiler/qmleventtype.h @@ -17,7 +17,7 @@ class QmlEventType : public Timeline::TraceEventType { public: static const qint32 staticClassId = 0x716d6c74; // 'qmlt'; - QmlEventType(Message message = MaximumMessage, RangeType rangeType = MaximumRangeType, + QmlEventType(Message message = UndefinedMessage, RangeType rangeType = UndefinedRangeType, int detailType = -1, const QmlEventLocation &location = QmlEventLocation(), const QString &data = QString(), const QString &displayName = QString()); |