From 3b02d7b32ab9f0745ff31bbc0ec77ac4642fb790 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20Mu=C4=87ko?= <piotr.mucko@qt.io>
Date: Thu, 2 Jun 2022 12:23:27 +0200
Subject: [PATCH] McuSupport: Use legacy implementation for QtMCUs 2.2

New implementation of mcu support plugin is not yet finished
so we should use legacy implementation for QtMCUs 2.2 JSON kits.

Change-Id: I8e6a8b7af2c3b4683bb19a5f05edd6ff5df46e5b
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
---
 src/plugins/mcusupport/mcusupport_global.h | 2 +-
 src/plugins/mcusupport/test/unittest.cpp   | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/plugins/mcusupport/mcusupport_global.h b/src/plugins/mcusupport/mcusupport_global.h
index a4a4daba46f..bb05bd0441d 100644
--- a/src/plugins/mcusupport/mcusupport_global.h
+++ b/src/plugins/mcusupport/mcusupport_global.h
@@ -48,7 +48,7 @@ using McuToolChainPackagePtr = QSharedPointer<McuToolChainPackage>;
 using McuTargetPtr = QSharedPointer<McuTarget>;
 
 static const QVersionNumber minimalVersion{2, 0, 0};
-static const QVersionNumber newVersion{2, 2};
+static const QVersionNumber newVersion{2, 3};
 using Targets = QList<McuTargetPtr>;
 using Packages = QSet<McuPackagePtr>;
 
diff --git a/src/plugins/mcusupport/test/unittest.cpp b/src/plugins/mcusupport/test/unittest.cpp
index 0c5cb38dacb..e723d3cf0a0 100644
--- a/src/plugins/mcusupport/test/unittest.cpp
+++ b/src/plugins/mcusupport/test/unittest.cpp
@@ -598,8 +598,9 @@ void McuSupportTest::test_twoDotOneUsesLegacyImplementation()
     QCOMPARE(McuSupportOptions::isLegacyVersion({2, 0}), true);
     QCOMPARE(McuSupportOptions::isLegacyVersion({2, 0, 0}), true);
     QCOMPARE(McuSupportOptions::isLegacyVersion({2, 0, 1}), true);
-    QCOMPARE(McuSupportOptions::isLegacyVersion({2, 2, 0}), false);
-    QCOMPARE(McuSupportOptions::isLegacyVersion({2, 2, 1}), false);
+    QCOMPARE(McuSupportOptions::isLegacyVersion({2, 2, 0}), true);
+    QCOMPARE(McuSupportOptions::isLegacyVersion({2, 2, 1}), true);
+    QCOMPARE(McuSupportOptions::isLegacyVersion({2, 3, 0}), false);
 }
 void McuSupportTest::test_useFallbackPathForToolchainWhenPathFromSettingsIsNotAvailable()
 {