Virtualization
/
meson
mirror of https://gitlab.com/qemu-project/meson.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

modules/qt: sort and clean up dependencies

This commit is contained in:
Dylan Baker 2021-06-04 09:21:15 -07:00
parent 2a8a6bb881
commit bfaa529a7a
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
mesonbuild/modules/qt.py
View File

@ -1,4 +1,5 @@
# Copyright 2015 The Meson development team # Copyright 2015 The Meson development team
# Copyright © 2021 Intel Corporation
# Licensed under the Apache License, Version 2.0 (the "License"); # Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License. # you may not use this file except in compliance with the License.
@ -12,21 +13,21 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
from mesonbuild.dependencies import find_external_dependency
import os import os
import shutil import shutil
import typing as T import typing as T
import xml.etree.ElementTree as ET
from .. import mlog from . import ModuleReturnValue, ExtensionModule
from .. import build from .. import build
from .. import mesonlib from .. import mesonlib
from ..mesonlib import MesonException, File, version_compare from .. import mlog
import xml.etree.ElementTree as ET from ..dependencies import find_external_dependency
from . import ModuleReturnValue, ExtensionModule
from ..interpreterbase import ContainerTypeInfo, FeatureDeprecated, KwargInfo, noPosargs, FeatureNew, typed_kwargs
from ..interpreter import extract_required_kwarg from ..interpreter import extract_required_kwarg
from ..programs import NonExistingExternalProgram
from ..interpreter.interpreterobjects import DependencyHolder, ExternalLibraryHolder, IncludeDirsHolder, FeatureOptionHolder, GeneratedListHolder from ..interpreter.interpreterobjects import DependencyHolder, ExternalLibraryHolder, IncludeDirsHolder, FeatureOptionHolder, GeneratedListHolder
from ..interpreterbase import ContainerTypeInfo, FeatureDeprecated, KwargInfo, noPosargs, FeatureNew, typed_kwargs
from ..mesonlib import MesonException, File
from ..programs import NonExistingExternalProgram
if T.TYPE_CHECKING: if T.TYPE_CHECKING:
from . import ModuleState from . import ModuleState
@ -171,7 +172,7 @@ class QtBaseModule(ExtensionModule):
if qt.found(): if qt.found():
# Get all tools and then make sure that they are the right version # Get all tools and then make sure that they are the right version
self.compilers_detect(state, qt) self.compilers_detect(state, qt)
if version_compare(qt.version, '>=5.14.0'): if mesonlib.version_compare(qt.version, '>=5.14.0'):
self._rcc_supports_depfiles = True self._rcc_supports_depfiles = True
else: else:
mlog.warning('rcc dependencies will not work properly until you move to Qt >= 5.14:', mlog.warning('rcc dependencies will not work properly until you move to Qt >= 5.14:',