Revert "More brackets (Maybe they are unneeded)"

This reverts commit 7f83c236aa3dab7e814c8ce4f03844f056bc25db.
This commit is contained in:
Zoltán Mizsei 2017-02-01 07:30:32 +01:00
parent 7f83c236aa
commit f7b9885660

View File

@ -97,8 +97,8 @@ def get_sip_dir():
pyqt['pyqt_sip_dir'] = get_sip_dir()
pyqt['sip_inc_dir'] = os.environ.get('SIP_INC_DIR', sysconfig.get_path('include'))
glib_flags = subprocess.check_output([PKGCONFIG, '--libs', 'glib-2.0']).strip() if (islinux or ishaiku) else ''
fontconfig_flags = subprocess.check_output([PKGCONFIG, '--libs', 'fontconfig']).strip() if (islinux or ishaiku) else ''
glib_flags = subprocess.check_output([PKGCONFIG, '--libs', 'glib-2.0']).strip() if islinux or ishaiku else ''
fontconfig_flags = subprocess.check_output([PKGCONFIG, '--libs', 'fontconfig']).strip() if islinux or ishaiku else ''
qt_inc = pyqt['inc']
qt_lib = pyqt['lib']
ft_lib_dirs = []
@ -121,7 +121,7 @@ QT_DLLS = ['Qt5' + x for x in (
'WebKit', 'WebKitWidgets', 'Widgets', 'Multimedia', 'MultimediaWidgets', 'Xml', # 'XmlPatterns',
)]
QT_PLUGINS = ('imageformats', 'audio', 'iconengines', 'mediaservice', 'platforms', 'playlistformats', 'printsupport', 'sqldrivers')
if (islinux or ishaiku):
if islinux or ishaiku:
# platformthemes cause crashes in Ubuntu
QT_PLUGINS += ('platforminputcontexts', 'generic',)