diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2017-10-17 15:41:58 +0200 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2017-10-17 14:43:00 +0000 |
| commit | 1f10f2e9dc17140145a4c8a3257ac2baad123e87 (patch) | |
| tree | 527a2c3740a3c1ed1df98942354fa524d4e07f68 /examples | |
| parent | 7813ae12a02fb7f24075c459e5335503a65da5c1 (diff) | |
Polish examples/app-and-lib
Assign sensible names to the products, fix the style of the project
files and add some more descriptive output.
Change-Id: Icdca5e8c32cfef767aa18abc2dd9c4688880c2ba
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/app-and-lib/app/app.qbs | 3 | ||||
| -rw-r--r-- | examples/app-and-lib/app/main.cpp | 2 | ||||
| -rw-r--r-- | examples/app-and-lib/lib/lib.qbs | 4 |
3 files changed, 5 insertions, 4 deletions
diff --git a/examples/app-and-lib/app/app.qbs b/examples/app-and-lib/app/app.qbs index 9b9c8809e..26f9774af 100644 --- a/examples/app-and-lib/app/app.qbs +++ b/examples/app-and-lib/app/app.qbs @@ -53,9 +53,8 @@ import qbs 1.0 Product { type: "application" consoleApplication: true - name : "app-and-lib-app" files : [ "main.cpp" ] Depends { name: "cpp" } - Depends { name: "app-and-lib-lib" } + Depends { name: "mylib" } } diff --git a/examples/app-and-lib/app/main.cpp b/examples/app-and-lib/app/main.cpp index d5a1a183c..9d1eda989 100644 --- a/examples/app-and-lib/app/main.cpp +++ b/examples/app-and-lib/app/main.cpp @@ -48,9 +48,11 @@ ** ****************************************************************************/ +#include <stdio.h> #include <lib.h> int main() { + puts("Now calling a function from mylib:"); return bla(); } diff --git a/examples/app-and-lib/lib/lib.qbs b/examples/app-and-lib/lib/lib.qbs index 06e6365ce..5c0098dae 100644 --- a/examples/app-and-lib/lib/lib.qbs +++ b/examples/app-and-lib/lib/lib.qbs @@ -52,13 +52,13 @@ import qbs 1.0 Product { type: "staticlibrary" - name: "app-and-lib-lib" + name: "mylib" files: [ "lib.cpp", "lib.h", ] - cpp.defines: ['CRUCIAL_DEFINE'] Depends { name: 'cpp' } + cpp.defines: ['CRUCIAL_DEFINE'] Export { Depends { name: "cpp" } |