Scons: set uic parameter -tr lyx::qt_ properly

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@16000 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/development/scons/SConstruct b/development/scons/SConstruct
index 6d7ea195780e433790b16b7bd2f6e13009922ab3..15589edb5ac43a1ff08d4c55f5cc95a6bf8d5e83 100644 (file)
--- a/development/scons/SConstruct
+++ b/development/scons/SConstruct
@@ -1715,6 +1715,8 @@ if build_qt4:
     #
     qt4env.Tool('qt4', [scons_dir])
     qt4env.EnableQt4Modules(qt_libs, debug = (mode == 'debug'))
+    qt4env['QT4_AUTOSCAN'] = 0
+    qt4env['QT4_UICDECLFLAGS'] = '-tr lyx::qt_'
 
     qt4env.AppendUnique(CPPPATH = [
         '$BUILDDIR/common',

diff --git a/development/scons/qt4.py b/development/scons/qt4.py
index 99bda3ce6b8a762572eba39eb0834e908202a24d..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 -tr lyx::qt_ -o $TARGET $SOURCE'
+       env['QT4_UIC4COM'] = '$QT4_UIC $QT4_UICDECLFLAGS -o $TARGET $SOURCE'
        uic4builder = Builder(
                action='$QT4_UIC4COM',
                src_suffix='$QT4_UISUFFIX',