aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKai Dohmen <psykai1993@googlemail.com>2020-12-17 11:22:50 +0100
committerKai Dohmen <psykai1993@googlemail.com>2020-12-17 11:34:00 +0000
commit9e9caf2268fd75f4bddd74084afcc7ba27fe5d2e (patch)
treeaaf1be2c74e4e18b97424564c6179bdba9aef591
parentb5df4a65d52a523bc58065f7c3401e76632389dd (diff)
Add missing nanopb generator file extension on windows
When using nanopb on windows the generator script has the ".bat" extension. Change-Id: Ia7a836784a0709d30dcf2e8b9c26c2a38b703c86 Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
-rw-r--r--share/qbs/modules/protobuf/nanopb/nanopb.qbs8
1 files changed, 4 insertions, 4 deletions
diff --git a/share/qbs/modules/protobuf/nanopb/nanopb.qbs b/share/qbs/modules/protobuf/nanopb/nanopb.qbs
index 36bdc9254..ae87b1ca1 100644
--- a/share/qbs/modules/protobuf/nanopb/nanopb.qbs
+++ b/share/qbs/modules/protobuf/nanopb/nanopb.qbs
@@ -9,9 +9,9 @@ import "../protobuf.js" as HelperFunctions
ProtobufBase {
property string includePath: includeProbe.path
property string libraryPath: libraryProbe.path
- property string pluginPath: pluginProbe.path
- property string _plugin: "protoc-gen-nanopb=" +
- FileInfo.joinPaths(pluginPath, "protoc-gen-nanopb")
+ property string pluginPath: pluginProbe.filePath
+ property string pluginName: "protoc-gen-nanopb"
+ readonly property string _plugin: "protoc-gen-nanopb=" + pluginPath
readonly property string _libraryName: {
var libraryName = FileInfo.baseName(libraryProbe.fileName);
if (libraryName.startsWith("lib"))
@@ -81,7 +81,7 @@ ProtobufBase {
Probes.BinaryProbe {
id: pluginProbe
- names: "protoc-gen-nanopb"
+ names: pluginName
}
validate: {