From 4a37baf3c500ff161b97dff50f6ad89e5542f362 Mon Sep 17 00:00:00 2001 From: Jussi Pakkanen Date: Sun, 25 Jun 2017 20:33:02 +0300 Subject: Fixed the remaining modules. --- mesonbuild/modules/qt4.py | 2 ++ 1 file changed, 2 insertions(+) (limited to 'mesonbuild/modules/qt4.py') diff --git a/mesonbuild/modules/qt4.py b/mesonbuild/modules/qt4.py index 0386291..f5b1070 100644 --- a/mesonbuild/modules/qt4.py +++ b/mesonbuild/modules/qt4.py @@ -20,6 +20,7 @@ from ..dependencies import Qt4Dependency from . import ExtensionModule import xml.etree.ElementTree as ET from . import ModuleReturnValue +from . import permittedKwargs class Qt4Module(ExtensionModule): tools_detected = False @@ -96,6 +97,7 @@ class Qt4Module(ExtensionModule): except Exception: return [] + @permittedKwargs(set(['moc_headers', 'moc_sources', 'ui_files', 'qresources', 'method'])) def preprocess(self, state, args, kwargs): rcc_files = kwargs.pop('qresources', []) if not isinstance(rcc_files, list): -- cgit v1.1 From 3262be23dc3f01923a1d162a5914ba29f05416b7 Mon Sep 17 00:00:00 2001 From: Jussi Pakkanen Date: Mon, 26 Jun 2017 20:39:00 +0300 Subject: Fixed issues raised in review. --- mesonbuild/modules/qt4.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mesonbuild/modules/qt4.py') diff --git a/mesonbuild/modules/qt4.py b/mesonbuild/modules/qt4.py index f5b1070..4056b6d 100644 --- a/mesonbuild/modules/qt4.py +++ b/mesonbuild/modules/qt4.py @@ -97,7 +97,7 @@ class Qt4Module(ExtensionModule): except Exception: return [] - @permittedKwargs(set(['moc_headers', 'moc_sources', 'ui_files', 'qresources', 'method'])) + @permittedKwargs({'moc_headers', 'moc_sources', 'ui_files', 'qresources', 'method'}) def preprocess(self, state, args, kwargs): rcc_files = kwargs.pop('qresources', []) if not isinstance(rcc_files, list): -- cgit v1.1