Commits

dirkbaechle committed 82ba70c

- patched tests to reflect the new naming scheme

  • Participants
  • Parent commits a474030

Comments (0)

Files changed (71)

File test/basic/CPPPATH/CPPPATH-appended/SConscript-after

 
 Import("qtEnv")
 qtEnv.Append(CPPPATH=['./local_include'])
-qtEnv.EnableQt4Modules(['QtCore'])
+qtEnv.EnableQt5Modules(['QtCore'])
 qtEnv.Program(target = 'aaa', source = 'aaa.cpp')
 

File test/basic/CPPPATH/CPPPATH-appended/SConscript-before

 
 Import("qtEnv")
-qtEnv.EnableQt4Modules(['QtCore'])
+qtEnv.EnableQt5Modules(['QtCore'])
 qtEnv.Program(target = 'aaa', source = 'aaa.cpp')
 

File test/basic/CPPPATH/CPPPATH-appended/sconstest-CPPPATH-appended-fail.py

 #!/usr/bin/env python
 #
-# Copyright (c) 2001-2010 The SCons Foundation
+# Copyright (c) 2001-2010,2011,2012 The SCons Foundation
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
 test.dir_fixture('image')
 test.file_fixture('SConscript-before','sub/SConscript')
 test.file_fixture('../../../qtenv.py')
-test.file_fixture('../../../../__init__.py','site_scons/site_tools/qt4/__init__.py')
+test.file_fixture('../../../../__init__.py','site_scons/site_tools/qt5/__init__.py')
 test.run(status=2, stderr=None)
 
 test.pass_test()

File test/basic/CPPPATH/CPPPATH-appended/sconstest-CPPPATH-appended.py

 #!/usr/bin/env python
 #
-# Copyright (c) 2001-2010 The SCons Foundation
+# Copyright (c) 2001-2010,2011,2012 The SCons Foundation
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
 test.dir_fixture('image')
 test.file_fixture('SConscript-after','sub/SConscript')
 test.file_fixture('../../../qtenv.py')
-test.file_fixture('../../../../__init__.py','site_scons/site_tools/qt4/__init__.py')
+test.file_fixture('../../../../__init__.py','site_scons/site_tools/qt5/__init__.py')
 test.run(stderr=None)
 
 test.pass_test()

File test/basic/CPPPATH/CPPPATH/SConscript-after

 Import("qtEnv")
-qtEnv.EnableQt4Modules(['QtCore'])
+qtEnv.EnableQt5Modules(['QtCore'])
 qtEnv.Program(target = 'aaa', source = 'aaa.cpp', CPPPATH=['$CPPPATH', './local_include'])

File test/basic/CPPPATH/CPPPATH/SConscript-before

 Import("qtEnv")
-qtEnv.EnableQt4Modules(['QtCore'])
+qtEnv.EnableQt5Modules(['QtCore'])
 qtEnv.Program(target = 'aaa', source = 'aaa.cpp')

File test/basic/CPPPATH/CPPPATH/sconstest-CPPPATH-fail.py

 #!/usr/bin/env python
 #
-# Copyright (c) 2001-2010 The SCons Foundation
+# Copyright (c) 2001-2010,2011,2012 The SCons Foundation
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
 test.dir_fixture('image')
 test.file_fixture('SConscript-before','SConscript')
 test.file_fixture('../../../qtenv.py')
-test.file_fixture('../../../../__init__.py','site_scons/site_tools/qt4/__init__.py')
+test.file_fixture('../../../../__init__.py','site_scons/site_tools/qt5/__init__.py')
 test.run(status=2, stderr=None)
 
 test.pass_test()

File test/basic/CPPPATH/CPPPATH/sconstest-CPPPATH.py

 #!/usr/bin/env python
 #
-# Copyright (c) 2001-2010 The SCons Foundation
+# Copyright (c) 2001-2010,2011,2012 The SCons Foundation
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
 test.dir_fixture('image')
 test.file_fixture('SConscript-after','SConscript')
 test.file_fixture('../../../qtenv.py')
-test.file_fixture('../../../../__init__.py','site_scons/site_tools/qt4/__init__.py')
+test.file_fixture('../../../../__init__.py','site_scons/site_tools/qt5/__init__.py')
 test.run(stderr=None)
 
 test.pass_test()

File test/basic/copied-env/image/SConscript

 
 copy = qtEnv.Clone()
 copy.Append(CPPDEFINES = ['MYLIB_IMPL'])
