summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDominik Holland <dominik.holland@qt.io>2020-04-02 16:24:18 +0200
committerDominik Holland <dominik.holland@qt.io>2020-04-02 17:57:50 +0200
commitc1eb0c8c62409a10ad1893a406aba07451b473e2 (patch)
treecc97ae52d1ecec282d66b50005253a404afc682d /src
parentf9ffd3516966345149b7d2721325fc695286118b (diff)
downloadqtivi-c1eb0c8c62409a10ad1893a406aba07451b473e2.tar.gz
Fix the geniviextras only build configuration
Change-Id: I07fd33fe28e5ff82cf0d478d616e9002e88a26fb Reviewed-by: Bernd Weimer <bernd.weimer@pelagicore.com>
Diffstat (limited to 'src')
-rw-r--r--src/ivicore/configure.json2
-rw-r--r--src/ivimedia/configure.json3
2 files changed, 3 insertions, 2 deletions
diff --git a/src/ivicore/configure.json b/src/ivicore/configure.json
index 6698d98..7bc153c 100644
--- a/src/ivicore/configure.json
+++ b/src/ivicore/configure.json
@@ -88,7 +88,7 @@
"report": [
{
"type": "error",
- "condition": "!features.ivigenerator && input.ivigenerator != 'no'",
+ "condition": "features.ivicore && !features.ivigenerator && input.ivigenerator != 'no'",
"message": "Cannot build the IVI Generator because its dependencies are not satisfied.
The IVI Generator provides tooling to generate source code out of IDL files.
Make sure python3 and its 'virtualenv' packages are installed.
diff --git a/src/ivimedia/configure.json b/src/ivimedia/configure.json
index 33265db..46dc233 100644
--- a/src/ivimedia/configure.json
+++ b/src/ivimedia/configure.json
@@ -53,11 +53,12 @@
},
"tuner_simulation_backend": {
"label": "Tuner Simulation Backend",
+ "condition": "module.multimedia",
"output": [ "privateFeature" ]
},
"media_qtro_backend" : {
"label": "Mediaplayer Qt Remote Objects Backend",
- "condition": "features.remoteobjects",
+ "condition": "features.remoteobjects && module.multimedia",
"output": [ "privateFeature" ]
},
"media_qtro_simulation_server" : {