Scons: initial windows nsis installer support

[lyx.git] / development / scons / qt4.py

diff --git a/development/scons/qt4.py b/development/scons/qt4.py
index 9d06e3589e5c87a59c962a0c22e46880b02255f7..360eceef116e9d43a3b0880b9cb1197a8f1400de 100644 (file)
--- a/development/scons/qt4.py
+++ b/development/scons/qt4.py
@@ -262,7 +262,7 @@ def generate(env):
        #env['QT4_UIC4COM'] = [
        #       CLVar('$QT4_UIC $QT4_UICDECLFLAGS -o ${TARGETS[0]} $SOURCE'),
        #       ]
-       env['QT4_UIC4COM'] = '$QT4_UIC -o $TARGET $SOURCE'
+       env['QT4_UIC4COM'] = '$QT4_UIC $QT4_UICDECLFLAGS -o $TARGET $SOURCE'
        uic4builder = Builder(
                action='$QT4_UIC4COM',
                src_suffix='$QT4_UISUFFIX',
@@ -332,9 +332,6 @@ def enable_modules(self, modules, debug=False) :
                'QtUiTools',
                'QtUiTools_debug',
        ]
-       # under windows, they are named QtCore4 etc
-       validModules += [x+'4' for x in validModules]
-       pclessModules += [x+'4' for x in pclessModules]
        invalidModules=[]
        for module in modules:
                if module not in validModules :