-copy.EnableQt4Modules(['QtCore'])
+copy.EnableQt5Modules(['QtCore'])
 
 copy.SharedLibrary(
    target = 'MyLib',

File test/basic/copied-env/sconstest-copied-env.py

 #!/usr/bin/env python
 #
-# Copyright (c) 2001-2010 The SCons Foundation
+# Copyright (c) 2001-2010,2011,2012 The SCons Foundation
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
 test = TestSCons.TestSCons()
 test.dir_fixture("image")
 test.file_fixture('../../qtenv.py')
-test.file_fixture('../../../__init__.py','site_scons/site_tools/qt4/__init__.py')
+test.file_fixture('../../../__init__.py','site_scons/site_tools/qt5/__init__.py')
 test.run()
 
 cpp_MyFile = [x for x in test.stdout().split('\n') if x.find('MyFile.cpp') != -1]

File test/basic/empty-env/sconstest-empty-env.py

 #!/usr/bin/env python
 #
-# Copyright (c) 2001-2010 The SCons Foundation
+# Copyright (c) 2001-2010,2011,2012 The SCons Foundation
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
 test = TestSCons.TestSCons()
 test.dir_fixture('image')
 test.file_fixture('../../qtenv.py')
-test.file_fixture('../../../__init__.py','site_scons/site_tools/qt4/__init__.py')
+test.file_fixture('../../../__init__.py','site_scons/site_tools/qt5/__init__.py')
 test.run()
 
 test.run(program = test.workpath('main' + TestSCons._exe),

File test/basic/manual/image/SConscript

 Import("qtEnv")
 sources = ['aaa.cpp', 'bbb.cpp', 'ddd.cpp', 'eee.cpp', 'main.cpp']
 
-qtEnv.EnableQt4Modules(['QtCore','QtGui'])
+qtEnv.EnableQt5Modules(['QtCore','QtGui'])
 
 # normal invocation
-sources.append(qtEnv.Moc4('include/aaa.h'))
-sources.append(qtEnv.Moc4('ui/ccc.h'))
-qtEnv.Moc4('bbb.cpp')
-qtEnv.Uic4('ui/ccc.ui')
+sources.append(qtEnv.Moc5('include/aaa.h'))
+sources.append(qtEnv.Moc5('ui/ccc.h'))
+qtEnv.Moc5('bbb.cpp')
+qtEnv.Uic5('ui/ccc.ui')
 
 # manual target specification
-sources.append(qtEnv.ExplicitMoc4('moc-ddd.cpp','include/ddd.h'))
-qtEnv.ExplicitMoc4('moc_eee.cpp','eee.cpp')
-qtEnv.ExplicitUic4('include/uic_fff.hpp','ui/fff.ui')
+sources.append(qtEnv.ExplicitMoc5('moc-ddd.cpp','include/ddd.h'))
+qtEnv.ExplicitMoc5('moc_eee.cpp','eee.cpp')
+qtEnv.ExplicitUic5('include/uic_fff.hpp','ui/fff.ui')
 
 qtEnv.Program(target='aaa',
               source=sources,
               CPPPATH=['$CPPPATH', './include'],
-              QT4_AUTOSCAN=0)
+              QT5_AUTOSCAN=0)

File test/basic/manual/sconstest-manual.py

 #!/usr/bin/env python
 #
-# Copyright (c) 2001-2010 The SCons Foundation
+# Copyright (c) 2001-2010,2011,2012 The SCons Foundation
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
 
 test.dir_fixture('image')
 test.file_fixture('../../qtenv.py')
-test.file_fixture('../../../__init__.py','site_scons/site_tools/qt4/__init__.py')
+test.file_fixture('../../../__init__.py','site_scons/site_tools/qt5/__init__.py')
 
 test.run()
 

File test/basic/moc-from-cpp/image/SConscript

 Import("qtEnv dup")
 
-qtEnv.EnableQt4Modules(['QtCore','QtGui'])
+qtEnv.EnableQt5Modules(['QtCore','QtGui'])
 
 if dup == 0: qtEnv.Append(CPPPATH=['.'])
 aaa_lib = qtEnv.StaticLibrary('aaa',['aaa.cpp','useit.cpp'])

File test/basic/moc-from-cpp/image/SConstruct

     dup=int(ARGUMENTS.get('dup', 1))
     if dup == 0:
         builddir = 'build_dup0'
-        qtEnv['QT4_DEBUG'] = 1
+        qtEnv['QT5_DEBUG'] = 1
     else:
         builddir = 'build'
     VariantDir(builddir, '.', duplicate=dup)

File test/basic/moc-from-cpp/sconstest-moc-from-cpp.py

 #!/usr/bin/env python
 #
-# Copyright (c) 2001-2010 The SCons Foundation
+# Copyright (c) 2001-2010,2011,2012 The SCons Foundation
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
 test = TestSCons.TestSCons()
 test.dir_fixture('image')
 test.file_fixture('../../qtenv.py')
-test.file_fixture('../../../__init__.py','site_scons/site_tools/qt4/__init__.py')
+test.file_fixture('../../../__init__.py','site_scons/site_tools/qt5/__init__.py')
 
 lib_aaa = 'aaa_lib' # Alias for the Library
 moc = 'aaa.moc'

File test/basic/moc-from-header/image/SConscript

 Import("qtEnv dup")
 
-qtEnv.EnableQt4Modules(['QtCore','QtGui'])
+qtEnv.EnableQt5Modules(['QtCore','QtGui'])
 
 if dup == 0: qtEnv.Append(CPPPATH=['.'])
 qtEnv.Program('aaa','aaa.cpp')

File test/basic/moc-from-header/image/SConstruct

     dup=int(ARGUMENTS.get('dup', 1))
     if dup == 0:
         builddir = 'build_dup0'
-        qtEnv['QT4_DEBUG'] = 1
+        qtEnv['QT5_DEBUG'] = 1
     else:
         builddir = 'build'
     VariantDir(builddir, '.', duplicate=dup)

File test/basic/moc-from-header/sconstest-moc-from-header.py

 #!/usr/bin/env python
 #
-# Copyright (c) 2001-2010 The SCons Foundation
+# Copyright (c) 2001-2010,2011,2012 The SCons Foundation
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
 test = TestSCons.TestSCons()
 test.dir_fixture('image')
 test.file_fixture('../../qtenv.py')
-test.file_fixture('../../../__init__.py','site_scons/site_tools/qt4/__init__.py')
+test.file_fixture('../../../__init__.py','site_scons/site_tools/qt5/__init__.py')
 
 aaa_exe = 'aaa' + TestSCons._exe
 build_aaa_exe = test.workpath('build', aaa_exe)

File test/basic/reentrant/image/SConscript

 Import("qtEnv")
-env = qtEnv.Clone(tool='qt4')
+env = qtEnv.Clone(tool='qt5')
 
 env.Program('main', 'main.cpp', CPPDEFINES=['FOO'], LIBS=[])

File test/basic/reentrant/sconstest-reentrant.py

 #!/usr/bin/env python
 #
-# Copyright (c) 2001-2010 The SCons Foundation
+# Copyright (c) 2001-2010,2011,2012 The SCons Foundation
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
 
 test.dir_fixture('image')
 test.file_fixture('../../qtenv.py')
-test.file_fixture('../../../__init__.py','site_scons/site_tools/qt4/__init__.py')
+test.file_fixture('../../../__init__.py','site_scons/site_tools/qt5/__init__.py')
 
 test.run()
 

File test/basic/variantdir/image/SConstruct

 import qtenv
 
 qtEnv = qtenv.createQtEnvironment()
-qtEnv.EnableQt4Modules(['QtCore','QtGui'])
+qtEnv.EnableQt5Modules(['QtCore','QtGui'])
 
 qtEnv.VariantDir('bld', '.')
-qtEnv.Uic4('bld/anUiFile.ui')
+qtEnv.Uic5('bld/anUiFile.ui')
 qtEnv.Program('bld/test_realqt', ['bld/mocFromCpp.cpp',
                                   'bld/mocFromH.cpp',
                                   'bld/MyForm.cpp',

File test/basic/variantdir/sconstest-installed.py

 #!/usr/bin/env python
 #
-# Copyright (c) 2001-2010 The SCons Foundation
+# Copyright (c) 2001-2010,2011,2012 The SCons Foundation
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
 
 """
 A simple test for VariantDir, in connection with basic
-automocing from cxx and header files and the Uic4 builder.
+automocing from cxx and header files and the Uic5 builder.
 """
 
 import sys
 test = TestSCons.TestSCons()
 test.dir_fixture('image')
 test.file_fixture('../../qtenv.py')
-test.file_fixture('../../../__init__.py','site_scons/site_tools/qt4/__init__.py')
+test.file_fixture('../../../__init__.py','site_scons/site_tools/qt5/__init__.py')
 
 test.run(arguments="bld/test_realqt" + TestSCons._exe)
 

File test/moc/auto/ccomment/image/SConscript

 Import("qtEnv")
 
 env = qtEnv.Clone()
-env['QT4_GOBBLECOMMENTS']=1
-env['QT4_DEBUG']=1
-env.EnableQt4Modules(['QtCore','QtGui'])
+env['QT5_GOBBLECOMMENTS']=1
+env['QT5_DEBUG']=1
+env.EnableQt5Modules(['QtCore','QtGui'])
 
 env.Program('main', Glob('*.cpp'))
 

File test/moc/auto/ccomment/sconstest-ccomment.py

 #!/usr/bin/env python
 #
-# Copyright (c) 2001-2010 The SCons Foundation
+# Copyright (c) 2001-2010,2011,2012 The SCons Foundation
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
 
 """
 A simple test for a few C/C++ comments, containing the
-string Q_OBJECT. With the QT4_GOBBLECOMMENTS variable set,
+string Q_OBJECT. With the QT5_GOBBLECOMMENTS variable set,
 no automocing should get triggered.
 """
 
 test = TestSCons.TestSCons()
 test.dir_fixture('image')
 test.file_fixture('../../../qtenv.py')
-test.file_fixture('../../../../__init__.py','site_scons/site_tools/qt4/__init__.py')
+test.file_fixture('../../../../__init__.py','site_scons/site_tools/qt5/__init__.py')
 
 test.run()
 

File test/moc/auto/literalstring/image/SConscript

 Import("qtEnv")
 
 env = qtEnv.Clone()
-env.EnableQt4Modules(['QtCore','QtGui'])
+env.EnableQt5Modules(['QtCore','QtGui'])
 
 env.Program('main', Glob('*.cpp'))

File test/moc/auto/literalstring/sconstest-literalstring.py

 #!/usr/bin/env python
 #
-# Copyright (c) 2001-2010 The SCons Foundation
+# Copyright (c) 2001-2010,2011,2012 The SCons Foundation
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
 test = TestSCons.TestSCons()
 test.dir_fixture('image')
 test.file_fixture('../../../qtenv.py')
-test.file_fixture('../../../../__init__.py','site_scons/site_tools/qt4/__init__.py')
+test.file_fixture('../../../../__init__.py','site_scons/site_tools/qt5/__init__.py')
 
 test.run()
 

File test/moc/cpppath/default/SConscript

 Import("qtEnv")
 
 env = qtEnv.Clone()
-env.EnableQt4Modules(['QtCore','QtGui'])
+env.EnableQt5Modules(['QtCore','QtGui'])
 env.Append(CPPPATH=['include'])
 
 env.Program('main', Glob('src/*.cpp'))

File test/moc/cpppath/default/SConscript-fails

 Import("qtEnv")
 
 env = qtEnv.Clone()
-env.EnableQt4Modules(['QtCore','QtGui'])
+env.EnableQt5Modules(['QtCore','QtGui'])
 env.Append(CPPPATH=['include'])
-env['QT4_AUTOMOC_SCANCPPPATH']='0'
+env['QT5_AUTOMOC_SCANCPPPATH']='0'
 
 env.Program('main', Glob('src/*.cpp'))
 

File test/moc/cpppath/default/sconstest-default-fails.py

 #!/usr/bin/env python
 #
-# Copyright (c) 2001-2010 The SCons Foundation
+# Copyright (c) 2001-2010,2011,2012 The SCons Foundation
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
 test.dir_fixture('image')
 test.file_fixture('SConscript-fails','SConscript')
 test.file_fixture('../../../qtenv.py')
-test.file_fixture('../../../../__init__.py','site_scons/site_tools/qt4/__init__.py')
+test.file_fixture('../../../../__init__.py','site_scons/site_tools/qt5/__init__.py')
 
 test.run(status=2, stderr=None)
 

File test/moc/cpppath/default/sconstest-default.py

 #!/usr/bin/env python
 #
-# Copyright (c) 2001-2010 The SCons Foundation
+# Copyright (c) 2001-2010,2011,2012 The SCons Foundation
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
 test.dir_fixture('image')
 test.file_fixture('SConscript','SConscript')
 test.file_fixture('../../../qtenv.py')
-test.file_fixture('../../../../__init__.py','site_scons/site_tools/qt4/__init__.py')
+test.file_fixture('../../../../__init__.py','site_scons/site_tools/qt5/__init__.py')
 
 test.run()
 

File test/moc/cpppath/specific/SConscript

 Import("qtEnv")
 
 env = qtEnv.Clone()
-env.EnableQt4Modules(['QtCore','QtGui'])
+env.EnableQt5Modules(['QtCore','QtGui'])
 env.Append(CPPPATH=['include'])
-env['QT4_AUTOMOC_CPPPATH']=['include']
+env['QT5_AUTOMOC_CPPPATH']=['include']
 
 env.Program('main', Glob('src/*.cpp'))
 

File test/moc/cpppath/specific/SConscript-fails

 Import("qtEnv")
 
 env = qtEnv.Clone()
-env.EnableQt4Modules(['QtCore','QtGui'])
+env.EnableQt5Modules(['QtCore','QtGui'])
 env.Append(CPPPATH=['include'])
-env['QT4_AUTOMOC_CPPPATH']=['wrongdir']
+env['QT5_AUTOMOC_CPPPATH']=['wrongdir']
 
 env.Program('main', Glob('src/*.cpp'))
 

File test/moc/cpppath/specific/sconstest-specific-fails.py

 #!/usr/bin/env python
 #
-# Copyright (c) 2001-2010 The SCons Foundation
+# Copyright (c) 2001-2010,2011,2012 The SCons Foundation
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
 Explicitly sets the path list to scan for mocable files,
 but to a wrong folder.
 Although the correct CPPPATH is used, this lets the test
-fail...and proves that the option QT4_AUTOMOC_CPPPATH
+fail...and proves that the option QT5_AUTOMOC_CPPPATH
 really has an effect.
 """
 
 test.dir_fixture('image')
 test.file_fixture('SConscript-fails','SConscript')
 test.file_fixture('../../../qtenv.py')
-test.file_fixture('../../../../__init__.py','site_scons/site_tools/qt4/__init__.py')
+test.file_fixture('../../../../__init__.py','site_scons/site_tools/qt5/__init__.py')
 
 test.run(status=2, stderr=None)
 

File test/moc/cpppath/specific/sconstest-specific.py

 #!/usr/bin/env python
 #
-# Copyright (c) 2001-2010 The SCons Foundation
+# Copyright (c) 2001-2010,2011,2012 The SCons Foundation
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
 test.dir_fixture('image')
 test.file_fixture('SConscript','SConscript')
 test.file_fixture('../../../qtenv.py')
-test.file_fixture('../../../../__init__.py','site_scons/site_tools/qt4/__init__.py')
+test.file_fixture('../../../../__init__.py','site_scons/site_tools/qt5/__init__.py')
 
 test.run()
 

File test/moc/explicit/image/SConscript

 Import("qtEnv")
 
 env = qtEnv.Clone()
-env.EnableQt4Modules(['QtCore','QtGui'])
-env['QT4_AUTOSCAN']=0
+env.EnableQt5Modules(['QtCore','QtGui'])
+env['QT5_AUTOSCAN']=0
 
-env.ExplicitMoc4('explicitly_moced_FromHeader.cpp','mocFromH.h')
-env.ExplicitMoc4('explicitly_moced_FromCpp.strange_cpp_moc_prefix','mocFromCpp.cpp')
+env.ExplicitMoc5('explicitly_moced_FromHeader.cpp','mocFromH.h')
+env.ExplicitMoc5('explicitly_moced_FromCpp.strange_cpp_moc_prefix','mocFromCpp.cpp')
 
 env.Program('main', Glob('*.cpp'))

File test/moc/explicit/sconstest-explicit.py

 #!/usr/bin/env python
 #
-# Copyright (c) 2001-2010 The SCons Foundation
+# Copyright (c) 2001-2010,2011,2012 The SCons Foundation
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
 #
 
 """
-Test of the explicit Moc4 builder, with arbitrary filenames
+Test of the explicit Moc5 builder, with arbitrary filenames
 for the created files.
 """
 
 test = TestSCons.TestSCons()
 test.dir_fixture('image')
 test.file_fixture('../../qtenv.py')
-test.file_fixture('../../../__init__.py','site_scons/site_tools/qt4/__init__.py')
+test.file_fixture('../../../__init__.py','site_scons/site_tools/qt5/__init__.py')
 
 test.run()
 

File test/moc/order_independent/image/SConscript

 Import("qtEnv dup reverted")
 
-qtEnv.EnableQt4Modules(['QtCore','QtGui'])
+qtEnv.EnableQt5Modules(['QtCore','QtGui'])
 
 if dup == 0: 
   qtEnv.Append(CPPPATH=['.'])

File test/moc/order_independent/image/SConstruct

     dup=int(ARGUMENTS.get('dup', 1))
     if dup == 0:
         builddir = 'build_dup0'
-        qtEnv['QT4_DEBUG'] = 1
+        qtEnv['QT5_DEBUG'] = 1
     else:
         builddir = 'build'
     VariantDir(builddir, '.', duplicate=dup)

File test/moc/order_independent/sconstest-order-independent.py

 #!/usr/bin/env python
 #
-# Copyright (c) 2001-2010 The SCons Foundation
+# Copyright (c) 2001-2010,2011,2012 The SCons Foundation
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
 test = TestSCons.TestSCons()
 test.dir_fixture('image')
 test.file_fixture('../../qtenv.py')
-test.file_fixture('../../../__init__.py','site_scons/site_tools/qt4/__init__.py')
+test.file_fixture('../../../__init__.py','site_scons/site_tools/qt5/__init__.py')
 
 test.run()
 test.up_to_date(options="-n", arguments=".")

File test/qrc/basic/SConscript

 Import('qtEnv')
 
 env = qtEnv.Clone()
-env.EnableQt4Modules(['QtCore','QtGui'])
+env.EnableQt5Modules(['QtCore','QtGui'])
 
 source_files = Glob('*.cpp')+Glob('*.qrc')
 

File test/qrc/basic/SConscript-wflags

 Import('qtEnv')
 
 env = qtEnv.Clone()
-env.EnableQt4Modules(['QtCore','QtGui'])
+env.EnableQt5Modules(['QtCore','QtGui'])
 
 source_files = Glob('*.cpp')+Glob('*.qrc')
-env['QT4_QRCFLAGS'] = ['-name', 'icons']
+env['QT5_QRCFLAGS'] = ['-name', 'icons']
 
 env.Program('main', source_files)

File test/qrc/basic/sconstest-basic.py

 #!/usr/bin/env python
 #
-# Copyright (c) 2001-2010 The SCons Foundation
+# Copyright (c) 2001-2010,2011,2012 The SCons Foundation
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
 test.dir_fixture("image")
 test.file_fixture('SConscript')
 test.file_fixture('../../qtenv.py')
-test.file_fixture('../../../__init__.py','site_scons/site_tools/qt4/__init__.py')
+test.file_fixture('../../../__init__.py','site_scons/site_tools/qt5/__init__.py')
 test.run()
 
 test.pass_test()

File test/qrc/basic/sconstest-basicwflags.py

 #!/usr/bin/env python
 #
-# Copyright (c) 2001-2010 The SCons Foundation
+# Copyright (c) 2001-2010,2011,2012 The SCons Foundation
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
 test.dir_fixture("image")
 test.file_fixture('SConscript-wflags','SConscript')
 test.file_fixture('../../qtenv.py')
-test.file_fixture('../../../__init__.py','site_scons/site_tools/qt4/__init__.py')
+test.file_fixture('../../../__init__.py','site_scons/site_tools/qt5/__init__.py')
 test.run()
 
 test.pass_test()

File test/qrc/manual/SConscript

 Import('qtEnv')
 
 env = qtEnv.Clone()
-env.EnableQt4Modules(['QtCore','QtGui'])
+env.EnableQt5Modules(['QtCore','QtGui'])
 
 source_files = Glob('*.cpp')
-source_files.append(env.Qrc4('icons'))
+source_files.append(env.Qrc5('icons'))
 
 env.Program('main', source_files)

File test/qrc/manual/SConscript-wflags

 Import('qtEnv')
 
 env = qtEnv.Clone()
-env.EnableQt4Modules(['QtCore','QtGui'])
+env.EnableQt5Modules(['QtCore','QtGui'])
 
 source_files = Glob('*.cpp')
-source_files.append(env.Qrc4('icons'))
+source_files.append(env.Qrc5('icons'))
 
-env['QT4_QRCFLAGS'] = ['-name', 'icons']
+env['QT5_QRCFLAGS'] = ['-name', 'icons']
 
 env.Program('main', source_files)

File test/qrc/manual/sconstest-manual.py

 #!/usr/bin/env python
 #
-# Copyright (c) 2001-2010 The SCons Foundation
+# Copyright (c) 2001-2010,2011,2012 The SCons Foundation
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
 test.dir_fixture("image")
 test.file_fixture('SConscript')
 test.file_fixture('../../qtenv.py')
-test.file_fixture('../../../__init__.py','site_scons/site_tools/qt4/__init__.py')
+test.file_fixture('../../../__init__.py','site_scons/site_tools/qt5/__init__.py')
 test.run()
 
 test.pass_test()

File test/qrc/manual/sconstest-manualwflags.py

 #!/usr/bin/env python
 #
-# Copyright (c) 2001-2010 The SCons Foundation
+# Copyright (c) 2001-2010,2011,2012 The SCons Foundation
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
 test.dir_fixture("image")
 test.file_fixture('SConscript-wflags','SConscript')
 test.file_fixture('../../qtenv.py')
-test.file_fixture('../../../__init__.py','site_scons/site_tools/qt4/__init__.py')
+test.file_fixture('../../../__init__.py','site_scons/site_tools/qt5/__init__.py')
 test.run()
 
 test.pass_test()

File test/qrc/multifiles/SConscript

 Import('qtEnv')
 
 env = qtEnv.Clone()
-env.EnableQt4Modules(['QtCore','QtGui'])
+env.EnableQt5Modules(['QtCore','QtGui'])
 
 source_files = Glob('*.cpp')+Glob('*.qrc')
 

File test/qrc/multifiles/SConscript-manual

 Import('qtEnv')
 
 env = qtEnv.Clone()
-env.EnableQt4Modules(['QtCore','QtGui'])
+env.EnableQt5Modules(['QtCore','QtGui'])
 
 source_files = Glob('*.cpp')
-qrc_files = env.Qrc4(['icons','other'])
+qrc_files = env.Qrc5(['icons','other'])
 
 env.Program('main', source_files+qrc_files)

File test/qrc/multifiles/sconstest-multifiles-manual.py

 #!/usr/bin/env python
 #
-# Copyright (c) 2001-2010 The SCons Foundation
+# Copyright (c) 2001-2010,2011,2012 The SCons Foundation
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
 test.dir_fixture("image")
 test.file_fixture('SConscript-manual','SConscript')
 test.file_fixture('../../qtenv.py')
-test.file_fixture('../../../__init__.py','site_scons/site_tools/qt4/__init__.py')
+test.file_fixture('../../../__init__.py','site_scons/site_tools/qt5/__init__.py')
 test.run()
 
 test.pass_test()

File test/qrc/multifiles/sconstest-multifiles.py

 #!/usr/bin/env python
 #
-# Copyright (c) 2001-2010 The SCons Foundation
+# Copyright (c) 2001-2010,2011,2012 The SCons Foundation
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
 test.dir_fixture("image")
 test.file_fixture('SConscript')
 test.file_fixture('../../qtenv.py')
-test.file_fixture('../../../__init__.py','site_scons/site_tools/qt4/__init__.py')
+test.file_fixture('../../../__init__.py','site_scons/site_tools/qt5/__init__.py')
 test.run()
 
 test.pass_test()

File test/qrc/othername/image/SConscript

 Import('qtEnv')
 
 env = qtEnv.Clone()
-env.EnableQt4Modules(['QtCore','QtGui'])
+env.EnableQt5Modules(['QtCore','QtGui'])
 
 source_files = Glob('*.cpp')
-source_files.append(env.Qrc4('icons'))
+source_files.append(env.Qrc5('icons'))
 
-env['QT4_QRCFLAGS'] = ['-name', 'othername']
+env['QT5_QRCFLAGS'] = ['-name', 'othername']
 
 env.Program('main', source_files)

File test/qrc/othername/sconstest-othername.py

 #!/usr/bin/env python
 #
-# Copyright (c) 2001-2010 The SCons Foundation
+# Copyright (c) 2001-2010,2011,2012 The SCons Foundation
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
 test = TestSCons.TestSCons()
 test.dir_fixture("image")
 test.file_fixture('../../qtenv.py')
-test.file_fixture('../../../__init__.py','site_scons/site_tools/qt4/__init__.py')
+test.file_fixture('../../../__init__.py','site_scons/site_tools/qt5/__init__.py')
 test.run()
 
 test.pass_test()

File test/qrc/samefilename/image/SConscript

 Import('qtEnv')
 
 env = qtEnv.Clone()
-env.EnableQt4Modules(['QtCore','QtGui'])
+env.EnableQt5Modules(['QtCore','QtGui'])
 
 source_files = Glob('*.cpp')+Glob('*.qrc')
 

File test/qrc/samefilename/sconstest-samefilename.py

 #!/usr/bin/env python
 #
-# Copyright (c) 2001-2010 The SCons Foundation
+# Copyright (c) 2001-2010,2011,2012 The SCons Foundation
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
 test = TestSCons.TestSCons()
 test.dir_fixture("image")
 test.file_fixture('../../qtenv.py')
-test.file_fixture('../../../__init__.py','site_scons/site_tools/qt4/__init__.py')
+test.file_fixture('../../../__init__.py','site_scons/site_tools/qt5/__init__.py')
 test.run()
 
 test.pass_test()

File test/qrc/subdir/image/SConscript

 Import('qtEnv')
 
 env = qtEnv.Clone()
-env.EnableQt4Modules(['QtCore','QtGui'])
+env.EnableQt5Modules(['QtCore','QtGui'])
 
 source_files = Glob('*.cpp')+['qrc/icons.qrc']
 

File test/qrc/subdir/sconstest-subdir.py

 #!/usr/bin/env python
 #
-# Copyright (c) 2001-2010 The SCons Foundation
+# Copyright (c) 2001-2010,2011,2012 The SCons Foundation
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
 
 """
 In this test the QRC file is placed in a subfolder (qrc/icons.qrc). The
-Qrc4() builder should correctly strip the leading path and set the "-name"
+Qrc5() builder should correctly strip the leading path and set the "-name"
 option for the RCC executable to "icons" only.
 """
 
 test = TestSCons.TestSCons()
 test.dir_fixture("image")
 test.file_fixture('../../qtenv.py')
-test.file_fixture('../../../__init__.py','site_scons/site_tools/qt4/__init__.py')
+test.file_fixture('../../../__init__.py','site_scons/site_tools/qt5/__init__.py')
 test.run()
 
 test.pass_test()

File test/qt_examples/create_scons_tests.py

 #!/usr/bin/env python
 #
-# Copyright (c) 2001-2010 The SCons Foundation
+# Copyright (c) 2001-2010,2011,2012 The SCons Foundation
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
                  }
 
 # dictionary of special Qt Environment settings for all single tests/pro files
-qtenv_flags = {'QT4_GOBBLECOMMENTS' : '1'
+qtenv_flags = {'QT5_GOBBLECOMMENTS' : '1'
               }
 
 # available qt modules
-valid_qt_modules = [
-        'QtCore',
-        'QtGui',
-        'QtOpenGL',
-        'Qt3Support',
-        'QtAssistant', # deprecated
-        'QtAssistantClient',
-        'QtScript',
-        'QtDBus',
-        'QtSql',
-        'QtSvg',
-        # The next modules have not been tested yet so, please
-        # maybe they require additional work on non Linux platforms
-        'QtNetwork',
-        'QtTest',
-        'QtXml',
-        'QtXmlPatterns',
-        'QtUiTools',
-        'QtDesigner',
-        'QtDesignerComponents',
-        'QtWebKit',
-        'QtHelp',
-        'QtScript',
-        'QAxFactory',
-        'QtScriptTools',
-        'QtMultimedia']
+validModules = [
+    # Qt Essentials
+    'QtCore',
+    'QtGui',
+    'QtMultimedia',
+    'QtMultimediaQuick_p',
+    'QtMultimediaWidgets'
+    'QtNetwork',
+    'QtQml',
+    'QtQuick',
+    'QtQuickParticles',
+    'QtSql',
+    'QtQuickTest',
+    'QtTest',
+    'QtWebKit',
+    'QtWebKitWidgets'
+    'QtWidgets',
+    # Qt Add-Ons
+    'QtConcurrent',
+    'QtDBus',
+    'QtOpenGL',
+    'QtPrintSupport',
+    'QtDeclarative',
+    'QtScript',
+    'QtScriptTools',
+    'QtSvg',
+    'QtXml',
+    'QtXmlPatterns',
+    # Qt Tools
+    'QtHelp',
+    'QtDesigner',
+    'QtDesignerComponents',
+    # Other
+    'QtCLucene',
+    'QtConcurrent',
+    'QtV8'
+    ]
 
 def extendQtPath(qtpath):
     if os.path.exists(os.path.join(qtpath,'qt','bin')):
-        # Looks like a binary install of the Qt4 SDK,
+        # Looks like a binary install of the Qt5 SDK,
         # so we add the 'qt' folder to the path...
         return os.path.join(qtpath,'qt')
 
 
 def collectModulesFromFiles(fpath):
     """ Scan source files in dirpath for included
-    Qt4 modules, and return the used modules in a list.
+    Qt5 modules, and return the used modules in a list.
     """
     mods = []
     try:
 
 def collectModules(dirpath, pkeys):
     """ Scan source files in dirpath for included
-    Qt4 modules, and return the used modules in a list.
+    Qt5 modules, and return the used modules in a list.
     """
     mods = []
     defines = []
 """)
 
     if len(mods):
-        sc.write('env.EnableQt4Modules([\n')
+        sc.write('env.EnableQt5Modules([\n')
         for m in mods[:-1]:
             sc.write("'%s',\n" % m)
         sc.write("'%s'\n" % mods[-1])
             sc.write("'%s',\n" % s)
         sc.write("'%s'\n" % pkeys['FORMS'][-1])
         sc.write(']\n')
-        sc.write('env.Uic4(ui_files)\n\n')
+        sc.write('env.Uic5(ui_files)\n\n')
     
     # Write .qrc files
     if validKey('RESOURCES', pkeys):
 test = TestSCons.TestSCons()
 test.dir_fixture("%s")
 test.file_fixture('%sqtenv.py')
-test.file_fixture('%s__init__.py','site_scons/site_tools/qt4/__init__.py')
+test.file_fixture('%s__init__.py','site_scons/site_tools/qt5/__init__.py')
 test.run()
 
 test.pass_test()
     updirs = dirpath.count('/')+1
     shutil.copy(os.path.join(dirpath,'../'*updirs+'qtenv.py'),
                 os.path.join(dirpath,'qtenv.py'))
-    toolpath = os.path.join(dirpath,'site_scons','site_tools','qt4')
+    toolpath = os.path.join(dirpath,'site_scons','site_tools','qt5')
     if not os.path.exists(toolpath):
         os.makedirs(toolpath)
     shutil.copy(os.path.join(dirpath,'../'*(updirs+1)+'__init__.py'),
-                os.path.join(dirpath,'site_scons','site_tools','qt4','__init__.py'))
+                os.path.join(dirpath,'site_scons','site_tools','qt5','__init__.py'))
     
 def isComplicated(keyvalues):
     for s in keyvalues:
     """
 
     # Parse command line options
-    options = {'local' : False, # Install qtenv.py and qt4.py in local folder
+    options = {'local' : False, # Install qtenv.py and qt5.py in local folder
                'qtpath' : None,
                'pkgconfig' : None
                }

File test/ts_qm/clean/image/SConscript

 Import("qtEnv")
 
-qtEnv['QT4_CLEAN_TS']=1
+qtEnv['QT5_CLEAN_TS']=1
 
-qtEnv.Ts4('my_en.ts', Glob('*.cpp'))
-qtEnv.Qm4('my_en','my_en')
+qtEnv.Ts5('my_en.ts', Glob('*.cpp'))
+qtEnv.Qm5('my_en','my_en')

File test/ts_qm/clean/sconstest-clean.py

 #!/usr/bin/env python
 #
-# Copyright (c) 2001-2010 The SCons Foundation
+# Copyright (c) 2001-2010,2011,2012 The SCons Foundation
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
 
 
 """
-Test the QT4_CLEAN_TS option, which removes .ts files
+Test the QT5_CLEAN_TS option, which removes .ts files
 on a 'scons -c'.
 """
 
 test = TestSCons.TestSCons()
 test.dir_fixture("image")
 test.file_fixture('../../qtenv.py')
-test.file_fixture('../../../__init__.py','site_scons/site_tools/qt4/__init__.py')
+test.file_fixture('../../../__init__.py','site_scons/site_tools/qt5/__init__.py')
 test.run(stderr=None)
 
 test.must_exist(test.workpath('my_en.ts'))

File test/ts_qm/mixdir/image/SConscript

 Import("qtEnv")
 
-qtEnv.Ts4('my_en', ['MyFile.cpp','subdir'])
+qtEnv.Ts5('my_en', ['MyFile.cpp','subdir'])

File test/ts_qm/mixdir/image/subdir/bbb.cpp

 #include "bbb.h"
 
-bbb::bbb() : my_s(tr("And Qt4 too!"))
+bbb::bbb() : my_s(tr("And Qt5 too!"))
 {
   ;
 }

File test/ts_qm/mixdir/sconstest-mixdir.py

 #!/usr/bin/env python
 #
-# Copyright (c) 2001-2010 The SCons Foundation
+# Copyright (c) 2001-2010,2011,2012 The SCons Foundation
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
 test = TestSCons.TestSCons()
 test.dir_fixture("image")
 test.file_fixture('../../qtenv.py')
-test.file_fixture('../../../__init__.py','site_scons/site_tools/qt4/__init__.py')
+test.file_fixture('../../../__init__.py','site_scons/site_tools/qt5/__init__.py')
 test.run(stderr=None)
 
 test.must_exist(test.workpath('my_en.ts'))
 test.must_contain(test.workpath('my_en.ts'),'SCons rocks!')
-test.must_contain(test.workpath('my_en.ts'),'And Qt4 too!')
+test.must_contain(test.workpath('my_en.ts'),'And Qt5 too!')
 
 test.pass_test()
 

File test/ts_qm/multisource/image/SConscript

 Import("qtEnv")
 
-qtEnv.Ts4('my_en', Glob('*.cpp'))
-qtEnv.Ts4('a','MyFile.cpp')
-qtEnv.Ts4('b','bbb.cpp')
-qtEnv.Qm4('my_en',['a','b'])
+qtEnv.Ts5('my_en', Glob('*.cpp'))
+qtEnv.Ts5('a','MyFile.cpp')
+qtEnv.Ts5('b','bbb.cpp')
+qtEnv.Qm5('my_en',['a','b'])

File test/ts_qm/multisource/image/bbb.cpp

 #include "bbb.h"
 
-bbb::bbb() : my_s(tr("And Qt4 too!"))
+bbb::bbb() : my_s(tr("And Qt5 too!"))
 {
   ;
 }

File test/ts_qm/multisource/sconstest-multisource.py

 #!/usr/bin/env python
 #
-# Copyright (c) 2001-2010 The SCons Foundation
+# Copyright (c) 2001-2010,2011,2012 The SCons Foundation
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
 test = TestSCons.TestSCons()
 test.dir_fixture("image")
 test.file_fixture('../../qtenv.py')
-test.file_fixture('../../../__init__.py','site_scons/site_tools/qt4/__init__.py')
+test.file_fixture('../../../__init__.py','site_scons/site_tools/qt5/__init__.py')
 test.run(stderr=None)
 
 test.must_exist(test.workpath('my_en.ts'))
 test.must_exist(test.workpath('a.ts'))
 test.must_exist(test.workpath('b.ts'))
 test.must_contain(test.workpath('my_en.ts'),'SCons rocks!')
-test.must_contain(test.workpath('my_en.ts'),'And Qt4 too!')
+test.must_contain(test.workpath('my_en.ts'),'And Qt5 too!')
 test.must_contain(test.workpath('a.ts'),'SCons rocks!')
-test.must_contain(test.workpath('b.ts'),'And Qt4 too!')
+test.must_contain(test.workpath('b.ts'),'And Qt5 too!')
 test.must_exist(test.workpath('my_en.qm'))
 
 test.run(options = '-c')

File test/ts_qm/multitarget/image/SConscript

 Import("qtEnv")
 
-qtEnv.Ts4(['my_en','my_de'], Glob('*.cpp'))
-qtEnv.Qm4(['my_en','my_de'],'my_en')
+qtEnv.Ts5(['my_en','my_de'], Glob('*.cpp'))
+qtEnv.Qm5(['my_en','my_de'],'my_en')

File test/ts_qm/multitarget/sconstest-multitarget.py

 #!/usr/bin/env python
 #
-# Copyright (c) 2001-2010 The SCons Foundation
+# Copyright (c) 2001-2010,2011,2012 The SCons Foundation
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
 test = TestSCons.TestSCons()
 test.dir_fixture("image")
 test.file_fixture('../../qtenv.py')
-test.file_fixture('../../../__init__.py','site_scons/site_tools/qt4/__init__.py')
+test.file_fixture('../../../__init__.py','site_scons/site_tools/qt5/__init__.py')
 test.run(stderr=None)
 
 test.must_exist(test.workpath('my_en.ts'))

File test/ts_qm/noclean/image/SConscript

 Import("qtEnv")
 
-qtEnv.Ts4('my_en.ts', Glob('*.cpp'))
-qtEnv.Qm4('my_en','my_en')
+qtEnv.Ts5('my_en.ts', Glob('*.cpp'))
+qtEnv.Qm5('my_en','my_en')

File test/ts_qm/noclean/sconstest-noclean.py

 #!/usr/bin/env python
 #
-# Copyright (c) 2001-2010 The SCons Foundation
+# Copyright (c) 2001-2010,2011,2012 The SCons Foundation
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
 test = TestSCons.TestSCons()
 test.dir_fixture("image")
 test.file_fixture('../../qtenv.py')
-test.file_fixture('../../../__init__.py','site_scons/site_tools/qt4/__init__.py')
+test.file_fixture('../../../__init__.py','site_scons/site_tools/qt5/__init__.py')
 test.run(stderr=None)
 
 test.must_exist(test.workpath('my_en.ts'))