aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIvan Komissarov <abbapoh@gmail.com>2020-06-30 22:49:55 +0200
committerIvan Komissarov <ABBAPOH@gmail.com>2020-07-03 09:39:33 +0000
commit20dc25f9fb4e00ec3989d729edbc6ffa61d41f7c (patch)
treede234bd7e6dfc6769d572261f3a686c343b32f4a
parentc5f75e127b6891a155c7c0795b12796a3f604717 (diff)
Do not use id property in protobuf examples
Change-Id: Ia7128e89624d874755e699dde791ac0d7c4029b2 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
-rw-r--r--examples/protobuf/addressbook_cpp/addressbook_cpp.qbs4
-rw-r--r--examples/protobuf/addressbook_objc/addressbook_objc.qbs4
2 files changed, 4 insertions, 4 deletions
diff --git a/examples/protobuf/addressbook_cpp/addressbook_cpp.qbs b/examples/protobuf/addressbook_cpp/addressbook_cpp.qbs
index 09e0d3a08..f0fe70ece 100644
--- a/examples/protobuf/addressbook_cpp/addressbook_cpp.qbs
+++ b/examples/protobuf/addressbook_cpp/addressbook_cpp.qbs
@@ -2,14 +2,14 @@ import qbs
CppApplication {
consoleApplication: true
- condition: protobuf.present && qbs.targetOS == qbs.hostOS
+ condition: protobuf.cpp.present && qbs.targetOS == qbs.hostOS
Depends { name: "cpp" }
cpp.cxxLanguageVersion: "c++11"
cpp.minimumMacosVersion: "10.8"
cpp.warningLevel: "none"
- Depends { id: protobuf; name: "protobuf.cpp"; required: false }
+ Depends { name: "protobuf.cpp"; required: false }
files: [
"../shared/addressbook.proto",
diff --git a/examples/protobuf/addressbook_objc/addressbook_objc.qbs b/examples/protobuf/addressbook_objc/addressbook_objc.qbs
index a4343e060..35409c4db 100644
--- a/examples/protobuf/addressbook_objc/addressbook_objc.qbs
+++ b/examples/protobuf/addressbook_objc/addressbook_objc.qbs
@@ -2,10 +2,10 @@ import qbs
CppApplication {
consoleApplication: true
- condition: protobuf.present && qbs.targetOS.contains("macos")
+ condition: protobuf.objc.present && qbs.targetOS.contains("macos")
Depends { name: "cpp" }
- Depends { id: protobuf; name: "protobuf.objc"; required: false }
+ Depends { name: "protobuf.objc"; required: false }
files: [
"../shared/addressbook.proto",