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

QmlDesigner: fix build on macOS

Browse Source 
Change-Id: I7814429f1b1ce04d37c202e3f47f40ab39ad430a
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
This commit is contained in:
Tim Jenssen
2024-04-16 12:38:38 +02:00
parent b17cd52f84
commit 7bef3c773a
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/qmldesigner/designercore/projectstorage/qmltypesparser.cpp
View File

@@ -9,6 +9,8 @@
#include <sqlitedatabase.h> #include <sqlitedatabase.h>
#include <utils/span.h>
#ifdef QDS_BUILD_QMLPARSER #ifdef QDS_BUILD_QMLPARSER
#include <private/qqmldomtop_p.h> #include <private/qqmldomtop_p.h>
#include <private/qqmljstypedescriptionreader_p.h> #include <private/qqmljstypedescriptionreader_p.h>
@@ -469,9 +471,9 @@ using namespace Qt::StringLiterals;
constexpr auto skipLists = std::make_tuple( constexpr auto skipLists = std::make_tuple(
std::pair{"QtQuick.Templates-cppnative"sv, std::array{"QQuickItem"_L1}}); std::pair{"QtQuick.Templates-cppnative"sv, std::array{"QQuickItem"_L1}});
std::span<const QLatin1StringView> getSkipList(std::string_view moduleName) Utils::span<const QLatin1StringView> getSkipList(std::string_view moduleName)
{ {
static constexpr std::span<const QLatin1StringView> emptySkipList; static constexpr Utils::span<const QLatin1StringView> emptySkipList;
auto currentSkipList = emptySkipList; auto currentSkipList = emptySkipList;
std::apply( std::apply(
@@ -484,7 +486,7 @@ std::span<const QLatin1StringView> getSkipList(std::string_view moduleName)
return currentSkipList; return currentSkipList;
} }
bool skipType(const QQmlJSExportedScope &object, std::span<const QLatin1StringView> skipList) bool skipType(const QQmlJSExportedScope &object, Utils::span<const QLatin1StringView> skipList)
{ {
return std::any_of(skipList.begin(), skipList.end(), [&](const QLatin1StringView skip) { return std::any_of(skipList.begin(), skipList.end(), [&](const QLatin1StringView skip) {
return object.scope->internalName() == skip; return object.scope->internalName() == skip;