Skip to content

Commit c86c180

Browse files
committed
deprecated QMAKE dependency type
Instead of using qmake, use config-tool. This is no different than when we deprecated the other per-dependency config-tool types (sdl2-config, llvm-config, etc) for just config-tool
1 parent c211fea commit c86c180

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

mesonbuild/dependencies/base.py

+4-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@ class DependencyMethods(Enum):
5757
# Auto means to use whatever dependency checking mechanisms in whatever order meson thinks is best.
5858
AUTO = 'auto'
5959
PKGCONFIG = 'pkg-config'
60-
QMAKE = 'qmake'
6160
CMAKE = 'cmake'
6261
# Just specify the standard link arguments, assuming the operating system provides the library.
6362
SYSTEM = 'system'
@@ -72,6 +71,7 @@ class DependencyMethods(Enum):
7271
CUPSCONFIG = 'cups-config'
7372
PCAPCONFIG = 'pcap-config'
7473
LIBWMFCONFIG = 'libwmf-config'
74+
QMAKE = 'qmake'
7575
# Misc
7676
DUB = 'dub'
7777

@@ -2281,6 +2281,9 @@ def process_method_kw(possible: T.Iterable[DependencyMethods], kwargs) -> T.List
22812281
DependencyMethods.PCAPCONFIG, DependencyMethods.LIBWMFCONFIG]:
22822282
FeatureDeprecated.single_use(f'Configuration method {method.value}', '0.44', 'Use "config-tool" instead.')
22832283
method = DependencyMethods.CONFIG_TOOL
2284+
if method is DependencyMethods.QMAKE:
2285+
FeatureDeprecated.single_use(f'Configuration method "qmake"', '0.58', 'Use "config-tool" instead.')
2286+
method = DependencyMethods.CONFIG_TOOL
22842287

22852288
# Set the detection method. If the method is set to auto, use any available method.
22862289
# If method is set to a specific string, allow only that detection method.

0 commit comments

Comments
 (0)