diff options
author | Tim Jenssen <tim.jenssen@qt.io> | 2020-05-27 18:59:53 +0200 |
---|---|---|
committer | Tim Jenssen <tim.jenssen@qt.io> | 2020-05-27 18:59:53 +0200 |
commit | b193892fd1289bd8a995cd609ead33f925b75ee1 (patch) | |
tree | 4d03bf8ea45a9ab542eb6ab129e56a82b860e19c /src/plugins/mcusupport/mcusupportoptions.cpp | |
parent | aa79d30b83fc79e8e18af4da0062ddf21fcd201f (diff) | |
parent | 13ad8163080153cb5d1ea39238069b5cca8f9651 (diff) |
Merge remote-tracking branch 'origin/4.12' into qds-1.50qds-1.50
Change-Id: I8e4155aa2a0a8c7f7405dd79e856380011e23a33
Diffstat (limited to 'src/plugins/mcusupport/mcusupportoptions.cpp')
-rw-r--r-- | src/plugins/mcusupport/mcusupportoptions.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/mcusupport/mcusupportoptions.cpp b/src/plugins/mcusupport/mcusupportoptions.cpp index 894eb9cb4c..bb10f7b064 100644 --- a/src/plugins/mcusupport/mcusupportoptions.cpp +++ b/src/plugins/mcusupport/mcusupportoptions.cpp @@ -61,7 +61,7 @@ namespace McuSupport { namespace Internal { -static const int KIT_VERSION = 4; // Bumps up whenever details in Kit creation change +static const int KIT_VERSION = 5; // Bumps up whenever details in Kit creation change static QString packagePathFromSettings(const QString &settingsKey, const QString &defaultPath = {}) { @@ -441,7 +441,7 @@ void McuSupportOptions::deletePackagesAndTargets() const QVersionNumber &McuSupportOptions::supportedQulVersion() { - static const QVersionNumber v({1, 1}); + static const QVersionNumber v({1, 2}); return v; } |