Scons: fix a uic bug, add unicode.hC

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

diff --git a/development/scons/SConstruct b/development/scons/SConstruct
index b1cde5b479fb078650b9941479d6ad27d2c34a74..c315e54caf34bff5c5d337c137823052b2dbee88 100644 (file)
--- a/development/scons/SConstruct
+++ b/development/scons/SConstruct
@@ -1787,7 +1787,7 @@ if build_qt4:
     # Compile resources
     #
     resources = [qt4env.Uic4(x.split('.')[0]) for x in \
-        src_frontends_qt4_ui_files]
+        ["$BUILDDIR/common/frontends/qt4/ui/%s" % x for x in src_frontends_qt4_ui_files]]
 
     #
     # moc qt4_moc_files, the moced files are included in the original files

diff --git a/development/scons/scons_manifest.py b/development/scons/scons_manifest.py
index bd502a171d9fbeef2afba9dee674e60ac8f0c7b0..32d9ff83000cb164533467962d43bd4f22f833f3 100644 (file)
--- a/development/scons/scons_manifest.py
+++ b/development/scons/scons_manifest.py
@@ -122,6 +122,7 @@ src_support_header_files = Split('''
     translator.h
     types.h
     userinfo.h
+    unicode.h
 ''')
 
 
@@ -154,6 +155,7 @@ src_support_files = Split('''
     tempname.C
     unlink.C
     userinfo.C
+    unicode.C
 ''')