Merge branch 1.4 into master.

Change-Id: I45ee8897a07522c51833739afc8de374ec269e08

1 files changed, 3 insertions, 4 deletions

diff --git a/examples/code-generator/code-generator.qbs b/examples/code-generator/code-generator.qbs
index 591d7cb82..a8a804be2 100644
--- a/examples/code-generator/code-generator.qbs
+++ b/examples/code-generator/code-generator.qbs
@@ -38,16 +38,15 @@ import qbs
 
 Project {
     // A code generator that outputs a "Hello World" C++ program.
-    Product {
+    CppApplication {
         name: "hwgen"
-        Depends { name: "cpp" }
         files: ["hwgen.cpp"]
+        bundle.isBundle: false
     }
 
     // Generate and build a hello-world application.
-    Product {
+    CppApplication {
         name: "hello-world"
-        Depends { name: "cpp" }
         Depends { name: "hwgen" }
         Rule {
             inputs: ["qbs"]     // needed to trigger this rule