diff --git a/CMake/xmlto.cmake b/CMake/xmlto.cmake
deleted file mode 100644
index ab7f0e3b7..000000000
--- a/CMake/xmlto.cmake
+++ /dev/null
@@ -1,103 +0,0 @@
-# - Convert XML docBook files to various formats
-# This will convert XML docBook files to various formats like:
-# man html txt dvi ps pdf
-#  macro XMLTO(outfiles infiles... MODES modes...)
-
-set ( XmlTo_FOUND false )
-
-find_program ( XMLTO_EXECUTABLE
-  NAMES xmlto
-  DOC   "path to the xmlto docbook xslt frontend"  
-)
-
-if ( XMLTO_EXECUTABLE )
-  set ( XmlTo_FOUND true )
-endif ( XMLTO_EXECUTABLE )
-
-if ( NOT XmlTo_FIND_QUIETLY )
-  if ( XmlTo_FIND_REQUIRED )
-    FATAL_ERROR ( "xmlto not found" )
-  endif ( XmlTo_FIND_REQUIRED )
-endif ( NOT XmlTo_FIND_QUIETLY )
-
-macro ( _XMLTO_FILE outfiles mode)
-  #special settings
-  set ( XMLTO_FILEEXT_man 1 )
-  set ( XMLTO_MODE_html xhtml-nochunks )
-
-  if ( NOT XMLTO_MODE_${mode})
-    set ( XMLTO_MODE_${mode} ${mode} )
-  endif ( NOT XMLTO_MODE_${mode} )
-  if ( NOT XMLTO_FILEEXT_${mode} )
-    set ( XMLTO_FILEEXT_${mode} ${mode} )
-  endif ( NOT XMLTO_FILEEXT_${mode} )
-
-  foreach ( dbFile ${ARGN} )
-    #TODO: set XMLTO_FILEEXT_man to value from <manvolnum>
-    if ( "${mode}" STREQUAL "man" )
-      file ( READ "${dbFile}" _DB_FILE_CONTENTS )
-      string ( REGEX MATCH "<manvolnum>[^<]*" XMLTO_FILEEXT_${mode} "${_DB_FILE_CONTENTS}" )
-      string ( REGEX REPLACE "^<manvolnum>" "" XMLTO_FILEEXT_${mode} "${XMLTO_FILEEXT_${mode}}" )
-      string ( REGEX REPLACE "[[:space:]]" "" XMLTO_FILEEXT_${mode} "${XMLTO_FILEEXT_${mode}}" )
-    endif ( "${mode}" STREQUAL "man" )
-
-    get_filename_component ( dbFilePath ${CMAKE_CURRENT_BINARY_DIR}/${dbFile} PATH )
-    get_filename_component ( dbFileWE ${dbFile} NAME_WE )
-    get_filename_component ( dbFileAbsWE ${dbFilePath}/${dbFileWE} ABSOLUTE )
-
-    add_custom_command (
-      OUTPUT            ${dbFileAbsWE}.${XMLTO_FILEEXT_${mode}}
-      COMMAND           ${XMLTO_EXECUTABLE} ${XMLTO_COMMAND_ARGS} -o ${CMAKE_CURRENT_BINARY_DIR}
-                        ${XMLTO_MODE_${mode}} "${CMAKE_CURRENT_SOURCE_DIR}/${dbFile}"
-      MAIN_DEPENDENCY   ${CMAKE_CURRENT_SOURCE_DIR}/${dbFile}
-      VERBATIM
-    )
-
-    set ( ${outfiles}
-      ${${outfiles}}
-      ${dbFileAbsWE}.${XMLTO_FILEEXT_${mode}}
-    )
-  endforeach ( dbFile )
-endmacro ( _XMLTO_FILE outfiles )
-
-macro ( XMLTO )
-  set ( XMLTO_MODES )
-  set ( XMLTO_FILES )
-  set ( XMLTO_HAS_MODES false )
-  set ( XMLTO_ADD_DEFAULT false )
-  foreach ( arg ${ARGN} )
-    if ( ${arg} STREQUAL "MODES" )
-      set ( XMLTO_HAS_MODES true )
-    elseif ( ${arg} STREQUAL "ALL" )
-      set ( XMLTO_ADD_DEFAULT true )
-    else ( ${arg} STREQUAL "MODES" )
-      if ( XMLTO_HAS_MODES )
-	set ( XMLTO_MODES ${XMLTO_MODES} ${arg} )
-      else ( XMLTO_HAS_MODES )    
-	set ( XMLTO_FILES ${XMLTO_FILES} ${arg} )
-      endif ( XMLTO_HAS_MODES )
-    endif ( ${arg} STREQUAL "MODES" )
-  endforeach ( arg ${ARGN} )
-  if ( NOT XMLTO_MODES )
-    set ( XMLTO_MODES html )
-  endif ( NOT XMLTO_MODES )
-
-  foreach ( mode ${XMLTO_MODES} )
-    _xmlto_file ( XMLTO_FILES_${mode} ${mode} ${XMLTO_FILES} )
-    if ( XMLTO_ADD_DEFAULT )
-      add_custom_target ( ${mode} ALL
-	DEPENDS ${XMLTO_FILES_${mode}}
-	VERBATIM
-      )
-    else ( XMLTO_ADD_DEFAULT )
-      add_custom_target ( ${mode}
-	DEPENDS ${XMLTO_FILES_${mode}}
-	VERBATIM
-      )
-    endif ( XMLTO_ADD_DEFAULT )
-  endforeach ( mode )
-
-  set ( XMLTO_MODES )
-  set ( XMLTO_FILES )
-endmacro ( XMLTO )
-
diff --git a/CMakeLists.txt b/CMakeLists.txt
deleted file mode 100644
index efa4e400e..000000000
--- a/CMakeLists.txt
+++ /dev/null
@@ -1,35 +0,0 @@
-# Minimal CMake build file
-# Builds:
-# - static library from lib directory
-# - commandline executable
-# - test suite
-# - Qt GUI
-
-# To build with CMake:
-# - install CMake 2.6 or later
-# - $ cmake .
-# - $ make
-
-cmake_minimum_required (VERSION 2.6)
-
-PROJECT(CPPCHECK)
-
-# Building lib as static library is disabled due to bug
-# #1299 CMake: The CheckClass is not used
-# https://sourceforge.net/apps/trac/cppcheck/ticket/1299
-# Instead lib code is included directly into cli and gui targets
-# ADD_SUBDIRECTORY(lib)
-
-ADD_SUBDIRECTORY(cli)
-
-# Exclude tests from command line targets but include them to VS IDE targets.
-# There is 'make check' -target for compiling and running tests from
-# command line.
-IF (MSVC_IDE)
-  ADD_SUBDIRECTORY(test)
-ELSE (MSVC_IDE)
-  ADD_SUBDIRECTORY(test EXCLUDE_FROM_ALL)
-ENDIF (MSVC_IDE)
-
-ADD_SUBDIRECTORY(gui)
-ADD_SUBDIRECTORY(man)
diff --git a/SConstruct b/SConstruct
deleted file mode 100644
index c7ce23dd5..000000000
--- a/SConstruct
+++ /dev/null
@@ -1,105 +0,0 @@
-# qt4.py is required for this script to work. It was downloaded from: 
-# http://clam-project.org/clam/trunk/CLAM/scons/sconstools/qt4.py
-import os
-
-# Lib
-libFiles = Glob('lib/*.cpp')
-libEnv = Environment()
-if "gcc" in libEnv["TOOLS"]:
-	libEnv.Append(CCFLAGS = ['-Wall', '-Wextra'])
-	if 'release' in COMMAND_LINE_TARGETS:
-		libEnv.Append(CCFLAGS = ['-O3'])
-	elif 'coverage' in COMMAND_LINE_TARGETS:
-		libEnv.Append(CCFLAGS = ['-g', '-fprofile-arcs', '-ftest-coverage'])
-		libEnv.Append(LINKFLAGS = ['-g', '-fprofile-arcs', '-ftest-coverage'])
-	elif 'ccwin32' in COMMAND_LINE_TARGETS:
-		libEnv.Replace(CXX = 'i586-mingw32msvc-g++')
-		libEnv.Replace(CCFLAGS = ['-O3'])
-		libEnv.Replace(LIBS = ['shlwapi'])
-	else:
-		libEnv.Append(CCFLAGS = ['-g','-O0'])
-
-libEnv.Append(CPPPATH = ['lib'])
-libObjects = libEnv.Object(libFiles)
-
-# Cppcheck (cli)
-cliFiles = Glob('cli/*.cpp')+libObjects
-cliEnv = libEnv.Clone()
-cliEnv.Append(CPPPATH = ['cli'])
-if "gcc" in libEnv["TOOLS"]:
-	cliEnv.Append(CCFLAGS = ['-pedantic'])
-cppcheck = cliEnv.Program('cppcheck',cliFiles)
-Alias('cppcheck',[cppcheck])
-Default(cppcheck)
-
-# Testrunner
-testFiles = Glob('test/*.cpp')+libObjects
-testEnv = libEnv.Clone()
-testEnv.Append(CPPPATH = ['test'])
-if "gcc" in libEnv["TOOLS"]:
-	testEnv.Append(CCFLAGS = ['-pedantic'])
-testrunner = testEnv.Program('testrunner', testFiles)
-Alias('testrunner',[testrunner])
-
-# GUI
-emptyEnv = Environment()
-conf = Configure(emptyEnv)
-try:
-	QTDIR = os.popen('qmake -query QT_INSTALL_DATA').read() 
-	pkgpath = os.environ.get("PKG_CONFIG_PATH", "")
-	pkgpath += ":%s/lib/pkgconfig" % QTDIR
-	os.environ["PKG_CONFIG_PATH"] = pkgpath
-	os.environ["QTDIR"] = QTDIR
-	guiEnv = libEnv.Clone(tools=["default", "qt4"], toolpath=['.'])
-	guiEnv.Append(CPPPATH = ['gui'])
-	guiEnv.EnableQt4Modules(["QtGui", "QtCore"])
-	rccs = [guiEnv.Qrc("gui/gui.qrc", QT4_QRCFLAGS="-name CppcheckGUI")]
-	uiFiles = Glob('gui/*.ui')
-	uis = [guiEnv.Uic4(ui) for ui in uiFiles]
-	guiFiles = Glob('gui/*.cpp')+libObjects
-	gui = guiEnv.Program(target="gui_cppcheck", source=[rccs, guiFiles])
-	Alias('gui',[gui])
-except:
-	gui = Alias('gui','')
-	if 'gui' in COMMAND_LINE_TARGETS:
-		print "Qt4 not found. It is required for gui"
-
-# Execute testrunner
-test = AlwaysBuild(Alias("test", testrunner, "./$SOURCE"))
-
-# All
-Alias('all',[testrunner,cppcheck,gui])
-
-# Release
-Alias('release',[cppcheck])
-
-# ccwin32 (Cross compile win32 in Linux)
-ccwin32 = Alias('ccwin32',[cppcheck],Move('cppcheck.exe','cppcheck'))
-Clean(ccwin32,'cppcheck.exe')
-
-# Coverage
-Alias('coverage',[test],[
-	'rm -r coverage_report',
-	'gcov lib/*.cpp -o lib/',
-	'lcov --directory ./ --capture --output-file lcov.info -b ./',
-	'genhtml lcov.info -o coverage_report',
-	'rm lib/*.gcda',
-	'rm lib/*.gcno',
-	'rm test/*.gcda',
-	'rm test/*.gcno',
-	'rm lcov.info'])
-
-Help("""
-       Type: 'scons'             - cppcheck (cli)
-             'scons cppcheck'    - cppcheck (cli)
-             'scons gui'         - gui_cppcheck
-             'scons testrunner'  - testrunner
-             'scons test'        - testrunner + execute tests
-             'scons all'         - gui+cppcheck+testrunner
-             'scons release'     - cppcheck release version
-             'scons release gui' - cppcheck+gui release versions
-             'scons coverage'    - coverage report
-             'scons ccwin32'     - Cross compile win32 (cli) in Linux
-             'scons -c all'      - clean all
-       """)
-
diff --git a/gui/CMakeLists.txt b/gui/CMakeLists.txt
deleted file mode 100644
index 0fb32182e..000000000
--- a/gui/CMakeLists.txt
+++ /dev/null
@@ -1,141 +0,0 @@
-# Minimal CMake build file to build cppcheck Qt GUI
-
-# find and setup Qt4 for this project
-find_package(Qt4)
-
-IF(QT4_FOUND)
-
-# Add needed Qt modules
-set(QT_USE_QTMAIN TRUE)
-set(QT_USE_QTXML TRUE)
-include(${QT_USE_FILE})
-
-include_directories (${CPPCHECK_SOURCE_DIR}/lib)
-# Generated files (in build directory) need to know gui directory
-include_directories (${CPPCHECK_SOURCE_DIR}/gui)
-
-# Header files - listed for mocking
-SET(CHECK_HEADERS
-  aboutdialog.h
-  applicationdialog.h
-  applicationlist.h
-  checkthread.h
-  common.h
-  csvreport.h
-  fileviewdialog.h
-  mainwindow.h
-  projectfile.h
-  report.h
-  resultstree.h
-  resultsview.h
-  settingsdialog.h
-  threadhandler.h
-  threadresult.h
-  translationhandler.h
-  txtreport.h
-  xmlreport.h
-)
-
-# Source files
-SET(CHECKGUI_SRCS
-  aboutdialog.cpp
-  applicationdialog.cpp 
-  applicationlist.cpp
-  checkthread.cpp
-  csvreport.cpp
-  fileviewdialog.cpp
-  main.cpp
-  mainwindow.cpp
-  projectfile.cpp
-  report.cpp
-  resultstree.cpp
-  resultsview.cpp
-  settingsdialog.cpp
-  threadhandler.cpp
-  threadresult.cpp
-  translationhandler.cpp
-  txtreport.cpp
-  xmlreport.cpp
-)
-
-# Add Windows resource file
-if (WIN32)
-  SET(CHECKGUI_SRCS
-    ${CHECKGUI_SRCS}
-    cppcheck-gui.rc
-  )
-endif (WIN32)
-
-# UI files
-SET(CHECK_UIS
-  about.ui
-  application.ui
-  file.ui
-  main.ui
-  resultsview.ui
-  settings.ui
-)
-
-# Translation files
-SET(CHECK_TRANS
-  cppcheck_de.ts
-  cppcheck_fi.ts
-  cppcheck_pl.ts
-  cppcheck_se.ts
-  cppcheck_en.ts
-  cppcheck_nl.ts
-  cppcheck_ru.ts
-)
-
-SET(CHECK_RCCS gui.qrc)
-
-aux_source_directory(${CPPCHECK_SOURCE_DIR}/lib LIB_SRCS)
-
-# Libraries to link
-#set(CHECK_LIBS
-#  checklib
-#)
-
-# Windows needs additional shlwapi library
-if (WIN32 AND NOT CYGWIN)
-set(CHECK_LIBS
-  ${CHECK_LIBS}
-  shlwapi
-  htmlhelp
-)
-endif (WIN32 AND NOT CYGWIN)
-
-if (CMAKE_COMPILER_IS_GNUCXX)
-  set(CMAKE_CXX_FLAGS
-    ${CMAKE_CXX_FLAGS}
-    "-Wall"
-  )
-endif (CMAKE_COMPILER_IS_GNUCXX)
-
-# Generate rules for building source files from the resources
-QT4_ADD_RESOURCES(CHECK_RCC_SRCS ${CHECK_RCCS})
-
-# Process UI files
-QT4_WRAP_UI(CHECK_UIS_H ${CHECK_UIS})
-
-# Mock header files
-QT4_WRAP_CPP(CHECK_MOC_SRCS ${CHECK_HEADERS})
-
-# add translations ...
-QT4_ADD_TRANSLATION(CHECK_QM ${CHECK_TRANS})
-
-# Create folders for Visual Studio IDE
-SOURCE_GROUP("Header Files" FILES ${CHECK_HEADERS})
-SOURCE_GROUP("Ui Files" ".ui$")
-SOURCE_GROUP("Moc Files" "moc_.*cxx$")
-
-# Include binary directory where code from UI files gets created
-include_directories(${CMAKE_CURRENT_BINARY_DIR})
-
-ADD_EXECUTABLE(gui WIN32 ${CHECKGUI_SRCS} ${CHECK_MOC_SRCS} ${CHECK_HEADERS} 
-  ${CHECK_UIS_H} ${CHECK_RCC_SRCS} ${LIB_SRCS})
-TARGET_LINK_LIBRARIES(gui ${CHECK_LIBS} ${QT_LIBRARIES})
-
-ELSE(QT4_FOUND)
-message("GUI not built since QT4 not found.")
-ENDIF(QT4_FOUND)
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
deleted file mode 100644
index 1f181a5f2..000000000
--- a/lib/CMakeLists.txt
+++ /dev/null
@@ -1,61 +0,0 @@
-# Minimal CMake build file to build static cppcheck library
-# This static library is used to build executables:
-# - cli
-# - tests
-# - Qt GUI
-
-SET(CHECKLIB_HDRS
-  check.h
-  checkautovariables.h
-  checkbufferoverrun.h
-  checkclass.h
-  checkdangerousfunctions.h
-  checkexceptionsafety.h
-  checkheaders.h
-  checkmemoryleak.h
-  checkother.h
-  checkstl.h
-  checkunusedfunctions.h
-  classinfo.h
-  cppcheck.h
-  errorlogger.h
-  executionpath.h
-  filelister.h
-  mathlib.h
-  preprocessor.h
-  settings.h
-  token.h
-  tokenize.h
-)
-
-SET(CHECKLIB_SRCS
-  checkautovariables.cpp
-  checkbufferoverrun.cpp
-  checkclass.cpp
-  checkdangerousfunctions.cpp
-  checkexceptionsafety.cpp
-  checkheaders.cpp
-  checkmemoryleak.cpp
-  checkother.cpp
-  checkstl.cpp
-  checkunusedfunctions.cpp
-  cppcheck.cpp
-  errorlogger.cpp
-  executionpath.cpp
-  filelister.cpp
-  mathlib.cpp
-  preprocessor.cpp
-  settings.cpp
-  token.cpp
-  tokenize.cpp
-)
-
-if (CMAKE_COMPILER_IS_GNUCXX)
-  set(CMAKE_CXX_FLAGS
-    ${CMAKE_CXX_FLAGS}
-    "-Wall -Wextra -pedantic"
-  )
-endif (CMAKE_COMPILER_IS_GNUCXX)
-
-ADD_LIBRARY(checklib STATIC ${CHECKLIB_SRCS} ${CHECKLIB_HDRS})
-
diff --git a/qt4.py b/qt4.py
deleted file mode 100644
index e18ebfdce..000000000
--- a/qt4.py
+++ /dev/null
@@ -1,524 +0,0 @@
-
-"""SCons.Tool.qt
-
-Tool-specific initialization for Qt.
-
-There normally shouldn't be any need to import this module directly.
-It will usually be imported through the generic SCons.Tool.Tool()
-selection method.
-
-"""
-
-#
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007 The SCons Foundation
-#
-# Permission is hereby granted, free of charge, to any person obtaining
-# a copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, sublicense, and/or sell copies of the Software, and to
-# permit persons to whom the Software is furnished to do so, subject to
-# the following conditions:
-#
-# The above copyright notice and this permission notice shall be included
-# in all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
-# KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
-# WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-#
-
-__revision__ = "/home/scons/scons/branch.0/branch.96/baseline/src/engine/SCons/Tool/qt.py 0.96.92.D001 2006/04/10 23:13:27 knight"
-
-import os.path
-import re
-
-import SCons.Action
-import SCons.Builder
-import SCons.Defaults
-import SCons.Scanner
-import SCons.Tool
-import SCons.Util
-
-class ToolQtWarning(SCons.Warnings.Warning):
-	pass
-
-class GeneratedMocFileNotIncluded(ToolQtWarning):
-	pass
-
-class QtdirNotFound(ToolQtWarning):
-	pass
-
-SCons.Warnings.enableWarningClass(ToolQtWarning)
-
-qrcinclude_re = re.compile(r'<file>([^<]*)</file>', re.M)
-
-def transformToWinePath(path) :
-	return os.popen('winepath -w "%s"'%path).read().strip().replace('\\','/')
-
-header_extensions = [".h", ".hxx", ".hpp", ".hh"]
-if SCons.Util.case_sensitive_suffixes('.h', '.H'):
-	header_extensions.append('.H')
-# TODO: The following two lines will work when integrated back to SCons
-# TODO: Meanwhile the third line will do the work
-#cplusplus = __import__('c++', globals(), locals(), [])
-#cxx_suffixes = cplusplus.CXXSuffixes
-cxx_suffixes = [".c", ".cxx", ".cpp", ".cc"]
-
-def checkMocIncluded(target, source, env):
-	moc = target[0]
-	cpp = source[0]
-	# looks like cpp.includes is cleared before the build stage :-(
-	# not really sure about the path transformations (moc.cwd? cpp.cwd?) :-/
-	path = SCons.Defaults.CScan.path_function(env, moc.cwd)
-	includes = SCons.Defaults.CScan(cpp, env, path)
-	if not moc in includes:
-		SCons.Warnings.warn(
-			GeneratedMocFileNotIncluded,
-			"Generated moc file '%s' is not included by '%s'" %
-			(str(moc), str(cpp)))
-
-def find_file(filename, paths, node_factory):
-	for dir in paths:
-		node = node_factory(filename, dir)
-		if node.rexists():
-			return node
-	return None
-
-class _Automoc:
-	"""
-	Callable class, which works as an emitter for Programs, SharedLibraries and
-	StaticLibraries.
-	"""
-
-	def __init__(self, objBuilderName):
-		self.objBuilderName = objBuilderName
-		
-	def __call__(self, target, source, env):
-		"""
-		Smart autoscan function. Gets the list of objects for the Program
-		or Lib. Adds objects and builders for the special qt files.
-		"""
-		try:
-			if int(env.subst('$QT4_AUTOSCAN')) == 0:
-				return target, source
-		except ValueError:
-			pass
-		try:
-			debug = int(env.subst('$QT4_DEBUG'))
-		except ValueError:
-			debug = 0
-		
-		# some shortcuts used in the scanner
-		splitext = SCons.Util.splitext
-		objBuilder = getattr(env, self.objBuilderName)
-
-		# some regular expressions:
-		# Q_OBJECT detection
-		q_object_search = re.compile(r'[^A-Za-z0-9]Q_OBJECT[^A-Za-z0-9]') 
-		# cxx and c comment 'eater'
-		#comment = re.compile(r'(//.*)|(/\*(([^*])|(\*[^/]))*\*/)')
-		# CW: something must be wrong with the regexp. See also bug #998222
-		#	 CURRENTLY THERE IS NO TEST CASE FOR THAT
-		
-		# The following is kind of hacky to get builders working properly (FIXME)
-		objBuilderEnv = objBuilder.env
-		objBuilder.env = env
-		mocBuilderEnv = env.Moc4.env
-		env.Moc4.env = env
-		
-		# make a deep copy for the result; MocH objects will be appended
-		out_sources = source[:]
-
-		for obj in source:
-			if isinstance(obj,basestring):  # big kludge!
-				print "scons: qt4: '%s' MAYBE USING AN OLD SCONS VERSION AND NOT CONVERTED TO 'File'. Discarded." % str(obj)
-				continue
-			if not obj.has_builder():
-				# binary obj file provided
-				if debug:
-					print "scons: qt: '%s' seems to be a binary. Discarded." % str(obj)
-				continue
-			cpp = obj.sources[0]
-			if not splitext(str(cpp))[1] in cxx_suffixes:
-				if debug:
-					print "scons: qt: '%s' is no cxx file. Discarded." % str(cpp) 
-				# c or fortran source
-				continue
-			#cpp_contents = comment.sub('', cpp.get_contents())
-			try:
-				cpp_contents = cpp.get_contents()
-			except: continue # may be an still not generated source
-			h=None
-			for h_ext in header_extensions:
-				# try to find the header file in the corresponding source
-				# directory
-				hname = splitext(cpp.name)[0] + h_ext
-				h = find_file(hname, (cpp.get_dir(),), env.File)
-				if h:
-					if debug:
-						print "scons: qt: Scanning '%s' (header of '%s')" % (str(h), str(cpp))
-					#h_contents = comment.sub('', h.get_contents())
-					h_contents = h.get_contents()
-					break
-			if not h and debug:
-				print "scons: qt: no header for '%s'." % (str(cpp))
-			if h and q_object_search.search(h_contents):
-				# h file with the Q_OBJECT macro found -> add moc_cpp
-				moc_cpp = env.Moc4(h)
-				moc_o = objBuilder(moc_cpp)
-				out_sources.append(moc_o)
-				#moc_cpp.target_scanner = SCons.Defaults.CScan
-				if debug:
-					print "scons: qt: found Q_OBJECT macro in '%s', moc'ing to '%s'" % (str(h), str(moc_cpp))
-			if cpp and q_object_search.search(cpp_contents):
-				# cpp file with Q_OBJECT macro found -> add moc
-				# (to be included in cpp)
-				moc = env.Moc4(cpp)
-				env.Ignore(moc, moc)
-				if debug:
-					print "scons: qt: found Q_OBJECT macro in '%s', moc'ing to '%s'" % (str(cpp), str(moc))
-				#moc.source_scanner = SCons.Defaults.CScan
-		# restore the original env attributes (FIXME)
-		objBuilder.env = objBuilderEnv
-		env.Moc4.env = mocBuilderEnv
-
-		return (target, out_sources)
-
-AutomocShared = _Automoc('SharedObject')
-AutomocStatic = _Automoc('StaticObject')
-
-def _detect(env):
-	"""Not really safe, but fast method to detect the QT library"""
-	try: return env['QTDIR']
-	except KeyError: pass
-
-	try: return os.environ['QTDIR']
-	except KeyError: pass
-
-	moc = env.WhereIs('moc-qt4') or env.WhereIs('moc4') or env.WhereIs('moc')
-	if moc:
-		QTDIR = os.path.dirname(os.path.dirname(moc))
-		SCons.Warnings.warn(
-			QtdirNotFound,
-			"QTDIR variable is not defined, using moc executable as a hint (QTDIR=%s)" % QTDIR)
-		return QTDIR
-
-	raise SCons.Errors.StopError(
-		QtdirNotFound,
-		"Could not detect Qt 4 installation")
-	return None
-
-def generate(env):
-	"""Add Builders and construction variables for qt to an Environment."""
-
-	def locateQt4Command(env, command, qtdir) :
-		suffixes = [
-			'-qt4',
-			'-qt4.exe',
-			'4',
-			'4.exe',
-			'',
-			'.exe',
-		]
-		triedPaths = []
-		for suffix in suffixes :
-			fullpath = os.path.join(qtdir,'bin',command + suffix)
-			if os.access(fullpath, os.X_OK) :
-				return fullpath
-			triedPaths.append(fullpath)
-
-		fullpath = env.Detect([command+'-qt4', command+'4', command])
-		if not (fullpath is None) : return fullpath
-
-		raise Exception("Qt4 command '" + command + "' not found. Tried: " + ', '.join(triedPaths))
-		
-
-	CLVar = SCons.Util.CLVar
-	Action = SCons.Action.Action
-	Builder = SCons.Builder.Builder
-	splitext = SCons.Util.splitext
-
-	env['QTDIR']  = _detect(env)
-	# TODO: 'Replace' should be 'SetDefault'
-#	env.SetDefault(
-	env.Replace(
-		QTDIR  = _detect(env),
-		QT4_BINPATH = os.path.join('$QTDIR', 'bin'),
-		# TODO: This is not reliable to QTDIR value changes but needed in order to support '-qt4' variants
-		QT4_MOC = locateQt4Command(env,'moc', env['QTDIR']),
-		QT4_UIC = locateQt4Command(env,'uic', env['QTDIR']),
-		QT4_RCC = locateQt4Command(env,'rcc', env['QTDIR']),
-		QT4_LUPDATE = locateQt4Command(env,'lupdate', env['QTDIR']),
-		QT4_LRELEASE = locateQt4Command(env,'lrelease', env['QTDIR']),
-
-		QT4_AUTOSCAN = 1, # Should the qt tool try to figure out, which sources are to be moc'ed?
-
-		# Some QT specific flags. I don't expect someone wants to
-		# manipulate those ...
-		QT4_UICFLAGS = CLVar(''),
-		QT4_MOCFROMHFLAGS = CLVar(''),
-		QT4_MOCFROMCXXFLAGS = CLVar('-i'),
-		QT4_QRCFLAGS = '',
-
-		# suffixes/prefixes for the headers / sources to generate
-		QT4_UISUFFIX = '.ui',
-		QT4_UICDECLPREFIX = 'ui_',
-		QT4_UICDECLSUFFIX = '.h',
-		QT4_MOCINCPREFIX = '-I',
-		QT4_MOCHPREFIX = 'moc_',
-		QT4_MOCHSUFFIX = '$CXXFILESUFFIX',
-		QT4_MOCCXXPREFIX = '',
-		QT4_MOCCXXSUFFIX = '.moc',
-		QT4_QRCSUFFIX = '.qrc',
-		QT4_QRCCXXSUFFIX = '$CXXFILESUFFIX',
-		QT4_QRCCXXPREFIX = 'qrc_',
-		QT4_MOCCPPPATH = [],
-		QT4_MOCINCFLAGS = '$( ${_concat(QT4_MOCINCPREFIX, QT4_MOCCPPPATH, INCSUFFIX, __env__, RDirs)} $)',
-
-		# Commands for the qt support ...
-		QT4_UICCOM = '$QT4_UIC $QT4_UICFLAGS -o $TARGET $SOURCE',
-		QT4_MOCFROMHCOM = '$QT4_MOC $QT4_MOCFROMHFLAGS $QT4_MOCINCFLAGS -o $TARGET $SOURCE',
-		QT4_MOCFROMCXXCOM = [
-			'$QT4_MOC $QT4_MOCFROMCXXFLAGS $QT4_MOCINCFLAGS -o $TARGET $SOURCE',
-			Action(checkMocIncluded,None)],
-		QT4_LUPDATECOM = '$QT4_LUPDATE $SOURCE -ts $TARGET',
-		QT4_LRELEASECOM = '$QT4_LRELEASE $SOURCE',
-		QT4_RCCCOM = '$QT4_RCC $QT4_QRCFLAGS $SOURCE -o $TARGET',
-		)
-
-	# Translation builder
-	tsbuilder = Builder(
-		action = SCons.Action.Action('$QT4_LUPDATECOM'), #,'$QT4_LUPDATECOMSTR'),
-		multi=1
-		)
-	env.Append( BUILDERS = { 'Ts': tsbuilder } )
-	qmbuilder = Builder(
-		action = SCons.Action.Action('$QT4_LRELEASECOM'),# , '$QT4_LRELEASECOMSTR'),
-		src_suffix = '.ts',
-		suffix = '.qm',
-		single_source = True
-		)
-	env.Append( BUILDERS = { 'Qm': qmbuilder } )
-
-	# Resource builder
-	def scanResources(node, env, path, arg):
-		# I've being careful on providing names relative to the qrc file
-		# If that was not needed that code could be simplified a lot
-		def recursiveFiles(basepath, path) :
-			result = []
-			for item in os.listdir(os.path.join(basepath, path)) :
-				itemPath = os.path.join(path, item)
-				if os.path.isdir(os.path.join(basepath, itemPath)) :
-					result += recursiveFiles(basepath, itemPath)
-				else:
-					result.append(itemPath)
-			return result
-		contents = node.get_contents()
-		includes = qrcinclude_re.findall(contents)
-		qrcpath = os.path.dirname(node.path)
-		dirs = [included for included in includes if os.path.isdir(os.path.join(qrcpath,included))]
-		# dirs need to include files recursively
-		for dir in dirs :
-			includes.remove(dir)
-			includes+=recursiveFiles(qrcpath,dir)
-		return includes
-	qrcscanner = SCons.Scanner.Scanner(name = 'qrcfile',
-		function = scanResources,
-		argument = None,
-		skeys = ['.qrc'])
-	qrcbuilder = Builder(
-		action = SCons.Action.Action('$QT4_RCCCOM', '$QT4_RCCCOMSTR'),
-		source_scanner = qrcscanner,
-		src_suffix = '$QT4_QRCSUFFIX',
-		suffix = '$QT4_QRCCXXSUFFIX',
-		prefix = '$QT4_QRCCXXPREFIX',
-		single_source = True
-		)
-	env.Append( BUILDERS = { 'Qrc': qrcbuilder } )
-
-	# Interface builder
-	uic4builder = Builder(
-		action = SCons.Action.Action('$QT4_UICCOM', '$QT4_UICCOMSTR'),
-		src_suffix='$QT4_UISUFFIX',
-		suffix='$QT4_UICDECLSUFFIX',
-		prefix='$QT4_UICDECLPREFIX',
-		single_source = True
-		#TODO: Consider the uiscanner on new scons version
-		)
-	env['BUILDERS']['Uic4'] = uic4builder
-
-	# Metaobject builder
-	mocBld = Builder(action={}, prefix={}, suffix={})
-	for h in header_extensions:
-		act = SCons.Action.Action('$QT4_MOCFROMHCOM', '$QT4_MOCFROMHCOMSTR')
-		mocBld.add_action(h, act)
-		mocBld.prefix[h] = '$QT4_MOCHPREFIX'
-		mocBld.suffix[h] = '$QT4_MOCHSUFFIX'
-	for cxx in cxx_suffixes:
-		act = SCons.Action.Action('$QT4_MOCFROMCXXCOM', '$QT4_MOCFROMCXXCOMSTR')
-		mocBld.add_action(cxx, act)
-		mocBld.prefix[cxx] = '$QT4_MOCCXXPREFIX'
-		mocBld.suffix[cxx] = '$QT4_MOCCXXSUFFIX'
-	env['BUILDERS']['Moc4'] = mocBld
-
-	# er... no idea what that was for
-	static_obj, shared_obj = SCons.Tool.createObjBuilders(env)
-	static_obj.src_builder.append('Uic4')
-	shared_obj.src_builder.append('Uic4')
-
-	# We use the emitters of Program / StaticLibrary / SharedLibrary
-	# to scan for moc'able files
-	# We can't refer to the builders directly, we have to fetch them
-	# as Environment attributes because that sets them up to be called
-	# correctly later by our emitter.
-	env.AppendUnique(PROGEMITTER =[AutomocStatic],
-					 SHLIBEMITTER=[AutomocShared],
-					 LIBEMITTER  =[AutomocStatic],
-					)
-
-	# TODO: Does dbusxml2cpp need an adapter
-	env.AddMethod(enable_modules, "EnableQt4Modules")
-
-def enable_modules(self, modules, debug=False, crosscompiling=False) :
-	import sys
-
-	validModules = [
-		'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',
-		'QtScriptTools',
-		'QtMultimedia',
-		]
-	pclessModules = [
-# in qt <= 4.3 designer and designerComponents are pcless, on qt4.4 they are not, so removed.	
-#		'QtDesigner',
-#		'QtDesignerComponents',
-	]
-	staticModules = [
-		'QtUiTools',
-	]
-	invalidModules=[]
-	for module in modules:
-		if module not in validModules :
-			invalidModules.append(module)
-	if invalidModules :
-		raise Exception("Modules %s are not Qt4 modules. Valid Qt4 modules are: %s"% (
-			str(invalidModules),str(validModules)))
-
-	moduleDefines = {
-		'QtScript'   : ['QT_SCRIPT_LIB'],
-		'QtSvg'      : ['QT_SVG_LIB'],
-		'Qt3Support' : ['QT_QT3SUPPORT_LIB','QT3_SUPPORT'],
-		'QtSql'      : ['QT_SQL_LIB'],
-		'QtXml'      : ['QT_XML_LIB'],
-		'QtOpenGL'   : ['QT_OPENGL_LIB'],
-		'QtGui'      : ['QT_GUI_LIB'],
-		'QtNetwork'  : ['QT_NETWORK_LIB'],
-		'QtCore'     : ['QT_CORE_LIB'],
-	}
-	for module in modules :
-		try : self.AppendUnique(CPPDEFINES=moduleDefines[module])
-		except: pass
-	debugSuffix = ''
-	if sys.platform in ["darwin", "linux2"] and not crosscompiling :
-		if debug : debugSuffix = '_debug'
-		for module in modules :
-			if module not in pclessModules : continue
-			self.AppendUnique(LIBS=[module+debugSuffix])
-			self.AppendUnique(LIBPATH=[os.path.join("$QTDIR","lib")])
-			self.AppendUnique(CPPPATH=[os.path.join("$QTDIR","include","qt4")])
-			self.AppendUnique(CPPPATH=[os.path.join("$QTDIR","include","qt4",module)])
-		pcmodules = [module+debugSuffix for module in modules if module not in pclessModules ]
-		if 'QtDBus' in pcmodules:
-			self.AppendUnique(CPPPATH=[os.path.join("$QTDIR","include","qt4","QtDBus")])
-		if "QtAssistant" in pcmodules:
-			self.AppendUnique(CPPPATH=[os.path.join("$QTDIR","include","qt4","QtAssistant")])
-			pcmodules.remove("QtAssistant")
-			pcmodules.append("QtAssistantClient")
-		self.ParseConfig('pkg-config %s --libs --cflags'% ' '.join(pcmodules))
-		self["QT4_MOCCPPPATH"] = self["CPPPATH"]
-		return
-	if sys.platform == "win32" or crosscompiling :
-		if crosscompiling:
-			transformedQtdir = transformToWinePath(self['QTDIR'])
-			self['QT4_MOC'] = "QTDIR=%s %s"%( transformedQtdir, self['QT4_MOC'])
-		self.AppendUnique(CPPPATH=[os.path.join("$QTDIR","include")])
-		try: modules.remove("QtDBus")
-		except: pass
-		if debug : debugSuffix = 'd'
-		if "QtAssistant" in modules:
-			self.AppendUnique(CPPPATH=[os.path.join("$QTDIR","include","QtAssistant")])
-			modules.remove("QtAssistant")
-			modules.append("QtAssistantClient")
-		self.AppendUnique(LIBS=[lib+'4'+debugSuffix for lib in modules if lib not in staticModules])
-		self.PrependUnique(LIBS=[lib+debugSuffix for lib in modules if lib in staticModules])
-		if 'QtOpenGL' in modules:
-			self.AppendUnique(LIBS=['opengl32'])
-		self.AppendUnique(CPPPATH=[ '$QTDIR/include/'])
-		self.AppendUnique(CPPPATH=[ '$QTDIR/include/'+module for module in modules])
-		if crosscompiling :
-			self["QT4_MOCCPPPATH"] = [
-				path.replace('$QTDIR', transformedQtdir)
-					for path in self['CPPPATH'] ]
-		else :
-			self["QT4_MOCCPPPATH"] = self["CPPPATH"]
-		self.AppendUnique(LIBPATH=[os.path.join('$QTDIR','lib')])
-		return
-	"""
-	if sys.platform=="darwin" :
-		# TODO: Test debug version on Mac
-		self.AppendUnique(LIBPATH=[os.path.join('$QTDIR','lib')])
-		self.AppendUnique(LINKFLAGS="-F$QTDIR/lib")
-		self.AppendUnique(LINKFLAGS="-L$QTDIR/lib") #TODO clean!
-		if debug : debugSuffix = 'd'
-		for module in modules :
-#			self.AppendUnique(CPPPATH=[os.path.join("$QTDIR","include")])
-#			self.AppendUnique(CPPPATH=[os.path.join("$QTDIR","include",module)])
-# port qt4-mac:
-			self.AppendUnique(CPPPATH=[os.path.join("$QTDIR","include", "qt4")])
-			self.AppendUnique(CPPPATH=[os.path.join("$QTDIR","include", "qt4", module)])
-			if module in staticModules :
-				self.AppendUnique(LIBS=[module+debugSuffix]) # TODO: Add the debug suffix
-				self.AppendUnique(LIBPATH=[os.path.join("$QTDIR","lib")])
-			else :
-#				self.Append(LINKFLAGS=['-framework', module])
-# port qt4-mac:
-				self.Append(LIBS=module)
-		if 'QtOpenGL' in modules:
-			self.AppendUnique(LINKFLAGS="-F/System/Library/Frameworks")
-			self.Append(LINKFLAGS=['-framework', 'AGL']) #TODO ughly kludge to avoid quotes
-			self.Append(LINKFLAGS=['-framework', 'OpenGL'])
-		self["QT4_MOCCPPPATH"] = self["CPPPATH"]
-		return
-# This should work for mac but doesn't
-#	env.AppendUnique(FRAMEWORKPATH=[os.path.join(env['QTDIR'],'lib')])
-#	env.AppendUnique(FRAMEWORKS=['QtCore','QtGui','QtOpenGL', 'AGL'])
-	"""
-
-
-def exists(env):
-	return _detect(env)