diff --git a/qmake/generators/unix/unixmake.cpp b/qmake/generators/unix/unixmake.cpp
index ea6a6a6..74da305 100644
--- a/qmake/generators/unix/unixmake.cpp
+++ b/qmake/generators/unix/unixmake.cpp
@@ -232,8 +232,10 @@ UnixMakefileGenerator::init()
         }
 
         QString cflags;
-        if(comps[i] == "OBJC" || comps[i] == "OBJCXX")
+        if(comps[i] == "OBJC")
             cflags += " $(CFLAGS)";
+        else if(comps[i] == "OBJCXX")
+            cflags += " $(CXXFLAGS)";
         else
             cflags += " $(" + comps[i] + "FLAGS)";
         compile_flag += cflags + " $(INCPATH)";
diff --git a/qmake/generators/unix/unixmake2.cpp b/qmake/generators/unix/unixmake2.cpp
index bc4c167..44f2c21 100644
--- a/qmake/generators/unix/unixmake2.cpp
+++ b/qmake/generators/unix/unixmake2.cpp
@@ -948,8 +948,10 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t)
                 continue;
 
             QString cflags;
-            if(comps[i] == "OBJC" || comps[i] == "OBJCXX")
+            if(comps[i] == "OBJC")
                 cflags += " $(CFLAGS)";
+            else if(comps[i] == "OBJCXX")
+                cflags += " $(CXXFLAGS)";
             else
                 cflags += " $(" + comps[i] + "FLAGS)";