Do not use Application item in Language tests

This item has grown over time and now pulls bundle module and xcode module on
macOS which is not desired as it make harder to read verbose logs when
debugging tests.

Change-Id: I7fa4dfaec477b5c6d8d8ec602d10db866c353441
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>

10 files changed, 34 insertions, 24 deletions

diff --git a/tests/auto/language/testdata/conditionaldepends_base.qbs b/tests/auto/language/testdata/conditionaldepends_base.qbs
index 5ab5b973a..74eb958d4 100644
--- a/tests/auto/language/testdata/conditionaldepends_base.qbs
+++ b/tests/auto/language/testdata/conditionaldepends_base.qbs
@@ -1,4 +1,4 @@
-Application {
+Product {
     name: 'conditionaldepends_base'
     property bool someProp: false
     Depends {
diff --git a/tests/auto/language/testdata/erroneous/conflicting_fileTagsFilter.qbs b/tests/auto/language/testdata/erroneous/conflicting_fileTagsFilter.qbs
index 97e11bb9b..3738e0cca 100644
--- a/tests/auto/language/testdata/erroneous/conflicting_fileTagsFilter.qbs
+++ b/tests/auto/language/testdata/erroneous/conflicting_fileTagsFilter.qbs
@@ -1,10 +1,11 @@
-Application {
+Product {
+    type: "app"
     Group {
-        fileTagsFilter: "application"
+        fileTagsFilter: "app"
         qbs.install: true
     }
     Group {
-        fileTagsFilter: "application"
+        fileTagsFilter: "app"
         qbs.install: false
     }
 }
diff --git a/tests/auto/language/testdata/erroneous/dependency_cycle.qbs b/tests/auto/language/testdata/erroneous/dependency_cycle.qbs
index 83a6e35f6..80c678f89 100644
--- a/tests/auto/language/testdata/erroneous/dependency_cycle.qbs
+++ b/tests/auto/language/testdata/erroneous/dependency_cycle.qbs
@@ -1,15 +1,15 @@
 Project {
-    CppApplication {
+    Product {
         name: "A"
         Depends { name: "B" }
         files: ["main.cpp"]
     }
-    CppApplication {
+    Product {
         name: "B"
         Depends { name: "C" }
         files: ["main.cpp"]
     }
-    CppApplication {
+    Product {
         name: "C"
         Depends { name: "A" }
         files: ["main.cpp"]
diff --git a/tests/auto/language/testdata/erroneous/dependency_cycle2.qbs b/tests/auto/language/testdata/erroneous/dependency_cycle2.qbs
index 335355480..4aff0b75c 100644
--- a/tests/auto/language/testdata/erroneous/dependency_cycle2.qbs
+++ b/tests/auto/language/testdata/erroneous/dependency_cycle2.qbs
@@ -1,20 +1,20 @@
 Project {
-    CppApplication {
+    Product {
         name: "A"
         Depends { name: "B" }
         files: ["main.cpp"]
     }
-    CppApplication {
+    Product {
         name: "B"
         Depends { name: "C" }
         files: ["main.cpp"]
     }
-    CppApplication {
+    Product {
         name: "C"
         Depends { name: "A" }
         files: ["main.cpp"]
     }
-    CppApplication {
+    Product {
         name: "D"
         files: ["main.cpp"]
     }
diff --git a/tests/auto/language/testdata/erroneous/invalid_file.qbs b/tests/auto/language/testdata/erroneous/invalid_file.qbs
index c461b87ef..54ec27410 100644
--- a/tests/auto/language/testdata/erroneous/invalid_file.qbs
+++ b/tests/auto/language/testdata/erroneous/invalid_file.qbs
@@ -1,3 +1,3 @@
-Application {
+Product {
     files: ["main.cpp", "other.h"]
 }
diff --git a/tests/auto/language/testdata/erroneous/missing-colon.qbs b/tests/auto/language/testdata/erroneous/missing-colon.qbs
index e62eb7cfd..6e136bb56 100644
--- a/tests/auto/language/testdata/erroneous/missing-colon.qbs
+++ b/tests/auto/language/testdata/erroneous/missing-colon.qbs
@@ -1,3 +1,5 @@
-CppApplication {
-    cpp.dynamicLibraries { }
+Product {
+    Depends { name: "dummy" }
+    qbsSearchPaths: ".."
+    dummy.cxxFlags { }
 }
diff --git a/tests/auto/language/testdata/exports.qbs b/tests/auto/language/testdata/exports.qbs
index a304edd61..0071aadce 100644
--- a/tests/auto/language/testdata/exports.qbs
+++ b/tests/auto/language/testdata/exports.qbs
@@ -1,7 +1,8 @@
 import "exports_product.qbs" as ProductWithInheritedExportItem
 
 Project {
-    Application {
+    Product {
+        type: "app"
         name: "myapp"
         Depends { name: "mylib" }
         Depends { name: "dummy" }
@@ -15,30 +16,35 @@ Project {
         "subdir2/exports-mylib2.qbs"
     ]
 
-    Application {
+    Product {
+        type: "app"
         name: "A"
         Depends { name: "qbs" }
         Depends { name: "B" }
     }
-    StaticLibrary {
+    Product {
+        type: "lib"
         name: "B"
         Export {
             Depends { name: "C" }
             Depends { name: "qbs" }
         }
     }
-    StaticLibrary {
+    Product {
+        type: "lib"
         name: "C"
         Export {
             Depends { name: "D" }
             Depends { name: "qbs" }
         }
     }
-    StaticLibrary {
+    Product {
+        type: "lib"
         name: "D"
     }
 
-    Application {
+    Product {
+        type: "app"
         name: "myapp2"
         Depends { name: "productWithInheritedExportItem" }
         Depends { name: "qbs" }
@@ -54,7 +60,8 @@ Project {
             }
         }
     }
-    Application {
+    Product {
+        type: "app"
         name: "myapp3"
         Depends { name: "productWithInheritedExportItem"; versionAtLeast: "2.0" }
     }
diff --git a/tests/auto/language/testdata/profilevaluesandoverriddenvalues.qbs b/tests/auto/language/testdata/profilevaluesandoverriddenvalues.qbs
index 3aaa0cfa9..a0f189403 100644
--- a/tests/auto/language/testdata/profilevaluesandoverriddenvalues.qbs
+++ b/tests/auto/language/testdata/profilevaluesandoverriddenvalues.qbs
@@ -1,5 +1,5 @@
 Project {
-    Application {
+    Product {
         name: "product1"
         property bool dummyProp: {
             if (!(dummy.cFlags instanceof Array))
diff --git a/tests/auto/language/testdata/suppressed-and-non-suppressed-errors.qbs b/tests/auto/language/testdata/suppressed-and-non-suppressed-errors.qbs
index 4d5219157..684cc67b3 100644
--- a/tests/auto/language/testdata/suppressed-and-non-suppressed-errors.qbs
+++ b/tests/auto/language/testdata/suppressed-and-non-suppressed-errors.qbs
@@ -1,5 +1,5 @@
 Project {
-    CppApplication {
+    Product {
         name: "mysterious creature"
         files: ["easter bunny"]
     }
diff --git a/tests/auto/language/tst_language.cpp b/tests/auto/language/tst_language.cpp
index cbb7d7556..da3eb417f 100644
--- a/tests/auto/language/tst_language.cpp
+++ b/tests/auto/language/tst_language.cpp
@@ -887,7 +887,7 @@ void TestLanguage::erroneousFiles_data()
     QTest::newRow("invalid-property-option")
             << "PropertyOptions item refers to non-existing property 's0meProp'";
     QTest::newRow("missing-colon")
-            << "Invalid item 'cpp.dynamicLibraries'. Did you mean to set a module property?";
+            << "Invalid item 'dummy.cxxFlags'. Did you mean to set a module property?";
     QTest::newRow("syntax-error-in-probe")
             << "syntax-error-in-probe.qbs:4:20.*ReferenceError";
     QTest::newRow("wrong-toplevel-item")