Commit 492cb3e1 authored by Paolo Angelelli's avatar Paolo Angelelli
Browse files

Properly namespace labs plugin configure feature


This also changes underscore with dashes, so that only dashes have to
be used in enabling a feature in a configure line.

Change-Id: I83d3412382ed2530dcd574a1c4b7bff9f20cfd6a
Reviewed-by: default avatarOswald Buddenhagen <oswald.buddenhagen@qt.io>
Reviewed-by: default avatarAlex Blasche <alexander.blasche@qt.io>
Showing with 4 additions and 4 deletions
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
], ],
"features": { "features": {
"locationlabs_plugin": { "location-labs-plugin": {
"label": "Qt.labs.location experimental QML plugin", "label": "Qt.labs.location experimental QML plugin",
"purpose": "Provides experimental QtLocation QML types", "purpose": "Provides experimental QtLocation QML types",
"section": "Location", "section": "Location",
...@@ -60,7 +60,7 @@ ...@@ -60,7 +60,7 @@
{ {
"section": "Qt Location", "section": "Qt Location",
"entries": [ "entries": [
"locationlabs_plugin", "location-labs-plugin",
{ {
"section": "Geoservice plugins", "section": "Geoservice plugins",
"entries": [ "entries": [
......
...@@ -21,14 +21,14 @@ qtHaveModule(quick) { ...@@ -21,14 +21,14 @@ qtHaveModule(quick) {
plugins.depends += location plugins.depends += location
exists(locationlabs):qtConfig(locationlabs_plugin) { exists(locationlabs):qtConfig(location-labs-plugin) {
SUBDIRS += locationlabs SUBDIRS += locationlabs
locationlabs.depends += location locationlabs.depends += location
} }
SUBDIRS += imports SUBDIRS += imports
imports.depends += positioningquick positioning location imports.depends += positioningquick positioning location
exists(locationlabs):qtConfig(locationlabs_plugin): imports.depends += locationlabs exists(locationlabs):qtConfig(location-labs-plugin): imports.depends += locationlabs
} }
plugins.depends += positioning plugins.depends += positioning
SUBDIRS += plugins SUBDIRS += plugins
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment