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

QmlDesigner: Fix hardcoded qtquick style config

Browse Source 
Task-number: QDS-11097
Change-Id: I0ebd531ee04420eae4d42de4c03205b592ff59af
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
This commit is contained in:
Aleksei German
2023-11-02 14:58:34 +01:00
parent 52e652c986
commit 47c7f22107
1 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/plugins/qmldesigner/components/componentcore/changestyleaction.cpp
View File

@@ -18,11 +18,24 @@ static QString styleConfigFileName(const QString &qmlFileName)
Utils::FilePath::fromString(qmlFileName)); Utils::FilePath::fromString(qmlFileName));
if (currentProject) { if (currentProject) {
const QList<Utils::FilePath> fileNames = currentProject->files( const auto &environment = currentProject->additionalEnvironment();
ProjectExplorer::Project::SourceFiles); const auto &envVar = std::find_if(std::begin(environment),
for (const Utils::FilePath &fileName : fileNames) std::end(environment),
if (fileName.endsWith("qtquickcontrols2.conf")) [](const auto &envVar) {
return fileName.toString(); return (envVar.name == u"QT_QUICK_CONTROLS_CONF"
&& envVar.operation
!= Utils::EnvironmentItem::SetDisabled);
});
if (envVar != std::end(environment)) {
const auto &fileNames = currentProject->files(ProjectExplorer::Project::SourceFiles);
const auto &foundFile = std::find_if(std::begin(fileNames),
std::end(fileNames),
[&](const auto &fileName) {
return fileName.fileName() == envVar->value;
});
if (foundFile != std::end(fileNames))
return foundFile->toString();
}
} }
return QString(); return QString();