From 59f15f2d945d7b31e0c846ea2974f33c5df7274a Mon Sep 17 00:00:00 2001 From: Bo Peng Date: Mon, 20 Nov 2006 17:26:26 +0000 Subject: [PATCH] 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 --- development/scons/SConstruct | 2 ++ development/scons/qt4.py | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/development/scons/SConstruct b/development/scons/SConstruct index 6d7ea19578..15589edb5a 100644 --- 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 99bda3ce6b..360eceef11 100644 --- 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', -- 2.39.5