aboutsummaryrefslogtreecommitdiff
path: root/mesonbuild/modules/qt.py
diff options
context:
space:
mode:
authorDylan Baker <dylan@pnwbakers.com>2020-03-05 09:50:30 -0800
committerDylan Baker <dylan@pnwbakers.com>2020-03-05 09:58:52 -0800
commit06b1a317d26cbe2a1bd7a232dd9726590d0c0a48 (patch)
treea2adf1f707779f18e226bf39c34447d229e71758 /mesonbuild/modules/qt.py
parent4d6ac91f950380d8262c13ce529ac0d6d8f6f4ba (diff)
downloadmeson-06b1a317d26cbe2a1bd7a232dd9726590d0c0a48.zip
meson-06b1a317d26cbe2a1bd7a232dd9726590d0c0a48.tar.gz
meson-06b1a317d26cbe2a1bd7a232dd9726590d0c0a48.tar.bz2
Make use of unholder
We have a lot of cases of code like: ```python if hasattr(var, 'held_object'): var = var.held_object` ``` replace that with the unholder function.
Diffstat (limited to 'mesonbuild/modules/qt.py')
-rw-r--r--mesonbuild/modules/qt.py6
1 files changed, 2 insertions, 4 deletions
diff --git a/mesonbuild/modules/qt.py b/mesonbuild/modules/qt.py
index b4f3a49..56a1406 100644
--- a/mesonbuild/modules/qt.py
+++ b/mesonbuild/modules/qt.py
@@ -15,7 +15,7 @@
import os
from .. import mlog
from .. import build
-from ..mesonlib import MesonException, Popen_safe, extract_as_list, File
+from ..mesonlib import MesonException, Popen_safe, extract_as_list, File, unholder
from ..dependencies import Dependency, Qt4Dependency, Qt5Dependency
import xml.etree.ElementTree as ET
from . import ModuleReturnValue, get_include_args, ExtensionModule
@@ -171,9 +171,7 @@ class QtBaseModule(ExtensionModule):
sources.append(ui_output)
inc = get_include_args(include_dirs=include_directories)
compile_args = []
- for dep in dependencies:
- if hasattr(dep, 'held_object'):
- dep = dep.held_object
+ for dep in unholder(dependencies):
if isinstance(dep, Dependency):
for arg in dep.get_compile_args():
if arg.startswith('-I') or arg.startswith('-D'):