From 87fdf5002673a15f76981302fc9b024bd542b4f4 Mon Sep 17 00:00:00 2001 From: Ivan Komissarov Date: Mon, 22 Feb 2021 00:55:00 +0100 Subject: protobuf: fix _libraryName prop if protobuf is not found Change-Id: Ia0cc1583ca95ce97b99c136433125cb90c59f3be Reviewed-by: Kai Dohmen Reviewed-by: Christian Kandeler --- share/qbs/modules/protobuf/cpp/protobufcpp.qbs | 4 +++- 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 47d1a60c1..50caf058a 100644 --- a/share/qbs/modules/protobuf/cpp/protobufcpp.qbs +++ b/share/qbs/modules/protobuf/cpp/protobufcpp.qbs @@ -16,7 +16,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; -- cgit v1.2.3