diff options
| author | Paolo Angelelli <paolo.angelelli@qt.io> | 2018-02-01 11:46:21 +0100 |
|---|---|---|
| committer | Paolo Angelelli <paolo.angelelli@qt.io> | 2018-02-19 15:32:19 +0000 |
| commit | 492cb3e14d3c67173eb1e6d37c9b3a44f4d7467d (patch) | |
| tree | 34ada222ed512397805758436c3d798f77765c91 | |
| parent | 677833d418176e46babbd7720b1160ce789c7e2d (diff) | |
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: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| -rw-r--r-- | src/location/configure.json | 4 | ||||
| -rw-r--r-- | src/src.pro | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/location/configure.json b/src/location/configure.json index 4695b1c0..fa29cd77 100644 --- a/src/location/configure.json +++ b/src/location/configure.json @@ -5,7 +5,7 @@ ], "features": { - "locationlabs_plugin": { + "location-labs-plugin": { "label": "Qt.labs.location experimental QML plugin", "purpose": "Provides experimental QtLocation QML types", "section": "Location", @@ -60,7 +60,7 @@ { "section": "Qt Location", "entries": [ - "locationlabs_plugin", + "location-labs-plugin", { "section": "Geoservice plugins", "entries": [ diff --git a/src/src.pro b/src/src.pro index 583ff666..54fddb62 100644 --- a/src/src.pro +++ b/src/src.pro @@ -21,14 +21,14 @@ qtHaveModule(quick) { plugins.depends += location - exists(locationlabs):qtConfig(locationlabs_plugin) { + exists(locationlabs):qtConfig(location-labs-plugin) { SUBDIRS += locationlabs locationlabs.depends += location } SUBDIRS += imports 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 SUBDIRS += plugins |