forked from qt-creator/qt-creator
QmlDesigner: Only show valid kits with valid Qt version
Task-number: QDS-10137 Change-Id: I582d714b2f4b670ca42b2d6e734489efe0efbf75 Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io> Reviewed-by: Tim Jenssen <tim.jenssen@qt.io> Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
This commit is contained in:
@@ -28,6 +28,7 @@
|
|||||||
#include <projectexplorer/target.h>
|
#include <projectexplorer/target.h>
|
||||||
|
|
||||||
#include <qmlprojectmanager/qmlproject.h>
|
#include <qmlprojectmanager/qmlproject.h>
|
||||||
|
#include <qtsupport/qtkitinformation.h>
|
||||||
|
|
||||||
#include <utils/algorithm.h>
|
#include <utils/algorithm.h>
|
||||||
#include <utils/qtcassert.h>
|
#include <utils/qtcassert.h>
|
||||||
@@ -617,8 +618,13 @@ int ToolBarBackend::currentStyle() const
|
|||||||
|
|
||||||
QStringList ToolBarBackend::kits() const
|
QStringList ToolBarBackend::kits() const
|
||||||
{
|
{
|
||||||
return Utils::transform(ProjectExplorer::KitManager::kits(),
|
auto kits = Utils::filtered(ProjectExplorer::KitManager::kits(), [](ProjectExplorer::Kit *kit) {
|
||||||
[](ProjectExplorer::Kit *kit) { return kit->displayName(); });
|
const auto qtVersion = QtSupport::QtKitAspect::qtVersion(kit);
|
||||||
|
return kit->isValid() && !kit->isReplacementKit() && qtVersion && qtVersion->isValid()
|
||||||
|
/*&& kit->isAutoDetected() */;
|
||||||
|
});
|
||||||
|
|
||||||
|
return Utils::transform(kits, [](ProjectExplorer::Kit *kit) { return kit->displayName(); });
|
||||||
}
|
}
|
||||||
|
|
||||||
int ToolBarBackend::currentKit() const
|
int ToolBarBackend::currentKit() const
|
||||||
|
Reference in New Issue
Block a user