diff options
| author | Paolo Angelelli <paolo.angelelli@qt.io> | 2018-01-29 11:15:52 +0100 |
|---|---|---|
| committer | Paolo Angelelli <paolo.angelelli@qt.io> | 2018-01-29 10:46:17 +0000 |
| commit | 5cf46b1ec34d44be2e51cd83f2c71ae52407f06a (patch) | |
| tree | 8dea55a82489e1dc6c434c85f4d94616ac0f98c0 | |
| parent | a19ae33f29e4c54d5ee4c97be171fbfc793a66ac (diff) | |
| download | qtlocation-5cf46b1ec34d44be2e51cd83f2c71ae52407f06a.tar.gz | |
Rename configure option labs_plugin into locationlabs_plugin
This to avoid potential clashes, as "labs_plugin" is too generic.
Change-Id: I5a797c8f15cd71b9b423fbe8ddfc8733fa0b2854
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
| -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 8f74a4be..4695b1c0 100644 --- a/src/location/configure.json +++ b/src/location/configure.json @@ -5,7 +5,7 @@ ], "features": { - "labs_plugin": { + "locationlabs_plugin": { "label": "Qt.labs.location experimental QML plugin", "purpose": "Provides experimental QtLocation QML types", "section": "Location", @@ -60,7 +60,7 @@ { "section": "Qt Location", "entries": [ - "labs_plugin", + "locationlabs_plugin", { "section": "Geoservice plugins", "entries": [ diff --git a/src/src.pro b/src/src.pro index 9cef3da0..583ff666 100644 --- a/src/src.pro +++ b/src/src.pro @@ -21,14 +21,14 @@ qtHaveModule(quick) { plugins.depends += location - exists(locationlabs):qtConfig(labs_plugin) { + exists(locationlabs):qtConfig(locationlabs_plugin) { SUBDIRS += locationlabs locationlabs.depends += location } SUBDIRS += imports imports.depends += positioningquick positioning location - exists(locationlabs):qtConfig(labs_plugin): imports.depends += locationlabs + exists(locationlabs):qtConfig(locationlabs_plugin): imports.depends += locationlabs } plugins.depends += positioning SUBDIRS += plugins |