From 309d238f7ba4939c2e9ab1d7220355d3d0bcf927 Mon Sep 17 00:00:00 2001 From: Christian Stenger Date: Fri, 15 Dec 2023 08:11:22 +0100 Subject: [PATCH 1/6] FakeVim: Persist fakevim settings when enabling globally Explicitly persist settings if enable FakeVim mode gets triggered using the global shortcuts, otherwise we would enable the FakeVim mode only temporarily and a restart of Qt Creator would use the former mode again. Fixes: QTCREATORBUG-29949 Change-Id: I457b32f8e5fe035e334ed51f358f374c85ab010b Reviewed-by: hjk --- src/plugins/fakevim/fakevimplugin.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/plugins/fakevim/fakevimplugin.cpp b/src/plugins/fakevim/fakevimplugin.cpp index f14cbbb2027..8cb623c0879 100644 --- a/src/plugins/fakevim/fakevimplugin.cpp +++ b/src/plugins/fakevim/fakevimplugin.cpp @@ -1048,6 +1048,7 @@ void FakeVimPluginPrivate::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); From 859dd3a4140eabaebf3f63e293526b0cb294bd9b Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Mon, 18 Dec 2023 08:01:02 +0100 Subject: [PATCH 2/6] Doc: Fix supported macOS platform Qt 6.6 only supports macOS 11.0 or later Fixes: QTCREATORBUG-30084 Change-Id: Ic7e83633b8b3e47602d75c65657db88e9381c874 Reviewed-by: Leena Miettinen --- README.md | 2 +- .../src/overview/creator-only/creator-desktop-platforms.qdoc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 70500da736d..6fc7918fd14 100644 --- a/README.md +++ b/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 diff --git a/doc/qtcreator/src/overview/creator-only/creator-desktop-platforms.qdoc b/doc/qtcreator/src/overview/creator-only/creator-desktop-platforms.qdoc index 8e1722f59d0..9626d41f837 100644 --- a/doc/qtcreator/src/overview/creator-only/creator-desktop-platforms.qdoc +++ b/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 From d27e905585623c73f1b4d6431b75d9d15ad76e54 Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Mon, 18 Dec 2023 08:00:24 +0100 Subject: [PATCH 3/6] GitHub: Fix macOS deployment target Qt 6.6 only supports 11.0 or later Change-Id: I8d429bef61c75179a2b1ecefdb8b7de3c21e11a9 Reviewed-by: Cristian Adam Reviewed-by: --- .github/workflows/build_cmake.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_cmake.yml b/.github/workflows/build_cmake.yml index d866f1f6d70..c32b57e4c3c 100644 --- a/.github/workflows/build_cmake.yml +++ b/.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 From 38d185e363c19d2d24215c072bc22574a1f6a4cc Mon Sep 17 00:00:00 2001 From: hjk Date: Mon, 18 Dec 2023 13:49:56 +0100 Subject: [PATCH 4/6] tests/unit/tests/mocks/sqlitereadstatementmock.h: Fix warning sqlitereadstatementmock.h:267:25: note: default constructor of 'SqliteReadStatementMockBase' is implicitly deleted because field 'databaseMock' of reference type 'SqliteDatabaseMock &' would not be initialized SqliteDatabaseMock &databaseMock; ^ sqlitereadstatementmock.h:31:37: note: replace 'default' with 'delete' SqliteReadStatementMockBase() = default; ^~~~~~~ delete 1 warning generated. Change-Id: Ia0f9a3f2e692585f509048d35fb01b380e2af035 Reviewed-by: Eike Ziller --- tests/unit/tests/mocks/sqlitereadstatementmock.h | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/unit/tests/mocks/sqlitereadstatementmock.h b/tests/unit/tests/mocks/sqlitereadstatementmock.h index 615e3d23b14..ed23409b97d 100644 --- a/tests/unit/tests/mocks/sqlitereadstatementmock.h +++ b/tests/unit/tests/mocks/sqlitereadstatementmock.h @@ -28,7 +28,6 @@ class SqliteDatabaseMock; class SqliteReadStatementMockBase { public: - SqliteReadStatementMockBase() = default; SqliteReadStatementMockBase(Utils::SmallStringView sqlStatement, SqliteDatabaseMock &databaseMock); MOCK_METHOD(std::vector, valuesReturnStringVector, (std::size_t), ()); From 2632f991236663b281dccd43a2ccc47436677198 Mon Sep 17 00:00:00 2001 From: hjk Date: Mon, 18 Dec 2023 13:38:00 +0100 Subject: [PATCH 5/6] Tracing: Fix compile error ff7d69daf in Qt base added a static assert. In file included from /data/dev/creator/src/libs/tracing/timelinetracemanager.cpp:6: In file included from /data/dev/creator/src/libs/tracing/timelinetracemanager.h:8: /data/dev/creator/src/libs/tracing/traceeventtype.h:45:1: error: static assertion failed due to requirement '!isRelocatable || std::is_copy_constructible_v || std::is_move_constructible_v': Timeline::TraceEventType is neither copy- nor move-constructible, so cannot be Q_RELOCATABLE_TYPE Q_DECLARE_TYPEINFO(Timeline::TraceEventType, Q_MOVABLE_TYPE); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ /data/dev/qt-6/qtbase/include/QtCore/../../src/corelib/global/qtypeinfo.h:173:12: note: expanded from macro 'Q_DECLARE_TYPEINFO' template<> \ ^ /data/dev/qt-6/qtbase/include/QtCore/../../src/corelib/global/qtypeinfo.h:166:5: note: expanded from macro '\ Q_DECLARE_TYPEINFO_BODY' static_assert(!isRelocatable || \ ^ ~~~~~~~~~~~~~~~~~~~ /data/dev/creator/src/libs/tracing/traceeventtype.h:45:1: note: expression evaluates to 'false || false' Q_DECLARE_TYPEINFO(Timeline::TraceEventType, Q_MOVABLE_TYPE); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ /data/dev/qt-6/qtbase/include/QtCore/../../src/corelib/global/qtypeinfo.h:173:12: note: expanded from macro 'Q_DECLARE_TYPEINFO' template<> \ ^ /data/dev/qt-6/qtbase/include/QtCore/../../src/corelib/global/qtypeinfo.h:167:55: note: expanded from macro '\ Q_DECLARE_TYPEINFO_BODY' std::is_copy_constructible_v || \ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~ 1 error generated. Change-Id: I68c963f6b2856e9aca3e8be65ac177456a02a875 Reviewed-by: Ulf Hermann --- src/libs/tracing/traceevent.h | 10 +++++----- src/libs/tracing/traceeventtype.h | 10 +++++----- 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 { 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 { 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; From 92d1938ab42572b3f75782e4a183392abb0b7fc8 Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Mon, 18 Dec 2023 17:39:19 +0100 Subject: [PATCH 6/6] Bump version to 12.0.2 Change-Id: Ia7514eccbb61380a502049cfa9f536981c0cac1f Reviewed-by: Eike Ziller --- cmake/QtCreatorIDEBranding.cmake | 4 ++-- qbs/modules/qtc/qtc.qbs | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cmake/QtCreatorIDEBranding.cmake b/cmake/QtCreatorIDEBranding.cmake index 33abd0e3f56..17ad5c2acae 100644 --- a/cmake/QtCreatorIDEBranding.cmake +++ b/cmake/QtCreatorIDEBranding.cmake @@ -1,6 +1,6 @@ -set(IDE_VERSION "12.0.1") # The IDE version. +set(IDE_VERSION "12.0.2") # The IDE version. set(IDE_VERSION_COMPAT "12.0.0") # The IDE Compatibility version. -set(IDE_VERSION_DISPLAY "12.0.1") # The IDE display version. +set(IDE_VERSION_DISPLAY "12.0.2") # The IDE display version. set(IDE_COPYRIGHT_YEAR "2023") # The IDE current copyright year. set(IDE_SETTINGSVARIANT "QtProject") # The IDE settings variation. diff --git a/qbs/modules/qtc/qtc.qbs b/qbs/modules/qtc/qtc.qbs index 6007489259e..79a55ad8456 100644 --- a/qbs/modules/qtc/qtc.qbs +++ b/qbs/modules/qtc/qtc.qbs @@ -7,7 +7,7 @@ Module { property string qtcreator_display_version: '12.0.1' property string ide_version_major: '12' property string ide_version_minor: '0' - property string ide_version_release: '1' + property string ide_version_release: '2' property string qtcreator_version: ide_version_major + '.' + ide_version_minor + '.' + ide_version_release