3 files changed, 14 insertions, 99 deletions

diff --git a/share/qbs/modules/protobuf/cpp/protobufcpp.qbs b/share/qbs/modules/protobuf/cpp/protobufcpp.qbs
index f377c63cf..b5dab2372 100644
--- a/share/qbs/modules/protobuf/cpp/protobufcpp.qbs
+++ b/share/qbs/modules/protobuf/cpp/protobufcpp.qbs
@@ -6,39 +6,26 @@ import "../protobufbase.qbs" as ProtobufBase
 import "../protobuf.js" as HelperFunctions
 
 ProtobufBase {
-    property string includePath: includeProbe.found ? includeProbe.path : undefined
-    property string libraryPath: libraryProbe.found ? libraryProbe.path : undefined
-
     property bool useGrpc: false
 
     property bool _linkLibraries: true
     readonly property bool _hasModules: protobuflib.present && (!useGrpc || grpcpp.present)
 
-    property string grpcIncludePath: grpcIncludeProbe.found ? grpcIncludeProbe.path : undefined
-    property string grpcLibraryPath: grpcLibraryProbe.found ? grpcLibraryProbe.path : undefined
+    property string _cxxLanguageVersion: "c++17"
 
-    readonly property string _libraryName: {
-        var libraryName;
-        if (libraryProbe.found) {
-            libraryName = FileInfo.baseName(libraryProbe.fileName);
-            if (libraryName.startsWith("lib"))
-                libraryName = libraryName.substring(3);
-        }
-        return libraryName;
-    }
+    cpp.includePaths: outputDir
 
     Depends { name: "cpp" }
     Depends {
         name: "protobuflib";
         condition: _linkLibraries;
-        required: false;
-        enableFallback: false
+        required: false
     }
     Depends {
-        name: "grpcpp";
+        name: "grpc++";
+        id: grpcpp
         condition: _linkLibraries && useGrpc;
-        required: false;
-        enableFallback: false
+        required: false
     }
 
     property path grpcPluginPath: grpcPluginProbe.filePath
@@ -49,41 +36,7 @@ ProtobufBase {
         names: "grpc_cpp_plugin"
     }
 
-    cpp.libraryPaths: {
-        if (!_linkLibraries || _hasModules)
-            return [];
-
-        var result = [];
-        if (libraryProbe.found)
-            result.push(libraryProbe.path);
-        if (useGrpc && grpcLibraryProbe.found)
-            result.push(grpcLibraryPath);
-        return result;
-    }
-    cpp.dynamicLibraries: {
-        if (!_linkLibraries || _hasModules)
-            return [];
-
-        var result = [];
-        if (_libraryName)
-            result.push(_libraryName)
-        if (qbs.targetOS.contains("unix"))
-            result.push("pthread");
-        if (useGrpc)
-            result.push("grpc++");
-        return result;
-    }
-    cpp.includePaths: {
-        if (!_linkLibraries || _hasModules)
-            return [outputDir];
-
-        var result = [outputDir];
-        if (includeProbe.found)
-            result.push(includePath);
-        if (useGrpc && grpcIncludeProbe.found)
-            result.push(grpcIncludePath);
-        return result;
-    }
+    cpp.cxxLanguageVersion: _cxxLanguageVersion
 
     Rule {
         inputs: ["protobuf.input", "protobuf.grpc"]
@@ -95,7 +48,7 @@ ProtobufBase {
                                                     ".pb.h"),
                         HelperFunctions.cppArtifact(outputDir, input, "cpp", ".pb.cc")
                     ];
-            if (input.fileTags.contains("protobuf.grpc")) {
+            if (input.fileTags.includes("protobuf.grpc")) {
                 result.push(
                         HelperFunctions.cppArtifact(outputDir, input, ["hpp", "protobuf.hpp"],
                                                     ".grpc.pb.h"),
@@ -108,7 +61,7 @@ ProtobufBase {
         prepare: {
             var result = HelperFunctions.doPrepare(
                         input.protobuf.cpp, product, input, outputs, "cpp");
-            if (input.fileTags.contains("protobuf.grpc")) {
+            if (input.fileTags.includes("protobuf.grpc")) {
                 result = ModUtils.concatAll(result, HelperFunctions.doPrepare(
                                 input.protobuf.cpp, product, input, outputs, "grpc",
                                 "protoc-gen-grpc=" + input.protobuf.cpp.grpcPluginPath));
@@ -117,56 +70,16 @@ ProtobufBase {
         }
     }
 
-    Probes.IncludeProbe {
-        id: includeProbe
-        names: "google/protobuf/message.h"
-        platformSearchPaths: includePath ? [] : base
-        searchPaths: includePath ? [includePath] : []
-    }
-
-    Probes.LibraryProbe {
-        id: libraryProbe
-        names: [
-            "protobuf",
-            "protobufd",
-        ]
-        platformSearchPaths: libraryPath ? [] : base
-        searchPaths: libraryPath ? [libraryPath] : []
-    }
-
-    Probes.IncludeProbe {
-        id: grpcIncludeProbe
-        pathSuffixes: "grpc++"
-        names: "grpc++.h"
-        platformSearchPaths: grpcIncludePath ? [] : base
-        searchPaths: grpcIncludePath ? [grpcIncludePath] : []
-    }
-
-    Probes.LibraryProbe {
-        id: grpcLibraryProbe
-        names: "grpc++"
-        platformSearchPaths: grpcLibraryPath ? [] : base
-        searchPaths: grpcLibraryPath ? [grpcLibraryPath] : []
-    }
-
     validate: {
         HelperFunctions.validateCompiler(compilerName, compilerPath);
 
-        if (_hasModules)
-            return;
-
-        if (_linkLibraries && !includeProbe.found)
-            throw "Can't find cpp protobuf include files. Please set the includePath property.";
-        if (_linkLibraries && !libraryProbe.found)
-            throw "Can't find cpp protobuf library. Please set the libraryPath property.";
+        if (_linkLibraries && ! _hasModules) {
+            throw "Can't find cpp protobuf runtime. Make sure .pc files are present";
+        }
 
         if (useGrpc) {
             if (!File.exists(grpcPluginPath))
                 throw "Can't find grpc_cpp_plugin plugin. Please set the grpcPluginPath property.";
-            if (_linkLibraries && !grpcIncludeProbe.found)
-                throw "Can't find grpc++ include files. Please set the grpcIncludePath property.";
-            if (_linkLibraries && !grpcLibraryProbe.found)
-                throw "Can't find grpc++ library. Please set the grpcLibraryPath property.";
         }
     }
 }
diff --git a/share/qbs/modules/protobuf/nanopb/nanopb.qbs b/share/qbs/modules/protobuf/nanopb/nanopb.qbs
index 898e230b6..ada7c20bb 100644
--- a/share/qbs/modules/protobuf/nanopb/nanopb.qbs
+++ b/share/qbs/modules/protobuf/nanopb/nanopb.qbs
@@ -41,6 +41,7 @@ ProtobufBase {
             result.push(includePath);
         return result;
     }
+    cpp.cxxLanguageVersion: qbs.targetOS.contains("darwin") ? ["c++17"] : ["c++11"]
 
     Rule {
         inputs: ["protobuf.input"]
diff --git a/share/qbs/modules/protobuf/protobuf.js b/share/qbs/modules/protobuf/protobuf.js
index abc2c2c4d..60d6f48e4 100644
--- a/share/qbs/modules/protobuf/protobuf.js
+++ b/share/qbs/modules/protobuf/protobuf.js
@@ -75,6 +75,7 @@ function cppArtifact(outputDir, input, tags, suffix) {
         filePath: FileInfo.joinPaths(outputDir, FileInfo.baseName(input.fileName) + suffix),
         cpp: {
             includePaths: [].concat(input.cpp.includePaths, outputDir),
+            defines: ["NDEBUG"],
             warningLevel: "none",
         }
     };