From edf4470fe8e3ece2eb15c30410cc534e7d02f75b Mon Sep 17 00:00:00 2001 From: Merlin Nimier-David Date: Thu, 12 Jul 2018 16:40:03 +0200 Subject: [PATCH] SCons: do not require Qt5 language tools (#79) --- data/scons/qt5.py | 20 +------------------- 1 file changed, 1 insertion(+), 19 deletions(-) diff --git a/data/scons/qt5.py b/data/scons/qt5.py index 3c5b85dc..4bddb898 100644 --- a/data/scons/qt5.py +++ b/data/scons/qt5.py @@ -255,8 +255,6 @@ def generate(env): QT5_MOC = locateQt5Command(env,'moc', env['QTDIR']), QT5_UIC = locateQt5Command(env,'uic', env['QTDIR']), QT5_RCC = locateQt5Command(env,'rcc', env['QTDIR']), - QT5_LUPDATE = locateQt5Command(env,'lupdate', env['QTDIR']), - QT5_LRELEASE = locateQt5Command(env,'lrelease', env['QTDIR']), QT5_AUTOSCAN = 1, # Should the qt tool try to figure out, which sources are to be moc'ed? @@ -288,24 +286,8 @@ def generate(env): QT5_MOCFROMCXXCOM = [ '$QT5_MOC $QT5_MOCFROMCXXFLAGS $QT5_MOCINCFLAGS -o $TARGET $SOURCE', Action(checkMocIncluded,None)], - QT5_LUPDATECOM = '"$QT5_LUPDATE" $SOURCE -ts $TARGET', - QT5_LRELEASECOM = '"$QT5_LRELEASE" $SOURCE', QT5_RCCCOM = '"$QT5_RCC" $QT5_QRCFLAGS $SOURCE -o $TARGET', - ) - - # Translation builder - tsbuilder = Builder( - action = SCons.Action.Action('$QT5_LUPDATECOM'), #,'$QT5_LUPDATECOMSTR'), - multi=1 - ) - env.Append( BUILDERS = { 'Ts': tsbuilder } ) - qmbuilder = Builder( - action = SCons.Action.Action('$QT5_LRELEASECOM'),# , '$QT5_LRELEASECOMSTR'), - src_suffix = '.ts', - suffix = '.qm', - single_source = True - ) - env.Append( BUILDERS = { 'Qm': qmbuilder } ) + ) # Resource builder def scanResources(node, env, path, arg):