diff options
| author | Dominik Holland <dominik.holland@pelagicore.com> | 2018-09-26 10:10:43 +0200 |
|---|---|---|
| committer | Dominik Holland <dominik.holland@pelagicore.com> | 2018-09-27 09:33:45 +0200 |
| commit | 6f96b2b3b985f1233302385db328e2aa67b95fb9 (patch) | |
| tree | 19caa35f592c7fb37e8f1bf63fdd2b5435c5ee45 /examples | |
| parent | 142d7174863c2acf2792ba723c8dd273f8d07b22 (diff) | |
| parent | c3da57cf0c7213120803fe63003d0cc14d14f871 (diff) | |
| download | qtivi-6f96b2b3b985f1233302385db328e2aa67b95fb9.tar.gz | |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: If48055bb577b4b59a836b2c4a00d940401b97c6a
Diffstat (limited to 'examples')
3 files changed, 3 insertions, 3 deletions
diff --git a/examples/ivicore/qface-ivi-addressbook/frontend/frontend.pro b/examples/ivicore/qface-ivi-addressbook/frontend/frontend.pro index 78ef584..bbcaeb5 100644 --- a/examples/ivicore/qface-ivi-addressbook/frontend/frontend.pro +++ b/examples/ivicore/qface-ivi-addressbook/frontend/frontend.pro @@ -6,7 +6,7 @@ QT_FOR_CONFIG += ivicore !qtConfig(ivigenerator): error("No ivigenerator available") QT += ivicore ivicore-private qml quick -DEFINES += QT_BUILD_ADDRESSBOOK_LIB +DEFINES += QT_BUILD_EXAMPLE_IVI_ADDRESSBOOK_LIB CONFIG += ivigenerator QFACE_SOURCES = ../example-ivi-addressbook.qface CONFIG += install_ok # Do not cargo-cult this! diff --git a/examples/ivicore/qface-ivi-climate/frontend/frontend.pro b/examples/ivicore/qface-ivi-climate/frontend/frontend.pro index fb07a8a..f76702e 100644 --- a/examples/ivicore/qface-ivi-climate/frontend/frontend.pro +++ b/examples/ivicore/qface-ivi-climate/frontend/frontend.pro @@ -8,7 +8,7 @@ QT_FOR_CONFIG += ivicore #! [0] QT += ivicore ivicore-private qml quick -DEFINES += QT_BUILD_CLIMATE_LIB +DEFINES += QT_BUILD_EXAMPLE_IVI_CLIMATE_LIB #! [1] CONFIG += ivigenerator QFACE_SOURCES = ../example-ivi-climate.qface diff --git a/examples/ivicore/qface-ivi-remote/frontend/frontend.pro b/examples/ivicore/qface-ivi-remote/frontend/frontend.pro index 20e5207..8fe5732 100644 --- a/examples/ivicore/qface-ivi-remote/frontend/frontend.pro +++ b/examples/ivicore/qface-ivi-remote/frontend/frontend.pro @@ -8,7 +8,7 @@ QT_FOR_CONFIG += ivicore #! [0] QT += ivicore ivicore-private qml quick -DEFINES += QT_BUILD_REMOTE_LIB +DEFINES += QT_BUILD_EXAMPLE_IVI_REMOTE_LIB #! [1] CONFIG += ivigenerator QFACE_SOURCES = ../example-ivi-remote.qface |