feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge remote-tracking branch 'origin/12.0'

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

Change-Id: I937d301156dac0d20b43e7a14b41a319eff57698
This commit is contained in:
Eike Ziller
2023-12-19 10:55:55 +01:00
parent fc3291afed 92d1938ab4
commit b37cd984db
6 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/libs/tracing/traceevent.h
View File

@@ -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;

10
src/libs/tracing/traceeventtype.h
View File

@@ -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;

1
src/plugins/fakevim/fakevimplugin.cpp
View File

@@ -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);