diff --git a/src/kitaspect.cpp b/src/kitaspect.cpp index 22af9ce5..3e90bd7c 100644 --- a/src/kitaspect.cpp +++ b/src/kitaspect.cpp @@ -72,7 +72,7 @@ void KitAspect::setAsn1Exe(Kit *k, const Utils::FilePath &v) QVariant KitAspect::defaultValue(const Kit *k) const { Q_UNUSED(k); - const QString path = Core::ICore::libexecPath().toString() + QLatin1String("/asn1scc/asn1scc"); + const QString path = Core::ICore::libexecPath().toString() + QLatin1String("/asn1scc/asn1.exe"); return path; } diff --git a/src/libraries/componentimporter.cpp b/src/libraries/componentimporter.cpp index 9b5b8551..201a4e0c 100644 --- a/src/libraries/componentimporter.cpp +++ b/src/libraries/componentimporter.cpp @@ -79,7 +79,7 @@ Utils::FilePaths ComponentImporter::copyFilesToProject() for (const auto &file : m_sourceFiles) { const QString filePath = file.path(); - QString target = targetFileName(filePath); + const QString target = targetFileName(filePath); createTargetDir(m_targetDir, QFileInfo(target).absolutePath()); copyFile(filePath, target); diff --git a/templates/wizards/projects/asn1acn/handleAsn1AcnBuild.pri b/templates/wizards/projects/asn1acn/handleAsn1AcnBuild.pri index f2480cf6..1b7eb2a7 100644 --- a/templates/wizards/projects/asn1acn/handleAsn1AcnBuild.pri +++ b/templates/wizards/projects/asn1acn/handleAsn1AcnBuild.pri @@ -22,7 +22,7 @@ ####################################################################### isEmpty(ASN1SCC): ASN1SCC = $$(ASN1SCC) -isEmpty(ASN1SCC): ASN1SCC = asn1scc +isEmpty(ASN1SCC): ASN1SCC = asn1.exe isEmpty(ASN1SCC_PRODUCTS_DIR): ASN1SCC_PRODUCTS_DIR = $$shell_path($${OUT_PWD}/asn1sccGenerated) isEmpty(ASN1SCC_COMMON_OPTIONS): ASN1SCC_COMMON_OPTIONS = --acn-enc --field-prefix AUTO --type-prefix T isEmpty(ASN1SCC_C_OPTIONS): ASN1SCC_C_OPTIONS = --c-lang $${ASN1SCC_COMMON_OPTIONS}