diff options
| author | Christian Kandeler <christian.kandeler@digia.com> | 2014-07-09 16:04:14 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@digia.com> | 2014-07-14 12:22:10 +0200 |
| commit | 3a037fe9a274953549c52d6d41e6112daa6362ac (patch) | |
| tree | 2f5d801a7f3725df18ed14bfd878c201e0b304f0 /tests/auto | |
| parent | 7eebf9997850de606bbd00f5eb64720888940c1c (diff) | |
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>
Diffstat (limited to 'tests/auto')
7 files changed, 7 insertions, 14 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", |