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'] = ''
#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 } )
'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 :
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" :