Add and make use of convenience item QtGuiApplication.

Using this item, building a Qt gui app against a static Qt
will work out of the box.
Also add the less useful QtApplication for completeness.

Change-Id: Idca1dbd3085659ebaf563f7df89f73b9daaf7001
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>

9 files changed, 13 insertions, 26 deletions

diff --git a/tests/auto/api/testdata/infinite-loop-process/infinite-loop.qbs b/tests/auto/api/testdata/infinite-loop-process/infinite-loop.qbs
index 855528615..504bf87b0 100644
--- a/tests/auto/api/testdata/infinite-loop-process/infinite-loop.qbs
+++ b/tests/auto/api/testdata/infinite-loop-process/infinite-loop.qbs
@@ -1,9 +1,8 @@
 import qbs
 
 Project {
-    CppApplication {
+    QtApplication {
         type: "application" // suppress bundle generation
-        Depends { name: "Qt.core" }
         files: "main.cpp"
         name: "infinite-loop"
     }
diff --git a/tests/auto/autotest.qbs b/tests/auto/autotest.qbs
index 19d639432..8c802df98 100644
--- a/tests/auto/autotest.qbs
+++ b/tests/auto/autotest.qbs
@@ -1,6 +1,6 @@
 import qbs
 
-CppApplication {
+QtApplication {
     type: "application"
     property string testName
     name: "tst_" + testName
diff --git a/tests/auto/blackbox/testdata/add-qobject-macro-to-cpp-file/project.qbs b/tests/auto/blackbox/testdata/add-qobject-macro-to-cpp-file/project.qbs
index 6c8db1913..40c5395ef 100644
--- a/tests/auto/blackbox/testdata/add-qobject-macro-to-cpp-file/project.qbs
+++ b/tests/auto/blackbox/testdata/add-qobject-macro-to-cpp-file/project.qbs
@@ -1,7 +1,6 @@
 import qbs
 
-CppApplication {
-    Depends { name: "Qt.core" }
+QtApplication {
     files: ["main.cpp", "object.h", "object.cpp"]
 }
 
diff --git a/tests/auto/blackbox/testdata/lotsofdots/lots.of.dots.qbs b/tests/auto/blackbox/testdata/lotsofdots/lots.of.dots.qbs
index fdf101a49..9654100fc 100644
--- a/tests/auto/blackbox/testdata/lotsofdots/lots.of.dots.qbs
+++ b/tests/auto/blackbox/testdata/lotsofdots/lots.of.dots.qbs
@@ -1,12 +1,10 @@
 import qbs 1.0
 
 Project {
-    Product {
+    QtGuiApplication {
         type: "application"
         name: "lots.of.dots"
 
-        Depends { name: "Qt.gui" }
-
         files : [
             "m.a.i.n.cpp",
             "object.narf.h",
diff --git a/tests/auto/blackbox/testdata/objc/objc.qbs b/tests/auto/blackbox/testdata/objc/objc.qbs
index b878097c4..c069c5032 100644
--- a/tests/auto/blackbox/testdata/objc/objc.qbs
+++ b/tests/auto/blackbox/testdata/objc/objc.qbs
@@ -1,9 +1,8 @@
 import qbs 1.0
 
 Project {
-    CppApplication {
+    QtApplication {
         condition: qbs.targetOS.contains("osx")
-        Depends { name: "Qt.core" }
         files: "main.mm"
         cpp.frameworks: [ "Foundation" ]
     }
diff --git a/tests/auto/blackbox/testdata/qml-debugging/project.qbs b/tests/auto/blackbox/testdata/qml-debugging/project.qbs
index 690bf40f9..317dd940d 100644
--- a/tests/auto/blackbox/testdata/qml-debugging/project.qbs
+++ b/tests/auto/blackbox/testdata/qml-debugging/project.qbs
@@ -1,6 +1,6 @@
 import qbs
 
-CppApplication {
+QtApplication {
     name: "debuggable-app"
     type: "application"
     Depends { name: "Qt.quick" }
diff --git a/tests/auto/blackbox/testdata/uic/uic.qbs b/tests/auto/blackbox/testdata/uic/uic.qbs
index cea4ec2a1..a216b86a9 100644
--- a/tests/auto/blackbox/testdata/uic/uic.qbs
+++ b/tests/auto/blackbox/testdata/uic/uic.qbs
@@ -1,12 +1,10 @@
 import qbs 1.0
 
 Project {
-    Product {
+    QtGuiApplication {
         type: "application"
         name: "ui"
 
-        Depends { name: "Qt.gui"}
-
         files: [
             "bla.cpp",
             "bla.h",
diff --git a/tests/fuzzy-test/fuzzy-test.qbs b/tests/fuzzy-test/fuzzy-test.qbs
index 87d6af196..c9c4fb0ac 100644
--- a/tests/fuzzy-test/fuzzy-test.qbs
+++ b/tests/fuzzy-test/fuzzy-test.qbs
@@ -1,9 +1,8 @@
 import qbs
 
-CppApplication {
+QtApplication {
     name: "qbs_fuzzy-test"
     destinationDirectory: "bin"
-    Depends { name: "Qt.core" }
     condition: Qt.core.versionMajor >= 5 // We use QDir::removeRecursively()
     type: "application"
     consoleApplication: true
diff --git a/tests/manual/minimumSystemVersion/minimumSystemVersion.qbs b/tests/manual/minimumSystemVersion/minimumSystemVersion.qbs
index 51272a8d7..fbb592cc9 100644
--- a/tests/manual/minimumSystemVersion/minimumSystemVersion.qbs
+++ b/tests/manual/minimumSystemVersion/minimumSystemVersion.qbs
@@ -2,9 +2,8 @@ import qbs 1.0
 
 Project {
     // no minimum versions are specified so the profile defaults will be used
-    CppApplication {
+    QtApplication {
         type: "application"
-        Depends { name: "Qt.core" }
         name: "unspecified"
         files: "main.cpp"
 
@@ -16,9 +15,8 @@ Project {
 
     // no minimum versions are specified, and explicitly set to undefined in
     // case the profile has set it
-    CppApplication {
+    QtApplication {
         type: "application"
-        Depends { name: "Qt.core" }
         name: "unspecified-forced"
         files: "main.cpp"
         cpp.minimumWindowsVersion: undefined
@@ -35,9 +33,8 @@ Project {
     // a specific version of the operating systems is specified
     // when the application is run its output should confirm
     // that the given values took effect
-    CppApplication {
+    QtApplication {
         type: "application"
-        Depends { name: "Qt.core" }
         condition: qbs.targetOS.contains("windows") || qbs.targetOS.contains("osx")
         name: "specific"
         files: "main.cpp"
@@ -57,9 +54,8 @@ Project {
     // non-existent versions of Windows should print a QBS warning
     // (but will still compile and link since we avoid passing a
     // bad value to the linker)
-    CppApplication {
+    QtApplication {
         type: "application"
-        Depends { name: "Qt.core" }
         condition: qbs.targetOS.contains("windows")
         name: "fakewindows"
         files: "main.cpp"
@@ -69,9 +65,8 @@ Project {
     // just to make sure three-digit minimum versions work on OS X
     // this only affects the value of __MAC_OS_X_VERSION_MIN_REQUIRED,
     // not the actual LC_VERSION_MIN_MACOSX command which is limited to two
-    CppApplication {
+    QtApplication {
         type: "application"
-        Depends { name: "Qt.core" }
         condition: qbs.targetOS.contains("osx")
         name: "macappstore"
         files: "main.cpp"