summaryrefslogtreecommitdiffstats
path: root/src/gui
diff options
context:
space:
mode:
authorGerry Boland <gerry.boland@canonical.com>2017-01-31 13:58:12 +0000
committerEirik Aavitsland <eirik.aavitsland@qt.io>2017-03-02 08:00:06 +0000
commit87f8777b45dd0643e1a9e17e3e93f95371d3246d (patch)
treee193c282bb0be75acf1087115a382fbb6289f2d1 /src/gui
parentc4c8886a864d1058c3441a96556aa8b124b4f17f (diff)
Mirclient: only enable if desired. Depend on content-hub>=0.2.0
Change-Id: I65050e7924b6f7564664e8f4c7270ddad5717336 Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/configure.json3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/gui/configure.json b/src/gui/configure.json
index 41c665962e..b1329cc213 100644
--- a/src/gui/configure.json
+++ b/src/gui/configure.json
@@ -170,7 +170,7 @@
"label": "Mir client libraries",
"test": "qpa/mirclient",
"sources": [
- { "type": "pkgConfig", "args": "egl mirclient ubuntu-platform-api libcontent-hub" }
+ { "type": "pkgConfig", "args": "egl mirclient ubuntu-platform-api libcontent-hub >= 0.2.0" }
]
},
"mtdev": {
@@ -546,6 +546,7 @@
"mirclient": {
"label": "Mir client",
"section": "Platform plugins",
+ "autoDetect": false,
"condition": "libs.mirclient",
"output": [ "privateFeature" ]
},