aboutsummaryrefslogtreecommitdiff
path: root/mesonbuild/modules/qt.py
diff options
context:
space:
mode:
authorJussi Pakkanen <jpakkane@gmail.com>2018-06-01 22:53:06 +0300
committerGitHub <noreply@github.com>2018-06-01 22:53:06 +0300
commitbf2e21ec0edeaf8e86ff6fd46c2c2fcfcc4713ed (patch)
tree6601dfff032ff82eb414fc94c44bdd048142ce4b /mesonbuild/modules/qt.py
parent0a035dea6d0b1416fc76e323bbd7b0ab5a60a4af (diff)
parentc5e85e59cc2b16edb094fa598fb1a096cd0db4d5 (diff)
downloadmeson-bf2e21ec0edeaf8e86ff6fd46c2c2fcfcc4713ed.zip
meson-bf2e21ec0edeaf8e86ff6fd46c2c2fcfcc4713ed.tar.gz
meson-bf2e21ec0edeaf8e86ff6fd46c2c2fcfcc4713ed.tar.bz2
Merge pull request #3486 from Salamandar/salamandar/meson_version_introspection
Add FeatureNew and FeatureDeprecated, to alert the user of bad meson_version
Diffstat (limited to 'mesonbuild/modules/qt.py')
-rw-r--r--mesonbuild/modules/qt.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/mesonbuild/modules/qt.py b/mesonbuild/modules/qt.py
index 39c65ed..ccf0930 100644
--- a/mesonbuild/modules/qt.py
+++ b/mesonbuild/modules/qt.py
@@ -19,7 +19,7 @@ from ..mesonlib import MesonException, Popen_safe, extract_as_list, File
from ..dependencies import Qt4Dependency, Qt5Dependency
import xml.etree.ElementTree as ET
from . import ModuleReturnValue, get_include_args
-from ..interpreterbase import permittedKwargs
+from ..interpreterbase import permittedKwargs, FeatureNewKwargs
_QT_DEPS_LUT = {
4: Qt4Dependency,
@@ -116,6 +116,7 @@ class QtBaseModule:
except Exception:
return []
+ @FeatureNewKwargs('qt.preprocess', '0.44.0', ['moc_extra_arguments'])
@permittedKwargs({'moc_headers', 'moc_sources', 'moc_extra_arguments', 'include_directories', 'ui_files', 'qresources', 'method'})
def preprocess(self, state, args, kwargs):
rcc_files, ui_files, moc_headers, moc_sources, moc_extra_arguments, sources, include_directories \
@@ -181,6 +182,7 @@ class QtBaseModule:
sources.append(moc_output)
return ModuleReturnValue(sources, sources)
+ @FeatureNewKwargs('build target', '0.40.0', ['build_by_default'])
@permittedKwargs({'ts_files', 'install', 'install_dir', 'build_by_default', 'method'})
def compile_translations(self, state, args, kwargs):
ts_files, install_dir = extract_as_list(kwargs, 'ts_files', 'install_dir', pop=True)