diff options
| author | Ivan Komissarov <abbapoh@gmail.com> | 2021-03-02 22:38:50 +0300 |
|---|---|---|
| committer | Ivan Komissarov <abbapoh@gmail.com> | 2021-03-02 22:39:17 +0300 |
| commit | 1371c4479cca8cea5d8bbfddd1b625569935152a (patch) | |
| tree | c7441a111daf77bf99a7ee020313573c66ba4232 /share/qbs/modules | |
| parent | 1e532e243a1ea7adab99d02920e5e0e1336bdb27 (diff) | |
| parent | b99079000697268bdf29c8ae09aa9fc02235edfc (diff) | |
| download | qbs-1371c4479cca8cea5d8bbfddd1b625569935152a.tar.gz | |
Merge branch '1.18' into master
Change-Id: Ia45a5502f2d3c30807b5cab14666070973654b3a
Diffstat (limited to 'share/qbs/modules')
| -rw-r--r-- | share/qbs/modules/protobuf/cpp/protobufcpp.qbs | 4 | ||||
| -rw-r--r-- | share/qbs/modules/protobuf/nanopb/nanopb.qbs | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/share/qbs/modules/protobuf/cpp/protobufcpp.qbs b/share/qbs/modules/protobuf/cpp/protobufcpp.qbs index 12d4e159f..abfe77dc1 100644 --- a/share/qbs/modules/protobuf/cpp/protobufcpp.qbs +++ b/share/qbs/modules/protobuf/cpp/protobufcpp.qbs @@ -18,7 +18,9 @@ ProtobufBase { property string grpcLibraryPath: grpcLibraryProbe.path readonly property string _libraryName: { - var libraryName = FileInfo.baseName(libraryProbe.fileName); + var libraryName; + if (libraryProbe.found) + libraryName = FileInfo.baseName(libraryProbe.fileName); if (libraryName.startsWith("lib")) libraryName = libraryName.substring(3); return libraryName; diff --git a/share/qbs/modules/protobuf/nanopb/nanopb.qbs b/share/qbs/modules/protobuf/nanopb/nanopb.qbs index ae87b1ca1..0a5e4e807 100644 --- a/share/qbs/modules/protobuf/nanopb/nanopb.qbs +++ b/share/qbs/modules/protobuf/nanopb/nanopb.qbs @@ -13,7 +13,9 @@ ProtobufBase { property string pluginName: "protoc-gen-nanopb" readonly property string _plugin: "protoc-gen-nanopb=" + pluginPath readonly property string _libraryName: { - var libraryName = FileInfo.baseName(libraryProbe.fileName); + var libraryName; + if (libraryProbe.found) + libraryName = FileInfo.baseName(libraryProbe.fileName); if (libraryName.startsWith("lib")) libraryName = libraryName.substring(3); return libraryName; |