diff --git a/src/plugins/qmldesigner/generatecmakelists.cpp b/src/plugins/qmldesigner/generatecmakelists.cpp index abab295c3ed..5783f2eff6a 100644 --- a/src/plugins/qmldesigner/generatecmakelists.cpp +++ b/src/plugins/qmldesigner/generatecmakelists.cpp @@ -576,6 +576,8 @@ bool generateMainCpp(const FilePath &dir) for (EnvironmentItem &envItem : buildSystem->environment()) { QString key = envItem.name; QString value = envItem.value; + if (isFileResource(value)) + value.prepend(":/"); environment.append(QString(ENV_HEADER_VARIABLE_LINE).arg(key).arg(value)); } QString envHeaderContent = GenerateCmake::readTemplate(ENV_HEADER_TEMPLATE_PATH) @@ -597,7 +599,17 @@ bool generateMainQml(const FilePath &dir) return GenerateCmake::queueFile(filePath, content); } +const QStringList resourceFileLocations = {"qtquickcontrols2.conf"}; + +bool isFileResource(QString &relativeFilePath) +{ + if (resourceFileLocations.contains(relativeFilePath)) + return true; + + return false; } -} +} //GenerateEntryPoints + +} //QmlDesigner diff --git a/src/plugins/qmldesigner/generatecmakelists.h b/src/plugins/qmldesigner/generatecmakelists.h index 53c6703ef0c..eafe72defcb 100644 --- a/src/plugins/qmldesigner/generatecmakelists.h +++ b/src/plugins/qmldesigner/generatecmakelists.h @@ -68,5 +68,6 @@ namespace GenerateEntryPoints { bool generateEntryPointFiles(const Utils::FilePath &dir); bool generateMainCpp(const Utils::FilePath &dir); bool generateMainQml(const Utils::FilePath &dir); +bool isFileResource(const QString &relativeFilePath); } } diff --git a/src/plugins/qmldesigner/qmlprojectmaincmakelists.tpl b/src/plugins/qmldesigner/qmlprojectmaincmakelists.tpl index 926f7b43be9..d1ead0eaa9f 100644 --- a/src/plugins/qmldesigner/qmlprojectmaincmakelists.tpl +++ b/src/plugins/qmldesigner/qmlprojectmaincmakelists.tpl @@ -8,6 +8,12 @@ set(CMAKE_AUTOMOC ON) find_package(Qt6 COMPONENTS Gui Qml Quick) add_executable(%1 src/main.cpp) +qt_add_resources(%1 "configuration" + PREFIX "/" + FILES + qtquickcontrols2.conf +) + target_link_libraries(%1 PRIVATE Qt${QT_VERSION_MAJOR}::Core Qt${QT_VERSION_MAJOR}::Gui