diff options
| -rw-r--r-- | mesonbuild/dependencies/base.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/mesonbuild/dependencies/base.py b/mesonbuild/dependencies/base.py index 8944780..14380d4 100644 --- a/mesonbuild/dependencies/base.py +++ b/mesonbuild/dependencies/base.py @@ -57,7 +57,6 @@ class DependencyMethods(Enum): # Auto means to use whatever dependency checking mechanisms in whatever order meson thinks is best. AUTO = 'auto' PKGCONFIG = 'pkg-config' - QMAKE = 'qmake' CMAKE = 'cmake' # Just specify the standard link arguments, assuming the operating system provides the library. SYSTEM = 'system' @@ -72,6 +71,7 @@ class DependencyMethods(Enum): CUPSCONFIG = 'cups-config' PCAPCONFIG = 'pcap-config' LIBWMFCONFIG = 'libwmf-config' + QMAKE = 'qmake' # Misc DUB = 'dub' @@ -2281,6 +2281,9 @@ def process_method_kw(possible: T.Iterable[DependencyMethods], kwargs) -> T.List DependencyMethods.PCAPCONFIG, DependencyMethods.LIBWMFCONFIG]: FeatureDeprecated.single_use(f'Configuration method {method.value}', '0.44', 'Use "config-tool" instead.') method = DependencyMethods.CONFIG_TOOL + if method is DependencyMethods.QMAKE: + FeatureDeprecated.single_use(f'Configuration method "qmake"', '0.58', 'Use "config-tool" instead.') + method = DependencyMethods.CONFIG_TOOL # Set the detection method. If the method is set to auto, use any available method. # If method is set to a specific string, allow only that detection method. |