Merge remote-tracking branch 'origin/12.0'

 Conflicts:
	cmake/QtCreatorIDEBranding.cmake
	qbs/modules/qtc/qtc.qbs

Change-Id: I937d301156dac0d20b43e7a14b41a319eff57698

2 files changed, 10 insertions, 10 deletions

diff --git a/src/libs/tracing/traceevent.h b/src/libs/tracing/traceevent.h
index d9de9641797..99a17814a85 100644
--- a/src/libs/tracing/traceevent.h
+++ b/src/libs/tracing/traceevent.h
@@ -14,6 +14,11 @@ namespace Timeline {
 class TraceEvent : public SafeCastable<TraceEvent>
 {
 public:
+    TraceEvent(const TraceEvent &) = default;
+    TraceEvent(TraceEvent &&) = default;
+    TraceEvent &operator=(const TraceEvent &) = default;
+    TraceEvent &operator=(TraceEvent &&) = default;
+
     qint64 timestamp() const { return m_timestamp; }
     void setTimestamp(qint64 timestamp) { m_timestamp = timestamp; }
 
@@ -29,11 +34,6 @@ protected:
         : m_timestamp(timestamp), m_typeIndex(typeIndex), m_classId(classId)
     {}
 
-    TraceEvent(const TraceEvent &) = default;
-    TraceEvent(TraceEvent &&) = default;
-    TraceEvent &operator=(const TraceEvent &) = default;
-    TraceEvent &operator=(TraceEvent &&) = default;
-
 private:
     qint64 m_timestamp;
     qint32 m_typeIndex;
diff --git a/src/libs/tracing/traceeventtype.h b/src/libs/tracing/traceeventtype.h
index 1a2be2694b8..fd87ba141a4 100644
--- a/src/libs/tracing/traceeventtype.h
+++ b/src/libs/tracing/traceeventtype.h
@@ -15,6 +15,11 @@ namespace Timeline {
 class TraceEventType : public SafeCastable<TraceEventType>
 {
 public:
+    TraceEventType(const TraceEventType &) = default;
+    TraceEventType(TraceEventType &&) = default;
+    TraceEventType &operator=(const TraceEventType &) = default;
+    TraceEventType &operator=(TraceEventType &&) = default;
+
     const QString &displayName() const { return m_displayName; }
     void setDisplayName(const QString &displayName) { m_displayName = displayName; }
 
@@ -28,11 +33,6 @@ protected:
         : m_displayName(displayName), m_classId(classId), m_feature(feature)
     {}
 
-    TraceEventType(const TraceEventType &) = default;
-    TraceEventType(TraceEventType &&) = default;
-    TraceEventType &operator=(const TraceEventType &) = default;
-    TraceEventType &operator=(TraceEventType &&) = default;
-
 private:
     QString m_displayName;
     qint32 m_classId;