introduce property cpp.objcxxFlags

Change-Id: Idd56c140b7c85a731421d9e284341f435f097cca
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>

2 files changed, 12 insertions, 0 deletions

diff --git a/share/qbs/modules/cpp/CppModule.qbs b/share/qbs/modules/cpp/CppModule.qbs
index 8906ab777..a1e3c2812 100644
--- a/share/qbs/modules/cpp/CppModule.qbs
+++ b/share/qbs/modules/cpp/CppModule.qbs
@@ -62,6 +62,12 @@ Module {
         description: "additional flags for the Objective-C compiler"
     }
 
+    property var objcxxFlags
+    PropertyOptions {
+        name: "objcxxFlags"
+        description: "additional flags for the Objective-C++ compiler"
+    }
+
     property var linkerFlags
     PropertyOptions {
         name: "linkerFlags"
diff --git a/share/qbs/modules/cpp/GenericGCC.qbs b/share/qbs/modules/cpp/GenericGCC.qbs
index da916564d..11de5c24a 100644
--- a/share/qbs/modules/cpp/GenericGCC.qbs
+++ b/share/qbs/modules/cpp/GenericGCC.qbs
@@ -261,6 +261,7 @@ CppModule {
             var cFlags = ModUtils.moduleProperties(input, 'cFlags');
             var cxxFlags = ModUtils.moduleProperties(input, 'cxxFlags');
             var objcFlags = ModUtils.moduleProperties(input, 'objcFlags');
+            var objcxxFlags = ModUtils.moduleProperties(input, 'objcxxFlags');
             var visibility = ModUtils.moduleProperty(product, 'visibility');
             var args = Gcc.configFlags(input);
             var i, c;
@@ -305,6 +306,11 @@ CppModule {
                     args.push('objective-c');
                     args = args.concat(objcFlags);
                     break;
+                } else if (input.fileTags[i] === "objcpp") {
+                    args.push('-x');
+                    args.push('objective-c++');
+                    args = args.concat(objcxxFlags);
+                    break;
                 }
             }
             args = args.concat(Gcc.additionalFlags(product, includePaths, frameworkPaths, systemIncludePaths, systemFrameworkPaths, input.fileName, output))