diff options
| author | Dominik Holland <dominik.holland@pelagicore.com> | 2019-02-11 10:22:41 +0100 |
|---|---|---|
| committer | Dominik Holland <dominik.holland@pelagicore.com> | 2019-02-11 10:22:41 +0100 |
| commit | 2295c67accd2ac50374d2e90cc536feaf11ead4b (patch) | |
| tree | 2696467a506f66a29a87960dde51645e74df9b11 /examples | |
| parent | 41f1e9d629a2128131ef5a1b93a04e08e3577df6 (diff) | |
| parent | 08b2e9c14f4acad3498f32fd638d76d61b7337de (diff) | |
| download | qtivi-2295c67accd2ac50374d2e90cc536feaf11ead4b.tar.gz | |
Merge remote-tracking branch 'origin/5.12' into dev
Change-Id: I7280716d07f051a8c25b9524bfe1273658969aaf
Diffstat (limited to 'examples')
7 files changed, 4 insertions, 7 deletions
diff --git a/examples/ivicore/qface-ivi-addressbook/backend_simulator/backend_simulator.pro b/examples/ivicore/qface-ivi-addressbook/backend_simulator/backend_simulator.pro index 38e65e7..a65f7d5 100644 --- a/examples/ivicore/qface-ivi-addressbook/backend_simulator/backend_simulator.pro +++ b/examples/ivicore/qface-ivi-addressbook/backend_simulator/backend_simulator.pro @@ -1,6 +1,5 @@ TEMPLATE=lib TARGET = $$qtLibraryTarget(example_ivi_addressbook) -macos: CONFIG += debug_and_release build_all QT_FOR_CONFIG += ivicore !qtConfig(ivigenerator): error("No ivigenerator available") diff --git a/examples/ivicore/qface-ivi-addressbook/frontend/frontend.pro b/examples/ivicore/qface-ivi-addressbook/frontend/frontend.pro index bbcaeb5..9008434 100644 --- a/examples/ivicore/qface-ivi-addressbook/frontend/frontend.pro +++ b/examples/ivicore/qface-ivi-addressbook/frontend/frontend.pro @@ -1,7 +1,7 @@ TARGET = $$qtLibraryTarget(QtIviAdressBookExample) TEMPLATE = lib DESTDIR = .. -macos: CONFIG += debug_and_release build_all + QT_FOR_CONFIG += ivicore !qtConfig(ivigenerator): error("No ivigenerator available") QT += ivicore ivicore-private qml quick diff --git a/examples/ivicore/qface-ivi-climate/backend_simulator/backend_simulator.pro b/examples/ivicore/qface-ivi-climate/backend_simulator/backend_simulator.pro index 42f0193..c38cb8c 100644 --- a/examples/ivicore/qface-ivi-climate/backend_simulator/backend_simulator.pro +++ b/examples/ivicore/qface-ivi-climate/backend_simulator/backend_simulator.pro @@ -1,6 +1,5 @@ TEMPLATE=lib TARGET = $$qtLibraryTarget(example_ivi_climate) -macos: CONFIG += debug_and_release build_all QT_FOR_CONFIG += ivicore !qtConfig(ivigenerator): error("No ivigenerator available") diff --git a/examples/ivicore/qface-ivi-climate/frontend/frontend.pro b/examples/ivicore/qface-ivi-climate/frontend/frontend.pro index f76702e..1eb1145 100644 --- a/examples/ivicore/qface-ivi-climate/frontend/frontend.pro +++ b/examples/ivicore/qface-ivi-climate/frontend/frontend.pro @@ -1,7 +1,7 @@ TARGET = $$qtLibraryTarget(QtIviClimateExample) TEMPLATE = lib DESTDIR = .. -macos: CONFIG += debug_and_release build_all + #! [0] QT_FOR_CONFIG += ivicore !qtConfig(ivigenerator): error("No ivigenerator available") diff --git a/examples/ivicore/qface-ivi-remote/backend_qtro/backend_qtro.pro b/examples/ivicore/qface-ivi-remote/backend_qtro/backend_qtro.pro index ff26393..7cee6be 100644 --- a/examples/ivicore/qface-ivi-remote/backend_qtro/backend_qtro.pro +++ b/examples/ivicore/qface-ivi-remote/backend_qtro/backend_qtro.pro @@ -1,6 +1,5 @@ TEMPLATE=lib TARGET = $$qtLibraryTarget(example_ivi_remote) -macos: CONFIG += debug_and_release build_all QT_FOR_CONFIG += ivicore !qtConfig(ivigenerator): error("No ivigenerator available") diff --git a/examples/ivicore/qface-ivi-remote/example-ivi-remote.qface b/examples/ivicore/qface-ivi-remote/example-ivi-remote.qface index af45423..31d6d0c 100644 --- a/examples/ivicore/qface-ivi-remote/example-ivi-remote.qface +++ b/examples/ivicore/qface-ivi-remote/example-ivi-remote.qface @@ -9,7 +9,7 @@ module Example.IVI.Remote 1.0; * all sorts of heavy processing */ //! [1] -@config: { id: "example.qtivi.ProcessingService/1.0", qml_type: "UiProcessingService" } +@config: { qml_type: "UiProcessingService" } interface ProcessingService { string lastMessage; diff --git a/examples/ivicore/qface-ivi-remote/frontend/frontend.pro b/examples/ivicore/qface-ivi-remote/frontend/frontend.pro index 8fe5732..dc3e04c 100644 --- a/examples/ivicore/qface-ivi-remote/frontend/frontend.pro +++ b/examples/ivicore/qface-ivi-remote/frontend/frontend.pro @@ -1,7 +1,7 @@ TARGET = $$qtLibraryTarget(QtIviRemoteExample) TEMPLATE = lib DESTDIR = .. -macos: CONFIG += debug_and_release build_all + #! [0] QT_FOR_CONFIG += ivicore !qtConfig(ivigenerator): error("No ivigenerator available") |