TR1: move TR1 check to config.h / buildsystem

[lyx.git] / development / scons / qt4.py

diff --git a/development/scons/qt4.py b/development/scons/qt4.py
index 8b3bc7f23b5aad26b3af2079f4084817c65de780..c140992f4c895a27250e35ae7403fb3d4c4513e6 100644 (file)
--- a/development/scons/qt4.py
+++ b/development/scons/qt4.py
@@ -207,10 +207,10 @@ 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'] = 'moc_'
+       env['QT4_MOCHPREFIX'] = ''
        env['QT4_MOCHSUFFIX'] = '$CXXFILESUFFIX'
        env['QT4_MOCCXXPREFIX'] = 'moc_'
        env['QT4_MOCCXXSUFFIX'] = '.moc'
@@ -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" :