aboutsummaryrefslogtreecommitdiffstats
path: root/examples
diff options
context:
space:
mode:
authorIvan Komissarov <abbapoh@gmail.com>2020-05-16 13:28:36 +0200
committerIvan Komissarov <ABBAPOH@gmail.com>2020-05-18 13:13:37 +0000
commit49948ff97d49558a512c89ffd19e4812b625c453 (patch)
tree73290cd0c850d950f71b4dcc64a83044b3ef9899 /examples
parent7218043c5e76c56dd386f4e1667ecff82d6fc1a1 (diff)
Rename .qbs files in examples to match catalog structure
Change-Id: I66996ff2b3e8dcb50b24ad92dffd0651322653e9 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'examples')
-rw-r--r--examples/app-and-lib/app-and-lib.qbs (renamed from examples/app-and-lib/app_and_lib.qbs)0
-rw-r--r--examples/cocoa-application/cocoa-application.qbs (renamed from examples/cocoa-application/CocoaApplication.qbs)0
-rw-r--r--examples/cocoa-touch-application/cocoa-touch-application.qbs (renamed from examples/cocoa-touch-application/CocoaTouchApplication.qbs)0
-rw-r--r--examples/compiled-qml/compiled-qml.qbs (renamed from examples/compiled-qml/myapp.qbs)0
-rw-r--r--examples/examples.qbs21
-rw-r--r--examples/grpc/grpc.qbs (renamed from examples/grpc/ping-pong-grpc.qbs)0
-rw-r--r--examples/helloworld-complex/helloworld-complex.qbs (renamed from examples/helloworld-complex/hello.qbs)0
-rw-r--r--examples/helloworld-minimal/helloworld-minimal.qbs (renamed from examples/helloworld-minimal/hello.qbs)0
-rw-r--r--examples/helloworld-qt/helloworld-qt.qbs (renamed from examples/helloworld-qt/hello.qbs)0
-rw-r--r--examples/protobuf/addressbook_cpp/README.md (renamed from examples/protobuf/cpp/README.md)0
-rw-r--r--examples/protobuf/addressbook_cpp/addressbook_cpp.qbs (renamed from examples/protobuf/cpp/addressbook.qbs)1
-rw-r--r--examples/protobuf/addressbook_cpp/main.cpp (renamed from examples/protobuf/cpp/main.cpp)0
-rw-r--r--examples/protobuf/addressbook_objc/README.md (renamed from examples/protobuf/objc/README.md)0
-rw-r--r--examples/protobuf/addressbook_objc/addressbook_objc.qbs (renamed from examples/protobuf/objc/addressbook.qbs)1
-rw-r--r--examples/protobuf/addressbook_objc/main.m (renamed from examples/protobuf/objc/main.m)0
15 files changed, 11 insertions, 12 deletions
diff --git a/examples/app-and-lib/app_and_lib.qbs b/examples/app-and-lib/app-and-lib.qbs
index baa42307f..baa42307f 100644
--- a/examples/app-and-lib/app_and_lib.qbs
+++ b/examples/app-and-lib/app-and-lib.qbs
diff --git a/examples/cocoa-application/CocoaApplication.qbs b/examples/cocoa-application/cocoa-application.qbs
index 472758764..472758764 100644
--- a/examples/cocoa-application/CocoaApplication.qbs
+++ b/examples/cocoa-application/cocoa-application.qbs
diff --git a/examples/cocoa-touch-application/CocoaTouchApplication.qbs b/examples/cocoa-touch-application/cocoa-touch-application.qbs
index ec1772f1f..ec1772f1f 100644
--- a/examples/cocoa-touch-application/CocoaTouchApplication.qbs
+++ b/examples/cocoa-touch-application/cocoa-touch-application.qbs
diff --git a/examples/compiled-qml/myapp.qbs b/examples/compiled-qml/compiled-qml.qbs
index 3a900fac9..3a900fac9 100644
--- a/examples/compiled-qml/myapp.qbs
+++ b/examples/compiled-qml/compiled-qml.qbs
diff --git a/examples/examples.qbs b/examples/examples.qbs
index ff6e7a191..2b1c0933b 100644
--- a/examples/examples.qbs
+++ b/examples/examples.qbs
@@ -52,19 +52,20 @@ import qbs
Project {
references: [
- "app-and-lib/app_and_lib.qbs",
- "cocoa-application/CocoaApplication.qbs",
- "cocoa-touch-application/CocoaTouchApplication.qbs",
+ "app-and-lib/app-and-lib.qbs",
+ "cocoa-application/cocoa-application.qbs",
+ "cocoa-touch-application/cocoa-touch-application.qbs",
"code-generator/code-generator.qbs",
"collidingmice/collidingmice.qbs",
- "compiled-qml/myapp.qbs",
- "grpc/ping-pong-grpc.qbs",
- "helloworld-complex/hello.qbs",
- "helloworld-minimal/hello.qbs",
- "helloworld-qt/hello.qbs",
+ "compiled-qml/compiled-qml.qbs",
+ "grpc/grpc.qbs",
+ "helloworld-complex/helloworld-complex.qbs",
+ "helloworld-minimal/helloworld-minimal.qbs",
+ "helloworld-qt/helloworld-qt.qbs",
"install-bundle/install-bundle.qbs",
- "protobuf/cpp/addressbook.qbs",
- "protobuf/objc/addressbook.qbs",
+ // these examples are broken because of the bug in the protobuf modules
+ // "protobuf/addressbook_cpp/addressbook_cpp.qbs",
+ // "protobuf/addressbook_objc/addressbook_objc.qbs",
"baremetal/baremetal.qbs",
"rule/rule.qbs",
]
diff --git a/examples/grpc/ping-pong-grpc.qbs b/examples/grpc/grpc.qbs
index 9f80add04..9f80add04 100644
--- a/examples/grpc/ping-pong-grpc.qbs
+++ b/examples/grpc/grpc.qbs
diff --git a/examples/helloworld-complex/hello.qbs b/examples/helloworld-complex/helloworld-complex.qbs
index 16e7eace0..16e7eace0 100644
--- a/examples/helloworld-complex/hello.qbs
+++ b/examples/helloworld-complex/helloworld-complex.qbs
diff --git a/examples/helloworld-minimal/hello.qbs b/examples/helloworld-minimal/helloworld-minimal.qbs
index 5cad9f4bf..5cad9f4bf 100644
--- a/examples/helloworld-minimal/hello.qbs
+++ b/examples/helloworld-minimal/helloworld-minimal.qbs
diff --git a/examples/helloworld-qt/hello.qbs b/examples/helloworld-qt/helloworld-qt.qbs
index 4c6e070af..4c6e070af 100644
--- a/examples/helloworld-qt/hello.qbs
+++ b/examples/helloworld-qt/helloworld-qt.qbs
diff --git a/examples/protobuf/cpp/README.md b/examples/protobuf/addressbook_cpp/README.md
index f0e1b1a93..f0e1b1a93 100644
--- a/examples/protobuf/cpp/README.md
+++ b/examples/protobuf/addressbook_cpp/README.md
diff --git a/examples/protobuf/cpp/addressbook.qbs b/examples/protobuf/addressbook_cpp/addressbook_cpp.qbs
index 3f699c7db..36ad86338 100644
--- a/examples/protobuf/cpp/addressbook.qbs
+++ b/examples/protobuf/addressbook_cpp/addressbook_cpp.qbs
@@ -1,7 +1,6 @@
import qbs
CppApplication {
- name: "addressbook_cpp"
consoleApplication: true
condition: protobuf.present
diff --git a/examples/protobuf/cpp/main.cpp b/examples/protobuf/addressbook_cpp/main.cpp
index 8d2ca9763..8d2ca9763 100644
--- a/examples/protobuf/cpp/main.cpp
+++ b/examples/protobuf/addressbook_cpp/main.cpp
diff --git a/examples/protobuf/objc/README.md b/examples/protobuf/addressbook_objc/README.md
index c0fc7c0e5..c0fc7c0e5 100644
--- a/examples/protobuf/objc/README.md
+++ b/examples/protobuf/addressbook_objc/README.md
diff --git a/examples/protobuf/objc/addressbook.qbs b/examples/protobuf/addressbook_objc/addressbook_objc.qbs
index f087113d9..58ba5a899 100644
--- a/examples/protobuf/objc/addressbook.qbs
+++ b/examples/protobuf/addressbook_objc/addressbook_objc.qbs
@@ -1,7 +1,6 @@
import qbs
CppApplication {
- name: "addressbook_objc"
consoleApplication: true
condition: protobuf.present && qbs.targetOS.contains("darwin")
diff --git a/examples/protobuf/objc/main.m b/examples/protobuf/addressbook_objc/main.m
index d70de8e55..d70de8e55 100644
--- a/examples/protobuf/objc/main.m
+++ b/examples/protobuf/addressbook_objc/main.m