Merge remote-tracking branch 'origin/12.0'

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

Change-Id: I937d301156dac0d20b43e7a14b41a319eff57698

.github/workflows/build_cmake.yml

@@ -8,7 +8,7 @@ on:
 
 env:
   QT_VERSION: 6.6.0
-  MACOS_DEPLOYMENT_TARGET: 10.15
+  MACOS_DEPLOYMENT_TARGET: 11.0
   CLANG_VERSION: 17.0.1
   ELFUTILS_VERSION: 0.175
   CMAKE_VERSION: 3.21.1

README.md

@@ -18,7 +18,7 @@ The standalone binary packages support the following platforms:
 
 * Windows 10 (64-bit) or later
 * (K)Ubuntu Linux 20.04 (64-bit) or later
-* macOS 10.15 or later
+* macOS 11 or later
 
 ## Contributing
 

doc/qtcreator/src/overview/creator-only/creator-desktop-platforms.qdoc

@@ -51,7 +51,7 @@
 
     \section1 macOS
 
-    \macos 10.15 or later is supported with the Xcode tools for your \macos
+    \macos 11.0 or later is supported with the Xcode tools for your \macos
     version available in the Mac App Store.
 
     \section1 Windows

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;

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;

src/plugins/fakevim/fakevimplugin.cpp

@@ -1092,6 +1092,7 @@ void FakeVimPlugin::initialize()
         INSTALL_HANDLER, Context(Core::Constants::C_GLOBAL), true);
     cmd->setDefaultKeySequence(QKeySequence(useMacShortcuts ? Tr::tr("Meta+Shift+Y,Meta+Shift+Y")
                                                             : Tr::tr("Alt+Y,Alt+Y")));
+    connect(cmd->action(), &QAction::triggered, [this] { settings().writeSettings(); });
 
     ActionContainer *advancedMenu =
         ActionManager::actionContainer(Core::Constants::M_EDIT_ADVANCED);