X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=development%2Fscons%2Fqt4.py;h=c140992f4c895a27250e35ae7403fb3d4c4513e6;hb=69036ced3765f40048d62be800c98af3ea2d1b4a;hp=3cbb797e29f1ab9832aee13b89326fab10976520;hpb=7aeddf0bc3a032848ae9bb74dd9e28c125f969b5;p=lyx.git

diff --git a/development/scons/qt4.py b/development/scons/qt4.py
index 3cbb797e29..c140992f4c 100644
--- a/development/scons/qt4.py
+++ b/development/scons/qt4.py
@@ -207,7 +207,7 @@ def generate(env):
 	env['QT4_UICDECLFLAGS'] = CLVar('')
 	env['QT4_MOCFROMHFLAGS'] = CLVar('')
 	env['QT4_MOCFROMCXXFLAGS'] = CLVar('-i')
-	env['QT4_QRCFLAGS'] = ''
+	env['QT4_QRCFLAGS'] = '-name Resources'
 
 	# suffixes/prefixes for the headers / sources to generate
 	env['QT4_MOCHPREFIX'] = ''
@@ -262,12 +262,12 @@ 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',
 		suffix='$QT4_UICDECLSUFFIX',
-		#prefix='$QT4_UICDECLPREFIX',
+		prefix='$QT4_UICDECLPREFIX',
 		single_source = True
 		)
 	env.Append( BUILDERS = { 'Uic4': uic4builder } )
@@ -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 :
@@ -355,9 +352,9 @@ def enable_modules(self, modules, debug=False) :
 				self.AppendUnique(LIBPATH=[os.path.join(self["QTDIR"],"lib",module)])
 				self.AppendUnique(CPPPATH=[os.path.join(self["QTDIR"],"include","qt4",module)])
 				modules.remove(module)
-		self.ParseConfig('PKG_CONFIG_PATH=%s/lib pkg-config %s --libs --cflags'%
+		self.ParseConfig('PKG_CONFIG_PATH=%s/lib:%s/lib/pkgconfig pkg-config %s --libs --cflags'%
 		(
-			self['QTDIR'],
+			self['QTDIR'], self['QTDIR'],
 			' '.join(modules)))
 		return
 	if sys.platform == "win32" :
@@ -366,7 +363,7 @@ def enable_modules(self, modules, debug=False) :
 		self.AppendUnique(LIBS=[lib+'4'+debugSuffix for lib in modules])
 		if 'QtOpenGL' in modules:
 			self.AppendUnique(LIBS=['opengl32'])
-		self.AppendUnique(CPPPATH=[ '$QTDIR/include/'+module[:-1]
+		self.AppendUnique(CPPPATH=[ '$QTDIR/include/'+module
 			for module in modules])
 		self.AppendUnique(LIBPATH=['$QTDIR/lib'])