diff options
| author | Ivan Komissarov <abbapoh@gmail.com> | 2020-07-14 21:34:41 +0200 |
|---|---|---|
| committer | Ivan Komissarov <ABBAPOH@gmail.com> | 2020-07-15 09:27:20 +0000 |
| commit | 3ae5188b20dca13fb2c23ca09457b9eda2147b4c (patch) | |
| tree | 8f6446f8bd859d63a7beabc0fa7654790232b311 /share | |
| parent | 5009c517d94be83e5948d33f65a0101db8353330 (diff) | |
Probes: Remove deprecated properties from PathProbe
They were declared deprecated in qbs 1.13, looks like it's safe to
remove them.
Change-Id: I493f7bb9578da1bb579161338bcb5d391cc15f4c
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'share')
| -rw-r--r-- | share/qbs/imports/qbs/Probes/PathProbe.qbs | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/share/qbs/imports/qbs/Probes/PathProbe.qbs b/share/qbs/imports/qbs/Probes/PathProbe.qbs index 424a621c6..768defd87 100644 --- a/share/qbs/imports/qbs/Probes/PathProbe.qbs +++ b/share/qbs/imports/qbs/Probes/PathProbe.qbs @@ -38,11 +38,9 @@ Probe { property var nameFilter property var candidateFilter property varList selectors - property pathList pathPrefixes property pathList searchPaths property stringList pathSuffixes property pathList platformSearchPaths: hostOS.contains("unix") ? ['/usr', '/usr/local'] : [] - property pathList platformPaths property stringList environmentPaths property stringList platformEnvironmentPaths property stringList hostOS: qbs.hostOS @@ -57,15 +55,9 @@ Probe { property varList allResults configure: { - if (pathPrefixes) - console.warn("PathProbe.pathPrefixes is deprecated, use searchPaths instead"); - if (platformPaths) - console.warn("PathProbe.platformPaths is deprecated, use platformSearchPaths instead"); - var _searchPaths = ModUtils.concatAll(pathPrefixes, searchPaths); - var _platformSearchPaths = ModUtils.concatAll(platformPaths, platformSearchPaths); var results = PathProbeConfigure.configure(selectors, names, nameSuffixes, nameFilter, - candidateFilter, _searchPaths, pathSuffixes, - _platformSearchPaths, environmentPaths, + candidateFilter, searchPaths, pathSuffixes, + platformSearchPaths, environmentPaths, platformEnvironmentPaths, pathListSeparator); found = results.found; allResults = results.files; |