X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=development%2Fscons%2Fqt4.py;h=360eceef116e9d43a3b0880b9cb1197a8f1400de;hb=8cc88bf1ecbbe2f09d310403726f1145d49236cf;hp=8b3bc7f23b5aad26b3af2079f4084817c65de780;hpb=bee53b6c8d8d830b6a104deaa367e31d70bb3ec0;p=lyx.git

diff --git a/development/scons/qt4.py b/development/scons/qt4.py
index 8b3bc7f23b..360eceef11 100644
--- a/development/scons/qt4.py
+++ b/development/scons/qt4.py
@@ -210,7 +210,7 @@ def generate(env):
 	env['QT4_QRCFLAGS'] = ''
 
 	# suffixes/prefixes for the headers / sources to generate
-	env['QT4_MOCHPREFIX'] = 'moc_'
+	env['QT4_MOCHPREFIX'] = ''
 	env['QT4_MOCHSUFFIX'] = '$CXXFILESUFFIX'
 	env['QT4_MOCCXXPREFIX'] = 'moc_'
 	env['QT4_MOCCXXSUFFIX'] = '.moc'
@@ -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 :