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

QmlDesigner: Fix build for Qt < 6.5

Browse Source 
Change-Id: I943b42e3536a2705dfcee5620e84ea5ddf4fc828
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
This commit is contained in:
Marco Bubke
2023-04-19 16:31:13 +02:00
parent 66288ef113
commit df56f95128
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/qmldesigner/designercore/projectstorage/modulescanner.cpp
View File

@@ -15,6 +15,7 @@ namespace QmlDesigner {
namespace { namespace {
#ifdef QDS_HAS_QMLPRIVATE
std::optional<QString> contentAsQString(const QString &filePath) std::optional<QString> contentAsQString(const QString &filePath)
{ {
QFile file{filePath}; QFile file{filePath};
@@ -24,7 +25,6 @@ std::optional<QString> contentAsQString(const QString &filePath)
return {}; return {};
} }
#ifdef QDS_HAS_QMLPRIVATE
QString createVersion(const QMultiHash<QString, QQmlDirParser::Component> &components) QString createVersion(const QMultiHash<QString, QQmlDirParser::Component> &components)
{ {
auto found = std::max_element(components.begin(), components.end(), [](auto &&first, auto &&second) { auto found = std::max_element(components.begin(), components.end(), [](auto &&first, auto &&second) {
@@ -46,7 +46,7 @@ void ModuleScanner::scan(const QStringList &modulePaths)
scan(modulePath.toStdString()); scan(modulePath.toStdString());
} }
void ModuleScanner::scan(std::string_view modulePath) void ModuleScanner::scan([[maybe_unused]] std::string_view modulePath)
{ {
#ifdef QDS_HAS_QMLPRIVATE #ifdef QDS_HAS_QMLPRIVATE
try { try {