aboutsummaryrefslogtreecommitdiff
path: root/mesonbuild/modules/qt4.py
diff options
context:
space:
mode:
authorDylan Baker <dylan@pnwbakers.com>2018-10-24 14:17:44 -0700
committerDylan Baker <dylan@pnwbakers.com>2018-11-14 15:57:37 -0800
commitaa04147a4a2a37aee197ebc0ed179c6fb582b3e9 (patch)
treebc3de0779833f443cbbdb759a3dbad8c21ffd003 /mesonbuild/modules/qt4.py
parent71a5f990d09f04d8eb8d636abf7e2b446fdf826a (diff)
downloadmeson-aa04147a4a2a37aee197ebc0ed179c6fb582b3e9.zip
meson-aa04147a4a2a37aee197ebc0ed179c6fb582b3e9.tar.gz
meson-aa04147a4a2a37aee197ebc0ed179c6fb582b3e9.tar.bz2
dependencies/ui: Allow qt compilers and qmake to be specified in native file
Diffstat (limited to 'mesonbuild/modules/qt4.py')
-rw-r--r--mesonbuild/modules/qt4.py7
1 files changed, 3 insertions, 4 deletions
diff --git a/mesonbuild/modules/qt4.py b/mesonbuild/modules/qt4.py
index 29992d5..112e3e4 100644
--- a/mesonbuild/modules/qt4.py
+++ b/mesonbuild/modules/qt4.py
@@ -14,14 +14,13 @@
from .. import mlog
from .qt import QtBaseModule
-from . import ExtensionModule
-class Qt4Module(ExtensionModule, QtBaseModule):
+class Qt4Module(QtBaseModule):
def __init__(self, interpreter):
- QtBaseModule.__init__(self, qt_version=4)
- ExtensionModule.__init__(self, interpreter)
+ QtBaseModule.__init__(self, interpreter, qt_version=4)
+
def initialize(*args, **kwargs):
mlog.warning('rcc dependencies will not work properly until this upstream issue is fixed:',