aboutsummaryrefslogtreecommitdiff
path: root/mesonbuild/modules/qt5.py
diff options
context:
space:
mode:
authorJussi Pakkanen <jpakkane@gmail.com>2018-11-15 22:47:51 +0200
committerGitHub <noreply@github.com>2018-11-15 22:47:51 +0200
commitc104251d2ef1ca1c4b8caea52fa6ab2da1dbaefe (patch)
tree0beb5ebae4bdbaf8e2385f644e7e6a8c406d0213 /mesonbuild/modules/qt5.py
parent6a2dc7576e00e849510f7bc1f939d66d0b2f6f80 (diff)
parent0ab27add49cedb6f5985dfba7ba40c8d29ae91dc (diff)
downloadmeson-c104251d2ef1ca1c4b8caea52fa6ab2da1dbaefe.zip
meson-c104251d2ef1ca1c4b8caea52fa6ab2da1dbaefe.tar.gz
meson-c104251d2ef1ca1c4b8caea52fa6ab2da1dbaefe.tar.bz2
Merge pull request #4216 from dcbaker/wip/config-file
native file support
Diffstat (limited to 'mesonbuild/modules/qt5.py')
-rw-r--r--mesonbuild/modules/qt5.py7
1 files changed, 3 insertions, 4 deletions
diff --git a/mesonbuild/modules/qt5.py b/mesonbuild/modules/qt5.py
index 19623ac..96a7964 100644
--- a/mesonbuild/modules/qt5.py
+++ b/mesonbuild/modules/qt5.py
@@ -14,14 +14,13 @@
from .. import mlog
from .qt import QtBaseModule
-from . import ExtensionModule
-class Qt5Module(ExtensionModule, QtBaseModule):
+class Qt5Module(QtBaseModule):
def __init__(self, interpreter):
- QtBaseModule.__init__(self, qt_version=5)
- ExtensionModule.__init__(self, interpreter)
+ QtBaseModule.__init__(self, interpreter, qt_version=5)
+
def initialize(*args, **kwargs):
mlog.warning('rcc dependencies will not work reliably until this upstream issue is fixed:',