diff options
| author | Dylan Baker <dylan@pnwbakers.com> | 2021-06-17 10:05:04 -0700 |
|---|---|---|
| committer | Dylan Baker <dylan@pnwbakers.com> | 2021-06-18 09:52:23 -0700 |
| commit | f7eda0e822615ccdfe796c3a8db5a2bae954d72a (patch) | |
| tree | 79a92f3e774f9b2a66e834b31783d75d8c3c62db /mesonbuild | |
| parent | 6d52ddf3c7f80810f09be93cfcf2a5cf537cd07d (diff) | |
| download | meson-f7eda0e822615ccdfe796c3a8db5a2bae954d72a.zip meson-f7eda0e822615ccdfe796c3a8db5a2bae954d72a.tar.gz meson-f7eda0e822615ccdfe796c3a8db5a2bae954d72a.tar.bz2 | |
modules/qt: allow string values for include_directories
This should have been supported before, but wasn't.
Diffstat (limited to 'mesonbuild')
| -rw-r--r-- | mesonbuild/modules/qt.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mesonbuild/modules/qt.py b/mesonbuild/modules/qt.py index 7d752db..5165fb3 100644 --- a/mesonbuild/modules/qt.py +++ b/mesonbuild/modules/qt.py @@ -65,7 +65,7 @@ if T.TYPE_CHECKING: headers: T.List[mesonlib.FileOrString] extra_args: T.List[str] method: str - include_directories: T.List[IncludeDirsHolder] + include_directories: T.List[T.Union[str, IncludeDirsHolder]] dependencies: T.List[T.Union[DependencyHolder, ExternalLibraryHolder]] class PreprocessKwArgs(TypedDict): @@ -78,7 +78,7 @@ if T.TYPE_CHECKING: moc_extra_arguments: T.List[str] rcc_extra_arguments: T.List[str] uic_extra_arguments: T.List[str] - include_directories: T.List[IncludeDirsHolder] + include_directories: T.List[T.Union[str, IncludeDirsHolder]] dependencies: T.List[T.Union[DependencyHolder, ExternalLibraryHolder]] method: str @@ -362,7 +362,7 @@ class QtBaseModule(ExtensionModule): KwargInfo('headers', ContainerTypeInfo(list, (File, str)), listify=True, default=[]), KwargInfo('extra_args', ContainerTypeInfo(list, str), listify=True, default=[]), KwargInfo('method', str, default='auto'), - KwargInfo('include_directories', ContainerTypeInfo(list, IncludeDirsHolder), listify=True, default=[]), + KwargInfo('include_directories', ContainerTypeInfo(list, (IncludeDirsHolder, str)), listify=True, default=[]), KwargInfo('dependencies', ContainerTypeInfo(list, (DependencyHolder, ExternalLibraryHolder)), listify=True, default=[]), ) def compile_moc(self, state: 'ModuleState', args: T.Tuple, kwargs: 'MocCompilerKwArgs') -> ModuleReturnValue: @@ -408,7 +408,7 @@ class QtBaseModule(ExtensionModule): KwargInfo('rcc_extra_arguments', ContainerTypeInfo(list, str), listify=True, default=[], since='0.49.0'), KwargInfo('uic_extra_arguments', ContainerTypeInfo(list, str), listify=True, default=[], since='0.49.0'), KwargInfo('method', str, default='auto'), - KwargInfo('include_directories', ContainerTypeInfo(list, IncludeDirsHolder), listify=True, default=[]), + KwargInfo('include_directories', ContainerTypeInfo(list, (IncludeDirsHolder, str)), listify=True, default=[]), KwargInfo('dependencies', ContainerTypeInfo(list, (DependencyHolder, ExternalLibraryHolder)), listify=True, default=[]), ) def preprocess(self, state: 'ModuleState', args: T.List[T.Union[str, File]], kwargs: 'PreprocessKwArgs') -> ModuleReturnValue: |