1 files changed, 8 insertions, 4 deletions
diff --git a/share/qbs/modules/protobuf/cpp/protobufcpp.qbs b/share/qbs/modules/protobuf/cpp/protobufcpp.qbs
index 4d5228813..450286805 100644
--- a/share/qbs/modules/protobuf/cpp/protobufcpp.qbs
+++ b/share/qbs/modules/protobuf/cpp/protobufcpp.qbs
@@ -26,8 +26,10 @@ ProtobufBase {
     }
 
     cpp.libraryPaths: {
-        var result = [libraryPath];
-        if (useGrpc)
+        var result = [];
+        if (libraryPath)
+            result.push(libraryPath);
+        if (useGrpc && grpcLibraryPath)
             result.push(grpcLibraryPath);
         return result;
     }
@@ -40,8 +42,10 @@ ProtobufBase {
         return result;
     }
     cpp.includePaths: {
-        var result = [outputDir, includePath];
-        if (useGrpc)
+        var result = [outputDir];
+        if (includePath)
+            result.push(includePath);
+        if (useGrpc && grpcIncludePath)
             result.push(grpcIncludePath);
         return result;
     }