aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--examples/app-and-lib/app/app.qbs3
-rw-r--r--examples/app-and-lib/app/main.cpp2
-rw-r--r--examples/app-and-lib/lib/lib.qbs4
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" }