diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6e7c708..a7ffbd5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,13 +1,41 @@
-include(icecc.cmake) # this must be the first line!
+include(cmake/Macros/icecc.cmake) # this must be the first line!
 
 project(pysidebindings)
 
 cmake_minimum_required(VERSION 2.6)
+set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/Macros/
+                      ${CMAKE_MODULE_PATH})
+find_package(Shiboken 1.1.1 REQUIRED)
+find_package(Qt4 4.5.0 REQUIRED)
+find_file(GL_H "gl.h" PATH_SUFFIXES "GL")
+include(FindQt4Extra)
 
-if(CMAKE_HOST_UNIX)
-    option(ENABLE_GCC_OPTIMIZATION "Enable specific GCC flags to optimization library size and performance. Only available on Release Mode" 0)
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -fvisibility=hidden -Wno-strict-aliasing")
+set(XVFB_EXEC "")
+option(USE_XVFB "Uses xvfb-run with the unit tests to avoid QtGui tests popping windows on the screen." FALSE)
+if(USE_XVFB)
+    find_program(XVFB_RUN NAMES xvfb-run)
+    if (NOT ${XVFB_RUN} MATCHES "XVFB_RUN-NOTFOUND")
+        set(XVFB_EXEC ${XVFB_RUN} -a)
+        message(STATUS "Using xvfb-run to perform QtGui tests.")
+    endif()
+endif()
+
+option(BUILD_TESTS "Build tests." TRUE)
+option(ENABLE_VERSION_SUFFIX "Used to use current version in suffix to generated files. This is used to allow multiples versions installed simultaneous." FALSE)
+set(LIB_SUFFIX "" CACHE STRING "Define suffix of directory name (32/64)" )
+set(LIB_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}" CACHE PATH "The subdirectory relative to the install prefix where libraries will be installed (default is /lib${LIB_SUFFIX})" FORCE)
+if(CMAKE_HOST_APPLE)
+    set(ALTERNATIVE_QT_INCLUDE_DIR "" CACHE PATH "The Alternative value to QT_INCLUDE_DIR. Necessary to fix bug on cmake 2.8 MACOS users")
+endif()
+
+if(MSVC)
+    set(CMAKE_CXX_FLAGS "/Zc:wchar_t- /GR /EHsc /DNOCOLOR /DWIN32 /D_WINDOWS /D_SCL_SECURE_NO_WARNINGS")
+else()
+    if(CMAKE_HOST_UNIX AND NOT CYGWIN)
+        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -fvisibility=hidden -Wno-strict-aliasing")
+    endif()
     set(CMAKE_CXX_FLAGS_DEBUG "-g")
+    option(ENABLE_GCC_OPTIMIZATION "Enable specific GCC flags to optimization library size and performance. Only available on Release Mode" 0)
     if(ENABLE_GCC_OPTIMIZATION)
         set(CMAKE_BUILD_TYPE Release)
         set(CMAKE_CXX_FLAGS_RELEASE "-DNDEBUG -Os -Wl,-O1")
@@ -19,36 +47,35 @@ if(CMAKE_HOST_UNIX)
     if(CMAKE_HOST_APPLE)
         if (NOT QT_INCLUDE_DIR)
             set(QT_INCLUDE_DIR "/Library/Frameworks")
-         endif()
+        endif()
+        if(ALTERNATIVE_QT_INCLUDE_DIR)
+            set(QT_INCLUDE_DIR ${ALTERNATIVE_QT_INCLUDE_DIR})
+        endif()
+        string(REPLACE " " ":" QT_INCLUDE_DIR ${QT_INCLUDE_DIR})
     endif()
 endif()
 
 if(NOT CMAKE_BUILD_TYPE)
-    set(CMAKE_BUILD_TYPE Release)
+    set(CMAKE_BUILD_TYPE ${SHIBOKEN_BUILD_TYPE})
 endif()
 
-option(AVOID_PROTECTED_HACK "Avoid protected hack on generated bindings." FALSE)
-if(AVOID_PROTECTED_HACK OR WIN32)
-    add_definitions(-DAVOID_PROTECTED_HACK)
-    message(STATUS "Avoiding protected hack!")
-endif()
-
-find_package(PythonLibs REQUIRED)
-find_package(PythonInterp REQUIRED)
-find_package(Shiboken REQUIRED)
-find_package(Qt4 4.5.0 REQUIRED)
-
 set(BINDING_NAME PySide)
-set(BINDING_API_MAJOR_VERSION "0")
-set(BINDING_API_MINOR_VERSION "3")
-set(BINDING_API_MICRO_VERSION "2")
-set(BINDING_API_VERSION "${BINDING_API_MAJOR_VERSION}.${BINDING_API_MINOR_VERSION}.${BINDING_API_MICRO_VERSION}")
-
-set(LIB_SUFFIX "" CACHE STRING "Define suffix of directory name (32/64)" )
-set(LIB_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}" CACHE PATH "The subdirectory relative to the install prefix where libraries will be installed (default is /lib${LIB_SUFFIX})" FORCE)
-
-if (NOT CMAKE_BUILD_TYPE)
-    set(CMAKE_BUILD_TYPE Release)
+set(BINDING_API_MAJOR_VERSION "1")
+set(BINDING_API_MINOR_VERSION "1")
+set(BINDING_API_MICRO_VERSION "1")
+set(BINDING_API_RELEASE_LEVEL "final") # alpha, beta, rc, or final
+set(BINDING_API_SERIAL 1) # leave as 0 when release level is final
+set(BINDING_API_VERSION "${BINDING_API_MAJOR_VERSION}.${BINDING_API_MINOR_VERSION}.${BINDING_API_MICRO_VERSION}" CACHE STRING "PySide version" FORCE)
+if (BINDING_API_RELEASE_LEVEL STREQUAL "final")
+    set(BINDING_API_VERSION_FULL "${BINDING_API_MAJOR_VERSION}.${BINDING_API_MINOR_VERSION}.${BINDING_API_MICRO_VERSION}"
+        CACHE STRING "PySide version [full]" FORCE)
+else()
+    set(BINDING_API_VERSION_FULL "${BINDING_API_MAJOR_VERSION}.${BINDING_API_MINOR_VERSION}.${BINDING_API_MICRO_VERSION}~${BINDING_API_RELEASE_LEVEL}${BINDING_API_SERIAL}"
+        CACHE STRING "PySide version [full]" FORCE)
+endif()
+set(PYSIDE_QT_VERSION "${QT_VERSION_MAJOR}.${QT_VERSION_MINOR}" CACHE STRING "Qt version used to compile PySide" FORCE)
+if(ENABLE_VERSION_SUFFIX)
+      set(pyside_SUFFIX "-${BINDING_API_MAJOR_VERSION}.${BINDING_API_MINOR_VERSION}")
 endif()
 
 include(${QT_USE_FILE})
@@ -57,43 +84,41 @@ if (${QTVERSION} VERSION_LESS 4.5.0)
 endif()
 
 # Configure OS support
+set(ENABLE_X11 "0")
+set(ENABLE_MAC "0")
+set(ENABLE_WIN "0")
+set(ENABLE_SIMULATOR "0")
 if(Q_WS_X11)
     set(ENABLE_X11 "1")
-    set(ENABLE_MAC "0")
-    set(ENABLE_WIN "0")
     if(Q_WS_MAEMO_5)
-        set(AUTO_OS "MAEMO 5")
+        set(AUTO_OS "maemo")
     else()
-        set(AUTO_OS "X11")
+        set(AUTO_OS "x11")
     endif()
 elseif(Q_WS_MAC)
-    set(ENABLE_X11 "0")
     set(ENABLE_MAC "1")
-    set(ENABLE_WIN "0")
-    set(AUTO_OS "MAC")
+    set(AUTO_OS "mac")
 elseif(Q_WS_WIN)
-    set(ENABLE_X11 "0")
-    set(ENABLE_MAC "0")
     set(ENABLE_WIN "1")
-    set(AUTO_OS "WIN")
+    set(AUTO_OS "win")
+elseif(Q_WS_SIMULATOR)
+    set(ENABLE_SIMULATOR "1")
+    set(AUTO_OS "simulator")
 else()
     message(FATAL_ERROR "OS not supported")
 endif()
 message(STATUS "Detected OS: ${AUTO_OS}")
 
-# Define supported Qt Version
-if(${QT_VERSION_MAJOR} EQUAL 4 AND ${QT_VERSION_MINOR} GREATER 6)
-    set(SUPPORTED_QT_VERSION 4.7)
+if (WIN32)
+    set(PATH_SEP "\;")
 else()
-    set(SUPPORTED_QT_VERSION 4.6)
+    set(PATH_SEP ":")
 endif()
 
+# Define supported Qt Version
+set(SUPPORTED_QT_VERSION "${QT_VERSION_MAJOR}.${QT_VERSION_MINOR}")
+
 set(BINDING_VERSION ${BINDING_API_VERSION}.${QT_VERSION_MAJOR}.${QT_VERSION_MINOR})
-find_program(GENERATOR generatorrunner REQUIRED)
-
-if (NOT GENERATOR)
-    message(FATAL_ERROR "You need to specify GENERATOR variable (-DGENERATOR=value)")
-endif()
 
 # uninstall target
 configure_file("${CMAKE_CURRENT_SOURCE_DIR}/cmake_uninstall.cmake"
@@ -103,7 +128,7 @@ add_custom_target(uninstall "${CMAKE_COMMAND}"
                   -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake")
 
 
-set(ARCHIVE_NAME pyside-qt${QT_VERSION_MAJOR}.${QT_VERSION_MINOR}+${BINDING_API_VERSION})
+set(ARCHIVE_NAME pyside-qt${QT_VERSION_MAJOR}.${QT_VERSION_MINOR}+${BINDING_API_VERSION_FULL})
 add_custom_target(dist
     COMMAND mkdir -p "${CMAKE_BINARY_DIR}/${ARCHIVE_NAME}" &&
             git log > "${CMAKE_BINARY_DIR}/${ARCHIVE_NAME}/ChangeLog" &&
@@ -113,21 +138,42 @@ add_custom_target(dist
             echo "Source package created at ${CMAKE_BINARY_DIR}/${ARCHIVE_NAME}.tar.bz2.\n"
     WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})
 
-execute_process(
-    COMMAND ${PYTHON_EXECUTABLE} -c "from distutils import sysconfig; \\
-        print sysconfig.get_python_lib(1,0,prefix='${CMAKE_INSTALL_PREFIX}')"
-    OUTPUT_VARIABLE SITE_PACKAGE
-    OUTPUT_STRIP_TRAILING_WHITESPACE)
 if (NOT SITE_PACKAGE)
-    message(FATAL_ERROR "Could not detect Python module installation directory.")
+    execute_process(
+        COMMAND ${SHIBOKEN_PYTHON_INTERPRETER} -c "from distutils import sysconfig; \\
+            print(sysconfig.get_python_lib(1,0,prefix='${CMAKE_INSTALL_PREFIX}'))"
+        OUTPUT_VARIABLE SITE_PACKAGE
+        OUTPUT_STRIP_TRAILING_WHITESPACE)
+    if (NOT SITE_PACKAGE)
+        message(FATAL_ERROR "Could not detect Python module installation directory.")
+    elseif (APPLE)
+        message(STATUS "!!! The generated bindings will be installed on ${SITE_PACKAGE}, is it right!?")
+    endif()
 endif()
 
-set(GENERATOR_EXTRA_FLAGS --generatorSet=shiboken --enable-parent-ctor-heuristic --enable-pyside-extensions --enable-return-value-heuristic)
-
-enable_testing()
+set(GENERATOR_EXTRA_FLAGS --generator-set=shiboken --enable-parent-ctor-heuristic --enable-pyside-extensions --enable-return-value-heuristic --use-isnull-as-nb_nonzero)
+if(WIN32 OR DEFINED AVOID_PROTECTED_HACK)
+    message(STATUS "PySide will be generated avoiding the protected hack!")
+    set(GENERATOR_EXTRA_FLAGS ${GENERATOR_EXTRA_FLAGS} --avoid-protected-hack)
+    add_definitions(-DAVOID_PROTECTED_HACK)
+else()
+    message(STATUS "PySide will be generated using the protected hack!")
+endif()
 
 add_subdirectory(libpyside)
+if(QT_QTUITOOLS_FOUND AND QT_QTDESIGNER_FOUND)
+    add_subdirectory(plugins)
+endif()
 # project directories
-add_subdirectory(${BINDING_NAME})
-add_subdirectory(tests)
-add_subdirectory(doc)
+add_subdirectory(PySide)
+if (BUILD_TESTS)
+    enable_testing()
+    add_subdirectory(tests)
+endif ()
+
+find_program(DOT_EXEC dot)
+if (QT_SRC_DIR AND DOT_EXEC)
+    add_subdirectory(doc)
+else ()
+    message(STATUS "QT_SRC_DIR variable not set or graphviz not found, apidoc generation targets disabled.")
+endif()
diff --git a/PySide/CMakeLists.txt b/PySide/CMakeLists.txt
index 3162cbb..d8371c0 100644
--- a/PySide/CMakeLists.txt
+++ b/PySide/CMakeLists.txt
@@ -1,83 +1,13 @@
 project(pyside)
-install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/__init__.py"
-        DESTINATION "${SITE_PACKAGE}/${BINDING_NAME}")
 
-macro(execute_generator module sources typesystem_path)
-add_custom_command(OUTPUT ${${sources}}
-COMMAND ${GENERATOR} ${GENERATOR_EXTRA_FLAGS}
-        ${CMAKE_BINARY_DIR}/PySide/global.h
-        --include-paths=${pyside_SOURCE_DIR}:${QT_INCLUDE_DIR}
-        --typesystem-paths=${pyside_SOURCE_DIR}:${typesystem_path}
-        --output-directory=${CMAKE_CURRENT_BINARY_DIR}
-        --license-file=${CMAKE_CURRENT_SOURCE_DIR}/../licensecomment.txt
-        ${CMAKE_CURRENT_SOURCE_DIR}/typesystem_${module}.xml
-        --api-version=${SUPPORTED_QT_VERSION}
-WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-COMMENT "Running generator for ${module}..."
-)
-endmacro(execute_generator)
+include(PySideModules)
 
 # Configure include based on platform
 configure_file("${CMAKE_CURRENT_SOURCE_DIR}/global.h.in"
-               "${CMAKE_CURRENT_BINARY_DIR}/global.h" @ONLY)
+               "${CMAKE_CURRENT_BINARY_DIR}/pyside_global.h" @ONLY)
 
-
-# Only add subdirectory if the associated Qt module is found.
-macro(HAS_QT_MODULE var name)
-if (DISABLE_${name})
-    message(STATUS "Generation of ${name} disabled.")
-else()
-    if (${var})
-        add_subdirectory(${name})
-        execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink "${CMAKE_CURRENT_BINARY_DIR}/${name}/${name}${CMAKE_DEBUG_POSTFIX}${CMAKE_SHARED_MODULE_SUFFIX}"
-                                                                "${CMAKE_BINARY_DIR}/PySide/${name}${CMAKE_SHARED_MODULE_SUFFIX}")
-    else()
-        message(STATUS "${name} NOT found. ${name} support disabled.")
-    endif()
-endif()
-endmacro(HAS_QT_MODULE)
-
-execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink "${CMAKE_CURRENT_SOURCE_DIR}/__init__.py"
-                                                           "${CMAKE_BINARY_DIR}/PySide/__init__.py")
-# Try to find QtMultimedia
-# TODO: Remove this hack when cmake support QtMultimedia module
-if (NOT QT_QTMULTIMEDIA_FOUND AND ${QTVERSION} VERSION_GREATER 4.5.9)
-    find_path(QT_QTMULTIMEDIA_INCLUDE_DIR QtMultimedia
-            PATHS ${QT_HEADERS_DIR}/QtMultimedia
-                ${QT_LIBRARY_DIR}/QtMultimedia.framework/Headers
-            NO_DEFAULT_PATH)
-    find_library(QT_QTMULTIMEDIA_LIBRARY QtMultimedia PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
-    if (QT_QTMULTIMEDIA_INCLUDE_DIR AND QT_QTMULTIMEDIA_LIBRARY)
-        set(QT_QTMULTIMEDIA_FOUND ON)
-    endif()
-endif ()
-
-# Try to find QtMaemo5 - it has to be done before QtGui to enable some QtMaemo5 flags
-# TODO: Remove this hack when cmake support QtMaemo5 module
-if (NOT QT_QTMAEMO5_FOUND AND ${QTVERSION} VERSION_GREATER 4.5.9)
-    find_path(QT_QTMAEMO5_INCLUDE_DIR QtMaemo5
-            PATHS ${QT_HEADERS_DIR}/QtMaemo5
-                ${QT_LIBRARY_DIR}/QtMaemo5.framework/Headers
-            NO_DEFAULT_PATH)
-    find_library(QT_QTMAEMO5_LIBRARY QtMaemo5 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
-    if (QT_QTMAEMO5_INCLUDE_DIR AND QT_QTMAEMO5_LIBRARY)
-        set(QT_QTMAEMO5_FOUND ON)
-        set(Q_WS_MAEMO_5 ON)
-    endif()
-endif ()
-
-# Try to find QtDeclarative
-# TODO: Remove this hack when cmake support QtDeclarative module
-if (NOT QT_QTDECLARATIVE_FOUND AND ${QTVERSION} VERSION_GREATER 4.6.0)
-    find_path(QT_QTDECLARATIVE_INCLUDE_DIR QtDeclarative
-            PATHS ${QT_HEADERS_DIR}/QtDeclarative
-                ${QT_LIBRARY_DIR}/QtDeclarative.framework/Headers
-            NO_DEFAULT_PATH)
-    find_library(QT_QTDECLARATIVE_LIBRARY QtDeclarative PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
-    if (QT_QTDECLARATIVE_INCLUDE_DIR AND QT_QTDECLARATIVE_LIBRARY)
-        set(QT_QTDECLARATIVE_FOUND ON)
-    endif()
-endif ()
+configure_file("${CMAKE_CURRENT_SOURCE_DIR}/__init__.py.in"
+               "${CMAKE_CURRENT_BINARY_DIR}/__init__.py" @ONLY)
 
 HAS_QT_MODULE(QT_QTCORE_FOUND QtCore)
 HAS_QT_MODULE(QT_QTGUI_FOUND QtGui)
@@ -88,7 +18,9 @@ HAS_QT_MODULE(QT_QTXML_FOUND QtXml)
 HAS_QT_MODULE(QT_QTTEST_FOUND QtTest)
 HAS_QT_MODULE(QT_QTOPENGL_FOUND QtOpenGL)
 HAS_QT_MODULE(QT_QTSQL_FOUND QtSql)
-HAS_QT_MODULE(QT_QTUITOOLS_FOUND QtUiTools)
+if(QT_QTDESIGNER_FOUND)
+    HAS_QT_MODULE(QT_QTUITOOLS_FOUND QtUiTools)
+endif()
 HAS_QT_MODULE(QT_QTHELP_FOUND QtHelp)
 HAS_QT_MODULE(QT_QTXMLPATTERNS_FOUND QtXmlPatterns)
 HAS_QT_MODULE(QT_QTMAEMO5_FOUND QtMaemo5)
@@ -97,3 +29,12 @@ HAS_QT_MODULE(QT_QTSCRIPTTOOLS_FOUND QtScriptTools)
 HAS_QT_MODULE(QT_QTMULTIMEDIA_FOUND QtMultimedia)
 HAS_QT_MODULE(QT_PHONON_FOUND phonon)
 HAS_QT_MODULE(QT_QTDECLARATIVE_FOUND QtDeclarative)
+
+# install
+install(FILES "${CMAKE_CURRENT_BINARY_DIR}/__init__.py"
+        DESTINATION "${SITE_PACKAGE}/${BINDING_NAME}${pyside_SUFFIX}")
+install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/typesystem_templates.xml
+        DESTINATION share/PySide${pyside_SUFFIX}/typesystems)
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/pyside_global.h
+        DESTINATION include/${BINDING_NAME}${pyside_SUFFIX})
+
diff --git a/PySide/QtCore/CMakeLists.txt b/PySide/QtCore/CMakeLists.txt
index 7572519..a2337c0 100644
--- a/PySide/QtCore/CMakeLists.txt
+++ b/PySide/QtCore/CMakeLists.txt
@@ -1,5 +1,7 @@
 project(QtCore)
 
+set(QtCore_gluecode "${CMAKE_CURRENT_SOURCE_DIR}/glue/qeasingcurve_glue.cpp")
+
 if (${QT_VERSION_MAJOR} EQUAL 4 AND ${QT_VERSION_MINOR} LESS 6)
     set (QtCore_46_SRC )
 else()
@@ -34,7 +36,14 @@ else()
     )
 endif()
 
-
+if(ENABLE_WIN)
+    set(SPECIFIC_OS_FILES
+        ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtCore/msg_wrapper.cpp
+        ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtCore/point_wrapper.cpp
+    )
+else()
+    set(SPECIFIC_OS_FILES "")
+endif()
 
 set(QtCore_SRC
 ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtCore/qabstracteventdispatcher_wrapper.cpp
@@ -49,7 +58,6 @@ ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtCore/qbitarray_wrapper.cpp
 ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtCore/qbuffer_wrapper.cpp
 ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtCore/qbytearray_wrapper.cpp
 ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtCore/qbytearraymatcher_wrapper.cpp
-${CMAKE_CURRENT_BINARY_DIR}/PySide/QtCore/qchar_wrapper.cpp
 ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtCore/qchildevent_wrapper.cpp
 ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtCore/qcoreapplication_wrapper.cpp
 ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtCore/qcryptographichash_wrapper.cpp
@@ -61,7 +69,7 @@ ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtCore/qdiriterator_wrapper.cpp
 ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtCore/qdynamicpropertychangeevent_wrapper.cpp
 ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtCore/qevent_wrapper.cpp
 ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtCore/qeventloop_wrapper.cpp
-${CMAKE_CURRENT_BINARY_DIR}/${BINDING_NAME}/QtCore/qfactoryinterface_wrapper.cpp
+${CMAKE_CURRENT_BINARY_DIR}/PySide/QtCore/qfactoryinterface_wrapper.cpp
 ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtCore/qfile_wrapper.cpp
 ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtCore/qfileinfo_wrapper.cpp
 ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtCore/qfilesystemwatcher_wrapper.cpp
@@ -69,8 +77,6 @@ ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtCore/qfsfileengine_wrapper.cpp
 ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtCore/qgenericargument_wrapper.cpp
 ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtCore/qgenericreturnargument_wrapper.cpp
 ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtCore/qiodevice_wrapper.cpp
-${CMAKE_CURRENT_BINARY_DIR}/PySide/QtCore/qlatin1char_wrapper.cpp
-${CMAKE_CURRENT_BINARY_DIR}/PySide/QtCore/qlatin1string_wrapper.cpp
 ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtCore/qlibraryinfo_wrapper.cpp
 ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtCore/qline_wrapper.cpp
 ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtCore/qlinef_wrapper.cpp
@@ -86,6 +92,7 @@ ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtCore/qmutex_wrapper.cpp
 ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtCore/qmutexlocker_wrapper.cpp
 ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtCore/qobject_wrapper.cpp
 ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtCore/qpersistentmodelindex_wrapper.cpp
+${CMAKE_CURRENT_BINARY_DIR}/PySide/QtCore/qpluginloader_wrapper.cpp
 ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtCore/qpoint_wrapper.cpp
 ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtCore/qpointf_wrapper.cpp
 ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtCore/qprocess_wrapper.cpp
@@ -95,16 +102,13 @@ ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtCore/qrect_wrapper.cpp
 ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtCore/qrectf_wrapper.cpp
 ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtCore/qregexp_wrapper.cpp
 ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtCore/qresource_wrapper.cpp
+${CMAKE_CURRENT_BINARY_DIR}/PySide/QtCore/qrunnable_wrapper.cpp
 ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtCore/qsemaphore_wrapper.cpp
 ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtCore/qsettings_wrapper.cpp
 ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtCore/qsignalmapper_wrapper.cpp
 ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtCore/qsize_wrapper.cpp
 ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtCore/qsizef_wrapper.cpp
 ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtCore/qsocketnotifier_wrapper.cpp
-${CMAKE_CURRENT_BINARY_DIR}/PySide/QtCore/qstring_wrapper.cpp
-${CMAKE_CURRENT_BINARY_DIR}/PySide/QtCore/qstringlist_wrapper.cpp
-${CMAKE_CURRENT_BINARY_DIR}/PySide/QtCore/qstringmatcher_wrapper.cpp
-${CMAKE_CURRENT_BINARY_DIR}/PySide/QtCore/qstringref_wrapper.cpp
 ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtCore/qsysinfo_wrapper.cpp
 ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtCore/qsystemlocale_wrapper.cpp
 ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtCore/qsystemsemaphore_wrapper.cpp
@@ -120,6 +124,7 @@ ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtCore/qtextencoder_wrapper.cpp
 ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtCore/qtextstream_wrapper.cpp
 ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtCore/qtextstreammanipulator_wrapper.cpp
 ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtCore/qthread_wrapper.cpp
+${CMAKE_CURRENT_BINARY_DIR}/PySide/QtCore/qthreadpool_wrapper.cpp
 ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtCore/qtime_wrapper.cpp
 ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtCore/qtimeline_wrapper.cpp
 ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtCore/qtimer_wrapper.cpp
@@ -127,7 +132,6 @@ ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtCore/qtimerevent_wrapper.cpp
 ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtCore/qtranslator_wrapper.cpp
 ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtCore/qurl_wrapper.cpp
 ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtCore/quuid_wrapper.cpp
-${CMAKE_CURRENT_BINARY_DIR}/PySide/QtCore/qvariant_wrapper.cpp
 ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtCore/qwaitcondition_wrapper.cpp
 ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtCore/qwritelocker_wrapper.cpp
 ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtCore/qxmlstreamattribute_wrapper.cpp
@@ -140,28 +144,30 @@ ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtCore/qxmlstreamreader_wrapper.cpp
 ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtCore/qxmlstreamwriter_wrapper.cpp
 ${QtCore_46_SRC}
 ${QtCore_47_SRC}
+${SPECIFIC_OS_FILES}
 )
 
-execute_generator(core QtCore_SRC "${CMAKE_CURRENT_BINARY_DIR}")
+configure_file("${CMAKE_CURRENT_SOURCE_DIR}/typesystem_core.xml.in"
+               "${CMAKE_CURRENT_BINARY_DIR}/typesystem_core.xml" @ONLY)
 
-include_directories(${CMAKE_CURRENT_SOURCE_DIR}
-                    ${CMAKE_CURRENT_BINARY_DIR}/${BINDING_NAME}/QtCore/
-                    ${QT_INCLUDE_DIR}
-                    ${SHIBOKEN_INCLUDE_DIR}
-                    ${libpyside_SOURCE_DIR}
-                    ${PYTHON_INCLUDE_PATH}
-                    )
-add_library(QtCore MODULE ${QtCore_SRC})
-set_property(TARGET QtCore PROPERTY PREFIX "")
-target_link_libraries(QtCore
-                      pyside
-                      ${PYTHON_LIBRARIES}
+set(QtCore_typesystem_path "${QtCore_SOURCE_DIR}")
+
+set(QtCore_include_dirs ${CMAKE_CURRENT_SOURCE_DIR}
+                        ${CMAKE_CURRENT_BINARY_DIR}/${BINDING_NAME}/QtCore/
+                        ${QT_INCLUDE_DIR}
+                        ${SHIBOKEN_INCLUDE_DIR}
+                        ${libpyside_SOURCE_DIR}
+                        ${SHIBOKEN_PYTHON_INCLUDE_DIR})
+set(QtCore_libraries  pyside
+                      ${SHIBOKEN_PYTHON_LIBRARIES}
                       ${SHIBOKEN_LIBRARY}
-                      ${QT_QTCORE_LIBRARY}
-                      )
+                      ${QT_QTCORE_LIBRARY})
 
-# install
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/QtCore${CMAKE_DEBUG_POSTFIX}.so
-        DESTINATION ${SITE_PACKAGE}/${BINDING_NAME})
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtCore/pyside_qtcore_python.h
-        DESTINATION include/PySide/QtCore/)
+create_pyside_module(QtCore
+                     QtCore_include_dirs
+                     QtCore_libraries
+                     ""
+                     QtCore_typesystem_path
+                     QtCore_SRC
+                     QtCore_gluecode
+                     ${CMAKE_CURRENT_BINARY_DIR}/typesystem_core.xml)
diff --git a/PySide/QtCore/glue/qbytearray_bufferprotocol.cpp b/PySide/QtCore/glue/qbytearray_bufferprotocol.cpp
index 4fd1587..acc7bb9 100644
--- a/PySide/QtCore/glue/qbytearray_bufferprotocol.cpp
+++ b/PySide/QtCore/glue/qbytearray_bufferprotocol.cpp
@@ -15,10 +15,10 @@ static Py_ssize_t SbkQByteArray_segcountproc(PyObject* self, Py_ssize_t* lenp)
 
 static Py_ssize_t SbkQByteArray_readbufferproc(PyObject* self, Py_ssize_t segment, void** ptrptr)
 {
-    if (segment || Shiboken::cppObjectIsInvalid(self))
+    if (segment || !Shiboken::Object::isValid(self))
         return -1;
 
-    QByteArray* cppSelf = Converter<QByteArray*>::toCpp(self);
+    QByteArray* cppSelf = %CONVERTTOCPP[QByteArray*](self);
     *ptrptr = reinterpret_cast<void*>(cppSelf->data());
     return cppSelf->size();
 }
diff --git a/PySide/QtCore/glue/qcoreapplication_init.cpp b/PySide/QtCore/glue/qcoreapplication_init.cpp
index f53db03..c92f03e 100644
--- a/PySide/QtCore/glue/qcoreapplication_init.cpp
+++ b/PySide/QtCore/glue/qcoreapplication_init.cpp
@@ -2,43 +2,23 @@
 static int QCoreApplicationArgCount;
 static char** QCoreApplicationArgValues;
 
-/**
- * Called at QtCore module exit
- */
-void DeleteQCoreApplicationAtExit() {
-    if (QCoreApplication::instance()) {
-        delete QCoreApplication::instance();
-        for (int i = 0; i < QCoreApplicationArgCount; ++i)
-            delete[] QCoreApplicationArgValues[i];
-    }
-}
-
-int SbkQCoreApplication_Init(PyObject* self, PyObject* args, PyObject*)
+void QCoreApplication_constructor(PyObject* self, PyObject* args, QCoreApplicationWrapper** cptr)
 {
     if (QCoreApplication::instance()) {
         PyErr_SetString(PyExc_RuntimeError, "A QCoreApplication instance already exists.");
-        return -1;
+        return;
     }
 
     int numArgs = PyTuple_GET_SIZE(args);
-    if (numArgs != 1) {
+    if (numArgs != 1
+        || !Shiboken::sequenceToArgcArgv(PyTuple_GET_ITEM(args, 0), &QCoreApplicationArgCount, &QCoreApplicationArgValues, "PySideApp")) {
         PyErr_BadArgument();
-        return -1;
+        return;
     }
 
-    if (!PySequenceToArgcArgv(PyTuple_GET_ITEM(args, 0), &QCoreApplicationArgCount, &QCoreApplicationArgValues, "PySideApp")) {
-        PyErr_BadArgument();
-        return -1;
-    }
-
-    void* cptr = new QCoreApplication(QCoreApplicationArgCount, QCoreApplicationArgValues);
-    Shiboken::setCppPointer(reinterpret_cast<SbkBaseWrapper*>(self),
-                            Shiboken::SbkType<QCoreApplication>(),
-                            cptr);
-    SbkBaseWrapper_setValidCppObject(self, 1);
-    Shiboken::BindingManager::instance().registerWrapper(reinterpret_cast<SbkBaseWrapper*>(self), cptr);
+    *cptr = new QCoreApplicationWrapper(QCoreApplicationArgCount, QCoreApplicationArgValues);
 
+    Shiboken::Object::releaseOwnership(reinterpret_cast<SbkObject*>(self));
+    PySide::registerCleanupFunction(&PySide::destroyQCoreApplication);
     Py_INCREF(self);
-    Py_AtExit(DeleteQCoreApplicationAtExit);
-    return 1;
 }
diff --git a/PySide/QtCore/glue/qeasingcurve_glue.cpp b/PySide/QtCore/glue/qeasingcurve_glue.cpp
new file mode 100644
index 0000000..7f56315
--- /dev/null
+++ b/PySide/QtCore/glue/qeasingcurve_glue.cpp
@@ -0,0 +1,120 @@
+#include <Python.h>
+#include <shiboken.h>
+#include <pysideweakref.h>
+#include <QEasingCurve>
+
+#include "glue/qeasingcurve_glue.h"
+
+#define __ECF_ATT_NAME__        "__ecf__"
+#define MAX_CUSTOM_FUNCTIONS    10
+
+static void deleteData(void* data);
+
+struct CustomFunctionsData
+{
+    static CustomFunctionsData m_list[MAX_CUSTOM_FUNCTIONS];
+
+    PySideEasingCurveFunctor* m_obj;
+    QEasingCurve::EasingFunction m_func;
+};
+
+CustomFunctionsData CustomFunctionsData::m_list[MAX_CUSTOM_FUNCTIONS];
+
+template<int N>
+struct CustomFunctions
+{
+    static void init()
+    {
+        CustomFunctionsData data;
+        data.m_obj = 0;
+        data.m_func = &CustomFunctions<N>::callback;
+        CustomFunctionsData::m_list[N] = data;
+
+        CustomFunctions<N-1>::init();
+    }
+
+    static qreal callback(qreal v)
+    {
+        return (*CustomFunctionsData::m_list[N].m_obj)(v);
+    }
+};
+
+template<>
+struct CustomFunctions<0>
+{
+    static void init()
+    {
+        CustomFunctionsData data;
+        data.m_obj = 0;
+        data.m_func = &CustomFunctions<0>::callback;
+        CustomFunctionsData::m_list[0] = data;
+    }
+
+    static qreal callback(qreal v)
+    {
+        return (*CustomFunctionsData::m_list[0].m_obj)(v);
+    }
+};
+
+void deleteData(void* data)
+{
+    delete (PySideEasingCurveFunctor*)(data);
+}
+
+void PySideEasingCurveFunctor::init()
+{
+    CustomFunctions<MAX_CUSTOM_FUNCTIONS-1>::init();
+}
+
+QEasingCurve::EasingFunction PySideEasingCurveFunctor::createCustomFuntion(PyObject* parent, PyObject* pyFunc)
+{
+    for(int i=0; i < MAX_CUSTOM_FUNCTIONS; i++) {
+        CustomFunctionsData& data = CustomFunctionsData::m_list[i];
+        if (data.m_obj == 0) {
+            data.m_obj = new PySideEasingCurveFunctor(i, parent, pyFunc);
+            return data.m_func;
+        }
+    }
+    //PyErr_Format(PyExc_RuntimeError, "PySide only supports %d custom functions simultaneously.", MAX_CUSTOM_FUNCTIONS);
+    return 0;
+}
+
+PySideEasingCurveFunctor::~PySideEasingCurveFunctor()
+{
+
+    CustomFunctionsData::m_list[m_index].m_obj = 0;
+    PyObject_SetAttrString(m_parent, __ECF_ATT_NAME__, Py_None);
+}
+
+qreal PySideEasingCurveFunctor::operator()(qreal progress)
+{
+    Shiboken::GilState state;
+    PyObject* args = Py_BuildValue("(f)", progress);
+    PyObject* result = PyObject_CallObject(m_func, args);
+    qreal cppResult = 0.0;
+    if (result) {
+        Shiboken::Conversions::pythonToCppCopy(Shiboken::Conversions::PrimitiveTypeConverter<qreal>(), result, &cppResult);
+        Py_DECREF(result);
+    }
+    Py_DECREF(args);
+    return cppResult;
+}
+
+PyObject* PySideEasingCurveFunctor::callable()
+{
+    Py_INCREF(m_func);
+    return m_func;
+}
+
+PyObject* PySideEasingCurveFunctor::callable(PyObject* parent)
+{
+    return PyObject_GetAttrString(parent, __ECF_ATT_NAME__);
+}
+
+PySideEasingCurveFunctor::PySideEasingCurveFunctor(int index, PyObject* parent, PyObject* pyFunc)
+    : m_parent(parent), m_func(pyFunc), m_index(index)
+{
+    PyObject_SetAttrString(m_parent, __ECF_ATT_NAME__, m_func);
+    PySide::WeakRef::create(m_parent, deleteData, this);
+}
+
diff --git a/PySide/QtCore/glue/qeasingcurve_glue.h b/PySide/QtCore/glue/qeasingcurve_glue.h
new file mode 100644
index 0000000..282e439
--- /dev/null
+++ b/PySide/QtCore/glue/qeasingcurve_glue.h
@@ -0,0 +1,27 @@
+#ifndef __QEASINGCURVE_GLUE__
+#define __QEASINGCURVE_GLUE__ 
+
+#include <Python.h>
+#include <QEasingCurve>
+
+class PySideEasingCurveFunctor
+{
+    public:
+        static void init();
+        static QEasingCurve::EasingFunction createCustomFuntion(PyObject* parent, PyObject* pyFunc);
+
+        qreal operator()(qreal progress);
+
+        PyObject* callable(); //Return New reference 
+        static PyObject* callable(PyObject* parent); //Return New reference 
+
+        ~PySideEasingCurveFunctor();
+    private:
+        PyObject* m_parent;
+        PyObject* m_func;
+        int m_index;
+
+        PySideEasingCurveFunctor(int index, PyObject* parent, PyObject *pyFunc);
+};
+
+#endif
diff --git a/PySide/QtCore/glue/qobject_connect.cpp b/PySide/QtCore/glue/qobject_connect.cpp
index 5b6f254..96bcfb2 100644
--- a/PySide/QtCore/glue/qobject_connect.cpp
+++ b/PySide/QtCore/glue/qobject_connect.cpp
@@ -1,23 +1,46 @@
-static bool getReceiver(PyObject *callback, QObject **receiver, PyObject **self)
+static bool isDecorator(PyObject* method, PyObject* self)
 {
+    Shiboken::AutoDecRef methodName(PyObject_GetAttrString(method, "__name__"));
+    if (!PyObject_HasAttr(self, methodName))
+        return true;
+    Shiboken::AutoDecRef otherMethod(PyObject_GetAttr(self, methodName));
+    return reinterpret_cast<PyMethodObject*>(otherMethod.object())->im_func != \
+           reinterpret_cast<PyMethodObject*>(method)->im_func;
+}
+
+static bool getReceiver(QObject *source, const char* signal, PyObject* callback, QObject** receiver, PyObject** self, QByteArray* callbackSig)
+{
+    bool forceGlobalReceiver = false;
     if (PyMethod_Check(callback)) {
         *self = PyMethod_GET_SELF(callback);
-        if (SbkQObject_Check(*self))
-            *receiver = Converter<QObject*>::toCpp(*self);
+        if (%CHECKTYPE[QObject*](*self))
+            *receiver = %CONVERTTOCPP[QObject*](*self);
+        forceGlobalReceiver = isDecorator(callback, *self);
     } else if (PyCFunction_Check(callback)) {
         *self = PyCFunction_GET_SELF(callback);
-        if (*self && SbkQObject_Check(*self))
-            *receiver = Converter<QObject*>::toCpp(*self);
+        if (*self && %CHECKTYPE[QObject*](*self))
+            *receiver = %CONVERTTOCPP[QObject*](*self);
     } else if (PyCallable_Check(callback)) {
         // Ok, just a callable object
         *receiver = 0;
         *self = 0;
     }
 
-    bool usingGlobalReceiver = !*receiver;
+    bool usingGlobalReceiver = !*receiver || forceGlobalReceiver;
+
+    // Check if this callback is a overwrite of a non-virtual Qt slot.
+    if (!usingGlobalReceiver && receiver && self) {
+        *callbackSig = PySide::Signal::getCallbackSignature(signal, *receiver, callback, usingGlobalReceiver).toAscii();
+        const QMetaObject* metaObject = (*receiver)->metaObject();
+        int slotIndex = metaObject->indexOfSlot(callbackSig->constData());
+        if (slotIndex != -1 && slotIndex < metaObject->methodOffset() && PyMethod_Check(callback))
+            usingGlobalReceiver = true;
+    }
+
     if (usingGlobalReceiver) {
         PySide::SignalManager& signalManager = PySide::SignalManager::instance();
-        *receiver = signalManager.globalReceiver();
+        *receiver = signalManager.globalReceiver(source, callback);
+        *callbackSig = PySide::Signal::getCallbackSignature(signal, *receiver, callback, usingGlobalReceiver).toAscii();
     }
 
     return usingGlobalReceiver;
@@ -25,13 +48,17 @@ static bool getReceiver(PyObject *callback, QObject **receiver, PyObject **self)
 
 static bool qobjectConnect(QObject* source, const char* signal, QObject* receiver, const char* slot, Qt::ConnectionType type)
 {
-    if (!PySide::checkSignal(signal))
+    if (!signal || !slot)
+        return false;
+
+    if (!PySide::Signal::checkQtSignal(signal))
         return false;
     signal++;
 
-    PySide::SignalManager::registerMetaMethod(source, signal, QMetaMethod::Signal);
+    if (!PySide::SignalManager::registerMetaMethod(source, signal, QMetaMethod::Signal))
+        return false;
 
-    bool isSignal = PySide::isSignal(slot);
+    bool isSignal = PySide::Signal::isQtSignal(slot);
     slot++;
     PySide::SignalManager::registerMetaMethod(receiver, slot, isSignal ? QMetaMethod::Signal : QMetaMethod::Slot);
     return QObject::connect(source, signal - 1, receiver, slot - 1, type);
@@ -39,58 +66,73 @@ static bool qobjectConnect(QObject* source, const char* signal, QObject* receive
 
 static bool qobjectConnectCallback(QObject* source, const char* signal, PyObject* callback, Qt::ConnectionType type)
 {
-    if (!PySide::checkSignal(signal))
+    if (!signal || !PySide::Signal::checkQtSignal(signal))
         return false;
     signal++;
 
-    PySide::SignalManager::registerMetaMethod(source, signal, QMetaMethod::Signal);
-    int signalIndex = source->metaObject()->indexOfMethod(signal);
+    int signalIndex = PySide::SignalManager::registerMetaMethodGetIndex(source, signal, QMetaMethod::Signal);
+    if (signalIndex == -1)
+        return false;
 
     PySide::SignalManager& signalManager = PySide::SignalManager::instance();
 
     // Extract receiver from callback
     QObject* receiver = 0;
     PyObject* self = 0;
-    bool usingGlobalReceiver = getReceiver(callback, &receiver, &self);
+    QByteArray callbackSig;
+    bool usingGlobalReceiver = getReceiver(source, signal, callback, &receiver, &self, &callbackSig);
     if (receiver == 0 && self == 0)
         return false;
 
     const QMetaObject* metaObject = receiver->metaObject();
-    const QByteArray callbackSig = PySide::getCallbackSignature(signal, callback, usingGlobalReceiver).toAscii();
     const char* slot = callbackSig.constData();
     int slotIndex = metaObject->indexOfSlot(slot);
+
     if (slotIndex == -1) {
-        if (!usingGlobalReceiver && self && !((SbkBaseWrapper*)self)->containsCppWrapper) {
+        if (!usingGlobalReceiver && self && !Shiboken::Object::hasCppWrapper((SbkObject*)self)) {
             qWarning() << "You can't add dynamic slots on an object originated from C++.";
+            if (usingGlobalReceiver)
+                signalManager.releaseGlobalReceiver(source, receiver);
+
             return false;
         }
-        if (usingGlobalReceiver) {
-            signalManager.addGlobalSlot(slot, callback);
-        } else {
-            PySide::SignalManager::registerMetaMethod(receiver, slot, QMetaMethod::Slot);
+
+        if (usingGlobalReceiver)
+            slotIndex = signalManager.globalReceiverSlotIndex(receiver, slot);
+        else
+            slotIndex = PySide::SignalManager::registerMetaMethodGetIndex(receiver, slot, QMetaMethod::Slot);
+
+        if (slotIndex == -1) {
+            if (usingGlobalReceiver)
+                signalManager.releaseGlobalReceiver(source, receiver);
+
+            return false;
         }
-        slotIndex = metaObject->indexOfSlot(slot);
     }
     if (QMetaObject::connect(source, signalIndex, receiver, slotIndex, type)) {
+        if (usingGlobalReceiver)
+            signalManager.notifyGlobalReceiver(receiver);
         #ifndef AVOID_PROTECTED_HACK
-            source->connectNotify(signal);
+            source->connectNotify(signal - 1);
         #else
             // Need to cast to QObjectWrapper* and call the public version of
             // connectNotify when avoiding the protected hack.
-            reinterpret_cast<QObjectWrapper*>(source)->connectNotify(signal);
+            reinterpret_cast<QObjectWrapper*>(source)->connectNotify(signal - 1);
         #endif
-        if (usingGlobalReceiver)
-            signalManager.globalReceiverConnectNotify(source, slotIndex);
 
         return true;
     }
+
+    if (usingGlobalReceiver)
+        signalManager.releaseGlobalReceiver(source, receiver);
+
     return false;
 }
 
 
 static bool qobjectDisconnectCallback(QObject* source, const char* signal, PyObject* callback)
 {
-    if (!PySide::checkSignal(signal))
+    if (!PySide::Signal::checkQtSignal(signal))
         return false;
 
     PySide::SignalManager& signalManager = PySide::SignalManager::instance();
@@ -98,20 +140,28 @@ static bool qobjectDisconnectCallback(QObject* source, const char* signal, PyObj
     // Extract receiver from callback
     QObject* receiver = 0;
     PyObject* self = 0;
-    bool usingGlobalReceiver = getReceiver(callback, &receiver, &self);
+    QByteArray callbackSig;
+    bool usingGlobalReceiver = getReceiver(NULL, signal, callback, &receiver, &self, &callbackSig);
     if (receiver == 0 && self == 0)
         return false;
 
     const QMetaObject* metaObject = receiver->metaObject();
-    const QByteArray callbackSig = PySide::getCallbackSignature(signal, callback, usingGlobalReceiver).toAscii();
-    QByteArray qtSlotName(callbackSig);
-    qtSlotName = qtSlotName.prepend('1');
+    int signalIndex = source->metaObject()->indexOfSignal(++signal);
+    int slotIndex = -1;
 
-    if (QObject::disconnect(source, signal, receiver, qtSlotName.constData())) {
-        if (usingGlobalReceiver) {
-            int slotIndex = metaObject->indexOfSlot(callbackSig.constData());
-            signalManager.globalReceiverDisconnectNotify(source, slotIndex);
-        }
+    slotIndex = metaObject->indexOfSlot(callbackSig);
+
+    if (QMetaObject::disconnectOne(source, signalIndex, receiver, slotIndex)) {
+        if (usingGlobalReceiver)
+            signalManager.releaseGlobalReceiver(source, receiver);
+
+        #ifndef AVOID_PROTECTED_HACK
+            source->disconnectNotify(callbackSig);
+        #else
+            // Need to cast to QObjectWrapper* and call the public version of
+            // connectNotify when avoiding the protected hack.
+            reinterpret_cast<QObjectWrapper*>(source)->disconnectNotify(callbackSig);
+        #endif
         return true;
     }
     return false;
diff --git a/PySide/QtCore/glue/qobject_findchild.cpp b/PySide/QtCore/glue/qobject_findchild.cpp
index 351aa69..669beac 100644
--- a/PySide/QtCore/glue/qobject_findchild.cpp
+++ b/PySide/QtCore/glue/qobject_findchild.cpp
@@ -17,14 +17,23 @@ static QObject* _findChildHelper(const QObject* parent, const QString& name, PyT
     return 0;
 }
 
-static void _findChildrenHelper(const QObject* parent, const QString& name, PyTypeObject* desiredType, PyObject* result)
+static inline bool _findChildrenComparator(const QObject*& child, const QRegExp& name)
 {
-    foreach(QObject* child, parent->children()) {
+    return name.indexIn(child->objectName()) != -1;
+}
+
+static inline bool _findChildrenComparator(const QObject*& child, const QString& name)
+{
+    return name.isNull() || name == child->objectName();
+}
+
+template<typename T>
+static void _findChildrenHelper(const QObject* parent, const T& name, PyTypeObject* desiredType, PyObject* result)
+{
+    foreach(const QObject* child, parent->children()) {
         Shiboken::AutoDecRef pyChild(%CONVERTTOPYTHON[QObject*](child));
-        if (PyType_IsSubtype(pyChild->ob_type, desiredType)
-            && (name.isNull() || name == child->objectName())) {
+        if (PyType_IsSubtype(pyChild->ob_type, desiredType) && _findChildrenComparator(child, name))
             PyList_Append(result, pyChild);
-        }
         _findChildrenHelper(child, name, desiredType, result);
     }
-}
\ No newline at end of file
+}
diff --git a/PySide/QtCore/glue/qstring_bufferprotocol.cpp b/PySide/QtCore/glue/qstring_bufferprotocol.cpp
deleted file mode 100644
index 02ca32c..0000000
--- a/PySide/QtCore/glue/qstring_bufferprotocol.cpp
+++ /dev/null
@@ -1,43 +0,0 @@
-
-#if PY_VERSION_HEX < 0x03000000
-
-// QByteArray buffer protocol functions
-// see: http://www.python.org/dev/peps/pep-3118/
-
-extern "C" {
-
-static Py_ssize_t SbkQString_segcountproc(PyObject* self, Py_ssize_t* lenp)
-{
-    if (lenp)
-        *lenp = self->ob_type->tp_as_sequence->sq_length(self);
-    return 1;
-}
-
-static Py_ssize_t SbkQString_readbufferproc(PyObject* self, Py_ssize_t segment, char** ptrptr)
-{
-    if (segment || Shiboken::cppObjectIsInvalid(self))
-        return -1;
-
-    QString* cppSelf = Converter<QString*>::toCpp(self);
-    QByteArray decodedData = cppSelf->toLocal8Bit();
-    Shiboken::AutoDecRef decodedString(PyString_FromStringAndSize(decodedData.constData(), decodedData.size()));
-
-    // delete __encodedStr attr if it exists
-    Shiboken::AutoDecRef attrName(PyString_FromStringAndSize("__encodedStr", sizeof("__encodedStr")-1));
-    if (PyObject_HasAttr(self, attrName))
-        PyObject_DelAttr(self, attrName);
-    PyObject_SetAttr(self, attrName, decodedString);
-    *ptrptr = PyString_AS_STRING(decodedString.object());
-    return decodedData.size();
-}
-
-PyBufferProcs SbkQStringBufferProc = {
-    /*bf_getreadbuffer*/  0,
-    /*bf_getwritebuffer*/ 0,
-    /*bf_getsegcount*/    &SbkQString_segcountproc,
-    /*bf_getcharbuffer*/  &SbkQString_readbufferproc
-};
-
-}
-
-#endif
diff --git a/PySide/QtCore/glue/qstring_hashfunc.cpp b/PySide/QtCore/glue/qstring_hashfunc.cpp
deleted file mode 100644
index b2fb6a1..0000000
--- a/PySide/QtCore/glue/qstring_hashfunc.cpp
+++ /dev/null
@@ -1,6 +0,0 @@
-static long QStringCustomHashFunction(const QString& str)
-{
-    QByteArray data = str.toUtf8();
-    Shiboken::AutoDecRef unicodeObj(PyUnicode_DecodeUTF8(data.constData(), data.length(), 0));
-    return unicodeObj->ob_type->tp_hash(unicodeObj);
-}
diff --git a/PySide/QtCore/qbool_conversions.h b/PySide/QtCore/qbool_conversions.h
deleted file mode 100644
index f4fb43f..0000000
--- a/PySide/QtCore/qbool_conversions.h
+++ /dev/null
@@ -1,16 +0,0 @@
-namespace Shiboken {
-template <>
-struct Converter<QBool> : public ValueTypeConverter<QBool>
-{
-    using ValueTypeConverter<QBool>::toPython;
-
-    static PyObject* toPython(const QBool& cppobj)
-    {
-        return PyBool_FromLong((bool) cppobj);
-    }
-    static QBool toCpp(PyObject* pyobj)
-    {
-        return QBool(pyobj == Py_True);
-    }
-};
-}
diff --git a/PySide/QtCore/qchar_conversions.h b/PySide/QtCore/qchar_conversions.h
deleted file mode 100644
index 6347c93..0000000
--- a/PySide/QtCore/qchar_conversions.h
+++ /dev/null
@@ -1,30 +0,0 @@
-namespace Shiboken {
-inline bool Shiboken::Converter<QChar >::isConvertible(PyObject* pyObj)
-{
-    return PyObject_TypeCheck(pyObj, SbkType<QChar>())
-         || SbkPySide_QtCore_QChar_SpecialCharacter_Check(pyObj)
-         || SbkQLatin1Char_Check(pyObj)
-         || (PyString_Check(pyObj) && (PyString_Size(pyObj) == 1))
-         || PyInt_Check(pyObj);
-}
-
-inline QChar Shiboken::Converter<QChar >::toCpp(PyObject* pyObj)
-{
-    if (!Shiboken_TypeCheck(pyObj, QChar)) {
-        if (SbkPySide_QtCore_QChar_SpecialCharacter_Check(pyObj))
-            return QChar(Shiboken::Converter<QChar::SpecialCharacter >::toCpp(pyObj));
-        else if (SbkQLatin1Char_Check(pyObj))
-            return QChar(Shiboken::Converter<QLatin1Char >::toCpp(pyObj));
-        else if (PyString_Check(pyObj) && PyString_Size(pyObj) == 1)
-            return QChar(Shiboken::Converter<char >::toCpp(pyObj));
-        else if (PyInt_Check(pyObj))
-            return QChar(Shiboken::Converter<int >::toCpp(pyObj));
-    }
-    return *Converter<QChar*>::toCpp(pyObj);
-}
-
-inline PyObject* Converter<QChar>::toPython(const QChar& cppObj)
-{
-    return ValueTypeConverter<QChar>::toPython(cppObj);
-}
-}
diff --git a/PySide/QtCore/qhash_conversions.h b/PySide/QtCore/qhash_conversions.h
deleted file mode 100644
index f9e2e42..0000000
--- a/PySide/QtCore/qhash_conversions.h
+++ /dev/null
@@ -1,4 +0,0 @@
-namespace Shiboken {
-template<typename KT, typename VT>
-struct Converter<QHash<KT, VT> > : QtDictConverter<QHash<KT, VT> > {};
-}
diff --git a/PySide/QtCore/qlist_conversions.h b/PySide/QtCore/qlist_conversions.h
deleted file mode 100644
index cb1d26b..0000000
--- a/PySide/QtCore/qlist_conversions.h
+++ /dev/null
@@ -1,4 +0,0 @@
-namespace Shiboken {
-template<typename T>
-struct Converter<QList<T> > : StdListConverter<QList<T> > {};
-}
diff --git a/PySide/QtCore/qmap_conversions.h b/PySide/QtCore/qmap_conversions.h
deleted file mode 100644
index 3153fae..0000000
--- a/PySide/QtCore/qmap_conversions.h
+++ /dev/null
@@ -1,5 +0,0 @@
-namespace Shiboken {
-template<typename KT, typename VT>
-struct Converter<QMap<KT, VT> > : QtDictConverter<QMap<KT, VT> > {
-};
-}
diff --git a/PySide/QtCore/qmultimap_conversions.h b/PySide/QtCore/qmultimap_conversions.h
deleted file mode 100644
index 43abd84..0000000
--- a/PySide/QtCore/qmultimap_conversions.h
+++ /dev/null
@@ -1,5 +0,0 @@
-namespace Shiboken {
-template<typename KT, typename VT>
-struct Converter<QMultiMap<KT, VT> > : QtMultiMapConverter<QMap<KT, VT> > {
-};
-}
diff --git a/PySide/QtCore/qpair_conversions.h b/PySide/QtCore/qpair_conversions.h
deleted file mode 100644
index 99e9cd8..0000000
--- a/PySide/QtCore/qpair_conversions.h
+++ /dev/null
@@ -1,4 +0,0 @@
-namespace Shiboken {
-template<typename FT, typename ST>
-struct Converter<QPair<FT, ST> > : StdPairConverter<QPair<FT, ST> > {};
-}
diff --git a/PySide/QtCore/qset_conversions.h b/PySide/QtCore/qset_conversions.h
deleted file mode 100644
index c46fef0..0000000
--- a/PySide/QtCore/qset_conversions.h
+++ /dev/null
@@ -1,4 +0,0 @@
-namespace Shiboken {
-template<typename T>
-struct Converter<QSet<T> > : QSequenceConverter<QSet<T> > {};
-}
diff --git a/PySide/QtCore/qstring_conversions.h b/PySide/QtCore/qstring_conversions.h
deleted file mode 100644
index 2c59928..0000000
--- a/PySide/QtCore/qstring_conversions.h
+++ /dev/null
@@ -1,72 +0,0 @@
-namespace Shiboken {
-inline bool Converter<QString>::isConvertible(PyObject* pyObj)
-{
-    SbkBaseWrapperType* shiboType = reinterpret_cast<SbkBaseWrapperType*>(SbkType<QString>());
-    return PyString_Check(pyObj)
-            || PyObject_TypeCheck(pyObj, SbkType<QString>())
-            || PyUnicode_Check(pyObj)
-            || SbkQByteArray_Check(pyObj)
-            || SbkQLatin1String_Check(pyObj)
-            || pyObj == Py_None
-#if PY_VERSION_HEX < 0x03000000
-            || (pyObj->ob_type->tp_as_buffer
-               && PyType_HasFeature(pyObj->ob_type, Py_TPFLAGS_HAVE_GETCHARBUFFER)
-               && pyObj->ob_type->tp_as_buffer->bf_getcharbuffer)
-#endif
-            || SbkQChar_Check(pyObj)
-            || (shiboType->ext_isconvertible && shiboType->ext_isconvertible(pyObj));
-}
-
-inline QString Converter<QString>::toCpp(PyObject* pyObj)
-{
-    SbkBaseWrapperType* shiboType = reinterpret_cast<SbkBaseWrapperType*>(SbkType<QString>());
-    if (SbkQChar_Check(pyObj)) {
-        return QString(Converter< QChar >::toCpp(pyObj));
-    } else if (SbkQByteArray_Check(pyObj)) {
-        return QString(Converter< QByteArray >::toCpp(pyObj));
-    } else if (SbkQLatin1String_Check(pyObj)) {
-        return QString(Converter< QLatin1String >::toCpp(pyObj));
-    } else if (PyUnicode_Check(pyObj)) {
-        Py_UNICODE* unicode = PyUnicode_AS_UNICODE(pyObj);
-#if defined(Py_UNICODE_WIDE)
-        // cast as Py_UNICODE can be a different type
-        return QString::fromUcs4(reinterpret_cast<const uint*>(unicode));
-#else
-        return QString::fromUtf16(unicode, PyUnicode_GET_SIZE(pyObj));
-#endif
-    } else if (PyString_Check(pyObj)) {
-        return QString(Converter< char * >::toCpp(pyObj));
-    } else if (pyObj == Py_None) {
-        return QString();
-    }
-#if PY_VERSION_HEX < 0x03000000
-    // Support for buffer objects on QString constructor
-    else if (pyObj->ob_type->tp_as_buffer
-               && PyType_HasFeature(pyObj->ob_type, Py_TPFLAGS_HAVE_GETCHARBUFFER)
-               && pyObj->ob_type->tp_as_buffer->bf_getcharbuffer) {
-        QByteArray data;
-        PyBufferProcs* bufferProcs = pyObj->ob_type->tp_as_buffer;
-        int segments = bufferProcs->bf_getsegcount(pyObj, 0);
-        for (int i = 0; i < segments; ++i) {
-            char* segmentData;
-            int length = bufferProcs->bf_getcharbuffer(pyObj, i, &segmentData);
-            if (length == -1)
-                break;
-            data.append(segmentData, length);
-        }
-        return QString(data);
-    }
-#endif
-    else if (shiboType->ext_isconvertible && shiboType->ext_tocpp && shiboType->ext_isconvertible(pyObj)) {
-        QString* cptr = reinterpret_cast<QString*>(shiboType->ext_tocpp(pyObj));
-        std::auto_ptr<QString> cptr_auto_ptr(cptr);
-        return *cptr;
-    }
-    return *Converter<QString*>::toCpp(pyObj);
-}
-
-inline PyObject* Converter<QString>::toPython(const QString& cppObj)
-{
-    return ValueTypeConverter<QString>::toPython(cppObj);
-}
-}
diff --git a/PySide/QtCore/qstringlist_conversions.h b/PySide/QtCore/qstringlist_conversions.h
deleted file mode 100644
index 9a5ec5f..0000000
--- a/PySide/QtCore/qstringlist_conversions.h
+++ /dev/null
@@ -1,17 +0,0 @@
-namespace Shiboken
-{
-inline bool Converter<QStringList>::isConvertible(PyObject* pyObj)
-{
-    return StdListConverter<QStringList>::isConvertible(pyObj);
-}
-
-inline QStringList Converter<QStringList>::toCpp(PyObject* pyObj)
-{
-    return StdListConverter<QStringList>::toCpp(pyObj);
-}
-
-inline PyObject* Converter<QStringList>::toPython(const QStringList& cppObj)
-{
-    return ValueTypeConverter<QStringList>::toPython(cppObj);
-}
-}
diff --git a/PySide/QtCore/qvariant_conversions.h b/PySide/QtCore/qvariant_conversions.h
deleted file mode 100644
index f0f78a0..0000000
--- a/PySide/QtCore/qvariant_conversions.h
+++ /dev/null
@@ -1,81 +0,0 @@
-// We use this thin wrapper instead of the plain PyObject pointer to avoid conflicts with specializations of T*
-// in QVariant.
-struct PyQt_PyObject
-{
-    PyObject* m_me;
-    PyQt_PyObject(PyObject* me) : m_me(me) {}
-    PyQt_PyObject() : m_me(Py_None) {}
-    operator PyObject*() { return m_me; }
-};
-
-Q_DECLARE_METATYPE(PyQt_PyObject)
-
-namespace Shiboken {
-
-// all types are convertible to QVariant
-inline bool Converter<QVariant>::isConvertible(PyObject* pyObj)
-{
-    return true;
-}
-
-inline QVariant Converter<QVariant>::toCpp(PyObject* pyObj)
-{
-    if (SbkQVariant_Check(pyObj))
-        return *Converter<QVariant*>::toCpp(pyObj);
-
-    // Primitive types
-    if (PyBool_Check(pyObj)) {
-        // QVariant(bool)
-        return QVariant(Shiboken::Converter<bool>::toCpp(pyObj));
-    } else if (PyString_CheckExact(pyObj)) {
-        // QVariant(const char*)
-        return QVariant(Shiboken::Converter<const char *>::toCpp(pyObj));
-    } else if (PyFloat_CheckExact(pyObj)) {
-        // QVariant(double)
-        return QVariant(Shiboken::Converter<double>::toCpp(pyObj));
-    } else if (PyInt_CheckExact(pyObj)) {
-        // QVariant(int)
-        return QVariant(Shiboken::Converter<int>::toCpp(pyObj));
-    } else if (PyLong_CheckExact(pyObj)) {
-        // QVariant(qlonglong)
-        return QVariant(Shiboken::Converter<qlonglong>::toCpp(pyObj));
-    } else if (Shiboken::isShibokenEnum(pyObj)) {
-        // QVariant(enum)
-        return QVariant(Shiboken::Converter<int>::toCpp(pyObj));
-    } else if (!Shiboken::isShibokenType(pyObj) || Shiboken::isUserType(pyObj)) {
-        // QVariant(User class)
-        Py_INCREF(pyObj);
-        return QVariant::fromValue<PyQt_PyObject>(pyObj);
-    } else {
-        // a class supported by QVariant?
-        const char* typeName = pyObj->ob_type->tp_name;
-        // check if the name starts with PySide.
-        if (!strncmp("PySide.", typeName, 7)) {
-            // get the type name
-            const char* lastDot = typeName;
-            for (int i = 8; typeName[i]; ++i) {
-                if (typeName[i] == '.')
-                    lastDot = &typeName[i];
-            }
-            lastDot++;
-            uint typeCode = QMetaType::type(lastDot);
-            if (!typeCode) {// Try with star at end, for QObject*, QWidget* and QAbstractKinectScroller*
-                QString typeName(lastDot);
-                typeName += '*';
-                typeCode = QMetaType::type(typeName.toAscii());
-            }
-            if (typeCode)
-                return QVariant(typeCode, reinterpret_cast<SbkBaseWrapper*>(pyObj)->cptr[0]);
-        }
-        // Is a shiboken type not known by Qt
-        Py_INCREF(pyObj);
-        return QVariant::fromValue<PyQt_PyObject>(pyObj);
-    }
-}
-
-inline PyObject* Converter<QVariant>::toPython(const QVariant& cppObj)
-{
-    return ValueTypeConverter<QVariant>::toPython(cppObj);
-}
-
-}
diff --git a/PySide/QtCore/qvector_conversions.h b/PySide/QtCore/qvector_conversions.h
deleted file mode 100644
index 0857036..0000000
--- a/PySide/QtCore/qvector_conversions.h
+++ /dev/null
@@ -1,4 +0,0 @@
-namespace Shiboken {
-template<typename T>
-struct Converter<QVector<T> > : StdListConverter<QVector<T> > {};
-}
diff --git a/PySide/QtCore/typesystem_core.xml b/PySide/QtCore/typesystem_core.xml
deleted file mode 100644
index 9711e2d..0000000
--- a/PySide/QtCore/typesystem_core.xml
+++ /dev/null
@@ -1,2870 +0,0 @@
-<?xml version="1.0"?>
-<typesystem package="PySide.QtCore">
-    <load-typesystem name="typesystem_templates.xml" generate="no"/>
-
-    <function signature="qAcos(qreal)" />
-    <function signature="qAsin(qreal)" />
-    <function signature="qAtan(qreal)" />
-    <function signature="qAtan2(qreal,qreal)" />
-    <function signature="qChecksum(const char*,uint)" />
-    <function signature="qCritical(const char*)" />
-    <function signature="qDebug(const char*)" />
-    <function signature="qExp(qreal)" />
-    <function signature="qFabs(qreal)" />
-    <function signature="qFastCos(qreal)" />
-    <function signature="qFastSin(qreal)" />
-    <function signature="qFatal(const char*)" />
-    <function signature="qFuzzyCompare(double,double)" />
-    <function signature="qFuzzyIsNull(double)" />
-    <function signature="qIsFinite(double)" />
-    <function signature="qIsInf(double)" />
-    <function signature="qIsNaN(double)" />
-    <function signature="qIsNull(double)" />
-    <function signature="qRound(qreal)" />
-    <function signature="qTan(qreal)" />
-    <function signature="qVersion()" />
-    <function signature="qWarning(const char*)" />
-    <function signature="qrand()" />
-    <function signature="qsrand(uint)" />
-
-    <!-- TODO: We do not support void* or const void* as arg -->
-    <rejection class="QMetaObject" function-name="activate"/>
-    <rejection class="QMetaObject" function-name="metacall"/>
-    <rejection class="QMetaObject" function-name="static_metacall"/>
-    <!-- TODO: Support to addGuard(QObject**) -->
-    <rejection class="QMetaObject" function-name="addGuard"/>
-    <rejection class="QMetaObject" function-name="changeGuard"/>
-    <rejection class="QMetaObject" function-name="removeGuard"/>
-
-  <rejection class="QFutureSynchronizer"/>
-  <rejection class="QByteArray" function-name="contains"/>
-  <rejection class="QRunnable"/>
-  <rejection class="QSharedPointer"/>
-  <rejection class="QWeakPointer"/>
-  <rejection class="QChildEvent" field-name="c"/>
-  <rejection class="QTimerEvent" field-name="id"/>
-  <rejection class="QEvent" field-name="t"/>
-  <rejection class="*" function-name="tr" />
-  <rejection class="*" function-name="trUtf8" />
-  <rejection class="*" function-name="qt_metacast" />
-  <rejection class="*" function-name="qt_metacall" />
-  <rejection class="QThreadPool"/>
-  <!-- From Qt4.6 -->
-  <rejection class="*" field-name="d_ptr"/>
-  <rejection class="*" field-name="staticQtMetaObject"/>
-  <rejection class="*" function-name="qobject_interface_iid"/>
-  <rejection class="*" function-name="qGetPtrHelper"/>
-  <rejection class="*" function-name="q_check_ptr"/>
-  <rejection class="*" function-name="qobject_interface_iid&lt;QTextCodecFactoryInterface*&gt;"/>
-  <rejection class="*" function-name="qobject_interface_iid&lt;QFactoryInterface*&gt;"/>
-  <rejection class="*" function-name="qRegisterAnimationInterpolator"/>
-  <rejection class="*" function-name="qvariant_cast&lt;QVariant&gt;"/>
-  <rejection class="*" function-name="qVariantSetValue&lt;QVariant&gt;"/>
-  <rejection class="*" function-name="qReallocAligned"/>
-  <rejection class="*" function-name="qMallocAligned"/>
-  <rejection class="*" function-name="qFreeAligned"/>
-  <!-- From Qt4.6 ^^^ -->
-  <enum-type name="QXmlStreamReader::Error"/>
-  <enum-type name="QXmlStreamReader::TokenType"/>
-  <enum-type name="QString::NormalizationForm" />
-  <enum-type name="QString::SectionFlag" />
-  <enum-type name="QString::SplitBehavior"/>
-  <enum-type name="QChar::Decomposition" />
-  <enum-type name="QChar::Direction" />
-  <enum-type name="QChar::Joining" />
-  <enum-type name="QChar::SpecialCharacter" />
-  <enum-type name="QChar::UnicodeVersion" />
-  <enum-type name="QChar::CombiningClass" />
-  <enum-type name="QLineF::IntersectType" />
-  <enum-type name="QVariant::Type" />
-  <!-- From Qt4.6 -->
-  <enum-type name="QXmlStreamReader::ReadElementTextBehaviour"/>
-  <enum-type name="QDataStream::FloatingPointPrecision"/>
-  <enum-type name="QtValidLicenseForOpenVGModule"/>
-  <enum-type name="QtValidLicenseForMultimediaModule"/>
-  <enum-type name="Qt::GestureFlag" flags="Qt::GestureFlags"/>
-  <enum-type name="Qt::GestureType"/>
-  <enum-type name="Qt::GestureState"/>
-  <enum-type name="Qt::CoordinateSystem"/>
-  <enum-type name="Qt::TileRule"/>
-  <enum-type name="Qt::AnchorPoint"/>
-  <enum-type name="Qt::NavigationMode"/>
-  <enum-type name="Qt::InputMethodHint" flags="Qt::InputMethodHints"/>
-  <enum-type name="Qt::TouchPointState"/>
-  <enum-type name="QEasingCurve::Type"/>
-  <enum-type name="QAbstractAnimation::DeletionPolicy"/>
-  <enum-type name="QAbstractAnimation::Direction"/>
-  <enum-type name="QAbstractAnimation::State"/>
-
-  <enum-type name="QElapsedTimer::ClockType" since="4.7"/>
-
-  <!-- From Qt4.6 ^^^ -->
-  <primitive-type name="qint8"/>
-  <primitive-type name="qint16"/>
-  <primitive-type name="qint32"/>
-  <primitive-type name="quint8"/>
-  <primitive-type name="quint16"/>
-  <primitive-type name="quint32"/>
-  <primitive-type name="quint64"/>
-  <primitive-type name="bool"/>
-  <primitive-type name="double"/>
-  <primitive-type name="qreal"/>
-  <primitive-type name="float"/>
-  <primitive-type name="qint64"/>
-  <primitive-type name="__int64"/>
-  <primitive-type name="unsigned __int64"/>
-  <primitive-type name="unsigned long long"/>
-  <primitive-type name="long long"/>
-  <primitive-type name="qlonglong" target-lang-api-name="PyLong" />
-  <primitive-type name="qulonglong" target-lang-api-name="PyLong" />
-  <primitive-type name="short"/>
-  <primitive-type name="signed short"/>
-  <primitive-type name="ushort" target-lang-api-name="PyInt" />
-  <primitive-type name="unsigned short"/>
-  <primitive-type name="char"/>
-  <primitive-type name="signed char"/>
-  <primitive-type name="uchar"/>
-  <primitive-type name="unsigned char"/>
-  <primitive-type name="int"/>
-  <primitive-type name="signed int"/>
-  <primitive-type name="uint"/>
-  <primitive-type name="ulong"/>
-  <primitive-type name="unsigned int"/>
-  <primitive-type name="signed long"/>
-  <primitive-type name="long"/>
-  <primitive-type name="unsigned long"/>
-  <primitive-type name="WId"/>
-  <primitive-type name="Qt::HANDLE" target-lang-api-name="PyLong"/>
-  <primitive-type name="QByteRef">
-    <!-- FIXME APIExtractor or shiboken do not support multiple includes by primitive type -->
-      <include file-name="QTextDocument" location="global"/>
-  </primitive-type>
-  <primitive-type name="QBool" target-lang-api-name="PyBool">
-    <conversion-rule file="qbool_conversions.h"/>
-    <!-- FIXME This is a workaround to include some headers needed by some includes (nothing to do with QBool) -->
-    <include file-name="QtConcurrentFilter" location="global"/>
-  </primitive-type>
-
-  <primitive-type name="std::string"/>
-  <primitive-type name="std::wstring"/>
-  <primitive-type name="QStdWString"/>
-
-  <container-type name="QSet" type="set">
-    <conversion-rule file="qset_conversions.h"/>
-    <include file-name="QSet" location="global"/>
-  </container-type>
-
-  <container-type name="QList" type="list">
-    <conversion-rule file="qlist_conversions.h"/>
-    <include file-name="QList" location="global"/>
-  </container-type>
-  <rejection class="QList" function-name="back"/>
-  <rejection class="QList" function-name="begin"/>
-  <rejection class="QList" function-name="constBegin"/>
-  <rejection class="QList" function-name="constData"/>
-  <rejection class="QList" function-name="constEnd"/>
-  <rejection class="QList" function-name="data"/>
-  <rejection class="QList" function-name="end"/>
-  <rejection class="QList" function-name="erase"/>
-  <rejection class="QList" function-name="erase"/>
-  <rejection class="QList" function-name="free"/>
-  <rejection class="QList" function-name="fromList"/>
-  <rejection class="QList" function-name="fromSet"/>
-  <rejection class="QList" function-name="fromSet"/>
-  <rejection class="QList" function-name="fromStdList" />
-  <rejection class="QList" function-name="front" />
-  <rejection class="QList" function-name="first" />
-  <rejection class="QList" function-name="insert"/>
-  <rejection class="QList" function-name="last"/>
-  <rejection class="QList" function-name="malloc"/>
-  <rejection class="QList" function-name="node_construct"/>
-  <rejection class="QList" function-name="node_copy"/>
-  <rejection class="QList" function-name="node_destruct"/>
-  <rejection class="QList" function-name="operator[]"/>
-  <rejection class="QList" function-name="operator="/>
-  <rejection class="QList" function-name="toSet"/>
-  <rejection class="QList" function-name="toStdList" />
-
-  <container-type name="QVector" type="vector">
-    <conversion-rule file="qvector_conversions.h"/>
-    <include file-name="QVector" location="global"/>
-  </container-type>
-  <rejection class="QVector" function-name="back"/>
-  <rejection class="QVector" function-name="begin"/>
-  <rejection class="QVector" function-name="constBegin"/>
-  <rejection class="QVector" function-name="constData"/>
-  <rejection class="QVector" function-name="constEnd"/>
-  <rejection class="QVector" function-name="data"/>
-  <rejection class="QVector" function-name="end"/>
-  <rejection class="QVector" function-name="erase"/>
-  <rejection class="QVector" function-name="first"/>
-  <rejection class="QVector" function-name="free"/>
-  <rejection class="QVector" function-name="front"/>
-  <rejection class="QVector" function-name="insert"/>
-  <rejection class="QVector" function-name="last"/>
-  <rejection class="QVector" function-name="malloc"/>
-  <rejection class="QVector" function-name="alloc"/>
-  <rejection class="QVector" function-name="operator+="/>
-  <rejection class="QVector" function-name="operator[]"/>
-  <rejection class="QVector" function-name="operator="/>
-  <rejection class="QVector" function-name="toStdVector"/>
-  <rejection class="QVector" function-name="fromStdVector"/>
-
-  <container-type name="QQueue" type="queue"/>
-  <rejection class="QQueue" function-name="head"/>
-
-  <container-type name="QHash" type="hash">
-    <conversion-rule file="qhash_conversions.h"/>
-    <include file-name="QHash" location="global"/>
-    <include file-name="pysideconversions.h" location="global"/>
-  </container-type>
-  <container-type name="QLinkedList" type="linked-list"/>
-  <container-type name="QMap" type="map">
-    <conversion-rule file="qmap_conversions.h"/>
-    <include file-name="QMap" location="global"/>
-  </container-type>
-  <container-type name="QMultiMap" type="multi-map">
-    <conversion-rule file="qmultimap_conversions.h"/>
-    <include file-name="QMultiMap" location="global"/>
-  </container-type>
-  <container-type name="QPair" type="pair">
-    <conversion-rule file="qpair_conversions.h"/>
-    <include file-name="QPair" location="global"/>
-  </container-type>
-  <container-type name="QStack" type="stack"/>
-
-  <rejection class="*" function-name="d_func"/>
-  <rejection class="*" function-name="data_ptr"/>
-  <rejection class="*" function-name="detach"/>
-  <rejection class="*" function-name="isDetached"/>
-  <rejection class="*" field-name="d_ptr"/>
-  <rejection class="*" field-name="d"/>
-  <rejection class="*" field-name="staticMetaObject"/>
-  <!-- not support array in property -->
-  <rejection class="QTextCodec::ConverterState" field-name="state_data"/>
-  <rejection class="QString" field-name="null"/>
-  <rejection class="QVariant" field-name="handler"/>
-  <rejection class="QUuid" field-name="data1"/>
-  <rejection class="QUuid" field-name="data2"/>
-  <rejection class="QUuid" field-name="data3"/>
-  <rejection class="QUuid" field-name="data4"/>
-  <rejection class="" enum-name="QtValidLicenseForTestModule"/>
-  <rejection class="" enum-name="QtValidLicenseForDBusModule"/>
-  <rejection class="" enum-name="QtValidLicenseForSqlModule"/>
-  <rejection class="" enum-name="QtValidLicenseForOpenGLModule"/>
-  <rejection class="" enum-name="QtValidLicenseForScriptToolsModule"/>
-  <rejection class="" enum-name="__codecvt_result"/>
-  <rejection class="" enum-name="enum_1"/>
-  <rejection class="" enum-name="enum_2"/>
-  <rejection class="" enum-name="QtValidLicenseForXmlModule"/>
-  <rejection class="" enum-name="QtValidLicenseForXmlPatternsModule"/>
-  <rejection class="" enum-name="QtValidLicenseForActiveQtModule"/>
-  <rejection class="" enum-name="QtValidLicenseForCoreModule"/>
-  <rejection class="" enum-name="QtValidLicenseForQt3SupportLightModule"/>
-  <rejection class="" enum-name="QtValidLicenseForQt3SupportModule"/>
-  <rejection class="" enum-name="QtValidLicenseForNetworkModule"/>
-  <rejection class="" enum-name="QtValidLicenseForSvgModule"/>
-  <rejection class="" enum-name="QtValidLicenseForGuiModule"/>
-  <rejection class="" enum-name="QtValidLicenseForScriptModule"/>
-  <rejection class="" enum-name="QtValidLicenseForHelpModule"/>
-  <rejection class="QtConcurrent" enum-name="enum_1"/>
-  <rejection class="QFuture::const_iterator"/>
-  <rejection class="QFutureInterface"/>
-  <rejection class="QFutureInterfaceBase"/>
-  <rejection class="QtConcurrent::BlockSizeManager"/>
-  <rejection class="QtConcurrent::ConstMemberFunctionWrapper"/>
-  <rejection class="QtConcurrent::Exception"/>
-  <rejection class="QtConcurrent::FilterKernel"/>
-  <rejection class="QtConcurrent::FilteredEachKernel"/>
-  <rejection class="QtConcurrent::FilteredReducedKernel"/>
-  <rejection class="QtConcurrent::FunctionWrapper0"/>
-  <rejection class="QtConcurrent::FunctionWrapper1"/>
-  <rejection class="QtConcurrent::FunctionWrapper2"/>
-  <rejection class="QtConcurrent::IntermediateResults"/>
-  <rejection class="QtConcurrent::IterateKernel"/>
-  <rejection class="QtConcurrent::MapKernel"/>
-  <rejection class="QtConcurrent::MappedEachKernel"/>
-  <rejection class="QtConcurrent::MappedReducedKernel"/>
-  <rejection class="QtConcurrent::Median"/>
-  <rejection class="QtConcurrent::MemberFunctionWrapper"/>
-  <rejection class="QtConcurrent::MemberFunctionWrapper1"/>
-  <rejection class="QtConcurrent::ReduceKernel"/>
-  <rejection class="QtConcurrent::ResultItem"/>
-  <rejection class="QtConcurrent::ResultIterator"/>
-  <rejection class="QtConcurrent::ResultIteratorBase"/>
-  <rejection class="QtConcurrent::ResultReporter"/>
-  <rejection class="QtConcurrent::ResultStore"/>
-  <rejection class="QtConcurrent::ResultStoreBase"/>
-  <rejection class="QtConcurrent::RunFunctionTask"/>
-  <rejection class="QtConcurrent::RunFunctionTaskBase"/>
-  <rejection class="QtConcurrent::SelectSpecialization"/>
-  <rejection class="QtConcurrent::SelectStoredConstMemberFunctionCall0"/>
-  <rejection class="QtConcurrent::SelectStoredConstMemberFunctionCall1"/>
-  <rejection class="QtConcurrent::SelectStoredConstMemberFunctionCall2"/>
-  <rejection class="QtConcurrent::SelectStoredConstMemberFunctionCall3"/>
-  <rejection class="QtConcurrent::SelectStoredConstMemberFunctionCall4"/>
-  <rejection class="QtConcurrent::SelectStoredConstMemberFunctionCall5"/>
-  <rejection class="QtConcurrent::SelectStoredConstMemberFunctionPointerCall0"/>
-  <rejection class="QtConcurrent::SelectStoredConstMemberFunctionPointerCall1"/>
-  <rejection class="QtConcurrent::SelectStoredConstMemberFunctionPointerCall2"/>
-  <rejection class="QtConcurrent::SelectStoredConstMemberFunctionPointerCall3"/>
-  <rejection class="QtConcurrent::SelectStoredConstMemberFunctionPointerCall4"/>
-  <rejection class="QtConcurrent::SelectStoredConstMemberFunctionPointerCall5"/>
-  <rejection class="QtConcurrent::SelectStoredFunctorCall0"/>
-  <rejection class="QtConcurrent::SelectStoredFunctorCall1"/>
-  <rejection class="QtConcurrent::SelectStoredFunctorCall2"/>
-  <rejection class="QtConcurrent::SelectStoredFunctorCall3"/>
-  <rejection class="QtConcurrent::SelectStoredFunctorCall4"/>
-  <rejection class="QtConcurrent::SelectStoredFunctorCall5"/>
-  <rejection class="QtConcurrent::SelectStoredFunctorPointerCall0"/>
-  <rejection class="QtConcurrent::SelectStoredFunctorPointerCall1"/>
-  <rejection class="QtConcurrent::SelectStoredFunctorPointerCall2"/>
-  <rejection class="QtConcurrent::SelectStoredFunctorPointerCall3"/>
-  <rejection class="QtConcurrent::SelectStoredFunctorPointerCall4"/>
-  <rejection class="QtConcurrent::SelectStoredFunctorPointerCall5"/>
-  <rejection class="QtConcurrent::SelectStoredMemberFunctionCall0"/>
-  <rejection class="QtConcurrent::SelectStoredMemberFunctionCall1"/>
-  <rejection class="QtConcurrent::SelectStoredMemberFunctionCall2"/>
-  <rejection class="QtConcurrent::SelectStoredMemberFunctionCall3"/>
-  <rejection class="QtConcurrent::SelectStoredMemberFunctionCall4"/>
-  <rejection class="QtConcurrent::SelectStoredMemberFunctionCall5"/>
-  <rejection class="QtConcurrent::SelectStoredMemberFunctionPointerCall0"/>
-  <rejection class="QtConcurrent::SelectStoredMemberFunctionPointerCall1"/>
-  <rejection class="QtConcurrent::SelectStoredMemberFunctionPointerCall2"/>
-  <rejection class="QtConcurrent::SelectStoredMemberFunctionPointerCall3"/>
-  <rejection class="QtConcurrent::SelectStoredMemberFunctionPointerCall4"/>
-  <rejection class="QtConcurrent::SelectStoredMemberFunctionPointerCall5"/>
-  <rejection class="QtConcurrent::SequenceHolder1"/>
-  <rejection class="QtConcurrent::SequenceHolder2"/>
-  <rejection class="QtConcurrent::StoredConstMemberFunctionCall0"/>
-  <rejection class="QtConcurrent::StoredConstMemberFunctionCall1"/>
-  <rejection class="QtConcurrent::StoredConstMemberFunctionCall2"/>
-  <rejection class="QtConcurrent::StoredConstMemberFunctionCall3"/>
-  <rejection class="QtConcurrent::StoredConstMemberFunctionCall4"/>
-  <rejection class="QtConcurrent::StoredConstMemberFunctionCall5"/>
-  <rejection class="QtConcurrent::StoredConstMemberFunctionPointerCall0"/>
-  <rejection class="QtConcurrent::StoredConstMemberFunctionPointerCall1"/>
-  <rejection class="QtConcurrent::StoredConstMemberFunctionPointerCall2"/>
-  <rejection class="QtConcurrent::StoredConstMemberFunctionPointerCall3"/>
-  <rejection class="QtConcurrent::StoredConstMemberFunctionPointerCall4"/>
-  <rejection class="QtConcurrent::StoredConstMemberFunctionPointerCall5"/>
-  <rejection class="QtConcurrent::StoredFunctorCall0"/>
-  <rejection class="QtConcurrent::StoredFunctorCall1"/>
-  <rejection class="QtConcurrent::StoredFunctorCall2"/>
-  <rejection class="QtConcurrent::StoredFunctorCall3"/>
-  <rejection class="QtConcurrent::StoredFunctorCall4"/>
-  <rejection class="QtConcurrent::StoredFunctorCall5"/>
-  <rejection class="QtConcurrent::StoredFunctorPointerCall0"/>
-  <rejection class="QtConcurrent::StoredFunctorPointerCall1"/>
-  <rejection class="QtConcurrent::StoredFunctorPointerCall2"/>
-  <rejection class="QtConcurrent::StoredFunctorPointerCall3"/>
-  <rejection class="QtConcurrent::StoredFunctorPointerCall4"/>
-  <rejection class="QtConcurrent::StoredFunctorPointerCall5"/>
-  <rejection class="QtConcurrent::StoredMemberFunctionCall0"/>
-  <rejection class="QtConcurrent::StoredMemberFunctionCall1"/>
-  <rejection class="QtConcurrent::StoredMemberFunctionCall2"/>
-  <rejection class="QtConcurrent::StoredMemberFunctionCall3"/>
-  <rejection class="QtConcurrent::StoredMemberFunctionCall4"/>
-  <rejection class="QtConcurrent::StoredMemberFunctionCall5"/>
-  <rejection class="QtConcurrent::StoredMemberFunctionPointerCall0"/>
-  <rejection class="QtConcurrent::StoredMemberFunctionPointerCall1"/>
-  <rejection class="QtConcurrent::StoredMemberFunctionPointerCall2"/>
-  <rejection class="QtConcurrent::StoredMemberFunctionPointerCall3"/>
-  <rejection class="QtConcurrent::StoredMemberFunctionPointerCall4"/>
-  <rejection class="QtConcurrent::StoredMemberFunctionPointerCall5"/>
-  <rejection class="QtConcurrent::ThreadEngine"/>
-  <rejection class="QtConcurrent::ThreadEngineBase"/>
-  <rejection class="QtConcurrent::ThreadEngineSemaphore"/>
-  <rejection class="QtConcurrent::ThreadEngineStarter"/>
-  <rejection class="QtConcurrent::ThreadEngineStarterBase"/>
-  <rejection class="QtConcurrent::UnhandledException"/>
-  <rejection class="QtConcurrent::VoidStoredConstMemberFunctionCall0"/>
-  <rejection class="QtConcurrent::VoidStoredConstMemberFunctionCall1"/>
-  <rejection class="QtConcurrent::VoidStoredConstMemberFunctionCall2"/>
-  <rejection class="QtConcurrent::VoidStoredConstMemberFunctionCall3"/>
-  <rejection class="QtConcurrent::VoidStoredConstMemberFunctionCall4"/>
-  <rejection class="QtConcurrent::VoidStoredConstMemberFunctionCall5"/>
-  <rejection class="QtConcurrent::VoidStoredConstMemberFunctionPointerCall0"/>
-  <rejection class="QtConcurrent::VoidStoredConstMemberFunctionPointerCall1"/>
-  <rejection class="QtConcurrent::VoidStoredConstMemberFunctionPointerCall2"/>
-  <rejection class="QtConcurrent::VoidStoredConstMemberFunctionPointerCall3"/>
-  <rejection class="QtConcurrent::VoidStoredConstMemberFunctionPointerCall4"/>
-  <rejection class="QtConcurrent::VoidStoredConstMemberFunctionPointerCall5"/>
-  <rejection class="QtConcurrent::VoidStoredFunctorCall0"/>
-  <rejection class="QtConcurrent::VoidStoredFunctorCall1"/>
-  <rejection class="QtConcurrent::VoidStoredFunctorCall2"/>
-  <rejection class="QtConcurrent::VoidStoredFunctorCall3"/>
-  <rejection class="QtConcurrent::VoidStoredFunctorCall4"/>
-  <rejection class="QtConcurrent::VoidStoredFunctorCall5"/>
-  <rejection class="QtConcurrent::VoidStoredFunctorPointerCall0"/>
-  <rejection class="QtConcurrent::VoidStoredFunctorPointerCall1"/>
-  <rejection class="QtConcurrent::VoidStoredFunctorPointerCall2"/>
-  <rejection class="QtConcurrent::VoidStoredFunctorPointerCall3"/>
-  <rejection class="QtConcurrent::VoidStoredFunctorPointerCall4"/>
-  <rejection class="QtConcurrent::VoidStoredFunctorPointerCall5"/>
-  <rejection class="QtConcurrent::VoidStoredMemberFunctionCall0"/>
-  <rejection class="QtConcurrent::VoidStoredMemberFunctionCall1"/>
-  <rejection class="QtConcurrent::VoidStoredMemberFunctionCall2"/>
-  <rejection class="QtConcurrent::VoidStoredMemberFunctionCall3"/>
-  <rejection class="QtConcurrent::VoidStoredMemberFunctionCall4"/>
-  <rejection class="QtConcurrent::VoidStoredMemberFunctionCall5"/>
-  <rejection class="QtConcurrent::VoidStoredMemberFunctionPointerCall0"/>
-  <rejection class="QtConcurrent::VoidStoredMemberFunctionPointerCall1"/>
-  <rejection class="QtConcurrent::VoidStoredMemberFunctionPointerCall2"/>
-  <rejection class="QtConcurrent::VoidStoredMemberFunctionPointerCall3"/>
-  <rejection class="QtConcurrent::VoidStoredMemberFunctionPointerCall4"/>
-  <rejection class="QtConcurrent::VoidStoredMemberFunctionPointerCall5"/>
-  <rejection class="QMdi"/>
-  <rejection class="stdext"/>
-  <rejection class="QAlgorithmsPrivate"/>
-  <rejection class="QAtomic"/>
-  <rejection class="QAtomicPointer"/>
-  <rejection class="QAtomicInt"/>
-  <rejection class="QBasicAtomicInt"/>
-  <rejection class="QBasicAtomic"/>
-  <rejection class="QBasicAtomicPointer"/>
-  <rejection class="QBitRef"/>
-  <rejection class="QCache"/>
-  <rejection class="QCharRef"/>
-  <rejection class="QDebug"/>
-  <rejection class="QExplicitlySharedDataPointer"/>
-  <rejection class="QFlag"/>
-  <rejection class="QFlags"/>
-  <rejection class="QForeachContainer"/>
-  <rejection class="QForeachContainerBase"/>
-  <rejection class="QGlobalStatic"/>
-  <rejection class="QHash"/>
-  <rejection class="QHashData"/>
-  <rejection class="QHashDummyNode"/>
-  <rejection class="QHashDummyNode"/>
-  <rejection class="QHashDummyNode"/>
-  <rejection class="QHashDummyNode"/>
-  <rejection class="QHashDummyNode"/>
-  <rejection class="QHashDummyValue"/>
-  <rejection class="QHashIterator"/>
-  <rejection class="QHashNode"/>
-  <rejection class="QHashNode"/>
-  <rejection class="QHashNode"/>
-  <rejection class="QHashNode"/>
-  <rejection class="QHashNode"/>
-  <rejection class="QInternal"/>
-  <rejection class="QLibrary"/>
-  <rejection class="QLinkedList"/>
-  <rejection class="QLinkedListData"/>
-  <rejection class="QLinkedListIterator"/>
-  <rejection class="QLinkedListNode"/>
-  <rejection class="QListData"/>
-  <rejection class="QListIterator"/>
-  <rejection class="QMap"/>
-  <rejection class="QMapData"/>
-  <rejection class="QMapIterator"/>
-  <rejection class="QMetaType"/>
-  <rejection class="QMetaTypeId"/>
-  <rejection class="QMultiHash"/>
-  <rejection class="QMultiMap"/>
-  <rejection class="QMutableHashIterator"/>
-  <rejection class="QMutableLinkedListIterator"/>
-  <rejection class="QMutableListIterator"/>
-  <rejection class="QMutableMapIterator"/>
-  <rejection class="QMutableVectorIterator"/>
-  <rejection class="QNoImplicitBoolCast"/>
-  <rejection class="QObjectCleanupHandler"/>
-  <rejection class="QObjectData"/>
-  <rejection class="QObjectUserData"/>
-  <rejection class="QPluginLoader"/>
-  <rejection class="QPointer"/>
-  <rejection class="QSetIterator"/>
-  <rejection class="QSharedData"/>
-  <rejection class="QSharedDataPointer"/>
-  <rejection class="QStack"/>
-  <rejection class="QThreadStorage"/>
-  <rejection class="QThreadStorageData"/>
-  <rejection class="QTypeInfo"/>
-  <rejection class="QTypeInfo"/>
-  <rejection class="QVFbKeyData"/>
-  <rejection class="QVariantComparisonHelper"/>
-  <rejection class="QVectorData"/>
-  <rejection class="QVectorIterator"/>
-  <rejection class="QVectorTypedData"/>
-  <rejection class="QtPrivate"/>
-  <rejection class="qGreater"/>
-  <rejection class="qLess"/>
-  <rejection class="std"/>
-  <rejection class="QAbstractFileEngine::ExtensionOption"/>
-  <rejection class="QAbstractFileEngine::ExtensionReturn"/>
-  <rejection class="QByteArray::Data"/>
-  <rejection class="QIntForType"/>
-  <rejection class="QList::Node"/>
-  <rejection class="QList::const_iterator"/>
-  <rejection class="QList::iterator"/>
-  <rejection class="QMetaTypeId2"/>
-  <rejection class="QMutableSetIterator"/>
-  <rejection class="QSubString"/>
-  <rejection class="QUintForType"/>
-  <rejection class="QtConcurrent::internal"/>
-  <rejection class="QLocale::Data"/>
-  <rejection class="QGlobalStaticDeleter"/>
-  <rejection class="QSharedMemory"/>
-  <!-- Temporarily until we know how to implement it in Java -->
-  <rejection class="QVarLengthArray"/>
-  <!-- DBus -->
-  <rejection class="QDBusAbstractAdaptor"/>
-  <rejection class="QDBusAbstractInterface"/>
-  <rejection class="QDBusArgument"/>
-  <rejection class="QDBusConnection"/>
-  <rejection class="QDBusConnectionInterface"/>
-  <rejection class="QDBusContext"/>
-  <rejection class="QDBusError"/>
-  <rejection class="QDBusInterface"/>
-  <rejection class="QDBusMessage"/>
-  <rejection class="QDBusMetaType"/>
-  <rejection class="QDBusObjectPath"/>
-  <rejection class="QDBusReply"/>
-  <rejection class="QDBusServer"/>
-  <rejection class="QDBusSignature"/>
-  <rejection class="QDBusVariant"/>
-  <rejection class="_Revbidit"/>
-  <rejection class="_complex"/>
-  <rejection class="_exception"/>
-  <rejection class="_iobuf"/>
-  <rejection class="_stat"/>
-  <rejection class="_wfinddata_t"/>
-  <rejection class="exception"/>
-  <rejection class="istreambuf_iterator"/>
-  <rejection class="ostreambuf_iterator"/>
-  <rejection class="reverse_bidirectional_iterator"/>
-  <rejection class="reverse_iterator"/>
-  <rejection class="stat"/>
-  <rejection class="tm"/>
-  <rejection class="QVariant" function-name="canConvert"/>
-  <rejection class="QVariant" function-name="fromValue"/>
-  <rejection class="QVariant" function-name="value"/>
-  <rejection class="QVariant" function-name="setValue"/>
-  <rejection class="QVariant" function-name="data"/>
-  <rejection class="QVariant" function-name="constData"/>
-  <rejection class="QString" function-name="constData"/>
-  <rejection class="QString" function-name="constBegin"/>
-  <rejection class="QString" function-name="constEnd"/>
-  <rejection class="QString" function-name="begin"/>
-  <rejection class="QString" function-name="end"/>
-  <rejection class="QString" function-name="data"/>
-  <rejection class="QString" function-name="unicode"/>
-  <rejection class="QString" function-name="utf16"/>
-  <rejection class="QString" function-name="fromLatin1_helper"/>
-  <rejection class="QString" function-name="fromAscii_helper"/>
-  <rejection class="QString" function-name="toWCharArray"/>
-  <rejection class="QString" function-name="sprintf"/>
-  <rejection class="QString" function-name="vsprintf"/>
-  <rejection class="QString" function-name="fromStdWString"/>
-  <rejection class="QStringRef" function-name="constData"/>
-  <rejection class="QStringRef" function-name="data"/>
-  <rejection class="QStringRef" function-name="unicode"/>
-  <rejection class="QStringRef" function-name="string"/>
-  <rejection class="QAbstractEventDispatcher" function-name="filterEvent"/>
-  <rejection class="QAbstractEventDispatcher" function-name="setEventFilter"/>
-  <rejection class="QAbstractFileEngine" function-name="beginEntryList"/>
-  <rejection class="QAbstractFileEngine" function-name="endEntryList"/>
-  <rejection class="QAbstractFileEngine" function-name="extension"/>
-  <rejection class="QAbstractFileEngine" function-name="map"/>
-  <rejection class="QCoreApplication" function-name="compressEvent"/>
-  <rejection class="QCoreApplication" function-name="eventFilter"/>
-  <rejection class="QCoreApplication" function-name="filterEvent"/>
-  <rejection class="QCoreApplication" function-name="setEventFilter"/>
-  <rejection class="QFile" function-name="setDecodingFunction"/>
-  <rejection class="QFile" function-name="setEncodingFunction"/>
-  <rejection class="QProcess" function-name="pid"/>
-  <rejection class="QRegion" function-name="cleanUp"/>
-  <rejection class="QSettings" function-name="registerFormat"/>
-  <rejection class="QAbstractFileEngineIterator" function-name="entryInfo"/>
-  <rejection class="QAbstractFileEngineIterator" enum-name="EntryInfoType"/>
-  <rejection class="QDataStream" enum-name="ByteOrder"/>
-  <namespace-type name="Qt">
-    <modify-function signature="codecForHtml(const QByteArray &amp;)" remove="all"/>
-    <modify-function signature="mightBeRichText(const QString &amp;)" remove="all"/>
-    <modify-function signature="escape(const QString&amp;)" remove="all"/>
-    <modify-function signature="convertFromPlainText(const QString &amp;, Qt::WhiteSpaceMode)" remove="all"/>
-    <extra-includes>
-      <include file-name="QTextDocument" location="global"/>
-    </extra-includes>
-  </namespace-type>
-  <add-function signature="qAbs(long)" return-type="long">
-    <inject-code class="target" position="beginning">
-        %PYARG_0 = %CONVERTTOPYTHON[long](qAbs(%1));
-    </inject-code>
-  </add-function>
-  <enum-type name="QtMsgType"/>
-  <enum-type name="QSystemSemaphore::AccessMode"/>
-  <enum-type name="QSystemSemaphore::SystemSemaphoreError"/>
-  <enum-type name="QTextBoundaryFinder::BoundaryReason" flags="QTextBoundaryFinder::BoundaryReasons"/>
-  <enum-type name="QTextBoundaryFinder::BoundaryType"/>
-  <enum-type name="QAbstractFileEngine::Extension" extensible="yes"/>
-  <enum-type name="QAbstractFileEngine::FileFlag" flags="QAbstractFileEngine::FileFlags"/>
-  <enum-type name="QAbstractFileEngine::FileName"/>
-  <enum-type name="QAbstractFileEngine::FileOwner"/>
-  <enum-type name="QAbstractFileEngine::FileTime"/>
-  <enum-type name="QDataStream::Status"/>
-  <enum-type name="QDate::MonthNameType"/>
-  <enum-type name="QDir::Filter" flags="QDir::Filters"/>
-  <enum-type name="QEvent::Type" extensible="yes" />
-  <enum-type name="QEventLoop::ProcessEventsFlag" flags="QEventLoop::ProcessEventsFlags"/>
-  <enum-type name="QFile::FileError"/>
-  <enum-type name="QFile::MemoryMapFlags"/>
-  <enum-type name="QFile::Permission" flags="QFile::Permissions"/>
-  <enum-type name="QIODevice::OpenModeFlag" flags="QIODevice::OpenMode"/>
-  <enum-type name="QLibraryInfo::LibraryLocation"/>
-  <enum-type name="QLocale::FormatType"/>
-  <enum-type name="QLocale::NumberOption" flags="QLocale::NumberOptions"/>
-  <enum-type name="QLocale::MeasurementSystem"/>
-  <enum-type name="QMutex::RecursionMode"/>
-  <enum-type name="QMetaObject::Call"/>
-  <enum-type name="QProcess::ExitStatus"/>
-  <enum-type name="QProcess::ProcessChannel"/>
-  <enum-type name="QProcess::ProcessChannelMode"/>
-  <enum-type name="QProcess::ProcessError"/>
-  <enum-type name="QProcess::ProcessState"/>
-  <enum-type name="QRegExp::CaretMode"/>
-  <enum-type name="QRegExp::PatternSyntax"/>
-  <enum-type name="QSettings::Format"/>
-  <enum-type name="QSettings::Scope"/>
-  <enum-type name="QSettings::Status"/>
-  <enum-type name="QSocketNotifier::Type"/>
-  <enum-type name="QSystemLocale::QueryType"/>
-  <enum-type name="QSysInfo::Endian"/>
-  <enum-type name="QSysInfo::Sizes"/>
-  <enum-type name="QTextCodec::ConversionFlag" flags="QTextCodec::ConversionFlags"/>
-  <enum-type name="QTextStream::FieldAlignment"/>
-  <enum-type name="QTextStream::NumberFlag" flags="QTextStream::NumberFlags"/>
-  <enum-type name="QTextStream::RealNumberNotation"/>
-  <enum-type name="QTextStream::Status"/>
-  <enum-type name="QTimeLine::CurveShape"/>
-  <enum-type name="QTimeLine::Direction"/>
-  <enum-type name="QTimeLine::State"/>
-  <enum-type name="QThread::Priority"/>
-  <enum-type name="QUrl::FormattingOption" flags="QUrl::FormattingOptions"/>
-  <enum-type name="QUrl::ParsingMode"/>
-  <enum-type name="QUuid::Variant"/>
-  <enum-type name="QUuid::Version"/>
-  <enum-type name="Qt::SizeHint"/>
-  <enum-type name="Qt::SizeMode"/>
-  <enum-type name="Qt::WindowFrameSection"/>
-  <enum-type name="Qt::Axis"/>
-  <enum-type name="Qt::AnchorAttribute"/>
-  <enum-type name="Qt::ApplicationAttribute"/>
-  <enum-type name="Qt::ArrowType"/>
-  <enum-type name="Qt::AspectRatioMode"/>
-  <enum-type name="Qt::BGMode"/>
-  <enum-type name="Qt::BrushStyle"/>
-  <enum-type name="Qt::CaseSensitivity"/>
-  <enum-type name="Qt::CheckState"/>
-  <enum-type name="Qt::ClipOperation"/>
-  <enum-type name="Qt::ConnectionType"/>
-  <enum-type name="Qt::ContextMenuPolicy"/>
-  <enum-type name="Qt::Corner"/>
-  <enum-type name="Qt::DayOfWeek"/>
-  <enum-type name="Qt::DockWidgetAreaSizes"/>
-  <enum-type name="Qt::DropAction" flags="Qt::DropActions"/>
-  <enum-type name="Qt::FillRule"/>
-  <enum-type name="Qt::FocusPolicy"/>
-  <enum-type name="Qt::FocusReason"/>
-  <enum-type name="Qt::GlobalColor"/>
-  <enum-type name="Qt::HitTestAccuracy"/>
-  <enum-type name="Qt::InputMethodQuery"/>
-  <enum-type name="Qt::ItemFlag" flags="Qt::ItemFlags"/>
-  <enum-type name="Qt::ItemSelectionMode"/>
-  <enum-type name="Qt::KeyboardModifier" flags="Qt::KeyboardModifiers"/>
-  <enum-type name="Qt::LayoutDirection"/>
-  <enum-type name="Qt::MatchFlag" flags="Qt::MatchFlags"/>
-  <enum-type name="Qt::Modifier"/>
-  <enum-type name="Qt::MouseButton" flags="Qt::MouseButtons"/>
-  <enum-type name="Qt::Orientation" flags="Qt::Orientations"/>
-  <enum-type name="Qt::PenCapStyle"/>
-  <enum-type name="Qt::PenJoinStyle"/>
-  <enum-type name="Qt::PenStyle"/>
-  <enum-type name="Qt::ScrollBarPolicy"/>
-  <enum-type name="Qt::ShortcutContext"/>
-  <enum-type name="Qt::SortOrder"/>
-  <enum-type name="Qt::TextElideMode"/>
-  <enum-type name="Qt::TextFlag"/>
-  <enum-type name="Qt::TextFormat"/>
-  <enum-type name="Qt::TextInteractionFlag" flags="Qt::TextInteractionFlags"/>
-  <enum-type name="Qt::TimeSpec"/>
-  <enum-type name="Qt::ToolBarAreaSizes"/>
-  <enum-type name="Qt::ToolButtonStyle"/>
-  <enum-type name="Qt::TransformationMode"/>
-  <enum-type name="Qt::UIEffect"/>
-  <enum-type name="Qt::WhiteSpaceMode" />
-  <enum-type name="Qt::WindowModality"/>
-  <enum-type name="Qt::WindowState" flags="Qt::WindowStates"/>
-  <enum-type name="Qt::WindowType" flags="Qt::WindowFlags"/>
-  <enum-type name="QDirIterator::IteratorFlag" flags="QDirIterator::IteratorFlags"/>
-  <enum-type name="Qt::EventPriority"/>
-  <enum-type name="Qt::MaskMode"/>
-  <enum-type name="QChar::Category" />
-  <enum-type name="QCryptographicHash::Algorithm"/>
-  <enum-type name="QReadWriteLock::RecursionMode"/>
-  <enum-type name="QtConcurrent::ReduceOption" flags="QtConcurrent::ReduceOptions"/>
-  <enum-type name="QCoreApplication::Encoding" />
-  <enum-type name="Qt::AlignmentFlag" flags="Qt::Alignment" />
-  <enum-type name="Qt::CursorShape" />
-  <enum-type name="Qt::DateFormat" />
-  <enum-type name="Qt::ItemDataRole" force-integer="yes" />
-  <enum-type name="QDataStream::Version" />
-  <enum-type name="QDir::SortFlag" flags="QDir::SortFlags" />
-  <enum-type name="Qt::DockWidgetArea" flags="Qt::DockWidgetAreas" />
-  <enum-type name="Qt::ImageConversionFlag" flags="Qt::ImageConversionFlags" />
-  <enum-type name="Qt::Key" />
-  <enum-type name="QLocale::Language" />
-  <enum-type name="QLocale::Country" />
-  <enum-type name="Qt::ToolBarArea" flags="Qt::ToolBarAreas" />
-  <enum-type name="Qt::WidgetAttribute" />
-  <enum-type name="QMetaMethod::Access"/>
-  <enum-type name="QMetaMethod::MethodType"/>
-
-  <!--signal/slot-->
-  <inject-code class="target" position="end">
-    PySide::init(module);
-  </inject-code>
-  <inject-code class="native" position="beginning">
-    #include &lt;pyside.h&gt;
-  </inject-code>
-
-  <value-type name="QElapsedTimer" since="4.7"/>
-
-  <object-type name="QAbstractTableModel" polymorphic-id-expression="qobject_cast&lt;QAbstractTableModel*&gt;(%1)">
-    <extra-includes>
-      <include file-name="QStringList" location="global"/>
-      <include file-name="QSize" location="global"/>
-    </extra-includes>
-  </object-type>
-  <value-type name="QLine"/>
-  <value-type name="QLineF">
-    <modify-function signature="intersect(QLineF, QPointF*)const">
-        <modify-argument index="2">
-            <remove-argument />
-        </modify-argument>
-        <inject-code class="target" position="beginning">
-            QPointF p;
-            %RETURN_TYPE retval = %CPPSELF.%FUNCTION_NAME(%ARGUMENT_NAMES, &amp;p);
-            %PYARG_0 = Shiboken::makeTuple(retval, p);
-        </inject-code>
-    </modify-function>
-  </value-type>
-  <object-type name="QResource">
-    <modify-function signature="registerResource(const uchar*, const QString&amp;)" remove="all"/>
-    <modify-function signature="unregisterResource(const uchar*, const QString&amp;)" remove="all"/>
-    <modify-function signature="data()const" remove="all"/>
-    <!-- TODO: find a way for this mimic the PyQt4 behaviour, remove it for now.
-    <modify-function signature="unregisterResource(const uchar*, const QString&amp;)" rename="unregisterResourceData">
-      <modify-argument index="1">
-        <replace-type modified-type="const char*"/>
-      </modify-argument>
-    </modify-function>
-    <modify-function signature="registerResource(const uchar*, const QString&amp;)" rename="registerResourceData"/>
-      <modify-argument index="1">
-        <replace-type modified-type="const char*"/>
-      </modify-argument>
-    </modify-function>
-    -->
-    <modify-function signature="data() const">
-      <modify-argument index="return">
-        <replace-type modified-type="const char*"/>
-      </modify-argument>
-    </modify-function>
-  </object-type>
-
-  <value-type name="QString" hash-function="QStringCustomHashFunction">
-    <extra-includes>
-      <include file-name="QTextCodec" location="global"/>
-    </extra-includes>
-    <conversion-rule file="qstring_conversions.h" />
-    <modify-documentation xpath="/description/section[@id='initializing-a-string']/para[2]" />
-    <modify-documentation xpath="/description/section[@id='initializing-a-string']/para[3]" />
-    <!-- Custom hash function -->
-    <inject-code class="native" position="beginning" file="glue/qstring_hashfunc.cpp" />
-    <!-- buffer protocol -->
-    <inject-code class="native" position="beginning" file="glue/qstring_bufferprotocol.cpp" />
-    <inject-code class="target" position="end">
-        #if PY_VERSION_HEX &lt; 0x03000000
-            Shiboken::SbkType&lt;QString>()->tp_as_buffer = &amp;SbkQStringBufferProc;
-            Shiboken::SbkType&lt;QString>()->tp_flags |= Py_TPFLAGS_HAVE_GETCHARBUFFER;
-        #endif
-    </inject-code>
-
-    <!-- the number(qlonglong) is enough for python -->
-    <modify-function signature="number(uint,int)" remove="all" />
-    <modify-function signature="number(int,int)" remove="all" />
-    <modify-function signature="number(ulong,int)" remove="all" />
-    <modify-function signature="number(qlonglong,int)" remove="all" />
-    <modify-function signature="number(qulonglong,int)" remove="all" />
-    <modify-function signature="insert(int,const QChar*,int)" remove="all" />
-    <modify-function signature="QString(const QChar*, int)" remove="all" />
-    <modify-function signature="fromStdString(std::string)" remove="all"/>
-    <modify-function signature="toStdString()const" remove="all"/>
-    <modify-function signature="toStdWString()const" remove="all"/>
-    <modify-function signature="operator+=(char)" remove="all"/>
-    <modify-function signature="toUShort(bool*,int)const">
-      <modify-argument index="1">
-        <remove-argument/>
-      </modify-argument>
-      <inject-code class="target" position="beginning">
-        <insert-template name="fix_bool*,arg"/>
-      </inject-code>
-    </modify-function>
-    <modify-function signature="toDouble(bool*)const">
-      <modify-argument index="1">
-        <remove-argument/>
-      </modify-argument>
-      <inject-code class="target" position="beginning">
-        <insert-template name="fix_bool*"/>
-      </inject-code>
-    </modify-function>
-    <modify-function signature="toFloat(bool*)const">
-      <modify-argument index="1">
-        <remove-argument/>
-      </modify-argument>
-      <inject-code class="target" position="beginning">
-        <insert-template name="fix_bool*"/>
-      </inject-code>
-    </modify-function>
-    <modify-function signature="toInt(bool*,int)const">
-      <modify-argument index="1">
-        <remove-argument/>
-      </modify-argument>
-      <inject-code class="target" position="beginning">
-        <insert-template name="fix_bool*,arg"/>
-      </inject-code>
-    </modify-function>
-    <modify-function signature="toLong(bool*,int)const">
-      <modify-argument index="1">
-        <remove-argument/>
-      </modify-argument>
-      <inject-code class="target" position="beginning">
-        <insert-template name="fix_bool*,arg"/>
-      </inject-code>
-    </modify-function>
-    <modify-function signature="toLongLong(bool*,int)const">
-      <modify-argument index="1">
-        <remove-argument/>
-      </modify-argument>
-      <inject-code class="target" position="beginning">
-        <insert-template name="fix_bool*,arg"/>
-      </inject-code>
-    </modify-function>
-    <modify-function signature="toShort(bool*,int)const">
-      <modify-argument index="1">
-        <remove-argument/>
-      </modify-argument>
-      <inject-code class="target" position="beginning">
-        <insert-template name="fix_bool*,arg"/>
-      </inject-code>
-    </modify-function>
-    <modify-function signature="toUInt(bool*,int)const">
-      <modify-argument index="1">
-        <remove-argument/>
-      </modify-argument>
-      <inject-code class="target" position="beginning">
-        <insert-template name="fix_bool*,arg"/>
-      </inject-code>
-    </modify-function>
-    <modify-function signature="toULong(bool*,int)const">
-      <modify-argument index="1">
-        <remove-argument/>
-      </modify-argument>
-      <inject-code class="target" position="beginning">
-        <insert-template name="fix_bool*,arg"/>
-      </inject-code>
-    </modify-function>
-    <modify-function signature="toULongLong(bool*,int)const">
-      <modify-argument index="1">
-        <remove-argument/>
-      </modify-argument>
-      <inject-code class="target" position="beginning">
-        <insert-template name="fix_bool*,arg"/>
-      </inject-code>
-    </modify-function>
-    <modify-function signature="setUtf16(const ushort*,int)" remove="all" />
-    <modify-function signature="fromUtf16(const ushort*,int)" remove="all" />
-    <modify-function signature="fromRawData(const QChar*,int)" remove="all" />
-    <modify-function signature="setUnicode(const QChar*,int)" remove="all" />
-    <modify-function signature="fromUcs4(const uint*,int)" remove="all" />
-    <modify-function signature="toUcs4()const" remove="all" />
-
-    <!-- Remove conflict signatures in python -->
-    <modify-function signature="arg(int, int, int, const QChar&amp;) const" remove="all"/>
-    <modify-function signature="arg(qlonglong, int, int, const QChar&amp;) const" remove="all"/>
-    <modify-function signature="arg(qulonglong, int, int, const QChar&amp;) const" remove="all"/>
-    <modify-function signature="arg(short, int, int, const QChar&amp;) const" remove="all"/>
-    <modify-function signature="arg(uint, int, int, const QChar&amp;) const" remove="all"/>
-    <modify-function signature="arg(ulong, int, int, const QChar&amp;) const" remove="all"/>
-    <modify-function signature="arg(ushort, int, int, const QChar&amp;) const" remove="all"/>
-    <modify-function signature="arg(char, int, const QChar&amp;) const" remove="all"/>
-    <modify-function signature="arg(QChar, int, const QChar&amp;) const" remove="all"/>
-
-    <add-function signature="__str__()" return-type="PyObject*">
-        <inject-code class="target" position="beginning">
-            QByteArray utf8 = %CPPSELF.toUtf8();
-            %PYARG_0 = PyUnicode_DecodeUTF8(utf8.data(), utf8.count(), 0);
-        </inject-code>
-    </add-function>
-    <add-function signature="__len__">
-        <inject-code class="target" position="beginning">
-            return %CPPSELF.count();
-        </inject-code>
-    </add-function>
-    <add-function signature="__getitem__">
-        <inject-code class="target" position="beginning">
-                if (_i &lt; 0 || _i >= %CPPSELF.size()) {
-                    PyErr_SetString(PyExc_IndexError, "index out of bounds");
-                    return 0;
-                }
-                return %CONVERTTOPYTHON[%TYPE](%CPPSELF.at(_i));
-        </inject-code>
-    </add-function>
-    <add-function signature="__setitem__">
-        <inject-code class="target" position="beginning">
-                %CPPSELF.remove(_i, 1);
-                PyObject* args = Py_BuildValue("(nO)", _i, _value);
-                PyObject* result = SbkQStringFunc_insert(self, args);
-                Py_DECREF(args);
-                Py_XDECREF(result);
-                return !result ? -1 : 0;
-        </inject-code>
-    </add-function>
-    <add-function signature="__getslice__">
-        <inject-code class="target" position="beginning">
-            <insert-template name="get_slice"/>
-        </inject-code>
-    </add-function>
-  </value-type>
-  <value-type name="QLatin1String" />
-  <value-type name="QStringRef">
-    <modify-function signature="QStringRef(const QString*)" remove="all" />
-    <modify-function signature="QStringRef(const QString*,int,int)" remove="all" />
-    <modify-function signature="appendTo(QString*)const" remove="all" />
-    <modify-function signature="operator=(const QString*)" remove="all" />
-  </value-type>
-  <value-type name="QChar" hash-function="qHash">
-    <conversion-rule file="qchar_conversions.h" />
-    <modify-function signature="QChar(uchar)" remove="all"/>
-    <modify-function signature="QChar(short)" remove="all"/>
-    <modify-function signature="QChar(ushort)" remove="all"/>
-    <modify-function signature="QChar(uint)" remove="all"/>
-    <modify-function signature="QChar(char)" remove="all"/>
-    Implementation note: This constructor is a replacement for
-         QChar(char), as the char type check also catches numbers,
-         conflicting with QChar(int).
-    <add-function signature="QChar(PyString*)">
-        <inject-code class="target" position="beginning">
-            if (PyString_Size(%PYARG_1) == 1) {
-                char value = %CONVERTTOCPP[char](%PYARG_1);
-                %0 = new %TYPE(value);
-            } else {
-                PyErr_SetString(PyExc_TypeError, "expected string of size 1");
-            }
-        </inject-code>
-    </add-function>
-    <modify-function signature="combiningClass(uint)" remove="all"/>
-    <modify-function signature="combiningClass(ushort)" remove="all"/>
-    <modify-function signature="decomposition(uint)" remove="all"/>
-    <modify-function signature="digitValue(uint)" remove="all"/>
-    <modify-function signature="digitValue(ushort)" remove="all"/>
-    <modify-function signature="mirroredChar(uint)" remove="all"/>
-    <modify-function signature="mirroredChar(ushort)" remove="all"/>
-    <modify-function signature="toCaseFolded(uint)" remove="all"/>
-    <modify-function signature="toCaseFolded(ushort)" remove="all"/>
-    <modify-function signature="toUpper(uint)" remove="all"/>
-    <modify-function signature="toUpper(ushort)" remove="all"/>
-    <modify-function signature="toLower(uint)" remove="all"/>
-    <modify-function signature="toLower(ushort)" remove="all"/>
-    <modify-function signature="toTitleCase(uint)" remove="all"/>
-    <modify-function signature="toTitleCase(ushort)" remove="all"/>
-    <modify-function signature="unicode()" remove="all"/>
-    <modify-function signature="category(uint)" remove="all"/>
-    <modify-function signature="category(ushort)" remove="all"/>
-    <modify-function signature="decompositionTag(uint)" remove="all"/>
-    <modify-function signature="direction(uint)" remove="all"/>
-    <modify-function signature="direction(ushort)" remove="all"/>
-    <modify-function signature="joining(uint)" remove="all"/>
-    <modify-function signature="joining(ushort)" remove="all"/>
-    <modify-function signature="unicodeVersion(uint)" remove="all"/>
-    <modify-function signature="unicodeVersion(ushort)" remove="all"/>
-  </value-type>
-  <value-type name="QLatin1Char" />
-  <value-type name="QBasicTimer"/>
-  <value-type name="QByteArrayMatcher"/>
-  <value-type name="QDate">
-    <modify-function signature="julianToGregorian(uint,int&amp;,int&amp;,int&amp;)" remove="all"/>
-    <modify-function signature="getDate(int*,int*,int*)" >
-        <modify-argument index="1">
-            <remove-argument/>
-        </modify-argument>
-        <modify-argument index="2">
-            <remove-argument/>
-        </modify-argument>
-        <modify-argument index="3">
-            <remove-argument/>
-        </modify-argument>
-        <modify-argument index="return">
-            <replace-type modified-type="PyTuple*"/>
-        </modify-argument>
-        <inject-code class="target" position="beginning">
-        int year, month, day;
-        %CPPSELF.%FUNCTION_NAME(&amp;year, &amp;month, &amp;day);
-        %PYARG_0 = Shiboken::makeTuple(year, month, day);
-        </inject-code>
-    </modify-function>
-    <modify-function signature="weekNumber(int*)const" >
-        <modify-argument index="1">
-            <remove-argument/>
-        </modify-argument>
-        <inject-code class="target" position="beginning">
-        int yearNumber;
-        int week = %CPPSELF.%FUNCTION_NAME(&amp;yearNumber);
-        %PYARG_0 = Shiboken::makeTuple(week, yearNumber);
-        </inject-code>
-    </modify-function>
-  </value-type>
-  <value-type name="QDateTime"/>
-  <value-type name="QDir">
-    <modify-function signature="QDir(QString,QString,QFlags&lt;QDir::SortFlag>,QFlags&lt;QDir::Filter>)" remove="all" />
-  </value-type>
-
-  <value-type name="QPoint">
-    <modify-function signature="rx()" remove="all"/>
-    <modify-function signature="ry()" remove="all"/>
-  </value-type>
-  <value-type name="QPointF">
-    <modify-function signature="rx()" remove="all"/>
-    <modify-function signature="ry()" remove="all"/>
-  </value-type>
-  <value-type name="QRect">
-    <modify-function signature="getCoords(int*,int*,int*,int*)const">
-      <remove/>
-    </modify-function>
-    <modify-function signature="getRect(int*,int*,int*,int*)const">
-      <remove/>
-    </modify-function>
-  </value-type>
-  <value-type name="QRectF">
-    <modify-function signature="getCoords(qreal*,qreal*,qreal*,qreal*)const">
-      <remove/>
-    </modify-function>
-    <modify-function signature="getRect(qreal*,qreal*,qreal*,qreal*)const">
-      <remove/>
-    </modify-function>
-  </value-type>
-  <value-type name="QSize">
-    <modify-function signature="rheight()" remove="all"/>
-    <modify-function signature="rwidth()" remove="all"/>
-  </value-type>
-  <value-type name="QSizeF">
-    <modify-function signature="rheight()" remove="all" />
-    <modify-function signature="rwidth()" remove="all" />
-  </value-type>
-
-  <value-type name="QStringMatcher"/>
-  <value-type name="QTime"/>
-  <value-type name="QPersistentModelIndex">
-    <modify-function signature="internalPointer()const" remove="all"/>
-    <modify-function signature="operator const QModelIndex&amp;()const" remove="all" /> <!-- FIXME Removed due to a shiboken bug-->
-  </value-type>
-  <value-type name="QUuid">
-    <modify-function signature="QUuid(const char*)" remove="all" />
-  </value-type>
-
-  <value-type name="QLocale">
-    <modify-function signature="toString(qulonglong) const" remove="all"/>
-    <modify-function signature="toString(ushort) const" remove="all"/>
-    <modify-function signature="toString(unsigned int) const" remove="all"/>
-    <extra-includes>
-      <include file-name="QDate" location="global"/>
-    </extra-includes>
-    <modify-function signature="toUInt(QString,bool*,int)const">
-        <modify-argument index="2">
-            <remove-argument />
-            <remove-default-expression />
-        </modify-argument>
-        <inject-code class="target" position="beginning">
-            <insert-template name="fix_arg,bool*,arg" />
-        </inject-code>
-    </modify-function>
-    <modify-function signature="toULongLong(QString,bool*,int)const">
-        <modify-argument index="2">
-            <remove-argument />
-            <remove-default-expression />
-        </modify-argument>
-        <inject-code class="target" position="beginning">
-            <insert-template name="fix_arg,bool*,arg" />
-        </inject-code>
-    </modify-function>
-    <modify-function signature="toDouble(QString,bool*)const">
-        <modify-argument index="2">
-            <remove-argument />
-            <remove-default-expression />
-        </modify-argument>
-        <inject-code class="target" position="beginning">
-            <insert-template name="fix_args,bool*" />
-        </inject-code>
-    </modify-function>
-    <modify-function signature="toFloat(QString,bool*)const">
-        <modify-argument index="2">
-            <remove-argument />
-            <remove-default-expression />
-        </modify-argument>
-        <inject-code class="target" position="beginning">
-            <insert-template name="fix_args,bool*" />
-        </inject-code>
-    </modify-function>
-    <modify-function signature="toInt(QString,bool*,int)const">
-        <modify-argument index="2">
-            <remove-argument />
-        </modify-argument>
-        <inject-code class="target" position="beginning">
-            <insert-template name="fix_arg,bool*,arg" />
-        </inject-code>
-    </modify-function>
-    <modify-function signature="toLongLong(QString,bool*,int)const">
-        <modify-argument index="2">
-            <remove-argument />
-        </modify-argument>
-        <inject-code class="target" position="beginning">
-            <insert-template name="fix_arg,bool*,arg" />
-        </inject-code>
-    </modify-function>
-    <modify-function signature="toShort(QString,bool*,int)const">
-        <modify-argument index="2">
-            <remove-argument />
-        </modify-argument>
-        <inject-code class="target" position="beginning">
-            <insert-template name="fix_arg,bool*,arg" />
-        </inject-code>
-    </modify-function>
-    <modify-function signature="toUShort(QString,bool*,int)const">
-        <modify-argument index="2">
-            <remove-argument />
-        </modify-argument>
-        <inject-code class="target" position="beginning">
-            <insert-template name="fix_arg,bool*,arg" />
-        </inject-code>
-    </modify-function>
-  </value-type>
-  <value-type name="QBitArray" hash-function="qHash" >
-      <modify-function signature="fill(bool,int)" remove="all"/> <!-- FIXME Removed due to a shiboken bug-->
-    <add-function signature="__len__">
-        <inject-code class="target" position="beginning">
-            return %CPPSELF.size();
-        </inject-code>
-    </add-function>
-    <add-function signature="__getitem__">
-        <inject-code class="target" position="beginning">
-            if (_i &lt; 0 || _i >= %CPPSELF.size()) {
-                PyErr_SetString(PyExc_IndexError, "index out of bounds");
-                return 0;
-            }
-            return %CONVERTTOPYTHON[bool](%CPPSELF.at(_i));
-        </inject-code>
-    </add-function>
-    <add-function signature="__setitem__">
-        <inject-code class="target" position="beginning">
-            PyObject* args = Py_BuildValue("(iiO)", _i, 1, _value);
-            PyObject* result = SbkQBitArrayFunc_setBit(self, args);
-            Py_DECREF(args);
-            Py_XDECREF(result);
-            return !result ? -1 : 0;
-        </inject-code>
-    </add-function>
-  </value-type>
-  <!-- QReadWriteLock does not have a copy ctor! -->
-  <object-type name="QReadWriteLock">
-    <modify-function signature="lockForRead()" allow-thread="yes"/>
-    <modify-function signature="tryLockForRead(int)" allow-thread="yes"/>
-    <modify-function signature="lockForWrite()" allow-thread="yes"/>
-    <modify-function signature="tryLockForWrite(int)" allow-thread="yes"/>
-  </object-type>
-  <object-type name="QReadLocker">
-    <modify-function signature="relock()" allow-thread="yes" />
-  </object-type>
-  <object-type name="QWriteLocker">
-    <modify-function signature="relock()" allow-thread="yes" />
-  </object-type>
-  <object-type name="QDirIterator"/>
-  <object-type name="QThread">
-    <modify-function signature="run()" thread="yes" />
-    <modify-function signature="exec()" rename="exec_" allow-thread="yes" />
-    <modify-function signature="msleep(unsigned long)" allow-thread="yes" />
-    <modify-function signature="sleep(unsigned long)" allow-thread="yes" />
-    <modify-function signature="usleep(unsigned long)" allow-thread="yes" />
-    <modify-function signature="wait(unsigned long)" allow-thread="yes" />
-    <modify-function signature="start(QThread::Priority)" allow-thread="yes" />
-    <modify-function signature="exit(int)" allow-thread="yes" />
-  </object-type>
-  <object-type name="QAbstractFileEngineIterator"/>
-  <object-type name="QAbstractItemModel">
-    <modify-function signature="createIndex(int, int, void*) const" remove="all"/>
-    <modify-function signature="createIndex(int,int,quint32)const" remove="all" />
-    <modify-function signature="createIndex(int, int, int) const">
-        <modify-argument index="3">
-            <replace-default-expression with="0" />
-        </modify-argument>
-    </modify-function>
-    <add-function signature="createIndex(int,int,PyObject*)const" return-type="QModelIndex">
-        <inject-code class="target" position="beginning">
-        %PYARG_0 = %CONVERTTOPYTHON[%RETURN_TYPE](%CPPSELF.%FUNCTION_NAME(%1, %2, %PYARG_3));
-        </inject-code>
-    </add-function>
-
-    <!-- These signals are private, because only QAbstractItemModel can emit then -->
-    <modify-function signature="rowsAboutToBeInserted(const QModelIndex&amp;,int,int)" remove="all" />
-    <modify-function signature="rowsInserted(const QModelIndex &amp;, int,int)" remove="all" />
-    <modify-function signature="rowsAboutToBeRemoved(const QModelIndex &amp;, int, int)" remove="all" />
-    <modify-function signature="rowsRemoved(const QModelIndex&amp;,int,int)" remove="all" />
-    <modify-function signature="columnsAboutToBeInserted(const QModelIndex&amp;,int,int)" remove="all" />
-    <modify-function signature="columnsInserted(const QModelIndex&amp;,int,int)" remove="all" />
-    <modify-function signature="columnsAboutToBeRemoved(const QModelIndex&amp;,int,int)" remove="all" />
-    <modify-function signature="columnsRemoved(const QModelIndex&amp;,int,int)" remove="all" />
-    <modify-function signature="modelAboutToBeReset()" remove="all" />
-    <modify-function signature="modelReset()" remove="all" />
-
-  </object-type>
-  <!-- QObject is created manually -->
-  <object-type name="QObject">
-    <extra-includes>
-      <include file-name="QThread" location="global"/>
-      <include file-name="QCoreApplication" location="global"/>
-      <include file-name="signalmanager.h" location="local" />
-    </extra-includes>
-    <modify-function signature="metaObject() const">
-      <inject-code class="target" position="beginning">
-        %PYARG_0 = %CONVERTTOPYTHON[%RETURN_TYPE](%CPPSELF.%FUNCTION_NAME());
-      </inject-code>
-      <modify-argument index="return">
-        <parent index="this" action="add"/>
-      </modify-argument>
-    </modify-function>
-    <modify-function signature="deleteLater()">
-      <modify-argument index="this">
-        <define-ownership owner="c++"/>
-      </modify-argument>
-    </modify-function>
-    <!-- Invalidate-after-use stuff -->
-    <modify-function signature="childEvent(QChildEvent*)">
-        <modify-argument index="1" invalidate-after-use="yes"/>
-    </modify-function>
-    <modify-function signature="customEvent(QEvent*)">
-        <modify-argument index="1" invalidate-after-use="yes"/>
-    </modify-function>
-    <modify-function signature="event(QEvent*)">
-        <modify-argument index="1" invalidate-after-use="yes"/>
-    </modify-function>
-    <modify-function signature="eventFilter(QObject*,QEvent*)">
-        <modify-argument index="2" invalidate-after-use="yes"/>
-    </modify-function>
-    <modify-function signature="timerEvent(QTimerEvent*)">
-        <modify-argument index="1" invalidate-after-use="yes"/>
-    </modify-function>
-    <!-- End of Invalidate-after-use fix -->
-    <modify-function signature="parent() const">
-      <modify-argument index="this">
-        <parent index="return" action="add"/>
-      </modify-argument>
-    </modify-function>
-    <modify-function signature="setParent(QObject*)">
-      <modify-argument index="this">
-        <parent index="1" action="add"/>
-      </modify-argument>
-    </modify-function>
-    <modify-function signature="thread() const" remove="all"/>
-    <modify-function signature="connect(const QObject*, const char*, const char *, Qt::ConnectionType) const">
-        <inject-code class="target" position="beginning" file="">
-        // %FUNCTION_NAME() - disable generation of function call.
-        %PYARG_0 = %CONVERTTOPYTHON[bool](qobjectConnect(%1, %2, %CPPSELF, %3, %4));
-        </inject-code>
-    </modify-function>
-    <modify-function signature="connect(const QObject*, const char*, const QObject*, const char *, Qt::ConnectionType)">
-        <inject-code class="target" position="beginning" file="">
-        // %FUNCTION_NAME() - disable generation of function call.
-        %PYARG_0 = %CONVERTTOPYTHON[bool](qobjectConnect(%1, %2, %3, %4, %5));
-        </inject-code>
-    </modify-function>
-    <inject-code class="native" position="beginning" file="glue/qobject_connect.cpp" />
-    <add-function signature="connect(const QObject*, const char*, PyCallable*, Qt::ConnectionType)" return-type="bool" static="yes">
-        <modify-argument index="4">
-            <replace-default-expression with="Qt::AutoConnection" />
-        </modify-argument>
-        <inject-code class="target" position="beginning">
-        // %FUNCTION_NAME() - disable generation of function call.
-        %PYARG_0 = %CONVERTTOPYTHON[bool](qobjectConnectCallback(%1, %2, %PYARG_3, %4));
-        </inject-code>
-    </add-function>
-    <!-- static version -->
-    <add-function signature="connect(const char*, PyCallable*, Qt::ConnectionType)" return-type="bool">
-        <modify-argument index="3">
-            <replace-default-expression with="Qt::AutoConnection" />
-        </modify-argument>
-        <inject-code class="target" position="beginning">
-        // %FUNCTION_NAME() - disable generation of function call.
-        %PYARG_0 = %CONVERTTOPYTHON[bool](qobjectConnectCallback(%CPPSELF, %1, %PYARG_2, %3));
-        </inject-code>
-    </add-function>
-    <add-function signature="connect(const char*, const QObject*, const char *, Qt::ConnectionType)" return-type="bool">
-        <modify-argument index="4">
-            <replace-default-expression with="Qt::AutoConnection" />
-        </modify-argument>
-        <inject-code class="target" position="beginning">
-        // %FUNCTION_NAME() - disable generation of function call.
-        %PYARG_0 = %CONVERTTOPYTHON[bool](qobjectConnect(%CPPSELF, %1, %2, %3, %4));
-        </inject-code>
-    </add-function>
-    <add-function signature="emit(const char*, ...)" return-type="bool">
-        <inject-code class="target" position="beginning">
-            %PYARG_0 = %CONVERTTOPYTHON[bool](PySide::SignalManager::instance().emitSignal(%CPPSELF, %1, %PYARG_2));
-        </inject-code>
-    </add-function>
-    <add-function signature="disconnect(const char *, PyCallable*)" return-type="bool">
-         <inject-code class="target" position="beginning">
-        // %FUNCTION_NAME() - disable generation of function call.
-        %PYARG_0 = %CONVERTTOPYTHON[bool](qobjectDisconnectCallback(%CPPSELF, %1, %2));
-        </inject-code>
-    </add-function>
-    <add-function signature="disconnect(const QObject*, const char*, PyCallable*)" return-type="bool" static="yes">
-         <inject-code class="target" position="beginning">
-        // %FUNCTION_NAME() - disable generation of function call.
-        %PYARG_0 = %CONVERTTOPYTHON[bool](qobjectDisconnectCallback(%1, %2, %3));
-        </inject-code>
-    </add-function>
-    <inject-code class="native" position="beginning">
-        static bool
-        qobjectInheritsInternal(PyTypeObject *objType, const char *class_name)
-        {
-            if (strcmp(objType->tp_name, class_name) == 0)
-                return true;
-
-            PyTypeObject* base = (objType)->tp_base;
-            if (base == 0)
-                return false;
-            return qobjectInheritsInternal(base, class_name);
-        }
-    </inject-code>
-    <modify-function signature="inherits(const char*) const">
-        <inject-code class="target" position="beginning">
-            bool retval =  qobjectInheritsInternal(self->ob_type, %1) ? true : %CPPSELF.%FUNCTION_NAME(%1);
-            %PYARG_0 = %CONVERTTOPYTHON[bool](retval);
-        </inject-code>
-    </modify-function>
-    <!-- findChildren and findChild causes warnings using generator. They were kept
-         here to avoid generation even removing QT_NO_MEMBER_TEMPLATES and QT_NO_REGEXP
-         from #define section-->
-    <modify-function signature="findChildren(const QRegExp &amp;) const" remove="all"/>
-    <modify-function signature="findChildren(const QString &amp;) const" remove="all"/>
-    <modify-function signature="findChild(const QString &amp;) const" remove="all" />
-    <inject-code class="native" file="glue/qobject_findchild.cpp"/>
-    <add-function signature="findChild(PyTypeObject*, const QString&amp;)" return-type="PyObject*">
-        <inject-code class="target" position="beginning">
-            %PYARG_0 = %CONVERTTOPYTHON[QObject*](_findChildHelper(%CPPSELF, %2, (PyTypeObject*)%PYARG_1));
-        </inject-code>
-      <modify-argument index="return">
-        <parent index="this" action="add"/>
-      </modify-argument>
-    </add-function>
-    <add-function signature="findChildren(PyTypeObject*, const QString&amp;)" return-type="PySequence*" >
-        <inject-code class="target" position="beginning">
-            %PYARG_0 = PyList_New(0);
-            _findChildrenHelper(%CPPSELF, %2, (PyTypeObject*)%PYARG_1, %PYARG_0);
-        </inject-code>
-        <modify-argument index="return">
-            <parent index="this" action="add"/>
-        </modify-argument>
-    </add-function>
-
-    <add-function signature="tr(const char *, const char *, int)" return-type="QString">
-        <modify-argument index="2">
-          <replace-default-expression with="0"/>
-        </modify-argument>
-        <modify-argument index="3">
-          <replace-default-expression with="-1"/>
-        </modify-argument>
-
-        <inject-code class="target" position="beginning">
-            QString result;
-            if (QCoreApplication::instance()) {
-                PyObject *klass = PyObject_GetAttrString(%PYSELF, "__class__");
-                PyObject *cname = PyObject_GetAttrString(klass, "__name__");
-                result = QString(QCoreApplication::instance()->translate(PyString_AsString(cname), %1, %2, QCoreApplication::CodecForTr, %3));
-
-                Py_DECREF(klass);
-                Py_DECREF(cname);
-            } else {
-                result = QString(QString::fromLatin1(%1));
-            }
-            %PYARG_0 = %CONVERTTOPYTHON[QString](result);
-        </inject-code>
-    </add-function>
-
-    <add-function signature="trUtf8(const char *, const char *, int)" return-type="QString">
-        <modify-argument index="2">
-          <replace-default-expression with="0"/>
-        </modify-argument>
-        <modify-argument index="3">
-          <replace-default-expression with="-1"/>
-        </modify-argument>
-        <inject-code class="target" position="beginning">
-            QString result;
-            if (QCoreApplication::instance()) {
-                PyObject *klass = PyObject_GetAttrString(%PYSELF, "__class__");
-                PyObject *cname = PyObject_GetAttrString(klass, "__name__");
-                result = QString(QCoreApplication::instance()->translate(PyString_AsString(cname), %1, %2, QCoreApplication::UnicodeUTF8, %3));
-
-                Py_DECREF(klass);
-                Py_DECREF(cname);
-            } else {
-                result = QString(QString::fromLatin1(%1));
-            }
-            %PYARG_0 = %CONVERTTOPYTHON[QString](result);
-        </inject-code>
-    </add-function>
-
-   <modify-function signature="receivers(const char*) const">
-     <inject-code class="target" position="beginning">
-       // Avoid return +1 because SignalManager connect to "destroyed()" signal to control object timelife
-       int ret = %CPPSELF.%FUNCTION_NAME(%1);
-       if (ret > 0 &amp;&amp; strcmp(%1, SIGNAL(destroyed())) == 0 &amp;&amp; PySide::SignalManager::instance().hasConnectionWith(%CPPSELF))
-           ret--;
-       %PYARG_0 = %CONVERTTOPYTHON[int](ret);
-     </inject-code>
-   </modify-function>
-
-   <modify-function signature="sender() const">
-      <modify-argument index="return">
-         <define-ownership owner="target"/>
-      </modify-argument>
-    </modify-function>
-  </object-type>
-  <value-type name="QVariant">
-    <conversion-rule file="qvariant_conversions.h" />
-    <modify-function signature="create(int,const void*)" remove="all" />
-
-    <!-- QVariant constructor is a beast with its own rules -->
-    <modify-function signature="QVariant(float)" remove="all"/>
-    <modify-function signature="QVariant(int)" remove="all"/>
-    <modify-function signature="QVariant(double)" remove="all"/>
-    <modify-function signature="QVariant(bool)" remove="all"/>
-    <modify-function signature="QVariant(qlonglong)" remove="all"/>
-    <modify-function signature="QVariant(int, const void*)" remove="all"/>
-    <modify-function signature="QVariant(int,const void*,uint)" remove="all"/>
-    <!-- handled by inject code -->
-    <modify-function signature="QVariant(uint)" remove="all"/>
-    <modify-function signature="QVariant(qulonglong)" remove="all"/>
-    <modify-function signature="QVariant(const QByteArray&amp;)">
-        <access modifier="private" />
-    </modify-function>
-    <modify-function signature="QVariant(QDataStream&amp;)" remove="all"/>
-    <modify-function signature="QVariant(const QBitArray&amp;)">
-        <access modifier="private" />
-    </modify-function>
-    <modify-function signature="QVariant(const QString&amp;)">
-        <access modifier="private" />
-    </modify-function>
-    <modify-function signature="QVariant(const QLatin1String&amp;)" remove="all"/>
-    <modify-function signature="QVariant(const QStringList&amp;)" remove="all"/>
-    <modify-function signature="QVariant(const QChar&amp;)">
-        <access modifier="private" />
-    </modify-function>
-    <modify-function signature="QVariant(const QDate&amp;)">
-        <access modifier="private" />
-    </modify-function>
-    <modify-function signature="QVariant(const QTime&amp;)">
-        <access modifier="private" />
-    </modify-function>
-    <modify-function signature="QVariant(const QDateTime&amp;)">
-        <access modifier="private" />
-    </modify-function>
-    <modify-function signature="QVariant(const QSize&amp;)">
-        <access modifier="private" />
-    </modify-function>
-    <modify-function signature="QVariant(const QSizeF&amp;)">
-        <access modifier="private" />
-    </modify-function>
-    <modify-function signature="QVariant(const QPoint&amp;)">
-        <access modifier="private" />
-    </modify-function>>
-    <modify-function signature="QVariant(const QPointF&amp;)">
-        <access modifier="private" />
-    </modify-function>
-    <modify-function signature="QVariant(const QRect&amp;)">
-        <access modifier="private" />
-    </modify-function>
-    <modify-function signature="QVariant(const QRectF&amp;)" >
-        <access modifier="private" />
-    </modify-function>
-    <modify-function signature="QVariant(const QUrl&amp;)">
-        <access modifier="private" />
-    </modify-function>
-    <modify-function signature="QVariant(const QLocale&amp;)">
-        <access modifier="private" />
-    </modify-function>
-    <modify-function signature="QVariant(const QRegExp&amp;)">
-        <access modifier="private" />
-    </modify-function>
-    <modify-function signature="QVariant(QHash&lt;QString,QVariant>)" remove="all" />
-    <modify-function signature="QVariant(QMap&lt;QString,QVariant>)" remove="all" />
-    <modify-function signature="QVariant(QList&lt;QVariant>)" remove="all" />
-    <modify-function signature="QVariant(QVariant)" remove="all" />
-    <modify-function signature="QVariant(QLine)">
-        <access modifier="private" />
-    </modify-function>
-    <modify-function signature="QVariant(QLineF)">
-        <access modifier="private" />
-    </modify-function>
-
-    <add-function signature="QVariant(PyObject*)">
-        <inject-code class="target" position="beginning">
-        %0 = new %TYPE(%CONVERTTOCPP[QVariant](%PYARG_1));
-        </inject-code>
-    </add-function>
-    <add-function signature="toPyObject()" return-type="PyObject*">
-        <inject-code class="target" position="beginning">
-            uint typeId = %CPPSELF.userType();
-            if (typeId == qMetaTypeId&lt;PyQt_PyObject>()) {
-                %PYARG_0 = %CPPSELF.value&lt;PyQt_PyObject>();
-            } else if (typeId == QVariant::String) {
-                %PYARG_0 = %CONVERTTOPYTHON[QString](%CPPSELF.toString());
-            } else {
-                %PYARG_0 = Py_None;
-                Py_INCREF(Py_None);
-            }
-        </inject-code>
-    </add-function>
-    <modify-function signature="typeName()const">
-      <inject-code class="target" position="beginning">
-        if (%CPPSELF.isNull()) {
-            %PYARG_0 = Py_None;
-            Py_INCREF(Py_None);
-        } else if (%CPPSELF.userType() == qMetaTypeId&lt;PyQt_PyObject>()) {
-            // emulate PyQt4 behaviour
-            PyObject* obj = %CPPSELF.value&lt;PyQt_PyObject>();
-            if (PySequence_Check(obj))
-                %PYARG_0 = %CONVERTTOPYTHON[%RETURN_TYPE]("QVariantList");
-        }
-        if (!%PYARG_0)
-            %PYARG_0 = %CONVERTTOPYTHON[%RETURN_TYPE](%CPPSELF.%FUNCTION_NAME());
-      </inject-code>
-    </modify-function>
-    <modify-function signature="toList()const">
-        <inject-code class="target" position="beginning">
-            if (%CPPSELF.userType() == qMetaTypeId&lt;PyQt_PyObject>()) {
-                PyObject* val = %CPPSELF.value&lt;PyQt_PyObject>();
-                if (PySequence_Check(val)) {
-                    %PYARG_0 = val;
-                    Py_INCREF(val);
-                } else {
-                    %PYARG_0 = Py_None;
-                    Py_INCREF(Py_None);
-                }
-            } else {
-                %PYARG_0 = %CONVERTTOPYTHON[%RETURN_TYPE](%CPPSELF.%FUNCTION_NAME());
-            }
-        </inject-code>
-    </modify-function>
-    <modify-function signature="toDouble(bool*)const">
-      <modify-argument index="1">
-        <remove-argument/>
-      </modify-argument>
-      <inject-code class="target" position="beginning">
-        <insert-template name="fix_bool*"/>
-      </inject-code>
-    </modify-function>
-    <modify-function signature="toInt(bool*)const">
-      <modify-argument index="1">
-        <remove-argument/>
-      </modify-argument>
-      <inject-code class="target" position="beginning">
-        <insert-template name="fix_bool*"/>
-      </inject-code>
-    </modify-function>
-    <modify-function signature="toLongLong(bool*)const">
-      <modify-argument index="1">
-        <remove-argument/>
-      </modify-argument>
-      <inject-code class="target" position="beginning">
-        <insert-template name="fix_bool*"/>
-      </inject-code>
-    </modify-function>
-    <modify-function signature="toUInt(bool*)const">
-      <modify-argument index="1">
-        <remove-argument/>
-      </modify-argument>
-      <inject-code class="target" position="beginning">
-        <insert-template name="fix_bool*"/>
-      </inject-code>
-    </modify-function>
-    <modify-function signature="toULongLong(bool*)const">
-      <modify-argument index="1">
-        <remove-argument/>
-      </modify-argument>
-      <inject-code class="target" position="beginning">
-        <insert-template name="fix_bool*"/>
-      </inject-code>
-    </modify-function>
-  </value-type>
-  <value-type name="QStringList">
-    <conversion-rule file="qstringlist_conversions.h"/>
-    <modify-function signature="fromVector(QVector&lt;QString>)" remove="all" />
-    <add-function signature="__len__">
-        <inject-code class="target" position="beginning">
-            return %CPPSELF.count();
-        </inject-code>
-    </add-function>
-    <add-function signature="__getitem__">
-        <inject-code class="target" position="beginning">
-            if (_i &lt; 0 || _i >= %CPPSELF.size()) {
-                PyErr_SetString(PyExc_IndexError, "index out of bounds");
-                return 0;
-            }
-            return %CONVERTTOPYTHON[QString](%CPPSELF.at(_i));
-        </inject-code>
-    </add-function>
-    <add-function signature="__setitem__">
-        <inject-code class="target" position="beginning">
-            PyObject* args = Py_BuildValue("(nO)", _i, _value);
-            PyObject* result = SbkQStringListFunc_replace(self, args);
-            Py_DECREF(args);
-            Py_XDECREF(result);
-            return !result ? -1 : 0;
-        </inject-code>
-    </add-function>
-    <add-function signature="__getslice__">
-        <inject-code class="target" position="beginning">
-            <insert-template name="get_slice"/>
-        </inject-code>
-    </add-function>
-    <add-function signature="__setslice__">
-        <inject-code class="target" position="beginning">
-            <!--
-            PyObject* result = 0;
-            Py_ssize_t start, end;
-            Py_ssize_t len = %CPPSELF->count();
-
-            if (_i1 &gt; len)
-               start = len;
-            else if (_i1 &lt; 0)
-               start = 0;
-            else
-               start = _i1;
-
-            if (_i2 &gt; len)
-               end = len;
-            else if (_i2 &lt; 0)
-               end = 0;
-            else
-               end = _i2;
-
-            if (start &lt; end) {
-                Py_ssize_t i;
-                for (Py_ssize_t i = _value->count(); i &gt; -1; i++) {
-                    PyObject* args = Py_BuildValue("(nO)", start, %CPPSELF->at(i));
-                    result = SbkQStringList_insert(self, args);
-                    Py_XDECREF(args);
-                    Py_XDECREF(result);
-                }
-                for (i = start; i &lt; end; i++)
-                    SbkQStringList_removeAt(self, Py_BuildValue("(n)", i));
-            }
-            return !result ? -1 : 0;
-            -->
-            return 0;
-        </inject-code>
-    </add-function>
-  </value-type>
-  <object-type name="QAbstractListModel" polymorphic-id-expression="qobject_cast&lt;QAbstractListModel*&gt;(%1)">
-    <extra-includes>
-      <include file-name="QStringList" location="global"/>
-      <include file-name="QSize" location="global"/>
-    </extra-includes>
-  </object-type>
-  <value-type name="QUrl">
-    <extra-includes>
-      <include file-name="QStringList" location="global"/>
-    </extra-includes>
-  </value-type>
-  <value-type name="QRegExp">
-    <extra-includes>
-      <include file-name="QStringList" location="global"/>
-    </extra-includes>
-  </value-type>
-  <value-type name="QFileInfo">
-    <extra-includes>
-      <include file-name="QDateTime" location="global"/>
-      <include file-name="QDir" location="global"/>
-    </extra-includes>
-  </value-type>
-  <value-type name="QByteArray" hash-function="qHash">
-    <extra-includes>
-      <include file-name="QNoImplicitBoolCast" location="global"/>
-    </extra-includes>
-    <modify-function signature="QByteArray(const char *)">
-        <!-- Keep \x00 bytes passed in python strings -->
-        <inject-code class="target" position="beginning">
-            int size = PyString_Size(pyargs[0]);
-            %0 = new QByteArray(cpp_arg0, size);
-        </inject-code>
-    </modify-function>
-    <!-- buffer protocol -->
-    <inject-code class="native" position="beginning" file="glue/qbytearray_bufferprotocol.cpp" />
-    <inject-code class="target" position="end">
-        #if PY_VERSION_HEX &lt; 0x03000000
-            Shiboken::SbkType&lt;QByteArray>()->tp_as_buffer = &amp;SbkQByteArrayBufferProc;
-            Shiboken::SbkType&lt;QByteArray>()->tp_flags |= Py_TPFLAGS_HAVE_GETCHARBUFFER;
-        #endif
-    </inject-code>
-    <!-- removed functions -->
-    <modify-function signature="begin()" remove="all"/>
-    <modify-function signature="begin()const" remove="all"/>
-    <modify-function signature="constBegin()const" remove="all"/>
-    <modify-function signature="constData()const" remove="all"/>
-    <modify-function signature="constEnd()const" remove="all"/>
-    <modify-function signature="end()" remove="all"/>
-    <modify-function signature="end()const" remove="all"/>
-    <modify-function signature="number(uint,int)" remove="all"/>
-    <modify-function signature="number(qulonglong,int)" remove="all"/>
-    <modify-function signature="operator const char *()const" remove="all"/>
-    <modify-function signature="operator const void *()const" remove="all"/>
-    <modify-function signature="operator+=(const char*)" remove="all"/>
-    <modify-function signature="operator=(const char*)" remove="all"/>
-    <modify-function signature="operator[](int)" remove="all"/>
-    <modify-function signature="operator[](int)const" remove="all"/>
-    <modify-function signature="operator[](uint)" remove="all"/>
-    <modify-function signature="operator[](uint)const" remove="all"/>
-    <modify-function signature="push_back(char)" remove="all"/>
-    <modify-function signature="push_back(const QByteArray&amp;)" remove="all"/>
-    <modify-function signature="push_back(const char*)" remove="all"/>
-    <modify-function signature="push_front(char)" remove="all"/>
-    <modify-function signature="push_front(const QByteArray&amp;)" remove="all"/>
-    <modify-function signature="push_front(const char*)" remove="all"/>
-    <modify-function signature="setNum(uint,int)" remove="all"/>
-    <modify-function signature="setNum(qlonglong,int)" remove="all"/>
-    <modify-function signature="setNum(ushort,int)" remove="all"/>
-    <modify-function signature="split(char)const">
-        <modify-argument index="1">
-            <replace-type modified-type="PyString" />
-        </modify-argument>
-        <inject-code class="target" position="beginning">
-            char c = PyString_AS_STRING(%PYARG_1)[0];
-            if (c) {
-               %PYARG_0 = %CONVERTTOPYTHON[%RETURN_TYPE](%CPPSELF.%FUNCTION_NAME(c));
-            }
-        </inject-code>
-    </modify-function>
-    <modify-function signature="toLong(bool*, int) const">
-      <modify-argument index="1">
-        <remove-argument/>
-      </modify-argument>
-      <inject-code class="target" position="beginning">
-        <insert-template name="fix_bool*,arg"/>
-      </inject-code>
-    </modify-function>
-    <modify-function signature="toLongLong(bool*, int) const">
-      <modify-argument index="1">
-        <remove-argument/>
-      </modify-argument>
-      <inject-code class="target" position="beginning">
-        <insert-template name="fix_bool*,arg"/>
-      </inject-code>
-    </modify-function>
-    <modify-function signature="toShort(bool*, int) const">
-      <modify-argument index="1">
-        <remove-argument/>
-      </modify-argument>
-      <inject-code class="target" position="beginning">
-        <insert-template name="fix_bool*,arg"/>
-      </inject-code>
-    </modify-function>
-    <modify-function signature="toUInt(bool*, int) const">
-      <modify-argument index="1">
-        <remove-argument/>
-      </modify-argument>
-      <inject-code class="target" position="beginning">
-        <insert-template name="fix_bool*,arg"/>
-      </inject-code>
-    </modify-function>
-    <modify-function signature="toULong(bool*, int) const">
-      <modify-argument index="1">
-        <remove-argument/>
-      </modify-argument>
-      <inject-code class="target" position="beginning">
-        <insert-template name="fix_bool*,arg"/>
-      </inject-code>
-    </modify-function>
-    <modify-function signature="toULongLong(bool*, int) const">
-      <modify-argument index="1">
-        <remove-argument/>
-      </modify-argument>
-      <inject-code class="target" position="beginning">
-        <insert-template name="fix_bool*,arg"/>
-      </inject-code>
-    </modify-function>
-    <modify-function signature="toInt(bool*,int)const">
-      <modify-argument index="1">
-        <remove-argument/>
-      </modify-argument>
-      <inject-code class="target" position="beginning">
-        <insert-template name="fix_bool*,arg"/>
-      </inject-code>
-    </modify-function>
-    <modify-function signature="toUShort(bool*,int)const">
-      <modify-argument index="1">
-        <remove-argument/>
-      </modify-argument>
-      <inject-code class="target" position="beginning">
-        <insert-template name="fix_bool*,arg"/>
-      </inject-code>
-    </modify-function>
-    <modify-function signature="QByteArray(const char*,int)" remove="all"/>
-    <modify-function signature="replace(const char*,int,const char*,int)" remove="all"/>
-    <modify-function signature="append(QByteArray)">
-      <modify-argument index="0" replace-value="this"/>
-    </modify-function>
-    <modify-function signature="append(QString)">
-      <modify-argument index="0" replace-value="this"/>
-    </modify-function>
-    <modify-function signature="append(const char *)" remove="all">
-      <modify-argument index="0" replace-value="this"/>
-    </modify-function>
-    <modify-function signature="append(char)">
-      <modify-argument index="0" replace-value="this"/>
-      <rename to="appendByte"/>
-    </modify-function>
-    <modify-function signature="count(const char *)const" remove="all"/>
-    <modify-function signature="data()" remove="all"/>
-    <modify-function signature="endsWith(const char *)const" remove="all"/>
-    <modify-function signature="fill(char,int)">
-      <modify-argument index="0" replace-value="this"/>
-    </modify-function>
-    <modify-function signature="indexOf(const char*,int)const" remove="all"/>
-    <modify-function signature="indexOf(char,int)const">
-      <rename to="indexOfByte"/>
-    </modify-function>
-    <modify-function signature="insert(int,QByteArray)">
-      <modify-argument index="0" replace-value="this"/>
-    </modify-function>
-    <modify-function signature="insert(int,QString)">
-      <modify-argument index="0" replace-value="this"/>
-    </modify-function>
-    <modify-function signature="insert(int,const char *)" remove="all"/>
-    <modify-function signature="insert(int,char)">
-      <modify-argument index="0" replace-value="this"/>
-      <rename to="insertByte"/>
-    </modify-function>
-    <modify-function signature="lastIndexOf(const char*,int)const" remove="all"/>
-    <modify-function signature="lastIndexOf(char,int)const">
-      <rename to="lastIndexOfByte"/>
-    </modify-function>
-    <modify-function signature="prepend(QByteArray)">
-      <modify-argument index="0" replace-value="this"/>
-    </modify-function>
-    <modify-function signature="prepend(const char *)" remove="all"/>
-    <modify-function signature="prepend(char)">
-      <modify-argument index="0" replace-value="this"/>
-      <rename to="prependByte"/>
-    </modify-function>
-    <modify-function signature="remove(int,int)">
-      <modify-argument index="0" replace-value="this"/>
-    </modify-function>
-    <modify-function signature="replace(int,int,QByteArray)">
-      <modify-argument index="0" replace-value="this"/>
-    </modify-function>
-    <modify-function signature="replace(int,int,const char *)" remove="all"/>
-    <modify-function signature="replace(QByteArray,QByteArray)">
-      <modify-argument index="0" replace-value="this"/>
-    </modify-function>
-    <modify-function signature="replace(const char*,QByteArray)" remove="all"/>
-    <modify-function signature="replace(QByteArray,const char *)" remove="all"/>
-    <modify-function signature="replace(QString,QByteArray)">
-      <modify-argument index="0" replace-value="this"/>
-    </modify-function>
-    <modify-function signature="replace(QString,const char *)" remove="all"/>
-    <modify-function signature="replace(const char *,const char *)" remove="all"/>
-    <modify-function signature="replace(char,QByteArray)">
-      <modify-argument index="0" replace-value="this"/>
-    </modify-function>
-    <modify-function signature="replace(char,QString)">
-      <modify-argument index="0" replace-value="this"/>
-    </modify-function>
-    <modify-function signature="replace(char,const char *)" remove="all"/>
-    <modify-function signature="replace(char,char)">
-      <modify-argument index="0" replace-value="this"/>
-    </modify-function>
-    <modify-function signature="startsWith(const char *)const" remove="all"/>
-    <modify-function signature="fromRawData(const char*,int)" remove="all"/>
-    <modify-function signature="number(int,int)">
-      <rename to="fromInt"/>
-    </modify-function>
-    <modify-function signature="number(uint,int)">
-      <rename to="fromUInt"/>
-    </modify-function>
-    <modify-function signature="number(qlonglong,int)">
-      <rename to="fromLongLong"/>
-    </modify-function>
-    <modify-function signature="number(qulonglong,int)">
-      <rename to="fromULongLong"/>
-    </modify-function>
-    <modify-function signature="setNum(int,int)">
-      <modify-argument index="0" replace-value="this"/>
-      <rename to="setInt"/>
-    </modify-function>
-    <modify-function signature="setNum(uint,int)">
-      <modify-argument index="0" replace-value="this"/>
-      <rename to="setUInt"/>
-    </modify-function>
-    <modify-function signature="setNum(short,int)">
-      <modify-argument index="0" replace-value="this"/>
-      <rename to="setShort"/>
-    </modify-function>
-    <modify-function signature="setNum(ushort,int)">
-      <modify-argument index="0" replace-value="this"/>
-      <rename to="setUShort"/>
-    </modify-function>
-    <modify-function signature="setNum(qlonglong,int)">
-      <modify-argument index="0" replace-value="this"/>
-      <rename to="setLongLong"/>
-    </modify-function>
-    <modify-function signature="setNum(qulonglong,int)">
-      <modify-argument index="0" replace-value="this"/>
-      <rename to="setULongLong"/>
-    </modify-function>
-    <modify-function signature="setNum(double,char,int)">
-      <modify-argument index="0" replace-value="this"/>
-      <rename to="setDouble"/>
-    </modify-function>
-    <modify-function signature="setNum(float,char,int)">
-      <modify-argument index="0" replace-value="this"/>
-      <rename to="setFloat"/>
-    </modify-function>
-    <modify-function signature="toDouble(bool*)const">
-      <modify-argument index="1">
-        <remove-argument/>
-      </modify-argument>
-      <inject-code class="target" position="beginning">
-        <insert-template name="fix_bool*"/>
-      </inject-code>
-    </modify-function>
-    <modify-function signature="toFloat(bool*)const">
-      <modify-argument index="1">
-        <remove-argument/>
-      </modify-argument>
-      <inject-code class="target" position="beginning">
-        <insert-template name="fix_bool*"/>
-      </inject-code>
-    </modify-function>
-    <add-function signature="__str__()" return-type="PyObject*">
-        <inject-code class="target" position="beginning">
-            %PYARG_0 = PyString_FromString(%CPPSELF.data());
-        </inject-code>
-    </add-function>
-    <add-function signature="__len__">
-        <inject-code class="target" position="beginning">
-            return %CPPSELF.count();
-        </inject-code>
-    </add-function>
-    <add-function signature="__getitem__">
-        <inject-code class="target" position="beginning">
-                if (_i &lt; 0 || _i >= %CPPSELF.size()) {
-                    PyErr_SetString(PyExc_IndexError, "index out of bounds");
-                    return 0;
-                } else {
-                    char res[2];
-                    res[0] = %CPPSELF.at(_i);
-                    res[1] = 0;
-                    return PyString_FromString(res);
-                }
-        </inject-code>
-    </add-function>
-    <add-function signature="__setitem__">
-        <inject-code class="target" position="beginning">
-                %CPPSELF.remove(_i, 1);
-                PyObject* args = Py_BuildValue("(nO)", _i, _value);
-                PyObject* result = SbkQByteArrayFunc_insert(self, args);
-                Py_DECREF(args);
-                Py_XDECREF(result);
-                return !result ? -1 : 0;
-        </inject-code>
-    </add-function>
-  </value-type>
-  <value-type name="QTextBoundaryFinder">
-    <modify-function signature="QTextBoundaryFinder(QTextBoundaryFinder::BoundaryType,const QChar*,int,unsigned char*,int)" remove="all"/>
-  </value-type>
-  <object-type name="QXmlStreamEntityResolver"/>
-  <object-type name="QAbstractEventDispatcher">
-    <extra-includes>
-      <include file-name="QPair" location="global"/>
-    </extra-includes>
-    <modify-function signature="processEvents(QFlags&lt;QEventLoop::ProcessEventsFlag>)" allow-thread="yes"/>
-  </object-type>
-  <object-type name="QEventLoop">
-      <modify-function signature="exec(QFlags&lt;QEventLoop::ProcessEventsFlag>)" rename="exec_" allow-thread="yes" />
-      <modify-function signature="processEvents(QFlags&lt;QEventLoop::ProcessEventsFlag>)" allow-thread="yes" />
-      <modify-function signature="processEvents(QFlags&lt;QEventLoop::ProcessEventsFlag>, int)" allow-thread="yes" />
-  </object-type>
-  <object-type name="QFile">
-    <extra-includes>
-      <include file-name="QAbstractFileEngine" location="global"/>
-    </extra-includes>
-    <modify-function signature="unmap(uchar*)" remove="all"/>
-    <!-- Can't provide same API and performance -->
-    <modify-function signature="open(int,QFlags&lt;QIODevice::OpenModeFlag&gt;)" remove="all"/>
-    <modify-function signature="decodeName(const char*)" remove="all"/>
-    <modify-function signature="map(qint64,qint64,QFile::MemoryMapFlags)" remove="all"/>
-    <modify-function signature="unmap(uchar*)" remove="all"/>
-
-    <modify-function signature="remove()" allow-thread="yes"/>
-    <modify-function signature="remove(const QString&amp;)" allow-thread="yes"/>
-    <modify-function signature="rename(const QString&amp;)" allow-thread="yes"/>
-    <modify-function signature="rename(const QString&amp;, const QString&amp;)" allow-thread="yes"/>
-    <modify-function signature="link(const QString&amp;)" allow-thread="yes"/>
-    <modify-function signature="link(const QString&amp;, const QString&amp;)" allow-thread="yes"/>
-    <modify-function signature="copy(const QString&amp;)" allow-thread="yes"/>
-    <modify-function signature="copy(const QString&amp;, const QString&amp;)" allow-thread="yes"/>
-    <modify-function signature="flush()" allow-thread="yes"/>
-  </object-type>
-  <object-type name="QIODevice">
-    <modify-function signature="open(QFlags&lt;QIODevice::OpenModeFlag>)" allow-thread="yes"/>
-    <modify-function signature="close()" allow-thread="yes"/>
-    <modify-function signature="seek(qint64)" allow-thread="yes"/>
-    <modify-function signature="readAll()" allow-thread="yes"/>
-    <modify-function signature="peek(qint64)" allow-thread="yes"/>
-    <modify-function signature="write(const QByteArray&amp;)" allow-thread="yes"/>
-    <modify-function signature="waitForReadyRead(int)" allow-thread="yes"/>
-    <modify-function signature="waitForBytesWritten(int)" allow-thread="yes"/>
-    <modify-function signature="peek(char *,qint64)" remove="all"/>
-    <modify-function signature="read(char *,qint64)" remove="all"/>
-<!--     Needed by QNetworkReply class on QtNetwork module -->
-<!--     <modify-function signature="readData(char *,qint64)" remove="all"/> -->
-    <modify-function signature="readLine(char *,qint64)" remove="all"/>
-    <modify-function signature="write(const char *,qint64)" remove="all"/>
-    <modify-function signature="getChar(char *)">
-        <modify-argument index="1">
-            <remove-argument />
-            <remove-default-expression />
-        </modify-argument>
-        <inject-code class="target" position="beginning">
-            <insert-template name="fix_char*" />
-        </inject-code>
-    </modify-function>
-  </object-type>
-  <object-type name="QCryptographicHash">
-    <modify-function signature="addData(const char*,int)" remove="all"/>
-  </object-type>
-  <object-type name="QLibraryInfo"/>
-  <object-type name="QMutexLocker" copyable="no">
-    <modify-function signature="QMutexLocker(QMutex*)" allow-thread="yes" />
-    <modify-function signature="relock()" allow-thread="yes"/>
-    <modify-function signature="mutex() const">
-      <modify-argument index="return">
-        <parent index="this" action="add"/>
-      </modify-argument>
-    </modify-function>
-  </object-type>
-
-  <object-type name="QMutex">
-    <modify-function signature="lock()" allow-thread="yes"/>
-    <modify-function signature="tryLock(int)" allow-thread="yes"/>
-  </object-type>
-  <object-type name="QSemaphore">
-    <modify-function signature="acquire(int)" allow-thread="yes"/>
-    <modify-function signature="tryAcquire(int, int)" allow-thread="yes"/>
-  </object-type>
-  <object-type name="QSocketNotifier"/>
-  <object-type name="QSystemLocale"/>
-  <object-type name="QSysInfo"/>
-  <object-type name="QTemporaryFile">
-    <extra-includes>
-      <include file-name="QAbstractFileEngine" location="global"/>
-    </extra-includes>
-    <modify-function signature="createLocalFile(const QString&amp;)" allow-thread="yes"/>
-  </object-type>
-  <object-type name="QMimeData">
-    <extra-includes>
-      <include file-name="QStringList" location="global"/>
-      <include file-name="QUrl" location="global"/>
-    </extra-includes>
-  </object-type>
-  <object-type name="QTextCodec">
-    <modify-function signature="setCodecForTr(QTextCodec*)">
-      <modify-argument index="1">
-        <parent index="this" action="add"/>
-      </modify-argument>
-    </modify-function>
-    <modify-function signature="setCodecForCStrings(QTextCodec*)">
-      <modify-argument index="1">
-        <parent index="this" action="add"/>
-      </modify-argument>
-    </modify-function>
-    <modify-function signature="setCodecForLocale(QTextCodec*)">
-      <modify-argument index="1">
-        <parent index="this" action="add"/>
-      </modify-argument>
-    </modify-function>
-  </object-type>
-  <object-type name="QTextDecoder">
-    <modify-function signature="toUnicode(const char*,int)">
-      <remove/>
-    </modify-function>
-    <modify-function signature="toUnicode(QString*,const char*,int)" remove="all"/>
-  </object-type>
-  <object-type name="QTextEncoder">
-    <modify-function signature="fromUnicode(const QChar*,int)">
-      <remove/>
-    </modify-function>
-  </object-type>
-  <object-type name="QTimeLine"/>
-  <object-type name="QTranslator">
-    <modify-function signature="translate(const char*,const char*,const char*,int)const" remove="all" />
-    <modify-function signature="load(const uchar*, int)" remove="all" />
-  </object-type>
-  <object-type name="QWaitCondition">
-    <modify-function signature="wait(QMutex*, unsigned long)" allow-thread="yes"/>
-    <modify-function signature="wait(QReadWriteLock*, unsigned long)" allow-thread="yes"/>
-  </object-type>
-  <object-type name="QFileSystemWatcher">
-    <extra-includes>
-      <include file-name="QStringList" location="global"/>
-    </extra-includes>
-  </object-type>
-  <!-- FIXME Removed due to a shiboken bug-->
-  <object-type name="QTextCodec::ConverterState">
-    <include file-name="QTextCodec" location="global"/>
-    <modify-function signature="ConverterState(QFlags&lt;QTextCodec::ConversionFlag&gt;)">
-      <modify-argument index="1">
-        <replace-default-expression with="QTextCodec::DefaultConversion"/>
-      </modify-argument>
-    </modify-function>
-  </object-type>
-  <object-type name="QBuffer">
-    <modify-function signature="buffer()const" remove="all"/>
-    <modify-function signature="data()const" remove="all"/>
-    <modify-function signature="setData(const char*,int)" remove="all"/>
-  </object-type>
-  <object-type name="QTimer">
-    <modify-function signature="singleShot(int,QObject*,const char*)">
-      <inject-code class="target" position="beginning">
-        // %FUNCTION_NAME() - disable generation of c++ function call
-        Shiboken::AutoDecRef emptyTuple(PyTuple_New(0));
-        PyObject* pyTimer = Shiboken::SbkType&lt;QTimer>()->tp_new(Shiboken::SbkType&lt;QTimer>(), emptyTuple, 0);
-        Shiboken::SbkType&lt;QTimer>()->tp_init(pyTimer, emptyTuple, 0);
-
-        QTimer* timer = Converter&lt;QTimer*>::toCpp(pyTimer);
-        PyObject* result = PyObject_CallMethod(pyTimer, const_cast&lt;char*>("connect"), const_cast&lt;char*>("OsOs"), pyTimer, SIGNAL(timeout()), %PYARG_2, %3);
-        Py_DECREF(result);
-        timer->setSingleShot(true);
-        timer->connect(timer, SIGNAL("timeout()"), timer, SLOT("deleteLater()"));
-        timer->start(%1);
-      </inject-code>
-    </modify-function>
-    <add-function signature="singleShot(int, PyCallable*)" static="yes">
-        <inject-code class="target" position="beginning">
-        // %FUNCTION_NAME() - disable generation of c++ function call
-        Shiboken::AutoDecRef emptyTuple(PyTuple_New(0));
-        PyObject* pyTimer = Shiboken::SbkType&lt;QTimer>()->tp_new(Shiboken::SbkType&lt;QTimer>(), emptyTuple, 0);
-        Shiboken::SbkType&lt;QTimer>()->tp_init(pyTimer, emptyTuple, 0);
-        QTimer* timer = Converter&lt;QTimer*>::toCpp(pyTimer);
-        timer->setSingleShot(true);
-        timer->connect(timer, SIGNAL(timeout()), timer, SLOT(deleteLater()));
-        PyObject* result = PyObject_CallMethod(pyTimer, const_cast&lt;char*>("connect"), const_cast&lt;char*>("OsO"), pyTimer, SIGNAL(timeout()), pyargs[1]);
-        Py_DECREF(result);
-        timer->start(cpp_arg0);
-        </inject-code>
-    </add-function>
-  </object-type>
-  <object-type name="QAbstractFileEngineHandler"/>
-  <!-- <object-type name="QAbstractFileEngine::MapExtensionOption" /> -->
-  <!-- <object-type name="QAbstractFileEngine::MapExtensionReturn" /> -->
-  <!-- <object-type name="QAbstractFileEngine::UnMapExtensionOption" /> -->
-  <object-type name="QAbstractFileEngine">
-    <extra-includes>
-      <include file-name="QDateTime" location="global"/>
-    </extra-includes>
-    <modify-function signature="unmap(uchar*)" remove="all"/>
-    <modify-function signature="open(QFlags&lt;QIODevice::OpenModeFlag>)" allow-thread="yes" />
-    <modify-function signature="close()" allow-thread="yes" />
-    <modify-function signature="flush()" allow-thread="yes" />
-    <modify-function signature="seek(qint64)" allow-thread="yes" />
-    <modify-function signature="remove()" allow-thread="yes" />
-    <modify-function signature="copy(const QString&amp;)" allow-thread="yes" />
-    <modify-function signature="rename(const QString&amp;)" allow-thread="yes" />
-    <modify-function signature="link(const QString&amp;)" allow-thread="yes" />
-    <modify-function signature="mkdir(const QString&amp;, bool)const" allow-thread="yes" />
-    <modify-function signature="rmdir(const QString&amp;, bool)const" allow-thread="yes" />
-    <modify-function signature="write(const char*, qint64)" allow-thread="yes" />
-    <modify-function signature="read(char*, qint64)" allow-thread="yes" remove="all" />
-    <modify-function signature="readLine(char*, qint64)" allow-thread="yes" remove="all" />
-  </object-type>
-  <object-type name="QProcess">
-    <modify-function signature="readChannelMode()const" remove="all"/>
-    <modify-function signature="waitForStarted(int)" allow-thread="yes"/>
-    <modify-function signature="waitForBytesWritten(int)" allow-thread="yes"/>
-    <modify-function signature="waitForFinished(int)" allow-thread="yes"/>
-    <modify-function signature="readAllStandardOutput()" allow-thread="yes"/>
-    <modify-function signature="readAllStandardError()" allow-thread="yes"/>
-    <modify-function signature="execute(QString, QStringList)" allow-thread="yes"/>
-    <modify-function signature="execute(QString)" allow-thread="yes"/>
-    <!--### Obsolete in 4.3-->
-    <modify-function signature="setReadChannelMode(QProcess::ProcessChannelMode)" remove="all"/>
-    <modify-function signature="startDetached(QString,QStringList,QString,qint64*)">
-        <modify-argument index="4">
-            <remove-argument />
-        </modify-argument>
-        <inject-code class="target" position="beginning">
-        qint64 pid;
-        %RETURN_TYPE retval = %TYPE::%FUNCTION_NAME(%1, %2, %3, &amp;pid);
-        %PYARG_0 = Shiboken::makeTuple(retval, pid);
-        </inject-code>
-    </modify-function>
-  </object-type>
-  <object-type name="QSignalMapper" />
-  <object-type name="QCoreApplication">
-    <extra-includes>
-      <include file-name="QStringList" location="global"/>
-      <include file-name="QTranslator" location="global"/>
-    </extra-includes>
-    <!-- constructor documentation -->
-    <inject-documentation format="target" mode="append">
-.. class:: QCoreApplication(args)
-
-    Constructs a Qt kernel application. Kernel applications are applications
-    without a graphical user interface. These type of applications are used
-    at the console or as server processes.
-
-    The *args* argument is processed by the application, and made available
-    in a more convenient form by the :meth:`~QCoreApplication.arguments()`
-    method.
-    </inject-documentation>
-    <!-- blocking functions -->
-    <modify-function signature="processEvents(QFlags&lt;QEventLoop::ProcessEventsFlag&gt;, int)" allow-thread="yes"/>
-    <modify-function signature="processEvents(QFlags&lt;QEventLoop::ProcessEventsFlag&gt;)" allow-thread="yes"/>
-    <modify-function signature="flush()" allow-thread="yes"/>
-    <modify-function signature="sendEvent(QObject*, QEvent*)" allow-thread="yes"/>
-    <modify-function signature="sendPostedEvents(QObject*, int)" allow-thread="yes"/>
-    <modify-function signature="sendPostedEvents()" allow-thread="yes"/>
-
-    <modify-function signature="exec()" rename="exec_" allow-thread="yes"/>
-    <modify-function signature="argv()" remove="all"/>
-    <!-- Obsolete -->
-    <modify-function signature="argc()" remove="all"/>
-    <!-- Obsolete -->
-    <modify-function signature="notify(QObject*,QEvent*)" allow-thread="yes">
-      <modify-argument index="2" invalidate-after-use="yes"/>
-    </modify-function>
-    <modify-function signature="QCoreApplication(int &amp;, char  **)" remove="all"/>
-    <inject-code class="native" file="glue/qcoreapplication_init.cpp" position="beginning" />
-    <modify-function signature="postEvent(QObject*,QEvent*)">
-      <modify-argument index="2">
-        <define-ownership owner="c++"/>
-      </modify-argument>
-    </modify-function>
-    <modify-function signature="postEvent(QObject*,QEvent*, int)">
-      <modify-argument index="2">
-        <define-ownership owner="c++"/>
-      </modify-argument>
-    </modify-function>
-    <modify-function signature="arguments()" remove="all"/>
-  </object-type>
-  <object-type name="QSettings">
-    <extra-includes>
-      <include file-name="QStringList" location="global"/>
-    </extra-includes>
-    <modify-function signature="setSystemIniPath(const QString&amp;)" remove="all"/>
-    <!--### Obsolete in 4.3-->
-    <modify-function signature="setUserIniPath(const QString&amp;)" remove="all"/>
-    <!--### Obsolete in 4.3-->
-    <modify-function signature="iniCodec()const" remove="all"/>
-    <!--TODO-->
-  </object-type>
-  <object-type name="QEvent"  polymorphic-id-expression="%1-&gt;type() == QEvent::None" />
-  <object-type name="QChildEvent" polymorphic-id-expression="%1-&gt;type() == QEvent::ChildAdded || %1-&gt;type() == QEvent::ChildPolished || %1-&gt;type() == QEvent::ChildRemoved">
-    <modify-field name="c" read="false" write="false"/>
-    <modify-function signature="child() const">
-      <modify-argument index="return">
-         <define-ownership owner="target"/>
-      </modify-argument>
-    </modify-function>
-  </object-type>
-  <object-type name="QTimerEvent" polymorphic-id-expression="%1-&gt;type() == QEvent::Timer" />
-  <object-type name="QDynamicPropertyChangeEvent" polymorphic-id-expression="%1-&gt;type() == QEvent::DynamicPropertyChange" />
-
-  <template name="stream_read_method">
-      %RETURN_TYPE _cpp_result;
-      (*%CPPSELF) &gt;&gt; _cpp_result;
-      %PYARG_0 = %CONVERTTOPYTHON[%RETURN_TYPE](_cpp_result);
-  </template>
-
-  <template name="stream_write_method">
-      (*%CPPSELF) &lt;&lt; cpp_arg0;
-  </template>
-
-  <object-type name="QDataStream" stream="yes">
-    <extra-includes>
-      <include file-name="QtCore/QtCore" location="global"/>
-    </extra-includes>
-
-    <modify-function signature="setDevice(QIODevice*)">
-      <modify-argument index="1">
-        <parent index="this" action="add"/>
-      </modify-argument>
-    </modify-function>
-
-    <modify-function signature="operator&gt;&gt;(qint8&amp;)" remove="all"/>
-    <modify-function signature="operator&gt;&gt;(bool&amp;)" remove="all"/>
-    <modify-function signature="operator&gt;&gt;(quint8&amp;)" remove="all"/>
-    <modify-function signature="operator&gt;&gt;(qint16&amp;)" remove="all"/>
-    <modify-function signature="operator&gt;&gt;(quint16&amp;)" remove="all"/>
-    <modify-function signature="operator&gt;&gt;(qint32&amp;)" remove="all"/>
-    <modify-function signature="operator&gt;&gt;(quint32&amp;)" remove="all"/>
-    <modify-function signature="operator&gt;&gt;(qint64&amp;)" remove="all"/>
-    <modify-function signature="operator&gt;&gt;(quint64&amp;)" remove="all"/>
-    <modify-function signature="operator&gt;&gt;(float&amp;)" remove="all"/>
-    <modify-function signature="operator&gt;&gt;(double&amp;)" remove="all"/>
-    <modify-function signature="operator&gt;&gt;(char*&amp;)" remove="all"/>
-
-    <modify-function signature="operator&lt;&lt;(qint8)" remove="all"/>
-    <modify-function signature="operator&lt;&lt;(bool)" remove="all"/>
-    <modify-function signature="operator&lt;&lt;(quint8)" remove="all"/>
-    <modify-function signature="operator&lt;&lt;(qint16)" remove="all"/>
-    <modify-function signature="operator&lt;&lt;(quint16)" remove="all"/>
-    <modify-function signature="operator&lt;&lt;(qint32)" remove="all"/>
-    <modify-function signature="operator&lt;&lt;(quint32)" remove="all"/>
-    <modify-function signature="operator&lt;&lt;(qint64)" remove="all"/>
-    <modify-function signature="operator&lt;&lt;(quint64)" remove="all"/>
-    <modify-function signature="operator&lt;&lt;(float)" remove="all"/>
-    <modify-function signature="operator&lt;&lt;(double)" remove="all"/>
-
-    <modify-function signature="operator&lt;&lt;(const char*)" remove="all"/>
-    <modify-function signature="readRawData(char*,int)" remove="all"/>
-    <modify-function signature="readBytes(char*&amp;,uint&amp;)" remove="all"/>
-    <modify-function signature="writeRawData(const char*,int)" remove="all"/>
-    <modify-function signature="writeBytes(const char*,uint)" remove="all"/>
-
-    <!-- Extra functions for primitive type handling -->
-
-    <add-function signature="readBool()" return-type="bool">
-        <inject-code class="target" position="end">
-            <insert-template name="stream_read_method"/>
-        </inject-code>
-    </add-function>
-    <add-function signature="readInt8()" return-type="qint8">
-        <inject-code class="target" position="end">
-            <insert-template name="stream_read_method"/>
-        </inject-code>
-    </add-function>
-    <add-function signature="readUInt8()" return-type="quint8">
-        <inject-code class="target" position="end">
-            <insert-template name="stream_read_method"/>
-        </inject-code>
-    </add-function>
-    <add-function signature="readUInt16()" return-type="quint16">
-        <inject-code class="target" position="end">
-            <insert-template name="stream_read_method"/>
-        </inject-code>
-    </add-function>
-    <add-function signature="readInt16()" return-type="qint16">
-        <inject-code class="target" position="end">
-            <insert-template name="stream_read_method"/>
-        </inject-code>
-    </add-function>
-    <add-function signature="readInt32()" return-type="qint32">
-        <inject-code class="target" position="end">
-            <insert-template name="stream_read_method"/>
-        </inject-code>
-    </add-function>
-    <add-function signature="readUInt32()" return-type="quint32">
-        <inject-code class="target" position="end">
-            <insert-template name="stream_read_method"/>
-        </inject-code>
-    </add-function>
-    <add-function signature="readInt64()" return-type="qint64">
-        <inject-code class="target" position="end">
-            <insert-template name="stream_read_method"/>
-        </inject-code>
-    </add-function>
-    <add-function signature="readUInt64()" return-type="quint64">
-        <inject-code class="target" position="end">
-            <insert-template name="stream_read_method"/>
-        </inject-code>
-    </add-function>
-    <add-function signature="readFloat()" return-type="float">
-        <inject-code class="target" position="end">
-            <insert-template name="stream_read_method"/>
-        </inject-code>
-    </add-function>
-    <add-function signature="readDouble()" return-type="qreal">
-        <inject-code class="target" position="end">
-            <insert-template name="stream_read_method"/>
-        </inject-code>
-    </add-function>
-    <add-function signature="readString()" return-type="QString">
-        <inject-code class="target" position="end">
-            <insert-template name="stream_read_method"/>
-        </inject-code>
-    </add-function>
-
-    <add-function signature="writeBool(bool)">
-        <inject-code class="target" position="end">
-            <insert-template name="stream_write_method"/>
-        </inject-code>
-    </add-function>
-    <add-function signature="writeInt8(qint8)">
-        <inject-code class="target" position="end">
-            <insert-template name="stream_write_method"/>
-        </inject-code>
-    </add-function>
-    <add-function signature="writeUInt8(quint8)">
-        <inject-code class="target" position="end">
-            <insert-template name="stream_write_method"/>
-        </inject-code>
-    </add-function>
-    <add-function signature="writeUInt16(quint16)">
-        <inject-code class="target" position="end">
-            <insert-template name="stream_write_method"/>
-        </inject-code>
-    </add-function>
-    <add-function signature="writeInt16(qint16)">
-        <inject-code class="target" position="end">
-            <insert-template name="stream_write_method"/>
-        </inject-code>
-    </add-function>
-    <add-function signature="writeInt32(qint32)">
-        <inject-code class="target" position="end">
-            <insert-template name="stream_write_method"/>
-        </inject-code>
-    </add-function>
-    <add-function signature="writeUInt32(quint32)">
-        <inject-code class="target" position="end">
-            <insert-template name="stream_write_method"/>
-        </inject-code>
-    </add-function>
-    <add-function signature="writeInt64(qint64)">
-        <inject-code class="target" position="end">
-            <insert-template name="stream_write_method"/>
-        </inject-code>
-    </add-function>
-    <add-function signature="writeUInt64(quint64)">
-        <inject-code class="target" position="end">
-            <insert-template name="stream_write_method"/>
-        </inject-code>
-    </add-function>
-    <add-function signature="writeFloat(float)">
-        <inject-code class="target" position="end">
-            <insert-template name="stream_write_method"/>
-        </inject-code>
-    </add-function>
-    <add-function signature="writeDouble(qreal)">
-        <inject-code class="target" position="end">
-            <insert-template name="stream_write_method"/>
-        </inject-code>
-    </add-function>
-    <add-function signature="writeString(QString)">
-        <inject-code class="target" position="end">
-            <insert-template name="stream_write_method"/>
-        </inject-code>
-    </add-function>
-
-
-  </object-type>
-  <object-type name="QFSFileEngine">
-    <extra-includes>
-      <include file-name="QDateTime" location="global"/>
-    </extra-includes>
-  </object-type>
-  <value-type name="QTextStreamManipulator">
-    <modify-function signature="exec(QTextStream &amp;)" rename="exec_"/>
-  </value-type>
-  <object-type name="QTextStream" stream="yes">
-    <modify-function signature="QTextStream(const QByteArray&amp;, QFlags&lt;QIODevice::OpenModeFlag&gt;)" remove="all"/>
-    <modify-function signature="setString(QString*,QFlags&lt;QIODevice::OpenModeFlag&gt;)" remove="all"/>
-
-    <modify-function signature="operator&lt;&lt;(const void*)" remove="all"/>
-    <modify-function signature="operator&lt;&lt;(float)" remove="all"/>
-    <modify-function signature="operator&lt;&lt;(qlonglong)" remove="all"/>
-    <modify-function signature="operator&lt;&lt;(qulonglong)" remove="all"/>
-    <modify-function signature="operator&lt;&lt;(signed short)" remove="all"/>
-    <modify-function signature="operator&lt;&lt;(signed int)" remove="all"/>
-    <modify-function signature="operator&lt;&lt;(QBool)" remove="all"/>
-    <modify-function signature="operator&lt;&lt;(unsigned int)" remove="all"/>
-    <modify-function signature="operator&lt;&lt;(unsigned short)" remove="all"/>
-
-    <modify-function signature="operator&gt;&gt;(float&amp;)" remove="all"/>
-    <modify-function signature="operator&gt;&gt;(qlonglong&amp;)" remove="all"/>
-    <modify-function signature="operator&gt;&gt;(qulonglong&amp;)" remove="all"/>
-    <modify-function signature="operator&gt;&gt;(signed int&amp;)" remove="all"/>
-    <modify-function signature="operator&gt;&gt;(signed short&amp;)" remove="all"/>
-    <modify-function signature="operator&gt;&gt;(unsigned int&amp;)" remove="all"/>
-    <modify-function signature="operator&gt;&gt;(unsigned short&amp;)" remove="all"/>
-
-    <modify-function signature="flush()" allow-thread="yes"/>
-    <modify-function signature="read(qint64)" allow-thread="yes"/>
-    <modify-function signature="readLine(qint64)" allow-thread="yes"/>
-    <modify-function signature="readAll()" allow-thread="yes"/>
-  </object-type>
-  <object-type name="QSystemSemaphore"/>
-  <namespace-type name="QtConcurrent" target-type="class">
-    <extra-includes>
-      <include file-name="qtconcurrentreducekernel.h" location="global"/>
-      <include file-name="qtconcurrentthreadengine.h" location="global"/>
-    </extra-includes>
-  </namespace-type>
-  <!-- <object-type name="QThreadPool"/> -->
-  <value-type name="QXmlStreamAttribute"/>
-  <!-- FIXME Removed due to a shiboken bug-->
-  <value-type name="QXmlStreamAttributes">
-    <modify-function signature="push_back(QXmlStreamAttribute)" remove="all"/>
-    <modify-function signature="pop_back()" remove="all"/>
-    <modify-function signature="push_front(QXmlStreamAttribute)" remove="all"/>
-    <modify-function signature="pop_front()" remove="all"/>
-    <modify-function signature="at(int) const" remove="all"/>
-    <modify-function signature="contains(const QXmlStreamAttribute &amp;)const" remove="all"/>
-    <modify-function signature="fill(QXmlStreamAttribute, int)" remove="all"/>
-    <modify-function signature="mid(int, int) const" remove="all"/>
-    <modify-function signature="toList() const" remove="all"/>
-    <modify-function signature="fromList(const QList&lt;QXmlStreamAttribute&gt; &amp;)" remove="all"/>
-    <modify-function signature="value(const QString &amp;, const QLatin1String &amp;)const" remove="all" />
-    <modify-function signature="value(const QLatin1String &amp;, const QLatin1String &amp;)const" remove="all" />
-    <modify-function signature="value(const QLatin1String &amp;)const" remove="all" />
-    <modify-function signature="hasAttribute(const QLatin1String &amp;)const" remove="all" />
-  </value-type>
-  <value-type name="QXmlStreamNamespaceDeclaration"/>
-  <value-type name="QXmlStreamNotationDeclaration"/>
-  <value-type name="QXmlStreamEntityDeclaration"/>
-  <object-type name="QXmlStreamReader">
-    <modify-function signature="QXmlStreamReader(const char*)" remove="all"/>
-    <modify-function signature="addData(const char*)" remove="all"/>
-  </object-type>
-  <object-type name="QXmlStreamWriter">
-    <modify-function signature="QXmlStreamWriter(QString *)" remove="all" />
-    <modify-function signature="codec()const" remove="all"/>
-  </object-type>
-  <value-type name="QModelIndex">
-    <modify-function signature="internalPointer()const">
-        <inject-code class="target" position="beginning">
-            %PYARG_0 = (PyObject*)%CPPSELF.%FUNCTION_NAME();
-            if (!%PYARG_0)
-                %PYARG_0 = Py_None;
-            Py_XINCREF(%PYARG_0);
-        </inject-code>
-    </modify-function>
-  </value-type>
-
-  <value-type name="QGenericArgument">
-    <include file-name="qobjectdefs.h" location="global" />
-  </value-type>
-
-  <value-type name="QGenericReturnArgument">
-    <include file-name="qobjectdefs.h" location="global" />
-  </value-type>
-
-
-  <value-type name="QMetaMethod"/>
-  <object-type name="QMetaObject">
-    <include file-name="qobjectdefs.h" location="global" />
-    <modify-function signature="connect(const QObject*, int, const QObject*, int, int, int*)" remove="all" />
-  </object-type>
-  <value-type name="QMetaProperty" >
-    <modify-function signature="enclosingMetaObject()const" remove="all" />
-  </value-type>
-  <value-type name="QMetaClassInfo">
-    <modify-function signature="enclosingMetaObject()const" remove="all" />
-  </value-type>
-  <value-type name="QMetaEnum">
-    <modify-function signature="enclosingMetaObject()const" remove="all" />
-  </value-type>
-  <!-- From Qt4.6 -->
-  <object-type name="QAbstractAnimation"/>
-
-  <object-type name="QAbstractState"/>
-
-  <object-type name="QAbstractTransition">
-    <modify-function signature="QAbstractTransition(QState*)">
-      <modify-argument index="1">
-        <parent index="this" action="add"/>
-      </modify-argument>
-    </modify-function>
-
-    <modify-function signature="addAnimation(QAbstractAnimation*)">
-      <modify-argument index="1">
-        <parent index="this" action="add"/>
-      </modify-argument>
-    </modify-function>
-
-    <modify-function signature="removeAnimation(QAbstractAnimation*)">
-      <modify-argument index="1">
-        <parent index="this" action="remove"/>
-      </modify-argument>
-    </modify-function>
-
-    <modify-function signature="setTargetState(QAbstractState*)">
-      <modify-argument index="1">
-        <reference-count action="add"/>
-      </modify-argument>
-    </modify-function>
-
-    <modify-function signature="targetState() const">
-      <modify-argument index="return">
-        <define-ownership class="target" owner="default"/>
-      </modify-argument>
-    </modify-function>
-
-    <modify-function signature="setTargetStates(QList&lt;QAbstractState*&gt;)">
-      <inject-code class="target" position="beginning">
-        // The normal here would be to use the 'reference-count' tag but this
-        // method is strongly tied to 'setTargetState' since both affect the same
-        // internal value in QAbstractTransition.
-        Shiboken::keepReference(reinterpret_cast&lt;SbkBaseWrapper*&gt;(%PYSELF), "setTargetState(QAbstractState*)1", %PYARG_1);
-      </inject-code>
-    </modify-function>
-
-    <!-- http://bugs.openbossa.org/show_bug.cgi?id=123
-    <modify-function signature="setTargetStates(QList&lt;QAbstractState*&gt;)" remove="all"/>
-    <modify-function signature="targetStates() const " remove="all"/>-->
-  </object-type>
-
-  <object-type name="QAnimationGroup">
-    <modify-function signature="addAnimation(QAbstractAnimation*)">
-      <modify-argument index="1">
-        <parent index="this" action="add"/>
-      </modify-argument>
-    </modify-function>
-
-    <modify-function signature="insertAnimation(int, QAbstractAnimation*)">
-      <modify-argument index="2">
-        <parent index="this" action="add"/>
-      </modify-argument>
-    </modify-function>
-
-    <modify-function signature="removeAnimation(QAbstractAnimation*)">
-      <modify-argument index="1">
-        <parent index="this" action="remove"/>
-      </modify-argument>
-    </modify-function>
-
-    <modify-function signature="takeAnimation(int)">
-      <modify-argument index="return">
-        <parent index="this" action="remove"/>
-      </modify-argument>
-    </modify-function>
-
-    <modify-function signature="clear()" >
-        <inject-code class="target" position="beginning">
-            for(int counter = 0; counter &lt; %CPPSELF.animationCount(); ++counter ) {
-                    PyObject* obj = %CONVERTTOPYTHON[QAbstractAnimation*](%CPPSELF.animationAt(counter));
-                    Shiboken::setParent(NULL, obj);
-                    Py_DECREF(obj);
-            }
-            %CPPSELF.clear();
-        </inject-code>
-    </modify-function>
-  </object-type>
-
-  <rejection class="QContiguousCache"/>
-
-  <value-type name="QEasingCurve">
-    <modify-function signature="customType() const" remove="all"/>
-    <!-- FIXME: setCustomType() actually takes a pointer to function type
-    (EasingFunction), but for some reason apiextractor thinks it is a float/double:
-    http://bugs.openbossa.org/show_bug.cgi?id=201 -->
-    <modify-function signature="setCustomType(float)" remove="all"/>
-    <modify-function signature="setCustomType(double)" remove="all"/>
-  </value-type>
-
-  <object-type name="QEventTransition">
-    <modify-function signature="QEventTransition(QState*)">
-      <modify-argument index="1">
-        <parent index="this" action="add"/>
-      </modify-argument>
-    </modify-function>
-
-    <modify-function signature="QEventTransition(QObject*, QEvent::Type, QState*)">
-      <modify-argument index="3">
-        <parent index="this" action="add"/>
-      </modify-argument>
-    </modify-function>
-
-  </object-type>
-
-  <object-type name="QFinalState"/>
-
-  <enum-type name="QHistoryState::HistoryType" />
-  <object-type name="QHistoryState"/>
-
-  <value-type name="QMargins"/>
-
-  <object-type name="QParallelAnimationGroup"/>
-
-  <object-type name="QPauseAnimation"/>
-
-  <value-type name="QProcessEnvironment"/>
-
-  <object-type name="QPropertyAnimation"/>
-
-  <rejection class="QScopedPointer"/>
-
-  <object-type name="QSequentialAnimationGroup"/>
-
-  <object-type name="QSignalTransition"/>
-
-  <enum-type name="QState::ChildMode"/>
-  <object-type name="QState">
-    <modify-function signature="addTransition(QAbstractTransition*)">
-      <modify-argument index="1">
-        <parent index="this" action="add"/>
-      </modify-argument>
-    </modify-function>
-
-    <modify-function signature="addTransition(QObject*, const char*, QAbstractState*)">
-      <modify-argument index="return">
-        <parent index="this" action="add"/>
-      </modify-argument>
-      <inject-code class="target" position="beginning">
-        QString signalName(%2);
-        if (PySide::SignalManager::registerMetaMethod(%1, signalName.mid(1).toAscii().data(), QMetaMethod::Signal)) {
-          %PYARG_0 = %CONVERTTOPYTHON[QSignalTransition*](%CPPSELF->addTransition(%1, %2, %3));
-        } else {
-          %PYARG_0 = Py_None;
-        }
-      </inject-code>
-    </modify-function>
-
-    <modify-function signature="addTransition(QAbstractState*)">
-      <modify-argument index="1">
-        <parent index="this" action="add"/>
-      </modify-argument>
-    </modify-function>
-
-    <modify-function signature="removeTransition(QAbstractTransition*)">
-      <modify-argument index="1">
-        <parent index="this" action="remove"/>
-      </modify-argument>
-    </modify-function>
-  </object-type>
-
-  <enum-type name="QStateMachine::Error"/>
-  <enum-type name="QStateMachine::EventPriority"/>
-  <enum-type name="QStateMachine::RestorePolicy"/>
-  <object-type name="QStateMachine">
-    <modify-function signature="addState(QAbstractState *)">
-      <modify-argument index="1">
-        <parent index="this" action="add"/>
-      </modify-argument>
-    </modify-function>
-    <modify-function signature="removeState(QAbstractState *)">
-      <modify-argument index="1">
-        <parent index="this" action="remove"/>
-      </modify-argument>
-    </modify-function>
-
-    <modify-function signature="defaultAnimations() const" remove="all"/>
-
-    <add-function signature="configuration()" return-type="PySequence*" >
-        <inject-code class="target" position="beginning">
-            %PYARG_0 = PySet_New(0);
-            foreach(QAbstractState* abs_state, %CPPSELF.configuration()) {
-                    Shiboken::AutoDecRef obj(%CONVERTTOPYTHON[QAbstractState*](abs_state));
-                    Shiboken::setParent(self, obj);
-                    PySet_Add(%PYARG_0, obj);
-            }
-        </inject-code>
-    </add-function>
-
-    <add-function signature="defaultAnimations()" return-type="PySequence*" >
-        <inject-code class="target" position="beginning">
-            %PYARG_0 = PyList_New(0);
-            foreach(QAbstractAnimation* abs_anim, %CPPSELF.defaultAnimations()) {
-                    Shiboken::AutoDecRef obj(%CONVERTTOPYTHON[QAbstractAnimation*](abs_anim));
-                    Shiboken::setParent(self, obj);
-                    PyList_Append(%PYARG_0, obj);
-            }
-        </inject-code>
-    </add-function>
-  </object-type>
-  <value-type name="QStateMachine::SignalEvent"/>
-  <value-type name="QStateMachine::WrappedEvent"/>
-
-  <object-type name="QVariantAnimation"/>
-
-  <!-- From Qt4.6 ^^^ -->
-
-  <add-function signature="SIGNAL(const char*)" return-type="PyString*">
-    <inject-code class="target" position="beginning">
-      %PYARG_0 = PyString_FromFormat("2%s", QMetaObject::normalizedSignature(%1).constData());
-    </inject-code>
-  </add-function>
-
-  <add-function signature="SLOT(const char*)" return-type="PyString*">
-    <inject-code class="target" position="beginning">
-      %PYARG_0 = PyString_FromFormat("1%s", QMetaObject::normalizedSignature(%1).constData());
-    </inject-code>
-  </add-function>
-
-  <add-function signature="QT_TR_NOOP(const char*)" return-type="PyString*">
-    <inject-code class="target" position="beginning">(void)%1;%PYARG_0 = %PYARG_1;</inject-code>
-  </add-function>
-  <add-function signature="QT_TR_NOOP_UTF8(const char*)" return-type="PyString*">
-    <inject-code class="target" position="beginning">(void)%1;%PYARG_0 = %PYARG_1;</inject-code>
-  </add-function>
-  <add-function signature="QT_TRANSLATE_NOOP(const char*)" return-type="PyString*">
-    <inject-code class="target" position="beginning">(void)%1;%PYARG_0 = %PYARG_1;</inject-code>
-  </add-function>
-  <add-function signature="QT_TRANSLATE_NOOP_UTF8(const char*)" return-type="PyString*">
-    <inject-code class="target" position="beginning">(void)%1;%PYARG_0 = %PYARG_1;</inject-code>
-  </add-function>
-
-  <inject-code class="native" position="beginning">
-    extern bool
-    qRegisterResourceData(int,
-                        const unsigned char *,
-                        const unsigned char *,
-                        const unsigned char *);
-
-    extern bool
-    qUnregisterResourceData(int,
-                            const unsigned char *,
-                            const unsigned char *,
-                            const unsigned char *);
-  </inject-code>
-  <add-function signature="qRegisterResourceData(int, const char *, const char *, const char *)" return-type="bool">
-    <inject-code class="target" position="beginning">
-    %PYARG_0 = %CONVERTTOPYTHON[bool](%FUNCTION_NAME(%1, (uchar*)%2, (uchar*)%3, (uchar*)%4));
-    </inject-code>
-  </add-function>
-  <add-function signature="qUnregisterResourceData(int, const char *, const char *, const char *)" return-type="bool">
-    <inject-code class="target" position="beginning">
-    %PYARG_0 = %CONVERTTOPYTHON[bool](%FUNCTION_NAME(%1, (uchar*)%2, (uchar*)%3, (uchar*)%4));
-    </inject-code>
-  </add-function>
-
-  <object-type name="QFactoryInterface"/>
-
-  <suppress-warning text="enum 'Qt::Initialization' does not have a type entry or is not an enum" />
-  <suppress-warning text="signature 'contais(QXmlStreamAttribute)' for function modification in 'QXmlStreamAttributes' not found."/>
-  <suppress-warning text="signature 'findChildren(QRegExp)const' for function modification in 'QObject' not found"/>
-  <suppress-warning text="signature 'findChildren(QString)const' for function modification in 'QObject' not found."/>
-  <suppress-warning text="signature 'findChild(QString)const' for function modification in 'QObject' not found."/>
-  <suppress-warning text="skipping function '*'"/>
-  <suppress-warning text="visibility of function '*' modified in class '*'"/>
-  <suppress-warning text="hiding of function '*' in class '*'"/>
-  <suppress-warning text="namespace '*' does not have a type entry"/>
-  <suppress-warning text="Shadowing: QObject::parent() const and QAbstractItemModel::parent() const"/>
-  <suppress-warning text="namespace '*' for enum 'QtMsgType' is not declared"/>
-  <suppress-warning text="horribly broken type 'imaxdiv_t'"/>
-  <suppress-warning text="horribly broken type '__off64_t'"/>
-  <suppress-warning text="horribly broken type 'div_t'"/>
-  <suppress-warning text="horribly broken type 'fd_set*'"/>
-  <suppress-warning text="horribly broken type 'ldiv_t'"/>
-  <suppress-warning text="horribly broken type 'lldiv_t'"/>
-  <suppress-warning text="signal '*' in class '*' is overloaded."/>
-  <suppress-warning text="enum 'enum_3' does not have a type entry or is not an enum"/>
-  <suppress-warning text="Shadowing: QFile::fileName() const and QTemporaryFile::fileName() const"/>
-  <suppress-warning text="enum 'QtValidLicenseForDeclarativeModule' does not have a type entry or is not an enum"/>
-  <suppress-warning text="enum 'QMetaMethod::Attributes' does not have a type entry or is not an enum"/>
-  <suppress-warning text="unhandled enum value: ~0u in Qt::GestureType"/>
-  <suppress-warning text="unhandled enum value: (sizeof(void*)&lt;&lt;3) in QSysInfo::Sizes"/>
-  <suppress-warning text="unmatched enum ~0u"/>
-  <suppress-warning text="unmatched enum (sizeof(void*)&lt;&lt;3)"/>
-  <suppress-warning text="signature 'setCustomType(float)' for function modification in 'QEasingCurve' not found. Possible candidates: setCustomType(double) in QEasingCurve"/>
-</typesystem>
diff --git a/PySide/QtCore/typesystem_core.xml.in b/PySide/QtCore/typesystem_core.xml.in
new file mode 100644
index 0000000..9de2082
--- /dev/null
+++ b/PySide/QtCore/typesystem_core.xml.in
@@ -0,0 +1,24 @@
+<?xml version="1.0"?>
+<!--
+    This file is part of PySide project.
+    Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+    Contact: PySide team <contact@pyside.org>
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+-->
+<typesystem package="PySide.QtCore">
+    <load-typesystem name="typesystem_core_@AUTO_OS@.xml" generate="yes"/>
+    <load-typesystem name="typesystem_core_common.xml" generate="yes"/>
+</typesystem>
diff --git a/PySide/QtCore/typesystem_core_common.xml b/PySide/QtCore/typesystem_core_common.xml
new file mode 100644
index 0000000..2e83131
--- /dev/null
+++ b/PySide/QtCore/typesystem_core_common.xml
@@ -0,0 +1,4097 @@
+<?xml version="1.0"?>
+<!--
+    This file is part of PySide project.
+    Copyright (C) 2009-2011 Nokia Corporation and/or its subsidiary(-ies).
+    Contact: PySide team <contact@pyside.org>
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+-->
+<typesystem package="PySide.QtCore">
+    <load-typesystem name="typesystem_templates.xml" generate="no"/>
+
+    <custom-type name="str" />
+    <custom-type name="PyBytes" />
+    <custom-type name="PyCallable" />
+    <custom-type name="PyObject" />
+    <custom-type name="PySequence" />
+    <custom-type name="PyTypeObject" />
+    <custom-type name="PyUnicode" />
+    <custom-type name="list of QAbstractAnimation" />
+    <custom-type name="list of QAbstractState" />
+
+    <function signature="qAcos(qreal)" />
+    <function signature="qAsin(qreal)" since="4.6" />
+    <function signature="qAtan(qreal)" since="4.6" />
+    <function signature="qAtan2(qreal,qreal)" since="4.6" />
+    <function signature="qChecksum(const char*,uint)" />
+    <function signature="qExp(qreal)" since="4.6" />
+    <function signature="qFabs(qreal)" since="4.6" />
+    <function signature="qFastCos(qreal)" since="4.6"/>
+    <function signature="qFastSin(qreal)" since="4.6" />
+    <function signature="qFuzzyCompare(double,double)" />
+    <function signature="qFuzzyIsNull(double)" since="4.6" />
+    <function signature="qIsFinite(double)" />
+    <function signature="qIsInf(double)" />
+    <function signature="qIsNaN(double)" />
+    <function signature="qIsNull(double)" />
+    <function signature="qRound(qreal)" />
+    <function signature="qTan(qreal)" since="4.6" />
+    <function signature="qtTrId(const char *, int)" since="4.6" />
+    <function signature="qVersion()" />
+    <function signature="qrand()" />
+    <function signature="qsrand(uint)" />
+
+    <template name="use_stream_for_format_security">
+        // Uses the stream version for security reasons
+        // see gcc man page at -Wformat-security
+        %FUNCTION_NAME() &lt;&lt; %1;
+    </template>
+
+    <add-function signature="qDebug(const char*)">
+        <inject-code>
+            <insert-template name="use_stream_for_format_security" />
+        </inject-code>
+    </add-function>
+    <add-function signature="qCritical(const char*)">
+        <inject-code>
+            <insert-template name="use_stream_for_format_security" />
+        </inject-code>
+    </add-function>
+    <add-function signature="qFatal(const char*)">
+        <inject-code>
+            // qFatal doesn't have a stream version, so we do a
+            // qWarning call followed by a qFatal() call using a
+            // literal.
+            qWarning() &lt;&lt; %1;
+            qFatal("[A qFatal() call was made from Python code]");
+        </inject-code>
+    </add-function>
+    <add-function signature="qWarning(const char*)">
+        <inject-code>
+            <insert-template name="use_stream_for_format_security" />
+        </inject-code>
+    </add-function>
+
+    <!-- TODO: We do not support void* or const void* as arg -->
+    <rejection class="QMetaObject" function-name="activate"/>
+    <rejection class="QMetaObject" function-name="metacall"/>
+    <rejection class="QMetaObject" function-name="static_metacall"/>
+    <!-- TODO: Support to addGuard(QObject**) -->
+    <rejection class="QMetaObject" function-name="addGuard"/>
+    <rejection class="QMetaObject" function-name="changeGuard"/>
+    <rejection class="QMetaObject" function-name="removeGuard"/>
+
+  <rejection class="QChildEvent" field-name="c"/>
+  <rejection class="QTimerEvent" field-name="id"/>
+  <rejection class="QEvent" field-name="t"/>
+  <rejection class="*" function-name="tr" />
+  <rejection class="*" function-name="trUtf8" />
+  <rejection class="*" function-name="qt_metacast" />
+  <!-- From Qt4.6 -->
+  <rejection class="*" field-name="d_ptr"/>
+  <rejection class="*" field-name="staticQtMetaObject"/>
+  <rejection class="*" function-name="qobject_interface_iid"/>
+  <rejection class="*" function-name="qGetPtrHelper"/>
+  <rejection class="*" function-name="q_check_ptr"/>
+  <rejection class="*" function-name="qobject_interface_iid&lt;QTextCodecFactoryInterface*&gt;"/>
+  <rejection class="*" function-name="qobject_interface_iid&lt;QFactoryInterface*&gt;"/>
+  <rejection class="*" function-name="qRegisterAnimationInterpolator"/>
+  <rejection class="*" function-name="qvariant_cast&lt;QVariant&gt;"/>
+  <rejection class="*" function-name="qVariantSetValue&lt;QVariant&gt;"/>
+  <rejection class="*" function-name="qReallocAligned"/>
+  <rejection class="*" function-name="qMallocAligned"/>
+  <rejection class="*" function-name="qFreeAligned"/>
+  <rejection class="QMetaMethod" enum-name="Attributes" />
+
+  <enum-type name="QtValidLicenseForOpenVGModule"/>
+  <enum-type name="QtValidLicenseForMultimediaModule"/>
+  <enum-type name="QtValidLicenseForDeclarativeModule" />
+  <!-- From Qt4.6 ^^^ -->
+
+
+  <enum-type name="QtMsgType"/>
+
+  <primitive-type name="qint8"/>
+  <primitive-type name="qint16"/>
+  <primitive-type name="qint32"/>
+  <primitive-type name="quint8"/>
+  <primitive-type name="quint16"/>
+  <primitive-type name="quint32"/>
+  <primitive-type name="quint64"/>
+  <primitive-type name="bool"/>
+  <primitive-type name="double"/>
+  <primitive-type name="qreal"/>
+  <primitive-type name="float"/>
+  <primitive-type name="qint64"/>
+  <primitive-type name="unsigned long long"/>
+  <primitive-type name="long long"/>
+  <primitive-type name="qlonglong" target-lang-api-name="PyLong" />
+  <primitive-type name="qulonglong" target-lang-api-name="PyLong" />
+  <primitive-type name="short"/>
+  <primitive-type name="signed short"/>
+  <primitive-type name="signed short int"/>
+  <primitive-type name="ushort" target-lang-api-name="PyInt" />
+  <primitive-type name="unsigned short int" />
+  <primitive-type name="unsigned short"/>
+  <primitive-type name="char"/>
+  <primitive-type name="signed char"/>
+  <primitive-type name="uchar"/>
+  <primitive-type name="unsigned char"/>
+  <primitive-type name="int"/>
+  <primitive-type name="signed int"/>
+  <primitive-type name="uint"/>
+  <primitive-type name="ulong"/>
+  <primitive-type name="unsigned int"/>
+  <primitive-type name="signed long"/>
+  <primitive-type name="signed long int"/>
+  <primitive-type name="long"/>
+  <primitive-type name="unsigned long int" />
+  <primitive-type name="unsigned long">
+    <!-- FIXME APIExtractor or shiboken do not support multiple includes by primitive type -->
+    <include file-name="signalmanager.h" location="global"/>
+  </primitive-type>
+  <primitive-type name="QBool" target-lang-api-name="PyBool">
+    <conversion-rule>
+        <native-to-target>
+        return PyBool_FromLong((bool)%in);
+        </native-to-target>
+        <target-to-native>
+            <add-conversion type="PyBool">
+            %out = %OUTTYPE(%in == Py_True);
+            </add-conversion>
+        </target-to-native>
+    </conversion-rule>
+    <!-- FIXME This is a workaround to include some headers needed by some includes (nothing to do with QBool) -->
+    <include file-name="QtConcurrentFilter" location="global"/>
+  </primitive-type>
+
+  <inject-code class="native" position="beginning">
+    bool py2kStrCheck(PyObject* obj)
+    {
+    #ifdef IS_PY3K
+        return false;
+    #else
+        return PyString_Check(obj);
+    #endif
+    }
+  </inject-code>
+
+  <primitive-type name="QString" target-lang-api-name="PyUnicode">
+    <include file-name="QString" location="global"/>
+    <conversion-rule>
+        <native-to-target>
+        const int N = %in.length();
+        wchar_t* str = new wchar_t[N];
+        %in.toWCharArray(str);
+        PyObject* %out = PyUnicode_FromWideChar(str, N);
+        delete[] str;
+        return %out;
+        </native-to-target>
+        <target-to-native>
+            <add-conversion type="PyUnicode">
+            Py_UNICODE* unicode = PyUnicode_AS_UNICODE(%in);
+            #if defined(Py_UNICODE_WIDE)
+            // cast as Py_UNICODE can be a different type
+            %out = QString::fromUcs4((const uint*)unicode);
+            #else
+            %out = QString::fromUtf16(unicode, PyUnicode_GET_SIZE(%in));
+            #endif
+            </add-conversion>
+            <add-conversion type="PyString" check="py2kStrCheck(%in)">
+            #ifndef IS_PY3K
+            const char* str = %CONVERTTOCPP[const char*](%in);
+            %out = %OUTTYPE(str);
+            #endif
+            </add-conversion>
+            <add-conversion type="Py_None">
+            %out = %OUTTYPE();
+            </add-conversion>
+        </target-to-native>
+    </conversion-rule>
+  </primitive-type>
+
+  <primitive-type name="QStringRef">
+    <conversion-rule>
+        <native-to-target>
+        const int N = %in.toString().length();
+        wchar_t* str = new wchar_t[N];
+        %in.toString().toWCharArray(str);
+        PyObject* %out = PyUnicode_FromWideChar(str, N);
+        delete[] str;
+        return %out;
+        </native-to-target>
+        <target-to-native>
+            <add-conversion type="PyObject" check="Shiboken::String::check(%in) || %in == Py_None">
+            %out = %OUTTYPE();
+            </add-conversion>
+        </target-to-native>
+    </conversion-rule>
+  </primitive-type>
+  <primitive-type name="QChar">
+    <conversion-rule>
+        <native-to-target>
+        wchar_t c = (wchar_t)%in.unicode();
+        return PyUnicode_FromWideChar(&amp;c, 1);
+        </native-to-target>
+        <target-to-native>
+            <add-conversion type="PyString" check="Shiboken::String::checkChar(%in)">
+            char c = %CONVERTTOCPP[char](%in);
+            %out = %OUTTYPE(c);
+            </add-conversion>
+            <add-conversion type="PyInt">
+            int i = %CONVERTTOCPP[int](%in);
+            %out = %OUTTYPE(i);
+            </add-conversion>
+            <add-conversion type="Py_None">
+            %out = %OUTTYPE();
+            </add-conversion>
+        </target-to-native>
+    </conversion-rule>
+  </primitive-type>
+
+  <primitive-type name="QVariant" target-lang-api-name="PyObject">
+    <include file-name="typeresolver.h" location="global"/>
+    <conversion-rule>
+        <native-to-target>
+        if (!%in.isValid())
+            Py_RETURN_NONE;
+
+        if (qstrcmp(%in.typeName(), "QVariantList") == 0) {
+            QList&lt;QVariant&gt; var = %in.value&lt;QVariantList&gt;();
+            return %CONVERTTOPYTHON[QList&lt;QVariant&gt;](var);
+        }
+
+        if (qstrcmp(%in.typeName(), "QStringList") == 0) {
+            QStringList var = %in.value&lt;QStringList&gt;();
+            return %CONVERTTOPYTHON[QList&lt;QString&gt;](var);
+        }
+
+        if (qstrcmp(%in.typeName(), "QVariantMap") == 0) {
+            QMap&lt;QString, QVariant&gt; var = %in.value&lt;QVariantMap&gt;();
+            return %CONVERTTOPYTHON[QMap&lt;QString, QVariant&gt;](var);
+        }
+
+        Shiboken::Conversions::SpecificConverter converter(cppInRef.typeName());
+        if (converter) {
+           void* ptr = cppInRef.data();
+           return converter.toPython(ptr);
+        }
+        PyErr_Format(PyExc_RuntimeError, "Can't find converter for '%s'.", %in.typeName());
+        return 0;
+        </native-to-target>
+        <target-to-native>
+            <add-conversion type="PyBool">
+            %out = %OUTTYPE(%in == Py_True);
+            </add-conversion>
+            <add-conversion type="Py_None">
+            %out = %OUTTYPE();
+            </add-conversion>
+            <add-conversion type="QString" check="Shiboken::String::check(%in)">
+            QString in = %CONVERTTOCPP[QString](%in);
+            %out = %OUTTYPE(in);
+            </add-conversion>
+            <add-conversion type="QByteArray">
+            QByteArray in = %CONVERTTOCPP[QByteArray](%in);
+            %out = %OUTTYPE(in);
+            </add-conversion>
+            <add-conversion type="PyFloat" check="PyFloat_CheckExact(%in)">
+            double in = %CONVERTTOCPP[double](%in);
+            %out = %OUTTYPE(in);
+            </add-conversion>
+            <add-conversion type="PyInt">
+            int in = %CONVERTTOCPP[int](%in);
+            %out = %OUTTYPE(in);
+            </add-conversion>
+            <add-conversion type="PyLong" check="PyLong_CheckExact(%in)">
+            qlonglong in = %CONVERTTOCPP[qlonglong](%in);
+            %out = %OUTTYPE(in);
+            </add-conversion>
+            <add-conversion type="SbkEnumType">
+            int in = %CONVERTTOCPP[int](%in);
+            %out = %OUTTYPE(in);
+            </add-conversion>
+            <add-conversion type="SbkObject">
+            // a class supported by QVariant?
+            int typeCode;
+            const char* typeName = QVariant_resolveMetaType(%in->ob_type, &amp;typeCode);
+            if (!typeCode || !typeName)
+                return;
+            QVariant var(typeCode, (void*)0);
+            Shiboken::Conversions::SpecificConverter converter(typeName);
+            converter.toCpp(pyIn, var.data());
+            %out = var;
+            </add-conversion>
+            <add-conversion type="PyDict">
+            QVariant ret = QVariant_convertToVariantMap(%in);
+            %out = ret.isValid() ? ret : QVariant::fromValue&lt;PySide::PyObjectWrapper&gt;(%in);
+            </add-conversion>
+            <add-conversion type="PySequence">
+            %out = QVariant_convertToVariantList(%in);
+            </add-conversion>
+            <add-conversion type="PyObject">
+            // Is a shiboken type not known by Qt
+            %out = QVariant::fromValue&lt;PySide::PyObjectWrapper&gt;(%in);
+            </add-conversion>
+        </target-to-native>
+    </conversion-rule>
+  </primitive-type>
+    <inject-code class="native" position="beginning">
+    static const char* QVariant_resolveMetaType(PyTypeObject* type, int* typeId)
+    {
+        if (PyObject_TypeCheck(type, &amp;SbkObjectType_Type)) {
+            SbkObjectType* sbkType = (SbkObjectType*)type;
+            const char* typeName = Shiboken::ObjectType::getOriginalName(sbkType);
+            if (!typeName)
+                return 0;
+            bool valueType = '*' != typeName[qstrlen(typeName) - 1];
+            // Do not convert user type of value
+            if (valueType &amp;&mp; Shiboken::ObjectType::isUserType(type))
+                return 0;
+            int obTypeId = QMetaType::type(typeName);
+            if (obTypeId) {
+                *typeId = obTypeId;
+                return typeName;
+            }
+            // Do not resolve types to value type
+            if (valueType)
+                return 0;
+            // find in base types
+            if (type->tp_base) {
+                return QVariant_resolveMetaType(type->tp_base, typeId);
+            } else if (type->tp_bases) {
+                for(int i = 0; i &lt; PyTuple_GET_SIZE(type->tp_bases); ++i) {
+                    const char* derivedName = QVariant_resolveMetaType((PyTypeObject*)PyTuple_GET_ITEM(type->tp_bases, i), typeId);
+                    if (derivedName)
+                        return derivedName;
+                }
+            }
+        }
+        *typeId = 0;
+        return 0;
+    }
+    static QVariant QVariant_convertToValueList(PyObject* list)
+    {
+        if (PySequence_Size(list) &lt; 1)
+            return QVariant();
+        Shiboken::AutoDecRef element(PySequence_GetItem(list, 0));
+        int typeId;
+        const char* typeName = QVariant_resolveMetaType(element.cast&lt;PyTypeObject*&gt;(), &amp;typeId);
+        if (typeName) {
+            QByteArray listTypeName("QList&lt;");
+            listTypeName += typeName;
+            listTypeName += '>';
+            typeId = QMetaType::type(listTypeName);
+            if (typeId &gt; 0) {
+                Shiboken::Conversions::SpecificConverter converter(listTypeName);
+                if (converter) {
+                    QVariant var(typeId, (void*)0);
+                    converter.toCpp(list, &amp;var);
+                    return var;
+                }
+                qWarning() &lt;&lt; "Type converter for :" &lt;&lt; listTypeName &lt;&lt; "not registered.";
+            }
+        }
+        return QVariant();
+    }
+    static bool QVariant_isStringList(PyObject *list)
+    {
+        bool allString = true;
+        Shiboken::AutoDecRef fast(PySequence_Fast(list, "Failed to convert QVariantList"));
+        Py_ssize_t size = PySequence_Fast_GET_SIZE(fast.object());
+        for(int i = 0; i &lt; size; ++i) {
+            PyObject* item = PySequence_Fast_GET_ITEM(fast.object(), i);
+            if (!%CHECKTYPE[QString](item)) {
+                allString = false;
+                break;
+            }
+        }
+        return allString;
+    }
+    static QVariant QVariant_convertToVariantMap(PyObject* map)
+    {
+        Py_ssize_t pos = 0;
+        Shiboken::AutoDecRef keys(PyDict_Keys(map));
+        if (!QVariant_isStringList(keys))
+            return QVariant();
+        PyObject* key;
+        PyObject* value;
+        QMap&lt;QString,QVariant&gt; ret;
+        while (PyDict_Next(map, &amp;pos, &amp;key, &amp;value)) {
+            QString cppKey = %CONVERTTOCPP[QString](key);
+            QVariant cppValue = %CONVERTTOCPP[QVariant](value);
+            ret.insert(cppKey, cppValue);
+        }
+        return QVariant(ret);
+    }
+    static QVariant QVariant_convertToVariantList(PyObject* list)
+    {
+        if (QVariant_isStringList(list)) {
+            QList&lt;QString &gt; lst = %CONVERTTOCPP[QList&lt;QString&gt;](list);
+            return QVariant(QStringList(lst));
+        }
+        QVariant valueList = QVariant_convertToValueList(list);
+        if (valueList.isValid())
+            return valueList;
+        QList&lt;QVariant&gt; lst;
+        Shiboken::AutoDecRef fast(PySequence_Fast(list, "Failed to convert QVariantList"));
+        Py_ssize_t size = PySequence_Fast_GET_SIZE(fast.object());
+        for (int i = 0; i &lt; size; ++i) {
+            PyObject* pyItem = PySequence_Fast_GET_ITEM(fast.object(), i);
+            QVariant item = %CONVERTTOCPP[QVariant](pyItem);
+            lst.append(item);
+        }
+        return QVariant(lst);
+    }
+    </inject-code>
+
+  <primitive-type name="QVariant::Type" default-constructor="QVariant::Invalid">
+    <conversion-rule>
+        <native-to-target>
+        const char* typeName = QVariant::typeToName(%in);
+        PyObject* %out;
+        PyTypeObject* pyType = 0;
+        if (typeName)
+            pyType = Shiboken::Conversions::getPythonTypeObject(typeName);
+        %out = pyType ? ((PyObject*)pyType) : Py_None;
+        Py_INCREF(%out);
+        return %out;
+        </native-to-target>
+        <target-to-native>
+            <add-conversion type="Py_None">
+            %out = QVariant::Invalid;
+            </add-conversion>
+            <add-conversion type="PyTypeObject">
+            const char* typeName;
+            if (Shiboken::String::checkType((PyTypeObject*)%in))
+                typeName = "QString";
+            else if (%in == (PyObject*)&amp;PyFloat_Type)
+                typeName = "double"; // float is a UserType in QVariant.
+            else if (%in == (PyObject*)&amp;PyLong_Type)
+                typeName = "int";    // long is a UserType in QVariant.
+            else if (%in->ob_type == &amp;SbkObjectType_Type)
+                typeName = Shiboken::ObjectType::getOriginalName((SbkObjectType*)%in);
+            else
+                typeName = ((PyTypeObject*)%in)->tp_name;
+            %out = QVariant::nameToType(typeName);
+            </add-conversion>
+            <add-conversion type="PyString" check="Shiboken::String::check(%in)">
+            %out = QVariant::nameToType(Shiboken::String::toCString(%in));
+            </add-conversion>
+            <add-conversion type="PyDict" check="PyDict_Check(%in) &amp;&amp; QVariantType_checkAllStringKeys(%in)">
+            %out = QVariant::nameToType("QVariantMap");
+            </add-conversion>
+            <add-conversion type="PySequence">
+            const char* typeName;
+            if (QVariantType_isStringList(%in))
+                typeName = "QStringList";
+            else
+                typeName = "QVariantList";
+            %out = QVariant::nameToType(typeName);
+            </add-conversion>
+        </target-to-native>
+    </conversion-rule>
+  </primitive-type>
+
+  <primitive-type name="QVariantMap" target-lang-api-name="PyDict"/>
+  <inject-code class="target" position="end">
+  Shiboken::Conversions::registerConverterName(SbkPySide_QtCoreTypeConverters[SBK_QTCORE_QMAP_QSTRING_QVARIANT_IDX], "QVariantMap");
+  </inject-code>
+
+  <inject-code class="native" position="beginning">
+  static bool QVariantType_isStringList(PyObject* list)
+  {
+      bool allString = true;
+      Shiboken::AutoDecRef fast(PySequence_Fast(list, "Failed to convert QVariantList"));
+      Py_ssize_t size = PySequence_Fast_GET_SIZE(fast.object());
+      for(int i=0; i &lt; size; i++) {
+          PyObject* item = PySequence_Fast_GET_ITEM(fast.object(), i);
+          if (!%CHECKTYPE[QString](item)) {
+              allString = false;
+              break;
+          }
+      }
+      return allString;
+  }
+  static bool QVariantType_checkAllStringKeys(PyObject* dict)
+  {
+      Shiboken::AutoDecRef keys(PyDict_Keys(dict));
+      return QVariantType_isStringList(keys);
+  }
+  </inject-code>
+
+  <primitive-type name="QStringList">
+    <include file-name="QStringList" location="global"/>
+    <conversion-rule>
+        <native-to-target>
+            <insert-template name="cpplist_to_pylist_convertion">
+                <replace from="%INTYPE_0" to="QString" />
+            </insert-template>
+        </native-to-target>
+        <target-to-native>
+            <add-conversion type="PySequence">
+                <insert-template name="pyseq_to_cpplist_convertion">
+                    <replace from="%OUTTYPE_0" to="QString" />
+                </insert-template>
+            </add-conversion>
+        </target-to-native>
+    </conversion-rule>
+  </primitive-type>
+
+  <primitive-type name="QModelIndexList">
+    <include file-name="qabstractitemmodel.h" location="global"/>
+    <conversion-rule>
+        <native-to-target>
+            <insert-template name="cpplist_to_pylist_convertion">
+                <replace from="%INTYPE_0" to="QModelIndex" />
+            </insert-template>
+        </native-to-target>
+        <target-to-native>
+            <add-conversion type="PySequence">
+                <insert-template name="pyseq_to_cpplist_convertion">
+                    <replace from="%OUTTYPE_0" to="QModelIndex" />
+                </insert-template>
+            </add-conversion>
+        </target-to-native>
+    </conversion-rule>
+  </primitive-type>
+
+  <container-type name="QSet" type="set">
+    <include file-name="QSet" location="global"/>
+    <conversion-rule>
+        <native-to-target>
+            <insert-template name="cpplist_to_pylist_convertion"/>
+        </native-to-target>
+        <target-to-native>
+            <add-conversion type="PySequence">
+                <insert-template name="pyseq_to_cpplist_convertion"/>
+            </add-conversion>
+        </target-to-native>
+    </conversion-rule>
+  </container-type>
+
+  <container-type name="QList" type="list">
+    <include file-name="QList" location="global"/>
+    <conversion-rule>
+        <native-to-target>
+            <insert-template name="cpplist_to_pylist_convertion"/>
+        </native-to-target>
+        <target-to-native>
+            <add-conversion type="PySequence">
+                <insert-template name="pyseq_to_cpplist_convertion"/>
+            </add-conversion>
+        </target-to-native>
+    </conversion-rule>
+  </container-type>
+
+  <container-type name="QVector" type="vector">
+    <include file-name="QVector" location="global"/>
+    <conversion-rule>
+        <native-to-target>
+            <insert-template name="cpplist_to_pylist_convertion"/>
+        </native-to-target>
+        <target-to-native>
+            <add-conversion type="PySequence">
+                <insert-template name="pyseq_to_cpplist_convertion"/>
+            </add-conversion>
+        </target-to-native>
+    </conversion-rule>
+
+  </container-type>
+
+  <container-type name="QStack" type="stack">
+    <include file-name="QStack" location="global"/>
+    <conversion-rule>
+        <native-to-target>
+            <insert-template name="cpplist_to_pylist_convertion"/>
+        </native-to-target>
+        <target-to-native>
+            <add-conversion type="PySequence">
+                <insert-template name="pyseq_to_cpplist_convertion"/>
+            </add-conversion>
+        </target-to-native>
+    </conversion-rule>
+  </container-type>
+
+  <container-type name="QQueue" type="queue">
+    <include file-name="QQueue" location="global"/>
+    <conversion-rule>
+        <native-to-target>
+            <insert-template name="cpplist_to_pylist_convertion"/>
+        </native-to-target>
+        <target-to-native>
+            <add-conversion type="PySequence">
+                <insert-template name="pyseq_to_cpplist_convertion"/>
+            </add-conversion>
+        </target-to-native>
+    </conversion-rule>
+  </container-type>
+
+  <container-type name="QLinkedList" type="linked-list">
+    <include file-name="QLinkedList" location="global"/>
+    <conversion-rule>
+        <native-to-target>
+            <insert-template name="cpplist_to_pylist_convertion"/>
+        </native-to-target>
+        <target-to-native>
+            <add-conversion type="PySequence">
+                <insert-template name="pyseq_to_cpplist_convertion"/>
+            </add-conversion>
+        </target-to-native>
+    </conversion-rule>
+  </container-type>
+
+  <template name="cppmap_to_pymap_convertion">
+    PyObject* %out = PyDict_New();
+    %INTYPE::const_iterator it = %in.begin();
+    for (; it != %in.end(); ++it) {
+        %INTYPE_0 key = it.key();
+        %INTYPE_1 value = it.value();
+        PyDict_SetItem(%out,
+                       %CONVERTTOPYTHON[%INTYPE_0](key),
+                       %CONVERTTOPYTHON[%INTYPE_1](value));
+    }
+    return %out;
+  </template>
+  <template name="pydict_to_cppmap_convertion">
+    PyObject* key;
+    PyObject* value;
+    Py_ssize_t pos = 0;
+    while (PyDict_Next(%in, &amp;pos, &amp;key, &amp;value)) {
+        %OUTTYPE_0 cppKey = %CONVERTTOCPP[%OUTTYPE_0](key);
+        %OUTTYPE_1 cppValue = %CONVERTTOCPP[%OUTTYPE_1](value);
+        %out.insert(cppKey, cppValue);
+    }
+  </template>
+
+  <container-type name="QHash" type="hash">
+    <include file-name="QHash" location="global"/>
+    <include file-name="pysideconversions.h" location="global"/>
+    <conversion-rule>
+        <native-to-target>
+            <insert-template name="cppmap_to_pymap_convertion"/>
+        </native-to-target>
+        <target-to-native>
+            <add-conversion type="PyDict">
+                <insert-template name="pydict_to_cppmap_convertion"/>
+            </add-conversion>
+        </target-to-native>
+    </conversion-rule>
+  </container-type>
+  <container-type name="QMap" type="map">
+    <include file-name="QMap" location="global"/>
+    <conversion-rule>
+        <native-to-target>
+            <insert-template name="cppmap_to_pymap_convertion"/>
+        </native-to-target>
+        <target-to-native>
+            <add-conversion type="PyDict">
+                <insert-template name="pydict_to_cppmap_convertion"/>
+            </add-conversion>
+        </target-to-native>
+    </conversion-rule>
+  </container-type>
+  <container-type name="QMultiMap" type="multi-map">
+    <include file-name="QMultiMap" location="global"/>
+    <conversion-rule>
+        <native-to-target>
+            <insert-template name="cppmap_to_pymap_convertion"/>
+        </native-to-target>
+        <target-to-native>
+            <add-conversion type="PyDict">
+                <insert-template name="pydict_to_cppmap_convertion"/>
+            </add-conversion>
+        </target-to-native>
+    </conversion-rule>
+  </container-type>
+
+  <container-type name="QPair" type="pair">
+    <include file-name="QPair" location="global"/>
+    <conversion-rule>
+        <native-to-target>
+        PyObject* %out = PyTuple_New(2);
+        PyTuple_SET_ITEM(%out, 0, %CONVERTTOPYTHON[%INTYPE_0](%in.first));
+        PyTuple_SET_ITEM(%out, 1, %CONVERTTOPYTHON[%INTYPE_1](%in.second));
+        return %out;
+        </native-to-target>
+        <target-to-native>
+            <add-conversion type="PySequence">
+            %out.first = %CONVERTTOCPP[%OUTTYPE_0](PySequence_Fast_GET_ITEM(%in, 0));
+            %out.second = %CONVERTTOCPP[%OUTTYPE_1](PySequence_Fast_GET_ITEM(%in, 1));
+            </add-conversion>
+        </target-to-native>
+    </conversion-rule>
+  </container-type>
+
+  <rejection class="*" function-name="d_func"/>
+  <rejection class="*" function-name="data_ptr"/>
+  <rejection class="*" function-name="detach"/>
+  <rejection class="*" function-name="isDetached"/>
+  <rejection class="*" field-name="d_ptr"/>
+  <rejection class="*" field-name="d"/>
+  <rejection class="*" field-name="staticMetaObject"/>
+  <!-- not support array in property -->
+  <rejection class="QTextCodec::ConverterState" field-name="state_data"/>
+  <rejection class="QUuid" field-name="data1"/>
+  <rejection class="QUuid" field-name="data2"/>
+  <rejection class="QUuid" field-name="data3"/>
+  <rejection class="QUuid" field-name="data4"/>
+  <rejection class="" enum-name="QtValidLicenseForTestModule"/>
+  <rejection class="" enum-name="QtValidLicenseForDBusModule"/>
+  <rejection class="" enum-name="QtValidLicenseForSqlModule"/>
+  <rejection class="" enum-name="QtValidLicenseForOpenGLModule"/>
+  <rejection class="" enum-name="QtValidLicenseForScriptToolsModule"/>
+  <rejection class="" enum-name="__codecvt_result"/>
+  <rejection class="" enum-name="enum_1"/>
+  <rejection class="" enum-name="enum_2"/>
+  <rejection class="" enum-name="QtValidLicenseForXmlModule"/>
+  <rejection class="" enum-name="QtValidLicenseForXmlPatternsModule"/>
+  <rejection class="" enum-name="QtValidLicenseForActiveQtModule"/>
+  <rejection class="" enum-name="QtValidLicenseForCoreModule"/>
+  <rejection class="" enum-name="QtValidLicenseForQt3SupportLightModule"/>
+  <rejection class="" enum-name="QtValidLicenseForQt3SupportModule"/>
+  <rejection class="" enum-name="QtValidLicenseForNetworkModule"/>
+  <rejection class="" enum-name="QtValidLicenseForSvgModule"/>
+  <rejection class="" enum-name="QtValidLicenseForGuiModule"/>
+  <rejection class="" enum-name="QtValidLicenseForScriptModule"/>
+  <rejection class="" enum-name="QtValidLicenseForHelpModule"/>
+  <rejection class="QtConcurrent" enum-name="enum_1"/>
+  <rejection class="QAbstractEventDispatcher" function-name="filterEvent"/>
+  <rejection class="QAbstractEventDispatcher" function-name="setEventFilter"/>
+  <!-- Internal -->
+  <rejection class="QAbstractFileEngine" function-name="endEntryList"/>
+  <rejection class="QAbstractFileEngine" function-name="extension"/>
+  <rejection class="QCoreApplication" function-name="compressEvent"/>
+  <rejection class="QCoreApplication" function-name="eventFilter"/>
+  <rejection class="QCoreApplication" function-name="filterEvent"/>
+  <rejection class="QCoreApplication" function-name="setEventFilter"/>
+  <rejection class="QFile" function-name="setDecodingFunction"/>
+  <rejection class="QFile" function-name="setEncodingFunction"/>
+  <rejection class="QRegion" function-name="cleanUp"/>
+  <rejection class="QSettings" function-name="registerFormat"/>
+  <rejection class="QAbstractFileEngineIterator" function-name="entryInfo"/>
+  <rejection class="QAbstractFileEngineIterator" enum-name="EntryInfoType"/>
+  <namespace-type name="Qt">
+    <enum-type name="AlignmentFlag" flags="Alignment" />
+    <enum-type name="AnchorAttribute"/>
+    <enum-type name="AnchorPoint" since="4.6" />
+    <enum-type name="ApplicationAttribute"/>
+    <enum-type name="ArrowType"/>
+    <enum-type name="AspectRatioMode"/>
+    <enum-type name="Axis"/>
+    <enum-type name="BGMode"/>
+    <enum-type name="BrushStyle"/>
+    <enum-type name="CaseSensitivity"/>
+    <enum-type name="CheckState"/>
+    <enum-type name="ClipOperation"/>
+    <enum-type name="ConnectionType"/>
+    <enum-type name="ContextMenuPolicy"/>
+    <enum-type name="CoordinateSystem" since="4.6"/>
+    <enum-type name="Corner"/>
+    <enum-type name="CursorShape" />
+    <enum-type name="DateFormat" />
+    <enum-type name="DayOfWeek"/>
+    <enum-type name="DockWidgetArea" flags="DockWidgetAreas" />
+    <enum-type name="DockWidgetAreaSizes"/>
+    <enum-type name="DropAction" flags="DropActions"/>
+    <enum-type name="EventPriority"/>
+    <enum-type name="FillRule"/>
+    <enum-type name="FocusPolicy"/>
+    <enum-type name="FocusReason"/>
+    <enum-type name="GestureFlag" flags="GestureFlags" since="4.6"/>
+    <enum-type name="GestureState" since="4.6"/>
+    <enum-type name="GestureType" since="4.6"/>
+    <enum-type name="GlobalColor"/>
+    <enum-type name="HitTestAccuracy"/>
+    <enum-type name="ImageConversionFlag" flags="ImageConversionFlags" />
+    <enum-type name="InputMethodHint" flags="InputMethodHints" since="4.6"/>
+    <enum-type name="InputMethodQuery"/>
+    <enum-type name="ItemDataRole" force-integer="yes" />
+    <enum-type name="ItemFlag" flags="ItemFlags"/>
+    <enum-type name="ItemSelectionMode"/>
+    <enum-type name="Key" />
+    <enum-type name="KeyboardModifier" flags="KeyboardModifiers"/>
+    <enum-type name="LayoutDirection"/>
+    <enum-type name="MaskMode"/>
+    <enum-type name="MatchFlag" flags="MatchFlags"/>
+    <enum-type name="Modifier"/>
+    <enum-type name="MouseButton" flags="MouseButtons"/>
+    <enum-type name="NavigationMode" since="4.6"/>
+    <enum-type name="Orientation" flags="Orientations"/>
+    <enum-type name="PenCapStyle"/>
+    <enum-type name="PenJoinStyle"/>
+    <enum-type name="PenStyle"/>
+    <enum-type name="ScrollBarPolicy"/>
+    <enum-type name="ShortcutContext"/>
+    <enum-type name="SizeHint"/>
+    <enum-type name="SizeMode"/>
+    <enum-type name="SortOrder"/>
+    <enum-type name="TextElideMode"/>
+    <enum-type name="TextFlag"/>
+    <enum-type name="TextFormat"/>
+    <enum-type name="TextInteractionFlag" flags="TextInteractionFlags"/>
+    <enum-type name="TileRule" since="4.6"/>
+    <enum-type name="TimeSpec"/>
+    <enum-type name="ToolBarArea" flags="ToolBarAreas" />
+    <enum-type name="ToolBarAreaSizes"/>
+    <enum-type name="ToolButtonStyle"/>
+    <enum-type name="TouchPointState" since="4.6"/>
+    <enum-type name="TransformationMode"/>
+    <enum-type name="UIEffect"/>
+    <enum-type name="WhiteSpaceMode" />
+    <enum-type name="WidgetAttribute" />
+    <enum-type name="WindowFrameSection"/>
+    <enum-type name="WindowModality"/>
+    <enum-type name="WindowState" flags="WindowStates"/>
+    <enum-type name="WindowType" flags="WindowFlags"/>
+    <enum-type name="CursorMoveStyle" since="4.8" revision="4800"/>
+
+   <!--### These functions are part of QtGui, not QtCore -->
+    <modify-function signature="codecForHtml(const QByteArray &amp;)" remove="all"/>
+    <modify-function signature="mightBeRichText(const QString &amp;)" remove="all"/>
+    <modify-function signature="escape(const QString&amp;)" remove="all"/>
+    <modify-function signature="convertFromPlainText(const QString &amp;, Qt::WhiteSpaceMode)" remove="all"/>
+    <!--### -->
+    <extra-includes>
+      <include file-name="QTextDocument" location="global"/>
+    </extra-includes>
+  </namespace-type>
+
+  <add-function signature="qAbs(double)" return-type="double">
+    <inject-code class="target" position="beginning">
+    double _abs = qAbs(%1);
+    %PYARG_0 = %CONVERTTOPYTHON[double](_abs);
+    </inject-code>
+  </add-function>
+
+  <inject-code class="native" position="beginning">
+    namespace PySide {
+    static QStack&lt;PyObject*&gt; globalPostRoutineFunctions;
+    void globalPostRoutineCallback()
+    {
+        foreach(PyObject* callback, globalPostRoutineFunctions) {
+            Shiboken::AutoDecRef result(PyObject_CallObject(callback, NULL));
+            Py_DECREF(callback);
+        }
+        globalPostRoutineFunctions.clear();
+    }
+    void addPostRoutine(PyObject* callback)
+    {
+        if (PyCallable_Check(callback)) {
+            globalPostRoutineFunctions &lt;&lt; callback;
+            Py_INCREF(callback);
+        } else {
+            PyErr_SetString(PyExc_TypeError, "qAddPostRoutine: The argument must be a callable object.");
+        }
+    }
+    } // namespace
+  </inject-code>
+  <add-function signature="qAddPostRoutine(PyObject*)">
+    <inject-code class="target" position="beginning">
+        PySide::addPostRoutine(%1);
+    </inject-code>
+  </add-function>
+  <inject-code class="target" position="end">
+    qAddPostRoutine(PySide::globalPostRoutineCallback);
+  </inject-code>
+
+  <inject-code class="target" position="end">
+  QList&lt;QByteArray&gt; version = QByteArray(qVersion()).split('.');
+  PyObject* pyQtVersion = PyTuple_New(3);
+  for (int i = 0; i &lt; 3; ++i)
+      PyTuple_SET_ITEM(pyQtVersion, i, PyInt_FromLong(version[i].toInt()));
+  PyModule_AddObject(module, "__version_info__", pyQtVersion);
+  PyModule_AddStringConstant(module, "__version__", qVersion());
+  </inject-code>
+
+  <inject-code class="target" position="end">
+    { // Avoid name clash
+        Shiboken::AutoDecRef atexit(Shiboken::Module::import("atexit"));
+        Shiboken::AutoDecRef regFunc(PyObject_GetAttrString(atexit, "register"));
+        PyObject* shutDownFunc = PyObject_GetAttrString(module, "__moduleShutdown");
+        Shiboken::AutoDecRef args(PyTuple_New(1));
+        PyTuple_SET_ITEM(args, 0, shutDownFunc);
+        Shiboken::AutoDecRef retval(PyObject_Call(regFunc, args, 0));
+        Q_ASSERT(!retval.isNull());
+    }
+  </inject-code>
+
+  <add-function signature="__moduleShutdown()">
+      <inject-code class="target" position="beginning">
+        PySide::runCleanupFunctions();
+    </inject-code>
+  </add-function>
+
+  <!--signal/slot-->
+  <inject-code class="target" position="end">
+    Shiboken::Conversions::registerConverterName(SbkPySide_QtCoreTypeConverters[SBK_QSTRING_IDX], "unicode");
+    Shiboken::Conversions::registerConverterName(SbkPySide_QtCoreTypeConverters[SBK_QSTRING_IDX], "str");
+    Shiboken::Conversions::registerConverterName(SbkPySide_QtCoreTypeConverters[SBK_QTCORE_QLIST_QVARIANT_IDX], "QVariantList");
+
+    PySide::init(module);
+    Py_AtExit(QtCoreModuleExit);
+  </inject-code>
+  <inject-code class="native" position="beginning">
+    #include &lt;pyside.h&gt;
+  </inject-code>
+
+  <inject-code class="native" position="beginning">
+    // Define a global variable to handle qInstallMsgHandler callback
+    static PyObject* qtmsghandler = 0;
+
+    static void msgHandlerCallback(QtMsgType type, const char* msg)
+    {
+        Shiboken::GilState state;
+        Shiboken::AutoDecRef arglist(PyTuple_New(2));
+        PyTuple_SET_ITEM(arglist, 0, %CONVERTTOPYTHON[QtMsgType](type));
+        PyTuple_SET_ITEM(arglist, 1, %CONVERTTOPYTHON[const char*](msg));
+        Shiboken::AutoDecRef ret(PyObject_CallObject(qtmsghandler, arglist));
+    }
+    static void QtCoreModuleExit()
+    {
+        PySide::SignalManager::instance().clear();
+    }
+  </inject-code>
+  <add-function signature="qInstallMsgHandler(PyObject)" return-type="PyObject">
+    <inject-code class="target" position="beginning">
+      if (%PYARG_1 == Py_None) {
+        qInstallMsgHandler(0);
+        %PYARG_0 = qtmsghandler ? qtmsghandler : Py_None;
+        qtmsghandler = 0;
+      } else if (!PyCallable_Check(%PYARG_1)) {
+        PyErr_SetString(PyExc_TypeError, "parameter must be callable");
+      } else {
+        %PYARG_0 = qtmsghandler ? qtmsghandler : Py_None;
+        Py_INCREF(%PYARG_1);
+        qtmsghandler = %PYARG_1;
+        qInstallMsgHandler(msgHandlerCallback);
+      }
+
+      if (%PYARG_0 == Py_None)
+        Py_INCREF(%PYARG_0);
+
+    </inject-code>
+  </add-function>
+
+  <value-type name="QElapsedTimer" since="4.7">
+    <enum-type name="ClockType" since="4.7"/>
+  </value-type>
+
+  <object-type name="QAbstractTableModel" polymorphic-id-expression="qobject_cast&lt;QAbstractTableModel*&gt;(%1)">
+    <extra-includes>
+      <include file-name="QStringList" location="global"/>
+      <include file-name="QSize" location="global"/>
+    </extra-includes>
+  </object-type>
+  <value-type name="QLine" hash-function="PySide::hash">
+    <add-function signature="__repr__" return-type="PyObject*">
+        <inject-code class="target" position="beginning">
+            <insert-template name="repr_code">
+               <replace from="%REPR_FORMAT" to="%i, %i, %i, %i" />
+               <replace from="%REPR_ARGS" to="%CPPSELF.x1(), %CPPSELF.y1(), %CPPSELF.x2(), %CPPSELF.y2()" />
+             </insert-template>
+        </inject-code>
+    </add-function>
+
+    <add-function signature="__reduce__" return-type="PyObject*">
+        <inject-code class="target" position="beginning">
+            <insert-template name="reduce_code">
+              <replace from="%REDUCE_FORMAT" to="iiii" />
+              <replace from="%REDUCE_ARGS" to="%CPPSELF.x1(), %CPPSELF.y1(), %CPPSELF.x2(), %CPPSELF.y2()" />
+            </insert-template>
+        </inject-code>
+    </add-function>
+    <inject-code class="native" position="beginning">
+      namespace PySide {
+          template&lt;&gt; inline uint hash(const QLine&amp; v) {
+              return qHash(qMakePair(qMakePair(v.x1(), v.y1()), qMakePair(v.x2(), v.y2())));
+          }
+      };
+    </inject-code>
+
+    <add-function signature="toTuple" return-type="PyObject*">
+        <inject-code class="target" position="beginning">
+            <insert-template name="to_tuple">
+                <replace from="%TT_FORMAT" to="iiii" />
+                <replace from="%TT_ARGS" to="%CPPSELF.x1(), %CPPSELF.y1(), %CPPSELF.x2(), %CPPSELF.y2()" />
+            </insert-template>
+        </inject-code>
+    </add-function>
+  </value-type>
+  <value-type name="QLineF">
+    <enum-type name="IntersectType" />
+    <add-function signature="__repr__" return-type="PyObject*">
+        <inject-code class="target" position="beginning">
+            <insert-template name="repr_code">
+               <replace from="%REPR_FORMAT" to="%f, %f, %f, %f" />
+               <replace from="%REPR_ARGS" to="%CPPSELF.x1(), %CPPSELF.y1(), %CPPSELF.x2(), %CPPSELF.y2()" />
+             </insert-template>
+        </inject-code>
+    </add-function>
+
+    <add-function signature="__reduce__" return-type="PyObject*">
+        <inject-code class="target" position="beginning">
+            <insert-template name="reduce_code">
+              <replace from="%REDUCE_FORMAT" to="dddd" />
+              <replace from="%REDUCE_ARGS" to="%CPPSELF.x1(), %CPPSELF.y1(), %CPPSELF.x2(), %CPPSELF.y2()" />
+            </insert-template>
+        </inject-code>
+    </add-function>
+
+    <add-function signature="toTuple" return-type="PyObject*">
+        <inject-code class="target" position="beginning">
+            <insert-template name="to_tuple">
+                <replace from="%TT_FORMAT" to="dddd" />
+                <replace from="%TT_ARGS" to="%CPPSELF.x1(), %CPPSELF.y1(), %CPPSELF.x2(), %CPPSELF.y2()" />
+            </insert-template>
+        </inject-code>
+    </add-function>
+    <modify-function signature="intersect(QLineF, QPointF*)const">
+        <modify-argument index="2">
+            <remove-argument />
+        </modify-argument>
+        <modify-argument index="return">
+            <replace-type modified-type="(intersectType, intersectionPoint)" />
+        </modify-argument>
+        <inject-code class="target" position="beginning">
+        QPointF p;
+        %RETURN_TYPE retval = %CPPSELF.%FUNCTION_NAME(%ARGUMENT_NAMES, &amp;p);
+        %PYARG_0 = PyTuple_New(2);
+        PyTuple_SET_ITEM(%PYARG_0, 0, %CONVERTTOPYTHON[%RETURN_TYPE](retval));
+        PyTuple_SET_ITEM(%PYARG_0, 1, %CONVERTTOPYTHON[QPointF](p));
+        </inject-code>
+    </modify-function>
+  </value-type>
+  <object-type name="QResource">
+    <modify-function signature="data()const">
+        <inject-documentation format="target">
+            Returns a read only buffer object pointing to the segment of data that this resource represents. If the resource is compressed the data returns is compressed and qUncompress() must be used to access the data. If the resource is a directory None is returned.
+        </inject-documentation>
+        <modify-argument index="return">
+            <replace-type modified-type="PyObject" />
+        </modify-argument>
+        <inject-code>
+            const void* d = %CPPSELF.%FUNCTION_NAME();
+            if (d) {
+                %PYARG_0 = Shiboken::Buffer::newObject(d, %CPPSELF.size());
+            } else {
+                Py_INCREF(Py_None);
+                %PYARG_0 = Py_None;
+            }
+        </inject-code>
+    </modify-function>
+    <template name="QResource_registerResource">
+    uchar* ptr = (uchar*) Shiboken::Buffer::getPointer(%PYARG_1);
+    %RETURN_TYPE %0 = %CPPSELF.%FUNCTION_NAME(const_cast&lt;const uchar*>(ptr), %2);
+    %PYARG_0 = %CONVERTTOPYTHON[%RETURN_TYPE](%0);
+    </template>
+
+    <modify-function signature="unregisterResource(const uchar*, const QString&amp;)" rename="unregisterResourceData">
+      <modify-argument index="1">
+        <replace-type modified-type="PyBuffer"/>
+      </modify-argument>
+      <inject-code>
+        <insert-template name="QResource_registerResource" />
+      </inject-code>
+    </modify-function>
+    <modify-function signature="registerResource(const uchar*, const QString&amp;)" rename="registerResourceData">
+      <modify-argument index="1">
+        <replace-type modified-type="PyBuffer"/>
+      </modify-argument>
+      <inject-code>
+        <insert-template name="QResource_registerResource" />
+      </inject-code>
+    </modify-function>
+  </object-type>
+
+  <value-type name="QBasicTimer"/>
+  <value-type name="QByteArrayMatcher"/>
+  <value-type name="QDate" hash-function="PySide::hash" >
+    <template name="pydatetime_importandcheck_function">
+    #ifdef IS_PY3K
+    #define PySideDateTime_IMPORT PyDateTime_IMPORT
+    #else
+    #define PySideDateTime_IMPORT \
+                (PyDateTimeAPI = (PyDateTime_CAPI*) PyCObject_Import((char*)"datetime", \
+                                                                 (char*)"datetime_CAPI"))
+    #endif
+    static bool PyDateTime_ImportAndCheck(PyObject* pyIn) {
+        if (!PyDateTimeAPI) PySideDateTime_IMPORT;
+        return $DATETIMETYPE_Check(pyIn);
+    }
+    </template>
+    <inject-code class="native" position="beginning">
+        <insert-template name="pydatetime_importandcheck_function">
+            <replace from="$DATETIMETYPE" to="PyDate" />
+        </insert-template>
+    </inject-code>
+    <conversion-rule>
+        <target-to-native>
+            <add-conversion type="Py_None">
+            %out = %OUTTYPE();
+            </add-conversion>
+            <add-conversion type="PyDate" check="PyDateTime_ImportAndCheck(%in)">
+            int day = PyDateTime_GET_DAY(%in);
+            int month = PyDateTime_GET_MONTH(%in);
+            int year = PyDateTime_GET_YEAR(%in);
+            %out = %OUTTYPE(year, month, day);
+            </add-conversion>
+        </target-to-native>
+    </conversion-rule>
+    <extra-includes>
+      <include file-name="datetime.h" location="global"/>
+    </extra-includes>
+    <enum-type name="MonthNameType"/>
+    <add-function signature="__repr__" return-type="PyObject">
+        <inject-code class="target" position="beginning">
+            <insert-template name="repr_code">
+               <replace from="%REPR_FORMAT" to="%i, %i, %i" />
+               <replace from="%REPR_ARGS" to="%CPPSELF.year(), %CPPSELF.month(), %CPPSELF.day()" />
+             </insert-template>
+        </inject-code>
+    </add-function>
+
+    <add-function signature="__reduce__" return-type="PyObject">
+        <inject-code class="target" position="beginning">
+            <insert-template name="reduce_code">
+              <replace from="%REDUCE_FORMAT" to="iii" />
+              <replace from="%REDUCE_ARGS" to="%CPPSELF.year(), %CPPSELF.month(), %CPPSELF.day()" />
+            </insert-template>
+        </inject-code>
+    </add-function>
+    <add-function signature="toPython()" return-type="PyObject">
+        <inject-code class="target" position="beginning">
+        if (!PyDateTimeAPI) PySideDateTime_IMPORT;
+        %PYARG_0 = PyDate_FromDate(%CPPSELF.year(), %CPPSELF.month(), %CPPSELF.day());
+        </inject-code>
+    </add-function>
+    <modify-function signature="getDate(int*,int*,int*)" >
+        <modify-argument index="1">
+            <remove-argument/>
+        </modify-argument>
+        <modify-argument index="2">
+            <remove-argument/>
+        </modify-argument>
+        <modify-argument index="3">
+            <remove-argument/>
+        </modify-argument>
+        <modify-argument index="return">
+            <replace-type modified-type="(year, month, day)"/>
+        </modify-argument>
+        <inject-code class="target" position="beginning">
+        int year, month, day;
+        %BEGIN_ALLOW_THREADS
+        %CPPSELF.%FUNCTION_NAME(&amp;year, &amp;month, &amp;day);
+        %END_ALLOW_THREADS
+        %PYARG_0 = PyTuple_New(3);
+        PyTuple_SET_ITEM(%PYARG_0, 0, %CONVERTTOPYTHON[int](year));
+        PyTuple_SET_ITEM(%PYARG_0, 1, %CONVERTTOPYTHON[int](month));
+        PyTuple_SET_ITEM(%PYARG_0, 2, %CONVERTTOPYTHON[int](day));
+        </inject-code>
+    </modify-function>
+    <modify-function signature="weekNumber(int*)const" >
+        <modify-argument index="1">
+            <remove-argument/>
+        </modify-argument>
+        <modify-argument index="return">
+            <replace-type modified-type="(week, yearNumber)"/>
+        </modify-argument>
+        <inject-code class="target" position="beginning">
+        int yearNumber;
+        %BEGIN_ALLOW_THREADS
+        int week = %CPPSELF.%FUNCTION_NAME(&amp;yearNumber);
+        %END_ALLOW_THREADS
+        %PYARG_0 = PyTuple_New(2);
+        PyTuple_SET_ITEM(%PYARG_0, 0, %CONVERTTOPYTHON[int](week));
+        PyTuple_SET_ITEM(%PYARG_0, 1, %CONVERTTOPYTHON[int](yearNumber));
+        </inject-code>
+    </modify-function>
+    <!-- This function isn't part of Qt public API -->
+    <modify-function signature="julianToGregorian(uint,int&amp;,int&amp;,int&amp;)" remove="all"/>
+  </value-type>
+  <value-type name="QDateTime" hash-function="PySide::hash">
+    <inject-code class="native" position="beginning">
+        <insert-template name="pydatetime_importandcheck_function">
+            <replace from="$DATETIMETYPE" to="PyDateTime" />
+        </insert-template>
+    </inject-code>
+    <conversion-rule>
+        <target-to-native>
+            <add-conversion type="Py_None">
+            %out = %OUTTYPE();
+            </add-conversion>
+            <add-conversion type="PyDateTime" check="PyDateTime_ImportAndCheck(%in)">
+            int day = PyDateTime_GET_DAY(%in);
+            int month = PyDateTime_GET_MONTH(%in);
+            int year = PyDateTime_GET_YEAR(%in);
+            int hour = PyDateTime_DATE_GET_HOUR(%in);
+            int min = PyDateTime_DATE_GET_MINUTE(%in);
+            int sec = PyDateTime_DATE_GET_SECOND(%in);
+            int usec = PyDateTime_DATE_GET_MICROSECOND(%in);
+            %out = %OUTTYPE(QDate(year, month, day), QTime(hour, min, sec, usec/1000));
+            </add-conversion>
+        </target-to-native>
+    </conversion-rule>
+    <extra-includes>
+      <include file-name="datetime.h" location="global"/>
+    </extra-includes>
+    <!-- Somewhat internal constructor used to pickle QDateTime -->
+    <add-function signature="QDateTime(int, int, int, int, int, int, int, int)">
+        <modify-argument index="8">
+          <replace-default-expression with="Qt::LocalTime"/>
+        </modify-argument>
+        <inject-code class="target" position="beginning">
+            QDate date(%1, %2, %3);
+            QTime time(%4, %5, %6, %7);
+            %0 = new %TYPE(date, time, Qt::TimeSpec(%8));
+        </inject-code>
+    </add-function>
+    <add-function signature="QDateTime(int, int, int, int, int, int)">
+        <inject-code class="target" position="beginning">
+            QDate date(%1, %2, %3);
+            QTime time(%4, %5, %6);
+            %0 = new %TYPE(date, time);
+        </inject-code>
+    </add-function>
+    <add-function signature="__repr__" return-type="PyObject*">
+        <inject-code class="target" position="beginning">
+            <insert-template name="repr_code">
+               <replace from="%REPR_FORMAT" to="%i, %i, %i, %i, %i, %i, %i, %i" />
+               <replace from="%REPR_ARGS" to="%CPPSELF.date().year(), %CPPSELF.date().month(), %CPPSELF.date().day(), %CPPSELF.time().hour(), %CPPSELF.time().minute(), %CPPSELF.time().second(), %CPPSELF.time().msec(), (int)%CPPSELF.timeSpec()" />
+             </insert-template>
+        </inject-code>
+    </add-function>
+    <add-function signature="__reduce__" return-type="PyObject*">
+        <inject-code class="target" position="beginning">
+            <insert-template name="reduce_code">
+              <replace from="%REDUCE_FORMAT" to="iiiiiiii" />
+              <replace from="%REDUCE_ARGS" to="%CPPSELF.date().year(), %CPPSELF.date().month(), %CPPSELF.date().day(), %CPPSELF.time().hour(), %CPPSELF.time().minute(), %CPPSELF.time().second(), %CPPSELF.time().msec(), (int)%CPPSELF.timeSpec()" />
+            </insert-template>
+        </inject-code>
+    </add-function>
+    <add-function signature="toPython()" return-type="PyObject">
+        <inject-code class="target" position="beginning">
+        QDate date = %CPPSELF.date();
+        QTime time = %CPPSELF.time();
+        if (!PyDateTimeAPI) PySideDateTime_IMPORT;
+        %PYARG_0 = PyDateTime_FromDateAndTime(date.year(), date.month(), date.day(), time.hour(), time.minute(), time.second(), time.msec()*1000);
+        </inject-code>
+    </add-function>
+  </value-type>
+  <value-type name="QDir">
+    <enum-type name="Filter" flags="Filters"/>
+    <enum-type name="SortFlag" flags="SortFlags" />
+    <add-function signature="__reduce__" return-type="PyObject*">
+        <inject-code class="target" position="beginning">
+            <insert-template name="reduce_code">
+              <replace from="%REDUCE_FORMAT" to="s" />
+              <replace from="%REDUCE_ARGS" to="qPrintable(%CPPSELF.path())" />
+            </insert-template>
+        </inject-code>
+    </add-function>
+  </value-type>
+
+  <value-type name="QPoint" hash-function="PySide::hash">
+    <add-function signature="__repr__" return-type="PyObject*">
+        <inject-code class="target" position="beginning">
+            <insert-template name="repr_code">
+               <replace from="%REPR_FORMAT" to="%i, %i" />
+               <replace from="%REPR_ARGS" to="%CPPSELF.x(), %CPPSELF.y()" />
+             </insert-template>
+        </inject-code>
+    </add-function>
+
+    <add-function signature="__reduce__" return-type="PyObject*">
+        <inject-code class="target" position="beginning">
+            <insert-template name="reduce_code">
+              <replace from="%REDUCE_FORMAT" to="ii" />
+              <replace from="%REDUCE_ARGS" to="%CPPSELF.x(), %CPPSELF.y()" />
+            </insert-template>
+        </inject-code>
+    </add-function>
+    <inject-code class="native" position="beginning">
+      namespace PySide {
+          template&lt;&gt; inline uint hash(const QPoint&amp; v) {
+              return qHash(qMakePair(v.x(), v.y()));
+          }
+      };
+    </inject-code>
+
+    <add-function signature="toTuple" return-type="PyObject*">
+        <inject-code class="target" position="beginning">
+            <insert-template name="to_tuple">
+                <replace from="%TT_FORMAT" to="ii" />
+                <replace from="%TT_ARGS" to="%CPPSELF.x(), %CPPSELF.y()" />
+            </insert-template>
+        </inject-code>
+    </add-function>
+
+    <!--### Functions removed because they return references to Python imutable objects -->
+    <modify-function signature="rx()" remove="all"/>
+    <modify-function signature="ry()" remove="all"/>
+    <!--### -->
+  </value-type>
+  <value-type name="QPointF">
+    <add-function signature="__repr__" return-type="PyObject*">
+        <inject-code class="target" position="beginning">
+            <insert-template name="repr_code">
+               <replace from="%REPR_FORMAT" to="%f, %f" />
+               <replace from="%REPR_ARGS" to="%CPPSELF.x(), %CPPSELF.y()" />
+             </insert-template>
+        </inject-code>
+    </add-function>
+
+    <add-function signature="__reduce__" return-type="PyObject*">
+        <inject-code class="target" position="beginning">
+            <insert-template name="reduce_code">
+              <replace from="%REDUCE_FORMAT" to="dd" />
+              <replace from="%REDUCE_ARGS" to="%CPPSELF.x(), %CPPSELF.y()" />
+            </insert-template>
+        </inject-code>
+    </add-function>
+
+    <add-function signature="toTuple" return-type="PyObject*">
+        <inject-code class="target" position="beginning">
+            <insert-template name="to_tuple">
+                <replace from="%TT_FORMAT" to="dd" />
+                <replace from="%TT_ARGS" to="%CPPSELF.x(), %CPPSELF.y()" />
+            </insert-template>
+        </inject-code>
+    </add-function>
+
+    <!--### Functions removed because they return references to Python imutable objects -->
+    <modify-function signature="rx()" remove="all"/>
+    <modify-function signature="ry()" remove="all"/>
+    <!--### -->
+  </value-type>
+  <value-type name="QRect" hash-function="PySide::hash">
+    <add-function signature="__repr__" return-type="PyObject*">
+        <inject-code class="target" position="beginning">
+            <insert-template name="repr_code">
+               <replace from="%REPR_FORMAT" to="%i, %i, %i, %i" />
+               <replace from="%REPR_ARGS" to="%CPPSELF.x(), %CPPSELF.y(), %CPPSELF.width(), %CPPSELF.height()" />
+             </insert-template>
+        </inject-code>
+    </add-function>
+    <add-function signature="__reduce__" return-type="PyObject*">
+        <inject-code class="target" position="beginning">
+            <insert-template name="reduce_code">
+              <replace from="%REDUCE_FORMAT" to="iiii" />
+              <replace from="%REDUCE_ARGS" to="%CPPSELF.x(), %CPPSELF.y(), %CPPSELF.width(), %CPPSELF.height()" />
+            </insert-template>
+        </inject-code>
+    </add-function>
+    <inject-code class="native" position="beginning">
+      namespace PySide {
+          template&lt;&gt; inline uint hash(const QRect&amp; v) {
+              return qHash(qMakePair(qMakePair(v.x(), v.y()), qMakePair(v.width(), v.height())));
+          }
+      };
+    </inject-code>
+
+    <modify-function signature="getCoords(int*,int*,int*,int*)const">
+        <modify-argument index="return">
+            <replace-type modified-type="PyObject" />
+        </modify-argument>
+        <modify-argument index="1">
+            <remove-argument />
+        </modify-argument>
+        <modify-argument index="2">
+            <remove-argument />
+        </modify-argument>
+        <modify-argument index="3">
+            <remove-argument />
+        </modify-argument>
+        <modify-argument index="4">
+            <remove-argument />
+        </modify-argument>
+        <inject-code class="target">
+            <insert-template name="fix_number*,number*,number*,number*">
+                <replace from="$TYPE" to="int" />
+            </insert-template>
+        </inject-code>
+    </modify-function>
+    <modify-function signature="getRect(int*,int*,int*,int*)const">
+        <modify-argument index="return">
+            <replace-type modified-type="PyObject" />
+        </modify-argument>
+        <modify-argument index="1">
+            <remove-argument />
+        </modify-argument>
+        <modify-argument index="2">
+            <remove-argument />
+        </modify-argument>
+        <modify-argument index="3">
+            <remove-argument />
+        </modify-argument>
+        <modify-argument index="4">
+            <remove-argument />
+        </modify-argument>
+        <inject-code class="target">
+            <insert-template name="fix_number*,number*,number*,number*">
+                <replace from="$TYPE" to="int" />
+            </insert-template>
+        </inject-code>
+    </modify-function>
+  </value-type>
+  <value-type name="QRectF">
+    <add-function signature="__repr__" return-type="PyObject*">
+        <inject-code class="target" position="beginning">
+            <insert-template name="repr_code">
+               <replace from="%REPR_FORMAT" to="%f, %f, %f, %f" />
+               <replace from="%REPR_ARGS" to="%CPPSELF.x(), %CPPSELF.y(), %CPPSELF.width(), %CPPSELF.height()" />
+             </insert-template>
+        </inject-code>
+    </add-function>
+
+   <!--
+         FIXME These functions return qreal. Will convert to double (format
+         string) mess things up in other architectures?
+    -->
+    <add-function signature="__reduce__" return-type="PyObject*">
+        <inject-code class="target" position="beginning">
+            <insert-template name="reduce_code">
+              <replace from="%REDUCE_FORMAT" to="dddd" />
+              <replace from="%REDUCE_ARGS" to="%CPPSELF.x(), %CPPSELF.y(), %CPPSELF.width(), %CPPSELF.height()" />
+            </insert-template>
+        </inject-code>
+    </add-function>
+    <modify-function signature="getCoords(qreal*,qreal*,qreal*,qreal*)const">
+        <modify-argument index="return">
+            <replace-type modified-type="PyObject" />
+        </modify-argument>
+        <modify-argument index="1">
+            <remove-argument />
+        </modify-argument>
+        <modify-argument index="2">
+            <remove-argument />
+        </modify-argument>
+        <modify-argument index="3">
+            <remove-argument />
+        </modify-argument>
+        <modify-argument index="4">
+            <remove-argument />
+        </modify-argument>
+        <inject-code class="target">
+            <insert-template name="fix_number*,number*,number*,number*">
+                <replace from="$TYPE" to="qreal" />
+            </insert-template>
+        </inject-code>
+    </modify-function>
+    <modify-function signature="getRect(qreal*,qreal*,qreal*,qreal*)const">
+        <modify-argument index="return">
+            <replace-type modified-type="PyObject" />
+        </modify-argument>
+        <modify-argument index="1">
+            <remove-argument />
+        </modify-argument>
+        <modify-argument index="2">
+            <remove-argument />
+        </modify-argument>
+        <modify-argument index="3">
+            <remove-argument />
+        </modify-argument>
+        <modify-argument index="4">
+            <remove-argument />
+        </modify-argument>
+        <inject-code class="target">
+            <insert-template name="fix_number*,number*,number*,number*">
+                <replace from="$TYPE" to="qreal" />
+            </insert-template>
+        </inject-code>
+    </modify-function>
+  </value-type>
+  <value-type name="QSize" hash-function="PySide::hash">
+    <add-function signature="__repr__" return-type="PyObject*">
+        <inject-code class="target" position="beginning">
+            <insert-template name="repr_code">
+               <replace from="%REPR_FORMAT" to="%i, %i" />
+               <replace from="%REPR_ARGS" to="%CPPSELF.width(), %CPPSELF.height()" />
+             </insert-template>
+        </inject-code>
+    </add-function>
+
+    <add-function signature="__reduce__" return-type="PyObject*">
+        <inject-code class="target" position="beginning">
+            <insert-template name="reduce_code">
+              <replace from="%REDUCE_FORMAT" to="ii" />
+              <replace from="%REDUCE_ARGS" to="%CPPSELF.width(), %CPPSELF.height()" />
+            </insert-template>
+        </inject-code>
+    </add-function>
+    <inject-code class="native" position="beginning">
+      namespace PySide {
+          template&lt;&gt; inline uint hash(const QSize&amp; v) {
+              return qHash(qMakePair(v.width(), v.height()));
+          }
+      };
+    </inject-code>
+
+    <add-function signature="toTuple" return-type="PyObject*">
+        <inject-code class="target" position="beginning">
+            <insert-template name="to_tuple">
+                <replace from="%TT_FORMAT" to="ii" />
+                <replace from="%TT_ARGS" to="%CPPSELF.width(), %CPPSELF.height()" />
+            </insert-template>
+        </inject-code>
+    </add-function>
+
+    <!--### Functions removed because they return references to Python imutable objects -->
+    <modify-function signature="rheight()" remove="all"/>
+    <modify-function signature="rwidth()" remove="all"/>
+    <!--### -->
+  </value-type>
+  <value-type name="QSizeF">
+    <add-function signature="__repr__" return-type="PyObject*">
+        <inject-code class="target" position="beginning">
+            <insert-template name="repr_code">
+               <replace from="%REPR_FORMAT" to="%f, %f" />
+               <replace from="%REPR_ARGS" to="%CPPSELF.width(), %CPPSELF.height()" />
+             </insert-template>
+        </inject-code>
+    </add-function>
+
+    <add-function signature="__reduce__" return-type="PyObject*">
+        <inject-code class="target" position="beginning">
+            <insert-template name="reduce_code">
+              <replace from="%REDUCE_FORMAT" to="dd" />
+              <replace from="%REDUCE_ARGS" to="%CPPSELF.width(), %CPPSELF.height()" />
+            </insert-template>
+        </inject-code>
+    </add-function>
+
+    <add-function signature="toTuple" return-type="PyObject*">
+        <inject-code class="target" position="beginning">
+            <insert-template name="to_tuple">
+                <replace from="%TT_FORMAT" to="dd" />
+                <replace from="%TT_ARGS" to="%CPPSELF.width(), %CPPSELF.height()" />
+            </insert-template>
+        </inject-code>
+    </add-function>
+
+    <!--### Functions removed because they return references to Python imutable objects -->
+    <modify-function signature="rheight()" remove="all" />
+    <modify-function signature="rwidth()" remove="all" />
+    <!--### -->
+  </value-type>
+
+  <value-type name="QTime" hash-function="PySide::hash">
+    <inject-code class="native" position="beginning">
+        <insert-template name="pydatetime_importandcheck_function">
+            <replace from="$DATETIMETYPE" to="PyTime" />
+        </insert-template>
+    </inject-code>
+    <conversion-rule>
+        <target-to-native>
+            <add-conversion type="Py_None">
+            %out = %OUTTYPE();
+            </add-conversion>
+            <add-conversion type="PyTime" check="PyDateTime_ImportAndCheck(%in)">
+            int hour = PyDateTime_TIME_GET_HOUR(%in);
+            int min = PyDateTime_TIME_GET_MINUTE(%in);
+            int sec = PyDateTime_TIME_GET_SECOND(%in);
+            int usec = PyDateTime_TIME_GET_MICROSECOND(%in);
+            %out = %OUTTYPE(hour, min, sec, usec/1000);
+            </add-conversion>
+        </target-to-native>
+    </conversion-rule>
+
+    <extra-includes>
+      <include file-name="datetime.h" location="global"/>
+    </extra-includes>
+
+    <add-function signature="__repr__" return-type="PyObject*">
+        <inject-code class="target" position="beginning">
+            <insert-template name="repr_code">
+               <replace from="%REPR_FORMAT" to="%i, %i, %i, %i" />
+               <replace from="%REPR_ARGS" to="%CPPSELF.hour(), %CPPSELF.minute(), %CPPSELF.second(), %CPPSELF.msec()" />
+             </insert-template>
+        </inject-code>
+    </add-function>
+    <add-function signature="__reduce__" return-type="PyObject*">
+        <inject-code class="target" position="beginning">
+            <insert-template name="reduce_code">
+              <replace from="%REDUCE_FORMAT" to="iiii" />
+              <replace from="%REDUCE_ARGS" to="%CPPSELF.hour(), %CPPSELF.minute(), %CPPSELF.second(), %CPPSELF.msec()" />
+            </insert-template>
+        </inject-code>
+    </add-function>
+    <add-function signature="toPython()" return-type="PyObject">
+        <inject-code class="target" position="beginning">
+        if (!PyDateTimeAPI) PySideDateTime_IMPORT;
+        %PYARG_0 = PyTime_FromTime(%CPPSELF.hour(), %CPPSELF.minute(), %CPPSELF.second(), %CPPSELF.msec()*1000);
+        </inject-code>
+    </add-function>
+  </value-type>
+  <value-type name="QPersistentModelIndex">
+    <modify-function signature="internalPointer()const">
+        <inject-code class="target" position="beginning">
+            <insert-template name="return_internal_pointer" />
+        </inject-code>
+    </modify-function>
+    <modify-function signature="operator const QModelIndex&amp;()const">
+        <modify-argument index="return">
+            <parent index="this" action="add"/>
+        </modify-argument>
+    </modify-function>
+  </value-type>
+  <value-type name="QUuid">
+    <enum-type name="Variant"/>
+    <enum-type name="Version"/>
+    <add-function signature="__repr__" return-type="PyObject*">
+        <inject-code class="target" position="beginning">
+            <insert-template name="repr_code">
+               <replace from="%REPR_FORMAT" to="'%s'" />
+               <replace from="%REPR_ARGS" to="qPrintable(%CPPSELF.toString())" />
+             </insert-template>
+        </inject-code>
+    </add-function>
+    <add-function signature="__reduce__" return-type="PyObject*">
+        <inject-code class="target" position="beginning">
+            <insert-template name="reduce_code">
+              <replace from="%REDUCE_FORMAT" to="s" />
+              <replace from="%REDUCE_ARGS" to="qPrintable(%CPPSELF.toString())" />
+            </insert-template>
+        </inject-code>
+    </add-function>
+  </value-type>
+
+  <value-type name="QLocale">
+    <enum-type name="Country" />
+    <enum-type name="FormatType"/>
+    <enum-type name="Language" />
+    <enum-type name="MeasurementSystem"/>
+    <enum-type name="NumberOption" flags="NumberOptions"/>
+    <enum-type name="Script" since="4.8" revision="4800"/>
+    <enum-type name="CurrencySymbolFormat" since="4.8" revision="4800"/>
+    <enum-type name="QuotationStyle" since="4.8" revision="4800"/>
+    <!--### All those C++ number types have the same representation in Python -->
+    <modify-function signature="toString(qulonglong) const" remove="all"/>
+    <modify-function signature="toString(ushort) const" remove="all"/>
+    <modify-function signature="toString(unsigned int) const" remove="all"/>
+    <!--### -->
+    <extra-includes>
+      <include file-name="QDate" location="global"/>
+    </extra-includes>
+    <modify-function signature="toTime(QString, QLocale::FormatType)const">
+        <modify-argument index="2">
+            <rename to="format" />
+        </modify-argument>
+    </modify-function>
+    <modify-function signature="toDate(QString, QLocale::FormatType)const">
+        <modify-argument index="2">
+            <rename to="format" />
+        </modify-argument>
+    </modify-function>
+    <modify-function signature="toUInt(QString,bool*,int)const">
+        <modify-argument index="2">
+            <remove-argument />
+            <remove-default-expression />
+        </modify-argument>
+        <modify-argument index="return">
+            <replace-type modified-type="(int, bool ok)"/>
+        </modify-argument>
+        <inject-code class="target" position="beginning">
+            <insert-template name="fix_arg,bool*,arg" />
+        </inject-code>
+    </modify-function>
+    <modify-function signature="toULongLong(QString,bool*,int)const">
+        <modify-argument index="2">
+            <remove-argument />
+            <remove-default-expression />
+        </modify-argument>
+        <modify-argument index="return">
+            <replace-type modified-type="(int, bool ok)"/>
+        </modify-argument>
+        <inject-code class="target" position="beginning">
+            <insert-template name="fix_arg,bool*,arg" />
+        </inject-code>
+    </modify-function>
+    <modify-function signature="toDouble(QString,bool*)const">
+        <modify-argument index="2">
+            <remove-argument />
+            <remove-default-expression />
+        </modify-argument>
+        <modify-argument index="return">
+            <replace-type modified-type="(float, bool ok)"/>
+        </modify-argument>
+        <inject-code class="target" position="beginning">
+            <insert-template name="fix_args,bool*" />
+        </inject-code>
+    </modify-function>
+    <modify-function signature="toFloat(QString,bool*)const">
+        <modify-argument index="2">
+            <remove-argument />
+            <remove-default-expression />
+        </modify-argument>
+        <modify-argument index="return">
+            <replace-type modified-type="(float, bool ok)"/>
+        </modify-argument>
+        <inject-code class="target" position="beginning">
+            <insert-template name="fix_args,bool*" />
+        </inject-code>
+    </modify-function>
+    <modify-function signature="toInt(QString,bool*,int)const">
+        <modify-argument index="2">
+            <remove-argument />
+        </modify-argument>
+        <modify-argument index="return">
+            <replace-type modified-type="(int, bool ok)"/>
+        </modify-argument>
+        <inject-code class="target" position="beginning">
+            <insert-template name="fix_arg,bool*,arg" />
+        </inject-code>
+    </modify-function>
+    <modify-function signature="toLongLong(QString,bool*,int)const">
+        <modify-argument index="2">
+            <remove-argument />
+        </modify-argument>
+        <modify-argument index="return">
+            <replace-type modified-type="(int, bool ok)"/>
+        </modify-argument>
+        <inject-code class="target" position="beginning">
+            <insert-template name="fix_arg,bool*,arg" />
+        </inject-code>
+    </modify-function>
+    <modify-function signature="toShort(QString,bool*,int)const">
+        <modify-argument index="2">
+            <remove-argument />
+        </modify-argument>
+        <modify-argument index="return">
+            <replace-type modified-type="(int, bool ok)"/>
+        </modify-argument>
+        <inject-code class="target" position="beginning">
+            <insert-template name="fix_arg,bool*,arg" />
+        </inject-code>
+    </modify-function>
+    <modify-function signature="toUShort(QString,bool*,int)const">
+        <modify-argument index="2">
+            <remove-argument />
+        </modify-argument>
+        <modify-argument index="return">
+            <replace-type modified-type="(int, bool ok)"/>
+        </modify-argument>
+        <inject-code class="target" position="beginning">
+            <insert-template name="fix_arg,bool*,arg" />
+        </inject-code>
+    </modify-function>
+  </value-type>
+  <value-type name="QBitArray" hash-function="qHash" >
+    <add-function signature="__len__">
+        <inject-code class="target" position="beginning">
+            return %CPPSELF.size();
+        </inject-code>
+    </add-function>
+    <add-function signature="__getitem__">
+        <inject-code class="target" position="beginning">
+        if (_i &lt; 0 || _i >= %CPPSELF.size()) {
+            PyErr_SetString(PyExc_IndexError, "index out of bounds");
+            return 0;
+        }
+        bool ret = %CPPSELF.at(_i);
+        return %CONVERTTOPYTHON[bool](ret);
+        </inject-code>
+    </add-function>
+    <add-function signature="__setitem__">
+        <inject-code class="target" position="beginning">
+            PyObject* args = Py_BuildValue("(iiO)", _i, 1, _value);
+            PyObject* result = Sbk_QBitArrayFunc_setBit(self, args);
+            Py_DECREF(args);
+            Py_XDECREF(result);
+            return !result ? -1 : 0;
+        </inject-code>
+    </add-function>
+  </value-type>
+  <!-- QReadWriteLock does not have a copy ctor! -->
+  <object-type name="QReadWriteLock">
+    <enum-type name="RecursionMode"/>
+    <modify-function signature="lockForRead()" allow-thread="yes"/>
+    <modify-function signature="tryLockForRead(int)" allow-thread="yes"/>
+    <modify-function signature="lockForWrite()" allow-thread="yes"/>
+    <modify-function signature="tryLockForWrite(int)" allow-thread="yes"/>
+  </object-type>
+  <object-type name="QReadLocker">
+    <modify-function signature="QReadLocker(QReadWriteLock*)">
+        <modify-argument index="1">
+            <reference-count action="set"/>
+        </modify-argument>
+    </modify-function>
+    <modify-function signature="relock()" allow-thread="yes" />
+    <add-function signature="__enter__()" />
+    <add-function signature="__exit__(PyObject*, PyObject*, PyObject*)">
+        <inject-code>
+            %CPPSELF.unlock();
+        </inject-code>
+    </add-function>
+  </object-type>
+  <object-type name="QWriteLocker">
+    <modify-function signature="QWriteLocker(QReadWriteLock*)">
+        <modify-argument index="1">
+            <reference-count action="set"/>
+        </modify-argument>
+    </modify-function>
+    <modify-function signature="relock()" allow-thread="yes" />
+    <add-function signature="__enter__()" />
+    <add-function signature="__exit__(PyObject*, PyObject*, PyObject*)">
+        <inject-code>
+            %CPPSELF.unlock();
+        </inject-code>
+    </add-function>
+  </object-type>
+  <object-type name="QDirIterator">
+    <enum-type name="IteratorFlag" flags="IteratorFlags"/>
+  </object-type>
+  <object-type name="QThread">
+    <enum-type name="Priority"/>
+    <modify-function signature="run()" thread="yes" />
+    <modify-function signature="exec()" rename="exec_" allow-thread="yes" />
+    <modify-function signature="msleep(unsigned long)" allow-thread="yes" />
+    <modify-function signature="sleep(unsigned long)" allow-thread="yes" />
+    <modify-function signature="usleep(unsigned long)" allow-thread="yes" />
+    <modify-function signature="wait(unsigned long)" allow-thread="yes" />
+    <modify-function signature="start(QThread::Priority)" allow-thread="yes">
+      <modify-argument index="1">
+        <rename to="priority"/>
+      </modify-argument>
+    </modify-function>
+    <modify-function signature="exit(int)" allow-thread="yes" />
+  </object-type>
+  <object-type name="QAbstractFileEngineIterator"/>
+  <object-type name="QAbstractItemModel">
+    <!-- This function was replaced by a added function -->
+    <modify-function signature="createIndex(int, int, void*) const" remove="all"/>
+    <!-- This function is the same as createIndex(int, int, int) const -->
+    <modify-function signature="createIndex(int,int, quint32)const" remove="all" />
+    <modify-function signature="createIndex(int, int, int)const">
+        <modify-argument index="3">
+            <replace-default-expression with="0" />
+        </modify-argument>
+    </modify-function>
+    <add-function signature="createIndex(int, int, PyObject*)const" return-type="QModelIndex">
+        <modify-argument index="1">
+            <rename to="row"/>
+        </modify-argument>
+        <modify-argument index="2">
+            <rename to="column"/>
+        </modify-argument>
+        <modify-argument index="3">
+            <rename to="ptr"/>
+        </modify-argument>
+        <inject-code class="target" position="beginning">
+        %RETURN_TYPE %0 = %CPPSELF.%FUNCTION_NAME(%1, %2, %PYARG_3);
+        %PYARG_0 = %CONVERTTOPYTHON[%RETURN_TYPE](%0);
+        </inject-code>
+        <inject-documentation mode="append" format="target">
+            Creates a model index for the given row and column with the internal pointer ptr.
+            When using a QSortFilterProxyModel, its indexes have their own internal pointer. It is not advisable to access this internal pointer outside of the model. Use the data() function instead.
+            This function provides a consistent interface that model subclasses must use to create model indexes.
+
+            .. warning:: Because of some Qt/Python itegration rules, the ptr argument do not get the reference incremented during the QModelIndex life time. So it is necessary to keep the object used on ptr argument alive during the whole process. Do not destroy the object if you are not sure about that.
+        </inject-documentation>
+    </add-function>
+    <modify-function signature="mimeData(QModelIndexList) const">
+      <modify-argument index="return">
+        <define-ownership class="native" owner="c++"/>
+        <define-ownership class="target" owner="default"/>
+      </modify-argument>
+    </modify-function>
+    <modify-function signature="data(const QModelIndex&amp;,int) const">
+      <modify-argument index="return">
+        <define-ownership class="native" owner="c++"/>
+      </modify-argument>
+    </modify-function>
+  </object-type>
+  <!-- QObject is created manually -->
+  <object-type name="QObject">
+    <extra-includes>
+      <include file-name="QThread" location="global"/>
+      <include file-name="QCoreApplication" location="global"/>
+      <include file-name="signalmanager.h" location="local" />
+    </extra-includes>
+    <modify-function signature="metaObject() const">
+      <inject-code class="target" position="beginning">
+        %RETURN_TYPE %0 = %CPPSELF.%FUNCTION_NAME();
+        %PYARG_0 = %CONVERTTOPYTHON[%RETURN_TYPE](%0);
+      </inject-code>
+      <modify-argument index="return">
+        <reference-count action="set"/>
+      </modify-argument>
+    </modify-function>
+    <modify-function signature="deleteLater()">
+      <modify-argument index="this">
+        <define-ownership owner="c++"/>
+      </modify-argument>
+    </modify-function>
+    <!-- Invalidate-after-use stuff -->
+    <modify-function signature="childEvent(QChildEvent*)">
+        <modify-argument index="1" invalidate-after-use="yes"/>
+    </modify-function>
+    <modify-function signature="customEvent(QEvent*)">
+        <modify-argument index="1" invalidate-after-use="yes"/>
+    </modify-function>
+    <modify-function signature="event(QEvent*)">
+        <modify-argument index="1" invalidate-after-use="yes"/>
+    </modify-function>
+    <modify-function signature="eventFilter(QObject*,QEvent*)">
+        <modify-argument index="2" invalidate-after-use="yes"/>
+    </modify-function>
+    <modify-function signature="timerEvent(QTimerEvent*)">
+        <modify-argument index="1" invalidate-after-use="yes"/>
+    </modify-function>
+    <!-- End of Invalidate-after-use fix -->
+    <modify-function signature="parent() const">
+      <modify-argument index="this">
+        <parent index="return" action="add"/>
+      </modify-argument>
+      <modify-argument index="return">
+        <define-ownership class="target" owner="default"/>
+      </modify-argument>
+    </modify-function>
+    <modify-function signature="setParent(QObject*)">
+      <modify-argument index="this">
+        <parent index="1" action="add"/>
+      </modify-argument>
+    </modify-function>
+    <modify-function signature="connect(const QObject*, const char*, const char *, Qt::ConnectionType) const">
+        <modify-argument index="4">
+            <rename to="type"/>
+        </modify-argument>
+        <inject-code class="target" position="beginning" file="">
+        // %FUNCTION_NAME() - disable generation of function call.
+        %RETURN_TYPE %0 = qobjectConnect(%1, %2, %CPPSELF, %3, %4);
+        %PYARG_0 = %CONVERTTOPYTHON[%RETURN_TYPE](%0);
+        </inject-code>
+    </modify-function>
+    <modify-function signature="connect(const QObject*, const char*, const QObject*, const char *, Qt::ConnectionType)">
+        <modify-argument index="5">
+            <rename to="type"/>
+        </modify-argument>
+        <inject-code class="target" position="beginning" file="">
+        // %FUNCTION_NAME() - disable generation of function call.
+        %RETURN_TYPE %0 = qobjectConnect(%1, %2, %3, %4, %5);
+        %PYARG_0 = %CONVERTTOPYTHON[%RETURN_TYPE](%0);
+        </inject-code>
+    </modify-function>
+    <inject-code class="native" position="beginning" file="glue/qobject_connect.cpp" />
+    <add-function signature="connect(const QObject*, const char*, PyCallable*, Qt::ConnectionType)" return-type="bool" static="yes">
+        <modify-argument index="4">
+            <rename to="type"/>
+            <replace-default-expression with="Qt::AutoConnection" />
+        </modify-argument>
+        <inject-code class="target" position="beginning">
+        // %FUNCTION_NAME() - disable generation of function call.
+        %RETURN_TYPE %0 = qobjectConnectCallback(%1, %2, %PYARG_3, %4);
+        %PYARG_0 = %CONVERTTOPYTHON[%RETURN_TYPE](%0);
+        </inject-code>
+    </add-function>
+    <!-- static version -->
+    <add-function signature="connect(const char*, PyCallable*, Qt::ConnectionType)" return-type="bool">
+        <modify-argument index="3">
+            <rename to="type"/>
+            <replace-default-expression with="Qt::AutoConnection" />
+        </modify-argument>
+        <inject-code class="target" position="beginning">
+        // %FUNCTION_NAME() - disable generation of function call.
+        %RETURN_TYPE %0 = qobjectConnectCallback(%CPPSELF, %1, %PYARG_2, %3);
+        %PYARG_0 = %CONVERTTOPYTHON[%RETURN_TYPE](%0);
+        </inject-code>
+    </add-function>
+    <add-function signature="connect(const char*, const QObject*, const char *, Qt::ConnectionType)" return-type="bool">
+        <modify-argument index="4">
+            <rename to="type"/>
+            <replace-default-expression with="Qt::AutoConnection" />
+        </modify-argument>
+        <inject-code class="target" position="beginning">
+        // %FUNCTION_NAME() - disable generation of function call.
+        %RETURN_TYPE %0 = qobjectConnect(%CPPSELF, %1, %2, %3, %4);
+        %PYARG_0 = %CONVERTTOPYTHON[%RETURN_TYPE](%0);
+        </inject-code>
+    </add-function>
+    <add-function signature="emit(const char*, ...)" return-type="bool">
+        <inject-code class="target" position="beginning">
+        %RETURN_TYPE %0 = PySide::SignalManager::instance().emitSignal(%CPPSELF, %1, %PYARG_2);
+        %PYARG_0 = %CONVERTTOPYTHON[%RETURN_TYPE](%0);
+        </inject-code>
+    </add-function>
+    <add-function signature="disconnect(const char *, PyCallable*)" return-type="bool">
+         <inject-code class="target" position="beginning">
+        // %FUNCTION_NAME() - disable generation of function call.
+        %RETURN_TYPE %0 = qobjectDisconnectCallback(%CPPSELF, %1, %2);
+        %PYARG_0 = %CONVERTTOPYTHON[%RETURN_TYPE](%0);
+        </inject-code>
+    </add-function>
+    <add-function signature="disconnect(const QObject*, const char*, PyCallable*)" return-type="bool" static="yes">
+         <inject-code class="target" position="beginning">
+        // %FUNCTION_NAME() - disable generation of function call.
+        %RETURN_TYPE %0 = qobjectDisconnectCallback(%1, %2, %3);
+        %PYARG_0 = %CONVERTTOPYTHON[%RETURN_TYPE](%0);
+        </inject-code>
+    </add-function>
+    <inject-code class="native" file="glue/qobject_findchild.cpp"/>
+    <add-function signature="findChild(PyTypeObject*, const QString&amp;)" return-type="PyObject*">
+        <inject-code class="target" position="beginning">
+        QObject* child = _findChildHelper(%CPPSELF, %2, (PyTypeObject*)%PYARG_1);
+        %PYARG_0 = %CONVERTTOPYTHON[QObject*](child);
+        </inject-code>
+      <modify-argument index="return">
+        <parent index="this" action="add"/>
+      </modify-argument>
+      <modify-argument index="2">
+          <replace-default-expression with="QString()" />
+      </modify-argument>
+    </add-function>
+    <add-function signature="findChildren(PyTypeObject*, const QString&amp;)" return-type="PySequence*" >
+        <inject-code class="target" position="beginning">
+            %PYARG_0 = PyList_New(0);
+            _findChildrenHelper(%CPPSELF, %2, (PyTypeObject*)%PYARG_1, %PYARG_0);
+        </inject-code>
+        <modify-argument index="return">
+            <parent index="this" action="add"/>
+        </modify-argument>
+        <modify-argument index="2">
+            <replace-default-expression with="QString()" />
+        </modify-argument>
+    </add-function>
+    <add-function signature="findChildren(PyTypeObject*, const QRegExp&amp;)" return-type="PySequence*" >
+        <inject-code class="target" position="beginning">
+            %PYARG_0 = PyList_New(0);
+            _findChildrenHelper(%CPPSELF, %2, (PyTypeObject*)%PYARG_1, %PYARG_0);
+        </inject-code>
+        <modify-argument index="return">
+            <parent index="this" action="add"/>
+        </modify-argument>
+    </add-function>
+
+    <add-function signature="tr(const char *, const char *, int)" return-type="QString">
+        <modify-argument index="2">
+          <replace-default-expression with="0"/>
+        </modify-argument>
+        <modify-argument index="3">
+          <replace-default-expression with="-1"/>
+        </modify-argument>
+
+        <inject-code class="target" position="beginning">
+            QString result;
+            if (QCoreApplication::instance()) {
+                PyObject *klass = PyObject_GetAttrString(%PYSELF, "__class__");
+                PyObject *cname = PyObject_GetAttrString(klass, "__name__");
+                result = QString(QCoreApplication::instance()->translate(Shiboken::String::toCString(cname), %1, %2, QCoreApplication::CodecForTr, %3));
+
+                Py_DECREF(klass);
+                Py_DECREF(cname);
+            } else {
+                result = QString(QString::fromLatin1(%1));
+            }
+            %PYARG_0 = %CONVERTTOPYTHON[QString](result);
+        </inject-code>
+    </add-function>
+
+    <template name="translate_utf8">
+    if (QCoreApplication::instance()) {
+        Shiboken::AutoDecRef klass(PyObject_GetAttrString(%PYSELF, "__class__"));
+        Shiboken::AutoDecRef cname(PyObject_GetAttrString(klass, "__name__"));
+        $DEFINE_SECOND_VAR
+        QString result = QCoreApplication::instance()->translate(Shiboken::String::toCString(cname.object()), $SECOND_VAR, %2, QCoreApplication::UnicodeUTF8, %3);
+        %PYARG_0 = %CONVERTTOPYTHON[QString](result);
+    } else {
+        Py_INCREF(%PYARG_1);
+        %PYARG_0 = %PYARG_1;
+    }
+    </template>
+    <add-function signature="trUtf8(const char *, const char *, int)" return-type="QString">
+        <modify-argument index="2">
+          <replace-default-expression with="0"/>
+        </modify-argument>
+        <modify-argument index="3">
+          <replace-default-expression with="-1"/>
+        </modify-argument>
+        <inject-code class="target" position="beginning">
+            <insert-template name="translate_utf8">
+                <replace from="$DEFINE_SECOND_VAR" to="" />
+                <replace from="$SECOND_VAR" to="%1" />
+            </insert-template>
+        </inject-code>
+    </add-function>
+    <add-function signature="trUtf8(PyUnicode, const char *, int)" return-type="QString">
+        <modify-argument index="2">
+          <replace-default-expression with="0"/>
+        </modify-argument>
+        <modify-argument index="3">
+          <replace-default-expression with="-1"/>
+        </modify-argument>
+        <inject-code class="target" position="beginning">
+            <insert-template name="translate_utf8">
+                <replace from="$DEFINE_SECOND_VAR" to="Shiboken::AutoDecRef str(PyUnicode_AsUTF8String(%1));" />
+                <replace from="$SECOND_VAR" to="Shiboken::String::toCString(str.object())" />
+            </insert-template>
+        </inject-code>
+    </add-function>
+
+   <modify-function signature="receivers(const char*) const">
+     <inject-code class="target" position="beginning">
+       // Avoid return +1 because SignalManager connect to "destroyed()" signal to control object timelife
+       int ret = %CPPSELF.%FUNCTION_NAME(%1);
+       if (ret > 0 &amp;&amp; ((strcmp(%1, SIGNAL(destroyed())) == 0) || (strcmp(%1, SIGNAL(destroyed(QObject*))) == 0)))
+       ret -= PySide::SignalManager::instance().countConnectionsWith(%CPPSELF);
+
+       %PYARG_0 = %CONVERTTOPYTHON[int](ret);
+     </inject-code>
+   </modify-function>
+
+   <modify-function signature="destroyed(QObject*)">
+     <modify-argument index="1">
+       <rename to="object"/>
+     </modify-argument>
+   </modify-function>
+
+   <modify-function signature="sender() const">
+      <modify-argument index="return">
+         <define-ownership owner="default"/>
+      </modify-argument>
+  </modify-function>
+
+   <!-- This is not supported due the lack of information durring the call with no arguments,  this can cause a memory leak -->
+   <modify-function signature="disconnect(const char*, const QObject *, const char *)">
+       <modify-argument index="1">
+           <remove-default-expression />
+       </modify-argument>
+       <modify-argument index="2">
+           <remove-default-expression />
+       </modify-argument>
+       <modify-argument index="3">
+           <remove-default-expression />
+       </modify-argument>
+   </modify-function>
+  </object-type>
+  <object-type name="QAbstractListModel" polymorphic-id-expression="qobject_cast&lt;QAbstractListModel*&gt;(%1)">
+    <extra-includes>
+      <include file-name="QStringList" location="global"/>
+      <include file-name="QSize" location="global"/>
+    </extra-includes>
+  </object-type>
+  <value-type name="QUrl" hash-function="PySide::hash">
+    <enum-type name="FormattingOption" flags="FormattingOptions"/>
+    <enum-type name="ParsingMode"/>
+    <modify-documentation xpath='description/para[3]'>
+        &lt;para>URLs can be represented in two forms: encoded or unencoded. The unencoded representation is suitable for showing to users, but the encoded representation is typically what you would send to a web server. For example, the unencoded URL &quot;http://bühler.example.com&quot; would be sent to the server as &quot;http://xn--bhler-kva.example.com/List%20of%20applicants.xml&quot;.&lt;/para>
+    </modify-documentation>
+    <extra-includes>
+      <include file-name="QStringList" location="global"/>
+    </extra-includes>
+    <add-function signature="__repr__" return-type="PyObject*">
+        <inject-code class="target" position="beginning">
+            <insert-template name="repr_code">
+               <replace from="%REPR_FORMAT" to="'%s'" />
+               <replace from="%REPR_ARGS" to="qPrintable(%CPPSELF.toString())" />
+             </insert-template>
+        </inject-code>
+    </add-function>
+
+    <add-function signature="__reduce__" return-type="PyObject*">
+        <inject-code class="target" position="beginning">
+            <insert-template name="reduce_code">
+              <replace from="%REDUCE_FORMAT" to="s" />
+              <replace from="%REDUCE_ARGS" to="qPrintable(%CPPSELF.toString())" />
+            </insert-template>
+        </inject-code>
+    </add-function>
+  </value-type>
+  <value-type name="QRegExp">
+    <enum-type name="CaretMode"/>
+    <enum-type name="PatternSyntax"/>
+    <extra-includes>
+      <include file-name="QStringList" location="global"/>
+    </extra-includes>
+    <add-function signature="__repr__" return-type="PyObject*">
+        <inject-code class="target" position="beginning">
+            <insert-template name="repr_code">
+               <replace from="%REPR_FORMAT" to="'%s', %i, %i" />
+               <replace from="%REPR_ARGS" to="qPrintable(%CPPSELF.pattern()), (int)%CPPSELF.caseSensitivity(), (int)%CPPSELF.patternSyntax()" />
+             </insert-template>
+        </inject-code>
+    </add-function>
+
+    <add-function signature="__reduce__" return-type="PyObject*">
+        <inject-code class="target" position="beginning">
+            <insert-template name="reduce_code">
+              <replace from="%REDUCE_FORMAT" to="sii" />
+              <replace from="%REDUCE_ARGS" to="qPrintable(%CPPSELF.pattern()), (int)%CPPSELF.caseSensitivity(), (int)%CPPSELF.patternSyntax()" />
+            </insert-template>
+        </inject-code>
+    </add-function>
+    <add-function signature="replace(QString, QString)" return-type="QString">
+        <modify-argument index="1">
+            <rename to="sourceString"/>
+        </modify-argument>
+        <modify-argument index="2">
+            <rename to="after"/>
+        </modify-argument>
+        <inject-documentation format="target" mode="append">
+        Replaces every occurrence of the regular expression in *sourceString* with *after*.
+        Returns a new Python string with the modified contents. For example:
+
+        ::
+
+            s = "Banana"
+            re = QRegExp("a[mn]")
+            s = re.replace(s, "ox")
+            # s == "Boxoxa"
+
+
+        For regular expressions containing capturing parentheses, occurrences of \1, \2, ..., in *after*
+        are replaced with rx.cap(1), cap(2), ...
+
+        ::
+
+            t = "A &lt;i>bon mot&lt;/i>."
+            re = QRegExp("&lt;i>([^&lt;]*)&lt;/i>")
+            t = re.replace(t, "\\emph{\\1}")
+            # t == "A \\emph{bon mot}."
+
+        </inject-documentation>
+        <inject-code class="target" position="beginning">
+        %1.replace(*%CPPSELF, %2);
+        %PYARG_0 = %CONVERTTOPYTHON[QString](%1);
+        </inject-code>
+    </add-function>
+  </value-type>
+  <value-type name="QFileInfo">
+    <extra-includes>
+      <include file-name="QDateTime" location="global"/>
+      <include file-name="QDir" location="global"/>
+    </extra-includes>
+    <add-function signature="__reduce__" return-type="PyObject*">
+        <inject-code class="target" position="beginning">
+            <insert-template name="reduce_code">
+              <replace from="%REDUCE_FORMAT" to="s" />
+              <replace from="%REDUCE_ARGS" to="qPrintable(%CPPSELF.filePath())" />
+            </insert-template>
+        </inject-code>
+    </add-function>
+  </value-type>
+  <value-type name="QByteArray" hash-function="qHash">
+    <conversion-rule>
+        <target-to-native>
+            <add-conversion type="Py_None">
+            %out = %OUTTYPE();
+            </add-conversion>
+            <add-conversion type="PyString" check="Shiboken::String::check(%in)">
+            %out = %OUTTYPE(Shiboken::String::toCString(%in), Shiboken::String::len(%in));
+            </add-conversion>
+            <add-conversion type="PyBytes">
+            #ifdef IS_PY3K
+            %out = %OUTTYPE(PyBytes_AS_STRING(%in), PyBytes_GET_SIZE(%in));
+            #endif
+            </add-conversion>
+        </target-to-native>
+    </conversion-rule>
+
+    <extra-includes>
+      <include file-name="QNoImplicitBoolCast" location="global"/>
+    </extra-includes>
+
+    <!-- ### These overloads must be removed accept strings with \x00 in their contents -->
+    <modify-function signature="append(const char*,int)" remove="all" />
+    <modify-function signature="append(const char*)" remove="all" />
+    <modify-function signature="append(QString)" remove="all" />
+    <modify-function signature="contains(const char*)const" remove="all" />
+    <modify-function signature="count(const char*)const" remove="all" />
+    <modify-function signature="endsWith(const char*)const" remove="all" />
+    <modify-function signature="indexOf(const char*,int)const" remove="all" />
+    <modify-function signature="indexOf(char,int)const" remove="all" />
+    <modify-function signature="indexOf(QString,int)const" remove="all" />
+    <modify-function signature="insert(int,const char*)" remove="all" />
+    <modify-function signature="insert(int,char)" remove="all" />
+    <modify-function signature="insert(int,const char*,int)" since="4.6" remove="all" />
+    <modify-function signature="insert(int,QString)" remove="all" />
+    <modify-function signature="lastIndexOf(const char*,int)const" remove="all" />
+    <modify-function signature="lastIndexOf(QString,int)const" remove="all" />
+    <modify-function signature="lastIndexOf(char,int)const" remove="all" />
+    <modify-function signature="prepend(const char*)" remove="all" />
+    <modify-function signature="prepend(const char*,int)" since="4.6" remove="all" />
+    <modify-function signature="replace(QByteArray,const char*)" remove="all" />
+    <modify-function signature="replace(const char*,int,const char*,int)" remove="all"/>
+    <modify-function signature="replace(QString,const char*)" remove="all" />
+    <modify-function signature="replace(const char*,QByteArray)" remove="all" />
+    <modify-function signature="replace(const char*,const char*)" remove="all" />
+    <modify-function signature="replace(int,int,const char*)" remove="all" />
+    <modify-function signature="replace(int,int,const char*,int)" since="4.6" remove="all" />
+    <modify-function signature="replace(char,const char*)" remove="all" />
+    <modify-function signature="replace(char,QString)" remove="all" />
+    <modify-function signature="startsWith(const char*)const" remove="all" />
+    <modify-function signature="operator==(QString)const" remove="all" />
+    <modify-function signature="operator==(const char*,QByteArray)" remove="all" />
+    <modify-function signature="operator==(QByteArray, const char*)" remove="all" />
+    <modify-function signature="operator>(QString)const" remove="all" />
+    <modify-function signature="operator>(const char*,QByteArray)" remove="all" />
+    <modify-function signature="operator>(QByteArray,const char*)" remove="all" />
+    <modify-function signature="operator>=(QString)const" remove="all" />
+    <modify-function signature="operator>=(const char*,QByteArray)" remove="all" />
+    <modify-function signature="operator>=(QByteArray,const char*)" remove="all" />
+    <modify-function signature="operator&lt;(QString)const" remove="all" />
+    <modify-function signature="operator&lt;(const char*,QByteArray)" remove="all" />
+    <modify-function signature="operator&lt;=(QString)const" remove="all" />
+    <modify-function signature="operator&lt;=(const char*,QByteArray)" remove="all" />
+    <modify-function signature="operator&lt;=(QByteArray,const char*)" remove="all" />
+    <modify-function signature="operator!=(QString)const" remove="all" />
+    <modify-function signature="operator!=(const char*,QByteArray)" remove="all" />
+    <modify-function signature="operator!=(QByteArray,const char*)" remove="all" />
+    <modify-function signature="operator+=(QString)" remove="all" />
+    <modify-function signature="operator+=(const char*)" remove="all" />
+    <modify-function signature="operator+(QByteArray,const char*)" remove="all" />
+    <modify-function signature="operator+(const char*,QByteArray)" remove="all" />
+    <modify-function signature="operator+(QByteArray,const char*)" remove="all" />
+    <modify-function signature="operator+(QString,QByteArray)" remove="all" />
+    <modify-function signature="operator+(QByteArray,QString)" remove="all" />
+    <add-function signature="operator+(PyUnicode)">
+        <inject-code>
+            Shiboken::AutoDecRef str(PyUnicode_AsASCIIString(%PYARG_1));
+            if (!str.isNull()) {
+                QByteArray b(PyBytes_AS_STRING(str.object()), PyBytes_GET_SIZE (str.object()));
+                b.prepend(*%CPPSELF);
+                %PYARG_0 = %CONVERTTOPYTHON[QByteArray](b);
+            }
+        </inject-code>
+    </add-function>
+    <add-function signature="operator+(PyUnicode, QByteArray)">
+        <inject-code>
+            Shiboken::AutoDecRef str(PyUnicode_AsASCIIString(%PYARG_1));
+            if (!str.isNull()) {
+                QByteArray b(PyBytes_AS_STRING(str.object()), PyBytes_GET_SIZE(str.object()));
+                b.append(*%CPPSELF);
+                %PYARG_0 = %CONVERTTOPYTHON[QByteArray](b);
+            }
+        </inject-code>
+    </add-function>
+    <add-function signature="operator+(PyBytes, QByteArray)">
+        <inject-code>
+        QByteArray ba = QByteArray(PyBytes_AS_STRING(%PYARG_1), PyBytes_GET_SIZE(%PYARG_1)) + *%CPPSELF;
+        %PYARG_0 = %CONVERTTOPYTHON[QByteArray](ba);
+        </inject-code>
+    </add-function>
+    <!-- ### -->
+
+    <add-function signature="__repr__" return-type="PyObject*">
+        <inject-code class="target" position="beginning">
+            QByteArray b(((PyObject*)%PYSELF)->ob_type->tp_name);
+            PyObject* aux = Shiboken::String::fromStringAndSize(%CPPSELF.constData(), %CPPSELF.size());
+            if (PyUnicode_CheckExact(aux)) {
+                PyObject* tmp = PyUnicode_AsASCIIString(aux);
+                Py_DECREF(aux);
+                aux = tmp;
+            }
+            b += "('";
+            b += QByteArray(PyBytes_AS_STRING(aux), PyBytes_GET_SIZE(aux));
+            b += "')";
+            %PYARG_0 = Shiboken::String::fromStringAndSize(b.constData(), b.size());
+        </inject-code>
+    </add-function>
+
+    <add-function signature="__reduce__" return-type="PyObject*">
+        <inject-code class="target" position="beginning">
+            <insert-template name="reduce_code">
+                <replace from="%REDUCE_FORMAT" to="N" />
+                <replace from="%REDUCE_ARGS" to="PyBytes_FromStringAndSize(%CPPSELF.constData(), %CPPSELF.size())" />
+            </insert-template>
+        </inject-code>
+    </add-function>
+    <modify-function signature="QByteArray(const char *)">
+        <!-- Keep \x00 bytes passed in python strings -->
+        <inject-code class="target" position="beginning">
+            if (PyBytes_Check(%PYARG_1)) {
+                %0 = new QByteArray(PyBytes_AsString(%PYARG_1), PyBytes_GET_SIZE(%PYARG_1));
+            } if (PyUnicode_CheckExact(%PYARG_1)) {
+                Shiboken::AutoDecRef data(PyUnicode_AsASCIIString(%PYARG_1));
+                %0 = new QByteArray(PyBytes_AsString(data.object()), PyBytes_GET_SIZE(data.object()));
+            } else if (Shiboken::String::check(%PYARG_1)) {
+                %0 = new QByteArray(Shiboken::String::toCString(%PYARG_1), Shiboken::String::len(%PYARG_1));
+            }
+        </inject-code>
+    </modify-function>
+    <!-- buffer protocol -->
+    <inject-code class="native" position="beginning" file="glue/qbytearray_bufferprotocol.cpp" />
+    <inject-code class="target" position="end">
+        #if PY_VERSION_HEX &lt; 0x03000000
+            Shiboken::SbkType&lt;QByteArray>()->tp_as_buffer = &amp;SbkQByteArrayBufferProc;
+            Shiboken::SbkType&lt;QByteArray>()->tp_flags |= Py_TPFLAGS_HAVE_GETCHARBUFFER;
+        #endif
+    </inject-code>
+
+   <modify-function signature="data()">
+       <inject-code class="target" position="beginning">
+           %PYARG_0 = PyBytes_FromStringAndSize(%CPPSELF.%FUNCTION_NAME(), %CPPSELF.size());
+       </inject-code>
+   </modify-function>
+
+    <!-- removed functions -->
+    <!--### Functions removed because they return STL-like iterators -->
+    <modify-function signature="begin()" remove="all"/>
+    <modify-function signature="begin()const" remove="all"/>
+    <modify-function signature="constBegin()const" remove="all"/>
+    <modify-function signature="constData()const" remove="all"/>
+    <modify-function signature="constEnd()const" remove="all"/>
+    <modify-function signature="end()" remove="all"/>
+    <modify-function signature="end()const" remove="all"/>
+    <!--### -->
+
+    <!--### Functions removed because they provide useless overloads from Python point of view -->
+    <modify-function signature="number(uint,int)" remove="all"/>
+    <modify-function signature="number(qulonglong,int)" remove="all"/>
+    <modify-function signature="operator+=(const char*)" remove="all"/>
+    <modify-function signature="operator==(const char*,QByteArray)" remove="all" />
+    <modify-function signature="operator!=(const char*,QByteArray)" remove="all" />
+    <modify-function signature="operator&lt;(const char*,QByteArray)" remove="all" />
+    <modify-function signature="operator&lt;=(const char*,QByteArray)" remove="all" />
+    <modify-function signature="operator>(const char*,QByteArray)" remove="all" />
+    <modify-function signature="operator>=(const char*,QByteArray)" remove="all" />
+    <modify-function signature="operator[](int)const" remove="all"/>
+    <modify-function signature="operator[](uint)const" remove="all"/>
+    <!-- Those types have the same representation in Python, an overload would be useless. -->
+    <modify-function signature="setNum(uint,int)" remove="all"/>
+    <modify-function signature="setNum(ushort,int)" remove="all"/>
+    <modify-function signature="setNum(float,char,int)" remove="all"/>
+    <modify-function signature="setNum(short,int)" remove="all"/>
+    <modify-function signature="setNum(qulonglong,int)" remove="all"/>
+
+    <!--### -->
+
+    <modify-function signature="operator const char *()const" remove="all"/>
+    <modify-function signature="operator const void *()const" remove="all"/>
+
+    <!--### STL compatibility functions not supported by PySide -->
+    <modify-function signature="push_back(char)" remove="all"/>
+    <modify-function signature="push_back(const QByteArray&amp;)" remove="all"/>
+    <modify-function signature="push_back(const char*)" remove="all"/>
+    <modify-function signature="push_front(char)" remove="all"/>
+    <modify-function signature="push_front(const QByteArray&amp;)" remove="all"/>
+    <modify-function signature="push_front(const char*)" remove="all"/>
+    <!--### -->
+
+    <modify-function signature="toLong(bool*, int) const">
+      <modify-argument index="1">
+        <remove-argument/>
+      </modify-argument>
+      <inject-code class="target" position="beginning">
+        <insert-template name="fix_bool*,arg"/>
+      </inject-code>
+    </modify-function>
+    <modify-function signature="toLongLong(bool*, int) const">
+      <modify-argument index="1">
+        <remove-argument/>
+      </modify-argument>
+      <inject-code class="target" position="beginning">
+        <insert-template name="fix_bool*,arg"/>
+      </inject-code>
+    </modify-function>
+    <modify-function signature="toShort(bool*, int) const">
+      <modify-argument index="1">
+        <remove-argument/>
+      </modify-argument>
+      <inject-code class="target" position="beginning">
+        <insert-template name="fix_bool*,arg"/>
+      </inject-code>
+    </modify-function>
+    <modify-function signature="toUInt(bool*, int) const">
+      <modify-argument index="1">
+        <remove-argument/>
+      </modify-argument>
+      <inject-code class="target" position="beginning">
+        <insert-template name="fix_bool*,arg"/>
+      </inject-code>
+    </modify-function>
+    <modify-function signature="toULong(bool*, int) const">
+      <modify-argument index="1">
+        <remove-argument/>
+      </modify-argument>
+      <inject-code class="target" position="beginning">
+        <insert-template name="fix_bool*,arg"/>
+      </inject-code>
+    </modify-function>
+    <modify-function signature="toULongLong(bool*, int) const">
+      <modify-argument index="1">
+        <remove-argument/>
+      </modify-argument>
+      <inject-code class="target" position="beginning">
+        <insert-template name="fix_bool*,arg"/>
+      </inject-code>
+    </modify-function>
+    <modify-function signature="toInt(bool*,int)const">
+      <modify-argument index="1">
+        <remove-argument/>
+      </modify-argument>
+      <inject-code class="target" position="beginning">
+        <insert-template name="fix_bool*,arg"/>
+      </inject-code>
+    </modify-function>
+    <modify-function signature="toUShort(bool*,int)const">
+      <modify-argument index="1">
+        <remove-argument/>
+      </modify-argument>
+      <inject-code class="target" position="beginning">
+        <insert-template name="fix_bool*,arg"/>
+      </inject-code>
+    </modify-function>
+    <!-- QByteArray(const char *) do the job of this constructor -->
+    <modify-function signature="QByteArray(const char*,int)" remove="all"/>
+    <modify-function signature="fromRawData(const char*,int)">
+        <modify-argument index="1">
+            <replace-type modified-type="PyBytes"/>
+        </modify-argument>
+        <modify-argument index="2">
+            <remove-argument />
+        </modify-argument>
+        <inject-code class="target">
+        %RETURN_TYPE %0 = %CPPSELF.%FUNCTION_NAME(PyBytes_AsString(%PYARG_1), PyBytes_GET_SIZE(%PYARG_1));
+        %PYARG_0 = %CONVERTTOPYTHON[%RETURN_TYPE](%0);
+        </inject-code>
+    </modify-function>
+    <modify-function signature="toDouble(bool*)const">
+      <modify-argument index="1">
+        <remove-argument/>
+      </modify-argument>
+      <inject-code class="target" position="beginning">
+        <insert-template name="fix_bool*"/>
+      </inject-code>
+    </modify-function>
+    <modify-function signature="toFloat(bool*)const">
+      <modify-argument index="1">
+        <remove-argument/>
+      </modify-argument>
+      <inject-code class="target" position="beginning">
+        <insert-template name="fix_bool*"/>
+      </inject-code>
+    </modify-function>
+    <add-function signature="__str__" return-type="PyObject*">
+        <inject-code class="target" position="beginning">
+            %PYARG_0 = Shiboken::String::fromStringAndSize(%CPPSELF.constData(), %CPPSELF.size());
+        </inject-code>
+    </add-function>
+    <add-function signature="__len__">
+        <inject-code class="target" position="beginning">
+            return %CPPSELF.count();
+        </inject-code>
+    </add-function>
+    <add-function signature="__getitem__">
+        <inject-code class="target" position="beginning">
+                if (_i &lt; 0 || _i >= %CPPSELF.size()) {
+                    PyErr_SetString(PyExc_IndexError, "index out of bounds");
+                    return 0;
+                } else {
+                    char res[2];
+                    res[0] = %CPPSELF.at(_i);
+                    res[1] = 0;
+                    return PyBytes_FromStringAndSize(res, 1);
+                }
+        </inject-code>
+    </add-function>
+    <add-function signature="__setitem__">
+        <inject-code class="target" position="beginning">
+                %CPPSELF.remove(_i, 1);
+                PyObject* args = Py_BuildValue("(nO)", _i, _value);
+                PyObject* result = Sbk_QByteArrayFunc_insert(self, args);
+                Py_DECREF(args);
+                Py_XDECREF(result);
+                return !result ? -1 : 0;
+        </inject-code>
+    </add-function>
+    <add-function signature="__getslice__">
+        <inject-code class="target" position="beginning">
+            Py_ssize_t max = %CPPSELF.count();
+            _i1 = qBound(Py_ssize_t(0), _i1, max);
+            _i2 = qBound(Py_ssize_t(0), _i2, max);
+            QByteArray ba;
+            if (_i1 &lt; _i2)
+                ba = %CPPSELF.mid(_i1, _i2 - _i1);
+            return %CONVERTTOPYTHON[QByteArray](ba);
+        </inject-code>
+    </add-function>
+  </value-type>
+  <value-type name="QTextBoundaryFinder">
+    <enum-type name="BoundaryReason" flags="BoundaryReasons"/>
+    <enum-type name="BoundaryType"/>
+    <!-- There's no QChar in PySide -->
+    <modify-function signature="QTextBoundaryFinder(QTextBoundaryFinder::BoundaryType,const QChar*,int,unsigned char*,int)" remove="all"/>
+  </value-type>
+  <object-type name="QXmlStreamEntityResolver"/>
+  <object-type name="QAbstractEventDispatcher">
+    <extra-includes>
+      <include file-name="QPair" location="global"/>
+    </extra-includes>
+    <modify-function signature="processEvents(QFlags&lt;QEventLoop::ProcessEventsFlag>)" allow-thread="yes"/>
+  </object-type>
+  <object-type name="QEventLoop">
+      <enum-type name="ProcessEventsFlag" flags="ProcessEventsFlags"/>
+      <modify-function signature="exec(QFlags&lt;QEventLoop::ProcessEventsFlag>)" rename="exec_" allow-thread="yes" />
+      <modify-function signature="processEvents(QFlags&lt;QEventLoop::ProcessEventsFlag>)" allow-thread="yes" />
+      <modify-function signature="processEvents(QFlags&lt;QEventLoop::ProcessEventsFlag>, int)" allow-thread="yes" />
+  </object-type>
+  <object-type name="QFile">
+    <enum-type name="FileError"/>
+    <enum-type name="MemoryMapFlags"/>
+    <enum-type name="Permission" flags="Permissions"/>
+    <enum-type name="FileHandleFlag" flags="FileHandleFlags" since="4.8" revision="4800"/>
+    <extra-includes>
+      <include file-name="QAbstractFileEngine" location="global"/>
+    </extra-includes>
+    <modify-function signature="unmap(uchar*)">
+        <modify-argument index="1">
+            <replace-type modified-type="PyBuffer"/>
+        </modify-argument>
+        <inject-code>
+        uchar* ptr = (uchar*) Shiboken::Buffer::getPointer(%PYARG_1);
+        %RETURN_TYPE %0 = %CPPSELF.%FUNCTION_NAME(ptr);
+        %PYARG_0 = %CONVERTTOPYTHON[%RETURN_TYPE](%0);
+        </inject-code>
+    </modify-function>
+    <modify-function signature="map(qint64,qint64,QFile::MemoryMapFlags)">
+        <modify-argument index="return">
+            <replace-type modified-type="PyObject"/>
+        </modify-argument>
+        <inject-code>
+            %PYARG_0 = Shiboken::Buffer::newObject(%CPPSELF.%FUNCTION_NAME(%1, %2, %3), %2, Shiboken::Buffer::ReadWrite);
+        </inject-code>
+    </modify-function>
+    <modify-function signature="remove()" allow-thread="yes"/>
+    <modify-function signature="remove(const QString&amp;)" allow-thread="yes"/>
+    <modify-function signature="rename(const QString&amp;)" allow-thread="yes"/>
+    <modify-function signature="rename(const QString&amp;, const QString&amp;)" allow-thread="yes"/>
+    <modify-function signature="link(const QString&amp;)" allow-thread="yes"/>
+    <modify-function signature="link(const QString&amp;, const QString&amp;)" allow-thread="yes"/>
+    <modify-function signature="copy(const QString&amp;)" allow-thread="yes"/>
+    <modify-function signature="copy(const QString&amp;, const QString&amp;)" allow-thread="yes"/>
+    <modify-function signature="flush()" allow-thread="yes"/>
+  </object-type>
+  <object-type name="QIODevice">
+    <enum-type name="OpenModeFlag" flags="OpenMode"/>
+    <modify-function signature="open(QFlags&lt;QIODevice::OpenModeFlag>)" allow-thread="yes"/>
+    <modify-function signature="close()" allow-thread="yes"/>
+    <modify-function signature="seek(qint64)" allow-thread="yes"/>
+    <modify-function signature="readAll()" allow-thread="yes"/>
+    <modify-function signature="peek(qint64)" allow-thread="yes"/>
+    <modify-function signature="write(const QByteArray&amp;)" allow-thread="yes"/>
+    <modify-function signature="waitForReadyRead(int)" allow-thread="yes"/>
+    <modify-function signature="waitForBytesWritten(int)" allow-thread="yes"/>
+    <!-- ### peek(qint64) do the job -->
+    <modify-function signature="peek(char*, qint64)" remove="all"/>
+    <!-- ### read(qint64) do the job -->
+    <modify-function signature="read(char*, qint64)" remove="all"/>
+    <!-- ### readLine(qint64) do the job -->
+    <modify-function signature="readLine(char*, qint64)" remove="all"/>
+    <!-- ### write(str) do the job -->
+    <modify-function signature="write(const char*, qint64)" remove="all"/>
+    <modify-function signature="write(const char*)" remove="all"/>
+    <modify-function signature="getChar(char*)">
+        <modify-argument index="1">
+            <remove-argument />
+            <remove-default-expression />
+        </modify-argument>
+        <inject-code class="target" position="beginning">
+            <insert-template name="fix_char*" />
+        </inject-code>
+    </modify-function>
+    <modify-function signature="readData(char*, qint64)">
+        <inject-code class="target">
+            QByteArray ba;
+            ba.resize(%2);
+            %CPPSELF.%FUNCTION_NAME(ba.data(), ba.size());
+            %PYARG_0 = %CONVERTTOPYTHON[QByteArray](ba);
+        </inject-code>
+        <modify-argument index="1">
+            <remove-argument />
+        </modify-argument>
+        <modify-argument index="return">
+            <replace-type modified-type="PyObject"/>
+            <conversion-rule class="native">
+                %RETURN_TYPE %out;
+                if (PyBytes_Check(%PYARG_0)) {
+                    %out = PyBytes_GET_SIZE((PyObject*)%PYARG_0);
+                    memcpy(%1, PyBytes_AS_STRING((PyObject*)%PYARG_0), %out);
+                } else if (Shiboken::String::check(%PYARG_0)) {
+                    %out = Shiboken::String::len((PyObject*)%PYARG_0);
+                    memcpy(%1, Shiboken::String::toCString((PyObject*)%PYARG_0), %out);
+                }
+            </conversion-rule>
+        </modify-argument>
+    </modify-function>
+    <modify-function signature="readLineData(char*, qint64)">
+        <inject-code class="target">
+            QByteArray ba;
+            ba.resize(%2);
+            %CPPSELF.%FUNCTION_NAME(ba.data(), ba.size());
+            %PYARG_0 = %CONVERTTOPYTHON[QByteArray](ba);
+        </inject-code>
+        <modify-argument index="1">
+            <remove-argument />
+        </modify-argument>
+        <modify-argument index="return">
+            <replace-type modified-type="PyObject"/>
+            <conversion-rule class="native">
+                %RETURN_TYPE %out;
+                if (!PyBytes_Check(%PYARG_0)) {
+                    %out = -1;
+                } else {
+                    %out = PyBytes_GET_SIZE((PyObject*)%PYARG_0);
+                    memcpy(%1, PyBytes_AS_STRING((PyObject*)%PYARG_0), %out);
+                }
+            </conversion-rule>
+        </modify-argument>
+    </modify-function>
+  </object-type>
+  <object-type name="QCryptographicHash">
+    <enum-type name="Algorithm"/>
+    <modify-function signature="addData(const char*,int)">
+        <modify-argument index="2">
+            <remove-argument />
+        </modify-argument>
+        <inject-code>
+            %CPPSELF.%FUNCTION_NAME(Shiboken::String::toCString(%PYARG_1), Shiboken::String::len(%PYARG_1));
+        </inject-code>
+    </modify-function>
+  </object-type>
+  <object-type name="QLibraryInfo">
+    <enum-type name="LibraryLocation"/>
+  </object-type>
+  <object-type name="QMutexLocker" copyable="no">
+    <modify-function signature="QMutexLocker(QMutex*)" allow-thread="yes">
+        <modify-argument index="1">
+            <reference-count action="set" variable-name="mutex()const0"/>
+        </modify-argument>
+    </modify-function>
+    <modify-function signature="relock()" allow-thread="yes"/>
+    <modify-function signature="mutex() const">
+      <modify-argument index="return">
+        <reference-count action="set"/>
+      </modify-argument>
+    </modify-function>
+    <add-function signature="__enter__()" />
+    <add-function signature="__exit__(PyObject*, PyObject*, PyObject*)">
+        <inject-code>
+            %CPPSELF.unlock();
+        </inject-code>
+    </add-function>
+  </object-type>
+
+  <object-type name="QMutex">
+    <enum-type name="RecursionMode"/>
+    <modify-function signature="lock()" allow-thread="yes"/>
+    <modify-function signature="tryLock(int)" allow-thread="yes"/>
+    <modify-function signature="tryLock()" allow-thread="yes"/>
+  </object-type>
+  <object-type name="QSemaphore">
+    <modify-function signature="acquire(int)" allow-thread="yes"/>
+    <modify-function signature="tryAcquire(int, int)" allow-thread="yes"/>
+  </object-type>
+  <object-type name="QSocketNotifier">
+    <enum-type name="Type"/>
+    <add-function signature="QSocketNotifier(PyObject*, QSocketNotifier::Type, QObject*)">
+        <modify-argument index="3">
+            <replace-default-expression with="0" />
+            <rename to="parent" />
+        </modify-argument>
+        <inject-code>
+        Shiboken::AutoDecRef fileNo(PyObject_GetAttrString(%PYARG_1, "fileno"));
+        if (!fileNo.isNull()) {
+            Shiboken::AutoDecRef fileNoValue(PyObject_CallObject(fileNo, 0));
+            if (%CHECKTYPE[int](fileNoValue)) {
+                int cppFileNoValue = %CONVERTTOCPP[int](fileNoValue);
+                %0 = new %TYPE(cppFileNoValue, %2, %3);
+            }
+        }
+        </inject-code>
+    </add-function>
+  </object-type>
+  <object-type name="QSystemLocale">
+    <enum-type name="QueryType"/>
+  </object-type>
+  <object-type name="QSysInfo">
+    <enum-type name="Endian"/>
+    <enum-type name="Sizes"/>
+  </object-type>
+  <object-type name="QTemporaryFile">
+    <extra-includes>
+      <include file-name="QAbstractFileEngine" location="global"/>
+    </extra-includes>
+    <modify-function signature="createLocalFile(const QString&amp;)" allow-thread="yes"/>
+  </object-type>
+  <object-type name="QMimeData">
+    <extra-includes>
+      <include file-name="QStringList" location="global"/>
+      <include file-name="QUrl" location="global"/>
+    </extra-includes>
+  </object-type>
+  <object-type name="QTextCodec">
+    <enum-type name="ConversionFlag" flags="ConversionFlags"/>
+
+    <object-type name="ConverterState">
+      <include file-name="QTextCodec" location="global"/>
+      <modify-function signature="ConverterState(QFlags&lt;QTextCodec::ConversionFlag&gt;)">
+        <modify-argument index="1">
+          <replace-default-expression with="QTextCodec::DefaultConversion"/>
+        </modify-argument>
+      </modify-function>
+    </object-type>
+
+    <modify-function signature="setCodecForTr(QTextCodec*)">
+      <modify-argument index="1">
+        <parent index="this" action="add"/>
+      </modify-argument>
+    </modify-function>
+    <modify-function signature="setCodecForCStrings(QTextCodec*)">
+      <modify-argument index="1">
+        <parent index="this" action="add"/>
+      </modify-argument>
+    </modify-function>
+    <modify-function signature="setCodecForLocale(QTextCodec*)">
+      <modify-argument index="1">
+        <parent index="this" action="add"/>
+      </modify-argument>
+    </modify-function>
+    <!-- fromUnicode(QString) does the job -->
+    <modify-function signature="fromUnicode(const QChar*,int,QTextCodec::ConverterState*)const" remove="all" />
+    <modify-function signature="convertFromUnicode(const QChar*,int,QTextCodec::ConverterState*)const" remove="all" />
+  </object-type>
+  <object-type name="QTextDecoder">
+    <!-- ### toUnicode(QByteArray) to the job -->
+    <modify-function signature="toUnicode(const char*,int)" remove="all" />
+    <modify-function signature="toUnicode(QString*,const char*,int)" remove="all" />
+    <!-- ### -->
+  </object-type>
+  <object-type name="QTextEncoder">
+    <!-- fromUnicode(QString) does the job -->
+    <modify-function signature="fromUnicode(const QChar*,int)" remove="all" />
+  </object-type>
+  <object-type name="QTimeLine">
+    <enum-type name="CurveShape"/>
+    <enum-type name="Direction"/>
+    <enum-type name="State"/>
+  </object-type>
+  <object-type name="QTranslator">
+    <modify-function signature="load(const uchar*, int)">
+        <modify-argument index="1">
+            <replace-type modified-type="PyBuffer" />
+        </modify-argument>
+        <modify-argument index="2">
+            <remove-argument />
+        </modify-argument>
+        <inject-code>
+        Py_ssize_t size;
+        uchar* ptr = (uchar*) Shiboken::Buffer::getPointer(%PYARG_1, &amp;size);
+        %RETURN_TYPE %0 = %CPPSELF.%FUNCTION_NAME(const_cast&lt;const uchar*>(ptr), size);
+        %PYARG_0 = %CONVERTTOPYTHON[%RETURN_TYPE](%0);
+        </inject-code>
+    </modify-function>
+  </object-type>
+  <object-type name="QWaitCondition">
+    <modify-function signature="wait(QMutex*, unsigned long)" allow-thread="yes"/>
+    <modify-function signature="wait(QReadWriteLock*, unsigned long)" allow-thread="yes"/>
+  </object-type>
+  <object-type name="QFileSystemWatcher">
+    <extra-includes>
+      <include file-name="QStringList" location="global"/>
+    </extra-includes>
+  </object-type>
+  <object-type name="QBuffer">
+    <!-- ### setData(QByteArray) do the job -->
+    <modify-function signature="setData(const char*,int)" remove="all"/>
+  </object-type>
+  <object-type name="QTimer">
+    <modify-function signature="singleShot(int,QObject*,const char*)">
+      <inject-code class="target" position="beginning">
+        // %FUNCTION_NAME() - disable generation of c++ function call
+        (void) %2; // remove warning about unused variable
+        Shiboken::AutoDecRef emptyTuple(PyTuple_New(0));
+        PyObject* pyTimer = Shiboken::SbkType&lt;QTimer>()->tp_new(Shiboken::SbkType&lt;QTimer>(), emptyTuple, 0);
+        Shiboken::SbkType&lt;QTimer>()->tp_init(pyTimer, emptyTuple, 0);
+
+        QTimer* timer = %CONVERTTOCPP[QTimer*](pyTimer);
+        Shiboken::AutoDecRef result(
+            PyObject_CallMethod(pyTimer,
+                                const_cast&lt;char*>("connect"),
+                                const_cast&lt;char*>("OsOs"),
+                                pyTimer,
+                                SIGNAL(timeout()),
+                                %PYARG_2,
+                                %3)
+        );
+        Shiboken::Object::releaseOwnership((SbkObject*)pyTimer);
+        Py_XDECREF(pyTimer);
+        timer->setSingleShot(true);
+        timer->connect(timer, SIGNAL(timeout()), timer, SLOT(deleteLater()));
+        timer->start(%1);
+      </inject-code>
+    </modify-function>
+    <add-function signature="singleShot(int, PyCallable*)" static="yes">
+        <inject-code class="target" position="beginning">
+        // %FUNCTION_NAME() - disable generation of c++ function call
+        Shiboken::AutoDecRef emptyTuple(PyTuple_New(0));
+        PyObject *pyTimer = Shiboken::SbkType&lt;QTimer>()->tp_new(Shiboken::SbkType&lt;QTimer>(), emptyTuple, 0);
+        Shiboken::SbkType&lt;QTimer>()->tp_init(pyTimer, emptyTuple, 0);
+        QTimer* timer = %CONVERTTOCPP[QTimer*](pyTimer);
+        timer->setSingleShot(true);
+
+        if (PyObject_TypeCheck(%2, &amp;PySideSignalInstanceType)) {
+            PySideSignalInstance* signalInstance = reinterpret_cast&lt;PySideSignalInstance*&gt;(%2);
+            Shiboken::AutoDecRef signalSignature(Shiboken::String::fromFormat("2%s", PySide::Signal::getSignature(signalInstance)));
+            Shiboken::AutoDecRef result(
+                PyObject_CallMethod(pyTimer,
+                                    const_cast&lt;char*>("connect"),
+                                    const_cast&lt;char*>("OsOO"),
+                                    pyTimer,
+                                    SIGNAL(timeout()),
+                                    PySide::Signal::getObject(signalInstance),
+                                    signalSignature.object())
+            );
+        } else {
+            Shiboken::AutoDecRef result(
+                PyObject_CallMethod(pyTimer,
+                                    const_cast&lt;char*>("connect"),
+                                    const_cast&lt;char*>("OsO"),
+                                    pyTimer,
+                                    SIGNAL(timeout()),
+                                    %PYARG_2)
+            );
+        }
+
+        timer->connect(timer, SIGNAL(timeout()), timer, SLOT(deleteLater()), Qt::DirectConnection);
+        Shiboken::Object::releaseOwnership((SbkObject*)pyTimer);
+        Py_XDECREF(pyTimer);
+        timer->start(%1);
+        </inject-code>
+    </add-function>
+  </object-type>
+  <object-type name="QAbstractFileEngineHandler">
+      <modify-function signature="create(const QString&map;)const">
+        <modify-argument index="return">
+            <define-ownership owner="c++"/>
+        </modify-argument>
+      </modify-function>
+  </object-type>
+  <!-- <object-type name="QAbstractFileEngine::MapExtensionOption" /> -->
+  <!-- <object-type name="QAbstractFileEngine::MapExtensionReturn" /> -->
+  <!-- <object-type name="QAbstractFileEngine::UnMapExtensionOption" /> -->
+  <object-type name="QAbstractFileEngine">
+    <enum-type name="Extension" extensible="yes"/>
+    <enum-type name="FileFlag" flags="FileFlags"/>
+    <enum-type name="FileName"/>
+    <enum-type name="FileOwner"/>
+    <enum-type name="FileTime"/>
+    <extra-includes>
+      <include file-name="QDateTime" location="global"/>
+    </extra-includes>
+
+    <modify-function signature="open(QFlags&lt;QIODevice::OpenModeFlag>)" allow-thread="yes" />
+    <modify-function signature="close()" allow-thread="yes" />
+    <modify-function signature="flush()" allow-thread="yes" />
+    <modify-function signature="seek(qint64)" allow-thread="yes" />
+    <modify-function signature="remove()" allow-thread="yes" />
+    <modify-function signature="copy(const QString&amp;)" allow-thread="yes" />
+    <modify-function signature="rename(const QString&amp;)" allow-thread="yes" />
+    <modify-function signature="link(const QString&amp;)" allow-thread="yes" />
+    <modify-function signature="mkdir(const QString&amp;, bool)const" allow-thread="yes" />
+    <modify-function signature="rmdir(const QString&amp;, bool)const" allow-thread="yes" />
+    <modify-function signature="write(const char*, qint64)" allow-thread="yes" />
+
+    <modify-function signature="beginEntryList(QFlags&lt;QDir::Filter>,const QStringList&amp;)">
+      <modify-argument index="return">
+        <define-ownership class="native" owner="c++"/>
+      </modify-argument>
+    </modify-function>
+
+    <modify-function signature="unmap(uchar*)">
+        <modify-argument index="1">
+            <replace-type modified-type="PyBuffer"/>
+        </modify-argument>
+        <inject-code>
+        uchar* ptr = (uchar*)Shiboken::Buffer::getPointer(%PYARG_1);
+        %RETURN_TYPE %0 = %CPPSELF.%FUNCTION_NAME(ptr);
+        %PYARG_0 = %CONVERTTOPYTHON[%RETURN_TYPE](%0);
+        </inject-code>
+    </modify-function>
+    <modify-function signature="map(qint64,qint64,QFile::MemoryMapFlags)">
+        <modify-argument index="return">
+            <replace-type modified-type="PyObject"/>
+        </modify-argument>
+        <inject-code>
+            %PYARG_0 = Shiboken::Buffer::newObject(%CPPSELF.%FUNCTION_NAME(%1, %2, %3), %2, Shiboken::Buffer::ReadWrite);
+        </inject-code>
+    </modify-function>
+
+    <modify-function signature="read(char*, qint64)" allow-thread="yes">
+        <inject-code class="target">
+            QByteArray ba;
+            ba.resize(%2);
+            %CPPSELF.%FUNCTION_NAME(ba.data(), ba.size());
+            %PYARG_0 = PyBytes_FromStringAndSize(ba.constData(), ba.size());
+        </inject-code>
+        <modify-argument index="1">
+            <remove-argument />
+        </modify-argument>
+        <modify-argument index="return">
+            <replace-type modified-type="PyObject"/>
+            <conversion-rule class="native">
+                %RETURN_TYPE %out;
+                if (!Shiboken::String::check(%PYARG_0)) {
+                    %out = -1;
+                } else {
+                    %out = PyBytes_GET_SIZE((PyObject*)%PYARG_0);
+                    memcpy(%1, PyBytes_AS_STRING((PyObject*)%PYARG_0), %out);
+                }
+            </conversion-rule>
+        </modify-argument>
+    </modify-function>
+    <modify-function signature="readLine(char*, qint64)" allow-thread="yes">
+        <inject-code class="target">
+            QByteArray ba;
+            ba.resize(%2);
+            %CPPSELF.%FUNCTION_NAME(ba.data(), ba.size());
+            %PYARG_0 = PyBytes_FromStringAndSize(ba.constData(), ba.size());
+        </inject-code>
+        <modify-argument index="1">
+            <remove-argument />
+        </modify-argument>
+        <modify-argument index="return">
+            <replace-type modified-type="PyObject"/>
+            <conversion-rule class="native">
+                %RETURN_TYPE %out;
+                if (!Shiboken::String::check(%PYARG_0)) {
+                    %out = -1;
+                } else {
+                    %out = PyBytes_GET_SIZE((PyObject*)%PYARG_0);
+                    memcpy(%1, PyBytes_AS_STRING((PyObject*)%PYARG_0), %out);
+                }
+            </conversion-rule>
+        </modify-argument>
+    </modify-function>
+  </object-type>
+  <object-type name="QProcess">
+    <enum-type name="ExitStatus"/>
+    <enum-type name="ProcessChannel"/>
+    <enum-type name="ProcessChannelMode"/>
+    <enum-type name="ProcessError"/>
+    <enum-type name="ProcessState"/>
+
+    <modify-function signature="waitForStarted(int)" allow-thread="yes"/>
+    <modify-function signature="waitForBytesWritten(int)" allow-thread="yes"/>
+    <modify-function signature="waitForFinished(int)" allow-thread="yes"/>
+    <modify-function signature="readAllStandardOutput()" allow-thread="yes"/>
+    <modify-function signature="readAllStandardError()" allow-thread="yes"/>
+    <modify-function signature="execute(QString, QStringList)" allow-thread="yes"/>
+    <modify-function signature="execute(QString)" allow-thread="yes"/>
+    <modify-function signature="startDetached(QString,QStringList,QString,qint64*)">
+        <modify-argument index="4">
+            <remove-argument />
+        </modify-argument>
+        <modify-argument index="return">
+            <replace-type modified-type="(retval, pid)"/>
+        </modify-argument>
+        <inject-code class="target" position="beginning">
+        qint64 pid;
+        %RETURN_TYPE retval = %TYPE::%FUNCTION_NAME(%1, %2, %3, &amp;pid);
+        %PYARG_0 = PyTuple_New(2);
+        PyTuple_SET_ITEM(%PYARG_0, 0, %CONVERTTOPYTHON[%RETURN_TYPE](retval));
+        PyTuple_SET_ITEM(%PYARG_0, 1, %CONVERTTOPYTHON[qint64](pid));
+        </inject-code>
+    </modify-function>
+    <!-- Function removed because on windows it returns a win32 specific structure -->
+    <modify-function signature="pid()const" remove="all" />
+    <add-function signature="pid()" return-type="long">
+        <inject-code>
+            long result;
+            #ifdef WIN32
+                _PROCESS_INFORMATION* procInfo = %CPPSELF.%FUNCTION_NAME();
+                result = procInfo ? procInfo->dwProcessId : 0;
+            #else
+                result = %CPPSELF.%FUNCTION_NAME();
+            #endif
+            %PYARG_0 = %CONVERTTOPYTHON[long](result);
+        </inject-code>
+    </add-function>
+    <!--### Obsolete in 4.3-->
+    <modify-function signature="setReadChannelMode(QProcess::ProcessChannelMode)" remove="all"/>
+    <modify-function signature="readChannelMode()const" remove="all"/>
+    <!-- ### -->
+  </object-type>
+  <object-type name="QSignalMapper" />
+
+  <object-type name="QCoreApplication">
+    <enum-type name="Encoding" />
+    <enum-type identified-by-value="ApplicationFlags" since="4.8" revision="4800"/>
+    <extra-includes>
+      <include file-name="QStringList" location="global"/>
+      <include file-name="QTranslator" location="global"/>
+    </extra-includes>
+    <!-- constructor documentation -->
+    <inject-documentation format="target" mode="append">
+.. class:: QCoreApplication(args)
+
+    Constructs a Qt kernel application. Kernel applications are applications
+    without a graphical user interface. These type of applications are used
+    at the console or as server processes.
+
+    The *args* argument is processed by the application, and made available
+    in a more convenient form by the :meth:`~QCoreApplication.arguments()`
+    method.
+    </inject-documentation>
+    <add-function signature="QCoreApplication(PySequence)">
+        <inject-code>
+            QCoreApplication_constructor(%PYSELF, args, &amp;%0);
+        </inject-code>
+    </add-function>
+    <!-- blocking functions -->
+    <modify-function signature="processEvents(QFlags&lt;QEventLoop::ProcessEventsFlag&gt;, int)" allow-thread="yes"/>
+    <modify-function signature="processEvents(QFlags&lt;QEventLoop::ProcessEventsFlag&gt;)" allow-thread="yes"/>
+    <modify-function signature="flush()" allow-thread="yes"/>
+    <modify-function signature="sendEvent(QObject*, QEvent*)" allow-thread="yes"/>
+    <modify-function signature="sendPostedEvents(QObject*, int)" allow-thread="yes"/>
+    <modify-function signature="sendPostedEvents()" allow-thread="yes"/>
+    <modify-function signature="instance()">
+      <inject-code class="target">
+        QCoreApplication* app = QCoreApplication::instance();
+        PyObject* pyApp = Py_None;
+        if (app) {
+            pyApp = reinterpret_cast&lt;PyObject*&gt;(Shiboken::BindingManager::instance().retrieveWrapper(app));
+            if (!pyApp)
+                pyApp = %CONVERTTOPYTHON[QCoreApplication*](app); // this will keep app live after python exit (extra ref)
+        }
+        %PYARG_0 = pyApp;
+        Py_XINCREF(%PYARG_0);
+      </inject-code>
+    </modify-function>
+
+    <modify-function signature="exec()" rename="exec_" allow-thread="yes"/>
+    <!-- ### Obsolete -->
+    <modify-function signature="argc()" remove="all"/>
+    <modify-function signature="argv()" remove="all"/>
+    <!-- ### -->
+    <modify-function signature="notify(QObject*,QEvent*)" allow-thread="yes">
+      <modify-argument index="2" invalidate-after-use="yes"/>
+    </modify-function>
+    <modify-function signature="QCoreApplication(int &amp;, char  **)" access="private"/>
+    <inject-code class="native" file="glue/qcoreapplication_init.cpp" position="beginning" />
+    <modify-function signature="postEvent(QObject*,QEvent*)">
+      <modify-argument index="2">
+        <define-ownership owner="c++"/>
+      </modify-argument>
+    </modify-function>
+    <modify-function signature="postEvent(QObject*,QEvent*, int)">
+      <modify-argument index="2">
+        <define-ownership owner="c++"/>
+      </modify-argument>
+    </modify-function>
+    <modify-function signature="winEventFilter(MSG*, long*)">
+      <modify-argument index="2">
+        <remove-argument />
+        <conversion-rule class="native">
+            long *%out = new long;
+            %out = 0;
+        </conversion-rule>
+      </modify-argument>
+      <modify-argument index="return">
+        <replace-type modified-type="PyObject"/>
+        <conversion-rule class="native">
+            %RETURN_TYPE %out = false;
+            if (PySequence_Check(%PYARG_0) &amp;&amp; (PySequence_Size(%PYARG_0) == 2)) {
+                Shiboken::AutoDecRef pyResult(PySequence_GetItem(%PYARG_0, 0));
+                %out = %CONVERTTOCPP[bool](pyResult);
+            }
+        </conversion-rule>
+      </modify-argument>
+      <inject-code position="end">
+      %PYARG_0 = PyTuple_New(2);
+      PyTuple_SET_ITEM(%PYARG_0, 0, %CONVERTTOPYTHON[%RETURN_TYPE](%0));
+      PyTuple_SET_ITEM(%PYARG_0, 1, %CONVERTTOPYTHON[long](*result_out));
+      delete result_out;
+      </inject-code>
+    </modify-function>
+  </object-type>
+  <object-type name="QSettings">
+    <enum-type name="Format"/>
+    <enum-type name="Scope"/>
+    <enum-type name="Status"/>
+    <extra-includes>
+      <include file-name="QStringList" location="global"/>
+    </extra-includes>
+    <!--### Obsolete in 4.3-->
+    <modify-function signature="setSystemIniPath(const QString&amp;)" remove="all"/>
+    <modify-function signature="setUserIniPath(const QString&amp;)" remove="all"/>
+    <!--### Obsolete in 4.3-->
+    <modify-function signature="iniCodec()const">
+      <modify-argument index="return">
+        <define-ownership class="target" owner="default"/>
+      </modify-argument>
+    </modify-function>
+    <modify-function signature="value(const QString&amp;, const QVariant&amp;)const">
+        <inject-documentation mode="append" format="target">
+            .. warning:: QSettings.value can return different types (QVariant types) depending on the platform it's running on, so the safest way to use it is always casting the result to the desired type, e.g.: int(settings.value("myKey"))
+        </inject-documentation>
+    </modify-function>
+  </object-type>
+  <object-type name="QEvent"  polymorphic-id-expression="%1-&gt;type() == QEvent::None">
+    <enum-type name="Type" extensible="yes" />
+  </object-type>
+  <object-type name="QChildEvent" polymorphic-id-expression="%1-&gt;type() == QEvent::ChildAdded || %1-&gt;type() == QEvent::ChildPolished || %1-&gt;type() == QEvent::ChildRemoved">
+    <modify-field name="c" read="false" write="false"/>
+    <modify-function signature="child() const">
+      <modify-argument index="return">
+         <define-ownership class="target" owner="default"/>
+      </modify-argument>
+    </modify-function>
+  </object-type>
+  <object-type name="QTimerEvent" polymorphic-id-expression="%1-&gt;type() == QEvent::Timer" />
+  <object-type name="QDynamicPropertyChangeEvent" polymorphic-id-expression="%1-&gt;type() == QEvent::DynamicPropertyChange" />
+
+  <template name="stream_read_method">
+      %RETURN_TYPE _cpp_result;
+      (*%CPPSELF) &gt;&gt; _cpp_result;
+      %PYARG_0 = %CONVERTTOPYTHON[%RETURN_TYPE](_cpp_result);
+  </template>
+
+  <template name="stream_write_method">
+      (*%CPPSELF) &lt;&lt; %1;
+  </template>
+
+  <object-type name="QDataStream" stream="yes">
+    <enum-type name="FloatingPointPrecision" since="4.6"/>
+    <enum-type name="Status"/>
+    <enum-type name="Version"/>
+    <enum-type name="ByteOrder"/>
+    <extra-includes>
+      <include file-name="QtCore/QtCore" location="global"/>
+    </extra-includes>
+
+    <modify-function signature="setDevice(QIODevice*)">
+      <modify-argument index="1">
+        <parent index="this" action="add"/>
+      </modify-argument>
+    </modify-function>
+
+    <!-- ### Replaced by write<TYPE> methods -->
+    <modify-function signature="operator&gt;&gt;(qint8&amp;)" remove="all"/>
+    <modify-function signature="operator&gt;&gt;(bool&amp;)" remove="all"/>
+    <modify-function signature="operator&gt;&gt;(quint8&amp;)" remove="all"/>
+    <modify-function signature="operator&gt;&gt;(qint16&amp;)" remove="all"/>
+    <modify-function signature="operator&gt;&gt;(quint16&amp;)" remove="all"/>
+    <modify-function signature="operator&gt;&gt;(qint32&amp;)" remove="all"/>
+    <modify-function signature="operator&gt;&gt;(quint32&amp;)" remove="all"/>
+    <modify-function signature="operator&gt;&gt;(qint64&amp;)" remove="all"/>
+    <modify-function signature="operator&gt;&gt;(quint64&amp;)" remove="all"/>
+    <modify-function signature="operator&gt;&gt;(float&amp;)" remove="all"/>
+    <modify-function signature="operator&gt;&gt;(double&amp;)" remove="all"/>
+    <modify-function signature="operator&gt;&gt;(char*&amp;)" remove="all"/>
+    <!-- ### -->
+
+    <!-- ### Replaced by read<TYPE> methods -->
+    <modify-function signature="operator&lt;&lt;(qint8)" remove="all"/>
+    <modify-function signature="operator&lt;&lt;(bool)" remove="all"/>
+    <modify-function signature="operator&lt;&lt;(quint8)" remove="all"/>
+    <modify-function signature="operator&lt;&lt;(qint16)" remove="all"/>
+    <modify-function signature="operator&lt;&lt;(quint16)" remove="all"/>
+    <modify-function signature="operator&lt;&lt;(qint32)" remove="all"/>
+    <modify-function signature="operator&lt;&lt;(quint32)" remove="all"/>
+    <modify-function signature="operator&lt;&lt;(qint64)" remove="all"/>
+    <modify-function signature="operator&lt;&lt;(quint64)" remove="all"/>
+    <modify-function signature="operator&lt;&lt;(float)" remove="all"/>
+    <modify-function signature="operator&lt;&lt;(double)" remove="all"/>
+    <modify-function signature="operator&lt;&lt;(const char*)" remove="all"/>
+    <!-- ### -->
+    <add-function signature="operator&lt;&lt;(const QString&amp;)">
+        <inject-code class="target" position="end">
+            <insert-template name="stream_write_method"/>
+        </inject-code>
+    </add-function>
+    <add-function signature="writeQString(const QString&amp;)">
+        <inject-code class="target" position="end">
+            <insert-template name="stream_write_method"/>
+        </inject-code>
+    </add-function>
+    <add-function signature="readQString()" return-type="QString">
+        <inject-code class="target" position="end">
+            <insert-template name="stream_read_method"/>
+        </inject-code>
+    </add-function>
+    <add-function signature="writeQChar(const QChar&amp;)">
+        <inject-code class="target" position="end">
+            <insert-template name="stream_write_method"/>
+        </inject-code>
+    </add-function>
+    <add-function signature="readQChar()" return-type="QChar">
+        <inject-code class="target" position="end">
+            <insert-template name="stream_read_method"/>
+        </inject-code>
+    </add-function>
+    <add-function signature="writeQStringList(const QStringList&amp;)">
+        <inject-code class="target" position="end">
+            <insert-template name="stream_write_method"/>
+        </inject-code>
+    </add-function>
+    <add-function signature="readQStringList()" return-type="QStringList">
+        <inject-code class="target" position="end">
+            <insert-template name="stream_read_method"/>
+        </inject-code>
+    </add-function>
+    <add-function signature="writeQVariant(const QVariant&amp;)">
+        <inject-code class="target" position="end">
+            <insert-template name="stream_write_method"/>
+        </inject-code>
+    </add-function>
+    <add-function signature="readQVariant()" return-type="QVariant">
+        <inject-code class="target" position="end">
+            <insert-template name="stream_read_method"/>
+        </inject-code>
+    </add-function>
+    <modify-function signature="readRawData(char*,int)">
+        <modify-argument index="1">
+            <remove-argument />
+        </modify-argument>
+        <inject-code class="target">
+            QByteArray data;
+            data.resize(%2);
+            int result = %CPPSELF.%FUNCTION_NAME(data.data(), data.size());
+            if (result == -1) {
+                Py_INCREF(Py_None);
+                %PYARG_0 = Py_None;
+            } else {
+                %PYARG_0 = PyBytes_FromStringAndSize(data.data(), result);
+            }
+        </inject-code>
+    </modify-function>
+    <modify-function signature="writeRawData(const char*,int)">
+        <modify-argument index="2">
+            <remove-argument />
+        </modify-argument>
+        <inject-code class="target">
+            int r = %CPPSELF.%FUNCTION_NAME(%1, Shiboken::String::len(%PYARG_1));
+            %PYARG_0 = %CONVERTTOPYTHON[int](r);
+        </inject-code>
+    </modify-function>
+
+    <!-- Extra functions for primitive type handling -->
+    <add-function signature="readBool()" return-type="bool">
+        <inject-code class="target" position="end">
+            <insert-template name="stream_read_method"/>
+        </inject-code>
+    </add-function>
+    <add-function signature="readInt8()" return-type="qint8">
+        <inject-code class="target" position="end">
+            <insert-template name="stream_read_method"/>
+        </inject-code>
+    </add-function>
+    <add-function signature="readUInt8()" return-type="quint8">
+        <inject-code class="target" position="end">
+            <insert-template name="stream_read_method"/>
+        </inject-code>
+    </add-function>
+    <add-function signature="readUInt16()" return-type="quint16">
+        <inject-code class="target" position="end">
+            <insert-template name="stream_read_method"/>
+        </inject-code>
+    </add-function>
+    <add-function signature="readInt16()" return-type="qint16">
+        <inject-code class="target" position="end">
+            <insert-template name="stream_read_method"/>
+        </inject-code>
+    </add-function>
+    <add-function signature="readInt32()" return-type="qint32">
+        <inject-code class="target" position="end">
+            <insert-template name="stream_read_method"/>
+        </inject-code>
+    </add-function>
+    <add-function signature="readUInt32()" return-type="quint32">
+        <inject-code class="target" position="end">
+            <insert-template name="stream_read_method"/>
+        </inject-code>
+    </add-function>
+    <add-function signature="readInt64()" return-type="qint64">
+        <inject-code class="target" position="end">
+            <insert-template name="stream_read_method"/>
+        </inject-code>
+    </add-function>
+    <add-function signature="readUInt64()" return-type="quint64">
+        <inject-code class="target" position="end">
+            <insert-template name="stream_read_method"/>
+        </inject-code>
+    </add-function>
+    <add-function signature="readFloat()" return-type="float">
+        <inject-code class="target" position="end">
+            <insert-template name="stream_read_method"/>
+        </inject-code>
+    </add-function>
+    <add-function signature="readDouble()" return-type="qreal">
+        <inject-code class="target" position="end">
+            <insert-template name="stream_read_method"/>
+        </inject-code>
+    </add-function>
+    <add-function signature="readString()" return-type="QString">
+        <inject-code class="target" position="end">
+            <insert-template name="stream_read_method"/>
+        </inject-code>
+    </add-function>
+
+    <add-function signature="writeBool(bool)">
+        <inject-code class="target" position="end">
+            <insert-template name="stream_write_method"/>
+        </inject-code>
+    </add-function>
+    <add-function signature="writeInt8(qint8)">
+        <inject-code class="target" position="end">
+            <insert-template name="stream_write_method"/>
+        </inject-code>
+    </add-function>
+    <add-function signature="writeUInt8(quint8)">
+        <inject-code class="target" position="end">
+            <insert-template name="stream_write_method"/>
+        </inject-code>
+    </add-function>
+    <add-function signature="writeUInt16(quint16)">
+        <inject-code class="target" position="end">
+            <insert-template name="stream_write_method"/>
+        </inject-code>
+    </add-function>
+    <add-function signature="writeInt16(qint16)">
+        <inject-code class="target" position="end">
+            <insert-template name="stream_write_method"/>
+        </inject-code>
+    </add-function>
+    <add-function signature="writeInt32(qint32)">
+        <inject-code class="target" position="end">
+            <insert-template name="stream_write_method"/>
+        </inject-code>
+    </add-function>
+    <add-function signature="writeUInt32(quint32)">
+        <inject-code class="target" position="end">
+            <insert-template name="stream_write_method"/>
+        </inject-code>
+    </add-function>
+    <add-function signature="writeInt64(qint64)">
+        <inject-code class="target" position="end">
+            <insert-template name="stream_write_method"/>
+        </inject-code>
+    </add-function>
+    <add-function signature="writeUInt64(quint64)">
+        <inject-code class="target" position="end">
+            <insert-template name="stream_write_method"/>
+        </inject-code>
+    </add-function>
+    <add-function signature="writeFloat(float)">
+        <inject-code class="target" position="end">
+            <insert-template name="stream_write_method"/>
+        </inject-code>
+    </add-function>
+    <add-function signature="writeDouble(qreal)">
+        <inject-code class="target" position="end">
+            <insert-template name="stream_write_method"/>
+        </inject-code>
+    </add-function>
+    <add-function signature="writeString(QString)">
+        <inject-code class="target" position="end">
+            <insert-template name="stream_write_method"/>
+        </inject-code>
+    </add-function>
+
+    <!-- ### deprecated method -->
+    <modify-function signature="readBytes(char*&amp;,uint&amp;)" remove="all"/>
+    <modify-function signature="writeBytes(const char*,uint)" remove="all" />
+  </object-type>
+  <object-type name="QFSFileEngine">
+    <extra-includes>
+      <include file-name="QDateTime" location="global"/>
+    </extra-includes>
+  </object-type>
+  <value-type name="QTextStreamManipulator" default-constructor="QTextStreamManipulator(0, 0)">
+    <modify-function signature="exec(QTextStream &amp;)" rename="exec_"/>
+  </value-type>
+  <object-type name="QTextStream" stream="yes">
+    <enum-type name="FieldAlignment"/>
+    <enum-type name="NumberFlag" flags="NumberFlags"/>
+    <enum-type name="RealNumberNotation"/>
+    <enum-type name="Status"/>
+    <!-- Removed because it expect QString to be mutable -->
+    <modify-function signature="QTextStream(QString*,QFlags&lt;QIODevice::OpenModeFlag&gt;)" remove="all"/>
+    <!-- Removed because we use the non-const version -->
+    <modify-function signature="QTextStream(const QByteArray&amp;, QFlags&lt;QIODevice::OpenModeFlag&gt;)" remove="all"/>
+
+    <!-- Removed because it expect QString to be mutable -->
+    <modify-function signature="setString(QString*,QFlags&lt;QIODevice::OpenModeFlag&gt;)" remove="all"/>
+
+    <modify-function signature="operator&lt;&lt;(const void*)" remove="all"/>
+    <modify-function signature="operator&lt;&lt;(float)" remove="all"/>
+    <modify-function signature="operator&lt;&lt;(qlonglong)" remove="all"/>
+    <modify-function signature="operator&lt;&lt;(qulonglong)" remove="all"/>
+    <modify-function signature="operator&lt;&lt;(signed short)" remove="all"/>
+    <modify-function signature="operator&lt;&lt;(signed int)" remove="all"/>
+    <modify-function signature="operator&lt;&lt;(QBool)" remove="all"/>
+    <modify-function signature="operator&lt;&lt;(unsigned int)" remove="all"/>
+    <modify-function signature="operator&lt;&lt;(unsigned short)" remove="all"/>
+    <modify-function signature="operator&lt;&lt;(const char*)" remove="all"/>
+
+    <modify-function signature="operator&gt;&gt;(char*)" remove="all"/>
+    <modify-function signature="operator&gt;&gt;(char&amp;)" remove="all"/>
+    <modify-function signature="operator&gt;&gt;(float&amp;)" remove="all"/>
+    <modify-function signature="operator&gt;&gt;(double&amp;)" remove="all"/>
+    <modify-function signature="operator&gt;&gt;(qlonglong&amp;)" remove="all"/>
+    <modify-function signature="operator&gt;&gt;(qulonglong&amp;)" remove="all"/>
+    <modify-function signature="operator&gt;&gt;(signed long&amp;)" remove="all"/>
+    <modify-function signature="operator&gt;&gt;(signed int&amp;)" remove="all"/>
+    <modify-function signature="operator&gt;&gt;(signed short&amp;)" remove="all"/>
+    <modify-function signature="operator&gt;&gt;(unsigned long&amp;)" remove="all"/>
+    <modify-function signature="operator&gt;&gt;(unsigned int&amp;)" remove="all"/>
+    <modify-function signature="operator&gt;&gt;(unsigned short&amp;)" remove="all"/>
+    <!-- Removed because it expect QChar to be mutable -->
+    <modify-function signature="operator&gt;&gt;(QChar&amp;)" remove="all"/>
+    <!-- Removed because it expect QString to be mutable -->
+    <modify-function signature="operator&gt;&gt;(QString&amp;)" remove="all"/>
+
+    <modify-function signature="string()const">
+      <modify-argument index="return">
+        <!--<replace-type modified-type="QString" />-->
+        <conversion-rule class="target">
+        QString&amp; res = *%0;
+        %PYARG_0 = %CONVERTTOPYTHON[QString](res);
+        </conversion-rule>
+      </modify-argument>
+    </modify-function>
+
+    <modify-function signature="flush()" allow-thread="yes"/>
+    <modify-function signature="read(qint64)" allow-thread="yes"/>
+    <modify-function signature="readLine(qint64)" allow-thread="yes"/>
+    <modify-function signature="readAll()" allow-thread="yes"/>
+  </object-type>
+  <object-type name="QSystemSemaphore">
+    <enum-type name="AccessMode"/>
+    <enum-type name="SystemSemaphoreError"/>
+  </object-type>
+  <namespace-type name="QtConcurrent" target-type="class">
+    <enum-type name="ReduceOption" flags="ReduceOptions"/>
+    <extra-includes>
+      <include file-name="qtconcurrentreducekernel.h" location="global"/>
+      <include file-name="qtconcurrentthreadengine.h" location="global"/>
+    </extra-includes>
+  </namespace-type>
+  <object-type name="QThreadPool">
+    <modify-function signature="start(QRunnable*, int)">
+      <modify-argument index="1">
+        <parent index="this" action="add" />
+      </modify-argument>
+    </modify-function>
+    <modify-function signature="tryStart(QRunnable*)">
+      <modify-argument index="1">
+        <parent index="this" action="add" />
+      </modify-argument>
+    </modify-function>
+
+    <modify-function signature="globalInstance()" >
+      <inject-code position="end">
+        Shiboken::Object::releaseOwnership(%PYARG_0);
+      </inject-code>
+    </modify-function>
+  </object-type>
+  <value-type name="QXmlStreamAttribute"/>
+  <value-type name="QXmlStreamAttributes">
+    <modify-function signature="push_back(QXmlStreamAttribute)" remove="all"/>
+    <modify-function signature="pop_back()" remove="all"/>
+    <modify-function signature="push_front(QXmlStreamAttribute)" remove="all"/>
+    <modify-function signature="pop_front()" remove="all"/>
+    <modify-function signature="toList() const" remove="all"/>
+    <modify-function signature="fromList(const QList&lt;QXmlStreamAttribute&gt; &amp;)" remove="all"/>
+    <modify-function signature="operator+=(QVector&lt;QXmlStreamAttribute&gt;)" remove="all" />
+  </value-type>
+  <value-type name="QXmlStreamNamespaceDeclaration"/>
+  <value-type name="QXmlStreamNotationDeclaration"/>
+  <value-type name="QXmlStreamEntityDeclaration"/>
+  <object-type name="QXmlStreamReader">
+    <enum-type name="Error"/>
+    <enum-type name="TokenType"/>
+    <enum-type name="ReadElementTextBehaviour" since="4.6"/>
+  </object-type>
+  <object-type name="QXmlStreamWriter">
+    <!-- Removed because it expect QString to be mutable -->
+    <modify-function signature="QXmlStreamWriter(QString *)" remove="all" />
+    <modify-function signature="codec()const">
+      <modify-argument index="return">
+        <define-ownership class="target" owner="default"/>
+      </modify-argument>
+    </modify-function>
+  </object-type>
+  <value-type name="QModelIndex">
+    <modify-function signature="internalPointer()const">
+        <inject-code class="target" position="beginning">
+            <insert-template name="return_internal_pointer" />
+        </inject-code>
+    </modify-function>
+    <modify-function signature="model()const">
+      <modify-argument index="return">
+        <define-ownership class="target" owner="default"/>
+      </modify-argument>
+    </modify-function>
+  </value-type>
+
+  <value-type name="QGenericArgument">
+    <include file-name="qobjectdefs.h" location="global" />
+  </value-type>
+
+  <value-type name="QGenericReturnArgument">
+    <include file-name="qobjectdefs.h" location="global" />
+  </value-type>
+
+  <value-type name="QMetaMethod">
+    <enum-type name="Access"/>
+    <enum-type name="MethodType"/>
+    <!-- This isn't part of Qt public API -->
+    <modify-function signature="attributes()const" remove="all" />
+  </value-type>
+  <object-type name="QMetaObject">
+    <enum-type name="Call"/>
+    <include file-name="qobjectdefs.h" location="global" />
+    <!-- This isn't part of Qt public API -->
+    <modify-function signature="connect(const QObject*, int, const QObject*, int, int, int*)" remove="all" />
+  </object-type>
+  <value-type name="QMetaProperty" >
+    <!-- This isn't part of Qt public API -->
+    <modify-function signature="enclosingMetaObject()const" remove="all" />
+  </value-type>
+  <value-type name="QMetaClassInfo">
+    <!-- This isn't part of Qt public API -->
+    <modify-function signature="enclosingMetaObject()const" remove="all" />
+  </value-type>
+  <value-type name="QMetaEnum">
+    <!-- This isn't part of Qt public API -->
+    <modify-function signature="enclosingMetaObject()const" remove="all" />
+  </value-type>
+  <!-- From Qt4.6 -->
+  <object-type name="QAbstractAnimation" since="4.6">
+    <enum-type name="DeletionPolicy"/>
+    <enum-type name="Direction"/>
+    <enum-type name="State"/>
+  </object-type>
+
+  <object-type name="QAbstractState" since="4.6">
+    <modify-function signature="machine() const">
+        <modify-argument index="this">
+            <parent index="return" action="add"/>
+        </modify-argument>
+    </modify-function>
+  </object-type>
+
+  <object-type name="QAbstractTransition" since="4.6">
+    <modify-function signature="QAbstractTransition(QState*)">
+      <modify-argument index="1">
+        <parent index="this" action="add"/>
+      </modify-argument>
+    </modify-function>
+
+    <modify-function signature="addAnimation(QAbstractAnimation*)">
+      <modify-argument index="1">
+        <reference-count action="add"/>
+      </modify-argument>
+    </modify-function>
+
+    <modify-function signature="removeAnimation(QAbstractAnimation*)">
+      <modify-argument index="1">
+        <reference-count action="remove"/>
+      </modify-argument>
+    </modify-function>
+
+    <modify-function signature="setTargetState(QAbstractState*)">
+      <modify-argument index="1">
+        <reference-count action="set"/>
+      </modify-argument>
+    </modify-function>
+
+    <modify-function signature="targetState() const">
+      <modify-argument index="return">
+        <reference-count action="set" variable-name="setTargetState(QAbstractState*)1" />
+      </modify-argument>
+    </modify-function>
+
+
+    <modify-function signature="targetStates() const">
+      <modify-argument index="return">
+        <reference-count action="set" variable-name="setTargetState(QAbstractState*)1" />
+      </modify-argument>
+    </modify-function>
+
+
+    <modify-function signature="setTargetStates(QList&lt;QAbstractState*&gt;)">
+      <modify-argument index="1">
+        <reference-count action="set" variable-name="setTargetState(QAbstractState*)1" />
+      </modify-argument>
+    </modify-function>
+
+  </object-type>
+
+  <object-type name="QAnimationGroup" since="4.6">
+    <modify-function signature="addAnimation(QAbstractAnimation*)">
+      <modify-argument index="1">
+        <parent index="this" action="add"/>
+      </modify-argument>
+    </modify-function>
+
+    <modify-function signature="insertAnimation(int, QAbstractAnimation*)">
+      <modify-argument index="2">
+        <parent index="this" action="add"/>
+      </modify-argument>
+    </modify-function>
+
+    <modify-function signature="removeAnimation(QAbstractAnimation*)">
+      <modify-argument index="1">
+        <parent index="this" action="remove"/>
+      </modify-argument>
+    </modify-function>
+
+    <modify-function signature="takeAnimation(int)">
+      <modify-argument index="return">
+        <parent index="this" action="remove"/>
+      </modify-argument>
+    </modify-function>
+
+    <modify-function signature="clear()" >
+        <inject-code class="target" position="beginning">
+        for(int counter = 0; counter &lt; %CPPSELF.animationCount(); ++counter ) {
+            QAbstractAnimation* animation = %CPPSELF.animationAt(counter);
+            PyObject* obj = %CONVERTTOPYTHON[QAbstractAnimation*](animation);
+            Shiboken::Object::setParent(NULL, obj);
+            Py_DECREF(obj);
+        }
+        %CPPSELF.clear();
+        </inject-code>
+    </modify-function>
+  </object-type>
+
+  <!-- We will use inject code to implement the function below -->
+  <rejection class="QEasingCurve" function-name="setCustomType" />
+  <rejection class="QEasingCurve" function-name="customType" />
+  <value-type name="QEasingCurve" since="4.6">
+    <extra-includes>
+      <include file-name="pysideweakref.h" location="global"/>
+      <include file-name="glue/qeasingcurve_glue.h" location="local"/>
+    </extra-includes>
+    <inject-code>
+        PySideEasingCurveFunctor::init();
+    </inject-code>
+    <enum-type name="Type" />
+    <add-function signature="setCustomType(PyObject*)">
+      <inject-code>
+        QEasingCurve::EasingFunction func = PySideEasingCurveFunctor::createCustomFuntion(%PYSELF, %PYARG_1);
+        if (func)
+            %CPPSELF.%FUNCTION_NAME(func);
+      </inject-code>
+    </add-function>
+    <add-function signature="customType()" return-type="PyObject">
+      <inject-code>
+        //%FUNCTION_NAME()
+        %PYARG_0 = PySideEasingCurveFunctor::callable(%PYSELF);
+      </inject-code>
+    </add-function>
+  </value-type>
+
+  <object-type name="QEventTransition" since="4.6">
+    <modify-function signature="QEventTransition(QState*)">
+      <modify-argument index="1">
+        <parent index="this" action="add"/>
+      </modify-argument>
+    </modify-function>
+
+    <modify-function signature="QEventTransition(QObject*, QEvent::Type, QState*)">
+      <modify-argument index="3">
+        <parent index="this" action="add"/>
+      </modify-argument>
+    </modify-function>
+
+  </object-type>
+
+  <object-type name="QFinalState" since="4.6" />
+
+  <object-type name="QHistoryState" since="4.6">
+    <enum-type name="HistoryType" />
+    <modify-documentation xpath='description/code'>
+        &lt;code>machine = QStateMachine()
+
+s1 = new QState()
+s11 = new QState(s1)
+s12 = new QState(s1)
+
+s1h = QHistoryState(s1)
+s1h.setDefaultState(s11)
+
+machine.addState(s1)
+
+s2 = QState()
+machine.addState(s2)
+
+button = QPushButton()
+# Clicking the button will cause the state machine to enter the child state
+# that s1 was in the last time s1 was exited, or the history state's default
+# state if s1 has never been entered.
+s1.addTransition(button.clicked, s1h)&lt;/code>
+    </modify-documentation>
+  </object-type>
+
+  <value-type name="QMargins" since="4.6"/>
+
+  <object-type name="QParallelAnimationGroup" since="4.6"/>
+
+  <object-type name="QPauseAnimation" since="4.6"/>
+
+  <value-type name="QProcessEnvironment" since="4.6"/>
+
+  <object-type name="QPropertyAnimation" since="4.6"/>
+
+  <object-type name="QSequentialAnimationGroup" since="4.6"/>
+
+  <object-type name="QSignalTransition" since="4.6">
+    <add-function signature="QSignalTransition(PyObject*, QState*)" return-type="QSignalTransition*">
+        <modify-argument index="2">
+            <replace-default-expression with="0" />
+        </modify-argument>
+        <inject-code>
+            if (PyObject_TypeCheck(%1, &amp;PySideSignalInstanceType)) {
+                PyObject* dataSource = PySide::Signal::getObject((PySideSignalInstance*) %PYARG_1);
+                Shiboken::AutoDecRef obType(PyObject_Type(dataSource));
+                QObject* sender = %CONVERTTOCPP[QObject*](dataSource);
+                if (sender) {
+                    const char* dataSignature = PySide::Signal::getSignature((PySideSignalInstance*) %PYARG_1);
+                    QByteArray signature(dataSignature); // Append SIGNAL flag (2)
+                    %0 = new QSignalTransitionWrapper(sender, "2" + signature, %2);
+                }
+            }
+        </inject-code>
+    </add-function>
+  </object-type>
+
+  <object-type name="QState" since="4.6">
+    <enum-type name="ChildMode"/>
+    <modify-function signature="addTransition(QAbstractTransition*)">
+      <modify-argument index="1">
+        <parent index="this" action="add"/>
+      </modify-argument>
+    </modify-function>
+
+    <modify-function signature="addTransition(QObject*, const char*, QAbstractState*)">
+      <modify-argument index="return">
+        <parent index="this" action="add"/>
+      </modify-argument>
+      <inject-code class="target" position="beginning">
+      QString signalName(%2);
+      if (PySide::SignalManager::registerMetaMethod(%1, signalName.mid(1).toAscii().data(), QMetaMethod::Signal)) {
+          QSignalTransition* %0 = %CPPSELF->addTransition(%1, %2, %3);
+          %PYARG_0 = %CONVERTTOPYTHON[QSignalTransition*](%0);
+      } else {
+          Py_INCREF(Py_None);
+          %PYARG_0 = Py_None;
+      }
+      </inject-code>
+    </modify-function>
+    <modify-function signature="addTransition(QAbstractState*)">
+      <modify-argument index="1">
+        <parent index="this" action="add"/>
+      </modify-argument>
+    </modify-function>
+
+    <!-- FIXME: the proper signature for this added function would be something like
+         addTransition(PySide.QtCore.Signal, QAbstractState*)
+         but that depends on bug #362. -->
+    <add-function signature="addTransition(PyObject*, QAbstractState*)" return-type="QSignalTransition*">
+      <modify-argument index="return">
+        <parent index="this" action="add"/>
+      </modify-argument>
+      <inject-code class="target" position="beginning">
+      // Obviously the label used by the following goto is a very awkward solution,
+      // since it refers to a name very tied to the generator implementation.
+      // Check bug #362 for more information on this
+      // http://bugs.openbossa.org/show_bug.cgi?id=362
+      if (!PyObject_TypeCheck(%1, &amp;PySideSignalInstanceType))
+          goto Sbk_%TYPEFunc_%FUNCTION_NAME_TypeError;
+      PySideSignalInstance* signalInstance = reinterpret_cast&lt;PySideSignalInstance*&gt;(%1);
+      QObject* sender = %CONVERTTOCPP[QObject*](PySide::Signal::getObject(signalInstance));
+      QSignalTransition* %0 = %CPPSELF->%FUNCTION_NAME(sender, PySide::Signal::getSignature(signalInstance), %2);
+      %PYARG_0 = %CONVERTTOPYTHON[QSignalTransition*](%0);
+      </inject-code>
+    </add-function>
+
+    <modify-function signature="removeTransition(QAbstractTransition*)">
+      <modify-argument index="1">
+        <parent index="this" action="remove"/>
+      </modify-argument>
+    </modify-function>
+  </object-type>
+
+  <object-type name="QStateMachine" since="4.6">
+    <enum-type name="Error"/>
+    <enum-type name="EventPriority"/>
+    <enum-type name="RestorePolicy"/>
+
+    <value-type name="SignalEvent" since="4.6"/>
+    <value-type name="WrappedEvent" since="4.6"/>
+
+    <modify-function signature="addState(QAbstractState *)">
+      <modify-argument index="1">
+        <parent index="this" action="add"/>
+      </modify-argument>
+    </modify-function>
+    <modify-function signature="removeState(QAbstractState *)">
+      <modify-argument index="1">
+        <parent index="this" action="remove"/>
+      </modify-argument>
+    </modify-function>
+
+    <add-function signature="configuration()" return-type="list of QAbstractState" >
+        <inject-code class="target" position="beginning">
+            %PYARG_0 = PySet_New(0);
+            foreach(QAbstractState* abs_state, %CPPSELF.configuration()) {
+                    Shiboken::AutoDecRef obj(%CONVERTTOPYTHON[QAbstractState*](abs_state));
+                    Shiboken::Object::setParent(self, obj);
+                    PySet_Add(%PYARG_0, obj);
+            }
+        </inject-code>
+    </add-function>
+
+    <!-- Replaced by a added function -->
+    <modify-function signature="defaultAnimations() const" remove="all"/>
+    <add-function signature="defaultAnimations()" return-type="list of QAbstractAnimation" >
+        <inject-code class="target" position="beginning">
+            %PYARG_0 = PyList_New(0);
+            foreach(QAbstractAnimation* abs_anim, %CPPSELF.defaultAnimations()) {
+                    Shiboken::AutoDecRef obj(%CONVERTTOPYTHON[QAbstractAnimation*](abs_anim));
+                    Shiboken::Object::setParent(self, obj);
+                    PyList_Append(%PYARG_0, obj);
+            }
+        </inject-code>
+    </add-function>
+  </object-type>
+
+  <object-type name="QVariantAnimation" since="4.6"/>
+
+  <!-- From Qt4.6 ^^^ -->
+
+  <add-function signature="SIGNAL(const char*)" return-type="str">
+    <inject-code class="target" position="beginning">
+      %PYARG_0 = Shiboken::String::fromFormat("2%s", QMetaObject::normalizedSignature(%1).constData());
+    </inject-code>
+  </add-function>
+
+  <add-function signature="SLOT(const char*)" return-type="str">
+    <inject-code class="target" position="beginning">
+      %PYARG_0 = Shiboken::String::fromFormat("1%s", QMetaObject::normalizedSignature(%1).constData());
+    </inject-code>
+  </add-function>
+
+  <add-function signature="QT_TR_NOOP(PyObject)" return-type="PyObject*">
+    <inject-code class="target" position="beginning">
+      <insert-template name="return_argument"><replace from="#" to="1" /></insert-template>
+    </inject-code>
+  </add-function>
+  <add-function signature="QT_TR_NOOP_UTF8(PyObject)" return-type="PyObject*">
+    <inject-code class="target" position="beginning">
+      <insert-template name="return_argument"><replace from="#" to="1" /></insert-template>
+    </inject-code>
+  </add-function>
+  <add-function signature="QT_TRANSLATE_NOOP(PyObject, PyObject)" return-type="PyObject*">
+    <inject-code class="target" position="beginning">
+      <insert-template name="return_argument"><replace from="#" to="2" /></insert-template>
+    </inject-code>
+  </add-function>
+  <add-function signature="QT_TRANSLATE_NOOP3(PyObject, PyObject, PyObject)" return-type="PyObject*">
+    <inject-code class="target" position="beginning">
+      <insert-template name="return_argument"><replace from="#" to="2" /></insert-template>
+    </inject-code>
+  </add-function>
+  <add-function signature="QT_TRANSLATE_NOOP_UTF8(PyObject)" return-type="PyObject*">
+    <inject-code class="target" position="beginning">
+      <insert-template name="return_argument"><replace from="#" to="1" /></insert-template>
+    </inject-code>
+  </add-function>
+
+  <inject-code class="native" position="beginning">
+    extern bool
+    qRegisterResourceData(int,
+                        const unsigned char *,
+                        const unsigned char *,
+                        const unsigned char *);
+
+    extern bool
+    qUnregisterResourceData(int,
+                            const unsigned char *,
+                            const unsigned char *,
+                            const unsigned char *);
+  </inject-code>
+  <add-function signature="qRegisterResourceData(int, PyBytes, PyBytes, PyBytes)" return-type="bool">
+    <inject-code class="target" position="beginning">
+        %RETURN_TYPE %0 = %FUNCTION_NAME(%1, (uchar*)PyBytes_AS_STRING(%PYARG_2),
+                                             (uchar*)PyBytes_AS_STRING(%PYARG_3),
+                                             (uchar*)PyBytes_AS_STRING(%PYARG_4));
+        %PYARG_0 = %CONVERTTOPYTHON[%RETURN_TYPE](%0);
+    </inject-code>
+  </add-function>
+  <add-function signature="qUnregisterResourceData(int, PyBytes, PyBytes, PyBytes)" return-type="bool">
+    <inject-code class="target" position="beginning">
+        %RETURN_TYPE %0 = %FUNCTION_NAME(%1, (uchar*)PyBytes_AS_STRING(%PYARG_2),
+                                             (uchar*)PyBytes_AS_STRING(%PYARG_3),
+                                             (uchar*)PyBytes_AS_STRING(%PYARG_4));
+        %PYARG_0 = %CONVERTTOPYTHON[%RETURN_TYPE](%0);
+    </inject-code>
+  </add-function>
+
+  <object-type name="QFactoryInterface"/>
+  <object-type name="QRunnable"/>
+
+  <object-type name="QPluginLoader"/>
+
+  <suppress-warning text="Unable to decide type of property: 'QLibrary::LoadHints' in class 'QPluginLoader'" />
+  <suppress-warning text="enum '_ISalnum' does not have a type entry or is not an enum" />
+  <suppress-warning text="enum 'Qt::Initialization' does not have a type entry or is not an enum" />
+  <suppress-warning text="visibility of function '*' modified in class '*'"/>
+  <suppress-warning text="hiding of function '*' in class '*'"/>
+  <suppress-warning text="namespace '*' does not have a type entry"/>
+  <suppress-warning text="Shadowing: QObject::parent() const and QAbstractItemModel::parent() const"/>
+  <suppress-warning text="namespace '*' for enum 'QtMsgType' is not declared"/>
+  <suppress-warning text="horribly broken type 'imaxdiv_t'"/>
+  <suppress-warning text="horribly broken type '__off64_t'"/>
+  <suppress-warning text="horribly broken type 'div_t'"/>
+  <suppress-warning text="horribly broken type 'fd_set*'"/>
+  <suppress-warning text="horribly broken type 'ldiv_t'"/>
+  <suppress-warning text="horribly broken type 'lldiv_t'"/>
+  <suppress-warning text="signal '*' in class '*' is overloaded."/>
+  <suppress-warning text="enum 'enum_3' does not have a type entry or is not an enum"/>
+  <suppress-warning text="Shadowing: QFile::fileName() const and QTemporaryFile::fileName() const"/>
+  <suppress-warning text="unhandled enum value: ~0u in Qt::GestureType"/>
+  <suppress-warning text="unhandled enum value: (sizeof(void*)&lt;&lt;3) in QSysInfo::Sizes"/>
+  <suppress-warning text="unmatched enum ~0u"/>
+  <suppress-warning text="unmatched enum (sizeof(void*)&lt;&lt;3)"/>
+  <suppress-warning text="signature 'setCustomType(float)' for function modification in 'QEasingCurve' not found. Possible candidates: setCustomType(double) in QEasingCurve"/>
+  <suppress-warning text="enum 'enum_4' does not have a type entry or is not an enum" />
+  <suppress-warning text="enum 'enum_5' does not have a type entry or is not an enum" />
+  <suppress-warning text="enum 'FP_NORMAL' does not have a type entry or is not an enum" />
+  <suppress-warning text="Shadowing: *" />
+  <!-- this enum is defined on Qt global header but only used in QtDeclarative module -->
+  <suppress-warning text="enum 'QML_HAS_ATTACHED_PROPERTIES' does not have a type entry or is not an enum" />
+
+  <!-- this enum is defined on Qt global header but only used in QtGui module -->
+  <suppress-warning text="enum 'PM_MessageBoxHeight' does not have a type entry or is not an enum" />
+
+  <!-- this function only exists on Windows -->
+  <suppress-warning text="signature 'winEventFilter(MSG*,long*)' for function modification in 'QCoreApplication' not found. Possible candidates:*"/>
+
+  <!-- this is necessary to avoid warning on other modules -->
+  <suppress-warning text="signature 'operator*(QByteArray,const char*)' for function modification in 'QByteArray' not found. Possible candidates: *"/>
+  <suppress-warning text="signature 'operator+(QByteArray,QString)' for function modification in 'QByteArray' not found. Possible candidates: *"/>
+
+  <!-- This enum is intenaly used -->
+  <suppress-warning text="enum 'PM_CbaIconHeight' does not have a type entry or is not an enum" />
+
+  <!-- TODO: this need be removed -->
+  <suppress-warning text="skipping function '*', unmatched return type '*'"/>
+  <suppress-warning text="skipping function '*', unmatched parameter type '*'"/>
+
+
+</typesystem>
diff --git a/PySide/QtCore/typesystem_core_mac.xml b/PySide/QtCore/typesystem_core_mac.xml
new file mode 100644
index 0000000..0f9c511
--- /dev/null
+++ b/PySide/QtCore/typesystem_core_mac.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0"?>
+<!--
+    This file is part of PySide project.
+    Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+    Contact: PySide team <contact@pyside.org>
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+-->
+<typesystem package="PySide.QtCore">
+  <primitive-type name="Qt::HANDLE" target-lang-api-name="PyObject" />
+</typesystem>
diff --git a/PySide/QtCore/typesystem_core_maemo.xml b/PySide/QtCore/typesystem_core_maemo.xml
new file mode 100644
index 0000000..eba223c
--- /dev/null
+++ b/PySide/QtCore/typesystem_core_maemo.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0"?>
+<!--
+    This file is part of PySide project.
+    Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+    Contact: PySide team <contact@pyside.org>
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+-->
+<typesystem package="PySide.QtCore">
+  <primitive-type name="Qt::HANDLE" target-lang-api-name="PyLong">
+    <!-- FIXME APIExtractor or shiboken do not support multiple includes by primitive type -->
+    <include file-name="QTextDocument" location="global"/>
+  </primitive-type>
+</typesystem>
diff --git a/PySide/QtCore/typesystem_core_win.xml b/PySide/QtCore/typesystem_core_win.xml
new file mode 100644
index 0000000..26c7a82
--- /dev/null
+++ b/PySide/QtCore/typesystem_core_win.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0"?>
+<!--
+    This file is part of PySide project.
+    Copyright (C) 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
+    Contact: PySide team <contact@pyside.org>
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+-->
+<typesystem package="PySide.QtCore">
+  <primitive-type name="Qt::HANDLE" target-lang-api-name="PyObject" />
+  <primitive-type name="HWND">
+      <conversion-rule>
+        <native-to-target>
+        #ifdef IS_PY3K
+        return PyCapsule_New(%in, 0, 0);
+        #else
+        return PyCObject_FromVoidPtr(%in, 0);
+        #endif
+        </native-to-target>
+        <target-to-native>
+            <add-conversion type="PyNone">
+            %out = 0;
+            </add-conversion>
+            <add-conversion check="checkPyCapsuleOrPyCObject(%in)" type="PyObject">
+            #ifdef IS_PY3K
+            %out = (%OUTTYPE)PyCapsule_GetPointer(%in, 0);
+            #else
+            %out = (%OUTTYPE)PyCObject_AsVoidPtr(%in);
+            #endif
+            </add-conversion>
+        </target-to-native>
+      </conversion-rule>
+  </primitive-type>
+  <inject-code class="native" position="beginning">
+    <insert-template name="checkPyCapsuleOrPyCObject_func"/>
+  </inject-code>
+  <value-type name="POINT">
+      <include file-name="wtypes.h" location="global"/>
+  </value-type>
+  <value-type name="MSG">
+      <include file-name="wtypes.h" location="global"/>
+  </value-type>
+  <suppress-warning text="class 'MSG' inherits from unknown base class 'tagMSG'"/>
+  <suppress-warning text="class not found for setup inheritance 'tagMSG'"/>
+</typesystem>
diff --git a/PySide/QtCore/typesystem_core_x11.xml b/PySide/QtCore/typesystem_core_x11.xml
new file mode 100644
index 0000000..eba223c
--- /dev/null
+++ b/PySide/QtCore/typesystem_core_x11.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0"?>
+<!--
+    This file is part of PySide project.
+    Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+    Contact: PySide team <contact@pyside.org>
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+-->
+<typesystem package="PySide.QtCore">
+  <primitive-type name="Qt::HANDLE" target-lang-api-name="PyLong">
+    <!-- FIXME APIExtractor or shiboken do not support multiple includes by primitive type -->
+    <include file-name="QTextDocument" location="global"/>
+  </primitive-type>
+</typesystem>
diff --git a/PySide/QtDeclarative/CMakeLists.txt b/PySide/QtDeclarative/CMakeLists.txt
index 587e3b5..c9ea931 100644
--- a/PySide/QtDeclarative/CMakeLists.txt
+++ b/PySide/QtDeclarative/CMakeLists.txt
@@ -1,11 +1,14 @@
 project(QtDeclarative)
 
+set(QtDeclarative_registerType "${CMAKE_CURRENT_SOURCE_DIR}/pysideqmlregistertype.cpp")
+
 set(QtDeclarative_SRC
 ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtDeclarative/qdeclarativecomponent_wrapper.cpp
 ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtDeclarative/qdeclarativecontext_wrapper.cpp
 ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtDeclarative/qdeclarativeengine_wrapper.cpp
 ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtDeclarative/qdeclarativeerror_wrapper.cpp
 ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtDeclarative/qdeclarativeexpression_wrapper.cpp
+${CMAKE_CURRENT_BINARY_DIR}/PySide/QtDeclarative/qdeclarativeextensioninterface_wrapper.cpp
 ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtDeclarative/qdeclarativeextensionplugin_wrapper.cpp
 ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtDeclarative/qdeclarativeimageprovider_wrapper.cpp
 ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtDeclarative/qdeclarativeitem_wrapper.cpp
@@ -20,40 +23,40 @@ ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtDeclarative/qdeclarativeview_wrapper.cpp
 ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtDeclarative/qtdeclarative_module_wrapper.cpp
 )
 
-execute_generator(declarative QtDeclarative_SRC "${CMAKE_CURRENT_BINARY_DIR}:${QtCore_SOURCE_DIR}:${QtGui_BINARY_DIR}:${QtGui_SOURCE_DIR}:${QtDeclarative_SOURCE_DIR}:${QtNetwork_SOURCE_DIR}:${QtNetwork_BINARY_DIR}")
+set(QtDeclarative_typesystem_path "${QtCore_SOURCE_DIR}${PATH_SEP}${QtCore_BINARY_DIR}${PATH_SEP}${QtGui_SOURCE_DIR}${PATH_SEP}${QtNetwork_SOURCE_DIR}${PATH_SEP}${QtDeclarative_SOURCE_DIR}${PATH_SEP}${QtGui_BINARY_DIR}")
 
-include_directories(${CMAKE_CURRENT_SOURCE_DIR}
-                    ${QT_QTCORE_INCLUDE_DIR}
-                    ${QT_QTGUI_INCLUDE_DIR}
-                    ${QT_QTNETWORK_INCLUDE_DIR}
-                    ${QT_QTDECLARATIVE_INCLUDE_DIR}
-                    ${PYTHON_INCLUDE_PATH}
-                    ${SHIBOKEN_INCLUDE_DIR}
-                    ${libpyside_SOURCE_DIR}
-                    ${QtGui_BINARY_DIR}/PySide/QtGui/
-                    ${QtCore_BINARY_DIR}/PySide/QtCore/
-                    ${QtNetwork_BINARY_DIR}/PySide/QtNetwork/
-                    ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtDeclarative)
-add_library(QtDeclarative MODULE ${QtDeclarative_SRC})
-set_target_properties(QtDeclarative PROPERTIES PREFIX "")
-target_link_libraries(QtDeclarative
-                      pyside
-                      ${PYTHON_LIBRARIES}
-                      ${QT_QTCORE_LIBRARY}
-                      ${QT_QTGUI_LIBRARY}
-                      ${QT_QTNETWORK_LIBRARY}
-                      ${QT_QTSCRIPT_LIBRARY}
-                      ${QT_QTSVG_LIBRARY}
-                      ${QT_QTSQL_LIBRARY}
-                      ${QT_QTXMLPATTERNS_LIBRARY}
-                      ${QT_QTOPENGL_LIBRARY}
-                      ${QT_QTDECLARATIVE_LIBRARY})
-add_dependencies(QtDeclarative QtGui)
-add_dependencies(QtDeclarative QtNetwork)
+set(QtDeclarative_include_dirs  ${CMAKE_CURRENT_SOURCE_DIR}
+                            ${QT_QTCORE_INCLUDE_DIR}
+                            ${QT_QTGUI_INCLUDE_DIR}
+                            ${QT_QTNETWORK_INCLUDE_DIR}
+                            ${QT_QTDECLARATIVE_INCLUDE_DIR}
+                            ${SHIBOKEN_PYTHON_INCLUDE_DIR}
+                            ${SHIBOKEN_INCLUDE_DIR}
+                            ${libpyside_SOURCE_DIR}
+                            ${QtGui_BINARY_DIR}/PySide/QtGui/
+                            ${QtCore_BINARY_DIR}/PySide/QtCore/
+                            ${QtNetwork_BINARY_DIR}/PySide/QtNetwork/
+                            ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtDeclarative)
 
-# install
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/QtDeclarative${CMAKE_DEBUG_POSTFIX}.so
-        DESTINATION ${SITE_PACKAGE}/PySide)
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtDeclarative/pyside_qtdeclarative_python.h
-        DESTINATION include/PySide/QtDeclarative/)
+set(QtDeclarative_libraries   pyside
+                              ${SHIBOKEN_PYTHON_LIBRARIES}
+                              ${QT_QTCORE_LIBRARY}
+                              ${QT_QTGUI_LIBRARY}
+                              ${QT_QTNETWORK_LIBRARY}
+                              ${QT_QTSCRIPT_LIBRARY}
+                              ${QT_QTSVG_LIBRARY}
+                              ${QT_QTSQL_LIBRARY}
+                              ${QT_QTXMLPATTERNS_LIBRARY}
+                              ${QT_QTOPENGL_LIBRARY}
+                              ${QT_QTDECLARATIVE_LIBRARY})
+
+set(QtDeclarative_deps QtGui QtNetwork)
+
+create_pyside_module(QtDeclarative
+                     QtDeclarative_include_dirs
+                     QtDeclarative_libraries
+                     QtDeclarative_deps
+                     QtDeclarative_typesystem_path
+                     QtDeclarative_SRC
+                     QtDeclarative_registerType)
 
diff --git a/PySide/QtDeclarative/pysideqmlregistertype.cpp b/PySide/QtDeclarative/pysideqmlregistertype.cpp
new file mode 100644
index 0000000..4efc4bf
--- /dev/null
+++ b/PySide/QtDeclarative/pysideqmlregistertype.cpp
@@ -0,0 +1,366 @@
+/*
+ * This file is part of the Shiboken Python Bindings Generator project.
+ *
+ * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+ *
+ * Contact: PySide team <contact@pyside.org>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+#include "pysideqmlregistertype.h"
+// Qt
+#include <QObject>
+#include <QDeclarativeEngine>
+#include <QMutex>
+// shiboken
+#include <typeresolver.h>
+#include <gilstate.h>
+#include <sbkdbg.h>
+// pyside
+#include <pyside.h>
+#include <dynamicqmetaobject.h>
+#include <pysideproperty.h>
+
+// auto generated headers
+#include "qdeclarativeitem_wrapper.h"
+#include "pyside_qtcore_python.h"
+#include "pyside_qtdeclarative_python.h"
+
+#ifndef PYSIDE_MAX_QML_TYPES
+// Maximum number of different types the user cna export to QML using qmlRegisterType.
+#define PYSIDE_MAX_QML_TYPES 50
+#endif
+
+// Forward declarations
+static void propListMetaCall(PySideProperty* pp, PyObject* self, QMetaObject::Call call, void** args);
+
+
+// All registered python types
+static PyObject* pyTypes[PYSIDE_MAX_QML_TYPES];
+static void (*createFuncs[PYSIDE_MAX_QML_TYPES])(void*);
+
+// Mutex used to avoid race condition on PySide::nextQObjectMemoryAddr
+static QMutex nextQmlElementMutex;
+
+template<int N>
+struct ElementFactoryBase
+{
+    static void createInto(void* memory)
+    {
+        QMutexLocker locker(&nextQmlElementMutex);
+        PySide::setNextQObjectMemoryAddr(memory);
+        Shiboken::GilState state;
+        PyObject* obj = PyObject_CallObject(pyTypes[N], 0);
+        if (!obj || PyErr_Occurred())
+            PyErr_Print();
+        PySide::setNextQObjectMemoryAddr(0);
+    }
+};
+
+template<int N>
+struct ElementFactory : ElementFactoryBase<N>
+{
+    static void init()
+    {
+        createFuncs[N] = &ElementFactoryBase<N>::createInto;
+        ElementFactory<N-1>::init();
+    }
+};
+
+template<>
+struct  ElementFactory<0> : ElementFactoryBase<0>
+{
+    static void init()
+    {
+        createFuncs[0] = &ElementFactoryBase<0>::createInto;
+    }
+};
+
+int PySide::qmlRegisterType(PyObject* pyObj, const char* uri, int versionMajor, int versionMinor, const char* qmlName)
+{
+    using namespace Shiboken;
+
+    static PyTypeObject* qobjectType = Shiboken::Conversions::getPythonTypeObject("QObject*");
+    static PyTypeObject* qdeclarativeType = Shiboken::Conversions::getPythonTypeObject("QDeclarativeItem*");
+    assert(qobjectType);
+    static int nextType = 0;
+
+    if (nextType >= PYSIDE_MAX_QML_TYPES) {
+        PyErr_Format(PyExc_TypeError, "QML doesn't really like language bindings, so you can only export %d types to QML.", PYSIDE_MAX_QML_TYPES);
+        return -1;
+    }
+
+    if (!PySequence_Contains(((PyTypeObject*)pyObj)->tp_mro, (PyObject*)qobjectType)) {
+        PyErr_Format(PyExc_TypeError, "A type inherited from %s expected, got %s.", qobjectType->tp_name, ((PyTypeObject*)pyObj)->tp_name);
+        return -1;
+    }
+
+    bool isDeclarativeType = PySequence_Contains(((PyTypeObject*)pyObj)->tp_mro, (PyObject*)qdeclarativeType);
+
+    QMetaObject* metaObject = reinterpret_cast<QMetaObject*>(ObjectType::getTypeUserData(reinterpret_cast<SbkObjectType*>(pyObj)));
+    Q_ASSERT(metaObject);
+
+    // Inc ref the type object, don't worry about dec ref them because there's no way to unregister a QML type
+    Py_INCREF(pyObj);
+
+    // All ready... now the ugly code begins... :-)
+    pyTypes[nextType] = pyObj;
+
+    // Init proxy object static meta object
+    QDeclarativePrivate::RegisterType type;
+    type.version = 0;
+    if (isDeclarativeType) {
+        type.typeId = qMetaTypeId<QDeclarativeItem*>();
+        type.listId = qMetaTypeId<QDeclarativeListProperty<QDeclarativeItem> >();
+
+        type.attachedPropertiesFunction = QDeclarativePrivate::attachedPropertiesFunc<QDeclarativeItem>();
+        type.attachedPropertiesMetaObject = QDeclarativePrivate::attachedPropertiesMetaObject<QDeclarativeItem>();
+
+        type.parserStatusCast = QDeclarativePrivate::StaticCastSelector<QDeclarativeItem, QDeclarativeParserStatus>::cast();
+        type.valueSourceCast = QDeclarativePrivate::StaticCastSelector<QDeclarativeItem, QDeclarativePropertyValueSource>::cast();
+        type.valueInterceptorCast = QDeclarativePrivate::StaticCastSelector<QDeclarativeItem, QDeclarativePropertyValueInterceptor>::cast();
+    } else {
+        type.typeId = qMetaTypeId<QObject*>();
+        type.listId = qMetaTypeId<QDeclarativeListProperty<QObject> >();
+        type.attachedPropertiesFunction = QDeclarativePrivate::attachedPropertiesFunc<QObject>();
+        type.attachedPropertiesMetaObject = QDeclarativePrivate::attachedPropertiesMetaObject<QObject>();
+
+        type.parserStatusCast = QDeclarativePrivate::StaticCastSelector<QObject, QDeclarativeParserStatus>::cast();
+        type.valueSourceCast = QDeclarativePrivate::StaticCastSelector<QObject, QDeclarativePropertyValueSource>::cast();
+        type.valueInterceptorCast = QDeclarativePrivate::StaticCastSelector<QObject, QDeclarativePropertyValueInterceptor>::cast();
+    }
+    type.objectSize = PySide::getSizeOfQObject(reinterpret_cast<SbkObjectType*>(pyObj));
+    type.create = createFuncs[nextType];
+    type.uri = uri;
+    type.versionMajor = versionMajor;
+    type.versionMinor = versionMinor;
+    type.elementName = qmlName;
+    type.metaObject = metaObject;
+
+    type.extensionObjectCreate = 0;
+    type.extensionMetaObject = 0;
+    type.customParser = 0;
+
+    int qmlTypeId = QDeclarativePrivate::qmlregister(QDeclarativePrivate::TypeRegistration, &type);
+    ++nextType;
+    return qmlTypeId;
+}
+
+extern "C"
+{
+
+// This is the user data we store in the property.
+struct DeclarativeListProperty
+{
+    PyTypeObject* type;
+    PyObject* append;
+    PyObject* at;
+    PyObject* clear;
+    PyObject* count;
+};
+
+static int propListTpInit(PyObject* self, PyObject* args, PyObject* kwds)
+{
+    static const char *kwlist[] = {"type", "append", "at", "clear", "count", 0};
+    PySideProperty* pySelf = reinterpret_cast<PySideProperty*>(self);
+    DeclarativeListProperty* data = new DeclarativeListProperty;
+    memset(data, 0, sizeof(DeclarativeListProperty));
+
+    if (!PyArg_ParseTupleAndKeywords(args, kwds,
+                                     "OO|OOO:QtDeclarative.ListProperty", (char**) kwlist,
+                                     &data->type,
+                                     &data->append,
+                                     &data->at,
+                                     &data->clear,
+                                     &data->count)) {
+        return 0;
+    }
+    PySide::Property::setMetaCallHandler(pySelf, &propListMetaCall);
+    PySide::Property::setTypeName(pySelf, "QDeclarativeListProperty<QDeclarativeItem>");
+    PySide::Property::setUserData(pySelf, data);
+
+    return 1;
+}
+
+void propListTpFree(void* self)
+{
+    PySideProperty* pySelf = reinterpret_cast<PySideProperty*>(self);
+    delete reinterpret_cast<DeclarativeListProperty*>(PySide::Property::userData(pySelf));
+    // calls base type constructor
+    Py_TYPE(pySelf)->tp_base->tp_free(self);
+}
+
+PyTypeObject PropertyListType = {
+    PyVarObject_HEAD_INIT(0, 0)
+    "ListProperty",            /*tp_name*/
+    sizeof(PySideProperty),    /*tp_basicsize*/
+    0,                         /*tp_itemsize*/
+    0,                         /*tp_dealloc*/
+    0,                         /*tp_print*/
+    0,                         /*tp_getattr*/
+    0,                         /*tp_setattr*/
+    0,                         /*tp_compare*/
+    0,                         /*tp_repr*/
+    0,                         /*tp_as_number*/
+    0,                         /*tp_as_sequence*/
+    0,                         /*tp_as_mapping*/
+    0,                         /*tp_hash */
+    0,                         /*tp_call*/
+    0,                         /*tp_str*/
+    0,                         /*tp_getattro*/
+    0,                         /*tp_setattro*/
+    0,                         /*tp_as_buffer*/
+    Py_TPFLAGS_DEFAULT,        /*tp_flags*/
+    0,                         /*tp_doc */
+    0,                         /*tp_traverse */
+    0,                         /*tp_clear */
+    0,                         /*tp_richcompare */
+    0,                         /*tp_weaklistoffset */
+    0,                         /*tp_iter */
+    0,                         /*tp_iternext */
+    0,                         /*tp_methods */
+    0,                         /*tp_members */
+    0,                         /*tp_getset */
+    &PySidePropertyType,       /*tp_base */
+    0,                         /*tp_dict */
+    0,                         /*tp_descr_get */
+    0,                         /*tp_descr_set */
+    0,                         /*tp_dictoffset */
+    propListTpInit,            /*tp_init */
+    0,                         /*tp_alloc */
+    0,                         /*tp_new */
+    propListTpFree,            /*tp_free */
+    0,                         /*tp_is_gc */
+    0,                         /*tp_bases */
+    0,                         /*tp_mro */
+    0,                         /*tp_cache */
+    0,                         /*tp_subclasses */
+    0,                         /*tp_weaklist */
+    0,                         /*tp_del */
+};
+
+} // extern "C"
+
+// Implementation of QDeclarativeListProperty<T>::AppendFunction callback
+void propListAppender(QDeclarativeListProperty<QDeclarativeItem>* propList, QDeclarativeItem* item)
+{
+    Shiboken::GilState state;
+
+    Shiboken::AutoDecRef args(PyTuple_New(2));
+    PyTuple_SET_ITEM(args, 0, Shiboken::Conversions::pointerToPython((SbkObjectType*)SbkPySide_QtCoreTypes[SBK_QOBJECT_IDX], propList->object));
+    PyTuple_SET_ITEM(args, 1, Shiboken::Conversions::pointerToPython((SbkObjectType*)SbkPySide_QtDeclarativeTypes[SBK_QDECLARATIVEITEM_IDX], item));
+
+    DeclarativeListProperty* data = reinterpret_cast<DeclarativeListProperty*>(propList->data);
+    Shiboken::AutoDecRef retVal(PyObject_CallObject(data->append, args));
+
+    if (PyErr_Occurred())
+        PyErr_Print();
+}
+
+// Implementation of QDeclarativeListProperty<T>::CountFunction callback
+int propListCount(QDeclarativeListProperty<QDeclarativeItem>* propList)
+{
+    Shiboken::GilState state;
+
+    Shiboken::AutoDecRef args(PyTuple_New(1));
+    PyTuple_SET_ITEM(args, 0, Shiboken::Conversions::pointerToPython((SbkObjectType*)SbkPySide_QtCoreTypes[SBK_QOBJECT_IDX], propList->object));
+
+    DeclarativeListProperty* data = reinterpret_cast<DeclarativeListProperty*>(propList->data);
+    Shiboken::AutoDecRef retVal(PyObject_CallObject(data->count, args));
+
+    // Check return type
+    int cppResult = 0;
+    PythonToCppFunc pythonToCpp;
+    if (PyErr_Occurred())
+        PyErr_Print();
+    else if ((pythonToCpp = Shiboken::Conversions::isPythonToCppConvertible(Shiboken::Conversions::PrimitiveTypeConverter<int>(), retVal)))
+        pythonToCpp(retVal, &cppResult);
+    return cppResult;
+}
+
+// Implementation of QDeclarativeListProperty<T>::AtFunction callback
+QDeclarativeItem* propListAt(QDeclarativeListProperty<QDeclarativeItem>* propList, int index)
+{
+    Shiboken::GilState state;
+
+    Shiboken::AutoDecRef args(PyTuple_New(2));
+    PyTuple_SET_ITEM(args, 0, Shiboken::Conversions::pointerToPython((SbkObjectType*)SbkPySide_QtCoreTypes[SBK_QOBJECT_IDX], propList->object));
+    PyTuple_SET_ITEM(args, 1, Shiboken::Conversions::copyToPython(Shiboken::Conversions::PrimitiveTypeConverter<int>(), &index));
+
+    DeclarativeListProperty* data = reinterpret_cast<DeclarativeListProperty*>(propList->data);
+    Shiboken::AutoDecRef retVal(PyObject_CallObject(data->at, args));
+
+    QDeclarativeItem* result = 0;
+    if (PyErr_Occurred())
+        PyErr_Print();
+    else if (PyType_IsSubtype(Py_TYPE(retVal), data->type))
+        Shiboken::Conversions::pythonToCppPointer((SbkObjectType*)SbkPySide_QtCoreTypes[SBK_QDECLARATIVEITEM_IDX], retVal, &result);
+    return result;
+}
+
+// Implementation of QDeclarativeListProperty<T>::ClearFunction callback
+void propListClear(QDeclarativeListProperty<QDeclarativeItem>* propList)
+{
+    Shiboken::GilState state;
+
+    Shiboken::AutoDecRef args(PyTuple_New(1));
+    PyTuple_SET_ITEM(args, 0, Shiboken::Conversions::pointerToPython((SbkObjectType*)SbkPySide_QtCoreTypes[SBK_QOBJECT_IDX], propList->object));
+
+    DeclarativeListProperty* data = reinterpret_cast<DeclarativeListProperty*>(propList->data);
+    Shiboken::AutoDecRef retVal(PyObject_CallObject(data->clear, args));
+
+    if (PyErr_Occurred())
+        PyErr_Print();
+}
+
+// qt_metacall specialization for ListProperties
+static void propListMetaCall(PySideProperty* pp, PyObject* self, QMetaObject::Call call, void** args)
+{
+    if (call != QMetaObject::ReadProperty)
+        return;
+
+    DeclarativeListProperty* data = reinterpret_cast<DeclarativeListProperty*>(PySide::Property::userData(pp));
+    QObject* qobj;
+    Shiboken::Conversions::pythonToCppPointer((SbkObjectType*)SbkPySide_QtCoreTypes[SBK_QOBJECT_IDX], self, &qobj);
+    QDeclarativeListProperty<QDeclarativeItem> declProp(qobj, data, &propListAppender);
+
+    if (data->count)
+        declProp.count = &propListCount;
+    if (data->at)
+        declProp.at = &propListAt;
+    if (data->clear)
+        declProp.clear = &propListClear;
+
+    // Copy the data to the memory location requested by the meta call
+    void* v = args[0];
+    *reinterpret_cast<QDeclarativeListProperty<QDeclarativeItem>*>(v) = declProp;
+}
+
+
+void PySide::initQmlSupport(PyObject* module)
+{
+    ElementFactory<PYSIDE_MAX_QML_TYPES - 1>::init();
+
+    // Export DeclarativeListProperty type
+    if (PyType_Ready(&PropertyListType) < 0)
+        return;
+
+    Py_INCREF((PyObject*)&PropertyListType);
+    PyModule_AddObject(module, PropertyListType.tp_name, (PyObject*)&PropertyListType);
+
+}
+
+
diff --git a/PySide/QtDeclarative/pysideqmlregistertype.h b/PySide/QtDeclarative/pysideqmlregistertype.h
new file mode 100644
index 0000000..aa25200
--- /dev/null
+++ b/PySide/QtDeclarative/pysideqmlregistertype.h
@@ -0,0 +1,57 @@
+/*
+ * This file is part of the Shiboken Python Bindings Generator project.
+ *
+ * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+ *
+ * Contact: PySide team <contact@pyside.org>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+#ifndef PYSIDEQMLREGISTERTYPE_H
+#define PYSIDEQMLREGISTERTYPE_H
+
+#include <Python.h>
+
+struct SbkObjectType;
+
+namespace PySide
+{
+
+extern void* nextQmlElementMemoryAddr;
+
+/**
+ * Init the QML support doign things like registering QtDeclarative.ListProperty and create the necessary stuff for
+ * qmlRegisterType.
+ *
+ * \param module QtDeclarative python module
+ */
+void initQmlSupport(PyObject* module);
+
+/**
+ * PySide implementation of qmlRegisterType<T> function.
+ *
+ * \param pyObj Python type to be registered.
+ * \param uri QML element uri.
+ * \param versionMajor QML component major version.
+ * \param versionMinor QML component minor version.
+ * \param qmlName QML element name
+ * \return the metatype id of the registered type.
+ */
+int qmlRegisterType(PyObject* pyObj, const char* uri, int versionMajor, int versionMinor, const char* qmlName);
+
+}
+
+#endif
diff --git a/PySide/QtDeclarative/typesystem_declarative.xml b/PySide/QtDeclarative/typesystem_declarative.xml
index 30786e2..1bc18ba 100644
--- a/PySide/QtDeclarative/typesystem_declarative.xml
+++ b/PySide/QtDeclarative/typesystem_declarative.xml
@@ -1,39 +1,169 @@
 <?xml version="1.0"?>
+<!--
+    This file is part of PySide project.
+    Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+    Contact: PySide team <contact@pyside.org>
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+-->
 <typesystem package="PySide.QtDeclarative">
     <load-typesystem name="typesystem_core.xml" generate="no"/>
     <load-typesystem name="typesystem_network.xml" generate="no"/>
     <load-typesystem name="typesystem_gui.xml" generate="no"/>
 
-    <object-type name="QDeclarativeComponent" />
-    <enum-type name="QDeclarativeComponent::Status" />
-    <object-type name="QDeclarativeContext" />
+    <add-function signature="qmlRegisterType(PyTypeObject, const char*, int, int, const char*)" return-type="int">
+        <inject-documentation format="target" mode="append">
+            This function registers the Python type in the QML system with the name qmlName, in the library imported from uri having the version number composed from versionMajor and versionMinor.
+            Returns the QML type id.
+
+            For example, this registers a Python class MySliderItem as a QML type named Slider for version 1.0 of a module called "com.mycompany.qmlcomponents":
+
+            ::
+
+                qmlRegisterType(MySliderItem, "com.mycompany.qmlcomponents", 1, 0, "Slider")
+
+            Once this is registered, the type can be used in QML by importing the specified module name and version number:
+
+            ::
+
+                import com.mycompany.qmlcomponents 1.0
+
+                Slider { ... }
+
+            Note that it's perfectly reasonable for a library to register types to older versions than the actual version of the library. Indeed, it is normal for the new library to allow QML written to previous versions to continue to work, even if more advanced versions of some of its types are available.
+        </inject-documentation>
+
+        <inject-code class="target">
+        int %0 = PySide::qmlRegisterType(%ARGUMENT_NAMES);
+        %PYARG_0 = %CONVERTTOPYTHON[int](%0);
+        </inject-code>
+    </add-function>
+
+    <enum-type identified-by-value="QML_HAS_ATTACHED_PROPERTIES" since="4.7">
+        <extra-includes>
+            <include file-name="QtDeclarative" location="global"/>
+            <!-- FIXME The include tag doesn't work on modules -->
+            <include file-name="pysideqmlregistertype.h" location="local"/>
+        </extra-includes>
+    </enum-type>
+
+    <inject-code class="target" position="end">
+    PySide::initQmlSupport(module);
+    </inject-code>
+
+    <object-type name="QDeclarativeExtensionInterface"/>
+    <object-type name="QDeclarativeComponent">
+        <enum-type name="Status"/>
+        <!-- This ctor isn't part of Qt public API -->
+        <modify-function signature="QDeclarativeComponent(QObject*)" remove="all" />
+    </object-type>
+    <object-type name="QDeclarativeContext">
+      <modify-function signature="setContextProperty(const QString &amp;, QObject*)">
+      <inject-code class="target" position="end">
+        QByteArray key("%FUNCTION_NAME_");
+        key.append(%1.toLocal8Bit());
+        Shiboken::Object::keepReference(reinterpret_cast&lt;SbkObject*&gt;(%PYSELF), key.constData(),  %PYARG_2);
+      </inject-code>
+      </modify-function>
+    </object-type>
+
     <object-type name="QDeclarativeEngine">
+        <enum-type name="ObjectOwnership" />
+        <modify-function signature="QDeclarativeEngine(QObject*)">
+            <modify-argument index="1">
+                <rename to="parent" /> <!-- Qt names this just p -->
+            </modify-argument>
+        </modify-function>
         <modify-function signature="setNetworkAccessManagerFactory(QDeclarativeNetworkAccessManagerFactory*)">
             <modify-argument index="1">
                 <parent index="this" action="add" />
             </modify-argument>
         </modify-function>
+        <modify-function signature="importPlugin(QString,QString,QString*)">
+            <modify-argument index="3">
+                <remove-argument/>
+            </modify-argument>
+            <modify-argument index="return">
+                <replace-type modified-type="(ok, errorString)" />
+            </modify-argument>
+            <inject-code class="target" position="beginning">
+            QString errorString;
+            %BEGIN_ALLOW_THREADS
+            %RETURN_TYPE ok_ = %CPPSELF.%FUNCTION_NAME(%1, %2, &amp;errorString);
+            %END_ALLOW_THREADS
+            %PYARG_0 = PyTuple_New(2);
+            PyTuple_SET_ITEM(%PYARG_0, 0, %CONVERTTOPYTHON[%RETURN_TYPE](ok_));
+            PyTuple_SET_ITEM(%PYARG_0, 1, %CONVERTTOPYTHON[QString](errorString));
+            </inject-code>
+        </modify-function>
     </object-type>
-    <enum-type name="QDeclarativeEngine::ObjectOwnership" />
     <value-type name="QDeclarativeError" />
-    <object-type name="QDeclarativeExpression" />
+    <object-type name="QDeclarativeExpression">
+        <modify-function signature="evaluate(bool*)">
+            <modify-argument index="1">
+                <remove-argument/>
+            </modify-argument>
+            <inject-code class="target" position="beginning">
+                <insert-template name="fix_bool*"/>
+            </inject-code>
+        </modify-function>
+    </object-type>
     <object-type name="QDeclarativeExtensionPlugin" />
-    <object-type name="QDeclarativeImageProvider" />
-    <object-type name="QDeclarativeItem" />
-    <enum-type name="QDeclarativeItem::TransformOrigin" />
+    <object-type name="QDeclarativeImageProvider">
+        <enum-type name="ImageType" />
+    </object-type>
+    <object-type name="QDeclarativeItem">
+        <extra-includes>
+            <include file-name="pysideqmlregistertype.h" location="local"/>
+        </extra-includes>
+        <enum-type name="TransformOrigin" />
+    </object-type>
 
     <value-type name="QDeclarativeListReference" />
-    <object-type name="QDeclarativeNetworkAccessManagerFactory" />
+    <object-type name="QDeclarativeNetworkAccessManagerFactory" >
+        <modify-function signature="create(QObject *)">
+          <modify-argument index="return">
+            <define-ownership class="target" owner="c++"/>
+          </modify-argument>
+        </modify-function>
+    </object-type>
     <object-type name="QDeclarativeParserStatus" />
 
-    <value-type name="QDeclarativeProperty" />
-    <enum-type name="QDeclarativeProperty::PropertyTypeCategory" />
-    <enum-type name="QDeclarativeProperty::Type" />
+    <value-type name="QDeclarativeProperty">
+        <enum-type name="PropertyTypeCategory" />
+        <enum-type name="Type" />
+    </value-type>
 
-    <object-type name="QDeclarativePropertyMap" />
+    <object-type name="QDeclarativePropertyMap">
+        <modify-documentation xpath="description/code[1]">&lt;code># create our data
+ownerData = QDeclarativePropertyMap()
+ownerData.insert(&quot;name&quot;, &quot;John Smith&quot;)
+ownerData.insert(&quot;phone&quot;, &quot;555-5555&quot;)
+
+# expose it to the UI layer
+view = QDeclarativeView()
+ctxt = view.rootContext()
+ctxt.setContextProperty(&quot;owner&quot;, ownerData)
+
+view.setSource(QUrl.fromLocalFile(&quot;main.qml&quot;))
+view.show()&lt;/code></modify-documentation>
+    </object-type>
     <object-type name="QDeclarativePropertyValueSource" />
     <value-type name="QDeclarativeScriptString" />
-    <object-type name="QDeclarativeView" />
-    <enum-type name="QDeclarativeView::ResizeMode" />
-    <enum-type name="QDeclarativeView::Status" />
+    <object-type name="QDeclarativeView">
+        <enum-type name="ResizeMode" />
+        <enum-type name="Status" />
+    </object-type>
 </typesystem>
diff --git a/PySide/QtGui/CMakeLists.txt b/PySide/QtGui/CMakeLists.txt
index e9f44d7..7625634 100644
--- a/PySide/QtGui/CMakeLists.txt
+++ b/PySide/QtGui/CMakeLists.txt
@@ -1,62 +1,22 @@
 project(QtGui)
 
-# Check QtGui support
-macro(CHECK_QT_GUI_MACRO macro_display_name qt_macro module_sources global_sources)
-    if (DEFINED PYSIDE_${qt_macro})
-        if (PYSIDE_${qt_macro})
-            list(APPEND ${global_sources} ${${module_sources}})
-        endif()
-    else()
-        set(SRC_FILE ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/test${qt_macro}.cxx)
-        file(WRITE ${SRC_FILE}
-        "#include <QtGui>\n"
-        "int main() { \n"
-        "#ifdef ${qt_macro}\n"
-        "#error not supported.\n"
-        "#endif\n"
-        "}\n")
-
-        try_compile(Q_WORKS ${CMAKE_BINARY_DIR}
-                    ${SRC_FILE}
-                    CMAKE_FLAGS
-                    -DINCLUDE_DIRECTORIES:STRING=${QT_QTGUI_INCLUDE_DIR}\;${QT_INCLUDE_DIR}
-                    -DLINK_LIBRARIES:PATH=${QT_QTGUI_LIBRARY_RELEASE}
-                    OUTPUT_VARIABLE OUTPUT)
-
-        set("PYSIDE_${qt_macro}" ${Q_WORKS} CACHE STRING "Has this Qt module been found by pyside?")
-        if(Q_WORKS)
-            message(STATUS "Testing support to ${macro_display_name} -- enabled")
-            list(APPEND ${global_sources} ${${module_sources}})
-        else()
-            message(STATUS "Testing support to ${macro_display_name} -- disabled")
-        endif()
-    endif()
-endmacro(CHECK_QT_GUI_MACRO)
-
 if(ENABLE_X11)
-    set(MODULE_NAME "x11")
     set(SPECIFIC_OS_FILES
         ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtGui/qx11info_wrapper.cpp
-       )
+        ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtGui/qx11embedcontainer_wrapper.cpp
+        ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtGui/qx11embedwidget_wrapper.cpp
+    )
 
     if(Q_WS_MAEMO_5)
-        set(AUTO_OS "MAEMO 5")
-        set(MODULE_NAME "maemo")
         set(SPECIFIC_OS_FILES
             ${SPECIFIC_OS_FILES}
             ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtGui/qabstractkineticscroller_wrapper.cpp
         )
-    endif(Q_WS_MAEMO_5)
-
-elseif(ENABLE_MAC)
-    set(MODULE_NAME "mac")
-    set(SPECIFIC_OS_FILES
-       )
-endif(ENABLE_X11)
-
+    endif()
+endif()
 
 if (${QT_VERSION_MAJOR} EQUAL 4 AND ${QT_VERSION_MINOR} LESS 6)
-    set (QtGui_46_SRC )
+    set(QtGui_46_SRC "")
 else()
     set(QtGui_46_SRC
     ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtGui/qmatrix2x2_wrapper.cpp
@@ -69,6 +29,7 @@ else()
     ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtGui/qmatrix4x3_wrapper.cpp
     ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtGui/qmatrix4x4_wrapper.cpp
     ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtGui/qgesture_wrapper.cpp
+    ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtGui/qgestureevent_wrapper.cpp
     ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtGui/qgesturerecognizer_wrapper.cpp
     ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtGui/qgraphicsanchor_wrapper.cpp
     ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtGui/qgraphicsanchorlayout_wrapper.cpp
@@ -87,6 +48,8 @@ else()
     ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtGui/qpinchgesture_wrapper.cpp
     ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtGui/qquaternion_wrapper.cpp
     ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtGui/qswipegesture_wrapper.cpp
+    ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtGui/qtapandholdgesture_wrapper.cpp
+    ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtGui/qtapgesture_wrapper.cpp
     ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtGui/qtilerules_wrapper.cpp
     ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtGui/qtouchevent_wrapper.cpp
     ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtGui/qtouchevent_touchpoint_wrapper.cpp
@@ -94,7 +57,34 @@ else()
     ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtGui/qvector3d_wrapper.cpp
     ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtGui/qvector4d_wrapper.cpp
     )
-endif (${QT_VERSION_MAJOR} EQUAL 4 AND ${QT_VERSION_MINOR} LESS 6)
+endif ()
+
+if (${QT_VERSION_MAJOR} EQUAL 4 AND ${QT_VERSION_MINOR} LESS 7)
+    set(QtGui_47_SRC "")
+else()
+    set(QtGui_47_SRC
+    ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtGui/qpainter_pixmapfragment_wrapper.cpp
+    )
+endif()
+
+set(QtGui_OPTIONAL_SRC )
+set(QtGui_DROPPED_ENTRIES )
+check_qt_class(QtGui QAbstractPageSetupDialog   QtGui_OPTIONAL_SRC QtGui_DROPPED_ENTRIES)
+check_qt_class(QtGui QAbstractPrintDialog       QtGui_OPTIONAL_SRC QtGui_DROPPED_ENTRIES)
+check_qt_class(QtGui QGtkStyle                  QtGui_OPTIONAL_SRC QtGui_DROPPED_ENTRIES)
+check_qt_class(QtGui QPageSetupDialog           QtGui_OPTIONAL_SRC QtGui_DROPPED_ENTRIES)
+check_qt_class(QtGui QPrintDialog               QtGui_OPTIONAL_SRC QtGui_DROPPED_ENTRIES)
+check_qt_class(QtGui QPrintEngine               QtGui_OPTIONAL_SRC QtGui_DROPPED_ENTRIES)
+check_qt_class(QtGui QPrintPreviewDialog        QtGui_OPTIONAL_SRC QtGui_DROPPED_ENTRIES)
+check_qt_class(QtGui QPrintPreviewWidget        QtGui_OPTIONAL_SRC QtGui_DROPPED_ENTRIES)
+check_qt_class(QtGui QPrinter                   QtGui_OPTIONAL_SRC QtGui_DROPPED_ENTRIES)
+check_qt_class(QtGui QPrinterInfo               QtGui_OPTIONAL_SRC QtGui_DROPPED_ENTRIES)
+check_qt_class(QtGui QSessionManager            QtGui_OPTIONAL_SRC QtGui_DROPPED_ENTRIES)
+check_qt_class(QtGui QSizeGrip                  QtGui_OPTIONAL_SRC QtGui_DROPPED_ENTRIES)
+check_qt_class(QtGui QSystemTrayIcon            QtGui_OPTIONAL_SRC QtGui_DROPPED_ENTRIES)
+check_qt_class(QtGui QMacStyle                  QtGui_OPTIONAL_SRC QtGui_DROPPED_ENTRIES)
+
+qt4_wrap_cpp(QPYTEXTOBJECT_MOC "${pyside_SOURCE_DIR}/qpytextobject.h")
 
 set(QtGui_SRC
 ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtGui/qabstractbutton_wrapper.cpp
@@ -259,6 +249,7 @@ ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtGui/qpen_wrapper.cpp
 ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtGui/qpictureio_wrapper.cpp
 ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtGui/qpicture_wrapper.cpp
 ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtGui/qpixmapcache_wrapper.cpp
+${CMAKE_CURRENT_BINARY_DIR}/PySide/QtGui/qpixmapcache_key_wrapper.cpp
 ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtGui/qpixmap_wrapper.cpp
 ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtGui/qplaintextdocumentlayout_wrapper.cpp
 ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtGui/qplaintextedit_wrapper.cpp
@@ -268,6 +259,7 @@ ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtGui/qpolygon_wrapper.cpp
 ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtGui/qprogressbar_wrapper.cpp
 ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtGui/qprogressdialog_wrapper.cpp
 ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtGui/qproxymodel_wrapper.cpp
+${CMAKE_CURRENT_BINARY_DIR}/PySide/QtGui/qpytextobject_wrapper.cpp
 ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtGui/qpushbutton_wrapper.cpp
 ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtGui/qradialgradient_wrapper.cpp
 ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtGui/qradiobutton_wrapper.cpp
@@ -411,86 +403,38 @@ ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtGui/qwizard_wrapper.cpp
 ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtGui/qworkspace_wrapper.cpp
 
 ${SPECIFIC_OS_FILES}
+${QPYTEXTOBJECT_MOC}
 ${QtGui_46_SRC}
+${QtGui_47_SRC}
+${QtGui_OPTIONAL_SRC}
 )
 
-#Check GtkStyle
-set(QT_GTKSTYLE_SRCS
-    ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtGui/qgtkstyle_wrapper.cpp
-)
-CHECK_QT_GUI_MACRO("GtkStyle" QT_NO_STYLE_GTK QT_GTKSTYLE_SRCS QtGui_SRC)
-
-#Check SystemTray
-set(QT_SYSTEMTRAY_SRCS
-    ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtGui/qsystemtrayicon_wrapper.cpp
-)
-CHECK_QT_GUI_MACRO("SystemTray" QT_NO_SYSTEMTRAYICON QT_SYSTEMTRAY_SRCS QtGui_SRC)
-
-#Check QT_PRINTDIALOG support
-set(QT_PRINTDIALOG_SRCS
-    ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtGui/qabstractpagesetupdialog_wrapper.cpp
-    ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtGui/qabstractprintdialog_wrapper.cpp
-    ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtGui/qpagesetupdialog_wrapper.cpp
-    ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtGui/qprintdialog_wrapper.cpp
-)
-CHECK_QT_GUI_MACRO("PrintDialog Support" QT_NO_PRINTDIALOG QT_PRINTDIALOG_SRCS QtGui_SRC)
-
-#Check QT_PRITPREVIEW support
-set(QT_PRINTPREVIEW_SRCS
-    ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtGui/qprintpreviewwidget_wrapper.cpp
-)
-CHECK_QT_GUI_MACRO("PrintPreview Support" QT_NO_PRINTPREVIEWWIDGET QT_PRINTPREVIEW_SRCS QtGui_SRC)
-
-#Check QT_PRINTPREVIEWDIALOG support
-set(QT_PRINTPREVIEWDIALOG_SRCS
-    ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtGui/qprintpreviewdialog_wrapper.cpp
-)
-CHECK_QT_GUI_MACRO("PrintPreviewDialog Support" QT_NO_PRINTPREVIEWDIALOG QT_PRINTPREVIEWDIALOG_SRCS QtGui_SRC)
-
-#Check QT_PRINTER
-set(QT_PRINTER_SRCS
-    ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtGui/qprinter_wrapper.cpp
-    ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtGui/qprinterinfo_wrapper.cpp
-    ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtGui/qprintengine_wrapper.cpp
-)
-CHECK_QT_GUI_MACRO("Printer Support" QT_NO_PRINTER QT_PRINTER_SRCS QtGui_SRC)
-
-#Check QT_SIZEGRIP support
-set(QT_SIZEGRIP_SRCS
-    ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtGui/qsizegrip_wrapper.cpp
-)
-CHECK_QT_GUI_MACRO("SizeGrip Support" QT_NO_SIZEGRIP QT_SIZEGRIP_SRCS QtGui_SRC)
-
-#Check QT_SESSIONMANAGER support
-set(QT_SESSIONMANAGER_SRCS
-    ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtGui/qsessionmanager_wrapper.cpp
-)
-CHECK_QT_GUI_MACRO("SessionManager Support" QT_NO_SESSIONMANAGER QT_SESSIONMANAGER_SRCS QtGui_SRC)
-
-configure_file(typesystem_gui.xml.in
+configure_file("${CMAKE_CURRENT_SOURCE_DIR}/typesystem_gui.xml.in"
                "${CMAKE_CURRENT_BINARY_DIR}/typesystem_gui.xml" @ONLY)
 
-execute_generator(gui QtGui_SRC "${CMAKE_CURRENT_BINARY_DIR}:${QtCore_SOURCE_DIR}:${QtCore_BINARY_DIR}")
+set(QtGui_typesystem_path "${QtCore_SOURCE_DIR}${PATH_SEP}${QtCore_BINARY_DIR}${PATH_SEP}${QtGui_SOURCE_DIR}")
 
-include_directories(${CMAKE_CURRENT_SOURCE_DIR}
-                    ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtGui/
-                    ${QT_INCLUDE_DIR}
-                    ${SHIBOKEN_INCLUDE_DIR}
-                    ${libpyside_SOURCE_DIR}
-                    ${PYTHON_INCLUDE_PATH}
-                    ${QtCore_BINARY_DIR}/PySide/QtCore/
-                    )
-add_library(QtGui MODULE ${QtGui_SRC})
-set_property(TARGET QtGui PROPERTY PREFIX "")
-target_link_libraries(QtGui
-                      pyside
-                      ${PYTHON_LIBRARIES}
+set(QtGui_include_dirs  ${CMAKE_CURRENT_SOURCE_DIR}
+                        ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtGui/
+                        ${pyside_SOURCE_DIR}
+                        ${QT_INCLUDE_DIR}
+                        ${SHIBOKEN_INCLUDE_DIR}
+                        ${libpyside_SOURCE_DIR}
+                        ${SHIBOKEN_PYTHON_INCLUDE_DIR}
+                        ${QtCore_BINARY_DIR}/PySide/QtCore/)
+set(QtGui_libraries   pyside
+                      ${SHIBOKEN_PYTHON_LIBRARIES}
                       ${SHIBOKEN_LIBRARY}
-                      ${QT_QTGUI_LIBRARY}
-                      )
-add_dependencies(QtGui QtCore)
+                      ${QT_QTGUI_LIBRARY})
+set(QtGui_deps "QtCore")
 
-# install
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/QtGui${CMAKE_DEBUG_POSTFIX}.so DESTINATION "${SITE_PACKAGE}/PySide")
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtGui/pyside_qtgui_python.h
-        DESTINATION include/PySide/QtGui/)
+create_pyside_module(QtGui
+                     QtGui_include_dirs
+                     QtGui_libraries
+                     QtGui_deps
+                     QtGui_typesystem_path
+                     QtGui_SRC
+                     ""
+                     ${CMAKE_CURRENT_BINARY_DIR}/typesystem_gui.xml)
+
+install(FILES ${pyside_SOURCE_DIR}/qpytextobject.h DESTINATION include/PySide/QtGui/)
diff --git a/PySide/QtGui/glue/qapplication_init.cpp b/PySide/QtGui/glue/qapplication_init.cpp
index 112b8e0..f2e972a 100644
--- a/PySide/QtGui/glue/qapplication_init.cpp
+++ b/PySide/QtGui/glue/qapplication_init.cpp
@@ -3,54 +3,48 @@ extern PyObject* moduleQtGui;
 
 static int QApplicationArgCount;
 static char** QApplicationArgValues;
+static const char QAPP_MACRO[] = "qApp";
 
-void DeleteQApplicationAtExit() {
-    if (QApplication::instance()) {
-        //disconnect and decref all widgets used on signals before destroy qApp
-        PySide::SignalManager::instance().clear();
-        delete QApplication::instance();
-        for (int i = 0; i < QApplicationArgCount; ++i)
-            delete[] QApplicationArgValues[i];
-    }
-}
-
-int SbkQApplication_Init(PyObject* self, PyObject* args, PyObject*)
+bool QApplicationConstructorStart(PyObject* argv)
 {
     if (QApplication::instance()) {
         PyErr_SetString(PyExc_RuntimeError, "A QApplication instance already exists.");
-        return -1;
+        return false;
     }
 
-    int numArgs = PyTuple_GET_SIZE(args);
-    if (numArgs != 1) {
-        PyErr_BadArgument();
-        return -1;
-    }
-
-    if (!PySequenceToArgcArgv(PyTuple_GET_ITEM(args, 0), &QApplicationArgCount, &QApplicationArgValues, "PySideApp")) {
-        PyErr_BadArgument();
-        return -1;
-    }
-
-    void* cptr = new QApplication(QApplicationArgCount, QApplicationArgValues);
-    Shiboken::setCppPointer(reinterpret_cast<SbkBaseWrapper*>(self),
-                            Shiboken::SbkType<QApplication>(),
-                            cptr);
-    SbkBaseWrapper_setValidCppObject(self, 1);
-    Shiboken::BindingManager::instance().registerWrapper(reinterpret_cast<SbkBaseWrapper*>(self), cptr);
-
-    // Verify if qApp is in main module
-    const char QAPP_MACRO[] = "qApp";
-    PyObject* localsDict = PyEval_GetLocals();
-    if (localsDict) {
-        PyObject* qAppObj = PyDict_GetItemString(localsDict, QAPP_MACRO);
-        if (qAppObj)
-            PyDict_SetItemString(localsDict, QAPP_MACRO, self);
-    }
-    PyObject_SetAttrString(moduleQtGui, QAPP_MACRO, self);
-
-    Py_INCREF(self);
-    Py_AtExit(DeleteQApplicationAtExit);
-
-    return 1;
+    return Shiboken::sequenceToArgcArgv(argv, &QApplicationArgCount, &QApplicationArgValues, "PySideApp");
+}
+
+void QApplicationConstructorEnd(PyObject* self)
+{
+    // Verify if qApp is in main module
+    PyObject* globalsDict = PyEval_GetGlobals();
+    if (globalsDict) {
+        PyObject* qAppObj = PyDict_GetItemString(globalsDict, QAPP_MACRO);
+        if (qAppObj)
+            PyDict_SetItemString(globalsDict, QAPP_MACRO, self);
+    }
+
+    PyObject_SetAttrString(moduleQtGui, QAPP_MACRO, self);
+    PySide::registerCleanupFunction(&PySide::destroyQCoreApplication);
+    Py_INCREF(self);
+}
+
+static void QApplicationConstructor(PyObject* self, PyObject* argv, QApplicationWrapper** cptr)
+{
+    if (QApplicationConstructorStart(argv)) {
+        *cptr = new QApplicationWrapper(QApplicationArgCount, QApplicationArgValues);
+        Shiboken::Object::releaseOwnership(reinterpret_cast<SbkObject*>(self));
+        QApplicationConstructorEnd(self);
+    }
+}
+
+template <typename T>
+static void QApplicationConstructor(PyObject* self, PyObject* argv, T extraArg, QApplicationWrapper** cptr)
+{
+    if (QApplicationConstructorStart(argv)) {
+        *cptr = new QApplicationWrapper(QApplicationArgCount, QApplicationArgValues, extraArg);
+        Shiboken::Object::releaseOwnership(reinterpret_cast<SbkObject*>(self));
+        QApplicationConstructorEnd(self);
+    }
 }
diff --git a/PySide/QtGui/glue/qlayout_help_functions.cpp b/PySide/QtGui/glue/qlayout_help_functions.cpp
new file mode 100644
index 0000000..b366061
--- /dev/null
+++ b/PySide/QtGui/glue/qlayout_help_functions.cpp
@@ -0,0 +1,122 @@
+void addLayoutOwnership(QLayout* layout, QLayoutItem* item);
+void removeLayoutOwnership(QLayout* layout, QWidget* widget);
+
+inline QByteArray retrieveObjectName(PyObject* obj)
+{
+    Shiboken::AutoDecRef objName(PyObject_Str(obj));
+    return Shiboken::String::toCString(objName);
+}
+
+inline void addLayoutOwnership(QLayout* layout, QWidget* widget)
+{
+    //transfer ownership to parent widget
+    QWidget *lw = layout->parentWidget();
+    QWidget *pw = widget->parentWidget();
+
+   Shiboken::AutoDecRef pyChild(%CONVERTTOPYTHON[QWidget*](widget));
+
+    //Transfer parent to layout widget
+    if (pw && lw && pw != lw)
+        Shiboken::Object::setParent(0, pyChild);
+
+    if (!lw && !pw) {
+        //keep the reference while the layout is orphan
+        Shiboken::AutoDecRef pyParent(%CONVERTTOPYTHON[QWidget*](layout));
+        Shiboken::Object::keepReference(reinterpret_cast<SbkObject*>(pyParent.object()), retrieveObjectName(pyParent).data(), pyChild, true);
+    } else {
+        if (!lw)
+            lw = pw;
+        Shiboken::AutoDecRef pyParent(%CONVERTTOPYTHON[QWidget*](lw));
+        Shiboken::Object::setParent(pyParent, pyChild);
+    }
+}
+
+inline void addLayoutOwnership(QLayout* layout, QLayout* other)
+{
+    //transfer all children widgets from other to layout parent widget
+    QWidget* parent = layout->parentWidget();
+    if (!parent) {
+        //keep the reference while the layout is orphan
+        Shiboken::AutoDecRef pyParent(%CONVERTTOPYTHON[QLayout*](layout));
+        Shiboken::AutoDecRef pyChild(%CONVERTTOPYTHON[QLayout*](other));
+        Shiboken::Object::keepReference(reinterpret_cast<SbkObject*>(pyParent.object()), retrieveObjectName(pyParent).data(), pyChild, true);
+        return;
+    }
+
+    for (int i=0, i_max=other->count(); i < i_max; i++) {
+        QLayoutItem* item = other->itemAt(i);
+        if (PyErr_Occurred() || !item)
+            return;
+        addLayoutOwnership(layout, item);
+    }
+
+    Shiboken::AutoDecRef pyParent(%CONVERTTOPYTHON[QLayout*](layout));
+    Shiboken::AutoDecRef pyChild(%CONVERTTOPYTHON[QLayout*](other));
+    Shiboken::Object::setParent(pyParent, pyChild);
+}
+
+inline void addLayoutOwnership(QLayout* layout, QLayoutItem* item)
+{
+    if (!item)
+        return;
+
+    QWidget* w = item->widget();
+    if (w)
+        addLayoutOwnership(layout, w);
+    else {
+        QLayout* l = item->layout();
+        if (l)
+            addLayoutOwnership(layout, l);
+    }
+
+    Shiboken::AutoDecRef pyParent(%CONVERTTOPYTHON[QLayout*](layout));
+    Shiboken::AutoDecRef pyChild(%CONVERTTOPYTHON[QLayoutItem*](item));
+    Shiboken::Object::setParent(pyParent, pyChild);
+}
+
+static void removeWidgetFromLayout(QLayout* layout, QWidget* widget)
+{
+    QWidget* parent = widget->parentWidget();
+
+    if (!parent) {
+        //remove reference on layout
+        Shiboken::AutoDecRef pyParent(%CONVERTTOPYTHON[QWidget*](layout));
+        Shiboken::AutoDecRef pyChild(%CONVERTTOPYTHON[QWidget*](widget));
+        Shiboken::Object::removeReference(reinterpret_cast<SbkObject*>(pyParent.object()), retrieveObjectName(pyParent).data(), pyChild);
+    } else {
+        //give the ownership to parent
+        Shiboken::AutoDecRef pyParent(%CONVERTTOPYTHON[QWidget*](parent));
+        Shiboken::AutoDecRef pyChild(%CONVERTTOPYTHON[QWidget*](widget));
+        Shiboken::Object::setParent(pyParent, pyChild);
+    }
+}
+
+inline void removeLayoutOwnership(QLayout* layout, QLayoutItem* item)
+{
+    QWidget* w = item->widget();
+    if (w)
+        removeWidgetFromLayout(layout, w);
+    else {
+        QLayout* l = item->layout();
+        if (l)
+            removeLayoutOwnership(layout, l);
+    }
+
+    Shiboken::AutoDecRef pyChild(%CONVERTTOPYTHON[QLayoutItem*](item));
+    Shiboken::Object::invalidate(pyChild);
+    Shiboken::Object::setParent(0, pyChild);
+}
+
+inline void removeLayoutOwnership(QLayout* layout, QWidget* widget)
+{
+    if (!widget)
+        return;
+
+    for (int i=0, i_max=layout->count(); i < i_max; i++) {
+        QLayoutItem* item = layout->itemAt(i);
+        if (PyErr_Occurred() || !item)
+            return;
+        if (item->widget() == widget)
+            removeLayoutOwnership(layout, item);
+    }
+}
diff --git a/PySide/QtGui/glue/qlayout_help_functions.h b/PySide/QtGui/glue/qlayout_help_functions.h
deleted file mode 100644
index 186e0ec..0000000
--- a/PySide/QtGui/glue/qlayout_help_functions.h
+++ /dev/null
@@ -1,51 +0,0 @@
-#ifndef QLAYOUT_HELP_FUNCTIONS
-#define QLAYOUT_HELP_FUNCTIONS
-
-void addLayoutOwnership(QLayout *layout, QLayoutItem *item);
-
-inline void addLayoutOwnership(QLayout *layout, QWidget *widget)
-{
-    //transfer ownership to parent widget
-    QWidget *parent = layout->parentWidget();
-    if (!parent)
-        return;
-
-    Shiboken::AutoDecRef pyParent(Shiboken::Converter<QWidget*>::toPython(parent));
-    Shiboken::AutoDecRef pyChild(Shiboken::Converter<QWidget*>::toPython(widget));
-    Shiboken::setParent(pyParent, pyChild);
-}
-
-inline void addLayoutOwnership(QLayout *layout, QLayout *other)
-{
-    //transfer all children widgetes from other to layout parent widget
-    QWidget *parent = layout->parentWidget();
-    if (!parent)
-        return;
-
-    for (int i=0, i_max=layout->count(); i < i_max; i++) {
-        addLayoutOwnership(layout, layout->itemAt(i));
-    }
-
-    Shiboken::AutoDecRef pyParent(Shiboken::Converter<QLayout*>::toPython(layout));
-    Shiboken::AutoDecRef pyChild(Shiboken::Converter<QLayout*>::toPython(other));
-    Shiboken::setParent(pyParent, pyChild);
-
-}
-
-inline void addLayoutOwnership(QLayout *layout, QLayoutItem *item)
-{
-    QWidget *w = item->widget();
-    if (w)
-        addLayoutOwnership(layout, w);
-    else {
-        QLayout *l = item->layout();
-        if (l)
-            addLayoutOwnership(layout, l);
-    }
-
-    Shiboken::AutoDecRef pyParent(Shiboken::Converter<QLayout*>::toPython(layout));
-    Shiboken::AutoDecRef pyChild(Shiboken::Converter<QLayoutItem*>::toPython(item));
-    Shiboken::setParent(pyParent, pyChild);
-}
-
-#endif
diff --git a/PySide/QtGui/glue/qmenu_glue.cpp b/PySide/QtGui/glue/qmenu_glue.cpp
new file mode 100644
index 0000000..0636dfa
--- /dev/null
+++ b/PySide/QtGui/glue/qmenu_glue.cpp
@@ -0,0 +1,21 @@
+inline PyObject* addActionWithPyObject(QMenu* self, const QIcon& icon, const QString& text, PyObject* callback, const QKeySequence& shortcut)
+{
+    QAction* act = new QAction(text, self);
+
+    if (!icon.isNull())
+        act->setIcon(icon);
+
+    if (!shortcut.isEmpty())
+        act->setShortcut(shortcut);
+
+    self->addAction(act);
+
+    PyObject* pyAct = %CONVERTTOPYTHON[QAction*](act);
+    Shiboken::AutoDecRef result(PyObject_CallMethod(pyAct, "connect", "OsO", pyAct, SIGNAL(triggered()), callback));
+    if (result.isNull()) {
+        Py_DECREF(pyAct);
+        return 0;
+    }
+
+    return pyAct;
+}
diff --git a/PySide/QtGui/glue/qmenu_glue.h b/PySide/QtGui/glue/qmenu_glue.h
deleted file mode 100644
index 7f0475a..0000000
--- a/PySide/QtGui/glue/qmenu_glue.h
+++ /dev/null
@@ -1,23 +0,0 @@
-
-inline PyObject*
-addActionWithPyObject(QMenu *self, const QIcon& icon, const QString& text, PyObject *callback, const QKeySequence &shortcut)
-{
-    QAction *act = new QAction(text, self);
-
-    if (!icon.isNull())
-        act->setIcon(icon);
-
-    if (!shortcut.isEmpty())
-        act->setShortcut(shortcut);
-
-    self->addAction(act);
-
-    PyObject *pyAct = Shiboken::Converter<QAction*>::toPython(act);
-    PyObject* result = PyObject_CallMethod(pyAct, "connect", "OsO", pyAct, SIGNAL(triggered()), callback);
-    if (result == 0) {
-        Py_DECREF(pyAct);
-        return 0;
-    }
-
-    return pyAct;
-}
diff --git a/PySide/QtGui/glue/qmenubar_glue.h b/PySide/QtGui/glue/qmenubar_glue.cpp
similarity index 87%
rename from PySide/QtGui/glue/qmenubar_glue.h
rename to PySide/QtGui/glue/qmenubar_glue.cpp
index 9568fa8..2326a76 100644
--- a/PySide/QtGui/glue/qmenubar_glue.h
+++ b/PySide/QtGui/glue/qmenubar_glue.cpp
@@ -5,7 +5,7 @@ addActionWithPyObject(QMenuBar* self, const QString& text, PyObject* callback)
 
     self->addAction(act);
 
-    PyObject* pyAct = Shiboken::Converter<QAction*>::toPython(act);
+    PyObject* pyAct = %CONVERTTOPYTHON[QAction*](act);
     PyObject* result = PyObject_CallMethod(pyAct, "connect", "OsO", pyAct,
                                            SIGNAL(triggered(bool)), callback);
 
diff --git a/PySide/QtGui/glue/qtgui_qapp.cpp b/PySide/QtGui/glue/qtgui_qapp.cpp
index f893f8e..5148b57 100644
--- a/PySide/QtGui/glue/qtgui_qapp.cpp
+++ b/PySide/QtGui/glue/qtgui_qapp.cpp
@@ -1,4 +1,10 @@
 // Init qApp macro to None.
-Py_INCREF(Py_None);
-PyModule_AddObject(module, "qApp", Py_None);
+if (qApp) {
+    PyObject* pyApp = %CONVERTTOPYTHON[QApplication*](qApp);
+    Py_INCREF(pyApp);
+    PyModule_AddObject(module, "qApp", pyApp);
+} else {
+    Py_INCREF(Py_None);
+    PyModule_AddObject(module, "qApp", Py_None);
+}
 moduleQtGui = module;
diff --git a/PySide/QtGui/glue/qwidget_glue.cpp b/PySide/QtGui/glue/qwidget_glue.cpp
new file mode 100644
index 0000000..cfa3f67
--- /dev/null
+++ b/PySide/QtGui/glue/qwidget_glue.cpp
@@ -0,0 +1,65 @@
+static QString retrieveObjectName(PyObject *obj)
+{
+    Shiboken::AutoDecRef objName(PyObject_Str(obj));
+    return QString(Shiboken::String::toCString(objName));
+}
+
+
+/**
+ * Tranfer objects ownership from layout to widget
+ **/
+static inline void qwidgetReparentLayout(QWidget *parent, QLayout *layout)
+{
+    Shiboken::AutoDecRef pyParent(%CONVERTTOPYTHON[QWidget*](parent));
+
+    for (int i=0; i < layout->count(); i++) {
+        QLayoutItem* item = layout->itemAt(i);
+        if (PyErr_Occurred() || !item)
+            return;
+
+        QWidget* w = item->widget();
+        if (w) {
+            QWidget* pw = w->parentWidget();
+            if (pw != parent) {
+                Shiboken::AutoDecRef pyChild(%CONVERTTOPYTHON[QWidget*](w));
+                Shiboken::Object::setParent(pyParent, pyChild);
+            }
+        } else {
+            QLayout* l = item->layout();
+            if (l)
+                qwidgetReparentLayout(parent, l);
+        }
+    }
+
+    Shiboken::AutoDecRef pyChild(%CONVERTTOPYTHON[QLayout*](layout));
+    Shiboken::Object::setParent(pyParent, pyChild);
+    //remove previous references
+    Shiboken::Object::keepReference(reinterpret_cast<SbkObject*>(pyChild.object()), qPrintable(retrieveObjectName(pyChild)), Py_None);
+}
+
+static inline void qwidgetSetLayout(QWidget *self, QLayout *layout)
+{
+    if (!layout || self->layout())
+        return;
+
+    QObject* oldParent = layout->parent();
+    if (oldParent && oldParent != self) {
+        if (oldParent->isWidgetType()) {
+            // remove old parent policy
+            Shiboken::AutoDecRef pyLayout(%CONVERTTOPYTHON[QLayout*](layout));
+            Shiboken::Object::setParent(Py_None, pyLayout);
+        } else {
+            PyErr_Format(PyExc_RuntimeError, "QWidget::setLayout: Attempting to set QLayout \"%s\" on %s \"%s\", when the QLayout already has a parent",
+                          qPrintable(layout->objectName()), self->metaObject()->className(), qPrintable(self->objectName()));
+            return;
+        }
+    }
+
+    if (oldParent != self) {
+        qwidgetReparentLayout(self, layout);
+        if (PyErr_Occurred())
+            return;
+
+        self->setLayout(layout);
+    }
+}
diff --git a/PySide/QtGui/glue/qwidget_glue.h b/PySide/QtGui/glue/qwidget_glue.h
deleted file mode 100644
index a6cd3b7..0000000
--- a/PySide/QtGui/glue/qwidget_glue.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/**
- * Tranfer objects ownership from layout to widget
- **/
-static inline void
-qwidgetReparentLayout(QWidget *parent, QLayout *layout)
-{
-    Shiboken::AutoDecRef pyParent(Shiboken::Converter<QWidget*>::toPython(parent));
-
-    for (int i=0; i < layout->count(); i++)
-    {
-        QLayoutItem *item = layout->itemAt(i);
-        QWidget *w = item->widget();
-
-        if (w)
-        {
-            Shiboken::AutoDecRef pyChild(Shiboken::Converter<QWidget*>::toPython(w));
-            Shiboken::setParent(pyParent, pyChild);
-        }
-        else
-        {
-            QLayout *l = item->layout();
-            if (l)
-                qwidgetReparentLayout(parent, l);
-        }
-    }
-
-    Shiboken::AutoDecRef pyChild(Shiboken::Converter<QLayout*>::toPython(layout));
-    Shiboken::setParent(pyParent, pyChild);
-}
-
-static inline void
-qwidgetSetLayout(QWidget *self, QLayout *layout)
-{
-    if (self->layout())
-        return;
-
-    qwidgetReparentLayout(self, layout);
-    self->setLayout(layout);
-}
diff --git a/PySide/QtGui/qpixmap_conversion.h b/PySide/QtGui/qpixmap_conversion.h
deleted file mode 100644
index 10b4803..0000000
--- a/PySide/QtGui/qpixmap_conversion.h
+++ /dev/null
@@ -1,44 +0,0 @@
-namespace Shiboken {
-inline bool Converter< QPixmap >::isConvertible(PyObject* pyobj)
-{
-    if (ValueTypeConverter<QPixmap>::isConvertible(pyobj))
-        return true;
-    SbkBaseWrapperType* shiboType = reinterpret_cast<SbkBaseWrapperType*>(SbkType<QPixmap>());
-    bool isVariant = SbkQVariant_Check(pyobj);
-    if (isVariant) {
-        QVariant var(Converter<QVariant>::toCpp(pyobj));
-        return var.type() == QVariant::Pixmap;
-    } else if (SbkQSize_Check(pyobj) || SbkQString_Check(pyobj)) {
-        return true;
-    } else if (shiboType->ext_isconvertible) {
-        return shiboType->ext_isconvertible(pyobj);
-    }
-    return false;
-
-}
-
-inline QPixmap Converter< QPixmap >::toCpp(PyObject* pyobj)
-{
-    SbkBaseWrapperType* shiboType = reinterpret_cast<SbkBaseWrapperType*>(SbkType<QPixmap>());
-    bool isVariant = SbkQVariant_Check(pyobj);
-    if (isVariant) {
-        QVariant var(Converter<QVariant>::toCpp(pyobj));
-        return var.value<QPixmap>();
-    } else if (SbkQSize_Check(pyobj)) {
-        return QPixmap(Shiboken::Converter<QSize& >::toCpp(pyobj));
-    } else if (SbkQString_Check(pyobj)) {
-        return QPixmap(Shiboken::Converter<QString& >::toCpp(pyobj));
-    } else if (shiboType->ext_isconvertible && shiboType->ext_tocpp && shiboType->ext_isconvertible(pyobj)) {
-        QPixmap* cptr = reinterpret_cast<QPixmap*>(shiboType->ext_tocpp(pyobj));
-        std::auto_ptr<QPixmap> cptr_auto_ptr(cptr);
-        return *cptr;
-    }
-
-    return *Converter<QPixmap*>::toCpp(pyobj);
-}
-
-inline PyObject* Converter<QPixmap>::toPython(const QPixmap& cppObj)
-{
-    return ValueTypeConverter<QPixmap>::toPython(cppObj);
-}
-}
diff --git a/PySide/QtGui/typesystem_gui.xml.in b/PySide/QtGui/typesystem_gui.xml.in
index 2dc9676..210b1dc 100644
--- a/PySide/QtGui/typesystem_gui.xml.in
+++ b/PySide/QtGui/typesystem_gui.xml.in
@@ -1,5 +1,25 @@
 <?xml version="1.0"?>
+<!--
+    This file is part of PySide project.
+    Copyright (C) 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
+    Contact: PySide team <contact@pyside.org>
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+-->
 <typesystem package="PySide.QtGui">
-  <load-typesystem name="typesystem_core.xml" generate="no"/>
-  <load-typesystem name="typesystem_gui_@MODULE_NAME@.xml" generate="yes"/>
+    <load-typesystem name="typesystem_core.xml" generate="no"/>
+    <load-typesystem name="typesystem_gui_@AUTO_OS@.xml" generate="yes"/>
+    <load-typesystem name="typesystem_gui_common.xml" generate="yes"/>
 </typesystem>
diff --git a/PySide/QtGui/typesystem_gui_common.xml b/PySide/QtGui/typesystem_gui_common.xml
index f971f25..552636a 100644
--- a/PySide/QtGui/typesystem_gui_common.xml
+++ b/PySide/QtGui/typesystem_gui_common.xml
@@ -1,5 +1,38 @@
 <?xml version="1.0"?>
+<!--
+    This file is part of PySide project.
+    Copyright (C) 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
+    Contact: PySide team <contact@pyside.org>
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+-->
 <typesystem package="PySide.QtGui">
+  <load-typesystem name="typesystem_core.xml" generate="no"/>
+
+  <template name="QFontCharFix">
+    int size = Shiboken::String::len(%PYARG_1);
+    if (size == 1) {
+        const char *str = Shiboken::String::toCString(%PYARG_1);
+        QChar ch(str[0]);
+        %RETURN_TYPE %0 = %CPPSELF.%FUNCTION_NAME(ch);
+        %PYARG_0 = %CONVERTTOPYTHON[%RETURN_TYPE](%0);
+    } else {
+        PyErr_SetString(PyExc_TypeError, "String must have only one character");
+    }
+  </template>
+
   <function signature="qAlpha(uint)" />
   <function signature="qBlue(uint)" />
   <function signature="qGray(int,int,int)" />
@@ -39,73 +72,97 @@
   <rejection class="*" function-name="qDrawBorderPixmap"/>
   <rejection class="*" function-name="qDrawPixmaps"/>
   <rejection class="*" function-name="qGenericMatrixToMatrix4x4"/>
-  <rejection class="QTouchEvent" field-name="_touchPointStates"/>
 
   <rejection class="*" function-name="d_func"/>
   <rejection class="*" field-name="d_ptr"/>
   <rejection class="*" field-name="d"/>
-  <rejection class="QWindowsCEStyle"/>
-  <rejection class="QWindowsMobileStyle"/>
-  <rejection class="QAbstractUndoItem"/>
-  <rejection class="QBrushData"/>
-  <rejection class="QImageTextKeyLang"/>
-  <rejection class="QItemEditorCreator"/>
-  <rejection class="QLibrary"/>
-  <rejection class="QLinkedList"/>
-  <rejection class="QLinkedListData"/>
-  <rejection class="QLinkedListIterator"/>
-  <rejection class="QLinkedListNode"/>
-  <rejection class="QMimeSource"/>
-  <rejection class="QPainterPathPrivate"/>
-  <rejection class="QRegionData"/>
-  <rejection class="QStandardItemEditorCreator"/>
-  <rejection class="QStyleOptionQ3DockWindow"/>
-  <rejection class="QStyleOptionQ3ListView"/>
-  <rejection class="QStyleOptionQ3ListViewItem"/>
-  <rejection class="QTextFrameLayoutData"/>
-  <rejection class="QUpdateLaterEvent"/>
-  <rejection class="QVFbHeader"/>
-  <rejection class="QWidgetData"/>
-  <rejection class="QWindowSurface"/>
-  <rejection class="QWindowsXPStyle"/>
-  <rejection class="QWindowsVistaStyle"/>
-  <rejection class="QWSEmbedWidget"/>
-  <rejection class="QRegion::QRegionData"/>
-  <rejection class="JObject_key"/>
-  <rejection class="QIconEngineFactoryInterface"/>
-  <rejection class="QIconEnginePlugin"/>
-  <rejection class="QWidgetItemV2"/>
-  <rejection class="QAccessibleApplication"/>
-  <rejection class="QAccessibleFactoryInterface"/>
-  <rejection class="QAccessibleEditableTextInterface"/>
-  <rejection class="QAccessibleSimpleEditableTextInterface"/>
-  <rejection class="QAccessibleTextInterface"/>
-  <rejection class="QAccessibleValueInterface"/>
-  <rejection class="QAccessibleObjectEx"/>
-  <rejection class="QAccessibleObject"/>
-  <rejection class="QAccessible"/>
-  <rejection class="QAccessible2"/>
-  <rejection class="QAccessibleInterface"/>
-  <rejection class="QAccessibleBridgePlugin"/>
-  <rejection class="QAccessibleBridgeFactoryInterface"/>
-  <rejection class="QAccessibleInterfaceEx"/>
-  <rejection class="QAccessibleWidget"/>
-  <rejection class="QAccessibleWidgetEx"/>
-  <rejection class="QAbstractItemDelegate" function-name="operator="/>
+
+  <!--
+    Event classes have a lot of non-documented protected fields, those fields
+    are removed from PySide because they are Qt implementation details,
+    besides the fact they are accessible by ordinary event methods.
+    -->
+
+  <rejection class="QInputEvent" field-name="modState"/>
+  <rejection class="QInputEvent" field-name="modState"/>
+
+  <rejection class="QMouseEvent" field-name="p"/>
+  <rejection class="QMouseEvent" field-name="g"/>
+  <rejection class="QMouseEvent" field-name="b"/>
+  <rejection class="QMouseEvent" field-name="mouseState"/>
+
+  <rejection class="QHoverEvent" field-name="p"/>
+  <rejection class="QHoverEvent" field-name="op"/>
+
+  <rejection class="QWheelEvent" field-name="p"/>
+  <rejection class="QWheelEvent" field-name="g"/>
+  <rejection class="QWheelEvent" field-name="mouseState"/>
+  <rejection class="QWheelEvent" field-name="o"/>
+
+  <rejection class="QTabletEvent" field-name="mPos"/>
+  <rejection class="QTabletEvent" field-name="mGPos"/>
+  <rejection class="QTabletEvent" field-name="mHiResGlobalPos"/>
+  <rejection class="QTabletEvent" field-name="mDev"/>
+  <rejection class="QTabletEvent" field-name="mPointerType"/>
+  <rejection class="QTabletEvent" field-name="mXT"/>
+  <rejection class="QTabletEvent" field-name="mYT"/>
+  <rejection class="QTabletEvent" field-name="mZ"/>
+  <rejection class="QTabletEvent" field-name="mPress"/>
+  <rejection class="QTabletEvent" field-name="mTangential"/>
+  <rejection class="QTabletEvent" field-name="mRot"/>
+  <rejection class="QTabletEvent" field-name="mUnique"/>
+  <rejection class="QTabletEvent" field-name="mExtra"/>
+
+  <rejection class="QKeyEvent" field-name="txt"/>
+  <rejection class="QKeyEvent" field-name="k"/>
+  <rejection class="QKeyEvent" field-name="c"/>
+  <rejection class="QKeyEvent" field-name="auto"/>
+
+  <rejection class="QPaintEvent" field-name="m_rect"/>
+  <rejection class="QPaintEvent" field-name="m_region"/>
+  <rejection class="QPaintEvent" field-name="m_erased"/>
+
+  <rejection class="QMoveEvent" field-name="p"/>
+  <rejection class="QMoveEvent" field-name="oldp"/>
+
+  <rejection class="QResizeEvent" field-name="s"/>
+  <rejection class="QResizeEvent" field-name="olds"/>
+
+  <rejection class="QContextMenuEvent" field-name="p"/>
+  <rejection class="QContextMenuEvent" field-name="gp"/>
+  <rejection class="QContextMenuEvent" field-name="reas"/>
+
+  <rejection class="QDropEvent" field-name="p"/>
+  <rejection class="QDropEvent" field-name="mouseState"/>
+  <rejection class="QDropEvent" field-name="modState"/>
+  <rejection class="QDropEvent" field-name="act"/>
+  <rejection class="QDropEvent" field-name="drop_action"/>
+  <rejection class="QDropEvent" field-name="default_action"/>
+  <rejection class="QDropEvent" field-name="mdata"/>
+  <rejection class="QDropEvent" field-name="fmts"/>
+
+  <rejection class="QDragMoveEvent" field-name="rect"/>
+
+  <rejection class="QShortcutEvent" field-name="sequence"/>
+  <rejection class="QShortcutEvent" field-name="ambig"/>
+  <rejection class="QShortcutEvent" field-name="sid"/>
+
+  <rejection class="QTouchEvent" field-name="_widget"/>
+  <rejection class="QTouchEvent" field-name="_deviceType"/>
+  <rejection class="QTouchEvent" field-name="_touchPointStates"/>
+  <rejection class="QTouchEvent" field-name="_touchPoints"/>
+
   <rejection class="QAbstractTextDocumentLayout::PaintContext" field-name="selections"/>
   <rejection class="QApplication" function-name="compressEvent"/>
   <rejection class="QBrush" function-name="cleanUp"/>
   <rejection class="QFont" enum-name="ResolveProperties"/>
   <rejection class="QMotifStyle" field-name="focus"/>
-  <rejection class="QKeyEvent" function-name="operator=="/>
   <rejection class="QPictureIO" function-name="defineIOHandler"/>
   <rejection class="QPolygon" function-name="putPoints"/>
   <rejection class="QPolygon" function-name="setPoints"/>
   <rejection class="QPolygon" function-name="setPoint"/>
   <rejection class="QPolygon" function-name="points"/>
   <rejection class="QPolygon" function-name="point"/>
-  <rejection class="QPrinter" function-name="printerSelectionOption"/>
-  <rejection class="QPrinter" function-name="setPrinterSelectionOption"/>
   <rejection class="QWidget" function-name="create"/>
   <rejection class="QWidget" function-name="find"/>
   <rejection class="QWidget" function-name="handle"/>
@@ -114,312 +171,49 @@
   <rejection class="QWidgetItem" field-name="wid"/>
   <rejection class="QActionGroup" function-name="selected"/>
   <rejection class="QPaintEngine" function-name="fix_neg_rect"/>
-  <rejection class="QTabletEvent" field-name="mExtra"/>
   <rejection class="*" enum-name="enum_1"/>
-  <enum-type name="QAbstractItemDelegate::EndEditHint"/>
-  <enum-type name="QAbstractItemView::CursorAction"/>
-  <enum-type name="QAbstractItemView::DragDropMode"/>
-  <enum-type name="QAbstractItemView::DropIndicatorPosition"/>
-  <enum-type name="QAbstractItemView::EditTrigger" flags="QAbstractItemView::EditTriggers"/>
-  <enum-type name="QAbstractItemView::ScrollHint"/>
-  <enum-type name="QAbstractItemView::ScrollMode"/>
-  <enum-type name="QAbstractItemView::SelectionBehavior"/>
-  <enum-type name="QAbstractItemView::SelectionMode"/>
-  <enum-type name="QAbstractItemView::State"/>
-  <enum-type name="QAbstractPrintDialog::PrintDialogOption" flags="QAbstractPrintDialog::PrintDialogOptions"/>
-  <enum-type name="QAbstractPrintDialog::PrintRange"/>
-  <enum-type name="QAbstractSlider::SliderAction"/>
-  <enum-type name="QAbstractSlider::SliderChange"/>
-  <enum-type name="QAbstractSpinBox::ButtonSymbols"/>
-  <enum-type name="QAbstractSpinBox::CorrectionMode"/>
-  <enum-type name="QAbstractSpinBox::StepEnabledFlag" flags="QAbstractSpinBox::StepEnabled"/>
-  <enum-type name="QAction::ActionEvent"/>
-  <enum-type name="QAction::MenuRole"/>
-  <enum-type name="QApplication::ColorSpec"/>
-  <enum-type name="QApplication::Type"/>
-  <enum-type name="QCalendarWidget::HorizontalHeaderFormat"/>
-  <enum-type name="QCalendarWidget::SelectionMode"/>
-  <enum-type name="QCalendarWidget::VerticalHeaderFormat"/>
-  <enum-type name="QColor::Spec"/>
-  <enum-type name="QColorDialog::ColorDialogOption" flags="QColorDialog::ColorDialogOptions"/>
-  <enum-type name="QComboBox::InsertPolicy"/>
-  <enum-type name="QComboBox::SizeAdjustPolicy"/>
-  <enum-type name="QCompleter::CompletionMode"/>
-  <enum-type name="QCompleter::ModelSorting"/>
-  <enum-type name="QContextMenuEvent::Reason"/>
-  <enum-type name="QDesktopServices::StandardLocation"/>
-  <enum-type name="QDirModel::Roles"/>
-  <enum-type name="QFont::Capitalization"/>
-  <enum-type name="QFont::SpacingType"/>
-  <enum-type name="QFontDialog::FontDialogOption" flags="QFontDialog::FontDialogOptions"/>
-  <enum-type name="QFileSystemModel::Roles"/>
-  <enum-type name="QGraphicsItem::CacheMode"/>
-  <enum-type name="QGradient::InterpolationMode"/>
-  <enum-type name="QFormLayout::FieldGrowthPolicy"/>
-  <enum-type name="QFormLayout::ItemRole"/>
-  <enum-type name="QFormLayout::RowWrapPolicy"/>
-  <enum-type name="QIconEngineV2::IconEngineHook"/>
-  <enum-type name="QMdiArea::AreaOption" flags="QMdiArea::AreaOptions"/>
-  <enum-type name="QMdiArea::WindowOrder"/>
-  <enum-type name="QMdiArea::ViewMode"/>
-  <enum-type name="QMdiSubWindow::SubWindowOption" flags="QMdiSubWindow::SubWindowOptions"/>
-  <enum-type name="QPlainTextEdit::LineWrapMode"/>
-  <enum-type name="QPrintPreviewWidget::ViewMode"/>
-  <enum-type name="QPrintPreviewWidget::ZoomMode"/>
-  <enum-type name="QStyleOptionViewItemV4::StyleOptionVersion"/>
-  <enum-type name="QStyleOptionViewItemV4::ViewItemPosition"/>
-  <enum-type name="QDataWidgetMapper::SubmitPolicy"/>
-  <enum-type name="QDateTimeEdit::Section" flags="QDateTimeEdit::Sections"/>
-  <enum-type name="QDialog::DialogCode"/>
-  <enum-type name="QDialogButtonBox::ButtonLayout"/>
-  <enum-type name="QDialogButtonBox::ButtonRole"/>
-  <enum-type name="QFileDialog::AcceptMode"/>
-  <enum-type name="QFileDialog::DialogLabel"/>
-  <enum-type name="QFileDialog::FileMode"/>
-  <enum-type name="QFileDialog::Option" flags="QFileDialog::Options"/>
-  <enum-type name="QFileDialog::ViewMode"/>
-  <enum-type name="QFileIconProvider::IconType"/>
-  <enum-type name="QFont::Stretch"/>
-  <enum-type name="QFont::Style"/>
-  <enum-type name="QFont::StyleStrategy"/>
-  <enum-type name="QFont::Weight"/>
-  <enum-type name="QFontComboBox::FontFilter" flags="QFontComboBox::FontFilters"/>
-  <enum-type name="QFrame::Shadow" extensible="yes"/>
-  <enum-type name="QFrame::Shape"/>
-  <enum-type name="QFrame::StyleMask"/>
-  <enum-type name="QGradient::CoordinateMode"/>
-  <enum-type name="QGradient::Spread" lower-bound="QGradient.PadSpread" upper-bound="QGradient.RepeatSpread"/>
-  <enum-type name="QGradient::Type"/>
-  <enum-type name="QGraphicsItem::Extension"/>
-  <enum-type name="QGraphicsItem::GraphicsItemChange"/>
-  <enum-type name="QGraphicsItem::GraphicsItemFlag" flags="QGraphicsItem::GraphicsItemFlags"/>
-  <enum-type name="QGraphicsPixmapItem::ShapeMode"/>
-  <enum-type name="QGraphicsScene::ItemIndexMethod"/>
-  <enum-type name="QGraphicsSceneContextMenuEvent::Reason"/>
-  <enum-type name="QGraphicsView::CacheModeFlag" flags="QGraphicsView::CacheMode"/>
-  <enum-type name="QGraphicsView::DragMode"/>
-  <enum-type name="QGraphicsView::OptimizationFlag" flags="QGraphicsView::OptimizationFlags"/>
-  <enum-type name="QGraphicsView::ViewportAnchor"/>
-  <enum-type name="QGraphicsView::ViewportUpdateMode"/>
-  <enum-type name="QIcon::Mode"/>
-  <enum-type name="QIcon::State"/>
-  <enum-type name="QImage::Format"/>
-  <enum-type name="QImage::InvertMode"/>
-  <enum-type name="QImageIOHandler::ImageOption"/>
-  <enum-type name="QImageReader::ImageReaderError"/>
-  <enum-type name="QImageWriter::ImageWriterError"/>
-  <enum-type name="QInputContext::StandardFormat"/>
-  <enum-type name="QInputDialog::InputMode"/>
-  <enum-type name="QInputDialog::InputDialogOption"/>
-  <!-- only declare this if ndef QT_NO_INPUTMETHOD -->
-  <enum-type name="QInputMethodEvent::AttributeType"/>
-  <!-- endif QT_NO_INPUTMETHOD -->
-  <enum-type name="QItemSelectionModel::SelectionFlag" flags="QItemSelectionModel::SelectionFlags"/>
-  <enum-type name="QKeySequence::SequenceFormat"/>
-  <enum-type name="QKeySequence::SequenceMatch"/>
-  <enum-type name="QKeySequence::StandardKey"/>
-  <enum-type name="QLCDNumber::Mode"/>
-  <enum-type name="QLCDNumber::SegmentStyle"/>
-  <enum-type name="QLayout::SizeConstraint"/>
-  <enum-type name="QLineEdit::EchoMode"/>
-  <enum-type name="QListView::Flow"/>
-  <enum-type name="QListView::LayoutMode"/>
-  <enum-type name="QListView::Movement"/>
-  <enum-type name="QListView::ResizeMode"/>
-  <enum-type name="QListView::ViewMode"/>
-  <enum-type name="QListWidgetItem::ItemType"/>
-  <enum-type name="QMainWindow::DockOption" flags="QMainWindow::DockOptions"/>
-  <enum-type name="QMessageBox::ButtonRole"/>
-  <enum-type name="QMessageBox::Icon"/>
-  <enum-type name="QMovie::CacheMode"/>
-  <enum-type name="QMovie::MovieState"/>
-  <enum-type name="QPaintDevice::PaintDeviceMetric"/>
-  <enum-type name="QPaintEngine::DirtyFlag" flags="QPaintEngine::DirtyFlags"/>
-  <enum-type name="QPaintEngine::PaintEngineFeature" flags="QPaintEngine::PaintEngineFeatures"/>
-  <enum-type name="QPaintEngine::PolygonDrawMode"/>
-  <enum-type name="QPaintEngine::Type"/>
-  <enum-type name="QPageSetupDialog::PageSetupDialogOption" flags="QPageSetupDialog::PageSetupDialogOptions"/>
-  <enum-type name="QPainter::CompositionMode"/>
-  <enum-type name="QPainter::RenderHint" flags="QPainter::RenderHints"/>
-  <enum-type name="QPainter::PixmapFragmentHint" flags="QPainter::PixmapFragmentHints" since="4.7"/>
-  <enum-type name="QPainterPath::ElementType"/>
-  <enum-type name="QPrintEngine::PrintEnginePropertyKey" />
-  <enum-type name="QPrinter::ColorMode"/>
-  <enum-type name="QPrinter::Orientation"/>
-  <enum-type name="QPrinter::OutputFormat"/>
-  <enum-type name="QPrinter::PageOrder"/>
-  <enum-type name="QPrinter::PaperSource"/>
-  <enum-type name="QPrinter::PrintRange"/>
-  <enum-type name="QPrinter::PrinterMode"/>
-  <enum-type name="QPrinter::PrinterState"/>
-  <enum-type name="QPrinter::Unit"/>
-  <enum-type name="QPrinter::DuplexMode"/>
-  <enum-type name="QProgressBar::Direction"/>
-  <enum-type name="QRegion::RegionType"/>
-  <enum-type name="QRubberBand::Shape"/>
-  <enum-type name="QSessionManager::RestartHint"/>
-  <enum-type name="QSizePolicy::Policy"/>
-  <enum-type name="QSizePolicy::PolicyFlag"/>
-  <enum-type name="QSizePolicy::ControlType" flags="QSizePolicy::ControlTypes"/>
-  <enum-type name="QStandardItem::ItemType"/>
-  <enum-type name="QStyle::SubControl" flags="QStyle::SubControls" extensible="yes" force-integer="yes"/>
-  <enum-type name="QStyle::ComplexControl" extensible="yes"/>
-  <enum-type name="QStyle::ContentsType" extensible="yes"/>
-  <enum-type name="QStyle::ControlElement" extensible="yes"/>
-  <enum-type name="QStyle::PixelMetric" extensible="yes" />
-  <enum-type name="QStyle::PrimitiveElement" extensible="yes" />
-  <enum-type name="QStyle::StandardPixmap" extensible="yes"/>
-  <enum-type name="QStyle::StateFlag" flags="QStyle::State"/>
-  <enum-type name="QStyle::SubElement" extensible="yes" />
-  <enum-type name="QStyleHintReturn::HintReturnType"/>
-  <enum-type name="QStyleHintReturn::StyleOptionType"/>
-  <enum-type name="QStyleHintReturn::StyleOptionVersion"/>
-  <enum-type name="QStyleHintReturnVariant::StyleOptionType"/>
-  <enum-type name="QStyleHintReturnVariant::StyleOptionVersion"/>
-  <enum-type name="QStyleHintReturnMask::StyleOptionType"/>
-  <enum-type name="QStyleHintReturnMask::StyleOptionVersion"/>
-  <enum-type name="QStyleOption::StyleOptionType"/>
-  <enum-type name="QStyleOption::OptionType" extensible="yes"/>
-  <enum-type name="QStyleOption::StyleOptionVersion"/>
-  <enum-type name="QStyleOptionButton::ButtonFeature" flags="QStyleOptionButton::ButtonFeatures"/>
-  <enum-type name="QStyleOptionButton::StyleOptionType"/>
-  <enum-type name="QStyleOptionButton::StyleOptionVersion"/>
-  <enum-type name="QStyleOptionComboBox::StyleOptionType"/>
-  <enum-type name="QStyleOptionComboBox::StyleOptionVersion"/>
-  <enum-type name="QStyleOptionComplex::StyleOptionType"/>
-  <enum-type name="QStyleOptionComplex::StyleOptionVersion"/>
-  <enum-type name="QStyleOptionDockWidget::StyleOptionType"/>
-  <enum-type name="QStyleOptionDockWidget::StyleOptionVersion"/>
-  <enum-type name="QStyleOptionDockWidgetV2::StyleOptionVersion"/>
-  <enum-type name="QStyleOptionFocusRect::StyleOptionType"/>
-  <enum-type name="QStyleOptionFocusRect::StyleOptionVersion"/>
-  <enum-type name="QStyleOptionFrame::StyleOptionType"/>
-  <enum-type name="QStyleOptionFrame::StyleOptionVersion"/>
-  <enum-type name="QStyleOptionFrameV2::FrameFeature" flags="QStyleOptionFrameV2::FrameFeatures"/>
-  <enum-type name="QStyleOptionFrameV2::StyleOptionVersion"/>
-  <enum-type name="QStyleOptionFrameV3::StyleOptionVersion"/>
-  <enum-type name="QStyleOptionGraphicsItem::StyleOptionType"/>
-  <enum-type name="QStyleOptionGraphicsItem::StyleOptionVersion"/>
-  <enum-type name="QStyleOptionGroupBox::StyleOptionType"/>
-  <enum-type name="QStyleOptionGroupBox::StyleOptionVersion"/>
-  <enum-type name="QStyleOptionHeader::SectionPosition"/>
-  <enum-type name="QStyleOptionHeader::SelectedPosition"/>
-  <enum-type name="QStyleOptionHeader::SortIndicator"/>
-  <enum-type name="QStyleOptionHeader::StyleOptionType"/>
-  <enum-type name="QStyleOptionHeader::StyleOptionVersion"/>
-  <enum-type name="QStyleOptionMenuItem::CheckType"/>
-  <enum-type name="QStyleOptionMenuItem::MenuItemType"/>
-  <enum-type name="QStyleOptionMenuItem::StyleOptionType"/>
-  <enum-type name="QStyleOptionMenuItem::StyleOptionVersion"/>
-  <enum-type name="QStyleOptionProgressBar::StyleOptionType"/>
-  <enum-type name="QStyleOptionProgressBar::StyleOptionVersion"/>
-  <enum-type name="QStyleOptionProgressBarV2::StyleOptionType"/>
-  <enum-type name="QStyleOptionProgressBarV2::StyleOptionVersion"/>
-  <enum-type name="QStyleOptionRubberBand::StyleOptionType"/>
-  <enum-type name="QStyleOptionRubberBand::StyleOptionVersion"/>
-  <enum-type name="QStyleOptionSizeGrip::StyleOptionType"/>
-  <enum-type name="QStyleOptionSizeGrip::StyleOptionVersion"/>
-  <enum-type name="QStyleOptionSlider::StyleOptionType"/>
-  <enum-type name="QStyleOptionSlider::StyleOptionVersion"/>
-  <enum-type name="QStyleOptionSpinBox::StyleOptionType"/>
-  <enum-type name="QStyleOptionSpinBox::StyleOptionVersion"/>
-  <enum-type name="QStyleOptionTab::CornerWidget" flags="QStyleOptionTab::CornerWidgets"/>
-  <enum-type name="QStyleOptionTab::SelectedPosition"/>
-  <enum-type name="QStyleOptionTab::StyleOptionType"/>
-  <enum-type name="QStyleOptionTab::StyleOptionVersion"/>
-  <enum-type name="QStyleOptionTab::TabPosition"/>
-  <enum-type name="QStyleOptionTabBarBase::StyleOptionType"/>
-  <enum-type name="QStyleOptionTabBarBase::StyleOptionVersion"/>
-  <enum-type name="QStyleOptionTabBarBaseV2::StyleOptionVersion"/>
-  <enum-type name="QStyleOptionTabV2::StyleOptionVersion"/>
-  <enum-type name="QStyleOptionTabV3::StyleOptionVersion"/>
-  <enum-type name="QStyleOptionTabWidgetFrame::StyleOptionType"/>
-  <enum-type name="QStyleOptionTabWidgetFrame::StyleOptionVersion"/>
-  <enum-type name="QStyleOptionTitleBar::StyleOptionType"/>
-  <enum-type name="QStyleOptionTitleBar::StyleOptionVersion"/>
-  <enum-type name="QStyleOptionToolBar::StyleOptionType"/>
-  <enum-type name="QStyleOptionToolBar::StyleOptionVersion"/>
-  <enum-type name="QStyleOptionToolBar::ToolBarFeature" flags="QStyleOptionToolBar::ToolBarFeatures"/>
-  <enum-type name="QStyleOptionToolBar::ToolBarPosition"/>
-  <enum-type name="QStyleOptionToolBox::StyleOptionType"/>
-  <enum-type name="QStyleOptionToolBox::StyleOptionVersion"/>
-  <enum-type name="QStyleOptionToolButton::StyleOptionType"/>
-  <enum-type name="QStyleOptionToolButton::StyleOptionVersion"/>
-  <enum-type name="QStyleOptionToolButton::ToolButtonFeature" flags="QStyleOptionToolButton::ToolButtonFeatures" />
-  <enum-type name="QStyleOptionViewItem::Position"/>
-  <enum-type name="QStyleOptionViewItem::StyleOptionType"/>
-  <enum-type name="QStyleOptionViewItem::StyleOptionVersion"/>
-  <enum-type name="QStyleOptionViewItemV2::StyleOptionVersion"/>
-  <enum-type name="QStyleOptionViewItemV2::ViewItemFeature" flags="QStyleOptionViewItemV2::ViewItemFeatures"/>
-  <enum-type name="QSystemTrayIcon::ActivationReason"/>
-  <enum-type name="QSystemTrayIcon::MessageIcon"/>
-  <enum-type name="QTabBar::Shape"/>
-  <enum-type name="QTabBar::SelectionBehavior"/>
-  <enum-type name="QTabBar::ButtonPosition"/>
-  <enum-type name="QTabWidget::TabPosition"/>
-  <enum-type name="QTabWidget::TabShape"/>
-  <enum-type name="QTableWidgetItem::ItemType"/>
-  <enum-type name="QTabletEvent::PointerType"/>
-  <enum-type name="QTabletEvent::TabletDevice"/>
-  <enum-type name="QTextCharFormat::UnderlineStyle"/>
-  <enum-type name="QTextCharFormat::VerticalAlignment"/>
-  <enum-type name="QTextCursor::MoveMode"/>
-  <enum-type name="QTextCursor::MoveOperation"/>
-  <enum-type name="QTextCursor::SelectionType"/>
-  <enum-type name="QTextDocument::FindFlag" flags="QTextDocument::FindFlags"/>
-  <enum-type name="QTextDocument::MetaInformation"/>
-  <enum-type name="QTextDocument::ResourceType"/>
-  <enum-type name="QTextDocument::Stacks" since="4.7"/>
-  <enum-type name="QTextEdit::AutoFormattingFlag" flags="QTextEdit::AutoFormatting"/>
-  <enum-type name="QTextEdit::LineWrapMode"/>
-  <enum-type name="QTextFormat::ObjectTypes"/>
-  <enum-type name="QTextFormat::PageBreakFlag" flags="QTextFormat::PageBreakFlags"/>
-  <enum-type name="QTextFrameFormat::Position"/>
-  <enum-type name="QTextFrameFormat::BorderStyle"/>
-  <enum-type name="QTextItem::RenderFlag" flags="QTextItem::RenderFlags"/>
-  <enum-type name="QTextLayout::CursorMode"/>
-  <enum-type name="QTextLength::Type"/>
-  <enum-type name="QTextLine::CursorPosition"/>
-  <enum-type name="QTextLine::Edge"/>
-  <enum-type name="QTextListFormat::Style"/>
-  <enum-type name="QToolButton::ToolButtonPopupMode"/>
-  <enum-type name="QTreeWidgetItem::ItemType"/>
-  <enum-type name="QTreeWidgetItemIterator::IteratorFlag" flags="QTreeWidgetItemIterator::IteratorFlags"/>
-  <enum-type name="QValidator::State"/>
-  <enum-type name="QWidget::RenderFlag" flags="QWidget::RenderFlags"/>
-  <enum-type name="QWorkspace::WindowOrder"/>
-  <enum-type name="QDoubleValidator::Notation"/>
-  <enum-type name="QGraphicsScene::SceneLayer" flags="QGraphicsScene::SceneLayers"/>
-  <enum-type name="QStyleOptionToolBoxV2::SelectedPosition"/>
-  <enum-type name="QStyleOptionToolBoxV2::StyleOptionVersion"/>
-  <enum-type name="QStyleOptionToolBoxV2::TabPosition"/>
-  <enum-type name="QStyleOptionViewItemV3::StyleOptionVersion"/>
-  <enum-type name="QTransform::TransformationType"/>
-  <enum-type name="QTreeWidgetItem::ChildIndicatorPolicy"/>
-  <enum-type name="QWizard::WizardOption" flags="QWizard::WizardOptions"/>
-  <enum-type name="QWizard::WizardPixmap"/>
-  <enum-type name="QWizard::WizardStyle"/>
-  <enum-type name="QStackedLayout::StackingMode"/>
-  <enum-type name="QWizard::WizardButton" />
-  <enum-type name="QBoxLayout::Direction" />
-  <enum-type name="QClipboard::Mode" />
-  <enum-type name="QDialogButtonBox::StandardButton" flags="QDialogButtonBox::StandardButtons" />
-  <enum-type name="QDockWidget::DockWidgetFeature" flags="QDockWidget::DockWidgetFeatures"/>
-  <enum-type name="QFont::StyleHint" />
-  <enum-type name="QFontDatabase::WritingSystem" />
-  <enum-type name="QHeaderView::ResizeMode" />
-  <enum-type name="QMessageBox::StandardButton" flags="QMessageBox::StandardButtons" />
-  <enum-type name="QPalette::ColorGroup" />
-  <enum-type name="QPalette::ColorRole" />
-  <enum-type name="QPrinter::PageSize" />
-  <enum-type name="QSlider::TickPosition" />
-  <enum-type name="QStyle::StyleHint" extensible="yes" />
-  <enum-type name="QTextFormat::FormatType"/>
-  <enum-type name="QTextFormat::Property" />
   <value-type name="QTransform">
-    <modify-function signature="operator=(QTransform)" remove="all"/>
+    <enum-type name="TransformationType"/>
+    <add-function signature="__repr__" return-type="PyObject*">
+        <inject-code class="target" position="beginning">
+            <insert-template name="repr_code">
+               <replace from="%REPR_FORMAT" to="%f, %f, %f, %f, %f, %f, %f, %f, %f" />
+               <replace from="%REPR_ARGS"
+                        to="%CPPSELF.m11(), %CPPSELF.m12(), %CPPSELF.m13(), %CPPSELF.m21(), %CPPSELF.m22(), %CPPSELF.m23(), %CPPSELF.m31(), %CPPSELF.m32(), %CPPSELF.m33()" />
+             </insert-template>
+        </inject-code>
+    </add-function>
+
+    <add-function signature="__reduce__" return-type="PyObject*">
+        <inject-code class="target" position="beginning">
+            <insert-template name="reduce_code">
+              <replace from="%REDUCE_FORMAT" to="ddddddddd" />
+              <replace from="%REDUCE_ARGS"
+                       to="%CPPSELF.m11(), %CPPSELF.m12(), %CPPSELF.m13(), %CPPSELF.m21(), %CPPSELF.m22(), %CPPSELF.m23(), %CPPSELF.m31(), %CPPSELF.m32(), %CPPSELF.m33()" />
+            </insert-template>
+        </inject-code>
+    </add-function>
+
+    <modify-function signature="map(qreal,qreal,qreal*,qreal*)const">
+        <modify-argument index="0">
+            <replace-type modified-type="PyObject" />
+        </modify-argument>
+        <modify-argument index="3">
+            <remove-argument/>
+        </modify-argument>
+        <modify-argument index="4">
+            <remove-argument/>
+        </modify-argument>
+        <inject-code class="target" position="beginning">
+            <insert-template name="fix_args,number*,number*">
+                <replace from="$TYPE" to="qreal" />
+            </insert-template>
+        </inject-code>
+    </modify-function>
+    <!-- ### This is just an overload to "map(qreal,qreal,qreal*,qreal*)const" and can be discarded in Python -->
     <modify-function signature="map(int,int,int*,int*)const" remove="all"/>
-    <modify-function signature="map(qreal,qreal,qreal*,qreal*)const" remove="all"/>
+    <!-- ### -->
+
     <modify-function signature="inverted(bool*)const">
       <modify-argument index="1">
         <remove-argument/>
@@ -431,267 +225,621 @@
         <insert-template name="fix_bool*"/>
       </inject-code>
     </modify-function>
+    <add-function signature="quadToQuad(QPolygonF&amp;, QPolygonF&amp;)" return-type="PyObject*" static="true">
+      <inject-code>
+        QTransform _result;
+        if (QTransform::quadToQuad(%1, %2, _result)) {
+            %PYARG_0 = %CONVERTTOPYTHON[QTransform](_result);
+        } else {
+            Py_INCREF(Py_None);
+            %PYARG_0 = Py_None;
+        }
+      </inject-code>
+    </add-function>
+    <add-function signature="quadToSquare(QPolygonF &amp;)" return-type="PyObject*" static="true">
+      <inject-code>
+        QTransform _result;
+        if (QTransform::quadToSquare(%1, _result)) {
+            %PYARG_0 = %CONVERTTOPYTHON[QTransform](_result);
+        } else {
+            Py_INCREF(Py_None);
+            %PYARG_0 = Py_None;
+        }
+      </inject-code>
+    </add-function>
+
+    <add-function signature="squareToQuad(QPolygonF &amp;)" return-type="PyObject*" static="true">
+      <inject-code>
+        QTransform _result;
+        if (QTransform::squareToQuad(%1, _result)) {
+            %PYARG_0 = %CONVERTTOPYTHON[QTransform](_result);
+        } else {
+            Py_INCREF(Py_None);
+            %PYARG_0 = Py_None;
+        }
+      </inject-code>
+    </add-function>
+
   </value-type>
-  <enum-type name="QTextOption::TabType"/>
-  <enum-type name="QTextOption::WrapMode"/>
-  <enum-type name="QTextOption::Flag" flags="QTextOption::Flags"/>
-  <value-type name="QStyleOption" polymorphic-id-expression="%1-&gt;type == QStyleOption::SO_Default">
-    <modify-function signature="operator=(QStyleOption)" remove="all"/>
-    <modify-function signature="init(const QWidget*)" remove="all"/>
+  <object-type name="QStyleOption" polymorphic-id-expression="%1-&gt;type == QStyleOption::SO_Default">
+    <enum-type name="OptionType" extensible="yes"/>
+    <enum-type name="StyleOptionType"/>
+    <enum-type name="StyleOptionVersion"/>
     <!--### Obsolete in 4.3-->
+    <modify-function signature="init(const QWidget*)" remove="all"/>
+  </object-type>
+  <object-type name="QStyleOptionGraphicsItem" polymorphic-id-expression="%1-&gt;type == QStyleOptionGraphicsItem::Type &amp;&amp; %1-&gt;version == QStyleOptionGraphicsItem::Version">
+      <enum-type name="StyleOptionType"/>
+      <enum-type name="StyleOptionVersion"/>
+  </object-type>
+  <object-type name="QStyleOptionSizeGrip" polymorphic-id-expression="%1-&gt;type == QStyleOptionSizeGrip::Type &amp;&amp; %1-&gt;version == QStyleOptionSizeGrip::Version">
+      <enum-type name="StyleOptionType"/>
+      <enum-type name="StyleOptionVersion"/>
+  </object-type>
+  <object-type name="QStyleOptionButton" polymorphic-id-expression="%1-&gt;type == QStyleOptionButton::Type &amp;&amp; %1-&gt;version == QStyleOptionButton::Version">
+      <enum-type name="ButtonFeature" flags="ButtonFeatures"/>
+      <enum-type name="StyleOptionType"/>
+      <enum-type name="StyleOptionVersion"/>
+  </object-type>
+  <object-type name="QStyleOptionComboBox" polymorphic-id-expression="%1-&gt;type == QStyleOptionComboBox::Type &amp;&amp; %1-&gt;version == QStyleOptionComboBox::Version">
+      <enum-type name="StyleOptionType"/>
+      <enum-type name="StyleOptionVersion"/>
+  </object-type>
+  <object-type name="QStyleOptionComplex" polymorphic-id-expression="%1-&gt;type == QStyleOptionComplex::Type &amp;&amp; %1-&gt;version == QStyleOptionComplex::Version">
+      <enum-type name="StyleOptionType"/>
+      <enum-type name="StyleOptionVersion"/>
+  </object-type>
+  <object-type name="QStyleOptionDockWidget" polymorphic-id-expression="%1-&gt;type == QStyleOptionDockWidget::Type &amp;&amp; %1-&gt;version == QStyleOptionDockWidget::Version">
+      <enum-type name="StyleOptionType"/>
+      <enum-type name="StyleOptionVersion"/>
+  </object-type>
+  <object-type name="QStyleOptionDockWidgetV2" polymorphic-id-expression="%1-&gt;type == QStyleOptionDockWidgetV2::Type &amp;&amp; %1-&gt;version == QStyleOptionDockWidgetV2::Version">
+      <enum-type name="StyleOptionVersion"/>
+  </object-type>
+  <object-type name="QStyleOptionFocusRect" polymorphic-id-expression="%1-&gt;type == QStyleOptionFocusRect::Type &amp;&amp; %1-&gt;version == QStyleOptionFocusRect::Version">
+      <enum-type name="StyleOptionType"/>
+      <enum-type name="StyleOptionVersion"/>
+  </object-type>
+  <object-type name="QStyleOptionFrame" polymorphic-id-expression="%1-&gt;type == QStyleOptionFrame::Type &amp;&amp; %1-&gt;version == QStyleOptionFrame::Version">
+      <enum-type name="StyleOptionType"/>
+      <enum-type name="StyleOptionVersion"/>
+  </object-type>
+  <object-type name="QStyleOptionFrameV2" polymorphic-id-expression="%1-&gt;type == QStyleOptionFrameV2::Type &amp;&amp; %1-&gt;version == QStyleOptionFrameV2::Version">
+      <enum-type name="FrameFeature" flags="FrameFeatures"/>
+      <enum-type name="StyleOptionVersion"/>
+  </object-type>
+  <object-type name="QStyleOptionFrameV3" polymorphic-id-expression="%1-&gt;type == QStyleOptionFrameV3::Type &amp;&amp; %1-&gt;version == QStyleOptionFrameV3::Version">
+      <enum-type name="StyleOptionVersion"/>
+  </object-type>
+  <object-type name="QStyleOptionGroupBox" polymorphic-id-expression="%1-&gt;type == QStyleOptionGroupBox::Type &amp;&amp; %1-&gt;version == QStyleOptionGroupBox::Version">
+      <enum-type name="StyleOptionType"/>
+      <enum-type name="StyleOptionVersion"/>
+  </object-type>
+  <object-type name="QStyleOptionHeader" polymorphic-id-expression="%1-&gt;type == QStyleOptionHeader::Type &amp;&amp; %1-&gt;version == QStyleOptionHeader::Version">
+      <enum-type name="SectionPosition"/>
+      <enum-type name="SelectedPosition"/>
+      <enum-type name="SortIndicator"/>
+      <enum-type name="StyleOptionType"/>
+      <enum-type name="StyleOptionVersion"/>
+  </object-type>
+  <object-type name="QStyleOptionMenuItem" polymorphic-id-expression="%1-&gt;type == QStyleOptionMenuItem::Type &amp;&amp; %1-&gt;version == QStyleOptionMenuItem::Version">
+      <enum-type name="CheckType"/>
+      <enum-type name="MenuItemType"/>
+      <enum-type name="StyleOptionType"/>
+      <enum-type name="StyleOptionVersion"/>
+  </object-type>
+  <object-type name="QStyleOptionProgressBar" polymorphic-id-expression="%1-&gt;type == QStyleOptionProgressBar::Type &amp;&amp; %1-&gt;version == QStyleOptionProgressBar::Version">
+      <enum-type name="StyleOptionType"/>
+      <enum-type name="StyleOptionVersion"/>
+  </object-type>
+  <object-type name="QStyleOptionProgressBarV2" polymorphic-id-expression="%1-&gt;type == QStyleOptionProgressBarV2::Type &amp;&amp; %1-&gt;version == QStyleOptionProgressBarV2::Version">
+      <enum-type name="StyleOptionType"/>
+      <enum-type name="StyleOptionVersion"/>
+  </object-type>
+  <object-type name="QStyleOptionRubberBand" polymorphic-id-expression="%1-&gt;type == QStyleOptionRubberBand::Type &amp;&amp; %1-&gt;version == QStyleOptionRubberBand::Version">
+      <enum-type name="StyleOptionType"/>
+      <enum-type name="StyleOptionVersion"/>
+  </object-type>
+  <object-type name="QStyleOptionSlider" polymorphic-id-expression="%1-&gt;type == QStyleOptionSlider::Type &amp;&amp; %1-&gt;version == QStyleOptionSlider::Version">
+      <enum-type name="StyleOptionType"/>
+      <enum-type name="StyleOptionVersion"/>
+  </object-type>
+  <object-type name="QStyleOptionSpinBox" polymorphic-id-expression="%1-&gt;type == QStyleOptionSpinBox::Type &amp;&amp; %1-&gt;version == QStyleOptionSpinBox::Version">
+      <enum-type name="StyleOptionType"/>
+      <enum-type name="StyleOptionVersion"/>
+  </object-type>
+  <object-type name="QStyleOptionTab" polymorphic-id-expression="%1-&gt;type == QStyleOptionTab::Type &amp;&amp; %1-&gt;version == QStyleOptionTab::Version">
+      <enum-type name="CornerWidget" flags="CornerWidgets"/>
+      <enum-type name="SelectedPosition"/>
+      <enum-type name="StyleOptionType"/>
+      <enum-type name="StyleOptionVersion"/>
+      <enum-type name="TabPosition"/>
+  </object-type>
+  <object-type name="QStyleOptionTabV2" polymorphic-id-expression="%1-&gt;type == QStyleOptionTabV2::Type &amp;&amp; %1-&gt;version == QStyleOptionTabV2::Version">
+      <enum-type name="StyleOptionVersion"/>
+  </object-type>
+  <object-type name="QStyleOptionTabV3" polymorphic-id-expression="%1-&gt;type == QStyleOptionTabV3::Type &amp;&amp; %1-&gt;version == QStyleOptionTabV3::Version">
+      <enum-type name="StyleOptionVersion"/>
+  </object-type>
+  <object-type name="QStyleOptionTabBarBase" polymorphic-id-expression="%1-&gt;type == QStyleOptionTabBarBase::Type &amp;&amp; %1-&gt;version == QStyleOptionTabBarBase::Version">
+      <enum-type name="StyleOptionType"/>
+      <enum-type name="StyleOptionVersion"/>
+  </object-type>
+  <object-type name="QStyleOptionTabBarBaseV2" delete-in-main-thread="yes" polymorphic-id-expression="%1-&gt;type == QStyleOptionTabBarBaseV2::Type &amp;&amp; %1-&gt;version == QStyleOptionTabBarBaseV2::Version">
+      <enum-type name="StyleOptionVersion"/>
+  </object-type>
+  <object-type name="QStyleOptionTabWidgetFrame" polymorphic-id-expression="%1-&gt;type == QStyleOptionTabWidgetFrame::Type &amp;&amp; %1-&gt;version == QStyleOptionTabWidgetFrame::Version">
+      <enum-type name="StyleOptionType"/>
+      <enum-type name="StyleOptionVersion"/>
+  </object-type>
+  <object-type name="QStyleOptionTitleBar" polymorphic-id-expression="%1-&gt;type == QStyleOptionTitleBar::Type &amp;&amp; %1-&gt;version == QStyleOptionTitleBar::Version">
+      <enum-type name="StyleOptionType"/>
+      <enum-type name="StyleOptionVersion"/>
+  </object-type>
+  <object-type name="QStyleOptionToolBar" polymorphic-id-expression="%1-&gt;type == QStyleOptionToolBar::Type &amp;&amp; %1-&gt;version == QStyleOptionToolBar::Version">
+      <enum-type name="StyleOptionType"/>
+      <enum-type name="StyleOptionVersion"/>
+      <enum-type name="ToolBarFeature" flags="ToolBarFeatures"/>
+      <enum-type name="ToolBarPosition"/>
+  </object-type>
+  <object-type name="QStyleOptionToolBox" polymorphic-id-expression="%1-&gt;type == QStyleOptionToolBox::Type &amp;&amp; %1-&gt;version == QStyleOptionToolBox::Version">
+      <enum-type name="StyleOptionType"/>
+      <enum-type name="StyleOptionVersion"/>
+  </object-type>
+  <object-type name="QStyleOptionToolBoxV2" polymorphic-id-expression="%1-&gt;type == QStyleOptionToolBoxV2::Type &amp;&amp; %1-&gt;version == QStyleOptionToolBoxV2::Version">
+      <enum-type name="SelectedPosition"/>
+      <enum-type name="StyleOptionVersion"/>
+      <enum-type name="TabPosition"/>
+  </object-type>
+  <object-type name="QStyleOptionToolButton" polymorphic-id-expression="%1-&gt;type == QStyleOptionToolButton::Type &amp;&amp; %1-&gt;version == QStyleOptionToolButton::Version">
+      <enum-type name="StyleOptionType"/>
+      <enum-type name="StyleOptionVersion"/>
+      <enum-type name="ToolButtonFeature" flags="ToolButtonFeatures" />
+  </object-type>
+  <value-type name="QStyleOptionViewItem" polymorphic-id-expression="%1-&gt;type == QStyleOptionViewItem::Type &amp;&amp; %1-&gt;version == QStyleOptionViewItem::Version">
+      <enum-type name="Position"/>
+      <enum-type name="StyleOptionType"/>
+      <enum-type name="StyleOptionVersion"/>
   </value-type>
-  <value-type name="QStyleOptionGraphicsItem" polymorphic-id-expression="%1-&gt;type == QStyleOptionGraphicsItem::Type &amp;&amp; %1-&gt;version == QStyleOptionGraphicsItem::Version" />
-  <value-type name="QStyleOptionSizeGrip" polymorphic-id-expression="%1-&gt;type == QStyleOptionSizeGrip::Type &amp;&amp; %1-&gt;version == QStyleOptionSizeGrip::Version" />
-  <value-type name="QStyleOptionButton" polymorphic-id-expression="%1-&gt;type == QStyleOptionButton::Type &amp;&amp; %1-&gt;version == QStyleOptionButton::Version" />
-  <value-type name="QStyleOptionComboBox" polymorphic-id-expression="%1-&gt;type == QStyleOptionComboBox::Type &amp;&amp; %1-&gt;version == QStyleOptionComboBox::Version" />
-  <value-type name="QStyleOptionComplex" polymorphic-id-expression="%1-&gt;type == QStyleOptionComplex::Type &amp;&amp; %1-&gt;version == QStyleOptionComplex::Version" />
-  <value-type name="QStyleOptionDockWidget" polymorphic-id-expression="%1-&gt;type == QStyleOptionDockWidget::Type &amp;&amp; %1-&gt;version == QStyleOptionDockWidget::Version" />
-  <value-type name="QStyleOptionDockWidgetV2" polymorphic-id-expression="%1-&gt;type == QStyleOptionDockWidgetV2::Type &amp;&amp; %1-&gt;version == QStyleOptionDockWidgetV2::Version" >
-    <modify-function signature="operator=(QStyleOptionDockWidget)" remove="all"/>
+  <value-type name="QStyleOptionViewItemV2" polymorphic-id-expression="%1-&gt;type == QStyleOptionViewItemV2::Type &amp;&amp; %1-&gt;version == QStyleOptionViewItemV2::Version">
+      <enum-type name="StyleOptionVersion"/>
+      <enum-type name="ViewItemFeature" flags="ViewItemFeatures"/>
   </value-type>
-  <value-type name="QStyleOptionFocusRect" polymorphic-id-expression="%1-&gt;type == QStyleOptionFocusRect::Type &amp;&amp; %1-&gt;version == QStyleOptionFocusRect::Version" />
-  <value-type name="QStyleOptionFrame" polymorphic-id-expression="%1-&gt;type == QStyleOptionFrame::Type &amp;&amp; %1-&gt;version == QStyleOptionFrame::Version" />
-  <value-type name="QStyleOptionFrameV2" polymorphic-id-expression="%1-&gt;type == QStyleOptionFrameV2::Type &amp;&amp; %1-&gt;version == QStyleOptionFrameV2::Version" >
-    <modify-function signature="operator=(QStyleOptionFrame)" remove="all"/>
-  </value-type>
-  <value-type name="QStyleOptionFrameV3" polymorphic-id-expression="%1-&gt;type == QStyleOptionFrameV3::Type &amp;&amp; %1-&gt;version == QStyleOptionFrameV3::Version">
-    <modify-function signature="operator=(QStyleOptionFrame)" remove="all"/>
-  </value-type>
-  <value-type name="QStyleOptionGroupBox" polymorphic-id-expression="%1-&gt;type == QStyleOptionGroupBox::Type &amp;&amp; %1-&gt;version == QStyleOptionGroupBox::Version" />
-  <value-type name="QStyleOptionHeader" polymorphic-id-expression="%1-&gt;type == QStyleOptionHeader::Type &amp;&amp; %1-&gt;version == QStyleOptionHeader::Version" />
-  <value-type name="QStyleOptionMenuItem" polymorphic-id-expression="%1-&gt;type == QStyleOptionMenuItem::Type &amp;&amp; %1-&gt;version == QStyleOptionMenuItem::Version" />
-  <value-type name="QStyleOptionProgressBar" polymorphic-id-expression="%1-&gt;type == QStyleOptionProgressBar::Type &amp;&amp; %1-&gt;version == QStyleOptionProgressBar::Version" />
-  <value-type name="QStyleOptionProgressBarV2" polymorphic-id-expression="%1-&gt;type == QStyleOptionProgressBarV2::Type &amp;&amp; %1-&gt;version == QStyleOptionProgressBarV2::Version" >
-    <modify-function signature="operator=(QStyleOptionProgressBar)" remove="all"/>
-  </value-type>
-  <value-type name="QStyleOptionRubberBand" polymorphic-id-expression="%1-&gt;type == QStyleOptionRubberBand::Type &amp;&amp; %1-&gt;version == QStyleOptionRubberBand::Version" />
-  <value-type name="QStyleOptionSlider" polymorphic-id-expression="%1-&gt;type == QStyleOptionSlider::Type &amp;&amp; %1-&gt;version == QStyleOptionSlider::Version" />
-  <value-type name="QStyleOptionSpinBox" polymorphic-id-expression="%1-&gt;type == QStyleOptionSpinBox::Type &amp;&amp; %1-&gt;version == QStyleOptionSpinBox::Version" />
-  <value-type name="QStyleOptionTab" polymorphic-id-expression="%1-&gt;type == QStyleOptionTab::Type &amp;&amp; %1-&gt;version == QStyleOptionTab::Version" />
-  <value-type name="QStyleOptionTabV2" polymorphic-id-expression="%1-&gt;type == QStyleOptionTabV2::Type &amp;&amp; %1-&gt;version == QStyleOptionTabV2::Version" >
-    <modify-function signature="operator=(const QStyleOptionTab &amp;)" remove="all"/>
-  </value-type>
-  <value-type name="QStyleOptionTabV3" polymorphic-id-expression="%1-&gt;type == QStyleOptionTabV3::Type &amp;&amp; %1-&gt;version == QStyleOptionTabV3::Version">
-    <modify-function signature="operator=(QStyleOptionTab)" remove="all" />
-  </value-type>
-  <value-type name="QStyleOptionTabBarBase" polymorphic-id-expression="%1-&gt;type == QStyleOptionTabBarBase::Type &amp;&amp; %1-&gt;version == QStyleOptionTabBarBase::Version" />
-  <value-type name="QStyleOptionTabBarBaseV2" delete-in-main-thread="yes" polymorphic-id-expression="%1-&gt;type == QStyleOptionTabBarBaseV2::Type &amp;&amp; %1-&gt;version == QStyleOptionTabBarBaseV2::Version">
-    <modify-function signature="operator=(QStyleOptionTabBarBase)" remove="all" />
-  </value-type>
-  <value-type name="QStyleOptionTabWidgetFrame" polymorphic-id-expression="%1-&gt;type == QStyleOptionTabWidgetFrame::Type &amp;&amp; %1-&gt;version == QStyleOptionTabWidgetFrame::Version" />
-  <value-type name="QStyleOptionTitleBar" polymorphic-id-expression="%1-&gt;type == QStyleOptionTitleBar::Type &amp;&amp; %1-&gt;version == QStyleOptionTitleBar::Version" />
-  <value-type name="QStyleOptionToolBar" polymorphic-id-expression="%1-&gt;type == QStyleOptionToolBar::Type &amp;&amp; %1-&gt;version == QStyleOptionToolBar::Version" />
-  <value-type name="QStyleOptionToolBox" polymorphic-id-expression="%1-&gt;type == QStyleOptionToolBox::Type &amp;&amp; %1-&gt;version == QStyleOptionToolBox::Version" />
-  <value-type name="QStyleOptionToolBoxV2" polymorphic-id-expression="%1-&gt;type == QStyleOptionToolBoxV2::Type &amp;&amp; %1-&gt;version == QStyleOptionToolBoxV2::Version" >
-    <modify-function signature="operator=(QStyleOptionToolBox)" remove="all"/>
-  </value-type>
-  <value-type name="QStyleOptionToolButton" polymorphic-id-expression="%1-&gt;type == QStyleOptionToolButton::Type &amp;&amp; %1-&gt;version == QStyleOptionToolButton::Version" />
-  <value-type name="QStyleOptionViewItem" polymorphic-id-expression="%1-&gt;type == QStyleOptionViewItem::Type &amp;&amp; %1-&gt;version == QStyleOptionViewItem::Version" />
-  <value-type name="QStyleOptionViewItemV2" polymorphic-id-expression="%1-&gt;type == QStyleOptionViewItemV2::Type &amp;&amp; %1-&gt;version == QStyleOptionViewItemV2::Version" >
-    <modify-function signature="operator=(QStyleOptionViewItem)" remove="all"/>
-  </value-type>
-  <value-type name="QStyleOptionViewItemV3" polymorphic-id-expression="%1-&gt;type == QStyleOptionViewItemV3::Type &amp;&amp; %1-&gt;version == QStyleOptionViewItemV3::Version" >
-    <modify-function signature="operator=(QStyleOptionViewItem)" remove="all"/>
+  <value-type name="QStyleOptionViewItemV3" polymorphic-id-expression="%1-&gt;type == QStyleOptionViewItemV3::Type &amp;&amp; %1-&gt;version == QStyleOptionViewItemV3::Version">
+      <enum-type name="StyleOptionVersion"/>
   </value-type>
   <value-type name="QStyleOptionViewItemV4" polymorphic-id-expression="%1-&gt;type == QStyleOptionViewItemV4::Type &amp;&amp; %1-&gt;version == QStyleOptionViewItemV4::Version" >
-    <modify-function signature="operator=(QStyleOptionViewItem)" remove="all"/>
-  </value-type>
-  <value-type name="QTextFragment" >
-    <modify-function signature="operator=(QTextFragment)" remove="all"/>
+      <enum-type name="StyleOptionVersion"/>
+      <enum-type name="ViewItemPosition"/>
   </value-type>
+  <value-type name="QTextFragment" />
   <value-type name="QBitmap" >
-    <modify-function signature="operator=(const QPixmap &amp;)" remove="all"/>
-    <modify-function signature="QBitmap(QString,const char*)" remove="all" />
-    <modify-function signature="fromData(QSize,const uchar*,QImage::Format)" remove="all" />
-    <modify-function signature="fromData(QSize,const uchar*,QImage::Format)" remove="all"/>
+    <modify-function signature="fromData(QSize,const uchar*,QImage::Format)">
+      <modify-argument index="2">
+        <replace-type modified-type="PyBuffer"/>
+      </modify-argument>
+      <inject-code>
+        uchar* buffer = (uchar*) Shiboken::Buffer::getPointer(%PYARG_2);
+        QBitmap %0 = QBitmap::fromData(%1, buffer, %3);
+        %PYARG_0 = %CONVERTTOPYTHON[QBitmap](%0);
+      </inject-code>
+    </modify-function>
   </value-type>
   <value-type name="QTextInlineObject" />
-  <value-type name="QSizePolicy"/>
-  <value-type name="QTableWidgetSelectionRange"/>
-  <value-type name="QTextDocumentFragment" >
-    <modify-function signature="operator=(QTextDocumentFragment)" remove="all"/>
+  <value-type name="QSizePolicy">
+      <enum-type name="ControlType" flags="ControlTypes"/>
+      <enum-type name="Policy"/>
+      <enum-type name="PolicyFlag"/>
   </value-type>
-  <value-type name="QTextOption" >
-    <modify-function signature="operator=(const QTextOption &amp;)" remove="all"/>
+  <value-type name="QTableWidgetSelectionRange"/>
+  <value-type name="QTextDocumentFragment" />
+  <value-type name="QTextOption">
+      <enum-type name="Flag" flags="Flags"/>
+      <enum-type name="TabType"/>
+      <enum-type name="WrapMode"/>
+      <value-type name="Tab"/>
   </value-type>
   <value-type name="QTextLine" >
+    <enum-type name="CursorPosition"/>
+    <enum-type name="Edge"/>
     <modify-function signature="cursorToX(int*,QTextLine::Edge)const" remove="all" />
+    <modify-function signature="cursorToX(int,QTextLine::Edge)const">
+        <modify-argument index="0">
+            <replace-type modified-type="PyObject" />
+        </modify-argument>
+        <inject-code class="target" position="beginning">
+        %BEGIN_ALLOW_THREADS
+        %RETURN_TYPE %0 = %CPPSELF->::%TYPE::%FUNCTION_NAME(&amp;%1, %2);
+        %END_ALLOW_THREADS
+        %PYARG_0 = PyTuple_New(2);
+        PyTuple_SET_ITEM(%PYARG_0, 0, %CONVERTTOPYTHON[%RETURN_TYPE](%0));
+        PyTuple_SET_ITEM(%PYARG_0, 1, %CONVERTTOPYTHON[%ARG1_TYPE](%1));
+        </inject-code>
+    </modify-function>
+    <modify-function signature="xToCursor(qreal,QTextLine::CursorPosition)const">
+      <modify-argument index="2">
+        <rename to="edge"/>
+      </modify-argument>
+    </modify-function>
   </value-type>
   <value-type name="QTextTableFormat" />
   <value-type name="QTextImageFormat" />
   <value-type name="QTextFrameFormat" >
+    <enum-type name="BorderStyle"/>
+    <enum-type name="Position"/>
     <modify-function signature="isValid()const" access="non-final"/>
   </value-type>
-  <value-type name="QTextLength" />
+  <value-type name="QTextLength">
+      <enum-type name="Type"/>
+  </value-type>
   <value-type name="QItemSelectionRange" hash-function="qHash">
-    <modify-function signature="intersect(QItemSelectionRange)const" remove="all"/>
     <!--### Obsolete in 4.3-->
+    <modify-function signature="intersect(QItemSelectionRange)const" remove="all"/>
   </value-type>
   <value-type name="QPainterPath">
-    <modify-function signature="operator=(QPainterPath)" remove="all"/>
+    <enum-type name="ElementType"/>
+    <value-type name="Element">
+      <modify-field name="x" write="false"/>
+      <modify-field name="y" write="false"/>
+      <modify-field name="type" write="false"/>
+      <include file-name="QPainterPath" location="global"/>
+    </value-type>
   </value-type>
   <value-type name="QPalette">
-    <modify-function signature="operator=(const QPalette&amp;)" remove="all"/>
+    <enum-type name="ColorGroup" />
+    <enum-type name="ColorRole" />
+    <!--### Obsolete in 4.3-->
     <modify-function signature="QPalette(QColor, QColor, QColor, QColor, QColor, QColor, QColor)" remove="all"/>
-    <!--### Obsolete in 4.3-->
     <modify-function signature="background()const" remove="all"/>
-    <!--### Obsolete in 4.3-->
     <modify-function signature="foreground()const" remove="all"/>
-    <!--### Obsolete in 4.3-->
     <modify-function signature="serialNumber()const" remove="all"/>
-    <!--### Obsolete in 4.3-->
+    <!--### End of obsolete section -->
   </value-type>
   <value-type name="QKeySequence">
-    <modify-function signature="operator=(QKeySequence)" remove="all"/>
-    <!-- TODO: QVariant operator temporarily removed due to compilation problems. -->
+    <enum-type name="SequenceFormat"/>
+    <enum-type name="SequenceMatch"/>
+    <enum-type name="StandardKey"/>
+
+    <add-function signature="__repr__" return-type="PyObject*">
+        <inject-code class="target" position="beginning">
+            <insert-template name="repr_code">
+               <replace from="%REPR_FORMAT" to="%i, %i, %i, %i" />
+               <replace from="%REPR_ARGS"
+                        to="(*%CPPSELF)[0], (*%CPPSELF)[1], (*%CPPSELF)[2], (*%CPPSELF)[3]" />
+             </insert-template>
+        </inject-code>
+    </add-function>
+
+    <add-function signature="__reduce__" return-type="PyObject*">
+        <inject-code class="target" position="beginning">
+            <insert-template name="reduce_code">
+              <replace from="%REDUCE_FORMAT" to="iiii" />
+              <replace from="%REDUCE_ARGS" to="(*%CPPSELF)[0], (*%CPPSELF)[1], (*%CPPSELF)[2], (*%CPPSELF)[3]" />
+            </insert-template>
+        </inject-code>
+    </add-function>
+
+    <modify-function signature="operator[](uint) const" remove="all"/>
+    <add-function signature="__getitem__">
+        <inject-code class="target" position="beginning">
+            if (_i &lt; 0 || _i >= %CPPSELF.count()) {
+                PyErr_SetString(PyExc_IndexError, "index out of bounds");
+                return 0;
+            }
+            int item = (*%CPPSELF)[_i];
+            return %CONVERTTOPYTHON[int](item);
+        </inject-code>
+    </add-function>
+
+    <!-- ### Not necessary due the PySide QVariant conversion rules -->
     <modify-function signature="operator QVariant()const" remove="all"/>
+    <!-- ### Obsolete -->
     <modify-function signature="operator int()const" remove="all"/>
-    <modify-function signature="operator[](uint)const" remove="all"/>
+    <modify-function signature="operator QString()const" remove="all"/>
+    <!-- ### End of obsolete section -->
   </value-type>
   <value-type name="QPicture" >
     <modify-function signature="load(QIODevice*, const char*)" allow-thread="yes"/>
     <modify-function signature="load(const QString&amp;, const char*)" allow-thread="yes"/>
     <modify-function signature="save(QIODevice*, const char*)" allow-thread="yes"/>
     <modify-function signature="save(const QString&amp;, const char*)" allow-thread="yes"/>
-    <modify-function signature="operator=(QPicture)" remove="all"/>
+    <!-- ### Obsolete in 4.3-->
     <modify-function signature="pictureFormat(QString)" remove="all" />
     <modify-function signature="inputFormatList()" remove="all"/>
-    <!--### Obsolete in 4.3-->
     <modify-function signature="inputFormats()" remove="all"/>
-    <!--### Obsolete in 4.3-->
     <modify-function signature="outputFormatList()" remove="all"/>
-    <!--### Obsolete in 4.3-->
     <modify-function signature="outputFormats()" remove="all"/>
-    <!--### Obsolete in 4.3-->
-    <modify-function signature="setData(const char*,uint)" remove="all"/>
+    <!-- ### End of obsolete section -->
+    <!-- See bug 759 -->
+    <modify-function signature="data() const">
+        <modify-argument index="return">
+            <replace-type modified-type="PyObject"/>
+        </modify-argument>
+        <inject-code>
+            %PYARG_0 = Shiboken::Buffer::newObject(%CPPSELF.data(), %CPPSELF.size());
+        </inject-code>
+    </modify-function>
+    <modify-function signature="setData(const char*,uint)">
+        <modify-argument index="1">
+            <replace-type modified-type="PyBuffer"/>
+            <conversion-rule class="target">
+                PyObject* %out = Shiboken::Buffer::newObject(%in, size);
+            </conversion-rule>
+            <conversion-rule class="native">
+                Py_ssize_t bufferLen;
+                char* %out = (char*) Shiboken::Buffer::getPointer(%PYARG_1, &amp;bufferLen);
+            </conversion-rule>
+        </modify-argument>
+        <modify-argument index="2">
+            <remove-argument/>
+            <conversion-rule class="native">
+                uint %out = bufferLen;
+            </conversion-rule>
+        </modify-argument>
+    </modify-function>
   </value-type>
   <value-type name="QRegion" >
-    <modify-function signature="operator=(QRegion)" remove="all"/>
-    <modify-function signature="operator&amp;=(QRegion)" remove="all"/>
+    <enum-type name="RegionType"/>
+    <!-- ### Obsolete in 4.3-->
     <modify-function signature="eor(QRegion)const" remove="all"/>
-    <!--### Obsolete in 4.3-->
-    <modify-function signature="intersect(QRegion)const" remove="all"/>
-    <!--### Obsolete in 4.3-->
+    <modify-function signature="intersect(QRect)const" remove="all" />
+    <modify-function signature="intersect(QRegion)const" remove="all" />
     <modify-function signature="subtract(QRegion)const" remove="all"/>
-    <!--### Obsolete in 4.3-->
     <modify-function signature="unite(QRegion)const" remove="all"/>
-    <!--### Obsolete in 4.3-->
+    <modify-function signature="unite(QRect)const" remove="all"/>
+    <!-- ### End of obsolete section -->
+    <!-- ### This operator does not make sense in Python. -->
+    <modify-function signature="operator&amp;=(QRegion)" remove="all"/>
     <modify-function signature="operator&amp;=(QRect)" remove="all"/>
-    <modify-function signature="operator+=(QRect)" remove="all"/>
+    <!-- ### -->
   </value-type>
-  <value-type name="QTextBlock" >
-    <modify-function signature="operator=(QTextBlock)" remove="all"/>
+  <value-type name="QTextBlock">
+    <value-type name="iterator" >
+      <include file-name="QTextBlock" location="global"/>
+      <!-- ### These operators where removed because they don't make sense in Python.
+           The iterator methods (__iter__, next) replace this functionality. -->
+      <modify-function signature="operator++()" remove="all"/>
+      <modify-function signature="operator--()" remove="all"/>
+      <!-- ### -->
+      <add-function signature="__iter__()" return-type="PyObject*">
+        <inject-code class="target" position="beginning">
+          <insert-template name="__iter__" />
+        </inject-code>
+      </add-function>
+      <add-function signature="__next__()" return-type="PyObject*">
+        <inject-code class="target" position="beginning">
+          <insert-template name="__next__">
+            <replace from="%CPPSELF_TYPE" to="QTextBlock::iterator" />
+          </insert-template>
+        </inject-code>
+      </add-function>
+    </value-type>
+    <add-function signature="__iter__()" return-type="PyObject*">
+        <inject-code class="target" position="beginning">
+          <insert-template name="__iter_parent__">
+            <replace from="%CPPSELF_TYPE" to="QTextBlock::iterator" />
+          </insert-template>
+        </inject-code>
+    </add-function>
+    <modify-function signature="setUserData(QTextBlockUserData*)">
+        <inject-code class="target" position="end">
+            const QTextDocument* doc = %CPPSELF.document();
+            if (doc) {
+                Shiboken::AutoDecRef pyDocument(%CONVERTTOPYTHON[QTextDocument*](doc));
+                Shiboken::Object::setParent(pyDocument, %PYARG_1);
+            }
+        </inject-code>
+    </modify-function>
+    <modify-function signature="userData() const">
+        <modify-argument index="return">
+            <define-ownership class="target" owner="default"/>
+        </modify-argument>
+        <inject-code class="target" position="end">
+            const QTextDocument* doc = %CPPSELF.document();
+            if (doc) {
+                Shiboken::AutoDecRef pyDocument(%CONVERTTOPYTHON[QTextDocument*](doc));
+                Shiboken::Object::setParent(pyDocument, %PYARG_0);
+            }
+        </inject-code>
+    </modify-function>
+  </value-type>
+  <value-type name="QTextBlockFormat">
+    <enum-type name="LineHeightTypes" since="4.8" revision="4800"/>
   </value-type>
-  <value-type name="QTextBlockFormat" />
   <value-type name="QTextTableCellFormat" />
   <value-type name="QTextCharFormat" >
+    <enum-type name="UnderlineStyle"/>
+    <enum-type name="VerticalAlignment"/>
     <modify-function signature="isValid()const" access="non-final"/>
+    <!--### Obsolete in 4.3-->
     <modify-function signature="anchorName()const" remove="all"/>
-    <!--### Obsolete in 4.3-->
     <modify-function signature="setAnchorName(QString)" remove="all"/>
-    <!--### Obsolete in 4.3-->
+    <!--### End of obsolete section -->
   </value-type>
   <value-type name="QTextFormat" >
-    <modify-function signature="operator=(QTextFormat)" remove="all"/>
+    <enum-type name="FormatType"/>
+    <enum-type name="ObjectTypes"/>
+    <enum-type name="PageBreakFlag" flags="PageBreakFlags"/>
+    <enum-type name="Property" />
     <modify-function signature="isValid()const" access="non-final"/>
-    <modify-function signature="setProperty(int,QVector&lt;QTextLength&gt;)" rename="setLengthVectorProperty"/>
   </value-type>
-  <value-type name="QTextListFormat" />
+  <value-type name="QTextListFormat">
+      <enum-type name="Style"/>
+  </value-type>
   <value-type name="QPolygon">
     <extra-includes>
       <include file-name="QMatrix" location="global"/>
       <include file-name="QTransform" location="global"/>
     </extra-includes>
+    <add-function signature="__reduce__" return-type="PyObject*">
+        <inject-code class="target" position="beginning">
+            PyObject* points = PyList_New(%CPPSELF.count());
+            for (int i = 0, max = %CPPSELF.count(); i &lt; max; ++i){
+                int x, y;
+                %CPPSELF.point(i, &amp;x, &amp;y);
+                QPoint pt = QPoint(x, y);
+                PyList_SET_ITEM(points, i, %CONVERTTOPYTHON[QPoint](pt));
+            }
+            <insert-template name="reduce_code">
+              <replace from="%REDUCE_FORMAT" to="N" />
+              <replace from="%REDUCE_ARGS" to="points" />
+            </insert-template>
+        </inject-code>
+    </add-function>
+
+    <!-- ### "QPolygon(int, const int*)" is an internal constructor. -->
     <modify-function signature="QPolygon(int, const int *)" remove="all"/>
-    <modify-function signature="operator+(QVector&lt;QPoint&gt;)const" remove="all"/>
-    <modify-function signature="operator&lt;&lt;(QPoint)" remove="all"/>
-    <modify-function signature="operator&lt;&lt;(QVector&lt;QPoint&gt;)" remove="all"/>
+    <!-- ### A QVector parameter, for no defined type, will generate wrong code. -->
+    <modify-function signature="operator+=(QVector&lt;QPoint&gt;)" remove="all"/>
+    <modify-function signature="operator&lt;&lt;(QPoint)">
+        <inject-code>
+            // %FUNCTION_NAME()
+            *%CPPSELF &lt;&lt; %1;
+            %PYARG_0 = %CONVERTTOPYTHON[QPolygon*](%CPPSELF);
+        </inject-code>
+    </modify-function>
+    <modify-function signature="operator&lt;&lt;(QVector&lt;QPoint&gt;)">
+        <inject-code>
+            // %FUNCTION_NAME()
+            *%CPPSELF &lt;&lt; %1;
+            %PYARG_0 = %CONVERTTOPYTHON[QPolygon*](%CPPSELF);
+        </inject-code>
+    </modify-function>
+    <!-- ### -->
   </value-type>
   <value-type name="QPolygonF">
     <extra-includes>
       <include file-name="QMatrix" location="global"/>
       <include file-name="QTransform" location="global"/>
     </extra-includes>
-    <modify-function signature="operator+(QVector&lt;QPointF&gt;)const" remove="all"/>
+    <!-- ### A QVector parameter, for no defined type, will generate wrong code. -->
+    <modify-function signature="operator+=(QVector&lt;QPointF&gt;)" remove="all"/>
+    <!-- ### See bug 776 -->
     <modify-function signature="operator&lt;&lt;(QPointF)" remove="all"/>
+    <!-- ### See bug 777 -->
     <modify-function signature="operator&lt;&lt;(QVector&lt;QPointF&gt;)" remove="all"/>
+    <!-- ### -->
   </value-type>
   <value-type name="QIcon" >
-    <modify-function signature="operator=(QIcon)" remove="all"/>
-    <modify-function signature="serialNumber()const" remove="all"/>
+    <enum-type name="Mode"/>
+    <enum-type name="State"/>
     <!--### Obsolete in 4.3-->
+    <modify-function signature="serialNumber()const" remove="all"/>
     <modify-function signature="QIcon(QIconEngineV2 *)">
       <modify-argument index="1">
+        <no-null-pointer/>
         <parent index="this" action="add"/>
       </modify-argument>
     </modify-function>
     <modify-function signature="QIcon(QIconEngine *)">
       <modify-argument index="1">
+        <no-null-pointer/>
         <parent index="this" action="add"/>
       </modify-argument>
     </modify-function>
   </value-type>
-  <value-type name="QTextFrame::iterator" >
-    <include file-name="QTextFrame" location="global"/>
-    <modify-function signature="operator++(int)" remove="all"/>
-    <modify-function signature="operator--(int)" remove="all"/>
-    <modify-function signature="operator=(QTextFrame::iterator)" remove="all"/>
-    <modify-function signature="operator++()" remove="all"/>
-    <modify-function signature="operator--()" remove="all"/>
-  </value-type>
   <value-type name="QTreeWidgetItemIterator" >
-    <modify-function signature="operator=(QTreeWidgetItemIterator)" remove="all"/>
-    <modify-function signature="operator++(int)" remove="all"/>
-    <modify-function signature="operator--(int)" remove="all"/>
-    <modify-function signature="operator+=(int)" remove="all"/>
-    <modify-function signature="operator-=(int)" remove="all"/>
-    <modify-function signature="operator++()" remove="all"/>
-    <modify-function signature="operator--()" remove="all"/>
-    <modify-function signature="operator*()const" remove="all"/>
-  </value-type>
-  <value-type name="QTextBlock::iterator" >
-    <include file-name="QTextBlock" location="global"/>
-    <modify-function signature="operator++()" remove="all"/>
-    <modify-function signature="operator--()" remove="all"/>
-    <modify-function signature="operator++(int)" remove="all"/>
-    <modify-function signature="operator--(int)" remove="all"/>
-  </value-type>
-  <value-type name="QAbstractTextDocumentLayout::PaintContext" >
-    <include file-name="QAbstractTextDocumentLayout" location="global"/>
-  </value-type>
-  <value-type name="QAbstractTextDocumentLayout::Selection" />
-  <value-type name="QPixmap" >
-    <conversion-rule file="qpixmap_conversion.h" />
-    <extra-includes>
-      <include file-name="QVariant" location="global"/>
-    </extra-includes>
-    <add-function signature="QPixmap(QVariant)">
-        <inject-code class="target" position="beginning">
-        if (%1.type() == QVariant::Pixmap)
-            %0 = new %TYPE(%1.value&lt;QPixmap>());
-        else if (%1.type() == QVariant::Image)
-            %0 = new %TYPE(QPixmap::fromImage(%1.value&lt;QImage>()));
-        else
-            PyErr_SetString(PyExc_TypeError, "QVariant must be holding a QPixmap");
-        </inject-code>
+    <modify-function signature="QTreeWidgetItemIterator(QTreeWidget *, QFlags&lt;QTreeWidgetItemIterator::IteratorFlag&gt;)">
+        <modify-argument index="this">
+            <parent index="1" action="add" />
+        </modify-argument>
+    </modify-function>
+
+    <add-function signature="__iter__()" return-type="PyObject*">
+      <inject-code class="target" position="beginning">
+        <insert-template name="__iter__" />
+      </inject-code>
+    </add-function>
+    <add-function signature="__next__()" return-type="PyObject*">
+      <inject-code class="target" position="beginning">
+      if (**%CPPSELF) {
+          QTreeWidgetItemIterator* %0 = new QTreeWidgetItemIterator((*%CPPSELF)++);
+          %PYARG_0 = %CONVERTTOPYTHON[QTreeWidgetItemIterator*](%0);
+      }
+      </inject-code>
     </add-function>
 
-    <modify-function signature="operator=(QPixmap)" remove="all"/>
+    <add-function signature="value()" return-type="QTreeWidgetItem*">
+        <inject-code>
+        QTreeWidgetItem* %0 = %CPPSELF.operator*();
+        %PYARG_0 = %CONVERTTOPYTHON[QTreeWidgetItem*](%0);
+        Shiboken::Object::releaseOwnership(%PYARG_0);
+        </inject-code>
+    </add-function>
+    <enum-type name="IteratorFlag" flags="IteratorFlags"/>
+    <!-- ### See bug 778 -->
+    <modify-function signature="operator++(int)" remove="all"/>
+    <modify-function signature="operator--(int)" remove="all"/>
+    <modify-function signature="operator++()" remove="all"/>
+    <modify-function signature="operator--()" remove="all"/>
+    <!-- ### Operator* doesn't make sense in Python. -->
+    <modify-function signature="operator*()const" remove="all"/>
+    <!-- ### -->
+  </value-type>
+
+  <template name="load_xpm">
+        Shiboken::AutoDecRef strList(PySequence_Fast(%PYARG_1, "Invalid sequence."));
+        int lineCount = PySequence_Fast_GET_SIZE(strList.object());
+        for (int line = 0; line &lt; lineCount; ++line) {
+            if (!Shiboken::String::check(PySequence_Fast_GET_ITEM(strList.object(), line))) {
+                PyErr_SetString(PyExc_TypeError, "The argument must be a sequence of strings.");
+                break;
+            }
+        }
+
+        const char** xpm = (const char**) malloc (lineCount * sizeof(const char**));
+        for (int line = 0; line &lt; lineCount; ++line)
+            xpm[line] = Shiboken::String::toCString(PySequence_Fast_GET_ITEM(strList.object(), line));
+
+        %BEGIN_ALLOW_THREADS
+        %0 = new %TYPE(xpm);
+        %END_ALLOW_THREADS
+
+        free(xpm);
+  </template>
+  <value-type name="QPixmap" >
+    <!--<conversion-rule>-->
+        <!--<target-to-native replace="no">-->
+            <!--<add-conversion type="QVariant" check="%CHECKTYPE[QVariant](%in)">-->
+            <!--QVariant in = %CONVERTTOCPP[QVariant](%in);-->
+            <!--%out = in.value&lt;%OUTTYPE&gt;();-->
+            <!--</add-conversion>-->
+        <!--</target-to-native>-->
+    <!--</conversion-rule>-->
+    <add-function signature="QPixmap(const QImage&amp;)">
+        <modify-argument index="1">
+            <rename to="image"/>
+        </modify-argument>
+        <inject-code class="target" position="beginning">
+        %0 = new %TYPE(QPixmap::fromImage(%1));
+        </inject-code>
+    </add-function>
+    <modify-function signature="QPixmap(const char **)">
+        <modify-argument index="1">
+            <replace-type modified-type="PySequence" />
+        </modify-argument>
+        <inject-code class="target" position="beginning">
+            <insert-template name="load_xpm" />
+        </inject-code>
+    </modify-function>
+
+    <!-- ### Operator ! doesn't make sense in Python. -->
     <modify-function signature="operator!()const" remove="all"/>
-    <modify-function signature="QPixmap(const char **)" remove="all"/>
-    <modify-function signature="serialNumber()const" remove="all"/>
     <!--### Obsolete in 4.3-->
+    <modify-function signature="serialNumber()const" remove="all"/>
+    <!-- ### -->
+
     <modify-function signature="loadFromData(const uchar*,uint,const char*,QFlags&lt;Qt::ImageConversionFlag&gt;)">
       <modify-argument index="1">
-        <replace-type modified-type="const char*"/>
+        <replace-type modified-type="PyBytes"/>
         <conversion-rule class="native">
-          const uchar* %out = reinterpret_cast&lt;const uchar*>(PyString_AS_STRING(%PYARG_1));
+          const uchar* %out = reinterpret_cast&lt;const uchar*>(PyBytes_AS_STRING(%PYARG_1));
         </conversion-rule>
       </modify-argument>
       <modify-argument index="2">
         <remove-argument/>
         <conversion-rule class="native">
-          uint %out = static_cast&lt;uint>(PyString_GET_SIZE(%PYARG_1));
+          uint %out = static_cast&lt;uint>(PyBytes_Size(%PYARG_1));
         </conversion-rule>
       </modify-argument>
     </modify-function>
@@ -701,8 +849,36 @@
       <include file-name="QTextBlock" location="global"/>
       <include file-name="QTextDocumentFragment" location="global"/>
     </extra-includes>
-    <modify-function signature="operator=(QTextCursor)" remove="all"/>
-    <modify-function signature="selectedTableCells(int*,int*,int*,int*)const" remove="all" />
+    <enum-type name="MoveMode"/>
+    <enum-type name="MoveOperation"/>
+    <enum-type name="SelectionType"/>
+    <modify-function signature="selectedTableCells(int*,int*,int*,int*)const">
+        <modify-argument index="0">
+            <replace-type modified-type="PyObject" />
+        </modify-argument>
+        <modify-argument index="1">
+            <remove-argument/>
+        </modify-argument>
+        <modify-argument index="2">
+            <remove-argument/>
+        </modify-argument>
+        <modify-argument index="3">
+            <remove-argument/>
+        </modify-argument>
+        <modify-argument index="4">
+            <remove-argument/>
+        </modify-argument>
+        <inject-code class="target" position="beginning">
+            <insert-template name="fix_number*,number*,number*,number*">
+                <replace from="$TYPE" to="int" />
+            </insert-template>
+        </inject-code>
+        <inject-code class="native" position="end">
+            <insert-template name="fix_native_return_number*,number*,number*,number*">
+                <replace from="$TYPE" to="int" />
+            </insert-template>
+        </inject-code>
+    </modify-function>
     <modify-function signature="currentFrame()const">
       <modify-argument index="return">
         <define-ownership class="target" owner="default"/>
@@ -719,35 +895,59 @@
       </modify-argument>
     </modify-function>
   </value-type>
-  <value-type name="QTextLayout::FormatRange">
-    <include file-name="QTextLayout" location="global"/>
-  </value-type>
 
-  <!-- only declare this if ndef QT_NO_INPUTMETHOD -->
-  <value-type name="QInputMethodEvent::Attribute">
-    <include file-name="QInputMethodEvent" location="global"/>
-  </value-type>
-  <!-- endif ndef QT_NO_INPUTMETHOD -->
-
-  <value-type name="QItemSelection" >
-    <modify-function signature="operator+(const QList&lt;QItemSelectionRange&gt;&amp;)const" remove="all"/>
-    <modify-function signature="operator+=(const QList&lt;QItemSelectionRange&gt;&amp;)" remove="all"/>
-    <modify-function signature="operator+=(const QItemSelectionRange&amp;)" remove="all"/>
-    <modify-function signature="operator&lt;&lt;(const QList&lt;QItemSelectionRange&gt;&amp;)" remove="all"/>
-    <modify-function signature="operator&lt;&lt;(QItemSelectionRange)" remove="all"/>
-    <add-function signature="__len__">
-        <inject-code class="target" position="beginning">
-            return %CPPSELF.count();
-        </inject-code>
-    </add-function>
-  </value-type>
+  <value-type name="QItemSelection" />
   <value-type name="QMatrix">
     <extra-includes>
       <include file-name="QPainterPath" location="global"/>
     </extra-includes>
-    <modify-function signature="map(int,int,int*,int*)const" remove="all"/>
-    <modify-function signature="map(qreal,qreal,qreal*,qreal*)const" remove="all"/>
-    <modify-function signature="operator=(QMatrix)" remove="all"/>
+    <add-function signature="__repr__" return-type="PyObject*">
+        <inject-code class="target" position="beginning">
+            <insert-template name="repr_code">
+               <replace from="%REPR_FORMAT" to="%f, %f, %f, %f, %f, %f" />
+               <replace from="%REPR_ARGS"
+                        to="%CPPSELF.m11(), %CPPSELF.m12(), %CPPSELF.m21(), %CPPSELF.m22(), %CPPSELF.dx(), %CPPSELF.dy()" />
+             </insert-template>
+        </inject-code>
+    </add-function>
+
+    <add-function signature="__reduce__" return-type="PyObject*">
+        <inject-code class="target" position="beginning">
+            <insert-template name="reduce_code">
+              <replace from="%REDUCE_FORMAT" to="dddddd" />
+              <replace from="%REDUCE_ARGS" to="%CPPSELF.m11(), %CPPSELF.m12(), %CPPSELF.m21(), %CPPSELF.m22(), %CPPSELF.dx(), %CPPSELF.dy()" />
+            </insert-template>
+        </inject-code>
+    </add-function>
+    <template name="qmatrix_map">
+    %ARG1_TYPE a, b;
+    %CPPSELF.%FUNCTION_NAME(%1, %2, &amp;a, &amp;b);
+    %PYARG_0 = PyTuple_New(2);
+    PyTuple_SET_ITEM(%PYARG_0, 0, %CONVERTTOPYTHON[%ARG1_TYPE](a));
+    PyTuple_SET_ITEM(%PYARG_0, 1, %CONVERTTOPYTHON[%ARG1_TYPE](b));
+    </template>
+    <modify-function signature="map(int,int,int*,int*)const">
+        <modify-argument index="3">
+            <remove-argument />
+        </modify-argument>
+        <modify-argument index="4">
+            <remove-argument />
+        </modify-argument>
+        <inject-code>
+            <insert-template name="qmatrix_map" />
+        </inject-code>
+    </modify-function>
+    <modify-function signature="map(qreal,qreal,qreal*,qreal*)const">
+        <modify-argument index="3">
+            <remove-argument />
+        </modify-argument>
+        <modify-argument index="4">
+            <remove-argument />
+        </modify-argument>
+        <inject-code>
+            <insert-template name="qmatrix_map" />
+        </inject-code>
+    </modify-function>
     <modify-function signature="inverted(bool*)const">
       <modify-argument index="1">
         <remove-argument/>
@@ -761,96 +961,321 @@
     </modify-function>
   </value-type>
   <value-type name="QConicalGradient" polymorphic-id-expression="%1-&gt;type() == QGradient::ConicalGradient" />
-  <value-type name="QFontInfo" >
-    <modify-function signature="operator=(QFontInfo)" remove="all"/>
-  </value-type>
+  <value-type name="QFontInfo" />
   <value-type name="QRadialGradient" polymorphic-id-expression="%1-&gt;type() == QGradient::RadialGradient" />
-  <value-type name="QPainterPath::Element">
-    <modify-field name="x" write="false"/>
-    <modify-field name="y" write="false"/>
-    <modify-field name="type" write="false"/>
-    <include file-name="QPainterPath" location="global"/>
-    <modify-function signature="operator QPointF()const" remove="all"/>
-  </value-type>
-  <value-type name="QTextEdit::ExtraSelection" >
-    <include file-name="QTextEdit" location="global"/>
-  </value-type>
   <value-type name="QFont" >
+    <enum-type name="Capitalization"/>
+    <enum-type name="SpacingType"/>
+    <enum-type name="Stretch"/>
+    <enum-type name="Style"/>
+    <enum-type name="StyleHint" />
+    <enum-type name="StyleStrategy"/>
+    <enum-type name="Weight"/>
+    <enum-type name="HintingPreference" since="4.8" revision="4800"/>
     <extra-includes>
       <include file-name="QStringList" location="global"/>
     </extra-includes>
-    <modify-function signature="operator=(QFont)" remove="all"/>
+    <modify-function signature="setStyleHint(QFont::StyleHint, QFont::StyleStrategy)">
+      <modify-argument index="2">
+        <rename to="strategy"/>
+      </modify-argument>
+    </modify-function>
   </value-type>
   <value-type name="QTextTableCell" >
     <extra-includes>
       <include file-name="QTextCursor" location="global"/>
     </extra-includes>
-    <modify-function signature="operator=(QTextTableCell)" remove="all"/>
   </value-type>
   <value-type name="QImage">
+    <enum-type name="Format"/>
+    <enum-type name="InvertMode"/>
     <extra-includes>
       <include file-name="QStringList" location="global"/>
       <include file-name="QMatrix" location="global"/>
     </extra-includes>
 
-    <modify-function signature="QImage(const char *, const char *)" remove="all" />
-    <modify-function signature="QImage(const char **)" remove="all" />
-    <modify-function signature="QImage(const uchar*,int,int,int,QImage::Format)" remove="all" />
-    <modify-function signature="bits()const" remove="all" />
-    <modify-function signature="scanLine(int)const" remove="all" />
-    <modify-function signature="QImage(const uchar *, int, int, QImage::Format)" remove="all" />
-    <modify-function signature="QImage(uchar*,int,int,QImage::Format)" remove="all" />
+    <template name="qimage_buffer_constructor">
+        uchar* ptr = (uchar*) Shiboken::Buffer::getPointer(%PYARG_1);
+        %0 = new %TYPE(ptr, %ARGS);
+    </template>
+    <modify-function signature="QImage(uchar *,int,int,int,QImage::Format)">
+        <modify-argument index="1">
+            <replace-type modified-type="PyBuffer"/>
+        </modify-argument>
+        <inject-code>
+            <insert-template name="qimage_buffer_constructor">
+                <replace from="%ARGS" to="%2, %3, %4, %5" />
+            </insert-template>
+        </inject-code>
+    </modify-function>
+    <modify-function signature="QImage(uchar*,int,int,QImage::Format)">
+        <modify-argument index="1">
+            <replace-type modified-type="PyBuffer"/>
+        </modify-argument>
+        <inject-code>
+            <insert-template name="qimage_buffer_constructor">
+                <replace from="%ARGS" to="%2, %3, %4" />
+            </insert-template>
+        </inject-code>
+    </modify-function>
+
+    <add-function signature="QImage(QString&amp;,int,int,int,QImage::Format)">
+        <inject-code>
+            <insert-template name="qimage_buffer_constructor">
+                <replace from="%ARGS" to="%2, %3, %4, %5" />
+            </insert-template>
+        </inject-code>
+    </add-function>
+    <add-function signature="QImage(QString&amp;,int,int,QImage::Format)">
+        <inject-code>
+            <insert-template name="qimage_buffer_constructor">
+                <replace from="%ARGS" to="%2, %3, %4" />
+            </insert-template>
+        </inject-code>
+    </add-function>
+
+    <!-- The non-const versions are already used -->
+    <modify-function signature="QImage(const uchar*,int,int,int,QImage::Format)" remove="all"/>
+    <modify-function signature="QImage(const uchar*,int,int,QImage::Format)" remove="all" />
+    <!-- ### -->
+
+    <modify-function signature="QImage(const char**)">
+        <modify-argument index="1">
+            <replace-type modified-type="PySequence" />
+        </modify-argument>
+        <inject-code class="target" position="beginning">
+            <insert-template name="load_xpm" />
+        </inject-code>
+    </modify-function>
+    <!-- ### "QImage(const char*,const char*)" is just an overload for "QImage(QString,const char*)" -->
+    <modify-function signature="QImage(const char*,const char*)" remove="all" />
+    <!-- ### There is already an fromData with a QByteArray type (that is convertible from Python's str) as the first type. -->
+    <modify-function signature="fromData(const uchar*,int,const char*)" remove="all"/>
+    <!-- ### There is already an loadFromData with a QByteArray type (that is convertible from Python's str) as the first type. -->
     <modify-function signature="loadFromData(const uchar*,int,const char*)" remove="all" />
-    <modify-function signature="operator=(QImage)" remove="all"/>
+
+    <!-- ### Functions removed because we already have overloads using QString -->
     <modify-function signature="setText(const char*,const char*,QString)" remove="all" />
     <modify-function signature="text(const char*,const char*)const" remove="all" />
+    <!-- ### -->
+
+    <!--### Obsolete in 4.3-->
     <modify-function signature="serialNumber()const" remove="all"/>
-    <!--### Obsolete in 4.3-->
     <modify-function signature="textLanguages()const" remove="all"/>
-    <!--### Obsolete in 4.3-->
-    <modify-function signature="QImage(const char**)" remove="all"/>
-    <modify-function signature="QImage(const uchar *,int,int,QImage::Format)" remove="all"/>
-    <modify-function signature="QImage(const uchar *,int,int,int,QImage::Format)" remove="all"/>
-    <modify-function signature="QImage(uchar *,int,int,QImage::Format)" remove="all"/>
-    <modify-function signature="QImage(uchar *,int,int,int,QImage::Format)" remove="all"/>
-    <modify-function signature="setColorTable(const QVector&lt;uint&gt;)" remove="all"/>
-    <modify-function signature="loadFromData(const uchar *,int,const char *)" remove="all"/>
-    <modify-function signature="fromData(const uchar *,int,const char *)" remove="all"/>
-    <modify-function signature="bits()" remove="all"/>
-    <modify-function signature="scanLine(int)" remove="all"/>
+    <!--### end of obsolete section -->
+
+    <modify-function signature="constBits()const" since="4.7">
+        <inject-code>
+            %PYARG_0 = Shiboken::Buffer::newObject(%CPPSELF.%FUNCTION_NAME(), %CPPSELF.byteCount());
+        </inject-code>
+    </modify-function>
+    <modify-function signature="bits()">
+        <inject-code>
+            // byteCount() is only available on Qt4.7, so we use bytesPerLine * height
+            %PYARG_0 = Shiboken::Buffer::newObject(%CPPSELF.%FUNCTION_NAME(), %CPPSELF.bytesPerLine() * %CPPSELF.height(), Shiboken::Buffer::ReadWrite);
+        </inject-code>
+    </modify-function>
+    <modify-function signature="constScanLine(int)const" since="4.7">
+        <inject-code>
+            %PYARG_0 = Shiboken::Buffer::newObject(%CPPSELF.%FUNCTION_NAME(%1), %CPPSELF.bytesPerLine());
+        </inject-code>
+        <modify-argument index="return">
+            <replace-type modified-type="PyObject" />
+        </modify-argument>
+    </modify-function>
+    <modify-function signature="scanLine(int)">
+        <inject-code>
+            %PYARG_0 = Shiboken::Buffer::newObject(%CPPSELF.%FUNCTION_NAME(%1), %CPPSELF.bytesPerLine(), Shiboken::Buffer::ReadWrite);
+        </inject-code>
+        <modify-argument index="return">
+            <replace-type modified-type="PyObject" />
+        </modify-argument>
+    </modify-function>
+    <!--
+        Only the non-const version of bits() and scanLine() is exported to Python
+        If the user don't want to detach the QImage data he must use constBits or constScanLine
+        as Python doesn't have the concept of constness.
+    -->
+    <modify-function signature="bits()const" remove="all"/>
+    <modify-function signature="scanLine(int)const" remove="all"/>
+
+    <modify-function signature="invertPixels(QImage::InvertMode)">
+      <modify-argument index="1">
+        <rename to="mode"/>
+      </modify-argument>
+    </modify-function>
   </value-type>
   <value-type name="QCursor" >
     <extra-includes>
       <include file-name="QPixmap" location="global"/>
       <include file-name="Qt" location="global"/>
     </extra-includes>
-    <modify-function signature="operator=(QCursor)" remove="all"/>
   </value-type>
   <value-type name="QFontDatabase" >
     <extra-includes>
       <include file-name="QStringList" location="global"/>
     </extra-includes>
+    <enum-type name="WritingSystem" />
   </value-type>
   <value-type name="QPen">
     <extra-includes>
       <include file-name="QBrush" location="global"/>
     </extra-includes>
-    <modify-function signature="operator=(QPen)" remove="all"/>
   </value-type>
   <value-type name="QBrush">
-    <modify-function signature="operator=(const QBrush &amp;)" remove="all"/>
     <extra-includes>
       <include file-name="QPixmap" location="global"/>
     </extra-includes>
   </value-type>
+
+  <template name="qcolor_repr">
+      switch(%CPPSELF.spec()) {
+        case QColor::Rgb:
+        {
+            qreal r, g, b, a;
+            %CPPSELF.getRgbF(&amp;r, &amp;g, &amp;b, &amp;a);
+            QString repr = QString().sprintf("PySide.QtGui.QColor.fromRgbF(%.6f, %.6f, %.6f, %.6f)", r, g, b, a);
+            %PYARG_0 = Shiboken::String::fromCString(qPrintable(repr));
+            break;
+        }
+        case QColor::Hsv:
+        {
+            qreal h, s, v, a;
+            %CPPSELF.getHsvF(&amp;h, &amp;s, &amp;v, &amp;a);
+            QString repr = QString().sprintf("PySide.QtGui.QColor.fromHsvF(%.6f, %.6f, %.6f, %.6f)", h, s, v, a);
+            %PYARG_0 = Shiboken::String::fromCString(qPrintable(repr));
+            break;
+        }
+        case QColor::Cmyk:
+        {
+            qreal c, m, y, k, a;
+            %CPPSELF.getCmykF(&amp;c, &amp;m, &amp;y, &amp;k, &amp;a);
+            QString repr = QString().sprintf("PySide.QtGui.QColor.fromCmykF(%.6f, %.6f, %.6f, %.6f, %.6f)", c, m, y, k, a);
+            %PYARG_0 = Shiboken::String::fromCString(qPrintable(repr));
+            break;
+        }
+        #if QT_VERSION >= 0x040600
+        case QColor::Hsl:
+        {
+            qreal h, s, l, a;
+            %CPPSELF.getHslF(&amp;h, &amp;s, &amp;l, &amp;a);
+            QString repr = QString().sprintf("PySide.QtGui.QColor.fromHslF(%.6f, %.6f, %.6f, %.6f)", h, s, l, a);
+            %PYARG_0 = Shiboken::String::fromCString(qPrintable(repr));
+            break;
+        }
+        #endif
+        default:
+        {
+            %PYARG_0 = Shiboken::String::fromCString("PySide.QtGui.QColor()");
+        }
+     }
+  </template>
   <value-type name="QColor">
+    <enum-type name="Spec"/>
     <extra-includes>
       <include file-name="QVariant" location="global"/>
     </extra-includes>
+    <add-function signature="__repr__" return-type="PyObject*">
+        <inject-code class="target" position="beginning">
+            <insert-template name="qcolor_repr" />
+        </inject-code>
+    </add-function>
+    <add-function signature="__str__" return-type="PyObject*">
+        <inject-code class="target" position="beginning">
+            <insert-template name="qcolor_repr" />
+        </inject-code>
+    </add-function>
+    <add-function signature="__setstate__(PyObject*)" return-type="PyObject">
+        <inject-code>
+            Shiboken::AutoDecRef func(PyObject_GetAttr(%PYSELF, PyTuple_GET_ITEM(%1, 0)));
+            PyObject* args = PyTuple_GET_ITEM(%1, 1);
+            %PYARG_0 = PyObject_Call(func, args, NULL);
+        </inject-code>
+    </add-function>
+    <add-function signature="__reduce__" return-type="PyObject">
+        <inject-code class="target" position="beginning">
+          switch(%CPPSELF.spec()) {
+            case QColor::Rgb:
+            {
+                qreal r, g, b, a;
+                %CPPSELF.getRgbF(&amp;r, &amp;g, &amp;b, &amp;a);
+                %PYARG_0 = Py_BuildValue("(ON(s(ffff)))", Py_TYPE(%PYSELF), PyTuple_New(0), "setRgbF", (float)r, (float)g, (float)b, (float)a);
+                break;
+            }
+            case QColor::Hsv:
+            {
+                qreal h, s, v, a;
+                %CPPSELF.getHsvF(&amp;h, &amp;s, &amp;v, &amp;a);
+                %PYARG_0 = Py_BuildValue("(ON(s(ffff)))", Py_TYPE(%PYSELF), PyTuple_New(0), "setHsvF", (float)h, (float)s, (float)v, (float)a);
+                break;
+            }
+            case QColor::Cmyk:
+            {
+                qreal c, m, y, k, a;
+                %CPPSELF.getCmykF(&amp;c, &amp;m, &amp;y, &amp;k, &amp;a);
+                %PYARG_0 = Py_BuildValue("(ON(s(fffff)))", Py_TYPE(%PYSELF), PyTuple_New(0), "setCmykF", (float)c, (float)m, (float)y, (float)k, (float)a);
+                break;
+            }
+            #if QT_VERSION >= 0x040600
+            case QColor::Hsl:
+            {
+                qreal h, s, l, a;
+                %CPPSELF.getHslF(&amp;h, &amp;s, &amp;l, &amp;a);
+                %PYARG_0 = Py_BuildValue("(ON(s(ffff)))", Py_TYPE(%PYSELF), PyTuple_New(0), "setHslF", (float)h, (float)s, (float)l, (float)a);
+                break;
+            }
+            #endif
+            default:
+            {
+                %PYARG_0 = Py_BuildValue("(N(O))", PyObject_Type(%PYSELF), Py_None);
+            }
+          }
+        </inject-code>
+    </add-function>
+
+    <add-function signature="toTuple" return-type="PyObject">
+        <inject-code class="target" position="beginning">
+          switch(%CPPSELF.spec()) {
+          case QColor::Rgb:
+          {
+                int r, g, b, a;
+                %CPPSELF.getRgb(&amp;r, &amp;g, &amp;b, &amp;a);
+                %PYARG_0 = Py_BuildValue("iiii", r, g, b, a);
+                break;
+          }
+          case QColor::Hsv:
+          {
+                int h, s, v, a;
+                %CPPSELF.getHsv(&amp;h, &amp;s, &amp;v, &amp;a);
+                %PYARG_0 = Py_BuildValue("iiii", h, s, v, a);
+                break;
+          }
+          case QColor::Cmyk:
+          {
+                int c, m, y, k, a;
+                %CPPSELF.getCmyk(&amp;c, &amp;m, &amp;y, &amp;k, &amp;a);
+                %PYARG_0 = Py_BuildValue("iiiii", c, m, y, k, a);
+                break;
+          }
+          case QColor::Hsl:
+          {
+                int h, s, l, a;
+                %CPPSELF.getHsl(&amp;h, &amp;s, &amp;l, &amp;a);
+                %PYARG_0 = Py_BuildValue("iiii", h, s, l, a);
+                break;
+          }
+          default:
+          {
+                %PYARG_0 = 0;
+          }
+        }
+        </inject-code>
+    </add-function>
+    <!-- ### "QColor(QColor::Spec)" is an internal method. -->
     <modify-function signature="QColor(QColor::Spec)" remove="all"/>
-    <modify-function signature="operator=(QColor)" remove="all"/>
-    <modify-function signature="operator=(Qt::GlobalColor)" remove="all"/>
+    <!-- ### Constructor removed because we already have an overload using QString. -->
     <modify-function signature="QColor(const char*)" remove="all" />
+    <!-- ### -->
     <add-function signature="QColor(QVariant)">
         <inject-code class="target" position="beginning">
         if (%1.type() == QVariant::Color)
@@ -882,7 +1307,9 @@
         </modify-argument>
 
         <inject-code class="target" position="beginning">
-            <insert-template name="fix_int*,int*,int*,int*,int*"/>
+            <insert-template name="fix_number*,number*,number*,number*,number*">
+                <replace from="$TYPE" to="int" />
+            </insert-template>
         </inject-code>
     </modify-function>
     <modify-function signature="getCmykF(qreal*,qreal*,qreal*,qreal*,qreal*)">
@@ -907,10 +1334,12 @@
         </modify-argument>
 
         <inject-code class="target" position="beginning">
-            <insert-template name="fix_qreal*,qreal*,qreal*,qreal*,qreal*"/>
+            <insert-template name="fix_number*,number*,number*,number*,number*">
+                <replace from="$TYPE" to="qreal" />
+            </insert-template>
         </inject-code>
     </modify-function>
-    <modify-function signature="getHsl(int*,int*,int*,int*)const">
+    <modify-function signature="getHsl(int*,int*,int*,int*)const" since="4.6">
         <modify-argument index="0">
             <replace-type modified-type="PyObject *" />
         </modify-argument>
@@ -928,10 +1357,12 @@
             <remove-default-expression/>
         </modify-argument>
         <inject-code class="target" position="beginning">
-            <insert-template name="fix_int*,int*,int*,int*"/>
+            <insert-template name="fix_number*,number*,number*,number*">
+                <replace from="$TYPE" to="int" />
+            </insert-template>
         </inject-code>
     </modify-function>
-    <modify-function signature="getHslF(qreal*,qreal*,qreal*,qreal*)const">
+    <modify-function signature="getHslF(qreal*,qreal*,qreal*,qreal*)const" since="4.6">
         <modify-argument index="0">
             <replace-type modified-type="PyObject *" />
         </modify-argument>
@@ -949,7 +1380,9 @@
             <remove-default-expression/>
         </modify-argument>
         <inject-code class="target" position="beginning">
-            <insert-template name="fix_qreal*,qreal*,qreal*,qreal*"/>
+            <insert-template name="fix_number*,number*,number*,number*">
+                <replace from="$TYPE" to="qreal" />
+            </insert-template>
         </inject-code>
     </modify-function>
     <modify-function signature="getHsv(int*,int*,int*,int*)const">
@@ -970,7 +1403,9 @@
             <remove-default-expression/>
         </modify-argument>
         <inject-code class="target" position="beginning">
-            <insert-template name="fix_int*,int*,int*,int*"/>
+            <insert-template name="fix_number*,number*,number*,number*">
+                <replace from="$TYPE" to="int" />
+            </insert-template>
         </inject-code>
     </modify-function>
     <modify-function signature="getHsvF(qreal*,qreal*,qreal*,qreal*)const">
@@ -991,7 +1426,9 @@
             <remove-default-expression/>
         </modify-argument>
         <inject-code class="target" position="beginning">
-            <insert-template name="fix_qreal*,qreal*,qreal*,qreal*"/>
+            <insert-template name="fix_number*,number*,number*,number*">
+                <replace from="$TYPE" to="qreal" />
+            </insert-template>
         </inject-code>
     </modify-function>
     <modify-function signature="getRgb(int*,int*,int*,int*)const">
@@ -1012,7 +1449,9 @@
             <remove-default-expression/>
         </modify-argument>
         <inject-code class="target" position="beginning">
-            <insert-template name="fix_int*,int*,int*,int*"/>
+            <insert-template name="fix_number*,number*,number*,number*">
+                <replace from="$TYPE" to="int" />
+            </insert-template>
         </inject-code>
     </modify-function>
     <modify-function signature="getRgbF(qreal*,qreal*,qreal*,qreal*)const">
@@ -1033,15 +1472,36 @@
             <remove-default-expression/>
         </modify-argument>
         <inject-code class="target" position="beginning">
-            <insert-template name="fix_qreal*,qreal*,qreal*,qreal*"/>
+            <insert-template name="fix_number*,number*,number*,number*">
+                <replace from="$TYPE" to="qreal" />
+            </insert-template>
         </inject-code>
     </modify-function>
-    <modify-function signature="dark(int)const" remove="all"/>
     <!--### Obsolete in 4.3-->
+    <modify-function signature="dark(int)const" remove="all"/>
     <modify-function signature="light(int)const" remove="all"/>
+    <!--### End of obsolete section -->
   </value-type>
   <value-type name="QFontMetricsF" >
 
+    <modify-function signature="boundingRect(QChar)const" rename="boundingRectChar">
+      <modify-argument index="1">
+        <replace-type modified-type="char"/>
+      </modify-argument>
+      <inject-code class="target" position="beginning">
+        <insert-template name="QFontCharFix"/>
+     </inject-code>
+    </modify-function>
+
+    <modify-function signature="width(QChar)const" rename="widthChar">
+      <modify-argument index="1">
+        <replace-type modified-type="char"/>
+      </modify-argument>
+      <inject-code class="target" position="beginning">
+        <insert-template name="QFontCharFix"/>
+     </inject-code>
+    </modify-function>
+
     <modify-function signature="boundingRect(QRectF,int,QString,int,int*)const">
       <modify-argument index="5">
           <replace-type modified-type="PyObject"/>
@@ -1097,12 +1557,27 @@
         }
       </inject-code>
     </modify-function>
-
-    <modify-function signature="operator=(QFontMetricsF)" remove="all"/>
-    <modify-function signature="operator=(QFontMetricsF)" remove="all"/>
   </value-type>
-  <value-type name="QTextOption::Tab"/>
   <value-type name="QFontMetrics" >
+
+    <modify-function signature="boundingRect(QChar)const" rename="boundingRectChar">
+      <modify-argument index="1">
+        <replace-type modified-type="char"/>
+      </modify-argument>
+      <inject-code class="target" position="beginning">
+        <insert-template name="QFontCharFix"/>
+     </inject-code>
+    </modify-function>
+
+    <modify-function signature="width(QChar)const" rename="widthChar">
+      <modify-argument index="1">
+        <replace-type modified-type="char"/>
+      </modify-argument>
+      <inject-code class="target" position="beginning">
+        <insert-template name="QFontCharFix"/>
+     </inject-code>
+    </modify-function>
+
     <modify-function signature="boundingRect(int,int,int,int,int,QString,int,int*)const">
       <modify-argument index="8">
         <replace-type modified-type="PyObject"/>
@@ -1187,14 +1662,14 @@
 
       </inject-code>
     </modify-function>
-
-    <modify-function signature="operator=(QFontMetrics)" remove="all"/>
   </value-type>
-  <value-type name="QGradient" force-abstract="yes" polymorphic-id-expression="%1-&gt;type() == QGradient::NoGradient" />
+  <value-type name="QGradient" force-abstract="yes" polymorphic-id-expression="%1-&gt;type() == QGradient::NoGradient">
+      <enum-type name="CoordinateMode"/>
+      <enum-type name="InterpolationMode"/>
+      <enum-type name="Spread" lower-bound="QGradient.PadSpread" upper-bound="QGradient.RepeatSpread"/>
+      <enum-type name="Type"/>
+  </value-type>
   <value-type name="QLinearGradient" polymorphic-id-expression="%1-&gt;type() == QGradient::LinearGradient" />
-  <value-type name="QPrinterInfo">
-    <modify-function signature="operator=(const QPrinterInfo &amp;)" remove="all"/>
-  </value-type>
   <object-type name="QLayoutItem">
 
     <modify-function signature="widget()">
@@ -1216,24 +1691,38 @@
     </modify-function>
 
   </object-type>
-  <object-type name="QPaintDevice"/>
+  <object-type name="QPaintDevice">
+      <enum-type name="PaintDeviceMetric"/>
+  </object-type>
   <object-type name="QGraphicsItem">
+    <enum-type name="CacheMode"/>
+    <enum-type name="Extension"/>
+    <enum-type name="GraphicsItemChange"/>
+    <enum-type name="GraphicsItemFlag" flags="GraphicsItemFlags"/>
+    <enum-type name="PanelModality" since="4.6"/>
     <inject-code class="target" position="end">
         PyObject* userTypeConstant =  PyInt_FromLong(QGraphicsItem::UserType);
-        PyDict_SetItemString(SbkQGraphicsItem_Type.super.ht_type.tp_dict, "UserType", userTypeConstant);
+        PyDict_SetItemString(Sbk_QGraphicsItem_Type.super.ht_type.tp_dict, "UserType", userTypeConstant);
     </inject-code>
     <modify-function signature="setParentItem(QGraphicsItem *)">
       <modify-argument index="this">
         <parent index="1" action="add"/>
       </modify-argument>
     </modify-function>
+    <template name="scene_return_parenting">
+    if (%0) {
+        QObject* parent = %0->parent();
+        Shiboken::AutoDecRef pyParent(%CONVERTTOPYTHON[QObject*](parent));
+        Shiboken::Object::setParent(pyParent, %PYARG_0);
+    }
+    </template>
     <modify-function signature="scene() const">
-      <modify-argument index="return">
-        <define-ownership owner="target"/>
-      </modify-argument>
-      <modify-argument index="this">
-        <parent index="return" action="add"/>
-      </modify-argument>
+        <inject-code position="end">
+            <insert-template name="scene_return_parenting"/>
+        </inject-code>
+        <modify-argument index="this">
+          <parent index="return" action="add"/>
+        </modify-argument>
     </modify-function>
 
     <modify-function signature="parentItem() const">
@@ -1245,13 +1734,14 @@
       </modify-argument>
     </modify-function>
     <modify-function signature="parentWidget() const">
-        <modify-argument index="return">
-          <define-ownership owner="target"/>
-        </modify-argument>
         <modify-argument index="this">
           <parent index="return" action="add"/>
         </modify-argument>
+        <modify-argument index="return">
+          <define-ownership class="target" owner="default"/>
+        </modify-argument>
     </modify-function>
+    <!-- ### Obsolete -->
     <modify-function signature="setMatrix(QMatrix, bool)" remove="all"/>
     <modify-function signature="paint(QPainter*,const QStyleOptionGraphicsItem*,QWidget*)">
       <modify-argument index="1" invalidate-after-use="yes"/>
@@ -1292,16 +1782,33 @@
     <modify-function signature="inputMethodEvent(QInputMethodEvent*)">
       <modify-argument index="1" invalidate-after-use="yes"/>
     </modify-function>
-    <modify-function signature="isBlockedByModalPanel(QGraphicsItem**)const">
+    <modify-function signature="isBlockedByModalPanel(QGraphicsItem**)const" since="4.6">
       <modify-argument index="1">
         <remove-argument/>
       </modify-argument>
+      <modify-argument index="return">
+        <replace-type modified-type="(retval, blockingPanel)"/>
+      </modify-argument>
       <inject-code class="target" position="beginning">
-        QGraphicsItem *item_ = NULL;
-        %RETURN_TYPE retval_ = %CPPSELF.%FUNCTION_NAME(&amp;item_);
-        %PYARG_0 = Shiboken::makeTuple(retval_, item_);
+      QGraphicsItem *item_ = NULL;
+      %RETURN_TYPE retval_ = %CPPSELF.%FUNCTION_NAME(&amp;item_);
+      %PYARG_0 = PyTuple_New(2);
+      PyTuple_SET_ITEM(%PYARG_0, 0, %CONVERTTOPYTHON[%RETURN_TYPE](retval_));
+      PyTuple_SET_ITEM(%PYARG_0, 1, %CONVERTTOPYTHON[QGraphicsItem*](item_));
       </inject-code>
     </modify-function>
+    <modify-function signature="itemTransform(const QGraphicsItem*,bool*)const">
+        <modify-argument index="2">
+            <remove-argument />
+            <remove-default-expression />
+        </modify-argument>
+        <modify-argument index="return">
+            <replace-type modified-type="(QTransform, bool ok)"/>
+        </modify-argument>
+        <inject-code class="target" position="beginning">
+            <insert-template name="fix_args,bool*" />
+        </inject-code>
+    </modify-function>
     <modify-function signature="isObscuredBy(const QGraphicsItem*)const">
       <modify-argument index="1" invalidate-after-use="yes"/>
     </modify-function>
@@ -1333,20 +1840,49 @@
     <modify-function signature="wheelEvent(QGraphicsSceneWheelEvent*)">
       <modify-argument index="1" invalidate-after-use="yes"/>
     </modify-function>
+    <!--### Obsolete in 4.3-->
     <modify-function signature="children()const" remove="all"/>
     <modify-function signature="matrix()const" remove="all"/>
-    <!--### Obsolete in 4.3-->
     <modify-function signature="resetMatrix()" remove="all"/>
-    <!--### Obsolete in 4.3-->
     <modify-function signature="sceneMatrix()const" remove="all"/>
-    <!--### Obsolete in 4.3-->
     <modify-function signature="setMatrix(QMatrix, bool)" remove="all"/>
-    <!--### Obsolete in 4.3-->
+    <!--### End of obsolete section -->
+    <!-- ### These methods are internal on Qt. -->
     <modify-function signature="supportsExtension(QGraphicsItem::Extension)const" remove="all"/>
     <modify-function signature="setExtension(QGraphicsItem::Extension,QVariant)" remove="all"/>
+    <!-- ### -->
   </object-type>
   <object-type name="QAbstractGraphicsShapeItem"/>
   <object-type name="QAbstractItemView">
+    <enum-type name="CursorAction"/>
+    <enum-type name="DragDropMode"/>
+    <enum-type name="DropIndicatorPosition"/>
+    <enum-type name="EditTrigger" flags="EditTriggers"/>
+    <enum-type name="ScrollHint"/>
+    <enum-type name="ScrollMode"/>
+    <enum-type name="SelectionBehavior"/>
+    <enum-type name="SelectionMode"/>
+    <enum-type name="State"/>
+    <modify-function signature="setModel(QAbstractItemModel*)">
+      <modify-argument index="1">
+        <reference-count action="set"/>
+      </modify-argument>
+    </modify-function>
+    <modify-function signature="setSelectionModel(QItemSelectionModel*)">
+      <modify-argument index="1">
+        <reference-count action="set"/>
+      </modify-argument>
+    </modify-function>
+    <modify-function signature="setItemDelegate(QAbstractItemDelegate*)">
+      <modify-argument index="1">
+        <reference-count action="set"/>
+      </modify-argument>
+    </modify-function>
+    <modify-function signature="viewOptions()const">
+      <modify-argument index="return">
+        <replace-default-expression with="QStyleOptionViewItem()" />
+      </modify-argument>
+    </modify-function>
     <modify-function signature="model() const">
       <modify-argument index="return">
         <!-- Defining ownership as "default" avoids the object to be automatically
@@ -1359,30 +1895,28 @@
         <parent index="this" action="add"/>
       </modify-argument>
     </modify-function>
+    <!--### Obsolete in 4.3-->
     <modify-function signature="horizontalStepsPerItem()const" remove="all"/>
-    <!--### Obsolete in 4.3-->
     <modify-function signature="setHorizontalStepsPerItem(int)" remove="all"/>
-    <!--### Obsolete in 4.3-->
     <modify-function signature="setVerticalStepsPerItem(int)" remove="all"/>
-    <!--### Obsolete in 4.3-->
     <modify-function signature="verticalStepsPerItem()const" remove="all"/>
-    <!--### Obsolete in 4.3-->
+    <!--### End of obsolete section -->
     <modify-function signature="edit(QModelIndex,QAbstractItemView::EditTrigger,QEvent*)">
       <modify-argument index="3" invalidate-after-use="yes"/>
     </modify-function>
     <modify-function signature="selectionCommand(QModelIndex,const QEvent*)const">
       <modify-argument index="2" invalidate-after-use="yes"/>
     </modify-function>
-    <!-- ### because the CursorAction enum is protected -->
-    <modify-function signature="moveCursor(QAbstractItemView::CursorAction,QFlags&lt;Qt::KeyboardModifier&gt;)" remove="all"/>
-  </object-type>
-  <object-type name="QAbstractPrintDialog">
-      <modify-function signature="exec()" rename="exec_" allow-thread="yes" />
   </object-type>
   <object-type name="QAbstractSlider">
-    <modify-function signature="sliderChange(QAbstractSlider::SliderChange)" remove="all"/>
+    <enum-type name="SliderAction"/>
+    <enum-type name="SliderChange"/>
   </object-type>
   <object-type name="QAbstractTextDocumentLayout">
+    <value-type name="PaintContext" >
+      <include file-name="QAbstractTextDocumentLayout" location="global"/>
+    </value-type>
+    <value-type name="Selection" />
     <modify-function signature="setPaintDevice(QPaintDevice*)">
       <modify-argument index="1">
         <parent index="this" action="add"/>
@@ -1395,6 +1929,7 @@
       <modify-argument index="1" invalidate-after-use="yes"/>
     </modify-function>
   </object-type>
+  <object-type name="QPyTextObject" />
   <object-type name="QActionGroup">
     <modify-function signature="addAction(QAction*)">
       <modify-argument index="1">
@@ -1410,28 +1945,19 @@
   <object-type name="QCDEStyle">
     <modify-function signature="standardIconImplementation(QStyle::StandardPixmap, const QStyleOption *, const QWidget *)const" virtual-slot="yes"/>
   </object-type>
-  <object-type name="QGtkStyle">
-    <modify-function signature="standardPixmap(QStyle::StandardPixmap,const QStyleOption*,const QWidget*)const">
-      <modify-argument index="2">
-        <replace-default-expression with="0"/>
-      </modify-argument>
-      <modify-argument index="3">
-        <replace-default-expression with="0"/>
-      </modify-argument>
-    </modify-function>
-  </object-type>
   <object-type name="QCheckBox"/>
   <object-type name="QCleanlooksStyle">
-    <modify-function signature="standardPixmap(QStyle::StandardPixmap,const QStyleOption*,const QWidget*)const" remove="all"/>
     <!--### Obsolete in 4.3-->
+    <modify-function signature="standardPixmap(QStyle::StandardPixmap,const QStyleOption*,const QWidget*)const" remove="all"/>
     <modify-function signature="standardIconImplementation(QStyle::StandardPixmap, const QStyleOption *, const QWidget *)const" virtual-slot="yes"/>
   </object-type>
   <object-type name="QCommonStyle">
-    <modify-function signature="standardPixmap(QStyle::StandardPixmap, const QStyleOption*,const QWidget*)const" remove="all"/>
     <!--### Obsolete in 4.3-->
+    <modify-function signature="standardPixmap(QStyle::StandardPixmap, const QStyleOption*,const QWidget*)const" remove="all"/>
     <modify-function signature="standardIconImplementation(QStyle::StandardPixmap, const QStyleOption *, const QWidget *)const" virtual-slot="yes"/>
   </object-type>
   <object-type name="QDataWidgetMapper">
+    <enum-type name="SubmitPolicy"/>
     <modify-function signature="addMapping(QWidget*,int)">
       <modify-argument index="1">
         <parent index="this" action="add"/>
@@ -1449,30 +1975,34 @@
     </modify-function>
     <modify-function signature="setItemDelegate(QAbstractItemDelegate*)">
       <modify-argument index="1">
-        <parent index="this" action="add"/>
+        <reference-count action="set"/>
       </modify-argument>
     </modify-function>
     <modify-function signature="setModel(QAbstractItemModel*)">
       <modify-argument index="1">
-        <reference-count action="add"/>
+        <reference-count action="set"/>
       </modify-argument>
     </modify-function>
   </object-type>
   <object-type name="QDateEdit"/>
-  <object-type name="QDesktopServices"/>
+  <object-type name="QDesktopServices">
+      <enum-type name="StandardLocation"/>
+  </object-type>
   <object-type name="QDialog">
-    <modify-function signature="setExtension(QWidget*)" remove="all"/>
+    <enum-type name="DialogCode"/>
     <modify-function signature="exec()" rename="exec_" allow-thread="yes"/>
+    <!--### Obsolete in 4.3-->
     <modify-function signature="extension()const" remove="all"/>
-    <!--### Obsolete in 4.3-->
     <modify-function signature="orientation()const" remove="all"/>
-    <!--### Obsolete in 4.3-->
     <modify-function signature="setOrientation(Qt::Orientation)" remove="all"/>
-    <!--### Obsolete in 4.3-->
     <modify-function signature="showExtension(bool)" remove="all"/>
-    <!--### Obsolete in 4.3-->
+    <modify-function signature="setExtension(QWidget*)" remove="all"/>
+    <!--### End of obsolete section -->
   </object-type>
   <object-type name="QDialogButtonBox">
+    <enum-type name="ButtonLayout"/>
+    <enum-type name="ButtonRole"/>
+    <enum-type name="StandardButton" flags="StandardButtons" />
     <modify-function signature="addButton(QAbstractButton*,QDialogButtonBox::ButtonRole)">
       <modify-argument index="1">
         <parent index="this" action="add"/>
@@ -1485,6 +2015,9 @@
     </modify-function>
   </object-type>
   <object-type name="QDirModel" polymorphic-id-expression="qobject_cast&lt;QDirModel*&gt;(%1)">
+    <enum-type name="Roles"/>
+    <!-- ### This reimplementation of "QObject::parent()" is used in C++ only
+         when "using QObject::parent;" is not available. It's useless in Python. -->
     <modify-function signature="parent()const" remove="all"/>
     <modify-function signature="setIconProvider(QFileIconProvider*)">
       <modify-argument index="1">
@@ -1492,11 +2025,17 @@
       </modify-argument>
     </modify-function>
   </object-type>
-  <object-type name="QDoubleValidator"/>
-  <object-type name="QFileIconProvider"/>
+  <object-type name="QDoubleValidator">
+      <enum-type name="Notation"/>
+  </object-type>
+  <object-type name="QFileIconProvider">
+      <enum-type name="IconType"/>
+  </object-type>
   <object-type name="QWizard">
-    <!-- ### Requires correct class name in meta object -->
-    <modify-function signature="setDefaultProperty(const char *, const char *, const char *)" remove="all"/>
+    <enum-type name="WizardButton" />
+    <enum-type name="WizardOption" flags="WizardOptions"/>
+    <enum-type name="WizardPixmap"/>
+    <enum-type name="WizardStyle"/>
     <modify-function signature="addPage(QWizardPage*)">
       <modify-argument index="1">
         <no-null-pointer/>
@@ -1510,8 +2049,11 @@
     </modify-function>
   </object-type>
   <object-type name="QWizardPage">
-    <!-- ### Reduced functionality due to meta object having missing information -->
-    <modify-function signature="registerField(const QString &amp;, QWidget *, const char *, const char *)" remove="all" />
+    <modify-function signature="wizard()const">
+      <modify-argument index="this">
+        <parent index="return" action="add"/>
+      </modify-argument>
+    </modify-function>
   </object-type>
   <object-type name="QFocusFrame">
     <modify-function signature="setWidget(QWidget*)">
@@ -1520,8 +2062,11 @@
       </modify-argument>
     </modify-function>
   </object-type>
-  <object-type name="QFontComboBox"/>
+  <object-type name="QFontComboBox">
+      <enum-type name="FontFilter" flags="FontFilters"/>
+  </object-type>
   <object-type name="QFontDialog">
+    <enum-type name="FontDialogOption" flags="FontDialogOptions"/>
     <modify-function signature="getFont(bool*,QWidget*)" allow-thread="yes">
         <modify-argument index="1">
             <remove-argument />
@@ -1555,6 +2100,17 @@
             <insert-template name="fix_bool*,arg,arg,arg"/>
         </inject-code>
     </modify-function>
+    <modify-function signature="getFont(bool*,QFont,QWidget*,QString,QFlags&lt;QFontDialog::FontDialogOption&gt;)">
+        <modify-argument index="1">
+            <remove-argument />
+        </modify-argument>
+        <modify-argument index="return">
+            <replace-type modified-type="PyTuple" />
+        </modify-argument>
+        <inject-code class="target" position="beginning">
+            <insert-template name="fix_bool*,arg,arg,arg,arg"/>
+        </inject-code>
+    </modify-function>
   </object-type>
   <object-type name="QGraphicsEllipseItem">
   </object-type>
@@ -1576,20 +2132,18 @@
   <object-type name="QGraphicsItemGroup"/>
   <object-type name="QGraphicsLineItem" />
   <object-type name="QGraphicsPathItem" />
-  <object-type name="QGraphicsPixmapItem" />
+  <object-type name="QGraphicsPixmapItem">
+      <enum-type name="ShapeMode"/>
+  </object-type>
   <object-type name="QGraphicsPolygonItem"/>
   <object-type name="QGraphicsRectItem" />
   <object-type name="QGraphicsSimpleTextItem" />
   <object-type name="QHBoxLayout"/>
   <object-type name="QHeaderView">
+    <enum-type name="ResizeMode" />
     <modify-function signature="paintSection(QPainter*,QRect,int)const">
       <modify-argument index="1" invalidate-after-use="yes"/>
     </modify-function>
-    <modify-function signature="setModel(QAbstractItemModel*)">
-      <modify-argument index="1">
-        <reference-count action="add"/>
-      </modify-argument>
-    </modify-function>
   </object-type>
   <object-type name="QIconEngine">
     <modify-function signature="paint(QPainter*,QRect,QIcon::Mode,QIcon::State)">
@@ -1597,30 +2151,37 @@
     </modify-function>
   </object-type>
   <object-type name="QIconEngineV2">
+    <enum-type name="IconEngineHook"/>
     <modify-function signature="read(QDataStream&amp;)">
       <modify-argument index="1" invalidate-after-use="yes"/>
     </modify-function>
     <modify-function signature="write(QDataStream&amp;)const">
       <modify-argument index="1" invalidate-after-use="yes"/>
     </modify-function>
+    <!-- ### This makes little sense in Python. Could be reassessed later. -->
     <modify-function signature="virtual_hook(int,void*)" remove="all"/>
   </object-type>
   <object-type name="QImageWriter">
+    <enum-type name="ImageWriterError"/>
     <modify-function signature="setDevice(QIODevice*)">
       <modify-argument index="1">
         <parent index="this" action="add"/>
       </modify-argument>
     </modify-function>
     <modify-function signature="write(const QImage&amp;)" allow-thread="yes"/>
+    <!--### Obsolete in 4.3-->
     <modify-function signature="description()const" remove="all"/>
-    <!--### Obsolete in 4.3-->
     <modify-function signature="setDescription(QString)" remove="all"/>
-    <!--### Obsolete in 4.3-->
+    <!--### End of obsolete section -->
   </object-type>
   <object-type name="QInputContextFactory"/>
-  <object-type name="QIntValidator"/>
+  <object-type name="QIntValidator" />
   <object-type name="QItemDelegate">
+    <!-- ### "doLayout(...)" is an internal method. -->
     <modify-function signature="doLayout(QStyleOptionViewItem,QRect*,QRect*,QRect*,bool)const" remove="all" />
+    <!-- ### "selected(QPixmap,QPalette,bool)" is an internal method. -->
+    <modify-function signature="selected(QPixmap,QPalette,bool)const" remove="all"/>
+    <!-- ### -->
     <modify-function signature="drawCheck(QPainter*,QStyleOptionViewItem,QRect,Qt::CheckState)const">
       <modify-argument index="1" invalidate-after-use="yes"/>
     </modify-function>
@@ -1633,39 +2194,53 @@
     <modify-function signature="drawFocus(QPainter*,QStyleOptionViewItem,QRect)const">
       <modify-argument index="1" invalidate-after-use="yes"/>
     </modify-function>
-    <modify-function signature="selected(QPixmap,QPalette,bool)const" remove="all"/>
     <modify-function signature="setItemEditorFactory(QItemEditorFactory*)">
       <modify-argument index="1">
         <parent index="this" action="add"/>
       </modify-argument>
     </modify-function>
   </object-type>
-  <object-type name="QItemEditorCreatorBase"/>
+  <object-type name="QItemEditorCreatorBase">
+    <modify-function signature="createWidget(QWidget *) const">
+      <modify-argument index="1" invalidate-after-use="yes"/>
+    </modify-function>
+  </object-type>
   <object-type name="QItemEditorFactory">
-    <modify-function signature="registerEditor(QVariant::Type, QItemEditorCreatorBase *)">
+      <modify-function signature="registerEditor(QVariant::Type, QItemEditorCreatorBase *)">
       <modify-argument index="2">
-        <parent index="this" action="add"/>
+        <reference-count action="set"/>
       </modify-argument>
+      <inject-code>
+        Shiboken::Object::releaseOwnership(%PYARG_2);
+      </inject-code>
     </modify-function>
     <modify-function signature="setDefaultFactory(QItemEditorFactory *)">
       <modify-argument index="1">
-        <parent index="this" action="add"/>
+        <define-ownership owner="c++"/>
       </modify-argument>
+      <inject-code>
+        //this function is static we need keep ref to default value, to be able to call python virtual functions
+        static PyObject* _defaultValue = 0;
+        %CPPSELF.%FUNCTION_NAME(%1);
+        Py_INCREF(%PYARG_1);
+        if (_defaultValue)
+            Py_DECREF(_defaultValue);
+
+        _defaultValue = %PYARG_1;
+      </inject-code>
     </modify-function>
   </object-type>
-  <object-type name="QItemSelectionModel"/>
-  <object-type name="QListView"/>
+  <object-type name="QItemSelectionModel">
+      <enum-type name="SelectionFlag" flags="SelectionFlags"/>
+  </object-type>
+  <object-type name="QListView">
+      <enum-type name="Flow"/>
+      <enum-type name="LayoutMode"/>
+      <enum-type name="Movement"/>
+      <enum-type name="ResizeMode"/>
+      <enum-type name="ViewMode"/>
+  </object-type>
   <object-type name="QColumnView">
-    <modify-function signature="setModel(QAbstractItemModel*)">
-      <modify-argument index="1">
-        <reference-count action="add"/>
-      </modify-argument>
-    </modify-function>
-    <modify-function signature="setSelectionModel(QItemSelectionModel*)">
-      <modify-argument index="1">
-        <parent index="this" action="add"/>
-      </modify-argument>
-    </modify-function>
     <modify-function signature="setPreviewWidget(QWidget*)">
       <modify-argument index="1">
         <parent index="this" action="add"/>
@@ -1673,27 +2248,52 @@
     </modify-function>
   </object-type>
   <object-type name="QMainWindow">
+    <enum-type name="DockOption" flags="DockOptions"/>
     <modify-function signature="setCentralWidget(QWidget*)">
-      <modify-argument index="1">
-        <parent index="this" action="add"/>
-      </modify-argument>
+       <inject-code class="target" position="beginning">
+         <insert-template name="replace_child">
+           <replace from="$FUNCTION_GET_OLD" to="centralWidget" />
+           <replace from="$CHILD_TYPE" to="QWidget" />
+           <replace from="$PYARG" to="%PYARG_1" />
+           <replace from="$CPPARG" to="%1" />
+         </insert-template>
+       </inject-code>
     </modify-function>
+
     <modify-function signature="setMenuBar(QMenuBar*)">
-      <modify-argument index="1">
-        <parent index="this" action="add"/>
-      </modify-argument>
-    </modify-function>
-    <modify-function signature="setMenuWidget(QWidget*)">
-      <modify-argument index="1">
-        <parent index="this" action="add"/>
-      </modify-argument>
+       <inject-code class="target" position="beginning">
+         <insert-template name="replace_child">
+           <replace from="$FUNCTION_GET_OLD" to="menuBar" />
+           <replace from="$CHILD_TYPE" to="QMenuBar" />
+           <replace from="$PYARG" to="%PYARG_1" />
+           <replace from="$CPPARG" to="%1" />
+         </insert-template>
+       </inject-code>
+   </modify-function>
+
+   <modify-function signature="setMenuWidget(QWidget*)">
+       <inject-code class="target" position="beginning">
+         <insert-template name="replace_child">
+           <replace from="$FUNCTION_GET_OLD" to="menuWidget" />
+           <replace from="$CHILD_TYPE" to="QWidget" />
+           <replace from="$PYARG" to="%PYARG_1" />
+           <replace from="$CPPARG" to="%1" />
+         </insert-template>
+       </inject-code>
     </modify-function>
+
     <modify-function signature="setStatusBar(QStatusBar*)">
-      <modify-argument index="1">
-        <parent index="this" action="add"/>
-      </modify-argument>
-    </modify-function>
-    <modify-function signature="addDockWidget(Qt::DockWidgetArea, QDockWidget*)">
+       <inject-code class="target" position="beginning">
+         <insert-template name="replace_child">
+           <replace from="$FUNCTION_GET_OLD" to="statusBar" />
+           <replace from="$CHILD_TYPE" to="QStatusBar" />
+           <replace from="$PYARG" to="%PYARG_1" />
+           <replace from="$CPPARG" to="%1" />
+         </insert-template>
+       </inject-code>
+   </modify-function>
+
+   <modify-function signature="addDockWidget(Qt::DockWidgetArea, QDockWidget*)">
       <modify-argument index="2">
         <parent index="this" action="add"/>
       </modify-argument>
@@ -1738,6 +2338,9 @@
 
   </object-type>
   <object-type name="QMdiArea">
+    <enum-type name="AreaOption" flags="AreaOptions"/>
+    <enum-type name="ViewMode"/>
+    <enum-type name="WindowOrder"/>
     <modify-function signature="addSubWindow(QWidget*, QFlags&lt;Qt::WindowType&gt;)" >
       <modify-argument index="1">
         <parent index="this" action="add"/>
@@ -1748,6 +2351,7 @@
     </modify-function>
   </object-type>
   <object-type name="QMdiSubWindow">
+    <enum-type name="SubWindowOption" flags="SubWindowOptions"/>
     <modify-function signature="setWidget(QWidget*)" >
       <modify-argument index="1">
         <parent index="this" action="add"/>
@@ -1760,9 +2364,7 @@
     </modify-function>
   </object-type>
   <object-type name="QMenu">
-    <extra-includes>
-      <include file-name="glue/qmenu_glue.h" location="local"/>
-    </extra-includes>
+    <inject-code class="native" position="beginning" file="glue/qmenu_glue.cpp"/>
 
     <modify-function signature="exec()" rename="exec_" allow-thread="yes" />
     <modify-function signature="exec(const QPoint&amp;, QAction*)" rename="exec_" allow-thread="yes" />
@@ -1809,32 +2411,54 @@
         <parent index="this" action="add"/>
       </modify-argument>
     </modify-function>
+    <!-- ### "setNoReplayFor(QWidget*)" is an internal method. -->
     <modify-function signature="setNoReplayFor(QWidget*)" remove="all" />
 
-    <add-function signature="addAction(const QString&amp;, PyObject*, const QKeySequence&amp;)">
+    <add-function signature="addAction(QString&amp;, PyObject*, QKeySequence&amp;)">
       <modify-argument index="3">
         <replace-default-expression with="0" />
       </modify-argument>
+      <modify-argument index="return">
+        <parent index="this" action="add"/>
+      </modify-argument>
+
       <inject-code class="target" position="beginning">
         %PYARG_0 = addActionWithPyObject(%CPPSELF, QIcon(), %1, %2, %3);
       </inject-code>
     </add-function>
 
-    <add-function signature="addAction(const QIcon&amp;, const QString&amp;, PyObject*, const QKeySequence&amp;)">
+    <add-function signature="addAction(QIcon&amp;, QString&amp;, PyObject*, QKeySequence&amp;)">
       <modify-argument index="4">
         <replace-default-expression with="0" />
       </modify-argument>
+      <modify-argument index="return">
+        <parent index="this" action="add"/>
+      </modify-argument>
+
       <inject-code class="target" position="beginning">
         %PYARG_0 = addActionWithPyObject(%CPPSELF, %1, %2, %3, %4);
       </inject-code>
     </add-function>
 
+    <modify-function signature="clear()">
+      <inject-code>
+          Shiboken::BindingManager&amp; bm = Shiboken::BindingManager::instance();
+          PyObject* pyObj;
+          foreach(QAction* act, %CPPSELF.actions()) {
+            if ((pyObj = (PyObject*)bm.retrieveWrapper(act)) != 0) {
+                Py_INCREF(pyObj);
+                Shiboken::Object::setParent(NULL, pyObj);
+                Shiboken::Object::invalidate(pyObj);
+                Py_DECREF(pyObj);
+            }
+          }
+      </inject-code>
+    </modify-function>
+
   </object-type>
 
   <object-type name="QMenuBar">
-    <extra-includes>
-      <include file-name="glue/qmenubar_glue.h" location="local"/>
-    </extra-includes>
+    <inject-code class="native" position="beginning" file="glue/qmenubar_glue.cpp"/>
     <modify-function signature="addAction(const QString&amp;)">
       <modify-argument index="return">
         <parent index="this" action="add"/>
@@ -1879,43 +2503,57 @@
         <parent index="this" action="add"/>
       </modify-argument>
     </modify-function>
+    <modify-function signature="clear()">
+      <inject-code>
+          foreach(QAction *act, %CPPSELF.actions()) {
+            Shiboken::AutoDecRef pyAct(%CONVERTTOPYTHON[QAction*](act));
+            Shiboken::Object::setParent(NULL, pyAct);
+            Shiboken::Object::invalidate(pyAct);
+          }
+      </inject-code>
+    </modify-function>
   </object-type>
   <object-type name="QMotifStyle">
-    <modify-function signature="standardPixmap(QStyle::StandardPixmap, const QStyleOption*, const QWidget*)const" remove="all"/>
     <!--### Obsolete in 4.3-->
+    <modify-function signature="standardPixmap(QStyle::StandardPixmap, const QStyleOption*, const QWidget*)const" remove="all"/>
     <modify-function signature="standardIconImplementation(QStyle::StandardPixmap, const QStyleOption *, const QWidget *)const" virtual-slot="yes"/>
   </object-type>
   <object-type name="QPainterPathStroker" copyable="false"/>
   <object-type name="QPictureIO">
-    <modify-function signature="QPictureIO(QIODevice*,const char*)" remove="all"/>
     <modify-function signature="setIODevice(QIODevice*)">
       <modify-argument index="1">
         <parent index="this" action="add"/>
       </modify-argument>
     </modify-function>
-    <modify-function signature="QPictureIO(QString,const char*)" remove="all" />
-    <modify-function signature="format()const" remove="all" />
-    <modify-function signature="parameters()const" remove="all" />
-    <modify-function signature="setFormat(const char*)" remove="all" />
-    <modify-function signature="setParameters(const char*)" remove="all"/>
   </object-type>
   <object-type name="QPixmapCache">
-    <modify-function signature="find(QString)" remove="all"/>
+    <value-type name="Key"/>
+    <add-function signature="find(QPixmapCache::Key&amp;)">
+        <inject-code>
+            QPixmap p;
+            if (%CPPSELF.%FUNCTION_NAME(%1, &amp;p)) {
+                %PYARG_0 = %CONVERTTOPYTHON[QPixmap](p);
+            } else {
+                %PYARG_0 = Py_None;
+                Py_INCREF(%PYARG_0);
+            }
+        </inject-code>
+    </add-function>
+    <!-- ### Obsolete. -->
     <modify-function signature="find(QString,QPixmap&amp;)" remove="all"/>
+    <!--### End of obsolete section -->
   </object-type>
   <object-type name="QPlastiqueStyle">
-    <modify-function signature="standardPixmap(QStyle::StandardPixmap, const QStyleOption*, const QWidget*)const" remove="all"/>
     <!--### Obsolete in 4.3-->
+    <modify-function signature="standardPixmap(QStyle::StandardPixmap, const QStyleOption*, const QWidget*)const" remove="all"/>
     <modify-function signature="standardIconImplementation(QStyle::StandardPixmap, const QStyleOption *, const QWidget *)const" virtual-slot="yes"/>
     <modify-function signature="layoutSpacingImplementation(QSizePolicy::ControlType, QSizePolicy::ControlType, Qt::Orientation, const QStyleOption *, const QWidget *) const" virtual-slot="yes"/>
   </object-type>
-  <object-type name="QPrintDialog">
-      <modify-function signature="exec()" rename="exec_" allow-thread="yes" />
+  <object-type name="QProgressBar">
+      <enum-type name="Direction"/>
   </object-type>
-  <object-type name="QPrintEngine"/>
-  <object-type name="QProgressBar" />
   <object-type name="QPushButton" />
-  <object-type name="QRegExpValidator"/>
+  <object-type name="QRegExpValidator" />
   <object-type name="QScrollArea">
     <modify-function signature="setWidget(QWidget*)">
       <modify-argument index="1">
@@ -1923,14 +2561,9 @@
       </modify-argument>
     </modify-function>
   </object-type>
-  <object-type name="QSessionManager">
-    <extra-includes>
-    </extra-includes>
-    <modify-function signature="handle()const" remove="all"/>
-  </object-type>
 
   <object-type name="QShortcut">
-    <add-function signature="QShortcut(const QKeySequence&amp;, QWidget*, PyCallable*, Qt::ShortcutContext)">
+    <add-function signature="QShortcut(QKeySequence&amp;, QWidget*, PyCallable*, Qt::ShortcutContext)">
       <modify-argument index="4">
         <replace-default-expression with="Qt::WindowShortcut"/>
       </modify-argument>
@@ -1940,16 +2573,14 @@
       <inject-code class="target" position="end">
         Shiboken::AutoDecRef result(PyObject_CallMethod(%PYSELF, "connect", "OsO", %PYSELF, SIGNAL(activated()), %PYARG_3));
         if (!result.isNull())
-            Shiboken::setParent(%PYARG_2, %PYSELF);
+            Shiboken::Object::setParent(%PYARG_2, %PYSELF);
       </inject-code>
     </add-function>
   </object-type>
-  <object-type name="QSizeGrip"/>
   <object-type name="QSound"/>
   <object-type name="QSpacerItem"/>
   <object-type name="QStandardItem">
-    <modify-function signature="QStandardItem(const QStandardItem &amp;)" remove="all"/>
-    <modify-function signature="operator=(QStandardItem)" remove="all"/>
+    <enum-type name="ItemType"/>
     <modify-function signature="operator&lt;(QStandardItem)const">
       <modify-argument index="1" invalidate-after-use="yes"/>
     </modify-function>
@@ -1959,9 +2590,85 @@
     <modify-function signature="write(QDataStream&amp;)const">
       <modify-argument index="1" invalidate-after-use="yes"/>
     </modify-function>
-    <modify-function signature="read(QDataStream &amp;)" remove="all"/>
-    <modify-function signature="write(QDataStream &amp;)const" remove="all"/>
-    <modify-function signature="operator=(QStandardItem)" remove="all"/>
+
+    <modify-function signature="appendColumn(const QList&lt;QStandardItem *&gt; &amp;)">
+      <modify-argument index="1">
+        <parent index="this" action="add"/>
+      </modify-argument>
+    </modify-function>
+    <modify-function signature="appendRow(const QList&lt;QStandardItem *&gt; &amp;)">
+      <modify-argument index="1">
+        <parent index="this" action="add"/>
+      </modify-argument>
+    </modify-function>
+    <modify-function signature="appendRow(QStandardItem *)">
+      <modify-argument index="1">
+        <parent index="this" action="add"/>
+      </modify-argument>
+    </modify-function>
+    <modify-function signature="appendRows(const QList&lt;QStandardItem *&gt; &amp;)">
+      <modify-argument index="1">
+        <parent index="this" action="add"/>
+      </modify-argument>
+    </modify-function>
+
+    <modify-function signature="insertColumn(int, const QList&lt;QStandardItem *&gt; &amp;)">
+      <modify-argument index="2">
+        <parent index="this" action="add"/>
+      </modify-argument>
+    </modify-function>
+    <modify-function signature="insertRow(int, const QList&lt;QStandardItem *&gt; &amp;)">
+      <modify-argument index="2">
+        <parent index="this" action="add"/>
+      </modify-argument>
+    </modify-function>
+    <modify-function signature="insertRows(int, const QList&lt;QStandardItem *&gt; &amp;)">
+      <modify-argument index="2">
+        <parent index="this" action="add"/>
+      </modify-argument>
+    </modify-function>
+
+    <modify-function signature="setChild(int, int, QStandardItem *)">
+      <inject-code class="target" position="beginning">
+        // Clear parent from the old child
+        QStandardItem* _i = %CPPSELF->child(%1, %2);
+        if (_i) {
+            PyObject* _pyI = %CONVERTTOPYTHON[QStandardItem*](_i);
+            Shiboken::Object::setParent(0, _pyI);
+        }
+      </inject-code>
+      <modify-argument index="3">
+        <parent index="this" action="add"/>
+      </modify-argument>
+    </modify-function>
+    <modify-function signature="setChild(int, QStandardItem *)">
+      <inject-code class="target" position="beginning">
+        // Clear parent from the old child
+        QStandardItem* _i = %CPPSELF->child(%1);
+        if (_i) {
+            PyObject* _pyI = %CONVERTTOPYTHON[QStandardItem*](_i);
+            Shiboken::Object::setParent(0, _pyI);
+        }
+      </inject-code>
+      <modify-argument index="2">
+        <parent index="this" action="add"/>
+      </modify-argument>
+    </modify-function>
+
+     <modify-function signature="takeChild(int, int)">
+      <modify-argument index="return">
+        <parent index="this" action="remove"/>
+      </modify-argument>
+    </modify-function>
+
+    <modify-function signature="clone() const">
+      <modify-argument index="return">
+        <define-ownership class="native" owner="c++"/>
+        <define-ownership class="target" owner="target"/>
+      </modify-argument>
+    </modify-function>
+
+    <!-- ??? -->
     <modify-function signature="operator&lt;(QStandardItem)const" remove="all"/>
   </object-type>
   <object-type name="QStatusBar">
@@ -1994,9 +2701,19 @@
       </modify-argument>
     </modify-function>
   </object-type>
-  <object-type name="QStyleHintReturn"/>
-  <object-type name="QStyleHintReturnVariant"/>
-  <object-type name="QStyleHintReturnMask"/>
+  <object-type name="QStyleHintReturn">
+      <enum-type name="HintReturnType"/>
+      <enum-type name="StyleOptionType"/>
+      <enum-type name="StyleOptionVersion"/>
+  </object-type>
+  <object-type name="QStyleHintReturnVariant">
+      <enum-type name="StyleOptionType"/>
+      <enum-type name="StyleOptionVersion"/>
+  </object-type>
+  <object-type name="QStyleHintReturnMask">
+      <enum-type name="StyleOptionType"/>
+      <enum-type name="StyleOptionVersion"/>
+  </object-type>
   <object-type name="QStylePainter" />
   <object-type name="QSyntaxHighlighter">
     <modify-function signature="setCurrentBlockUserData(QTextBlockUserData*)">
@@ -2009,11 +2726,9 @@
         <parent index="this" action="add"/>
       </modify-argument>
     </modify-function>
-  </object-type>
-  <object-type name="QSystemTrayIcon">
-    <modify-function signature="setContextMenu(QMenu*)">
-      <modify-argument index="1">
-        <parent index="this" action="add"/>
+    <modify-function signature="document() const">
+      <modify-argument index="this">
+        <parent index="return" action="add"/>
       </modify-argument>
     </modify-function>
   </object-type>
@@ -2028,27 +2743,17 @@
         <parent index="this" action="add"/>
       </modify-argument>
     </modify-function>
-    <modify-function signature="setModel(QAbstractItemModel*)">
-      <modify-argument index="1">
-        <reference-count action="add"/>
-      </modify-argument>
-    </modify-function>
-    <modify-function signature="setSelectionModel(QItemSelectionModel*)">
-      <modify-argument index="1">
-        <no-null-pointer/>
-        <parent index="this" action="add"/>
-      </modify-argument>
-    </modify-function>
-    <modify-function signature="sortByColumn(int)" remove="all"/>
     <!--### Obsolete in 4.3-->
+    <modify-function signature="sortByColumn(int)" remove="all"/>
   </object-type>
   <object-type name="QTextBlockGroup" />
   <object-type name="QTextBlockUserData" />
-  <object-type name="QTextItem" />
+  <object-type name="QTextItem">
+      <enum-type name="RenderFlag" flags="RenderFlags"/>
+  </object-type>
   <object-type name="QTextList" >
-    <modify-function signature="format()const" rename="textListFormat"/>
-    <modify-function signature="isEmpty()const" remove="all"/>
     <!--### Obsolete in 4.3-->
+    <modify-function signature="isEmpty()const" remove="all"/>
   </object-type>
   <object-type name="QTextObject"/>
   <object-type name="QTextObjectInterface" >
@@ -2083,12 +2788,13 @@
         QWidget *_widget = %CPPSELF.widget(%1);
         if (_widget) {
             Shiboken::AutoDecRef pyWidget(%CONVERTTOPYTHON[QWidget*](_widget));
-            Shiboken::setParent(0, pyWidget);
+            Shiboken::Object::setParent(0, pyWidget);
         }
       </inject-code>
     </modify-function>
   </object-type>
   <object-type name="QToolButton">
+    <enum-type name="ToolButtonPopupMode"/>
     <modify-function signature="setDefaultAction(QAction *)">
       <modify-argument index="1">
         <parent index="this" action="add"/>
@@ -2108,19 +2814,8 @@
     <modify-function signature="drawRow(QPainter*,QStyleOptionViewItem,QModelIndex)const">
       <modify-argument index="1" invalidate-after-use="yes"/>
     </modify-function>
-    <modify-function signature="setModel(QAbstractItemModel*)">
-      <modify-argument index="1">
-        <reference-count action="add"/>
-      </modify-argument>
-    </modify-function>
-    <modify-function signature="setSelectionModel(QItemSelectionModel*)">
-      <modify-argument index="1">
-        <no-null-pointer/>
-        <parent index="this" action="add"/>
-      </modify-argument>
-    </modify-function>
-    <modify-function signature="sortByColumn(int)" remove="all"/>
     <!--### Obsolete in 4.3-->
+    <modify-function signature="sortByColumn(int)" remove="all"/>
   </object-type>
   <object-type name="QUndoCommand">
     <modify-function signature="mergeWith(const QUndoCommand*)">
@@ -2179,7 +2874,65 @@
     </modify-function>
   </object-type>
   <object-type name="QVBoxLayout"/>
-  <object-type name="QValidator"/>
+
+  <template name="validator_conversionrule">
+        QValidator::State %out;
+
+        if (PySequence_Check(%PYARG_0)) {
+            Shiboken::AutoDecRef seq(PySequence_Fast(%PYARG_0, 0));
+            int size = PySequence_Fast_GET_SIZE(seq.object());
+
+            if (size > 1) {
+                if (%ISCONVERTIBLE[QString](PySequence_Fast_GET_ITEM(seq.object(), 1)))
+                    %1 = %CONVERTTOCPP[QString](PySequence_Fast_GET_ITEM(seq.object(), 1));
+                else
+                    qWarning("%TYPE::%FUNCTION_NAME: Second tuple element is not convertible to unicode.");
+            }
+
+            if (size > 2) {
+                if (%ISCONVERTIBLE[int](PySequence_Fast_GET_ITEM(seq.object(), 2)))
+                    %2 = %CONVERTTOCPP[int](PySequence_Fast_GET_ITEM(seq.object(), 2));
+                else
+                    qWarning("%TYPE::%FUNCTION_NAME: Second tuple element is not convertible to int.");
+            }
+            %PYARG_0 = PySequence_Fast_GET_ITEM(seq.object(), 0);
+            Py_INCREF(%PYARG_0); // we need to incref, because "%PYARG_0 = ..." will decref the tuple and the tuple will be decrefed again at the end of this scope.
+        }
+
+        // check retrun value
+        if (%ISCONVERTIBLE[QValidator::State](%PYARG_0)) {
+            %out = %CONVERTTOCPP[QValidator::State](%PYARG_0);
+        } else {
+            PyErr_Format(PyExc_TypeError, "Invalid return value in function %s, expected %s, got %s.",
+                        "QValidator.validate",
+                        "PySide.QtGui.QValidator.State, (PySide.QtGui.QValidator.State,), (PySide.QtGui.QValidator.State, unicode) or (PySide.QtGui.QValidator.State, unicode, int)",
+                        pyResult->ob_type->tp_name);
+            return QValidator::State();
+        }
+  </template>
+
+  <object-type name="QValidator">
+    <enum-type name="State"/>
+    <modify-function signature="fixup(QString &amp;)const">
+      <modify-argument index="return">
+        <replace-type modified-type="QString"/>
+      </modify-argument>
+      <inject-code class="target" position="end">
+        <insert-template name="return_QString"/>
+      </inject-code>
+    </modify-function>
+    <modify-function signature="validate(QString &amp;, int &amp;)const">
+      <modify-argument index="return">
+        <replace-type modified-type="PyObject"/>
+        <conversion-rule class="native">
+            <insert-template name="validator_conversionrule"/>
+        </conversion-rule>
+      </modify-argument>
+      <inject-code class="target" position="end">
+        <insert-template name="return_tuple_QValidator_QString_int"/>
+      </inject-code>
+    </modify-function>
+  </object-type>
   <object-type name="QWhatsThis"/>
   <object-type name="QWidgetAction">
     <modify-function signature="setDefaultWidget(QWidget*)">
@@ -2195,11 +2948,12 @@
   </object-type>
   <object-type name="QWidgetItem" polymorphic-id-expression="%1-&gt;widget()" />
   <object-type name="QWindowsStyle">
-    <modify-function signature="standardPixmap(QStyle::StandardPixmap, const QStyleOption*, const QWidget*)const" remove="all"/>
     <!--### Obsolete in 4.3-->
+    <modify-function signature="standardPixmap(QStyle::StandardPixmap, const QStyleOption*, const QWidget*)const" remove="all"/>
     <modify-function signature="standardIconImplementation(QStyle::StandardPixmap, const QStyleOption *, const QWidget *)const" virtual-slot="yes"/>
   </object-type>
   <object-type name="QWorkspace">
+    <enum-type name="WindowOrder"/>
     <modify-function signature="addWindow(QWidget*, QFlags&lt;Qt::WindowType>)">
         <modify-argument index="1">
             <parent index="this" action="add" />
@@ -2209,7 +2963,9 @@
   <object-type name="QActionEvent" polymorphic-id-expression="%1-&gt;type() == QEvent::ActionAdded || %1-&gt;type() == QEvent::ActionRemoved || %1-&gt;type() == QEvent::ActionChanged" />
   <object-type name="QClipboardEvent" polymorphic-id-expression="%1-&gt;type() == QEvent::Clipboard"/>
   <object-type name="QCloseEvent" polymorphic-id-expression="%1-&gt;type() == QEvent::Close"/>
-  <object-type name="QContextMenuEvent" polymorphic-id-expression="%1-&gt;type() == QEvent::ContextMenu"/>
+  <object-type name="QContextMenuEvent" polymorphic-id-expression="%1-&gt;type() == QEvent::ContextMenu">
+      <enum-type name="Reason"/>
+  </object-type>
   <object-type name="QDragEnterEvent" polymorphic-id-expression="%1-&gt;type() == QEvent::DragEnter"/>
   <object-type name="QDragLeaveEvent" polymorphic-id-expression="%1-&gt;type() == QEvent::DragLeave"/>
   <object-type name="QDragMoveEvent" polymorphic-id-expression="%1-&gt;type() == QEvent::DragMove" />
@@ -2219,18 +2975,28 @@
         <define-ownership owner="target"/>
       </modify-argument>
     </modify-function>
+    <!--### Method encodedData(const char*) exists only for Qt3 compatibility. -->
     <modify-function signature="encodedData(const char*)const" remove="all"/>
+    <!--### Method format(int) exists only for Qt3 compatibility. -->
     <modify-function signature="format(int)const" remove="all"/>
+    <!--### Method provides(const char*) exists only for Qt3 compatibility. -->
     <modify-function signature="provides(const char*)const" remove="all"/>
+    <!-- ### -->
   </object-type>
   <object-type name="QFileOpenEvent" polymorphic-id-expression="%1-&gt;type() == QEvent::FileOpen" />
   <object-type name="QFocusEvent" polymorphic-id-expression="%1-&gt;type() == QEvent::FocusIn || %1-&gt;type() == QEvent::FocusOut" />
-  <object-type name="QGraphicsSceneContextMenuEvent" copyable="false" polymorphic-id-expression="%1-&gt;type() == QEvent::GraphicsSceneContextMenu" />
+  <object-type name="QGraphicsSceneContextMenuEvent" copyable="false" polymorphic-id-expression="%1-&gt;type() == QEvent::GraphicsSceneContextMenu">
+      <enum-type name="Reason"/>
+  </object-type>
   <object-type name="QGraphicsSceneDragDropEvent" copyable="false" polymorphic-id-expression="%1-&gt;type() == QEvent::GraphicsSceneDragEnter || %1-&gt;type() == QEvent::GraphicsSceneDragLeave || %1-&gt;type() == QEvent::GraphicsSceneDragMove || %1-&gt;type() == QEvent::GraphicsSceneDrop" >
+    <!-- ### "setMimeData(const QMimeData*)" is an internal method. -->
     <modify-function signature="setMimeData(const QMimeData *)" remove="all"/>
+    <!-- ### "setSource(QWidget*)" is an internal method. -->
     <modify-function signature="setSource(QWidget *)" remove="all"/>
+    <!-- ### -->
   </object-type>
   <object-type name="QGraphicsSceneEvent" copyable="false">
+    <!-- ### "setWidget(QWidget*)" is an internal method. -->
     <modify-function signature="setWidget(QWidget *)" remove="all"/>
   </object-type>
   <object-type name="QGraphicsSceneMoveEvent" copyable="false" polymorphic-id-expression="%1-&gt;type() == QEvent::GraphicsSceneMove" />
@@ -2243,7 +3009,16 @@
   <object-type name="QHideEvent" copyable="false" polymorphic-id-expression="%1-&gt;type() == QEvent::Hide"/>
   <object-type name="QHoverEvent" copyable="false" polymorphic-id-expression="%1-&gt;type() == QEvent::HoverEnter || %1-&gt;type() == QEvent::HoverLeave || %1-&gt;type() == QEvent::HoverMove"/>
   <object-type name="QIconDragEvent" copyable="false" polymorphic-id-expression="%1-&gt;type() == QEvent::IconDrag"/>
-  <object-type name="QInputMethodEvent" copyable="no" polymorphic-id-expression="%1-&gt;type() == QEvent::InputMethod"/>
+
+  <object-type name="QInputMethodEvent" copyable="no" polymorphic-id-expression="%1-&gt;type() == QEvent::InputMethod">
+    <!-- only declare this if ndef QT_NO_INPUTMETHOD -->
+    <enum-type name="AttributeType"/>
+    <value-type name="Attribute">
+      <include file-name="QInputMethodEvent" location="global"/>
+    </value-type>
+    <!-- endif ndef QT_NO_INPUTMETHOD -->
+  </object-type>
+
   <object-type name="QMoveEvent" copyable = "false" polymorphic-id-expression="%1-&gt;type() == QEvent::Move" />
   <object-type name="QResizeEvent" copyable = "false" polymorphic-id-expression="%1-&gt;type() == QEvent::Resize"/>
   <object-type name="QShortcutEvent" copyable = "false" polymorphic-id-expression="%1-&gt;type() == QEvent::Shortcut">
@@ -2251,10 +3026,14 @@
     <modify-function signature="isAmbiguous()" remove="all"/>
     <modify-function signature="shortcutId()" remove="all"/>
     <modify-function signature="key()" remove="all"/>
+    <!-- ### -->
   </object-type>
   <object-type name="QShowEvent" copyable= "false" polymorphic-id-expression="%1-&gt;type() == QEvent::Show"/>
   <object-type name="QStatusTipEvent" copyable= "false" polymorphic-id-expression="%1-&gt;type() == QEvent::StatusTip"/>
-  <object-type name="QTabletEvent" copyable= "false" polymorphic-id-expression="%1-&gt;type() == QEvent::TabletMove || %1-&gt;type() == QEvent::TabletPress || %1-&gt;type() == QEvent::TabletRelease"/>
+  <object-type name="QTabletEvent" copyable= "false" polymorphic-id-expression="%1-&gt;type() == QEvent::TabletMove || %1-&gt;type() == QEvent::TabletPress || %1-&gt;type() == QEvent::TabletRelease">
+      <enum-type name="PointerType"/>
+      <enum-type name="TabletDevice"/>
+  </object-type>
   <object-type name="QToolBarChangeEvent" polymorphic-id-expression="%1-&gt;type() == QEvent::ToolBarChange"/>
   <object-type name="QWhatsThisClickedEvent" copyable="false" polymorphic-id-expression="%1-&gt;type() == QEvent::WhatsThisClicked"/>
   <object-type name="QWheelEvent" copyable= "false" polymorphic-id-expression="%1-&gt;type() == QEvent::Wheel"/>
@@ -2262,22 +3041,85 @@
   <object-type name="QInputEvent" copyable="false">
     <modify-function signature="modifiers()const" access="non-final"/>
   </object-type>
-  <object-type name="QKeyEvent" copyable= "false" polymorphic-id-expression="%1-&gt;type() == QEvent::KeyPress || %1-&gt;type() == QEvent::KeyRelease"/>
+  <object-type name="QKeyEvent" copyable= "false" polymorphic-id-expression="%1-&gt;type() == QEvent::KeyPress || %1-&gt;type() == QEvent::KeyRelease || %1-&gt;type() == QEvent::ShortcutOverride">
+      <add-function signature="operator!=(QKeySequence::StandardKey)">
+          <inject-code class="target">
+          bool ret = !(&amp;%CPPSELF == %1);
+          %PYARG_0 = %CONVERTTOPYTHON[bool](ret);
+          </inject-code>
+      </add-function>
+  </object-type>
   <object-type name="QMouseEvent" copyable= "false" polymorphic-id-expression="%1-&gt;type() == QEvent::MouseButtonDblClick || %1-&gt;type() == QEvent::MouseButtonPress || %1-&gt;type() == QEvent::MouseButtonRelease || %1-&gt;type() == QEvent::MouseMove"/>
   <object-type name="QPaintEvent" copyable= "false" polymorphic-id-expression="%1-&gt;type() == QEvent::Paint"/>
   <object-type name="QAccessibleEvent" polymorphic-id-expression="%1-&gt;type() == QEvent::AccessibilityDescription || %1-&gt;type() == QEvent::AccessibilityHelp"/>
+  <object-type name="QGestureEvent" polymorphic-id-expression="%1-&gt;type() == QEvent::Gesture || %1-&gt;type() == QEvent::GestureOverride" since="4.6">
+    <modify-function signature="activeGestures()const">
+      <modify-argument index="return">
+        <define-ownership owner="default"/>
+      </modify-argument>
+    </modify-function>
+    <modify-function signature="canceledGestures()const">
+      <modify-argument index="return">
+        <define-ownership owner="default"/>
+      </modify-argument>
+    </modify-function>
+    <modify-function signature="gestures()const">
+      <modify-argument index="return">
+        <define-ownership owner="default"/>
+      </modify-argument>
+    </modify-function>
+    <modify-function signature="gesture(Qt::GestureType)const">
+      <modify-argument index="return">
+        <define-ownership owner="default"/>
+      </modify-argument>
+    </modify-function>
+    <modify-function signature="widget()const">
+      <modify-argument index="return">
+        <define-ownership owner="default"/>
+      </modify-argument>
+    </modify-function>
+  </object-type>
   <object-type name="QAbstractButton"/>
   <object-type name="QStyle">
+    <enum-type name="ComplexControl" extensible="yes"/>
+    <enum-type name="ContentsType" extensible="yes"/>
+    <enum-type name="ControlElement" extensible="yes"/>
+    <enum-type name="PixelMetric" extensible="yes" />
+    <enum-type name="PrimitiveElement" extensible="yes" />
+    <enum-type name="RequestSoftwareInputPanel" since="4.6"/>
+    <enum-type name="StandardPixmap" extensible="yes"/>
+    <enum-type name="StateFlag" flags="State"/>
+    <enum-type name="StyleHint" extensible="yes" />
+    <enum-type name="SubControl" flags="SubControls" extensible="yes" force-integer="yes"/>
+    <enum-type name="SubElement" extensible="yes" />
     <modify-function signature="standardIconImplementation(QStyle::StandardPixmap, const QStyleOption *, const QWidget *)const" virtual-slot="yes"/>
     <modify-function signature="layoutSpacingImplementation(QSizePolicy::ControlType, QSizePolicy::ControlType, Qt::Orientation, const QStyleOption *, const QWidget *) const" virtual-slot="yes"/>
     <modify-function signature="drawComplexControl(QStyle::ComplexControl,const QStyleOptionComplex*,QPainter*,const QWidget*)const">
       <modify-argument index="3" invalidate-after-use="yes"/>
+      <modify-argument index="4">
+        <replace-default-expression with="0"/>
+        <rename to="widget" />
+      </modify-argument>
     </modify-function>
     <modify-function signature="drawControl(QStyle::ControlElement,const QStyleOption*,QPainter*,const QWidget*)const">
       <modify-argument index="3" invalidate-after-use="yes"/>
+      <modify-argument index="4">
+        <replace-default-expression with="0"/>
+        <rename to="widget" />
+      </modify-argument>
     </modify-function>
     <modify-function signature="drawPrimitive(QStyle::PrimitiveElement,const QStyleOption*,QPainter*,const QWidget*)const">
       <modify-argument index="3" invalidate-after-use="yes"/>
+      <modify-argument index="4">
+        <replace-default-expression with="0"/>
+        <rename to="widget" />
+      </modify-argument>
+    </modify-function>
+    <modify-function signature="hitTestComplexControl(QStyle::ComplexControl, const QStyleOptionComplex*, const QPoint&amp;, const QWidget*)const">
+      <modify-argument index="4">
+        <replace-default-expression with="0"/>
+        <rename to="widget" />
+      </modify-argument>
     </modify-function>
     <modify-function signature="styleHint(QStyle::StyleHint,const QStyleOption*,const QWidget*,QStyleHintReturn*)const">
       <modify-argument index="4" invalidate-after-use="yes"/>
@@ -2288,19 +3130,18 @@
     <modify-function signature="drawItemText(QPainter*,QRect,int,QPalette,bool,QString,QPalette::ColorRole)const">
       <modify-argument index="1" invalidate-after-use="yes"/>
     </modify-function>
-    <modify-function signature="itemTextRect(QFontMetrics,QRect,int,bool,QString)const" remove="all"/>
   </object-type>
   <object-type name="QColorDialog">
+    <enum-type name="ColorDialogOption" flags="ColorDialogOptions"/>
     <!-- Obsolete method -->
     <modify-function signature="getRgba(uint,bool*,QWidget*)" remove="all" />
     <modify-function signature="getColor(const QColor&amp;, QWidget*)" allow-thread="yes" />
     <modify-function signature="getColor(const QColor&amp;, QWidget*, const QString&amp;, QFlags&lt;QColorDialog::ColorDialogOption>)" allow-thread="yes" />
   </object-type>
   <object-type name="QLayout">
+    <inject-code class="native" position="beginning" file="glue/qlayout_help_functions.cpp"/>
 
-    <extra-includes>
-      <include file-name="glue/qlayout_help_functions.h" location="local"/>
-    </extra-includes>
+    <enum-type name="SizeConstraint"/>
 
     <modify-function signature="itemAt(int)const">
       <modify-argument index="return">
@@ -2311,10 +3152,24 @@
       </inject-code>
     </modify-function>
 
+    <modify-function signature="removeWidget(QWidget*)">
+      <inject-code class="target" position="beginning">
+        removeLayoutOwnership(%CPPSELF, %1);
+      </inject-code>
+    </modify-function>
+    <modify-function signature="removeItem(QLayoutItem*)">
+      <inject-code class="target" position="beginning">
+        removeLayoutOwnership(%CPPSELF, %1);
+      </inject-code>
+    </modify-function>
+
     <modify-function signature="parentWidget()const">
       <modify-argument index="this">
         <parent index="return" action="add"/>
       </modify-argument>
+      <modify-argument index="return">
+        <define-ownership class="target" owner="default"/>
+      </modify-argument>
     </modify-function>
 
     <modify-function signature="takeAt(int)">
@@ -2350,38 +3205,42 @@
       </inject-code>
     </modify-function>
 
-    <modify-function signature="getContentsMargins(int*,int*,int*,int*)const" remove="all" />
-    <!--### Obsolete in 4.3-->
-    <!-- <modify-function signature="setMargin(int)" remove="all"/> -->
-    <!--### Obsolete in 4.3-->
+    <modify-function signature="getContentsMargins(int*,int*,int*,int*)const">
+        <modify-argument index="0">
+            <replace-type modified-type="PyObject" />
+        </modify-argument>
+        <modify-argument index="1">
+            <remove-argument/>
+        </modify-argument>
+        <modify-argument index="2">
+            <remove-argument/>
+        </modify-argument>
+        <modify-argument index="3">
+            <remove-argument/>
+        </modify-argument>
+        <modify-argument index="4">
+            <remove-argument/>
+        </modify-argument>
+        <inject-code class="target" position="beginning">
+            <insert-template name="fix_number*,number*,number*,number*">
+                <replace from="$TYPE" to="int" />
+            </insert-template>
+        </inject-code>
+        <inject-code class="native" position="end">
+            <insert-template name="fix_native_return_number*,number*,number*,number*">
+                <replace from="$TYPE" to="int" />
+            </insert-template>
+        </inject-code>
+    </modify-function>
+    <!-- ### Obsolete in 4.3 -->
+    <modify-function signature="setMargin(int)" remove="all"/>
+    <modify-function signature="margin()const" remove="all"/>
+    <!-- ### -->
   </object-type>
 
   <object-type name="QStackedLayout">
-    <extra-includes>
-      <include file-name="glue/qlayout_help_functions.h" location="local"/>
-    </extra-includes>
-
-    <modify-function signature="addItem(QLayoutItem *)">
-      <inject-code class="target" position="beginning">
-        addLayoutOwnership(%CPPSELF, %1);
-      </inject-code>
-    </modify-function>
-
-   <modify-function signature="itemAt(int)const">
-      <modify-argument index="return">
-        <define-ownership owner="default"/>
-      </modify-argument>
-      <inject-code class="target" position="end">
-        addLayoutOwnership(%CPPSELF, %0);
-      </inject-code>
-    </modify-function>
-
-    <modify-function signature="addWidget(QWidget *)">
-      <rename to="addStackedWidget"/>
-      <inject-code class="target" position="beginning">
-        addLayoutOwnership(%CPPSELF, %1);
-      </inject-code>
-    </modify-function>
+    <inject-code class="native" position="beginning" file="glue/qlayout_help_functions.cpp"/>
+    <enum-type name="StackingMode"/>
     <modify-function signature="insertWidget(int,QWidget*)">
       <inject-code class="target" position="beginning">
         addLayoutOwnership(%CPPSELF, %2);
@@ -2390,35 +3249,22 @@
   </object-type>
 
   <object-type name="QBoxLayout">
-    <extra-includes>
-      <include file-name="glue/qlayout_help_functions.h" location="local"/>
-    </extra-includes>
+    <inject-code class="native" position="beginning" file="glue/qlayout_help_functions.cpp"/>
 
-   <modify-function signature="itemAt(int)const">
-      <modify-argument index="return">
-        <define-ownership owner="default"/>
-      </modify-argument>
-
-      <inject-code class="target" position="end">
-        addLayoutOwnership(%CPPSELF, %0);
-      </inject-code>
-    </modify-function>
+    <enum-type name="Direction" />
 
     <modify-function signature="addWidget(QWidget *, int, QFlags&lt;Qt::AlignmentFlag&gt;)">
       <inject-code class="target" position="beginning">
         addLayoutOwnership(%CPPSELF, %1);
       </inject-code>
     </modify-function>
+
     <modify-function signature="addLayout(QLayout *, int)">
       <inject-code class="target" position="beginning">
         addLayoutOwnership(%CPPSELF, %1);
       </inject-code>
     </modify-function>
-    <modify-function signature="addItem(QLayoutItem *)">
-      <inject-code class="target" position="beginning">
-        addLayoutOwnership(%CPPSELF, %1);
-      </inject-code>
-    </modify-function>
+
     <modify-function signature="insertWidget(int, QWidget *, int, QFlags&lt;Qt::AlignmentFlag&gt;)">
       <inject-code class="target" position="beginning">
         addLayoutOwnership(%CPPSELF, %2);
@@ -2447,52 +3293,88 @@
   </object-type>
 
   <object-type name="QGridLayout">
-    <extra-includes>
-      <include file-name="glue/qlayout_help_functions.h" location="local"/>
-    </extra-includes>
-
-    <modify-function signature="addWidget(QWidget *)">
-      <inject-code class="target" position="beginning">
-        addLayoutOwnership(%CPPSELF, %1);
+    <inject-code class="native" position="beginning" file="glue/qlayout_help_functions.cpp"/>
+    <modify-function signature="itemAtPosition (int, int) const">
+      <modify-argument index="return">
+        <define-ownership owner="default"/>
+      </modify-argument>
+      <inject-code class="target" position="end">
+        addLayoutOwnership(%CPPSELF, %0);
       </inject-code>
     </modify-function>
     <modify-function signature="addWidget(QWidget *, int, int, QFlags&lt;Qt::AlignmentFlag&gt;)">
+      <modify-argument index="4">
+        <rename to="alignment"/>
+      </modify-argument>
       <inject-code class="target" position="beginning">
         addLayoutOwnership(%CPPSELF, %1);
       </inject-code>
     </modify-function>
     <modify-function signature="addWidget(QWidget *, int, int, int, int, QFlags&lt;Qt::AlignmentFlag&gt;)">
+      <modify-argument index="6">
+        <rename to="alignment"/>
+      </modify-argument>
       <inject-code class="target" position="beginning">
         addLayoutOwnership(%CPPSELF, %1);
       </inject-code>
     </modify-function>
     <modify-function signature="addLayout(QLayout *, int, int, QFlags&lt;Qt::AlignmentFlag&gt;)">
+      <modify-argument index="4">
+        <rename to="alignment"/>
+      </modify-argument>
       <inject-code class="target" position="beginning">
         addLayoutOwnership(%CPPSELF, %1);
       </inject-code>
     </modify-function>
     <modify-function signature="addLayout(QLayout *, int, int, int, int, QFlags&lt;Qt::AlignmentFlag&gt;)">
+      <modify-argument index="6">
+        <rename to="alignment"/>
+      </modify-argument>
       <inject-code class="target" position="beginning">
         addLayoutOwnership(%CPPSELF, %1);
       </inject-code>
     </modify-function>
     <modify-function signature="addItem(QLayoutItem *, int, int, int, int, QFlags&lt;Qt::AlignmentFlag&gt;)">
+      <modify-argument index="4">
+        <rename to="rowSpan"/>
+      </modify-argument>
+      <modify-argument index="5">
+        <rename to="columnSpan"/>
+      </modify-argument>
+      <modify-argument index="6">
+        <rename to="alignment"/>
+      </modify-argument>
       <inject-code class="target" position="beginning">
         addLayoutOwnership(%CPPSELF, %1);
       </inject-code>
     </modify-function>
-
-   <modify-function signature="itemAt(int)const">
-      <modify-argument index="return">
-        <define-ownership owner="default"/>
-      </modify-argument>
-
-      <inject-code class="target" position="end">
-        addLayoutOwnership(%CPPSELF, %0);
-      </inject-code>
+    <modify-function signature="getItemPosition(int,int*,int*,int*,int*)">
+        <modify-argument index="return">
+            <replace-type modified-type="PyObject*" />
+        </modify-argument>
+        <modify-argument index="2">
+            <remove-argument/>
+        </modify-argument>
+        <modify-argument index="3">
+            <remove-argument/>
+        </modify-argument>
+        <modify-argument index="4">
+            <remove-argument/>
+        </modify-argument>
+        <modify-argument index="5">
+            <remove-argument/>
+            <remove-default-expression/>
+        </modify-argument>
+        <inject-code class="target" position="beginning">
+        int a, b, c, d;
+        %CPPSELF.%FUNCTION_NAME(%1, &amp;a, &amp;b, &amp;c, &amp;d);
+        %PYARG_0 = PyTuple_New(4);
+        PyTuple_SET_ITEM(%PYARG_0, 0, %CONVERTTOPYTHON[int](a));
+        PyTuple_SET_ITEM(%PYARG_0, 1, %CONVERTTOPYTHON[int](b));
+        PyTuple_SET_ITEM(%PYARG_0, 2, %CONVERTTOPYTHON[int](c));
+        PyTuple_SET_ITEM(%PYARG_0, 3, %CONVERTTOPYTHON[int](d));
+        </inject-code>
     </modify-function>
-
-    <modify-function signature="getItemPosition(int,int*,int*,int*,int*)" remove="all" />
   </object-type>
 
   <object-type name="QGraphicsView">
@@ -2500,12 +3382,35 @@
       <include file-name="QPainterPath" location="global"/>
       <include file-name="QVarLengthArray" location="global"/>
     </extra-includes>
+    <enum-type name="CacheModeFlag" flags="CacheMode"/>
+    <enum-type name="DragMode"/>
+    <enum-type name="OptimizationFlag" flags="OptimizationFlags"/>
+    <enum-type name="ViewportAnchor"/>
+    <enum-type name="ViewportUpdateMode"/>
     <modify-function signature="setupViewport(QWidget *)" access="non-final"/>
     <modify-function signature="setScene(QGraphicsScene*)">
       <modify-argument index="1">
-        <parent index="this" action="add"/>
+        <reference-count action="set"/>
       </modify-argument>
     </modify-function>
+    <modify-function signature="scene()const">
+        <inject-code position="end">
+            <insert-template name="scene_return_parenting"/>
+        </inject-code>
+        <modify-argument index="return">
+            <define-ownership owner="default"/>
+        </modify-argument>
+    </modify-function>
+    <modify-function signature="itemAt(int,int)const">
+        <modify-argument index="return">
+            <define-ownership owner="default"/>
+        </modify-argument>
+    </modify-function>
+    <modify-function signature="itemAt(QPoint)const">
+        <modify-argument index="return">
+            <define-ownership owner="default"/>
+        </modify-argument>
+    </modify-function>
     <modify-function signature="drawBackground(QPainter*,QRectF)">
       <modify-argument index="1" invalidate-after-use="yes"/>
     </modify-function>
@@ -2515,7 +3420,6 @@
 
     <!-- TODO: Support conversions on virtual function -->
     <modify-function signature="drawItems(QPainter*, int, QGraphicsItem**, const QStyleOptionGraphicsItem*)">
-
         <modify-argument index="2">
             <remove-argument/>
             <conversion-rule class="native">
@@ -2527,7 +3431,7 @@
             <replace-type modified-type="PySequence"/>
             <conversion-rule class="native">
                 int numItems = PySequence_Size(%PYARG_1);
-                QGraphicsItem *%out[numItems];
+                Shiboken::AutoArrayPointer&lt;QGraphicsItem*&gt; %out(numItems);
                 for (int i=0; i &lt; numItems; i++) {
                     %out[i] = %CONVERTTOCPP[QGraphicsItem*](PySequence_Fast_GET_ITEM(%PYARG_1, i));
                 }
@@ -2547,14 +3451,15 @@
             <conversion-rule class="target">
                 Shiboken::AutoDecRef option_object(PyList_New(0));
                 for (int i=0, max=numItems; i &lt; max; i++) {
-                    PyList_Append(option_object, %CONVERTTOPYTHON[QStyleOptionGraphicsItem](%in[i]));
+                    const QStyleOptionGraphicsItem* item = &amp;%in[i];
+                    PyList_Append(option_object, %CONVERTTOPYTHON[QStyleOptionGraphicsItem](item));
                 }
-                PyObject *%out = option_object.object();
+                PyObject* %out = option_object.object();
             </conversion-rule>
 
             <conversion-rule class="native">
                 int numOptions = PySequence_Size(%PYARG_2);
-                QStyleOptionGraphicsItem %out[numOptions];
+                Shiboken::AutoArrayPointer&lt;QStyleOptionGraphicsItem&gt; %out(numOptions);
                 for (int i=0; i &lt; numOptions; i++) {
                     %out[i] = %CONVERTTOCPP[QStyleOptionGraphicsItem](PySequence_Fast_GET_ITEM(%PYARG_1, i));
                 }
@@ -2563,7 +3468,9 @@
     </modify-function>
   </object-type>
   <object-type name="QInputDialog">
-    <modify-function signature="getInteger(QWidget *, const QString &amp;, const QString &amp;, int, int, int, int, bool *, QFlags&lt;Qt::WindowType&gt;)" allow-thread="yes">
+    <enum-type name="InputDialogOption"/>
+    <enum-type name="InputMode"/>
+    <modify-function signature="getInteger(QWidget*, const QString&amp;, const QString&amp;, int, int, int, int, bool*, QFlags&lt;Qt::WindowType&gt;)" allow-thread="yes">
       <modify-argument index="8">
         <remove-default-expression/>
         <remove-argument/>
@@ -2572,7 +3479,7 @@
         <insert-template name="fix_arg,arg,arg,arg,arg,arg,arg,bool*,arg"/>
       </inject-code>
     </modify-function>
-    <modify-function signature="getInt(QWidget *, const QString &amp;, const QString &amp;, int, int, int, int, bool *, QFlags&lt;Qt::WindowType&gt;)" allow-thread="yes">
+    <modify-function signature="getInt(QWidget*, const QString&amp;, const QString&amp;, int, int, int, int, bool*, QFlags&lt;Qt::WindowType&gt;)" allow-thread="yes">
       <modify-argument index="8">
         <remove-default-expression/>
         <remove-argument/>
@@ -2581,7 +3488,7 @@
         <insert-template name="fix_arg,arg,arg,arg,arg,arg,arg,bool*,arg"/>
       </inject-code>
     </modify-function>
-    <modify-function signature="getItem(QWidget *, const QString &amp;, const QString &amp;, const QStringList &amp;, int, bool, bool *, QFlags&lt;Qt::WindowType&gt;)" allow-thread="yes">
+    <modify-function signature="getItem(QWidget*, const QString&amp;, const QString&amp;, const QStringList&amp;, int, bool, bool*, QFlags&lt;Qt::WindowType&gt;)" allow-thread="yes">
       <modify-argument index="7">
         <remove-default-expression/>
         <remove-argument/>
@@ -2590,7 +3497,7 @@
         <insert-template name="fix_arg,arg,arg,arg,arg,arg,bool*,arg"/>
       </inject-code>
     </modify-function>
-    <modify-function signature="getText(QWidget *, const QString &amp;, const QString &amp;, QLineEdit::EchoMode, const QString &amp;, bool *, QFlags&lt;Qt::WindowType&gt;)" allow-thread="yes">
+    <modify-function signature="getText(QWidget *, const QString&amp;, const QString&amp;, QLineEdit::EchoMode, const QString&amp;, bool*, QFlags&lt;Qt::WindowType&gt;)" allow-thread="yes">
       <modify-argument index="6">
         <remove-default-expression/>
         <remove-argument/>
@@ -2599,7 +3506,7 @@
         <insert-template name="fix_arg,arg,arg,arg,arg,bool*,arg"/>
       </inject-code>
     </modify-function>
-    <modify-function signature="getDouble(QWidget *, const QString &amp;, const QString &amp;, double, double, double, int, bool *, QFlags&lt;Qt::WindowType&gt;)" allow-thread="yes">
+    <modify-function signature="getDouble(QWidget*, const QString&amp;, const QString&amp;, double, double, double, int, bool*, QFlags&lt;Qt::WindowType&gt;)" allow-thread="yes">
       <modify-argument index="8">
         <remove-default-expression/>
         <remove-argument/>
@@ -2613,7 +3520,36 @@
     <extra-includes>
       <include file-name="QVarLengthArray" location="global"/>
     </extra-includes>
+    <enum-type name="ItemIndexMethod"/>
+    <enum-type name="SceneLayer" flags="SceneLayers"/>
+
+    <!-- ### Obsolete -->
     <modify-function signature="drawItems(QPainter*,int,QGraphicsItem**,const QStyleOptionGraphicsItem*,QWidget*)" remove="all" />
+    <!-- ### -->
+
+    <modify-function signature="createItemGroup(const QList&lt;QGraphicsItem*&gt;&amp;)">
+        <modify-argument index="1">
+            <parent index="return" action="add" />
+        </modify-argument>
+        <modify-argument index="return">
+            <define-ownership owner="default"/>
+        </modify-argument>
+    </modify-function>
+
+    <modify-function signature="destroyItemGroup(QGraphicsItemGroup*)">
+        <inject-code>
+        QGraphicsItem* parentItem = %1->parentItem();
+        Shiboken::AutoDecRef parent(%CONVERTTOPYTHON[QGraphicsItem*](parentItem));
+        foreach (QGraphicsItem* item, %1->children())
+            Shiboken::Object::setParent(parent, %CONVERTTOPYTHON[QGraphicsItem*](item));
+        %BEGIN_ALLOW_THREADS
+        %CPPSELF.%FUNCTION_NAME(%1);
+        %END_ALLOW_THREADS
+        // the arg was destroyed by Qt.
+        Shiboken::Object::invalidate(%PYARG_1);
+        </inject-code>
+    </modify-function>
+
     <modify-function signature="contextMenuEvent(QGraphicsSceneContextMenuEvent*)">
       <modify-argument index="1" invalidate-after-use="yes"/>
     </modify-function>
@@ -2668,24 +3604,24 @@
     <modify-function signature="wheelEvent(QGraphicsSceneWheelEvent*)">
       <modify-argument index="1" invalidate-after-use="yes"/>
     </modify-function>
-    <modify-function signature="addItem(QGraphicsItem *)">
+    <modify-function signature="addItem(QGraphicsItem*)">
       <modify-argument index="1">
         <parent index="this" action="add" />
       </modify-argument>
    </modify-function>
 
-    <modify-function signature="addEllipse(const QRectF &amp;, const QPen &amp;, const QBrush &amp;)">
+    <modify-function signature="addEllipse(const QRectF&amp;, const QPen&amp;, const QBrush&amp;)">
       <modify-argument index="return">
         <parent index="this" action="add" />
       </modify-argument>
     </modify-function>
-    <modify-function signature="addEllipse(qreal, qreal, qreal, qreal, const QPen &amp;, const QBrush &amp;)">
+    <modify-function signature="addEllipse(qreal, qreal, qreal, qreal, const QPen&amp;, const QBrush&amp;)">
       <modify-argument index="return">
         <parent index="this" action="add" />
       </modify-argument>
     </modify-function>
 
-    <modify-function signature="addLine(const QLineF &amp;, const QPen &amp;)">
+    <modify-function signature="addLine(const QLineF&amp;, const QPen&amp;)">
       <modify-argument index="return">
         <parent index="this" action="add" />
       </modify-argument>
@@ -2696,47 +3632,50 @@
       </modify-argument>
     </modify-function>
 
-    <modify-function signature="addPath(const QPainterPath &amp;, const QPen &amp;, const QBrush &amp;)">
+    <modify-function signature="addPath(const QPainterPath&amp;, const QPen&amp;, const QBrush&amp;)">
       <modify-argument index="return">
         <parent index="this" action="add" />
       </modify-argument>
     </modify-function>
-    <modify-function signature="addPixmap(const QPixmap &amp;)">
+    <modify-function signature="addPixmap(const QPixmap&amp;)">
       <modify-argument index="return">
         <parent index="this" action="add" />
       </modify-argument>
     </modify-function>
-    <modify-function signature="addPolygon(const QPolygonF &amp;, const QPen &amp;, const QBrush &amp;)">
+    <modify-function signature="addPolygon(const QPolygonF&amp;, const QPen&amp;, const QBrush&amp;)">
       <modify-argument index="return">
         <parent index="this" action="add" />
       </modify-argument>
     </modify-function>
-    <modify-function signature="addRect(const QRectF &amp;, const QPen &amp;, const QBrush &amp;)">
+    <modify-function signature="addRect(const QRectF&amp;, const QPen&amp;, const QBrush&amp;)">
       <modify-argument index="return">
         <parent index="this" action="add" />
       </modify-argument>
     </modify-function>
-    <modify-function signature="addRect(qreal, qreal, qreal, qreal, const QPen &amp;, const QBrush &amp;)">
+    <modify-function signature="addRect(qreal, qreal, qreal, qreal, const QPen&amp;, const QBrush&amp;)">
       <modify-argument index="return">
         <parent index="this" action="add" />
       </modify-argument>
     </modify-function>
 
-    <modify-function signature="addText(const QString &amp;, const QFont &amp;)">
+    <modify-function signature="addText(const QString&amp;, const QFont&amp;)">
       <modify-argument index="return">
         <parent index="this" action="add" />
       </modify-argument>
     </modify-function>
-    <modify-function signature="addSimpleText(const QString &amp;, const QFont &amp;)">
+    <modify-function signature="addSimpleText(const QString&amp;, const QFont&amp;)">
       <modify-argument index="return">
         <parent index="this" action="add" />
       </modify-argument>
     </modify-function>
 
     <modify-function signature="addWidget(QWidget*,QFlags&lt;Qt::WindowType&gt;)">
-      <modify-argument index="return">
-        <parent index="this" action="add" />
-      </modify-argument>
+        <!-- TODO: Add a keeper attribute to reference-count tag to do what this inject code do. -->
+        <inject-code>
+        %RETURN_TYPE %0 = %CPPSELF.%FUNCTION_NAME(%1, %2);
+        %PYARG_0 = %CONVERTTOPYTHON[%RETURN_TYPE](%0);
+        Shiboken::Object::keepReference((SbkObject*)%PYARG_0, "setWidget(QWidget*)1", %PYARG_1);
+        </inject-code>
     </modify-function>
 
     <!-- use glue code -->
@@ -2746,9 +3685,21 @@
         </modify-argument>
     </modify-function>
 
-    <modify-function signature="createItemGroup(const QList&lt;QGraphicsItem*&gt;&amp;)" remove="all"/>
-    <modify-function signature="destroyItemGroup(QGraphicsItemGroup*)" remove="all"/>
-    <modify-function signature="clear()" remove="all"/>
+    <modify-function signature="clear()">
+        <inject-code>
+            const QList&lt;QGraphicsItem*> items = %CPPSELF.items();
+            Shiboken::BindingManager&amp; bm = Shiboken::BindingManager::instance();
+            foreach (QGraphicsItem* item, items) {
+                SbkObject* obj = bm.retrieveWrapper(item);
+                if (obj) {
+                    if (reinterpret_cast&lt;PyObject*&gt;(obj)->ob_refcnt > 1) // If the refcnt is 1 the object will vannish anyway.
+                        Shiboken::Object::invalidate(obj);
+                    Shiboken::Object::removeParent(obj);
+                }
+            }
+            %CPPSELF.%FUNCTION_NAME();
+        </inject-code>
+    </modify-function>
 
     <modify-function signature="removeItem(QGraphicsItem*)">
       <modify-argument index="1">
@@ -2763,13 +3714,16 @@
     </modify-function>
   </object-type>
   <object-type name="QCalendarWidget">
+    <enum-type name="HorizontalHeaderFormat"/>
+    <enum-type name="SelectionMode"/>
+    <enum-type name="VerticalHeaderFormat"/>
     <extra-includes>
       <include file-name="QTextCharFormat" location="global"/>
     </extra-includes>
+    <!--### Obsolete in 4.3-->
     <modify-function signature="isHeaderVisible()const" remove="all"/>
-    <!--### Obsolete in 4.3-->
     <modify-function signature="setHeaderVisible(bool)" remove="all"/>
-    <!--### Obsolete in 4.3-->
+    <!--### End of obsolete section -->
     <modify-function signature="paintCell(QPainter*,QRect,QDate)const">
       <modify-argument invalidate-after-use="yes" index="1"/>
     </modify-function>
@@ -2778,19 +3732,13 @@
     <modify-function signature="dropMimeData(QTreeWidgetItem*,int,const QMimeData*,Qt::DropAction)">
       <modify-argument index="1" invalidate-after-use="yes"/>
     </modify-function>
-    <modify-function signature="isSortingEnabled()const" remove="all"/>
-    <modify-function signature="setSortingEnabled(bool)" remove="all"/>
+    <!-- ### "indexOfTopLevelItem(QTreeWidgetItem*)" is an internal method. -->
     <modify-function signature="indexOfTopLevelItem(QTreeWidgetItem *)" remove="all"/>
     <modify-function signature="addTopLevelItem(QTreeWidgetItem *)">
       <modify-argument index="1">
         <parent index="this" action="add"/>
       </modify-argument>
     </modify-function>
-    <modify-function signature="takeTopLevelItem(int)">
-      <modify-argument index="return">
-        <parent index="this" action="add"/>
-      </modify-argument>
-    </modify-function>
     <modify-function signature="addTopLevelItems(const QList&lt;QTreeWidgetItem*&gt; &amp;)">
       <modify-argument index="1">
         <parent index="this" action="add"/>
@@ -2811,78 +3759,87 @@
         <parent index="this" action="add"/>
       </modify-argument>
     </modify-function>
-    <modify-function signature="setHeaderItem(QTreeWidgetItem *)">
+    <modify-function signature="setHeaderItem(QTreeWidgetItem*)">
       <modify-argument index="1">
         <parent index="this" action="add"/>
       </modify-argument>
     </modify-function>
     <modify-function signature="takeTopLevelItem(int)">
       <modify-argument index="return">
+        <define-ownership owner="default"/>
         <parent index="this" action="remove"/>
       </modify-argument>
     </modify-function>
-    <modify-function signature="removeItemWidget(QTreeWidgetItem*,int)">
-      <modify-argument index="1">
-        <parent index="this" action="remove"/>
-      </modify-argument>
+    <modify-function signature="clear()">
+        <inject-code>
+        QTreeWidgetItem *rootItem = %CPPSELF.invisibleRootItem();
+        Shiboken::BindingManager &amp;bm = Shiboken::BindingManager::instance();
+        for (int i = 0; i &lt; rootItem->childCount(); ++i) {
+            QTreeWidgetItem *item = rootItem->child(i);
+            SbkObject* wrapper = bm.retrieveWrapper(item);
+            if (wrapper)
+                Shiboken::Object::setParent(0, reinterpret_cast&lt;PyObject*&gt;(wrapper));
+        }
+        </inject-code>
     </modify-function>
-   <modify-function signature="items(const QMimeData*)const" remove="all"/>
     <!--### Obsolete in 4.3-->
-    <modify-function signature="mimeData(const QList&lt;QTreeWidgetItem*&gt;)const" remove="all"/>
+    <modify-function signature="items(const QMimeData*)const" remove="all"/>
   </object-type>
   <object-type name="QAbstractItemDelegate">
+    <enum-type name="EndEditHint"/>
     <modify-function signature="paint(QPainter*,QStyleOptionViewItem,QModelIndex)const">
       <modify-argument index="1" invalidate-after-use="yes"/>
     </modify-function>
     <modify-function signature="editorEvent(QEvent*,QAbstractItemModel*,QStyleOptionViewItem,QModelIndex)">
       <modify-argument index="1" invalidate-after-use="yes"/>
     </modify-function>
-    <modify-function signature="elidedText(QFontMetrics, int, Qt::TextElideMode, QString)" remove="all"/>
     <!--### Obsolete in 4.3-->
+    <modify-function signature="elidedText(QFontMetrics, int, Qt::TextElideMode, QString)" remove="all"/>
+    <modify-function signature="createEditor(QWidget*,QStyleOptionViewItem,QModelIndex)const">
+      <modify-argument index="1">
+        <define-ownership owner="c++"/>
+      </modify-argument>
+      <modify-argument index="return">
+        <define-ownership class="native" owner="c++"/>
+      </modify-argument>
+    </modify-function>
   </object-type>
   <object-type name="QTableWidgetItem" >
-    <modify-function signature="operator=(const QTableWidgetItem&amp;)" remove="all"/>
+    <enum-type name="ItemType"/>
+    <!--### Obsolete in 4.3-->
     <modify-function signature="backgroundColor()const" remove="all"/>
-    <!--### Obsolete in 4.3-->
     <modify-function signature="setBackgroundColor(QColor)" remove="all"/>
-    <!--### Obsolete in 4.3-->
     <modify-function signature="setTextColor(QColor)" remove="all"/>
-    <!--### Obsolete in 4.3-->
     <modify-function signature="textColor()const" remove="all"/>
-    <!--### Obsolete in 4.3-->
-    <modify-function signature="operator&lt;(QTableWidgetItem)const">
-      <modify-argument index="1" invalidate-after-use="yes"/>
-    </modify-function>
+    <!--### End of obsolete section -->
     <modify-function signature="read(QDataStream&amp;)">
       <modify-argument index="1" invalidate-after-use="yes"/>
     </modify-function>
     <modify-function signature="write(QDataStream&amp;)const">
       <modify-argument index="1" invalidate-after-use="yes"/>
     </modify-function>
-    <modify-function signature="read(QDataStream &amp;)" remove="all"/>
-    <modify-function signature="write(QDataStream &amp;)const" remove="all"/>
-    <modify-function signature="QTableWidgetItem(QTableWidgetItem)" remove="all"/>
-    <modify-function signature="operator=(QTableWidgetItem)" remove="all"/>
-    <modify-function signature="operator&lt;(QTableWidgetItem)const" remove="all"/>
   </object-type>
   <object-type name="QListWidgetItem" >
-    <modify-function signature="QListWidgetItem(const QString &amp;, QListWidget *, int)">
+    <enum-type name="ItemType"/>
+    <modify-function signature="QListWidgetItem(const QString&amp;, QListWidget*, int)">
       <modify-argument index="this">
         <parent index="2" action="add"/>
       </modify-argument>
     </modify-function>
-    <modify-function signature="QListWidgetItem(const QIcon &amp;, const QString &amp;, QListWidget *, int)">
+    <modify-function signature="QListWidgetItem(const QIcon&amp;, const QString&amp;, QListWidget*, int)">
       <modify-argument index="this">
         <parent index="3" action="add"/>
       </modify-argument>
     </modify-function>
-    <modify-function signature="QListWidgetItem(QListWidget *, int)">
+    <modify-function signature="QListWidgetItem(QListWidget*, int)">
       <modify-argument index="this">
         <parent index="1" action="add"/>
       </modify-argument>
     </modify-function>
-    <modify-function signature="operator&lt;(QListWidgetItem)const">
-      <modify-argument index="1" invalidate-after-use="yes"/>
+    <modify-function signature="listWidget() const">
+      <modify-argument index="return">
+        <define-ownership owner="target"/>
+      </modify-argument>
     </modify-function>
     <modify-function signature="read(QDataStream&amp;)">
       <modify-argument index="1" invalidate-after-use="yes"/>
@@ -2890,20 +3847,12 @@
     <modify-function signature="write(QDataStream&amp;)const">
       <modify-argument index="1" invalidate-after-use="yes"/>
     </modify-function>
-    <modify-function signature="operator=(const QListWidgetItem&amp;)" remove="all"/>
+    <!--### Obsolete in 4.3-->
     <modify-function signature="backgroundColor()const" remove="all"/>
-    <!--### Obsolete in 4.3-->
     <modify-function signature="setBackgroundColor(QColor)" remove="all"/>
-    <!--### Obsolete in 4.3-->
     <modify-function signature="setTextColor(QColor)" remove="all"/>
-    <!--### Obsolete in 4.3-->
     <modify-function signature="textColor()const" remove="all"/>
-    <!--### Obsolete in 4.3-->
-    <modify-function signature="read(QDataStream &amp;)" remove="all"/>
-    <modify-function signature="write(QDataStream &amp;)const" remove="all"/>
-    <modify-function signature="QListWidgetItem(QListWidgetItem)" remove="all"/>
-    <modify-function signature="operator=(QListWidgetItem)" remove="all"/>
-    <modify-function signature="operator&lt;(QListWidgetItem)const" remove="all"/>
+    <!--### End of obsolete section -->
   </object-type>
   <object-type name="QGraphicsTextItem">
     <!-- a QObject so main-thread delete redundant -->
@@ -2917,51 +3866,44 @@
     </modify-function>
   </object-type>
   <object-type name="QCompleter">
-    <modify-function signature="activated(const QModelIndex &amp;)">
-      <rename to="activatedIndex"/>
-    </modify-function>
-    <modify-function signature="highlighted(const QModelIndex &amp;)">
-      <rename to="highlightedIndex"/>
-    </modify-function>
-    <modify-function signature="setModel(QAbstractItemModel *)">
+    <enum-type name="CompletionMode"/>
+    <enum-type name="ModelSorting"/>
+    <modify-function signature="setModel(QAbstractItemModel*)">
       <modify-argument index="1">
-        <reference-count action="add"/>
+        <reference-count action="set"/>
       </modify-argument>
     </modify-function>
-    <modify-function signature="setPopup(QAbstractItemView *)">
+    <modify-function signature="setPopup(QAbstractItemView*)">
       <modify-argument index="1">
         <parent index="this" action="add"/>
       </modify-argument>
     </modify-function>
-    <modify-function signature="setWidget(QWidget *)">
-      <modify-argument index="1">
-        <parent index="this" action="add"/>
+    <modify-function signature="setWidget(QWidget*)">
+      <modify-argument index="this">
+        <parent index="1" action="add"/>
       </modify-argument>
     </modify-function>
   </object-type>
   <object-type name="QTreeWidgetItem" hash-function="qHash">
-    <modify-function signature="operator&lt;(QTreeWidgetItem)const">
-      <modify-argument index="1" invalidate-after-use="yes"/>
-    </modify-function>
+    <enum-type name="ChildIndicatorPolicy"/>
+    <enum-type name="ItemType"/>
     <modify-function signature="read(QDataStream&amp;)">
       <modify-argument index="1" invalidate-after-use="yes"/>
     </modify-function>
     <modify-function signature="write(QDataStream&amp;)const">
       <modify-argument index="1" invalidate-after-use="yes"/>
     </modify-function>
-    <modify-function signature="QTreeWidgetItem(const QTreeWidgetItem &amp;)" remove="all"/>
-    <modify-function signature="operator=(const QTreeWidgetItem&amp;)" remove="all"/>
-    <modify-function signature="QTreeWidgetItem(QTreeWidget *,int)">
+    <modify-function signature="QTreeWidgetItem(QTreeWidget*, int)">
       <modify-argument index="this">
         <parent index="1" action="add"/>
       </modify-argument>
     </modify-function>
-    <modify-function signature="QTreeWidgetItem(QTreeWidget *,const QStringList&amp;,int)">
+    <modify-function signature="QTreeWidgetItem(QTreeWidget*, const QStringList&amp;, int)">
       <modify-argument index="this">
         <parent index="1" action="add"/>
       </modify-argument>
     </modify-function>
-    <modify-function signature="QTreeWidgetItem(QTreeWidget *,QTreeWidgetItem *,int)">
+    <modify-function signature="QTreeWidgetItem(QTreeWidget*, QTreeWidgetItem*, int)">
       <modify-argument index="this">
         <parent index="1" action="add"/>
       </modify-argument>
@@ -2971,12 +3913,12 @@
         <parent index="1" action="add"/>
       </modify-argument>
     </modify-function>
-    <modify-function signature="QTreeWidgetItem(QTreeWidgetItem *,const QStringList &amp;,int)">
+    <modify-function signature="QTreeWidgetItem(QTreeWidgetItem*, const QStringList &amp;, int)">
       <modify-argument index="this">
         <parent index="1" action="add"/>
       </modify-argument>
     </modify-function>
-    <modify-function signature="QTreeWidgetItem(QTreeWidgetItem *,QTreeWidgetItem *,int)">
+    <modify-function signature="QTreeWidgetItem(QTreeWidgetItem*, QTreeWidgetItem*, int)">
       <modify-argument index="this">
         <parent index="1" action="add"/>
       </modify-argument>
@@ -3016,19 +3958,35 @@
         <parent index="this" action="add"/>
       </modify-argument>
     </modify-function>
+    <modify-function signature="parent() const">
+      <modify-argument index="return">
+        <define-ownership class="target" owner="default"/>
+      </modify-argument>
+      <inject-code class="target" position="end">
+          // Only call the parent function if this return some value
+          // the parent can be the TreeWidget
+          if (%0)
+            Shiboken::Object::setParent(%PYARG_0, %PYSELF);
+      </inject-code>
+    </modify-function>
+    <modify-function signature="treeWidget() const">
+      <modify-argument index="return">
+        <define-ownership class="target" owner="default"/>
+      </modify-argument>
+      <inject-code class="target" position="end">
+          // Only call the parent function if this return some value
+          // the parent can be the TreeWidgetItem
+          if (%0)
+            Shiboken::Object::setParent(%PYARG_0, %PYSELF);
+      </inject-code>
+    </modify-function>
+
+    <!--### Obsolete in 4.3-->
     <modify-function signature="backgroundColor(int)const" remove="all"/>
-    <!--### Obsolete in 4.3-->
     <modify-function signature="setBackgroundColor(int, QColor)" remove="all"/>
-    <!--### Obsolete in 4.3-->
     <modify-function signature="setTextColor(int, QColor)" remove="all"/>
-    <!--### Obsolete in 4.3-->
     <modify-function signature="textColor(int)const" remove="all"/>
-    <!--### Obsolete in 4.3-->
-    <modify-function signature="read(QDataStream &amp;)" remove="all"/>
-    <modify-function signature="write(QDataStream &amp;)const" remove="all"/>
-    <modify-function signature="QTreeWidgetItem(QTreeWidgetItem)" remove="all"/>
-    <modify-function signature="operator=(QTreeWidgetItem)" remove="all"/>
-    <modify-function signature="operator&lt;(QTreeWidgetItem)const" remove="all"/>
+    <!--### End of obsolete section -->
   </object-type>
   <object-type name="QListWidget">
     <modify-function signature="setItemWidget(QListWidgetItem *, QWidget *)">
@@ -3036,116 +3994,214 @@
         <parent index="1" action="add"/>
       </modify-argument>
     </modify-function>
-    <modify-function signature="addItem(QListWidgetItem *)">
+    <modify-function signature="addItem(QListWidgetItem*)">
       <modify-argument index="1">
         <parent index="this" action="add"/>
       </modify-argument>
     </modify-function>
-    <modify-function signature="insertItem(int, QListWidgetItem *)">
+    <modify-function signature="insertItem(int, QListWidgetItem*)">
       <modify-argument index="2">
         <parent index="this" action="add"/>
       </modify-argument>
     </modify-function>
-    <modify-function signature="removeItemWidget(QListWidgetItem*)">
-      <modify-argument index="1">
-        <parent index="this" action="remove"/>
-      </modify-argument>
-    </modify-function>
+    <!--### Obsolete in 4.3-->
     <modify-function signature="setItemHidden(const QListWidgetItem*,bool)" remove="all"/>
     <modify-function signature="isItemHidden(const QListWidgetItem*)const" remove="all"/>
     <modify-function signature="setItemSelected(const QListWidgetItem*,bool)" remove="all"/>
     <modify-function signature="isItemSelected(const QListWidgetItem*)const" remove="all"/>
+    <!--### End of obsolete section -->
     <modify-function signature="takeItem(int)">
       <modify-argument index="return">
         <define-ownership owner="default"/>
+        <parent index="this" action="remove"/>
       </modify-argument>
     </modify-function>
-    <modify-function signature="mimeData(const QList&lt;QListWidgetItem*&gt;)const" remove="all"/>
   </object-type>
   <object-type name="QWidget">
     <extra-includes>
       <include file-name="QIcon" location="global"/>
       <include file-name="QMessageBox" location="global"/>
-      <include file-name="glue/qwidget_glue.h" location="local"/>
     </extra-includes>
 
+    <inject-code class="native" file="glue/qwidget_glue.cpp" position="beginning" />
+
+    <enum-type name="RenderFlag" flags="RenderFlags"/>
+
+    <modify-function signature="setParent(QWidget*)">
+      <modify-argument index="this">
+        <parent index="1" action="add"/>
+      </modify-argument>
+    </modify-function>
+
+    <modify-function signature="setParent(QWidget*, QFlags&lt;Qt::WindowType&gt;)">
+      <modify-argument index="this">
+        <parent index="1" action="add"/>
+      </modify-argument>
+    </modify-function>
+
+    <modify-function signature="parentWidget()const">
+        <modify-argument index="this">
+          <parent index="return" action="add"/>
+        </modify-argument>
+        <modify-argument index="return">
+          <define-ownership class="target" owner="default"/>
+        </modify-argument>
+    </modify-function>
+
     <modify-function signature="actionEvent(QActionEvent*)">
-        <modify-argument index="1" invalidate-after-use="yes"/>
+        <modify-argument index="1" invalidate-after-use="yes">
+            <rename to="event"/>
+        </modify-argument>
     </modify-function>
     <modify-function signature="changeEvent(QEvent*)">
-        <modify-argument index="1" invalidate-after-use="yes"/>
+        <modify-argument index="1" invalidate-after-use="yes">
+            <rename to="event"/>
+        </modify-argument>
     </modify-function>
     <modify-function signature="closeEvent(QCloseEvent*)">
-        <modify-argument index="1" invalidate-after-use="yes"/>
+        <modify-argument index="1" invalidate-after-use="yes">
+            <rename to="event"/>
+        </modify-argument>
     </modify-function>
     <modify-function signature="contextMenuEvent(QContextMenuEvent*)">
-        <modify-argument index="1" invalidate-after-use="yes"/>
+        <modify-argument index="1" invalidate-after-use="yes">
+            <rename to="event"/>
+        </modify-argument>
     </modify-function>
     <modify-function signature="dragEnterEvent(QDragEnterEvent*)">
-        <modify-argument index="1" invalidate-after-use="yes"/>
+        <modify-argument index="1" invalidate-after-use="yes">
+            <rename to="event"/>
+        </modify-argument>
     </modify-function>
     <modify-function signature="dragLeaveEvent(QDragLeaveEvent*)">
-        <modify-argument index="1" invalidate-after-use="yes"/>
+        <modify-argument index="1" invalidate-after-use="yes">
+            <rename to="event"/>
+        </modify-argument>
     </modify-function>
     <modify-function signature="dragMoveEvent(QDragMoveEvent*)">
-        <modify-argument index="1" invalidate-after-use="yes"/>
+        <modify-argument index="1" invalidate-after-use="yes">
+            <rename to="event"/>
+        </modify-argument>
     </modify-function>
     <modify-function signature="dropEvent(QDropEvent*)">
-        <modify-argument index="1" invalidate-after-use="yes"/>
+        <modify-argument index="1" invalidate-after-use="yes">
+            <rename to="event"/>
+        </modify-argument>
     </modify-function>
     <modify-function signature="enterEvent(QEvent*)">
-        <modify-argument index="1" invalidate-after-use="yes"/>
+        <modify-argument index="1" invalidate-after-use="yes">
+            <rename to="event"/>
+        </modify-argument>
     </modify-function>
     <modify-function signature="focusInEvent(QFocusEvent*)">
-        <modify-argument index="1" invalidate-after-use="yes"/>
+        <modify-argument index="1" invalidate-after-use="yes">
+            <rename to="event"/>
+        </modify-argument>
     </modify-function>
     <modify-function signature="focusOutEvent(QFocusEvent*)">
-        <modify-argument index="1" invalidate-after-use="yes"/>
+        <modify-argument index="1" invalidate-after-use="yes">
+            <rename to="event"/>
+        </modify-argument>
     </modify-function>
     <modify-function signature="hideEvent(QHideEvent*)">
-        <modify-argument index="1" invalidate-after-use="yes"/>
+        <modify-argument index="1" invalidate-after-use="yes">
+            <rename to="event"/>
+        </modify-argument>
     </modify-function>
     <modify-function signature="inputMethodEvent(QInputMethodEvent*)">
-        <modify-argument index="1" invalidate-after-use="yes"/>
+        <modify-argument index="1" invalidate-after-use="yes">
+            <rename to="event"/>
+        </modify-argument>
     </modify-function>
     <modify-function signature="keyPressEvent(QKeyEvent*)">
-        <modify-argument index="1" invalidate-after-use="yes"/>
+        <modify-argument index="1" invalidate-after-use="yes">
+            <rename to="event"/>
+        </modify-argument>
     </modify-function>
     <modify-function signature="keyReleaseEvent(QKeyEvent*)">
-        <modify-argument index="1" invalidate-after-use="yes"/>
+        <modify-argument index="1" invalidate-after-use="yes">
+            <rename to="event"/>
+        </modify-argument>
     </modify-function>
     <modify-function signature="leaveEvent(QEvent*)">
-        <modify-argument index="1" invalidate-after-use="yes"/>
+        <modify-argument index="1" invalidate-after-use="yes">
+            <rename to="event"/>
+        </modify-argument>
     </modify-function>
     <modify-function signature="mouseDoubleClickEvent(QMouseEvent*)">
-        <modify-argument index="1" invalidate-after-use="yes"/>
+        <modify-argument index="1" invalidate-after-use="yes">
+            <rename to="event"/>
+        </modify-argument>
     </modify-function>
     <modify-function signature="mouseMoveEvent(QMouseEvent*)">
-        <modify-argument index="1" invalidate-after-use="yes"/>
+        <modify-argument index="1" invalidate-after-use="yes">
+            <rename to="event"/>
+        </modify-argument>
     </modify-function>
     <modify-function signature="mousePressEvent(QMouseEvent*)">
-        <modify-argument index="1" invalidate-after-use="yes"/>
+        <modify-argument index="1" invalidate-after-use="yes">
+            <rename to="event"/>
+        </modify-argument>
     </modify-function>
     <modify-function signature="mouseReleaseEvent(QMouseEvent*)">
-        <modify-argument index="1" invalidate-after-use="yes"/>
+        <modify-argument index="1" invalidate-after-use="yes">
+            <rename to="event"/>
+        </modify-argument>
     </modify-function>
     <modify-function signature="moveEvent(QMoveEvent*)">
-        <modify-argument index="1" invalidate-after-use="yes"/>
+        <modify-argument index="1" invalidate-after-use="yes">
+            <rename to="event"/>
+        </modify-argument>
     </modify-function>
     <modify-function signature="paintEvent(QPaintEvent*)">
-        <modify-argument index="1" invalidate-after-use="yes"/>
+        <modify-argument index="1" invalidate-after-use="yes">
+            <rename to="event"/>
+        </modify-argument>
     </modify-function>
     <modify-function signature="resizeEvent(QResizeEvent*)">
-        <modify-argument index="1" invalidate-after-use="yes"/>
+        <modify-argument index="1" invalidate-after-use="yes">
+            <rename to="event"/>
+        </modify-argument>
     </modify-function>
     <modify-function signature="showEvent(QShowEvent*)">
-        <modify-argument index="1" invalidate-after-use="yes"/>
+        <modify-argument index="1" invalidate-after-use="yes">
+            <rename to="event"/>
+        </modify-argument>
     </modify-function>
     <modify-function signature="tabletEvent(QTabletEvent*)">
-        <modify-argument index="1" invalidate-after-use="yes"/>
+        <modify-argument index="1" invalidate-after-use="yes">
+            <rename to="event"/>
+        </modify-argument>
     </modify-function>
     <modify-function signature="wheelEvent(QWheelEvent*)">
-        <modify-argument index="1" invalidate-after-use="yes"/>
+        <modify-argument index="1" invalidate-after-use="yes">
+            <rename to="event"/>
+        </modify-argument>
+    </modify-function>
+
+    <modify-function signature="setStyle(QStyle*)">
+      <inject-code class="target" position="end">
+        Shiboken::Object::keepReference(reinterpret_cast&lt;SbkObject*&gt;(%PYSELF), "__style__",  %PYARG_1);
+      </inject-code>
+    </modify-function>
+    <modify-function signature="style()const">
+      <inject-code class="target" position="end">
+        QStyle* myStyle = %CPPSELF->style();
+        if (myStyle &amp;&amp; qApp) {
+        %PYARG_0 = %CONVERTTOPYTHON[QStyle*](myStyle);
+            QStyle *appStyle = qApp->style();
+            if (appStyle == myStyle) {
+                Shiboken::AutoDecRef pyApp(%CONVERTTOPYTHON[QApplication*](qApp));
+                Shiboken::Object::setParent(pyApp, %PYARG_0);
+                Shiboken::Object::releaseOwnership(%PYARG_0);
+            } else {
+                Shiboken::Object::keepReference(reinterpret_cast&lt;SbkObject*&gt;(%PYSELF), "__style__",  %PYARG_0);
+            }
+        }
+      </inject-code>
+      <modify-argument index="return">
+        <define-ownership owner="default"/>
+      </modify-argument>
     </modify-function>
 
     <modify-function signature="render(QPainter*,QPoint,QRegion,QFlags&lt;QWidget::RenderFlag&gt;)">
@@ -3164,49 +4220,85 @@
         <define-ownership owner="c++"/>
       </modify-argument>
     </modify-function>
-    <modify-function signature="getContentsMargins(int*,int*,int*,int*)const" remove="all" />
-    <modify-function signature="insertAction(QAction *, QAction *)">
+    <modify-function signature="getContentsMargins(int*,int*,int*,int*)const">
+        <modify-argument index="0">
+            <replace-type modified-type="PyObject" />
+        </modify-argument>
+        <modify-argument index="1">
+            <remove-argument/>
+        </modify-argument>
+        <modify-argument index="2">
+            <remove-argument/>
+        </modify-argument>
+        <modify-argument index="3">
+            <remove-argument/>
+        </modify-argument>
+        <modify-argument index="4">
+            <remove-argument/>
+        </modify-argument>
+        <inject-code class="target" position="beginning">
+            <insert-template name="fix_number*,number*,number*,number*">
+                <replace from="$TYPE" to="int" />
+            </insert-template>
+        </inject-code>
+        <inject-code class="native" position="end">
+            <insert-template name="fix_native_return_number*,number*,number*,number*">
+                <replace from="$TYPE" to="int" />
+            </insert-template>
+        </inject-code>
+    </modify-function>
+    <modify-function signature="insertAction(QAction*, QAction*)">
       <modify-argument index="2">
         <parent index="this" action="add"/>
       </modify-argument>
     </modify-function>
-    <modify-function signature="parentWidget()const">
-      <modify-argument index="return">
-        <define-ownership owner="target"/>
-      </modify-argument>
-    </modify-function>
 
     <modify-function signature="setLayout(QLayout *)">
       <inject-code class="target" position="beginning">
         qwidgetSetLayout(%CPPSELF, %1);
+        // %FUNCTION_NAME() - disable generation of function call.
       </inject-code>
     </modify-function>
+    <!--### Obsolete in 4.3-->
     <modify-function signature="enabledChange(bool)" remove="all"/>
-    <!--### Obsolete in 4.3-->
     <modify-function signature="fontChange(QFont)" remove="all"/>
-    <!--### Obsolete in 4.3-->
     <modify-function signature="isEnabledToTLW()const" remove="all"/>
-    <!--### Obsolete in 4.3-->
     <modify-function signature="isTopLevel()const" remove="all"/>
-    <!--### Obsolete in 4.3-->
     <modify-function signature="paletteChange(QPalette)" remove="all"/>
-    <!--### Obsolete in 4.3-->
     <modify-function signature="setShown(bool)" remove="all"/>
-    <!--### Obsolete in 4.3-->
     <modify-function signature="topLevelWidget()const" remove="all"/>
-    <!--### Obsolete in 4.3-->
     <modify-function signature="windowActivationChange(bool)" remove="all"/>
-    <!--### Obsolete in 4.3-->
+    <!--### End of obsolete section -->
     <modify-function signature="raise()" rename="raise_" />
     <modify-function signature="setParent(QWidget*, QFlags&lt;Qt::WindowType>)">
       <modify-argument index="this">
         <parent index="1" action="add"/>
       </modify-argument>
     </modify-function>
+    <modify-function signature="winId()const">
+        <inject-documentation mode="replace" format="target">
+            Returns the window system identifier of the widget.
+
+            Portable in principle, but if you use it you are probably about to do something non-portable. Be careful.
+
+            If a widget is non-native (alien) and winId() is invoked on it, that widget will be provided a native handle.
+
+            On X11 the type returned is long, on other platforms it's void pointer casted to a Python long long.
+
+            This value may change at run-time. An event with type PySide.QtCore.QEvent.WinIdChange will be sent to the widget following a change in window system identifier.
+        </inject-documentation>
+    </modify-function>
+
+    <modify-function signature="window()const">
+      <modify-argument index="return">
+        <define-ownership class="target" owner="default"/>
+      </modify-argument>
+    </modify-function>
   </object-type>
   <object-type name="QMessageBox">
-    <modify-function signature="setWindowTitle(const QString &amp;)" remove="all"/>
-    <modify-function signature="setWindowModality(Qt::WindowModality)" remove="all"/>
+    <enum-type name="ButtonRole"/>
+    <enum-type name="Icon"/>
+    <enum-type name="StandardButton" flags="StandardButtons" />
     <modify-function signature="removeButton(QAbstractButton*)">
       <modify-argument index="1">
         <parent index="this" action="add"/>
@@ -3215,30 +4307,20 @@
     <extra-includes>
       <include file-name="QPixmap" location="global"/>
     </extra-includes>
+    <!--### Obsolete in 4.3-->
     <modify-function signature="QMessageBox(QString,QString,QMessageBox::Icon,int,int,int,QWidget*,QFlags&lt;Qt::WindowType&gt;)" remove="all"/>
-    <!--### Obsolete in 4.3-->
     <modify-function signature="buttonText(int)const" remove="all"/>
-    <!--### Obsolete in 4.3-->
     <modify-function signature="setButtonText(int, QString)" remove="all"/>
-    <!--### Obsolete in 4.3-->
     <modify-function signature="standardIcon(QMessageBox::Icon)" remove="all"/>
-    <!--### Obsolete in 4.3-->
     <modify-function signature="critical(QWidget*,QString,QString,int,int,int)" remove="all"/>
-    <!--### Obsolete in 4.3-->
     <modify-function signature="critical(QWidget*,QString,QString,QString,QString,QString,int,int)" remove="all"/>
-    <!--### Obsolete in 4.3-->
     <modify-function signature="information(QWidget*,QString,QString,int,int,int)" remove="all"/>
-    <!--### Obsolete in 4.3-->
     <modify-function signature="information(QWidget*,QString,QString,QString,QString,QString,int,int)" remove="all"/>
-    <!--### Obsolete in 4.3-->
     <modify-function signature="question(QWidget*, QString, QString, int, int, int)" remove="all"/>
-    <!--### Obsolete in 4.3-->
     <modify-function signature="question(QWidget*, QString, QString, QString, QString, QString, int, int)" remove="all"/>
-    <!--### Obsolete in 4.3-->
     <modify-function signature="warning(QWidget*, QString, QString, int, int, int)" remove="all"/>
-    <!--### Obsolete in 4.3-->
     <modify-function signature="warning(QWidget*, QString, QString, QString, QString, QString, int, int)" remove="all"/>
-    <!--### Obsolete in 4.3-->
+    <!--### End of obsolete section -->
 
     <modify-function signature="critical(QWidget*, const QString&amp;, const QString&amp;, QFlags&lt;QMessageBox::StandardButton&gt;, QMessageBox::StandardButton)" allow-thread="yes"/>
     <modify-function signature="information(QWidget*, const QString&amp;, const QString&amp;, QFlags&lt;QMessageBox::StandardButton&gt;, QMessageBox::StandardButton)" allow-thread="yes"/>
@@ -3247,31 +4329,83 @@
 
   </object-type>
   <object-type name="QAbstractSpinBox">
+    <enum-type name="ButtonSymbols"/>
+    <enum-type name="CorrectionMode"/>
+    <enum-type name="StepEnabledFlag" flags="StepEnabled"/>
     <modify-function signature="setLineEdit(QLineEdit *)">
       <modify-argument index="1">
         <parent index="this" action="add"/>
       </modify-argument>
     </modify-function>
+    <modify-function signature="fixup(QString &amp;)const">
+      <modify-argument index="return">
+        <replace-type modified-type="QString"/>
+      </modify-argument>
+      <inject-code class="target" position="end">
+        <insert-template name="return_QString"/>
+      </inject-code>
+    </modify-function>
+    <modify-function signature="validate(QString &amp;, int &amp;)const">
+      <modify-argument index="return">
+        <replace-type modified-type="PyObject"/>
+        <conversion-rule class="native">
+            <insert-template name="validator_conversionrule"/>
+        </conversion-rule>
+      </modify-argument>
+      <inject-code class="target" position="end">
+        <insert-template name="return_tuple_QValidator_QString_int"/>
+      </inject-code>
+    </modify-function>
   </object-type>
   <object-type name="QTextFrame" >
     <extra-includes>
       <include file-name="QTextCursor" location="global"/>
     </extra-includes>
+    <value-type name="iterator" >
+      <include file-name="QTextFrame" location="global"/>
+      <!-- ### These operators where removed because they don't make sense in Python.
+           Instead iterator methods (__iter__, next) should be implemented.
+           See bug 688 -->
+      <modify-function signature="operator++()" remove="all"/>
+      <modify-function signature="operator--()" remove="all"/>
+      <!-- ### -->
+      <add-function signature="__iter__()" return-type="PyObject*">
+        <inject-code class="target" position="beginning">
+          <insert-template name="__iter__" />
+        </inject-code>
+      </add-function>
+      <add-function signature="__next__()" return-type="PyObject*">
+        <inject-code class="target" position="beginning">
+          <insert-template name="__next__">
+            <replace from="%CPPSELF_TYPE" to="QTextFrame::iterator" />
+          </insert-template>
+        </inject-code>
+      </add-function>
+    </value-type>
+    <add-function signature="__iter__()" return-type="PyObject*">
+        <inject-code class="target" position="beginning">
+          <insert-template name="__iter_parent__">
+            <replace from="%CPPSELF_TYPE" to="QTextFrame::iterator" />
+          </insert-template>
+        </inject-code>
+    </add-function>
   </object-type>
   <object-type name="QImageIOHandler">
     <extra-includes>
       <include file-name="QRect" location="global"/>
     </extra-includes>
-    <modify-function signature="setFormat(const QByteArray &amp;)const" remove="all"/>
+    <enum-type name="ImageOption"/>
     <modify-function signature="setDevice(QIODevice*)">
       <modify-argument index="1">
         <parent index="this" action="add"/>
       </modify-argument>
     </modify-function>
-    <modify-function signature="name()const" remove="all"/>
     <!--### Obsolete in 4.3-->
+    <modify-function signature="name()const" remove="all"/>
   </object-type>
   <object-type name="QProxyModel" polymorphic-id-expression="qobject_cast&lt;QProxyModel*&gt;(%1)">
+    <!-- ### This reimplementation of "QObject::parent()" is used in C++ only
+         when "using QObject::parent;" is not available. It's useless in Python. -->
     <modify-function signature="parent()const" remove="all"/>
     <extra-includes>
       <include file-name="QPixmap" location="global"/>
@@ -3280,7 +4414,7 @@
     </extra-includes>
     <modify-function signature="setModel(QAbstractItemModel*)">
       <modify-argument index="1">
-        <reference-count action="add"/>
+        <reference-count action="set"/>
       </modify-argument>
     </modify-function>
   </object-type>
@@ -3292,7 +4426,9 @@
       <include file-name="QStringList" location="global"/>
       <include file-name="QImage" location="global"/>
     </extra-includes>
-    <!-- this method does nto makes sense in python -->
+    <enum-type name="ImageReaderError"/>
+    <!-- ### This method does not make sense in Python.
+         Update: perhaps it does, but no one is missing it. -->
     <modify-function signature="read(QImage*)" remove="all" />
     <modify-function signature="setDevice(QIODevice*)">
       <modify-argument index="1">
@@ -3308,6 +4444,9 @@
       <include file-name="QRect" location="global"/>
       <include file-name="QSize" location="global"/>
     </extra-includes>
+    <enum-type name="CacheMode"/>
+    <enum-type name="MovieState"/>
+    <!-- ### "cacheMode()" is an internal method. -->
     <modify-function signature="cacheMode()" remove="all"/>
     <modify-function signature="setDevice(QIODevice*)">
       <modify-argument index="1">
@@ -3315,11 +4454,9 @@
       </modify-argument>
     </modify-function>
   </object-type>
-  <object-type name="QAbstractPageSetupDialog"/>
-  <object-type name="QPageSetupDialog">
-      <modify-function signature="exec()" rename="exec_" allow-thread="yes"/>
-  </object-type>
   <object-type name="QTabWidget">
+    <enum-type name="TabPosition"/>
+    <enum-type name="TabShape"/>
     <modify-function signature="addTab(QWidget*, const QString&amp;)">
       <modify-argument index="1">
         <parent index="this" action="add"/>
@@ -3335,7 +4472,7 @@
         <parent index="this" action="add"/>
       </modify-argument>
     </modify-function>
-    <modify-function signature="insertTab(int, QWidget*, const QIcon&amp;, const QString&amp;)">
+    <modify-function signature="insertTab(int, QWidget*, const QString&amp;)">
       <modify-argument index="2">
         <parent index="this" action="add"/>
       </modify-argument>
@@ -3356,15 +4493,18 @@
     <inject-code class="target" position="beginning">
         QWidget* tab = %CPPSELF.widget(%1);
         if (tab) {
-            Shiboken::setParent(0, %CONVERTTOPYTHON[QWidget*](tab));
+            Shiboken::AutoDecRef pyWidget(%CONVERTTOPYTHON[QWidget*](tab));
             %CPPSELF.%FUNCTION_NAME(%1);
         }
     </inject-code>
     </modify-function>
     <modify-function signature="clear()">
         <inject-code class="target" position="beginning">
-            for (int i=0; i &lt; %CPPSELF.count(); i++)
-                Shiboken::setParent(0, %CONVERTTOPYTHON[QWidget*](%CPPSELF.widget(i)));
+            for (int i = 0; i &lt; %CPPSELF.count(); i++) {
+                QWidget* widget = %CPPSELF.widget(i);
+                Shiboken::AutoDecRef pyWidget(%CONVERTTOPYTHON[QWidget*](widget));
+                Shiboken::Object::setParent(0, pyWidget);
+            }
             %CPPSELF.%FUNCTION_NAME();
         </inject-code>
     </modify-function>
@@ -3389,9 +4529,9 @@
         <define-ownership owner="target"/>
       </modify-argument>
     </modify-function>
-    <modify-function signature="setMimeData(QMimeData *)">
+    <modify-function signature="setMimeData(QMimeData*)">
       <modify-argument index="1">
-        <!-- TODO: mybe this is not the best solution -->
+        <!-- TODO: maybe this is not the best solution -->
         <parent index="this" action="add"/>
       </modify-argument>
     </modify-function>
@@ -3399,36 +4539,40 @@
     <modify-function signature="exec(QFlags&lt;Qt::DropAction&gt;, Qt::DropAction)" rename="exec_" allow-thread="yes"/>
   </object-type>
   <object-type name="QDateTimeEdit">
-    <modify-function signature="setCalendarWidget(QCalendarWidget *)">
+    <enum-type name="Section" flags="Sections"/>
+    <modify-function signature="setCalendarWidget(QCalendarWidget*)">
       <modify-argument index="1">
         <parent index="this" action="add"/>
       </modify-argument>
     </modify-function>
   </object-type>
   <object-type name="QSortFilterProxyModel">
+    <!-- ### This reimplementation of "QObject::parent()" is used in C++ only
+         when "using QObject::parent;" is not available. It's useless in Python. -->
     <modify-function signature="parent()const" remove="all"/>
     <extra-includes>
       <include file-name="QItemSelection" location="global"/>
       <include file-name="QStringList" location="global"/>
       <include file-name="QSize" location="global"/>
     </extra-includes>
-    <modify-function signature="setSourceModel(QAbstractItemModel *)">
+    <modify-function signature="setSourceModel(QAbstractItemModel*)">
       <modify-argument index="1">
-        <parent index="this" action="add"/>
+        <reference-count action="set"/>
       </modify-argument>
     </modify-function>
+    <!--### Obsolete in 4.3-->
     <modify-function signature="clear()" remove="all"/>
-    <!--### Obsolete in 4.3-->
     <modify-function signature="filterChanged()" remove="all"/>
-    <!--### Obsolete in 4.3-->
+    <!--### End of obsolete section -->
   </object-type>
   <object-type name="QSlider">
+      <enum-type name="TickPosition" />
   </object-type>
   <object-type name="QInputContext">
     <extra-includes>
       <include file-name="QTextFormat" location="global"/>
     </extra-includes>
-    <modify-function signature="setFocusWidget(QWidget*)" remove="all"/>
+    <enum-type name="StandardFormat"/>
     <modify-function signature="filterEvent(const QEvent*)">
       <modify-argument index="1" invalidate-after-use="yes"/>
     </modify-function>
@@ -3465,16 +4609,15 @@
         <parent index="this" action="add"/>
       </modify-argument>
     </modify-function>
-
-    <modify-function signature="setPixmap(const QPixmap&amp;)">
-      <modify-argument index="1">
-        <parent index="this" action="add"/>
-      </modify-argument>
-    </modify-function>
   </object-type>
 
 
   <object-type name="QFileDialog">
+    <enum-type name="AcceptMode"/>
+    <enum-type name="DialogLabel"/>
+    <enum-type name="FileMode"/>
+    <enum-type name="Option" flags="Options"/>
+    <enum-type name="ViewMode"/>
     <extra-includes>
       <include file-name="QUrl" location="global"/>
       <include file-name="QAbstractProxyModel" location="global"/>
@@ -3486,13 +4629,46 @@
     </modify-function>
     <modify-function signature="setItemDelegate(QAbstractItemDelegate*)">
       <modify-argument index="1">
-        <parent index="this" action="add"/>
+        <reference-count action="set"/>
       </modify-argument>
     </modify-function>
 
-    <modify-function signature="getOpenFileNames(QWidget*, const QString&amp;, const QString&amp;, const QString&amp;, QString*, QFlags&lt;QFileDialog::Option&gt;)" allow-thread="yes"/>
-    <modify-function signature="getOpenFileName(QWidget*, const QString&amp;, const QString&amp;, const QString&amp;, QString*, QFlags&lt;QFileDialog::Option&gt;)" allow-thread="yes"/>
-    <modify-function signature="getSaveFileName(QWidget*, const QString&amp;, const QString&amp;, const QString&amp;, QString*, QFlags&lt;QFileDialog::Option&gt;)" allow-thread="yes"/>
+    <modify-function signature="getOpenFileNames(QWidget*, const QString&amp;, const QString&amp;, const QString&amp;, QString*, QFlags&lt;QFileDialog::Option&gt;)" allow-thread="yes">
+      <modify-argument index="return">
+        <replace-type modified-type="(fileNames, selectedFilter)"/>
+      </modify-argument>
+      <modify-argument index="5">
+        <replace-type modified-type="QString"/>
+        <replace-default-expression with="QString()"/>
+      </modify-argument>
+      <inject-code class="target" position="end">
+        <insert-template name="return_for_QFileDialog"/>
+      </inject-code>
+    </modify-function>
+    <modify-function signature="getOpenFileName(QWidget*, const QString&amp;, const QString&amp;, const QString&amp;, QString*, QFlags&lt;QFileDialog::Option&gt;)" allow-thread="yes">
+      <modify-argument index="return">
+        <replace-type modified-type="(fileName, selectedFilter)"/>
+      </modify-argument>
+      <modify-argument index="5">
+        <replace-type modified-type="QString"/>
+        <replace-default-expression with="QString()"/>
+      </modify-argument>
+      <inject-code class="target" position="end">
+        <insert-template name="return_for_QFileDialog"/>
+      </inject-code>
+    </modify-function>
+    <modify-function signature="getSaveFileName(QWidget*, const QString&amp;, const QString&amp;, const QString&amp;, QString*, QFlags&lt;QFileDialog::Option&gt;)" allow-thread="yes">
+      <modify-argument index="return">
+        <replace-type modified-type="(fileName, selectedFilter)"/>
+      </modify-argument>
+      <modify-argument index="5">
+        <replace-type modified-type="QString"/>
+        <replace-default-expression with="QString()"/>
+      </modify-argument>
+      <inject-code class="target" position="end">
+        <insert-template name="return_for_QFileDialog"/>
+      </inject-code>
+    </modify-function>
     <modify-function signature="getExistingDirectory(QWidget*, const QString&amp;, const QString&amp;, QFlags&lt;QFileDialog::Option>)" allow-thread="yes" />
   </object-type>
   <object-type name="QErrorMessage"/>
@@ -3500,9 +4676,11 @@
     <extra-includes>
       <include file-name="QIcon" location="global"/>
     </extra-includes>
+    <enum-type name="Shape"/>
+    <enum-type name="SelectionBehavior"/>
+    <enum-type name="ButtonPosition"/>
   </object-type>
   <object-type name="QStandardItemModel" polymorphic-id-expression="qobject_cast&lt;QStandardItemModel*&gt;(%1)">
-    <modify-function signature="parent()const" remove="all"/>
     <extra-includes>
       <include file-name="QStringList" location="global"/>
       <include file-name="QSize" location="global"/>
@@ -3552,51 +4730,122 @@
         <parent index="this" action="add" />
       </modify-argument>
     </modify-function>
-    <modify-function signature="appendRow(QStandardItem *)">
+
+    <modify-function signature="appendRow(const QList&lt;QStandardItem*&gt;&amp;)">
       <modify-argument index="1">
         <parent index="this" action="add" />
       </modify-argument>
     </modify-function>
-    <modify-function signature="insertRow(int, QStandardItem *)">
-      <modify-argument index="2">
-        <parent index="this" action="add" />
-      </modify-argument>
-    </modify-function>
-    <modify-function signature="setHorizontalHeaderItem(int, QStandardItem *)">
-      <modify-argument index="2">
-        <parent index="this" action="add" />
-      </modify-argument>
-    </modify-function>
-    <modify-function signature="setItem(int, int, QStandardItem *)">
-      <modify-argument index="3">
-        <parent index="this" action="add" />
-      </modify-argument>
-    </modify-function>
-    <modify-function signature="setItem(int, QStandardItem *)">
-      <modify-argument index="2">
-        <parent index="this" action="add" />
-      </modify-argument>
-    </modify-function>
-    <modify-function signature="setItemPrototype(const QStandardItem *)">
+    <modify-function signature="appendRow(QStandardItem*)">
       <modify-argument index="1">
         <parent index="this" action="add" />
       </modify-argument>
+  </modify-function>
+
+    <modify-function signature="insertRow(int, QStandardItem*)">
+      <modify-argument index="2">
+        <parent index="this" action="add" />
+      </modify-argument>
     </modify-function>
-    <modify-function signature="setVerticalHeaderItem(int, QStandardItem *)">
+    <modify-function signature="setHorizontalHeaderItem(int, QStandardItem*)">
       <modify-argument index="2">
         <parent index="this" action="add" />
       </modify-argument>
     </modify-function>
 
-    <!-- Inject code -->
-    <modify-function signature="takeColumn(int)" remove="all"/>
-    <modify-function signature="takeRow(int)" remove="all"/>
-    <modify-function signature="findItems(const QString&amp;, QFlags&lt;Qt::MatchFlag&gt;, int) const" remove="all"/>
-    <modify-function signature="insertColumn(int, const QList&lt;QStandardItem *&gt;&amp;)" remove="all"/>
-    <modify-function signature="insertRow(int, const QList&lt;QStandardItem *&gt;&amp;)" remove="all"/>
-    <modify-function signature="appendRow(const QList&lt;QStandardItem *&gt;&amp;)" remove="all"/>
-    <modify-function signature="appendColumn(const QList&lt;QStandardItem *&gt;&amp;)" remove="all"/>
-    <modify-function signature="clear()" remove="all"/>
+    <modify-function signature="setItem(int, int, QStandardItem*)">
+      <inject-code class="target" position="beginning">
+        // Clear parent from the old child
+        QStandardItem* _i = %CPPSELF->item(%1, %2);
+        if (_i) {
+            PyObject* _pyI = %CONVERTTOPYTHON[QStandardItem*](_i);
+            Shiboken::Object::setParent(0, _pyI);
+        }
+      </inject-code>
+      <modify-argument index="3">
+        <parent index="this" action="add" />
+      </modify-argument>
+    </modify-function>
+    <modify-function signature="setItem(int, QStandardItem*)">
+      <inject-code class="target" position="beginning">
+        // Clear parent from the old child
+        QStandardItem* _i = %CPPSELF->item(%1);
+        if (_i) {
+            PyObject* _pyI = %CONVERTTOPYTHON[QStandardItem*](_i);
+            Shiboken::Object::setParent(0, _pyI);
+        }
+      </inject-code>
+      <modify-argument index="2">
+        <parent index="this" action="add" />
+      </modify-argument>
+    </modify-function>
+    <modify-function signature="setItemPrototype(const QStandardItem*)">
+      <modify-argument index="1">
+        <parent index="this" action="add" />
+      </modify-argument>
+    </modify-function>
+
+    <modify-function signature="setVerticalHeaderItem(int, QStandardItem*)">
+      <inject-code class="target" position="beginning">
+        // Clear parent from the old child
+        QStandardItem* _i = %CPPSELF->verticalHeaderItem(%1);
+        if (_i) {
+            PyObject* _pyI = %CONVERTTOPYTHON[QStandardItem*](_i);
+            Shiboken::Object::setParent(0, _pyI);
+        }
+      </inject-code>
+      <modify-argument index="2">
+        <parent index="this" action="add" />
+      </modify-argument>
+    </modify-function>
+
+    <modify-function signature="takeColumn(int)">
+      <modify-argument index="return">
+        <parent index="this" action="remove" />
+      </modify-argument>
+    </modify-function>
+
+    <modify-function signature="takeRow(int)">
+      <modify-argument index="return">
+        <parent index="this" action="remove" />
+      </modify-argument>
+    </modify-function>
+
+    <modify-function signature="findItems(const QString&amp;, QFlags&lt;Qt::MatchFlag&gt;, int) const">
+      <modify-argument index="return">
+        <parent index="this" action="add" />
+      </modify-argument>
+    </modify-function>
+
+    <modify-function signature="insertColumn(int, const QList&lt;QStandardItem*&gt;&amp;)">
+      <modify-argument index="2">
+        <parent index="this" action="add" />
+      </modify-argument>
+    </modify-function>
+
+    <modify-function signature="insertRow(int, const QList&lt;QStandardItem*&gt;&amp;)">
+      <modify-argument index="2">
+        <parent index="this" action="add" />
+      </modify-argument>
+    </modify-function>
+
+    <modify-function signature="appendColumn(const QList&lt;QStandardItem*&gt;&amp;)">
+      <modify-argument index="1">
+        <parent index="this" action="add" />
+      </modify-argument>
+    </modify-function>
+
+    <modify-function signature="clear()">
+        <inject-code class="target" position="beginning">
+          for(int r=0, r_max = %CPPSELF.rowCount(); r &lt; r_max; r++) {
+            QList&lt;QStandardItem *&gt; ri = %CPPSELF.takeRow(0);
+
+            PyObject *pyResult = %CONVERTTOPYTHON[QList&lt;QStandardItem * &gt;](ri);
+            Shiboken::Object::setParent(Py_None, pyResult);
+            Py_XDECREF(pyResult);
+          }
+        </inject-code>
+    </modify-function>
   </object-type>
   <object-type name="QRadioButton" />
   <object-type name="QScrollBar" />
@@ -3605,13 +4854,29 @@
       <include file-name="QImage" location="global"/>
       <include file-name="QPixmap" location="global"/>
     </extra-includes>
+    <enum-type name="Mode" />
     <modify-function signature="setMimeData(QMimeData *, QClipboard::Mode)">
       <modify-argument index="1">
-        <!-- TODO: mybe this is not the best solution -->
+        <!-- TODO: maybe this is not the best solution -->
         <parent index="this" action="add"/>
       </modify-argument>
     </modify-function>
-    <modify-function signature="text(QString&amp;,QClipboard::Mode)const" remove="all" />
+    <modify-function signature="text(QString&amp;,QClipboard::Mode)const">
+      <modify-argument index="2">
+        <replace-default-expression with="QClipboard::Clipboard"/>
+      </modify-argument>
+      <modify-argument index="return">
+        <replace-type modified-type="(retval, subtype)"/>
+      </modify-argument>
+      <inject-code class="target" position="end">
+      %BEGIN_ALLOW_THREADS
+      %RETURN_TYPE retval_ = %CPPSELF.%FUNCTION_NAME(%1, %2);
+      %END_ALLOW_THREADS
+      %PYARG_0 = PyTuple_New(2);
+      PyTuple_SET_ITEM(%PYARG_0, 0, %CONVERTTOPYTHON[%RETURN_TYPE](retval_));
+      PyTuple_SET_ITEM(%PYARG_0, 1, %CONVERTTOPYTHON[%ARG1_TYPE](%1));
+      </inject-code>
+    </modify-function>
   </object-type>
   <object-type name="QAbstractScrollArea">
     <modify-function signature="setViewport(QWidget *)">
@@ -3659,26 +4924,26 @@
     </extra-includes>
   </object-type>
   <object-type name="QRubberBand">
+    <enum-type name="Shape"/>
     <modify-function signature="QRubberBand(QRubberBand::Shape, QWidget*)">
       <modify-argument index="this">
         <parent index="2" action="add"/>
       </modify-argument>
+      <modify-argument index="2">
+        <rename to="parent"/>
+      </modify-argument>
     </modify-function>
-    <modify-function signature="move(int,int)" rename="moveRubberBand"/>
-    <modify-function signature="move(const QPoint &amp;)" rename="moveRubberBand"/>
-    <modify-function signature="resize(int,int)" rename="resizeRubberBand"/>
-    <modify-function signature="resize(const QSize &amp;)" rename="resizeRubberBand"/>
-    <modify-function signature="setGeometry(int,int,int,int)" rename="setRubberBandGeometry"/>
-    <modify-function signature="setGeometry(const QRect &amp;)" rename="setRubberBandGeometry"/>
   </object-type>
   <object-type name="QTextLayout">
     <extra-includes>
       <include file-name="QTextOption" location="global"/>
     </extra-includes>
+    <enum-type name="CursorMode"/>
+    <value-type name="FormatRange">
+      <include file-name="QTextLayout" location="global"/>
+    </value-type>
   </object-type>
   <object-type name="QTableWidget">
-    <modify-function signature="isSortingEnabled()const" remove="all"/>
-    <modify-function signature="setSortingEnabled(bool)" remove="all"/>
     <modify-function signature="setHorizontalHeaderItem(int, QTableWidgetItem *)">
       <modify-argument index="2">
         <parent index="this" action="add"/>
@@ -3729,14 +4994,10 @@
         <parent index="this" action="add"/>
       </modify-argument>
     </modify-function>
+    <!-- ### Obsolete -->
     <modify-function signature="setItemSelected(const QTableWidgetItem*,bool)" remove="all"/>
     <modify-function signature="isItemSelected(const QTableWidgetItem*)const" remove="all"/>
-    <modify-function signature="setModel(QAbstractItemModel*)">
-      <modify-argument index="1">
-        <reference-count action="add"/>
-      </modify-argument>
-    </modify-function>
-    <modify-function signature="mimeData(const QList&lt;QTableWidgetItem*&gt;)const" remove="all"/>
+    <!-- ### -->
   </object-type>
   <object-type name="QTextDocument">
     <extra-includes>
@@ -3744,7 +5005,10 @@
       <include file-name="QTextFormat" location="global"/>
       <include file-name="QTextCursor" location="global"/>
     </extra-includes>
-    <modify-function signature="redo(QTextCursor*)" remove="all" />
+    <enum-type name="FindFlag" flags="FindFlags"/>
+    <enum-type name="MetaInformation"/>
+    <enum-type name="ResourceType"/>
+    <enum-type name="Stacks" since="4.7"/>
     <modify-function signature="setDocumentLayout(QAbstractTextDocumentLayout*)">
       <modify-argument index="1">
         <parent index="this" action="add"/>
@@ -3765,11 +5029,25 @@
         <parent index="this" action="add"/>
       </modify-argument>
     </modify-function>
-    <modify-function signature="undo(QTextCursor*)" remove="all" />
     <modify-function signature="print(QPrinter*)const" rename="print_" />
   </object-type>
   <object-type name="QSplitter">
-    <modify-function signature="getRange(int,int*,int*)const" remove="all" />
+    <modify-function signature="getRange(int,int*,int*)const">
+        <modify-argument index="0">
+            <replace-type modified-type="PyObject" />
+        </modify-argument>
+        <modify-argument index="2">
+            <remove-argument/>
+        </modify-argument>
+        <modify-argument index="3">
+            <remove-argument/>
+        </modify-argument>
+        <inject-code class="target" position="beginning">
+            <insert-template name="fix_args,number*,number*">
+                <replace from="$TYPE" to="int" />
+            </insert-template>
+        </inject-code>
+    </modify-function>
     <modify-function signature="addWidget(QWidget *)">
       <modify-argument index="1">
         <parent index="this" action="add"/>
@@ -3807,26 +5085,54 @@
   <object-type name="QSplitterHandle"/>
   <object-type name="QDial" />
   <object-type name="QLineEdit">
-    <modify-function signature="setCompleter(QCompleter *)">
+    <enum-type name="EchoMode"/>
+    <modify-function signature="setCompleter(QCompleter*)">
       <modify-argument index="1">
         <parent index="this" action="add"/>
       </modify-argument>
     </modify-function>
-    <modify-function signature="setValidator(const QValidator *)">
+    <modify-function signature="setValidator(const QValidator*)">
       <modify-argument index="1">
         <parent index="this" action="add"/>
       </modify-argument>
     </modify-function>
     <modify-function signature="del()" rename="del_" />
+    <modify-function signature="getTextMargins(int*, int*, int*, int*) const">
+        <modify-argument index="0">
+            <replace-type modified-type="PyObject *" />
+        </modify-argument>
+        <modify-argument index="1">
+            <remove-argument/>
+        </modify-argument>
+        <modify-argument index="2">
+            <remove-argument/>
+        </modify-argument>
+        <modify-argument index="3">
+            <remove-argument/>
+        </modify-argument>
+        <modify-argument index="4">
+            <remove-argument/>
+        </modify-argument>
+        <inject-code class="target" position="beginning">
+            <insert-template name="fix_number*,number*,number*,number*">
+                <replace from="$TYPE" to="int" />
+            </insert-template>
+        </inject-code>
+    </modify-function>
+  </object-type>
+  <object-type name="QLCDNumber">
+      <enum-type name="Mode"/>
+      <enum-type name="SegmentStyle"/>
   </object-type>
-  <object-type name="QLCDNumber"/>
   <object-type name="QSplashScreen">
+    <!-- Override QWidget.painter -->
     <modify-function signature="repaint()" remove="all"/>
     <modify-function signature="drawContents(QPainter*)">
       <modify-argument index="1" invalidate-after-use="yes"/>
     </modify-function>
   </object-type>
   <object-type name="QDockWidget">
+    <enum-type name="DockWidgetFeature" flags="DockWidgetFeatures"/>
     <modify-function signature="setTitleBarWidget(QWidget*)">
       <modify-argument index="1">
         <parent index="this" action="add"/>
@@ -3851,38 +5157,56 @@
     </modify-function>
   </object-type>
   <object-type name="QDesktopWidget"/>
-  <object-type name="QFrame"/>
+  <object-type name="QFrame">
+      <enum-type name="Shadow" extensible="yes"/>
+      <enum-type name="Shape"/>
+      <enum-type name="StyleMask"/>
+  </object-type>
   <object-type name="QTextTable">
-    <modify-function signature="format() const">
-      <rename to="tableFormat"/>
-    </modify-function>
     <extra-includes>
       <include file-name="QTextCursor" location="global"/>
     </extra-includes>
   </object-type>
   <object-type name="QSpinBox">
-    <modify-function signature="valueChanged(const QString &amp;)">
-      <rename to="valueStringChanged"/>
-    </modify-function>
-  </object-type>
-  <object-type name="QTextBrowser">
-    <modify-function signature="highlighted(const QString &amp;)">
-      <rename to="highlightedString"/>
-    </modify-function>
-  </object-type>
-  <object-type name="QDoubleSpinBox">
-    <modify-function signature="valueChanged(const QString &amp;)">
-      <rename to="valueStringChanged"/>
-    </modify-function>
+      <modify-function signature="valueChanged(int)">
+          <inject-documentation mode="append" format="target">
+::
+
+    def callback_int(value_as_int):
+        print 'int value changed:', repr(value_as_int)
+
+    app = QApplication(sys.argv)
+    spinbox = QSpinBox()
+    spinbox.valueChanged[unicode].connect(callback_unicode)
+    spinbox.show()
+    sys.exit(app.exec_())
+          </inject-documentation>
+      </modify-function>
+      <modify-function signature="valueChanged(QString)">
+          <inject-documentation mode="append" format="target">
+::
+
+    def callback_unicode(value_as_unicode):
+        print 'unicode value changed:', repr(value_as_unicode)
+
+    app = QApplication(sys.argv)
+    spinbox = QSpinBox()
+    spinbox.valueChanged[unicode].connect(callback_unicode)
+    spinbox.show()
+    sys.exit(app.exec_())
+          </inject-documentation>
+      </modify-function>
   </object-type>
+  <object-type name="QTextBrowser"/>
+  <object-type name="QDoubleSpinBox"/>
   <object-type name="QButtonGroup">
-   <modify-function signature="addButton(QAbstractButton *)">
+   <modify-function signature="addButton(QAbstractButton*)">
       <modify-argument index="1">
         <parent index="this" action="add"/>
         <no-null-pointer/>
       </modify-argument>
     </modify-function>
-    <modify-function signature="addButton(QAbstractButton *, int)">
+    <modify-function signature="addButton(QAbstractButton*, int)">
       <modify-argument index="1">
         <parent index="this" action="add"/>
         <no-null-pointer/>
@@ -3901,14 +5225,45 @@
     </modify-function>
   </object-type>
   <object-type name="QToolBar">
-    <modify-function signature="addAction(QIcon,QString,const QObject*,const char*)" remove="all"/>
-    <modify-function signature="addAction(QString,const QObject*,const char*)" remove="all"/>
-    <modify-function signature="addAction(const QString &amp;)">
+    <modify-function signature="addAction(QIcon,QString,const QObject*,const char*)">
+      <modify-argument index="3">
+        <replace-type modified-type="PyObject" />
+      </modify-argument>
+      <modify-argument index="4">
+        <remove-argument />
+      </modify-argument>
+      <modify-argument index="return">
+        <parent index="this" action="add"/>
+      </modify-argument>
+
+      <inject-code>
+        QAction* action = %CPPSELF.addAction(%1, %2);
+        %PYARG_0 = %CONVERTTOPYTHON[QAction*](action);
+        Shiboken::AutoDecRef result(PyObject_CallMethod(%PYARG_0, "connect", "OsO", %PYARG_0, SIGNAL(triggered()), %PYARG_3));
+      </inject-code>
+    </modify-function>
+    <modify-function signature="addAction(QString,const QObject*,const char*)">
+      <modify-argument index="2">
+        <replace-type modified-type="PyObject" />
+      </modify-argument>
+      <modify-argument index="3">
+        <remove-argument />
+      </modify-argument>
+      <modify-argument index="return">
+        <parent index="this" action="add"/>
+      </modify-argument>
+      <inject-code>
+        QAction* action = %CPPSELF.addAction(%1);
+        %PYARG_0 = %CONVERTTOPYTHON[QAction*](action);
+        Shiboken::AutoDecRef result(PyObject_CallMethod(%PYARG_0, "connect", "OsO", %PYARG_0, SIGNAL(triggered()), %PYARG_2));
+      </inject-code>
+    </modify-function>
+    <modify-function signature="addAction(const QString&amp;)">
       <modify-argument index="return">
         <parent index="this" action="add"/>
       </modify-argument>
     </modify-function>
-    <modify-function signature="addAction(const QIcon &amp;, const QString &amp;)">
+    <modify-function signature="addAction(const QIcon&amp;, const QString&amp;)">
       <modify-argument index="return">
         <parent index="this" action="add"/>
       </modify-argument>
@@ -3939,8 +5294,38 @@
         <parent index="this" action="add"/>
       </modify-argument>
     </modify-function>
+    <modify-function signature="clear()">
+      <inject-code>
+        QList&lt;PyObject* &gt; lst;
+        Shiboken::BindingManager&amp; bm = Shiboken::BindingManager::instance();
+        foreach(QToolButton* child, %CPPSELF.findChildren&lt;QToolButton*&gt;()) {
+            if (bm.hasWrapper(child)) {
+                PyObject* pyChild = %CONVERTTOPYTHON[QToolButton*](child);
+                Shiboken::Object::setParent(0, pyChild);
+                lst &lt;&lt; pyChild;
+            }
+        }
+
+        //Remove actions
+        foreach(QAction *act, %CPPSELF.actions()) {
+            Shiboken::AutoDecRef pyAct(%CONVERTTOPYTHON[QAction*](act));
+            Shiboken::Object::setParent(NULL, pyAct);
+            Shiboken::Object::invalidate(pyAct);
+        }
+
+        %CPPSELF.clear();
+        foreach(PyObject* obj, lst) {
+            Shiboken::Object::invalidate(reinterpret_cast&lt;SbkObject* &gt;(obj));
+            Py_XDECREF(obj);
+        }
+      </inject-code>
+    </modify-function>
   </object-type>
   <object-type name="QPaintEngine">
+    <enum-type name="DirtyFlag" flags="DirtyFlags"/>
+    <enum-type name="PaintEngineFeature" flags="PaintEngineFeatures"/>
+    <enum-type name="PolygonDrawMode"/>
+    <enum-type name="Type"/>
     <modify-function signature="begin(QPaintDevice*)">
       <modify-argument index="1" invalidate-after-use="yes"/>
     </modify-function>
@@ -3953,10 +5338,13 @@
     <extra-includes>
       <include file-name="QVarLengthArray" location="global"/>
     </extra-includes>
+    <!-- ### "setPaintDevice(QPaintDevice*)" is an internal method. -->
     <modify-function signature="setPaintDevice(QPaintDevice*)" remove="all"/>
     <modify-field name="state" read="false" write="false"/>
   </object-type>
   <object-type name="QComboBox">
+    <enum-type name="InsertPolicy"/>
+    <enum-type name="SizeAdjustPolicy"/>
     <modify-function signature="setCompleter(QCompleter*)">
       <modify-argument index="1">
         <parent index="this" action="add"/>
@@ -3969,7 +5357,7 @@
     </modify-function>
     <modify-function signature="setItemDelegate(QAbstractItemDelegate *)">
       <modify-argument index="1">
-        <define-ownership owner="c++"/>
+        <reference-count action="set"/>
         <no-null-pointer/>
       </modify-argument>
     </modify-function>
@@ -3986,27 +5374,22 @@
     <modify-function signature="setModel(QAbstractItemModel *)">
       <modify-argument index="1">
         <no-null-pointer/>
-        <reference-count action="add"/>
+        <reference-count action="set"/>
       </modify-argument>
     </modify-function>
-    <modify-function signature="activated(int)">&gt;
-        <rename to="activatedIndex"/></modify-function>
-    <modify-function signature="currentIndexChanged(const QString &amp;)">
-      <rename to="currentStringChanged"/>
-    </modify-function>
-    <modify-function signature="highlighted(int)">
-      <rename to="highlightedIndex"/>
-    </modify-function>
+    <!--### Obsolete in 4.3-->
     <modify-function signature="autoCompletion()const" remove="all"/>
-    <!--### Obsolete in 4.3-->
     <modify-function signature="autoCompletionCaseSensitivity()const" remove="all"/>
-    <!--### Obsolete in 4.3-->
     <modify-function signature="setAutoCompletion(bool)" remove="all"/>
-    <!--### Obsolete in 4.3-->
     <modify-function signature="setAutoCompletionCaseSensitivity(Qt::CaseSensitivity)" remove="all"/>
-    <!--### Obsolete in 4.3-->
+    <!--### End of obsolete section -->
   </object-type>
   <object-type name="QTextEdit">
+    <enum-type name="AutoFormattingFlag" flags="AutoFormatting"/>
+    <enum-type name="LineWrapMode"/>
+    <value-type name="ExtraSelection" >
+      <include file-name="QTextEdit" location="global"/>
+    </value-type>
     <extra-includes>
       <include file-name="QTextCursor" location="global"/>
     </extra-includes>
@@ -4022,22 +5405,11 @@
     </modify-function>
     <modify-function signature="print(QPrinter*) const" rename="print_"/>
   </object-type>
-  <object-type name="QPrinter" >
-    <!-- TODO: What to do with this function? -->
-    <modify-function signature="getPageMargins(qreal*,qreal*,qreal*,qreal*,QPrinter::Unit)const" remove="all" />
-    <modify-function signature="setEngines(QPrintEngine*,QPaintEngine*)">
-      <modify-argument index="1">
-        <parent index="this" action="add"/>
-      </modify-argument>
-      <modify-argument index="2">
-        <parent index="this" action="add"/>
-      </modify-argument>
-    </modify-function>
-    <extra-includes>
-      <include file-name="QPrinterInfo" location="global"/>
-    </extra-includes>
-  </object-type>
   <object-type name="QAction">
+    <enum-type name="ActionEvent"/>
+    <enum-type name="MenuRole"/>
+    <enum-type name="Priority" since="4.6"/>
+    <enum-type name="SoftKeyRole" since="4.6"/>
     <modify-function signature="setMenu(QMenu*)">
       <modify-argument index="1">
         <parent index="this" action="add"/>
@@ -4050,54 +5422,116 @@
       <include file-name="QPainterPath" location="global"/>
       <include file-name="QPixmap" location="global"/>
     </extra-includes>
-    <modify-function signature="drawText(const QPointF &amp;, const QString &amp;, int, int)" remove="all"/>
-    <modify-function signature="drawConvexPolygon(const QPoint *, int)" remove="all" />
-    <modify-function signature="drawConvexPolygon(const QPointF *, int)" remove="all" />
-    <modify-function signature="drawLines(const QLine *, int)" remove="all" />
-    <modify-function signature="drawLines(const QLineF *, int)" remove="all" />
-    <modify-function signature="drawLines(const QPoint *, int)" remove="all" />
-    <modify-function signature="drawLines(const QPointF *, int)" remove="all" />
-    <modify-function signature="drawPoints(const QPoint *, int)" remove="all" />
-    <modify-function signature="drawPoints(const QPointF *, int)" remove="all" />
-    <modify-function signature="drawPolygon(const QPoint *, int, Qt::FillRule)" remove="all" />
-    <modify-function signature="drawPolygon(const QPointF *, int, Qt::FillRule)" remove="all" />
-    <modify-function signature="drawPolyline(const QPoint *, int)" remove="all" />
-    <modify-function signature="drawPolyline(const QPointF *, int)" remove="all" />
-    <modify-function signature="drawRects(const QRect *, int)" remove="all" />
-    <modify-function signature="drawRects(const QRectF *, int)" remove="all" />
-    <modify-function signature="drawLines(const QVector&lt;QPoint&gt; &amp;)">
-      <rename to="drawLinesFromPoints"/>
+    <enum-type name="CompositionMode"/>
+    <enum-type name="PixmapFragmentHint" flags="PixmapFragmentHints" since="4.7"/>
+    <enum-type name="RenderHint" flags="RenderHints"/>
+    <value-type name="PixmapFragment" since="4.7">
+        <include file-name="QPainter" location="global"/>
+    </value-type>
+
+    <!-- ### "drawText(...)" is an internal method. -->
+    <modify-function signature="drawText(const QPointF&amp;, const QString&amp;, int, int)" remove="all"/>
+
+    <template name="qpainter_drawlist">
+        %BEGIN_ALLOW_THREADS
+        %CPPSELF.%FUNCTION_NAME(%1.data(), %1.size());
+        %END_ALLOW_THREADS
+    </template>
+
+    <modify-function signature="drawConvexPolygon(const QPoint*, int)" remove="all" />
+    <add-function signature="drawConvexPolygon(QVector&lt;QPoint>)">
+        <inject-code>
+            <insert-template name="qpainter_drawlist" />
+        </inject-code>
+    </add-function>
+    <modify-function signature="drawConvexPolygon(const QPointF*, int)" remove="all" />
+    <add-function signature="drawConvexPolygon(QVector&lt;QPointF>)">
+        <inject-code>
+            <insert-template name="qpainter_drawlist" />
+        </inject-code>
+    </add-function>
+    <!-- ### Overloads using QVector<T> does the job of these methods -->
+    <modify-function signature="drawLines(const QLine*, int)" remove="all" />
+    <modify-function signature="drawLines(const QLineF*, int)" remove="all" />
+    <modify-function signature="drawLines(const QPoint*, int)" remove="all" />
+    <modify-function signature="drawLines(const QPointF*, int)" remove="all" />
+    <modify-function signature="drawRects(const QRect*, int)" remove="all" />
+    <modify-function signature="drawRects(const QRectF*, int)" remove="all" />
+    <!-- ### -->
+    <modify-function signature="drawPoints(const QPoint*, int)" remove="all" />
+    <add-function signature="drawPoints(QVector&lt;QPoint>)">
+        <inject-code>
+            <insert-template name="qpainter_drawlist" />
+        </inject-code>
+    </add-function>
+    <modify-function signature="drawPoints(const QPointF*, int)" remove="all" />
+    <add-function signature="drawPoints(QVector&lt;QPointF>)">
+        <inject-code>
+            <insert-template name="qpainter_drawlist" />
+        </inject-code>
+    </add-function>
+    <modify-function signature="drawPolygon(const QPoint*, int, Qt::FillRule)" remove="all" />
+    <add-function signature="drawPolygon(QVector&lt;QPoint>, Qt::FillRule)">
+        <inject-code>
+            %BEGIN_ALLOW_THREADS
+            %CPPSELF.%FUNCTION_NAME(%1.data(), %1.size(), %2);
+            %END_ALLOW_THREADS
+        </inject-code>
+    </add-function>
+    <modify-function signature="drawPolygon(const QPointF*, int, Qt::FillRule)" remove="all" />
+    <add-function signature="drawPolygon(QVector&lt;QPointF>, Qt::FillRule)">
+        <inject-code>
+            %BEGIN_ALLOW_THREADS
+            %CPPSELF.%FUNCTION_NAME(%1.data(), %1.size(), %2);
+            %END_ALLOW_THREADS
+        </inject-code>
+    </add-function>
+    <modify-function signature="drawPolyline(const QPoint*, int)" remove="all" />
+    <add-function signature="drawPolyline(QVector&lt;QPoint>)">
+        <inject-code>
+            <insert-template name="qpainter_drawlist" />
+        </inject-code>
+    </add-function>
+    <modify-function signature="drawPolyline(const QPointF*, int)" remove="all" />
+    <add-function signature="drawPolyline(QVector&lt;QPointF>)">
+        <inject-code>
+            <insert-template name="qpainter_drawlist" />
+        </inject-code>
+    </add-function>
+    <modify-function signature="drawRoundRect(int, int, int, int, int, int)">
+      <modify-argument index="5">
+        <rename to="xRound"/>
+      </modify-argument>
+      <modify-argument index="6">
+        <rename to="yRound"/>
+      </modify-argument>
     </modify-function>
-    <modify-function signature="drawLines(const QVector&lt;QPointF&gt; &amp;)">
-      <rename to="drawLinesFromPointsF"/>
+    <modify-function signature="drawTiledPixmap(const QRect&amp;,const QPixmap&amp;, const QPoint&amp;)">
+      <modify-argument index="3">
+        <rename to="pos"/>
+      </modify-argument>
     </modify-function>
-    <modify-function signature="drawLines(const QVector&lt;QLineF&gt; &amp;)">
-      <rename to="drawLinesF"/>
-    </modify-function>
-    <modify-function signature="drawRects(const QVector&lt;QRectF&gt; &amp;)">
-      <rename to="drawRectsF"/>
-    </modify-function>
-    <modify-function signature="QPainter(QPaintDevice *)">
+    <modify-function signature="QPainter(QPaintDevice*)">
       <modify-argument index="1">
         <no-null-pointer/>
       </modify-argument>
     </modify-function>
-    <modify-function signature="begin(QPaintDevice *)">
+    <modify-function signature="begin(QPaintDevice*)">
       <modify-argument index="1">
         <no-null-pointer/>
       </modify-argument>
     </modify-function>
-    <modify-function signature="initFrom(const QWidget *)">
+    <modify-function signature="initFrom(const QWidget*)">
       <modify-argument index="1">
         <no-null-pointer/>
       </modify-argument>
     </modify-function>
-    <modify-function signature="setRedirected(const QPaintDevice *, QPaintDevice *, const QPoint &amp;)">
+    <modify-function signature="setRedirected(const QPaintDevice*, QPaintDevice*, const QPoint&amp;)">
       <modify-argument index="1">
         <no-null-pointer/>
       </modify-argument>
     </modify-function>
-    <modify-function signature="restoreRedirected(const QPaintDevice *)">
+    <modify-function signature="restoreRedirected(const QPaintDevice*)">
       <modify-argument index="1">
         <no-null-pointer/>
       </modify-argument>
@@ -4135,17 +5569,14 @@
         <insert-template name="fix_args,QRect*"/>
       </inject-code>
     </modify-function>
+    <!--### Obsoleted by QWidget::render() -->
     <modify-function signature="redirected(const QPaintDevice*,QPoint*)" remove="all" />
+    <!--### Obsolete in 4.3-->
     <modify-function signature="matrix()const" remove="all"/>
-    <!--### Obsolete in 4.3-->
     <modify-function signature="matrixEnabled()const" remove="all"/>
-    <!--### Obsolete in 4.3-->
     <modify-function signature="setMatrix(QMatrix, bool)" remove="all"/>
-    <!--### Obsolete in 4.3-->
     <modify-function signature="setMatrixEnabled(bool)" remove="all"/>
-    <!--### Obsolete in 4.3-->
-    <modify-function signature="fontInfo()const" remove="all"/>
-    <modify-function signature="fontMetrics()const" remove="all"/>
+    <!--### End of obsolete section -->
   </object-type>
   <!-- qApp macro -->
   <inject-code class="native" position="beginning">
@@ -4153,6 +5584,8 @@
   </inject-code>
   <inject-code class="target" file="glue/qtgui_qapp.cpp" position="end" />
   <object-type name="QApplication">
+    <enum-type name="ColorSpec"/>
+    <enum-type name="Type"/>
     <extra-includes>
       <include file-name="QBasicTimer" location="global"/>
       <include file-name="QFont" location="global"/>
@@ -4162,36 +5595,89 @@
       <include file-name="QLocale" location="global"/>
       <include file-name="QStyle" location="global"/>
     </extra-includes>
-    <modify-function signature="QApplication(int &amp;, char  **)" remove="all" />
+    <modify-function signature="QApplication(int&amp;,char**)" access="private" />
+    <add-function signature="QApplication(PySequence)">
+        <inject-code>
+            QApplicationConstructor(%PYSELF, %1, &amp;%0);
+        </inject-code>
+    </add-function>
+    <modify-function signature="QApplication(int&amp;,char**,bool)" access="private"/>
+    <add-function signature="QApplication(PySequence,bool)">
+        <inject-code>
+            QApplicationConstructor(%PYSELF, %1, %2, &amp;%0);
+        </inject-code>
+    </add-function>
+    <modify-function signature="QApplication(int&amp;,char**,QApplication::Type)" access="private" />
+    <add-function signature="QApplication(PySequence,QApplication::Type)">
+        <inject-code>
+            QApplicationConstructor(%PYSELF, %1, %2, &amp;%0);
+        </inject-code>
+    </add-function>
     <modify-function signature="exec()" rename="exec_" allow-thread="yes"/>
     <inject-code class="native" file="glue/qapplication_init.cpp" position="beginning" />
 
-    <!-- Causes warnings using generator. They were kept here to avoid generation even
-    removing Q_INTERNAL_QAPP_SRC || qdoc from #define section-->
+    <!-- ### Causes warnings using generator. They were kept here to avoid generation even
+         removing Q_INTERNAL_QAPP_SRC || qdoc from #define section-->
     <modify-function signature="QApplication(int&amp;,char**,int)" remove="all"/>
-    <modify-function signature="QApplication(int&amp;,char**,bool)" remove="all"/>
     <modify-function signature="QApplication(int&amp;,char**,bool,int)" remove="all"/>
-    <modify-function signature="QApplication(int&amp;,char**,QApplication::Type)" remove="all"/>
-    <modify-function signature="QApplication(int&amp;,char**,QApplication::Type, int)" remove="all"/>
-
-    <modify-function signature="font(const char*)" remove="all"/>
-    <modify-function signature="setFont(QFont,const char*)" remove="all"/>
-    <modify-function signature="palette(const char*)" remove="all" />
+    <modify-function signature="QApplication(int&amp;,char**,QApplication::Type,int)" remove="all"/>
+    <!-- ### -->
 
     <!-- ownership control transfer to qApp -->
     <modify-function signature="setStyle(QStyle*)">
         <inject-code class="target" position="end">
-            Shiboken::setParent(%CONVERTTOPYTHON[QApplication*](qApp), %PYARG_1);
+            Shiboken::Object::setParent(%CONVERTTOPYTHON[QApplication*](qApp), %PYARG_1);
         </inject-code>
     </modify-function>
     <modify-function signature="style()">
-        <inject-code class="target" position="end">
-            Shiboken::setParent(%CONVERTTOPYTHON[QApplication*](qApp), %PYARG_0);
-        </inject-code>
+      <inject-code class="target" position="end">
+        <insert-template name="set_qapp_parent_for_orphan"/>
+      </inject-code>
+    </modify-function>
+    <modify-function signature="desktop()">
+      <inject-code class="target" position="end">
+        <insert-template name="set_qapp_parent_for_orphan"/>
+      </inject-code>
+    </modify-function>
+    <modify-function signature="clipboard()">
+      <inject-code class="target" position="end">
+        <insert-template name="set_qapp_parent_for_orphan"/>
+      </inject-code>
+    </modify-function>
+    <modify-function signature="focusWidget()">
+      <inject-code class="target" position="end">
+        <insert-template name="set_qapp_parent_for_orphan"/>
+      </inject-code>
+    </modify-function>
+    <modify-function signature="overrideCursor()">
+      <inject-code class="target" position="end">
+        <insert-template name="set_qapp_parent_for_orphan"/>
+      </inject-code>
+    </modify-function>
+    <modify-function signature="topLevelAt(const QPoint&amp;)">
+      <inject-code class="target" position="end">
+        <insert-template name="set_qapp_parent_for_orphan"/>
+      </inject-code>
+    </modify-function>
+    <modify-function signature="topLevelAt(int, int)">
+      <inject-code class="target" position="end">
+        <insert-template name="set_qapp_parent_for_orphan"/>
+      </inject-code>
+    </modify-function>
+    <modify-function signature="widgetAt(const QPoint&amp;)">
+      <inject-code class="target" position="end">
+        <insert-template name="set_qapp_parent_for_orphan"/>
+      </inject-code>
+    </modify-function>
+    <modify-function signature="widgetAt(int, int)">
+      <inject-code class="target" position="end">
+        <insert-template name="set_qapp_parent_for_orphan"/>
+      </inject-code>
     </modify-function>
   </object-type>
   <object-type name="QCommandLinkButton"/>
   <object-type name="QFileSystemModel" polymorphic-id-expression="qobject_cast&lt;QFileSystemModel*&gt;(%1)">
+    <enum-type name="Roles"/>
     <modify-function signature="setIconProvider(QFileIconProvider*)">
       <modify-argument index="1">
         <parent index="this" action="add"/>
@@ -4199,10 +5685,66 @@
     </modify-function>
   </object-type>
   <object-type name="QFormLayout">
-    <!-- FIXME: What to do with this function!? -->
-    <modify-function signature="getLayoutPosition(QLayout*,int*,QFormLayout::ItemRole*)const" remove="all" />
-    <!-- FIXME: What to do with this function!? -->
-    <modify-function signature="getWidgetPosition(QWidget*,int*,QFormLayout::ItemRole*)const" remove="all" />
+    <inject-code class="native" position="beginning" file="glue/qlayout_help_functions.cpp"/>
+
+    <enum-type name="FieldGrowthPolicy"/>
+    <enum-type name="ItemRole"/>
+    <enum-type name="RowWrapPolicy"/>
+
+    <template name="fix_args,int*,ItemRole*">
+    int _row;
+    QFormLayout::ItemRole _role;
+    %BEGIN_ALLOW_THREADS
+    %CPPSELF->%FUNCTION_NAME(%ARGUMENT_NAMES, &amp;_row, &amp;_role);
+    %END_ALLOW_THREADS
+    %PYARG_0 = PyTuple_New(2);
+    PyTuple_SET_ITEM(%PYARG_0, 0, %CONVERTTOPYTHON[int](_row));
+    PyTuple_SET_ITEM(%PYARG_0, 1, %CONVERTTOPYTHON[QFormLayout::ItemRole](_role));
+    </template>
+
+    <modify-function signature="getLayoutPosition(QLayout*,int*,QFormLayout::ItemRole*)const">
+        <modify-argument index="0">
+            <replace-type modified-type="PyObject" />
+        </modify-argument>
+        <modify-argument index="2">
+            <remove-argument/>
+        </modify-argument>
+        <modify-argument index="3">
+            <remove-argument/>
+        </modify-argument>
+        <inject-code class="target" position="beginning">
+            <insert-template name="fix_args,int*,ItemRole*"/>
+        </inject-code>
+    </modify-function>
+    <modify-function signature="getWidgetPosition(QWidget*,int*,QFormLayout::ItemRole*)const">
+        <modify-argument index="0">
+            <replace-type modified-type="PyObject" />
+        </modify-argument>
+        <modify-argument index="2">
+            <remove-argument/>
+        </modify-argument>
+        <modify-argument index="3">
+            <remove-argument/>
+        </modify-argument>
+        <inject-code class="target" position="beginning">
+            <insert-template name="fix_args,int*,ItemRole*"/>
+        </inject-code>
+    </modify-function>
+    <modify-function signature="getItemPosition(int,int*,QFormLayout::ItemRole*)const">
+        <modify-argument index="0">
+            <replace-type modified-type="PyObject" />
+        </modify-argument>
+        <modify-argument index="2">
+            <remove-argument/>
+        </modify-argument>
+        <modify-argument index="3">
+            <remove-argument/>
+        </modify-argument>
+        <inject-code class="target" position="beginning">
+            <insert-template name="fix_args,int*,ItemRole*"/>
+        </inject-code>
+    </modify-function>
+
     <modify-function signature="addRow(QWidget*,QWidget*)">
       <modify-argument index="1">
         <parent index="this" action="add"/>
@@ -4285,19 +5827,11 @@
         <parent index="this" action="add"/>
       </modify-argument>
     </modify-function>
-    <modify-function signature="setItem(int,QFormLayout::ItemRole,QLayoutItem*)" remove="all"/>
-    <!-- FIXME: Check what to do with this function! -->
-    <modify-function signature="getItemPosition(int,int*,QFormLayout::ItemRole*)const" remove="all" />
-    <modify-function signature="addItem(QLayoutItem*)">
-      <modify-argument index="1">
+    <modify-function signature="setItem(int,QFormLayout::ItemRole,QLayoutItem*)">
+      <modify-argument index="3">
         <parent index="this" action="add"/>
       </modify-argument>
     </modify-function>
-    <modify-function signature="takeAt(int)">
-      <modify-argument index="return">
-        <parent index="this" action="remove"/>
-      </modify-argument>
-    </modify-function>
   </object-type>
   <object-type name="QGraphicsGridLayout" >
     <modify-function signature="addItem(QGraphicsLayoutItem*,int,int,QFlags&lt;Qt::AlignmentFlag&gt;)">
@@ -4317,14 +5851,65 @@
     </modify-function>
   </object-type>
   <object-type name="QGraphicsLayout">
-    <!-- FIXME: Check what to do with this function! -->
-    <modify-function signature="getContentsMargins(qreal*,qreal*,qreal*,qreal*)const" remove="all" />
+    <modify-function signature="getContentsMargins(qreal*,qreal*,qreal*,qreal*)const">
+        <modify-argument index="0">
+            <replace-type modified-type="PyObject" />
+        </modify-argument>
+        <modify-argument index="1">
+            <remove-argument/>
+        </modify-argument>
+        <modify-argument index="2">
+            <remove-argument/>
+        </modify-argument>
+        <modify-argument index="3">
+            <remove-argument/>
+        </modify-argument>
+        <modify-argument index="4">
+            <remove-argument/>
+        </modify-argument>
+        <inject-code class="target" position="beginning">
+            <insert-template name="fix_number*,number*,number*,number*">
+                <replace from="$TYPE" to="qreal" />
+            </insert-template>
+        </inject-code>
+        <inject-code class="native" position="end">
+            <insert-template name="fix_native_return_number*,number*,number*,number*">
+                <replace from="$TYPE" to="qreal" />
+            </insert-template>
+        </inject-code>
+    </modify-function>
     <modify-function signature="widgetEvent(QEvent*)">
         <modify-argument index="1" invalidate-after-use="yes"/>
     </modify-function>
   </object-type>
   <object-type name="QGraphicsLayoutItem" copyable="false">
-    <modify-function signature="getContentsMargins(qreal*,qreal*,qreal*,qreal*)const" remove="all" />
+    <modify-function signature="getContentsMargins(qreal*,qreal*,qreal*,qreal*)const">
+        <modify-argument index="0">
+            <replace-type modified-type="PyObject" />
+        </modify-argument>
+        <modify-argument index="1">
+            <remove-argument/>
+        </modify-argument>
+        <modify-argument index="2">
+            <remove-argument/>
+        </modify-argument>
+        <modify-argument index="3">
+            <remove-argument/>
+        </modify-argument>
+        <modify-argument index="4">
+            <remove-argument/>
+        </modify-argument>
+        <inject-code class="target" position="beginning">
+            <insert-template name="fix_number*,number*,number*,number*">
+                <replace from="$TYPE" to="qreal" />
+            </insert-template>
+        </inject-code>
+        <inject-code class="native" position="end">
+            <insert-template name="fix_native_return_number*,number*,number*,number*">
+                <replace from="$TYPE" to="qreal" />
+            </insert-template>
+        </inject-code>
+    </modify-function>
     <modify-function signature="setParentLayoutItem(QGraphicsLayoutItem*)">
       <modify-argument index="1">
         <parent index="this" action="add"/>
@@ -4375,17 +5960,63 @@
       </modify-argument>
     </modify-function>
     <modify-function signature="setWidget(QWidget*)">
-      <modify-argument index="1">
-        <parent index="this" action="add"/>
-      </modify-argument>
+      <inject-code>
+          QWidget* _old = %CPPSELF.widget();
+          if (_old)
+             Shiboken::Object::setParent(NULL, %CONVERTTOPYTHON[QWidget*](_old));
+          %CPPSELF.%FUNCTION_NAME(%1);
+          Shiboken::Object::setParent(%PYSELF, %PYARG_1);
+      </inject-code>
     </modify-function>
   </object-type>
   <!-- a QObject so main-thread delete redundant -->
   <object-type name="QGraphicsWidget">
-    <!-- FIXME: What to do with this function? -->
-    <modify-function signature="getContentsMargins(qreal*,qreal*,qreal*,qreal*)const" remove="all" />
-    <!-- FIXME: What to do with this function? -->
-    <modify-function signature="getWindowFrameMargins(qreal*,qreal*,qreal*,qreal*)const" remove="all" />
+    <modify-function signature="getContentsMargins(qreal*,qreal*,qreal*,qreal*)const">
+        <modify-argument index="return">
+            <replace-type modified-type="PyObject" />
+        </modify-argument>
+        <modify-argument index="1">
+            <remove-argument/>
+        </modify-argument>
+        <modify-argument index="2">
+            <remove-argument/>
+        </modify-argument>
+        <modify-argument index="3">
+            <remove-argument/>
+        </modify-argument>
+        <modify-argument index="4">
+            <remove-argument/>
+        </modify-argument>
+
+        <inject-code class="target" position="beginning">
+            <insert-template name="fix_number*,number*,number*,number*">
+                <replace from="$TYPE" to="qreal" />
+            </insert-template>
+        </inject-code>
+    </modify-function>
+    <modify-function signature="getWindowFrameMargins(qreal*,qreal*,qreal*,qreal*)const">
+        <modify-argument index="return">
+            <replace-type modified-type="PyObject" />
+        </modify-argument>
+        <modify-argument index="1">
+            <remove-argument/>
+        </modify-argument>
+        <modify-argument index="2">
+            <remove-argument/>
+        </modify-argument>
+        <modify-argument index="3">
+            <remove-argument/>
+        </modify-argument>
+        <modify-argument index="4">
+            <remove-argument/>
+        </modify-argument>
+
+        <inject-code class="target" position="beginning">
+            <insert-template name="fix_number*,number*,number*,number*">
+                <replace from="$TYPE" to="qreal" />
+            </insert-template>
+        </inject-code>
+    </modify-function>
     <!-- a QObject so main-thread delete redundant -->
     <!-- Duplicate function to QObject::children() to override accidental shadowing which is not present in Jambi -->
     <modify-function signature="children()const" remove="all"/>
@@ -4446,6 +6077,7 @@
   </object-type>
   <object-type name="QPlainTextDocumentLayout"/>
   <object-type name="QPlainTextEdit">
+    <enum-type name="LineWrapMode"/>
     <modify-function signature="setDocument(QTextDocument*)">
       <modify-argument index="1">
         <parent index="this" action="add"/>
@@ -4456,9 +6088,8 @@
         <parent index="this" action="add"/>
       </modify-argument>
     </modify-function>
+    <modify-function signature="print(QPrinter*)const" rename="print_" />
   </object-type>
-  <object-type name="QPrintPreviewDialog"/>
-  <object-type name="QPrintPreviewWidget"/>
   <object-type name="QStyledItemDelegate">
     <modify-function signature="setItemEditorFactory(QItemEditorFactory*)">
       <modify-argument index="1">
@@ -4472,32 +6103,609 @@
     </modify-function>
     <modify-function signature="setModelData(QWidget*,QAbstractItemModel*,QModelIndex)const">
       <modify-argument index="1">
-        <reference-count action="add"/>
+        <reference-count action="set"/>
       </modify-argument>
     </modify-function>
   </object-type>
 
-  <!-- Qt 4.6 -->
-  <enum-type name="QGraphicsBlurEffect::BlurHint" flags="QGraphicsBlurEffect::BlurHints"/>
-  <enum-type name="QGesture::GestureCancelPolicy"/>
-  <enum-type name="QGraphicsEffect::PixmapPadMode"/>
-  <enum-type name="QGestureRecognizer::ResultFlag" flags="QGestureRecognizer::Result"/>
-  <enum-type name="QPinchGesture::ChangeFlag" flags="QPinchGesture::ChangeFlags"/>
-  <enum-type name="QGraphicsItem::PanelModality"/>
-  <enum-type name="QStyle::RequestSoftwareInputPanel"/>
-  <enum-type name="QAction::Priority"/>
-  <enum-type name="QAction::SoftKeyRole"/>
+  <value-type name="QMatrix2x2" since="4.6">
+    <add-function signature="__repr__" return-type="PyObject*">
+        <inject-code class="target" position="beginning">
+            <insert-template name="repr_code_matrix">
+               <replace from="%MATRIX_SIZE" to="4" />
+               <replace from="%MATRIX_TYPE" to="qreal" />
+             </insert-template>
+        </inject-code>
+    </add-function>
 
+    <add-function signature="__reduce__" return-type="PyObject*">
+        <inject-code class="target" position="beginning">
+            <insert-template name="reduce_code_matrix">
+              <replace from="%MATRIX_TYPE" to="qreal" />
+              <replace from="%MATRIX_SIZE" to="4" />
+            </insert-template>
+        </inject-code>
+    </add-function>
+    <add-function signature="QMatrix2x2(PySequence*)">
+      <inject-code class="target" position="beginning">
+        <insert-template name="matrix_constructor">
+          <replace from="%SIZE" to="4" />
+        </insert-template>
+      </inject-code>
+    </add-function>
+    <add-function signature="data()" return-type="qreal">
+      <inject-code class="target" position="beginning">
+        <insert-template name="matrix_data_function">
+          <replace from="%MATRIX_SIZE" to="4" />
+        </insert-template>
+      </inject-code>
+    </add-function>
+    <add-function signature="fill(PyObject*)">
+      <inject-code class="target" position="beginning">
+        <insert-template name="matrix_fill_function">
+          <replace from="%MATRIX_SIZE" to="4" />
+        </insert-template>
+      </inject-code>
+    </add-function>
+    <add-function signature="transposed()" return-type="PyObject">
+      <inject-code class="target" position="beginning">
+        <insert-template name="matrix_transposed_function">
+          <replace from="%TRANSPOSED_TYPE" to="QMatrix2x2" />
+        </insert-template>
+      </inject-code>
+    </add-function>
+    <add-function signature="operator!=(const QMatrix2x2&amp;)" return-type="bool" />
 
-  <value-type name="QMatrix2x2"/>
-  <value-type name="QMatrix2x3"/>
-  <value-type name="QMatrix2x4"/>
-  <value-type name="QMatrix3x2"/>
-  <value-type name="QMatrix3x3"/>
-  <value-type name="QMatrix3x4"/>
-  <value-type name="QMatrix4x2"/>
-  <value-type name="QMatrix4x3"/>
-  <value-type name="QMatrix4x4">
+    <template name="inplace_add">
+    *%CPPSELF += %1;
+    return %CONVERTTOPYTHON[%RETURN_TYPE](*%CPPSELF);
+    </template>
+    <template name="inplace_sub">
+    *%CPPSELF -= %1;
+    return %CONVERTTOPYTHON[%RETURN_TYPE](*%CPPSELF);
+    </template>
+    <template name="inplace_mult">
+    *%CPPSELF *= %1;
+    return %CONVERTTOPYTHON[%RETURN_TYPE](*%CPPSELF);
+    </template>
+    <template name="inplace_div">
+    *%CPPSELF /= %1;
+    return %CONVERTTOPYTHON[%RETURN_TYPE](*%CPPSELF);
+    </template>
+
+    <add-function signature="operator*=(qreal)" return-type="QMatrix2x2" >
+      <inject-code class="target" position="beginning">
+        <insert-template name="inplace_mult"/>
+      </inject-code>
+    </add-function>
+    <add-function signature="operator+=(const QMatrix2x2&amp;)" return-type="QMatrix2x2" >
+      <inject-code class="target" position="beginning">
+        <insert-template name="inplace_add"/>
+      </inject-code>
+    </add-function>
+    <add-function signature="operator-=(const QMatrix2x2&amp;)" return-type="QMatrix2x2" >
+      <inject-code class="target" position="beginning">
+        <insert-template name="inplace_sub"/>
+      </inject-code>
+    </add-function>
+    <add-function signature="operator/=(qreal)" return-type="QMatrix2x2" >
+      <inject-code class="target" position="beginning">
+        <insert-template name="inplace_div"/>
+      </inject-code>
+    </add-function>
+    <add-function signature="operator==(const QMatrix2x2&amp;)" return-type="bool" />
+  </value-type>
+
+  <value-type name="QMatrix2x3" since="4.6">
+    <add-function signature="__repr__" return-type="PyObject*">
+        <inject-code class="target" position="beginning">
+            <insert-template name="repr_code_matrix">
+               <replace from="%MATRIX_SIZE" to="6" />
+               <replace from="%MATRIX_TYPE" to="qreal" />
+             </insert-template>
+        </inject-code>
+    </add-function>
+
+    <add-function signature="__reduce__" return-type="PyObject*">
+        <inject-code class="target" position="beginning">
+            <insert-template name="reduce_code_matrix">
+              <replace from="%MATRIX_TYPE" to="qreal" />
+              <replace from="%MATRIX_SIZE" to="6" />
+            </insert-template>
+        </inject-code>
+    </add-function>
+    <add-function signature="QMatrix2x3(PySequence*)">
+      <inject-code class="target" position="beginning">
+        <insert-template name="matrix_constructor">
+          <replace from="%SIZE" to="6" />
+        </insert-template>
+      </inject-code>
+    </add-function>
+    <add-function signature="data()" return-type="qreal">
+      <inject-code class="target" position="beginning">
+        <insert-template name="matrix_data_function">
+          <replace from="%MATRIX_SIZE" to="6" />
+        </insert-template>
+      </inject-code>
+    </add-function>
+    <add-function signature="fill(PyObject*)">
+      <inject-code class="target" position="beginning">
+        <insert-template name="matrix_fill_function">
+          <replace from="%MATRIX_SIZE" to="6" />
+        </insert-template>
+      </inject-code>
+    </add-function>
+    <add-function signature="transposed()" return-type="PyObject">
+      <inject-code class="target" position="beginning">
+        <insert-template name="matrix_transposed_function">
+          <replace from="%TRANSPOSED_TYPE" to="QMatrix3x2" />
+        </insert-template>
+      </inject-code>
+    </add-function>
+    <add-function signature="operator!=(const QMatrix2x3&amp;)" return-type="bool" />
+    <add-function signature="operator*=(qreal)" return-type="QMatrix2x3" >
+      <inject-code class="target" position="beginning">
+        <insert-template name="inplace_mult"/>
+      </inject-code>
+    </add-function>
+    <add-function signature="operator+=(const QMatrix2x3&amp;)" return-type="QMatrix2x3" >
+      <inject-code class="target" position="beginning">
+        <insert-template name="inplace_add"/>
+      </inject-code>
+    </add-function>
+    <add-function signature="operator-=(const QMatrix2x3&amp;)" return-type="QMatrix2x3" >
+      <inject-code class="target" position="beginning">
+        <insert-template name="inplace_sub"/>
+      </inject-code>
+    </add-function>
+    <add-function signature="operator/=(qreal)" return-type="QMatrix2x3" >
+      <inject-code class="target" position="beginning">
+        <insert-template name="inplace_div"/>
+      </inject-code>
+    </add-function>
+    <add-function signature="operator==(const QMatrix2x3&amp;)" return-type="bool" />
+  </value-type>
+
+  <value-type name="QMatrix2x4" since="4.6">
+    <add-function signature="__repr__" return-type="PyObject*">
+        <inject-code class="target" position="beginning">
+            <insert-template name="repr_code_matrix">
+               <replace from="%MATRIX_SIZE" to="8" />
+               <replace from="%MATRIX_TYPE" to="qreal" />
+             </insert-template>
+        </inject-code>
+    </add-function>
+
+    <add-function signature="__reduce__" return-type="PyObject*">
+        <inject-code class="target" position="beginning">
+            <insert-template name="reduce_code_matrix">
+              <replace from="%MATRIX_TYPE" to="qreal" />
+              <replace from="%MATRIX_SIZE" to="8" />
+            </insert-template>
+        </inject-code>
+    </add-function>
+    <add-function signature="QMatrix2x4(PySequence*)">
+      <inject-code class="target" position="beginning">
+        <insert-template name="matrix_constructor">
+          <replace from="%SIZE" to="8" />
+        </insert-template>
+      </inject-code>
+    </add-function>
+    <add-function signature="data()" return-type="qreal">
+      <inject-code class="target" position="beginning">
+        <insert-template name="matrix_data_function">
+          <replace from="%MATRIX_SIZE" to="8" />
+        </insert-template>
+      </inject-code>
+    </add-function>
+    <add-function signature="fill(PyObject*)">
+      <inject-code class="target" position="beginning">
+        <insert-template name="matrix_fill_function">
+          <replace from="%MATRIX_SIZE" to="8" />
+        </insert-template>
+      </inject-code>
+    </add-function>
+    <add-function signature="transposed()" return-type="PyObject">
+      <inject-code class="target" position="beginning">
+        <insert-template name="matrix_transposed_function">
+          <replace from="%TRANSPOSED_TYPE" to="QMatrix4x2" />
+        </insert-template>
+      </inject-code>
+    </add-function>
+    <add-function signature="operator!=(const QMatrix2x4&amp;)" return-type="bool" />
+    <add-function signature="operator*=(qreal)" return-type="QMatrix2x4" >
+      <inject-code class="target" position="beginning">
+        <insert-template name="inplace_mult"/>
+      </inject-code>
+    </add-function>
+    <add-function signature="operator+=(const QMatrix2x4&amp;)" return-type="QMatrix2x4" >
+      <inject-code class="target" position="beginning">
+        <insert-template name="inplace_add"/>
+      </inject-code>
+    </add-function>
+    <add-function signature="operator-=(const QMatrix2x4&amp;)" return-type="QMatrix2x4" >
+      <inject-code class="target" position="beginning">
+        <insert-template name="inplace_sub"/>
+      </inject-code>
+    </add-function>
+    <add-function signature="operator/=(qreal)" return-type="QMatrix2x4" >
+      <inject-code class="target" position="beginning">
+        <insert-template name="inplace_div"/>
+      </inject-code>
+    </add-function>
+    <add-function signature="operator==(const QMatrix2x4&amp;)" return-type="bool" />
+ </value-type>
+
+  <value-type name="QMatrix3x2" since="4.6">
+    <add-function signature="__repr__" return-type="PyObject*">
+        <inject-code class="target" position="beginning">
+            <insert-template name="repr_code_matrix">
+               <replace from="%MATRIX_SIZE" to="6" />
+               <replace from="%MATRIX_TYPE" to="qreal" />
+             </insert-template>
+        </inject-code>
+    </add-function>
+
+    <add-function signature="__reduce__" return-type="PyObject*">
+        <inject-code class="target" position="beginning">
+            <insert-template name="reduce_code_matrix">
+              <replace from="%MATRIX_TYPE" to="qreal" />
+              <replace from="%MATRIX_SIZE" to="6" />
+            </insert-template>
+        </inject-code>
+    </add-function>
+    <add-function signature="QMatrix3x2(PySequence*)">
+      <inject-code class="target" position="beginning">
+        <insert-template name="matrix_constructor">
+          <replace from="%SIZE" to="6" />
+        </insert-template>
+      </inject-code>
+    </add-function>
+    <add-function signature="data()" return-type="qreal">
+      <inject-code class="target" position="beginning">
+        <insert-template name="matrix_data_function">
+          <replace from="%MATRIX_SIZE" to="6" />
+        </insert-template>
+      </inject-code>
+    </add-function>
+    <add-function signature="fill(PyObject*)">
+      <inject-code class="target" position="beginning">
+        <insert-template name="matrix_fill_function">
+          <replace from="%MATRIX_SIZE" to="6" />
+        </insert-template>
+      </inject-code>
+    </add-function>
+    <add-function signature="transposed()" return-type="PyObject">
+      <inject-code class="target" position="beginning">
+        <insert-template name="matrix_transposed_function">
+          <replace from="%TRANSPOSED_TYPE" to="QMatrix2x3" />
+        </insert-template>
+      </inject-code>
+    </add-function>
+    <add-function signature="operator!=(const QMatrix3x2&amp;)" return-type="bool" />
+    <add-function signature="operator*=(qreal)" return-type="QMatrix3x2" >
+      <inject-code class="target" position="beginning">
+        <insert-template name="inplace_mult"/>
+      </inject-code>
+    </add-function>
+    <add-function signature="operator+=(const QMatrix3x2&amp;)" return-type="QMatrix3x2" >
+      <inject-code class="target" position="beginning">
+        <insert-template name="inplace_add"/>
+      </inject-code>
+    </add-function>
+    <add-function signature="operator-=(const QMatrix3x2&amp;)" return-type="QMatrix3x2" >
+      <inject-code class="target" position="beginning">
+        <insert-template name="inplace_sub"/>
+      </inject-code>
+    </add-function>
+    <add-function signature="operator/=(qreal)" return-type="QMatrix3x2" >
+      <inject-code class="target" position="beginning">
+        <insert-template name="inplace_div"/>
+      </inject-code>
+    </add-function>
+    <add-function signature="operator==(const QMatrix3x2&amp;)" return-type="bool" />
+  </value-type>
+
+  <value-type name="QMatrix3x3" since="4.6">
+    <add-function signature="__repr__" return-type="PyObject*">
+        <inject-code class="target" position="beginning">
+            <insert-template name="repr_code_matrix">
+               <replace from="%MATRIX_SIZE" to="9" />
+               <replace from="%MATRIX_TYPE" to="qreal" />
+             </insert-template>
+        </inject-code>
+    </add-function>
+
+    <add-function signature="__reduce__" return-type="PyObject*">
+        <inject-code class="target" position="beginning">
+            <insert-template name="reduce_code_matrix">
+              <replace from="%MATRIX_TYPE" to="qreal" />
+              <replace from="%MATRIX_SIZE" to="9" />
+            </insert-template>
+        </inject-code>
+    </add-function>
+    <add-function signature="QMatrix3x3(PySequence*)">
+      <inject-code class="target" position="beginning">
+        <insert-template name="matrix_constructor">
+          <replace from="%SIZE" to="9" />
+        </insert-template>
+      </inject-code>
+    </add-function>
+    <add-function signature="data()" return-type="qreal">
+      <inject-code class="target" position="beginning">
+        <insert-template name="matrix_data_function">
+          <replace from="%MATRIX_SIZE" to="9" />
+        </insert-template>
+      </inject-code>
+    </add-function>
+    <add-function signature="fill(PyObject*)">
+      <inject-code class="target" position="beginning">
+        <insert-template name="matrix_fill_function">
+          <replace from="%MATRIX_SIZE" to="9" />
+        </insert-template>
+      </inject-code>
+    </add-function>
+    <add-function signature="transposed()" return-type="PyObject">
+      <inject-code class="target" position="beginning">
+        <insert-template name="matrix_transposed_function">
+          <replace from="%TRANSPOSED_TYPE" to="QMatrix3x3" />
+        </insert-template>
+      </inject-code>
+    </add-function>
+    <add-function signature="operator!=(const QMatrix3x3&amp;)" return-type="bool" />
+    <add-function signature="operator*=(qreal)" return-type="QMatrix3x3" >
+      <inject-code class="target" position="beginning">
+        <insert-template name="inplace_mult"/>
+      </inject-code>
+    </add-function>
+    <add-function signature="operator+=(const QMatrix3x3&amp;)" return-type="QMatrix3x3" >
+      <inject-code class="target" position="beginning">
+        <insert-template name="inplace_add"/>
+      </inject-code>
+    </add-function>
+    <add-function signature="operator-=(const QMatrix3x3&amp;)" return-type="QMatrix3x3" >
+      <inject-code class="target" position="beginning">
+        <insert-template name="inplace_sub"/>
+      </inject-code>
+    </add-function>
+    <add-function signature="operator/=(qreal)" return-type="QMatrix3x3" >
+      <inject-code class="target" position="beginning">
+        <insert-template name="inplace_div"/>
+      </inject-code>
+    </add-function>
+    <add-function signature="operator==(const QMatrix3x3&amp;)" return-type="bool" />
+  </value-type>
+
+  <value-type name="QMatrix3x4" since="4.6">
+    <add-function signature="__repr__" return-type="PyObject*">
+        <inject-code class="target" position="beginning">
+            <insert-template name="repr_code_matrix">
+               <replace from="%MATRIX_SIZE" to="12" />
+               <replace from="%MATRIX_TYPE" to="qreal" />
+             </insert-template>
+        </inject-code>
+    </add-function>
+
+    <add-function signature="__reduce__" return-type="PyObject*">
+        <inject-code class="target" position="beginning">
+            <insert-template name="reduce_code_matrix">
+              <replace from="%MATRIX_TYPE" to="qreal" />
+              <replace from="%MATRIX_SIZE" to="12" />
+            </insert-template>
+        </inject-code>
+    </add-function>
+    <add-function signature="QMatrix3x4(PySequence*)">
+      <inject-code class="target" position="beginning">
+        <insert-template name="matrix_constructor">
+          <replace from="%SIZE" to="12" />
+        </insert-template>
+      </inject-code>
+    </add-function>
+    <add-function signature="data()" return-type="qreal">
+      <inject-code class="target" position="beginning">
+        <insert-template name="matrix_data_function">
+          <replace from="%MATRIX_SIZE" to="12" />
+        </insert-template>
+      </inject-code>
+    </add-function>
+    <add-function signature="fill(PyObject*)">
+      <inject-code class="target" position="beginning">
+        <insert-template name="matrix_fill_function">
+          <replace from="%MATRIX_SIZE" to="12" />
+        </insert-template>
+      </inject-code>
+    </add-function>
+    <add-function signature="transposed()" return-type="PyObject">
+      <inject-code class="target" position="beginning">
+        <insert-template name="matrix_transposed_function">
+          <replace from="%TRANSPOSED_TYPE" to="QMatrix4x3" />
+        </insert-template>
+      </inject-code>
+    </add-function>
+    <add-function signature="operator!=(const QMatrix3x4&amp;)" return-type="bool" />
+    <add-function signature="operator*=(qreal)" return-type="QMatrix3x4" >
+      <inject-code class="target" position="beginning">
+        <insert-template name="inplace_mult"/>
+      </inject-code>
+    </add-function>
+    <add-function signature="operator+=(const QMatrix3x4&amp;)" return-type="QMatrix3x4" >
+      <inject-code class="target" position="beginning">
+        <insert-template name="inplace_add"/>
+      </inject-code>
+    </add-function>
+    <add-function signature="operator-=(const QMatrix3x4&amp;)" return-type="QMatrix3x4" >
+      <inject-code class="target" position="beginning">
+        <insert-template name="inplace_sub"/>
+      </inject-code>
+    </add-function>
+    <add-function signature="operator/=(qreal)" return-type="QMatrix3x4" >
+      <inject-code class="target" position="beginning">
+        <insert-template name="inplace_div"/>
+      </inject-code>
+    </add-function>
+    <add-function signature="operator==(const QMatrix3x4&amp;)" return-type="bool" />
+  </value-type>
+
+  <value-type name="QMatrix4x2" since="4.6">
+    <add-function signature="__repr__" return-type="PyObject*">
+        <inject-code class="target" position="beginning">
+            <insert-template name="repr_code_matrix">
+               <replace from="%MATRIX_SIZE" to="8" />
+               <replace from="%MATRIX_TYPE" to="qreal" />
+             </insert-template>
+        </inject-code>
+    </add-function>
+
+    <add-function signature="__reduce__" return-type="PyObject*">
+        <inject-code class="target" position="beginning">
+            <insert-template name="reduce_code_matrix">
+              <replace from="%MATRIX_TYPE" to="qreal" />
+              <replace from="%MATRIX_SIZE" to="8" />
+            </insert-template>
+        </inject-code>
+    </add-function>
+    <add-function signature="QMatrix4x2(PySequence*)">
+      <inject-code class="target" position="beginning">
+        <insert-template name="matrix_constructor">
+          <replace from="%SIZE" to="8" />
+        </insert-template>
+      </inject-code>
+    </add-function>
+    <add-function signature="data()" return-type="qreal">
+      <inject-code class="target" position="beginning">
+        <insert-template name="matrix_data_function">
+          <replace from="%MATRIX_SIZE" to="8" />
+        </insert-template>
+      </inject-code>
+    </add-function>
+    <add-function signature="fill(PyObject*)">
+      <inject-code class="target" position="beginning">
+        <insert-template name="matrix_fill_function">
+          <replace from="%MATRIX_SIZE" to="8" />
+        </insert-template>
+      </inject-code>
+    </add-function>
+    <add-function signature="transposed()" return-type="PyObject">
+      <inject-code class="target" position="beginning">
+        <insert-template name="matrix_transposed_function">
+          <replace from="%TRANSPOSED_TYPE" to="QMatrix2x4" />
+        </insert-template>
+      </inject-code>
+    </add-function>
+    <add-function signature="operator!=(const QMatrix4x2&amp;)" return-type="bool" />
+    <add-function signature="operator*=(qreal)" return-type="QMatrix4x2" >
+      <inject-code class="target" position="beginning">
+        <insert-template name="inplace_mult"/>
+      </inject-code>
+    </add-function>
+    <add-function signature="operator+=(const QMatrix4x2&amp;)" return-type="QMatrix4x2" >
+      <inject-code class="target" position="beginning">
+        <insert-template name="inplace_add"/>
+      </inject-code>
+    </add-function>
+    <add-function signature="operator-=(const QMatrix4x2&amp;)" return-type="QMatrix4x2" >
+      <inject-code class="target" position="beginning">
+        <insert-template name="inplace_sub"/>
+      </inject-code>
+    </add-function>
+    <add-function signature="operator/=(qreal)" return-type="QMatrix4x2" >
+      <inject-code class="target" position="beginning">
+        <insert-template name="inplace_div"/>
+      </inject-code>
+    </add-function>
+    <add-function signature="operator==(const QMatrix4x2&amp;)" return-type="bool" />
+  </value-type>
+
+  <value-type name="QMatrix4x3" since="4.6">
+    <add-function signature="__repr__" return-type="PyObject*">
+        <inject-code class="target" position="beginning">
+            <insert-template name="repr_code_matrix">
+               <replace from="%MATRIX_SIZE" to="12" />
+               <replace from="%MATRIX_TYPE" to="qreal" />
+             </insert-template>
+        </inject-code>
+    </add-function>
+
+    <add-function signature="__reduce__" return-type="PyObject*">
+        <inject-code class="target" position="beginning">
+            <insert-template name="reduce_code_matrix">
+              <replace from="%MATRIX_TYPE" to="qreal" />
+              <replace from="%MATRIX_SIZE" to="12" />
+            </insert-template>
+        </inject-code>
+    </add-function>
+    <add-function signature="QMatrix4x3(PySequence*)">
+      <inject-code class="target" position="beginning">
+        <insert-template name="matrix_constructor">
+          <replace from="%SIZE" to="12" />
+        </insert-template>
+      </inject-code>
+    </add-function>
+    <add-function signature="data()" return-type="qreal">
+      <inject-code class="target" position="beginning">
+        <insert-template name="matrix_data_function">
+          <replace from="%MATRIX_SIZE" to="12" />
+        </insert-template>
+      </inject-code>
+    </add-function>
+    <add-function signature="fill(PyObject*)">
+      <inject-code class="target" position="beginning">
+        <insert-template name="matrix_fill_function">
+          <replace from="%MATRIX_SIZE" to="12" />
+        </insert-template>
+      </inject-code>
+    </add-function>
+    <add-function signature="transposed()" return-type="PyObject">
+      <inject-code class="target" position="beginning">
+        <insert-template name="matrix_transposed_function">
+          <replace from="%TRANSPOSED_TYPE" to="QMatrix3x4" />
+        </insert-template>
+      </inject-code>
+    </add-function>
+    <add-function signature="operator!=(const QMatrix4x3&amp;)" return-type="bool" />
+    <add-function signature="operator*=(qreal)" return-type="QMatrix4x3" >
+      <inject-code class="target" position="beginning">
+        <insert-template name="inplace_mult"/>
+      </inject-code>
+    </add-function>
+    <add-function signature="operator+=(const QMatrix4x3&amp;)" return-type="QMatrix4x3" >
+      <inject-code class="target" position="beginning">
+        <insert-template name="inplace_add"/>
+      </inject-code>
+    </add-function>
+    <add-function signature="operator-=(const QMatrix4x3&amp;)" return-type="QMatrix4x3" >
+      <inject-code class="target" position="beginning">
+        <insert-template name="inplace_sub"/>
+      </inject-code>
+    </add-function>
+    <add-function signature="operator/=(qreal)" return-type="QMatrix4x3" >
+      <inject-code class="target" position="beginning">
+        <insert-template name="inplace_div"/>
+      </inject-code>
+    </add-function>
+    <add-function signature="operator==(const QMatrix4x3&amp;)" return-type="bool" />
+  </value-type>
+
+  <value-type name="QMatrix4x4" since="4.6">
+    <add-function signature="__repr__" return-type="PyObject*">
+        <inject-code class="target" position="beginning">
+            <insert-template name="repr_code_matrix">
+               <replace from="%MATRIX_SIZE" to="16" />
+               <replace from="%MATRIX_TYPE" to="qreal" />
+             </insert-template>
+        </inject-code>
+    </add-function>
+
+    <add-function signature="__reduce__" return-type="PyObject*">
+        <inject-code class="target" position="beginning">
+            <insert-template name="reduce_code_matrix">
+              <replace from="%MATRIX_TYPE" to="qreal" />
+              <replace from="%MATRIX_SIZE" to="16" />
+            </insert-template>
+        </inject-code>
+    </add-function>
+
+    <!-- ### "QMatrix4x4(const qreal*,int,int)" is an internal constructor. -->
     <modify-function signature="QMatrix4x4(const qreal*,int,int)" remove="all"/>
 
     <modify-function signature="QMatrix4x4(const qreal*)">
@@ -4519,21 +6727,13 @@
         }
       </inject-code>
     </modify-function>
-
-    <modify-function signature="constData() const" rename="data">
-      <modify-argument index="return">
-        <replace-type modified-type="PyTupleObject*"/>
-      </modify-argument>
+    <modify-function signature="data()">
       <inject-code class="target" position="beginning">
-        const qreal* values = %CPPSELF.constData();
-        %PYARG_0 = PyTuple_New(16);
-        for(int i=0; i &lt; 16; i++) {
-          PyObject *v = PyFloat_FromDouble(values[i]);
-          PyTuple_SET_ITEM(%PYARG_0, i, v);
-        }
+        <insert-template name="matrix_data_function">
+          <replace from="%MATRIX_SIZE" to="16" />
+        </insert-template>
       </inject-code>
     </modify-function>
-
     <modify-function signature="copyDataTo(qreal *) const">
       <modify-argument index="1">
         <remove-argument/>
@@ -4541,7 +6741,6 @@
       <modify-argument index="return">
         <replace-type modified-type="PyTupleObject*"/>
       </modify-argument>
-
       <inject-code class="target" position="beginning">
         qreal values[16];
         %CPPSELF.%FUNCTION_NAME(values);
@@ -4553,37 +6752,99 @@
       </inject-code>
     </modify-function>
 
-    <modify-function signature="operator()(int, int)" remove="all"/>
-    <modify-function signature="operator()(int, int)const" remove="all"/>
-    <modify-function signature="data()" remove="all"/>
+    <modify-function signature="inverted(bool*)const">
+      <modify-argument index="1">
+        <remove-argument/>
+      </modify-argument>
+      <modify-argument index="return">
+        <replace-type modified-type="PyTuple"/>
+      </modify-argument>
+      <inject-code class="target" position="beginning">
+        <insert-template name="fix_bool*"/>
+      </inject-code>
+    </modify-function>
+
+    <!-- ### "constData() const" and "data() const" are unnecessary in Python and their function is performed by "data()". -->
     <modify-function signature="data() const" remove="all"/>
+    <modify-function signature="constData() const" remove="all"/>
+    <!-- ### -->
+    <modify-function signature="operator()(int, int) const" remove="all"/>
+    <modify-function signature="operator()(int, int)" remove="all"/>
+    <add-function signature="__mgetitem__" return-type="PyObject*">
+       <inject-code>
+         if (PySequence_Check(_key)) {
+             Shiboken::AutoDecRef key(PySequence_Fast(_key, "Invalid matrix index."));
+             if (PySequence_Fast_GET_SIZE(key.object()) == 2) {
+                 PyObject* posx = PySequence_Fast_GET_ITEM(key.object(), 0);
+                 PyObject* posy = PySequence_Fast_GET_ITEM(key.object(), 1);
+                 Py_ssize_t x = PyInt_AsSsize_t(posx);
+                 Py_ssize_t y = PyInt_AsSsize_t(posy);
+                 qreal ret = (*%CPPSELF)(x,y);
+                 return %CONVERTTOPYTHON[qreal](ret);
+             }
+         }
+         PyErr_SetString(PyExc_IndexError, "Invalid matrix index.");
+         return 0;
+       </inject-code>
+    </add-function>
   </value-type>
 
-  <object-type name="QGesture"/>
-  <object-type name="QGestureRecognizer"/>
-  <object-type name="QGraphicsAnchor"/>
-  <object-type name="QGraphicsAnchorLayout"/>
-  <object-type name="QGraphicsBlurEffect"/>
-  <object-type name="QGraphicsColorizeEffect"/>
-  <object-type name="QGraphicsDropShadowEffect"/>
+  <object-type name="QGesture" since="4.6">
+      <enum-type name="GestureCancelPolicy"/>
+  </object-type>
+  <object-type name="QGestureRecognizer" since="4.6">
+      <enum-type name="ResultFlag" flags="Result"/>
+  </object-type>
+  <object-type name="QTapAndHoldGesture" since="4.6"/>
+  <object-type name="QTapGesture" since="4.6"/>
+  <object-type name="QGraphicsAnchor" since="4.6"/>
+  <object-type name="QGraphicsAnchorLayout" since="4.6"/>
+  <object-type name="QGraphicsBlurEffect" since="4.6">
+      <enum-type name="BlurHint" flags="BlurHints"/>
+  </object-type>
+  <object-type name="QGraphicsColorizeEffect" since="4.6"/>
+  <object-type name="QGraphicsDropShadowEffect" since="4.6"/>
 
-  <enum-type name="QGraphicsEffect::ChangeFlag" flags="QGraphicsEffect::ChangeFlags"/>
-  <object-type name="QGraphicsEffect"/>
+  <object-type name="QGraphicsEffect" since="4.6">
+      <enum-type name="ChangeFlag" flags="ChangeFlags"/>
+      <enum-type name="PixmapPadMode"/>
+  </object-type>
 
   <!-- QtInternal
   <object-type name="QGraphicsEffectSource"/>
   -->
 
-  <object-type name="QGraphicsObject"/>
-  <object-type name="QGraphicsOpacityEffect"/>
-  <object-type name="QGraphicsRotation"/>
-  <object-type name="QGraphicsScale"/>
-  <object-type name="QGraphicsTransform"/>
-  <object-type name="QKeyEventTransition"/>
-  <object-type name="QMouseEventTransition"/>
-  <object-type name="QPanGesture"/>
-  <object-type name="QPinchGesture"/>
-  <value-type name="QQuaternion"/>
+  <object-type name="QGraphicsObject" since="4.6" />
+  <object-type name="QGraphicsOpacityEffect" since="4.6"/>
+  <object-type name="QGraphicsRotation" since="4.6"/>
+  <object-type name="QGraphicsScale" since="4.6"/>
+  <object-type name="QGraphicsTransform" since="4.6"/>
+  <object-type name="QKeyEventTransition" since="4.6"/>
+  <object-type name="QMouseEventTransition" since="4.6"/>
+  <object-type name="QPanGesture" since="4.6"/>
+  <object-type name="QPinchGesture" since="4.6">
+      <enum-type name="ChangeFlag" flags="ChangeFlags"/>
+  </object-type>
+  <value-type name="QQuaternion" since="4.6">
+    <add-function signature="__repr__" return-type="PyObject*">
+        <inject-code class="target" position="beginning">
+            <insert-template name="repr_code">
+               <replace from="%REPR_FORMAT" to="%f, %f, %f, %f" />
+               <replace from="%REPR_ARGS" to="%CPPSELF.scalar(), %CPPSELF.x(), %CPPSELF.y(), %CPPSELF.z()" />
+             </insert-template>
+        </inject-code>
+    </add-function>
+
+    <add-function signature="__reduce__" return-type="PyObject*">
+        <inject-code class="target" position="beginning">
+            <insert-template name="reduce_code">
+              <replace from="%REDUCE_FORMAT" to="dddd" />
+              <replace from="%REDUCE_ARGS" to="%CPPSELF.scalar(), %CPPSELF.x(), %CPPSELF.y(), %CPPSELF.z()" />
+            </insert-template>
+        </inject-code>
+    </add-function>
+  </value-type>
+
 
   <!-- Symbian
   <value-type name="QS60MainApplication"/>
@@ -4591,29 +6852,113 @@
   <object-type name="QS60MainDocument"/>
   <value-type name="QS60Style"/>
 
-  <enum-type name="QSymbianEvent::Type"/>
-  <object-type name="QSymbianEvent"/>
+  <object-type name="QSymbianEvent">
+      <enum-type name="Type"/>
+  </object-type>
   -->
 
-  <enum-type name="QSwipeGesture::SwipeDirection"/>
-  <object-type name="QSwipeGesture"/>
+  <object-type name="QSwipeGesture" since="4.6">
+      <enum-type name="SwipeDirection"/>
+  </object-type>
 
-  <value-type name="QTileRules"/>
+  <value-type name="QTileRules" since="4.6"/>
 
-  <enum-type name="QTouchEvent::DeviceType"/>
-  <value-type name="QTouchEvent"/>
-  <value-type name="QTouchEvent::TouchPoint"/>
+  <object-type name="QTouchEvent" since="4.6">
+      <enum-type name="DeviceType"/>
+      <value-type name="TouchPoint" since="4.6"/>
+  </object-type>
+
+  <value-type name="QVector2D" since="4.6">
+    <add-function signature="__repr__" return-type="PyObject*">
+        <inject-code class="target" position="beginning">
+            <insert-template name="repr_code">
+               <replace from="%REPR_FORMAT" to="%f, %f" />
+               <replace from="%REPR_ARGS" to="%CPPSELF.x(), %CPPSELF.y()" />
+             </insert-template>
+        </inject-code>
+    </add-function>
+
+    <add-function signature="__reduce__" return-type="PyObject*">
+        <inject-code class="target" position="beginning">
+            <insert-template name="reduce_code">
+              <replace from="%REDUCE_FORMAT" to="dd" />
+              <replace from="%REDUCE_ARGS" to="%CPPSELF.x(), %CPPSELF.y()" />
+            </insert-template>
+        </inject-code>
+    </add-function>
+
+    <add-function signature="toTuple" return-type="PyObject*">
+        <inject-code class="target" position="beginning">
+            <insert-template name="to_tuple">
+                <replace from="%TT_FORMAT" to="dd" />
+                <replace from="%TT_ARGS" to="%CPPSELF.x(), %CPPSELF.y()" />
+            </insert-template>
+        </inject-code>
+    </add-function>
 
-  <value-type name="QVector2D"/>
-  <value-type name="QVector3D">
-    <extra-includes>
-      <include file-name="QMatrix4x4" location="global"/>
-    </extra-includes>
   </value-type>
-  <value-type name="QVector4D">
+  <value-type name="QVector3D" since="4.6">
     <extra-includes>
       <include file-name="QMatrix4x4" location="global"/>
     </extra-includes>
+    <add-function signature="__repr__" return-type="PyObject*">
+        <inject-code class="target" position="beginning">
+            <insert-template name="repr_code">
+               <replace from="%REPR_FORMAT" to="%f, %f, %f" />
+               <replace from="%REPR_ARGS" to="%CPPSELF.x(), %CPPSELF.y(), %CPPSELF.z()" />
+             </insert-template>
+        </inject-code>
+    </add-function>
+
+    <add-function signature="__reduce__" return-type="PyObject*">
+        <inject-code class="target" position="beginning">
+            <insert-template name="reduce_code">
+              <replace from="%REDUCE_FORMAT" to="ddd" />
+              <replace from="%REDUCE_ARGS" to="%CPPSELF.x(), %CPPSELF.y(), %CPPSELF.z()" />
+            </insert-template>
+        </inject-code>
+    </add-function>
+
+    <add-function signature="toTuple" return-type="PyObject*">
+        <inject-code class="target" position="beginning">
+            <insert-template name="to_tuple">
+                <replace from="%TT_FORMAT" to="ddd" />
+                <replace from="%TT_ARGS" to="%CPPSELF.x(), %CPPSELF.y(), %CPPSELF.z()" />
+            </insert-template>
+        </inject-code>
+    </add-function>
+
+  </value-type>
+  <value-type name="QVector4D" since="4.6">
+    <extra-includes>
+      <include file-name="QMatrix4x4" location="global"/>
+    </extra-includes>
+    <add-function signature="__repr__" return-type="PyObject*">
+        <inject-code class="target" position="beginning">
+            <insert-template name="repr_code">
+               <replace from="%REPR_FORMAT" to="%f, %f, %f, %f" />
+               <replace from="%REPR_ARGS" to="%CPPSELF.x(), %CPPSELF.y(), %CPPSELF.z(), %CPPSELF.w()" />
+             </insert-template>
+        </inject-code>
+    </add-function>
+
+    <add-function signature="__reduce__" return-type="PyObject*">
+        <inject-code class="target" position="beginning">
+            <insert-template name="reduce_code">
+              <replace from="%REDUCE_FORMAT" to="dddd" />
+              <replace from="%REDUCE_ARGS" to="%CPPSELF.x(), %CPPSELF.y(), %CPPSELF.z(), %CPPSELF.w()" />
+            </insert-template>
+        </inject-code>
+    </add-function>
+
+    <add-function signature="toTuple" return-type="PyObject*">
+        <inject-code class="target" position="beginning">
+            <insert-template name="to_tuple">
+                <replace from="%TT_FORMAT" to="dddd" />
+                <replace from="%TT_ARGS" to="%CPPSELF.x(), %CPPSELF.y(), %CPPSELF.z(), %CPPSELF.w()" />
+            </insert-template>
+        </inject-code>
+    </add-function>
   </value-type>
 
   <suppress-warning text="template baseclass 'QGenericMatrix&lt;qreal&gt;' of '*' is not known"/>
@@ -4623,9 +6968,126 @@
   <suppress-warning text="signature 'addToolbar(Qt::ToolBarArea,QToolBar*)' for function modification in 'QMainWindow' not found."/>
   <suppress-warning text="signature 'addToolbar(QToolBar*)' for function modification in 'QMainWindow' not found."/>
   <suppress-warning text="signature 'addToolbar(QString)' for function modification in 'QMainWindow' not found."/>
-  <suppress-warning text="namespace 'PySide.QtGui.QInputMethodEvent' for enum 'AttributeType' is not declared"/>
-  <suppress-warning text="type 'QInputMethodEvent::Attribute' is specified in typesystem, but not defined."/>
-  <suppress-warning text="Shadowing: *"/>
   <suppress-warning text="unhandled enum value: ~FlagMask in QMessageBox::StandardButton"/>
   <suppress-warning text="unmatched enum ~FlagMask"/>
+  <suppress-warning text="enum 'QMatrix4x4::enum_1' is specified in typesystem, but not declared"/>
+  <suppress-warning text="class not found for setup inheritance 'QMimeSource'"/>
+  <suppress-warning text="class 'QDropEvent' inherits from unknown base class 'QMimeSource'"/>
+
+
+  <!-- The following entries may be present in the system or not. Keep this section organized. -->
+  <object-type name="QAbstractPageSetupDialog"/>
+  <object-type name="QAbstractPrintDialog">
+    <enum-type name="PrintDialogOption" flags="PrintDialogOptions"/>
+    <enum-type name="PrintRange"/>
+    <modify-function signature="exec()" rename="exec_" allow-thread="yes" />
+  </object-type>
+
+  <object-type name="QGtkStyle">
+    <modify-function signature="standardPixmap(QStyle::StandardPixmap,const QStyleOption*,const QWidget*)const">
+      <modify-argument index="2">
+        <replace-default-expression with="0"/>
+      </modify-argument>
+      <modify-argument index="3">
+        <replace-default-expression with="0"/>
+      </modify-argument>
+    </modify-function>
+  </object-type>
+
+  <object-type name="QPageSetupDialog">
+    <enum-type name="PageSetupDialogOption" flags="PageSetupDialogOptions"/>
+    <modify-function signature="exec()" rename="exec_" allow-thread="yes"/>
+  </object-type>
+
+  <object-type name="QPrintDialog">
+    <modify-function signature="exec()" rename="exec_" allow-thread="yes" />
+  </object-type>
+  <object-type name="QPrintEngine">
+    <enum-type name="PrintEnginePropertyKey" />
+  </object-type>
+  <value-type name="QPrinterInfo" />
+  <rejection class="QPrinter" function-name="printerSelectionOption"/>
+  <rejection class="QPrinter" function-name="setPrinterSelectionOption"/>
+
+  <object-type name="QPrinter" >
+    <enum-type name="ColorMode"/>
+    <enum-type name="DuplexMode"/>
+    <enum-type name="Orientation"/>
+    <enum-type name="OutputFormat"/>
+    <enum-type name="PageOrder"/>
+    <enum-type name="PageSize" />
+    <enum-type name="PaperSource"/>
+    <enum-type name="PrintRange"/>
+    <enum-type name="PrinterMode"/>
+    <enum-type name="PrinterState"/>
+    <enum-type name="Unit"/>
+    <modify-function signature="getPageMargins(qreal*,qreal*,qreal*,qreal*,QPrinter::Unit)const">
+        <modify-argument index="0">
+            <replace-type modified-type="PyObject" />
+        </modify-argument>
+        <modify-argument index="1">
+            <remove-argument/>
+        </modify-argument>
+        <modify-argument index="2">
+            <remove-argument/>
+        </modify-argument>
+        <modify-argument index="3">
+            <remove-argument/>
+        </modify-argument>
+        <modify-argument index="4">
+            <remove-argument/>
+        </modify-argument>
+        <inject-code class="target" position="beginning">
+            <insert-template name="fix_number*,number*,number*,number*,args">
+                <replace from="$TYPE" to="qreal" />
+            </insert-template>
+        </inject-code>
+    </modify-function>
+    <modify-function signature="setEngines(QPrintEngine*,QPaintEngine*)">
+      <modify-argument index="1">
+        <parent index="this" action="add"/>
+      </modify-argument>
+      <modify-argument index="2">
+        <parent index="this" action="add"/>
+      </modify-argument>
+    </modify-function>
+    <extra-includes>
+      <include file-name="QPrinterInfo" location="global"/>
+    </extra-includes>
+  </object-type>
+
+  <object-type name="QPrintPreviewDialog"/>
+  <object-type name="QPrintPreviewWidget">
+    <enum-type name="ViewMode"/>
+    <enum-type name="ZoomMode"/>
+    <modify-function signature="print()" rename="print_" />
+  </object-type>
+
+  <object-type name="QSessionManager">
+    <extra-includes>
+    </extra-includes>
+    <enum-type name="RestartHint"/>
+    <!-- ### "handle()const" is an internal method. -->
+    <modify-function signature="handle()const" remove="all"/>
+    <!-- ### -->
+  </object-type>
+
+  <object-type name="QSizeGrip"/>
+
+  <object-type name="QSystemTrayIcon">
+    <enum-type name="ActivationReason"/>
+    <enum-type name="MessageIcon"/>
+    <modify-function signature="setContextMenu(QMenu*)">
+      <modify-argument index="1">
+        <reference-count action="set"/>
+      </modify-argument>
+    </modify-function>
+  </object-type>
+
+  <!-- The above entries may be present in the system or not. Keep this section organized. -->
+
+  <!-- This enum is present on QtCore -->
+  <suppress-warning text="enum 'QCoreApplication::ApplicationFlags' is specified in typesystem, but not declared" />
+
 </typesystem>
+
diff --git a/PySide/QtGui/typesystem_gui_mac.xml b/PySide/QtGui/typesystem_gui_mac.xml
index b27df0f..b7597b9 100644
--- a/PySide/QtGui/typesystem_gui_mac.xml
+++ b/PySide/QtGui/typesystem_gui_mac.xml
@@ -1,11 +1,32 @@
 <?xml version="1.0"?>
+<!--
+    This file is part of PySide project.
+    Copyright (C) 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
+    Contact: PySide team <contact@pyside.org>
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+-->
 <typesystem package="PySide.QtGui">
   <rejection class="*" function-name="qt_mac_set_cursor"/>
   <rejection class="*" function-name="macMenu"/>
 
   <primitive-type name="Qt::HANDLE" target-lang-api-name="PyObject"/>
-
-  <load-typesystem name="typesystem_gui_common.xml" generate="yes"/>
+  <object-type name="QMacStyle" >
+    <enum-type name="FocusRectPolicy"/>
+    <enum-type name="WidgetSizePolicy"/>
+  </object-type>
 
   <suppress-warning text="enum 'QPixmap::ShareMode' does not have a type entry or is not an enum" />
   <suppress-warning text="enum 'QSysInfo::Endian' is specified in typesystem, but not declared" />
diff --git a/PySide/QtGui/typesystem_gui_maemo.xml b/PySide/QtGui/typesystem_gui_maemo.xml
index 0a06c77..f49da9d 100644
--- a/PySide/QtGui/typesystem_gui_maemo.xml
+++ b/PySide/QtGui/typesystem_gui_maemo.xml
@@ -1,10 +1,30 @@
 <?xml version="1.0"?>
+<!--
+    This file is part of PySide project.
+    Copyright (C) 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
+    Contact: PySide team <contact@pyside.org>
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+-->
 <typesystem package="PySide.QtGui">
 
-  <enum-type name="QAbstractKineticScroller::Mode"/>
-  <enum-type name="QAbstractKineticScroller::OvershootPolicy"/>
-  <enum-type name="QAbstractKineticScroller::State"/>
-  <object-type name="QAbstractKineticScroller" />
+  <object-type name="QAbstractKineticScroller">
+      <enum-type name="Mode"/>
+      <enum-type name="OvershootPolicy"/>
+      <enum-type name="State"/>
+  </object-type>
 
   <load-typesystem name="typesystem_gui_x11.xml" generate="yes"/>
 </typesystem>
diff --git a/PySide/QtGui/typesystem_gui_simulator.xml b/PySide/QtGui/typesystem_gui_simulator.xml
new file mode 100644
index 0000000..065e44d
--- /dev/null
+++ b/PySide/QtGui/typesystem_gui_simulator.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0"?>
+<!--
+    This file is part of PySide project.
+    Copyright (C) 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
+    Contact: PySide team <contact@pyside.org>
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+-->
+<typesystem package="PySide.QtGui">
+  <!-- These classes are not present in Qt Simulator build, even though
+       QT_NO_PRINTER is *not* set -->
+  <rejection class="QAbstractPageSetupDialog"/>
+  <rejection class="QAbstractPrintDialog"/>
+  <rejection class="QPageSetupDialog"/>
+  <rejection class="QPrintDialog"/>
+  <rejection class="QPrintPreviewDialog"/>
+  <rejection class="QPrintPreviewWidget"/>
+  <rejection class="QPrintEngine"/>
+  <rejection class="QPrinterInfo"/>
+  <rejection class="QPrinter"/>
+
+  <object-type name="QPlainTextEdit">
+    <modify-function signature="print(QPrinter*)const" remove="all"/>
+  </object-type>
+  <object-type name="QTextDocument">
+    <modify-function signature="print(QPrinter*)const" remove="all"/>
+  </object-type>
+  <object-type name="QTextEdit">
+    <modify-function signature="print(QPrinter*)const" remove="all"/>
+  </object-type>
+
+  <!-- Qt::HANDLE is typedef to "void *", which gives compilation errors on
+       conversion templates -->
+  <value-type name="QCursor">
+    <modify-function signature="QCursor(Qt::HANDLE)" remove="all"/>
+  </value-type>
+  <value-type name="QFont">
+    <modify-function signature="handle()const" remove="all"/>
+  </value-type>
+</typesystem>
diff --git a/PySide/QtGui/typesystem_gui_win.xml b/PySide/QtGui/typesystem_gui_win.xml
new file mode 100644
index 0000000..387964d
--- /dev/null
+++ b/PySide/QtGui/typesystem_gui_win.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0"?>
+<!--
+    This file is part of PySide project.
+    Copyright (C) 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
+    Contact: PySide team <contact@pyside.org>
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+-->
+<typesystem package="PySide.QtGui">
+  <primitive-type name="WId" target-lang-api-name="PyObject">
+    <conversion-rule>
+        <native-to-target>
+        #ifdef IS_PY3K
+        return PyCapsule_New(%in, 0, 0);
+        #else
+        return PyCObject_FromVoidPtr(%in, 0);
+        #endif
+        </native-to-target>
+        <target-to-native>
+            <add-conversion type="PyNone">
+            %out = 0;
+            </add-conversion>
+            <add-conversion check="checkPyCapsuleOrPyCObject(%in)" type="PyObject">
+            #ifdef IS_PY3K
+            %out = (%OUTTYPE)PyCapsule_GetPointer(%in, 0);
+            #else
+            %out = (%OUTTYPE)PyCObject_AsVoidPtr(%in);
+            #endif
+            </add-conversion>
+        </target-to-native>
+    </conversion-rule>
+  </primitive-type>
+  <inject-code class="native" position="beginning">
+    <insert-template name="checkPyCapsuleOrPyCObject_func"/>
+  </inject-code>
+  <enum-type name="QPixmap::HBitmapFormat" />
+</typesystem>
diff --git a/PySide/QtGui/typesystem_gui_x11.xml b/PySide/QtGui/typesystem_gui_x11.xml
index 7429874..54d8882 100644
--- a/PySide/QtGui/typesystem_gui_x11.xml
+++ b/PySide/QtGui/typesystem_gui_x11.xml
@@ -1,14 +1,50 @@
 <?xml version="1.0"?>
+<!--
+    This file is part of PySide project.
+    Copyright (C) 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
+    Contact: PySide team <contact@pyside.org>
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+-->
 <typesystem package="PySide.QtGui">
 
   <rejection class="" function-name="qt_x11_getX11InfoForWindow"/>
   <rejection class="QX11Info" field-name="x11data"/>
   <value-type name="QX11Info">
-    <modify-function signature="visual()const" remove="all"/>
-    <modify-function signature="appVisual(int)" remove="all"/>
+    <add-function signature="display()" return-type="unsigned long" static="yes">
+        <inject-code>
+            %PYARG_0 = PyLong_FromVoidPtr(%TYPE::%FUNCTION_NAME());
+        </inject-code>
+    </add-function>
+    <modify-function signature="visual()const">
+        <inject-code>
+            %PYARG_0 = PyLong_FromVoidPtr(%CPPSELF.%FUNCTION_NAME());
+        </inject-code>
+    </modify-function>
+    <modify-function signature="appVisual(int)">
+        <inject-code>
+            %PYARG_0 = PyLong_FromVoidPtr(%CPPSELF.%FUNCTION_NAME());
+        </inject-code>
+    </modify-function>
   </value-type>
+  <object-type name="QX11EmbedContainer">
+    <enum-type name="Error"/>
+  </object-type>
+  <object-type name="QX11EmbedWidget">
+    <enum-type name="Error"/>
+  </object-type>
 
   <enum-type name="QPixmap::ShareMode"/>
-
-  <load-typesystem name="typesystem_gui_common.xml" generate="yes"/>
 </typesystem>
diff --git a/PySide/QtHelp/CMakeLists.txt b/PySide/QtHelp/CMakeLists.txt
index 219dfc3..041ef63 100644
--- a/PySide/QtHelp/CMakeLists.txt
+++ b/PySide/QtHelp/CMakeLists.txt
@@ -15,34 +15,28 @@ set(QtHelp_SRC
     ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtHelp/qthelp_module_wrapper.cpp
 )
 
-execute_generator(help QtHelp_SRC "${CMAKE_CURRENT_BINARY_DIR}:${QtCore_SOURCE_DIR}:${QtGui_BINARY_DIR}:${QtGui_SOURCE_DIR}:${QtHelp_SOURCE_DIR}")
-
-include_directories(${CMAKE_CURRENT_SOURCE_DIR}
-                    ${QT_QTCORE_INCLUDE_DIR}
-                    ${QT_QTGUI_INCLUDE_DIR}
-                    ${QT_QTHELP_INCLUDE_DIR}
-                    ${PYTHON_INCLUDE_PATH}
-                    ${SHIBOKEN_INCLUDE_DIR}
-                    ${libpyside_SOURCE_DIR}
-                    ${QtGui_BINARY_DIR}/PySide/QtGui/
-                    ${QtCore_BINARY_DIR}/PySide/QtCore/
-                    ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtHelp)
-add_library(QtHelp MODULE ${QtHelp_SRC})
-
-set_target_properties(QtHelp PROPERTIES PREFIX "")
-
-target_link_libraries(QtHelp
-                      pyside
-                      ${PYTHON_LIBRARIES}
+set(QtHelp_typesystem_path "${QtCore_SOURCE_DIR}${PATH_SEP}${QtCore_BINARY_DIR}${PATH_SEP}${QtGui_SOURCE_DIR}${PATH_SEP}${QtHelp_SOURCE_DIR}${PATH_SEP}${QtGui_BINARY_DIR}")
+set(QtHelp_include_dirs ${CMAKE_CURRENT_SOURCE_DIR}
+                        ${QT_QTCORE_INCLUDE_DIR}
+                        ${QT_QTGUI_INCLUDE_DIR}
+                        ${QT_QTHELP_INCLUDE_DIR}
+                        ${SHIBOKEN_PYTHON_INCLUDE_DIR}
+                        ${SHIBOKEN_INCLUDE_DIR}
+                        ${libpyside_SOURCE_DIR}
+                        ${QtGui_BINARY_DIR}/PySide/QtGui/
+                        ${QtCore_BINARY_DIR}/PySide/QtCore/
+                        ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtHelp)
+set(QtHelp_libraries  pyside
+                      ${SHIBOKEN_PYTHON_LIBRARIES}
                       ${QT_QTCORE_LIBRARY}
                       ${QT_QTGUI_LIBRARY}
                       ${QT_QTHELP_LIBRARY})
-add_dependencies(QtHelp QtGui)
-
-# install
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/QtHelp${CMAKE_DEBUG_POSTFIX}.so
-        DESTINATION ${SITE_PACKAGE}/PySide)
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtHelp/pyside_qthelp_python.h
-        DESTINATION include/PySide/QtHelp/)
-
+set(QtHelp_deps QtGui)
 
+create_pyside_module(QtHelp
+                     QtHelp_include_dirs
+                     QtHelp_libraries
+                     QtHelp_deps
+                     QtHelp_typesystem_path
+                     QtHelp_SRC
+                     "")
diff --git a/PySide/QtHelp/typesystem_help.xml b/PySide/QtHelp/typesystem_help.xml
index e78153f..bc58957 100644
--- a/PySide/QtHelp/typesystem_help.xml
+++ b/PySide/QtHelp/typesystem_help.xml
@@ -1,10 +1,27 @@
 <?xml version="1.0"?>
+<!--
+    This file is part of PySide project.
+    Copyright (C) 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
+    Contact: PySide team <contact@pyside.org>
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+-->
 
 <typesystem package="PySide.QtHelp">
     <load-typesystem name="typesystem_gui.xml" generate="no" />
 
-    <enum-type name="QHelpSearchQuery::FieldName"/>
-
     <value-type name="QHelpContentItem">
       <modify-function signature="parent() const">
         <modify-argument index="return">
@@ -19,7 +36,9 @@
     <object-type name="QHelpIndexModel"/>
     <object-type name="QHelpIndexWidget"/>
     <object-type name="QHelpSearchEngine"/>
-    <value-type name="QHelpSearchQuery"/>
+    <value-type name="QHelpSearchQuery">
+        <enum-type name="FieldName"/>
+    </value-type>
     <object-type name="QHelpSearchQueryWidget"/>
     <object-type name="QHelpSearchResultWidget"/>
 </typesystem>
diff --git a/PySide/QtMaemo5/CMakeLists.txt b/PySide/QtMaemo5/CMakeLists.txt
index ac85ea4..41397f4 100644
--- a/PySide/QtMaemo5/CMakeLists.txt
+++ b/PySide/QtMaemo5/CMakeLists.txt
@@ -11,47 +11,40 @@ ${CMAKE_CURRENT_BINARY_DIR}/${BINDING_NAME}/QtMaemo5/qmaemo5valuebutton_wrapper.
 ${CMAKE_CURRENT_BINARY_DIR}/${BINDING_NAME}/QtMaemo5/qtmaemo5_module_wrapper.cpp
 )
 
-execute_generator(maemo5 QtMaemo5_SRC
-                  "${CMAKE_CURRENT_BINARY_DIR}:${QtCore_SOURCE_DIR}:${QtGui_BINARY_DIR}:${QtGui_SOURCE_DIR}:${QtMaemo5_SOURCE_DIR}")
+set(QtMaemo5_typesystem_path "${QtCore_SOURCE_DIR}${PATH_SEP}${QtCore_BINARY_DIR}${PATH_SEP}${QtGui_SOURCE_DIR}${PATH_SEP}${QtMaemo5_SOURCE_DIR}${PATH_SEP}${QtGui_BINARY_DIR}")
 
 # QT_QTMAEMO5_* variables are not defined by CMake
 if(NOT QT_QTMAEMO5_INCLUDE_DIR)
   FIND_PATH(QT_QTMAEMO5_INCLUDE_DIR QtMaemo5
             PATHS ${QT_HEADERS_DIR}/QtMaemo5 NO_DEFAULT_PATH)
-endif(NOT QT_QTMAEMO5_INCLUDE_DIR)
+endif()
 if(NOT QT_QTMAEMO5_LIBRARY)
   FIND_LIBRARY(QT_QTMAEMO5_LIBRARY QtMaemo5
                PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
-endif(NOT QT_QTMAEMO5_LIBRARY)
+endif()
 
-include_directories(${CMAKE_CURRENT_SOURCE_DIR}
-                    ${QT_QTCORE_INCLUDE_DIR}
-                    ${QT_QTGUI_INCLUDE_DIR}
-                    ${QT_QTMAEMO5_INCLUDE_DIR}
-                    ${PYTHON_INCLUDE_PATH}
-                    ${SHIBOKEN_INCLUDE_DIR}
-                    ${libpyside_SOURCE_DIR}
-                    ${QtCore_BINARY_DIR}/${BINDING_NAME}/QtCore/
-                    ${QtGui_BINARY_DIR}/${BINDING_NAME}/QtGui/
-                    ${CMAKE_CURRENT_BINARY_DIR}/${BINDING_NAME}/QtMaemo5)
-add_library(QtMaemo5 MODULE ${QtMaemo5_SRC})
-
-set_target_properties(QtMaemo5 PROPERTIES
-                      PREFIX "")
-
-target_link_libraries(QtMaemo5
-                      pyside
-                      ${PYTHON_LIBRARIES}
+set(QtMaemo5_include_dirs ${CMAKE_CURRENT_SOURCE_DIR}
+                        ${QT_QTCORE_INCLUDE_DIR}
+                        ${QT_QTGUI_INCLUDE_DIR}
+                        ${QT_QTMAEMO5_INCLUDE_DIR}
+                        ${SHIBOKEN_PYTHON_INCLUDE_DIR}
+                        ${SHIBOKEN_INCLUDE_DIR}
+                        ${libpyside_SOURCE_DIR}
+                        ${QtCore_BINARY_DIR}/${BINDING_NAME}/QtCore/
+                        ${QtGui_BINARY_DIR}/${BINDING_NAME}/QtGui/
+                        ${CMAKE_CURRENT_BINARY_DIR}/${BINDING_NAME}/QtMaemo5)
+set(QtMaemo5_libraries  pyside
+                      ${SHIBOKEN_PYTHON_LIBRARIES}
                       ${QT_QTCORE_LIBRARY}
                       ${QT_QTGUI_LIBRARY}
                       ${QT_QTMAEMO5_LIBRARY})
+set(QtMaemo5_deps QtGui)
 
-#add_dependencies(QtMaemo5)
-
-# install
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/QtMaemo5${CMAKE_DEBUG_POSTFIX}.so
-        DESTINATION ${SITE_PACKAGE}/${BINDING_NAME})
-
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtMaemo5/pyside_qtmaemo5_python.h
-        DESTINATION include/${BINDING_NAME}/QtMaemo5/)
+create_pyside_module(QtMaemo5
+                     QtMaemo5_include_dirs
+                     QtMaemo5_libraries
+                     QtMaemo5_deps
+                     QtMaemo5_typesystem_path
+                     QtMaemo5_SRC
+                     "")
 
diff --git a/PySide/QtMaemo5/typesystem_maemo5.xml b/PySide/QtMaemo5/typesystem_maemo5.xml
index 9f92793..803404d 100644
--- a/PySide/QtMaemo5/typesystem_maemo5.xml
+++ b/PySide/QtMaemo5/typesystem_maemo5.xml
@@ -1,9 +1,26 @@
 <?xml version="1.0"?>
+<!--
+    This file is part of PySide project.
+    Copyright (C) 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
+    Contact: PySide team <contact@pyside.org>
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+-->
 <typesystem package="PySide.QtMaemo5">
   <load-typesystem name="typesystem_gui.xml" generate="no"/>
 
-  <enum-type name="QMaemo5ValueButton::ValueLayout"/>
-
   <object-type name="QMaemo5AbstractPickSelector">
     <modify-function signature="widget(QWidget*)">
       <modify-argument index="return">
@@ -13,7 +30,7 @@
   </object-type>
 
   <object-type name="QMaemo5DatePickSelector"/>
-  
+
   <object-type name="QMaemo5EditBar">
      <modify-function signature="addButton(QAbstractButton*)">
       <modify-argument index="1">
@@ -30,7 +47,7 @@
   <object-type name="QMaemo5InformationBox">
     <modify-function signature="setWidget(QWidget*)">
       <modify-argument index="1">
-        <reference-count action="add"/>
+        <reference-count action="set"/>
       </modify-argument>
      </modify-function>
      <modify-function signature="paintEvent(QPaintEvent*)">
@@ -44,7 +61,7 @@
   <object-type name="QMaemo5ListPickSelector">
     <modify-function signature="setModel(QAbstractItemModel*)">
       <modify-argument index="1">
-        <reference-count action="add"/>
+        <reference-count action="set"/>
       </modify-argument>
     </modify-function>
 
@@ -57,6 +74,7 @@
 
   <object-type name="QMaemo5TimePickSelector"/>
   <object-type name="QMaemo5ValueButton">
+    <enum-type name="ValueLayout"/>
     <modify-function signature="setPickSelector(QMaemo5AbstractPickSelector*)">
       <modify-argument index="1">
         <parent index="this" action="add"/>
@@ -67,5 +85,5 @@
         <modify-argument index="1" invalidate-after-use="yes"/>
     </modify-function>
   </object-type>
- 
+
 </typesystem>
diff --git a/PySide/QtMultimedia/CMakeLists.txt b/PySide/QtMultimedia/CMakeLists.txt
index cbf0b6f..ea37c80 100644
--- a/PySide/QtMultimedia/CMakeLists.txt
+++ b/PySide/QtMultimedia/CMakeLists.txt
@@ -17,35 +17,32 @@ set(QtMultimedia_SRC
     ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtMultimedia/qvideoframe_wrapper.cpp
     ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtMultimedia/qtmultimedia_module_wrapper.cpp
 )
+set(QtMultimedia_typesystem_path "${QtCore_SOURCE_DIR}${PATH_SEP}${QtCore_BINARY_DIR}${PATH_SEP}${QtGui_SOURCE_DIR}${PATH_SEP}${QtGui_BINARY_DIR}")
 
-execute_generator(multimedia QtMultimedia_SRC "${CMAKE_CURRENT_BINARY_DIR}:${QtCore_SOURCE_DIR}:${QtGui_SOURCE_DIR}:${QtGui_BINARY_DIR}")
+set(QtMultimedia_include_dirs   ${CMAKE_CURRENT_SOURCE_DIR}
+                                ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtMultimedia/
+                                ${QT_INCLUDE_DIR}
+                                ${QT_QTCORE_INCLUDE_DIR}
+                                ${QT_QTGUI_INCLUDE_DIR}
+                                ${QT_QTMULTIMEDIA_INCLUDE_DIR}
+                                ${SHIBOKEN_INCLUDE_DIR}
+                                ${libpyside_SOURCE_DIR}
+                                ${SHIBOKEN_PYTHON_INCLUDE_DIR}
+                                ${QtCore_BINARY_DIR}/PySide/QtCore/
+                                ${QtGui_BINARY_DIR}/PySide/QtGui/)
 
-include_directories(${CMAKE_CURRENT_SOURCE_DIR}
-                    ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtMultimedia/
-                    ${QT_INCLUDE_DIR}
-                    ${QT_QTCORE_INCLUDE_DIR}
-                    ${QT_QTGUI_INCLUDE_DIR}
-                    ${QT_QTMULTIMEDIA_INCLUDE_DIR}
-                    ${SHIBOKEN_INCLUDE_DIR}
-                    ${libpyside_SOURCE_DIR}
-                    ${PYTHON_INCLUDE_PATH}
-                    ${QtCore_BINARY_DIR}/PySide/QtCore/
-                    ${QtGui_BINARY_DIR}/PySide/QtGui/
-                    )
+set(QtMultimedia_libraries  pyside
+                            ${SHIBOKEN_PYTHON_LIBRARIES}
+                            ${SHIBOKEN_LIBRARY}
+                            ${QT_QTMULTIMEDIA_LIBRARY}
+                            ${QT_QTGUI_LIBRARY})
 
-add_library(QtMultimedia MODULE ${QtMultimedia_SRC})
-set_property(TARGET QtMultimedia PROPERTY PREFIX "")
-target_link_libraries(QtMultimedia
-                      pyside
-                      ${PYTHON_LIBRARIES}
-                      ${SHIBOKEN_LIBRARY}
-                      ${QT_QTMULTIMEDIA_LIBRARY}
-                      ${QT_QTGUI_LIBRARY}
-                      )
-add_dependencies(QtMultimedia QtGui)
+set(QtMultimedia_deps QtGui)
 
-# install
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/QtMultimedia${CMAKE_DEBUG_POSTFIX}.so
-        DESTINATION ${SITE_PACKAGE}/PySide)
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtMultimedia/pyside_qtmultimedia_python.h
-        DESTINATION include/PySide/QtMultimedia/)
+create_pyside_module(QtMultimedia
+                     QtMultimedia_include_dirs
+                     QtMultimedia_libraries
+                     QtMultimedia_deps
+                     QtMultimedia_typesystem_path
+                     QtMultimedia_SRC
+                     "")
diff --git a/PySide/QtMultimedia/typesystem_multimedia.xml b/PySide/QtMultimedia/typesystem_multimedia.xml
index 1786e70..b1a684f 100644
--- a/PySide/QtMultimedia/typesystem_multimedia.xml
+++ b/PySide/QtMultimedia/typesystem_multimedia.xml
@@ -1,26 +1,44 @@
 <?xml version="1.0"?>
+<!--
+    This file is part of PySide project.
+    Copyright (C) 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
+    Contact: PySide team <contact@pyside.org>
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+-->
 <typesystem package="PySide.QtMultimedia">
   <load-typesystem name="typesystem_gui.xml" generate="no" />
 
   <rejection class="" function-name="qobject_cast&lt;QAudioEngineFactoryInterface*&gt;"/>
   <rejection class="" function-name="qobject_interface_iid&lt;QAudioEngineFactoryInterface*&gt;"/>
 
-  <namespace-type name="QAudio"/>
-  <enum-type name="QAudio::Error"/>
-  <enum-type name="QAudio::Mode"/>
-  <enum-type name="QAudio::State"/>
-  <enum-type name="QAbstractVideoBuffer::HandleType"/>
-  <enum-type name="QAbstractVideoBuffer::MapMode"/>
-  <enum-type name="QAbstractVideoSurface::Error"/>
-  <enum-type name="QAudioFormat::Endian"/>
-  <enum-type name="QAudioFormat::SampleType"/>
-  <enum-type name="QVideoFrame::FieldType"/>
-  <enum-type name="QVideoFrame::PixelFormat"/>
-  <enum-type name="QVideoSurfaceFormat::Direction"/>
-  <enum-type name="QVideoSurfaceFormat::YCbCrColorSpace"/>
+  <namespace-type name="QAudio">
+      <enum-type name="Error"/>
+      <enum-type name="Mode"/>
+      <enum-type name="State"/>
+  </namespace-type>
 
-  <value-type name="QVideoSurfaceFormat"/>
+  <value-type name="QVideoSurfaceFormat">
+      <enum-type name="Direction"/>
+      <enum-type name="YCbCrColorSpace"/>
+  </value-type>
   <object-type name="QAbstractVideoBuffer">
+      <enum-type name="HandleType"/>
+      <enum-type name="MapMode"/>
+      <modify-function signature="map(QAbstractVideoBuffer::MapMode, int*, int*)" remove="all"/>
+      <!-- TODO: discuss a way to have this working with the virtual method.
       <modify-function signature="map(QAbstractVideoBuffer::MapMode, int*, int*)">
           <modify-argument index="0">
               <replace-type modified-type="PyObject"/>
@@ -35,11 +53,20 @@
               <insert-template name="fix_arg,int*,int*"/>
           </inject-code>
       </modify-function>
+      -->
+  </object-type>
+  <object-type name="QAbstractVideoSurface">
+      <enum-type name="Error"/>
+  </object-type>
+  <object-type name="QVideoFrame">
+      <enum-type name="FieldType"/>
+      <enum-type name="PixelFormat"/>
   </object-type>
-  <object-type name="QAbstractVideoSurface"/>
-  <object-type name="QVideoFrame"/>
 
-  <value-type name="QAudioFormat"/>
+  <value-type name="QAudioFormat">
+      <enum-type name="Endian"/>
+      <enum-type name="SampleType"/>
+  </value-type>
   <value-type name="QAudioDeviceInfo"/>
   <object-type name="QAbstractAudioDeviceInfo"/>
 
diff --git a/PySide/QtNetwork/CMakeLists.txt b/PySide/QtNetwork/CMakeLists.txt
index e66fa37..c18d70a 100644
--- a/PySide/QtNetwork/CMakeLists.txt
+++ b/PySide/QtNetwork/CMakeLists.txt
@@ -1,52 +1,5 @@
 project(QtNetwork)
 
-# Check QtNetwork support
-macro(CHECK_QT_NETWORK_MACRO macro_display_name qt_macro module_sources global_sources)
-    if (DEFINED PYSIDE_${qt_macro})
-        if (PYSIDE_${qt_macro})
-            list(APPEND ${global_sources} ${${module_sources}})
-        endif()
-    else()
-        set(SRC_FILE ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/test${qt_macro}.cxx)
-        file(WRITE ${SRC_FILE}
-        "#include <QtNetwork>\n"
-        "int main() { \n"
-        "#ifdef ${qt_macro}\n"
-        "#error not supported.\n"
-        "#endif\n"
-        "}\n")
-
-        try_compile(Q_WORKS ${CMAKE_BINARY_DIR}
-                    ${SRC_FILE}
-                    CMAKE_FLAGS
-                    -DINCLUDE_DIRECTORIES:STRING=${QT_QTNETWORK_INCLUDE_DIR}\;${QT_INCLUDE_DIR}
-                    -DLINK_LIBRARIES:PATH=${QT_QTNETWORK_LIBRARY_RELEASE}
-                    OUTPUT_VARIABLE OUTPUT)
-
-        set("PYSIDE_${qt_macro}" ${Q_WORKS} CACHE STRING "Has this Qt module been found by pyside?")
-        if(Q_WORKS)
-            message(STATUS "Testing support to ${macro_display_name} -- enabled")
-            list(APPEND ${global_sources} ${${module_sources}})
-        else()
-            message(STATUS "Testing support to ${macro_display_name} -- disabled")
-        endif()
-    endif()
-endmacro(CHECK_QT_NETWORK_MACRO)
-
-
-if(Q_WS_X11)
-    set(MODULE_NAME network_x11)
-    set(SPECIFIC_OS_FILES
-       )
-
-elseif(Q_WS_MAC)
-    set(MODULE_NAME network_mac)
-    set(SPECIFIC_OS_FILES
-       )
-else()
-    message(FATAL_ERROR "OS not supported")
-endif(Q_WS_X11)
-
 if (${QT_VERSION_MAJOR} EQUAL 4 AND ${QT_VERSION_MINOR} GREATER 6)
     set (QtNetwork_47_SRC
         ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtNetwork/qnetworkconfiguration_wrapper.cpp
@@ -57,25 +10,39 @@ else()
     set(QtNetwork_47_SRC )
 endif ()
 
+set(QtNetwork_OPTIONAL_SRC )
+set(QtNetwork_DROPPED_ENTRIES )
+check_qt_class(QtNetwork QSslCertificate    QtNetwork_OPTIONAL_SRC QtNetwork_DROPPED_ENTRIES)
+check_qt_class(QtNetwork QSslCipher         QtNetwork_OPTIONAL_SRC QtNetwork_DROPPED_ENTRIES)
+check_qt_class(QtNetwork QSslConfiguration  QtNetwork_OPTIONAL_SRC QtNetwork_DROPPED_ENTRIES)
+check_qt_class(QtNetwork QSslError          QtNetwork_OPTIONAL_SRC QtNetwork_DROPPED_ENTRIES)
+check_qt_class(QtNetwork QSslKey            QtNetwork_OPTIONAL_SRC QtNetwork_DROPPED_ENTRIES)
+check_qt_class(QtNetwork QSslSocket         QtNetwork_OPTIONAL_SRC QtNetwork_DROPPED_ENTRIES)
+
 set(QtNetwork_SRC
+${CMAKE_CURRENT_BINARY_DIR}/PySide/QtNetwork/qabstractnetworkcache_wrapper.cpp
 ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtNetwork/qabstractsocket_wrapper.cpp
 ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtNetwork/qauthenticator_wrapper.cpp
 ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtNetwork/qftp_wrapper.cpp
 ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtNetwork/qhostaddress_wrapper.cpp
 ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtNetwork/qhostinfo_wrapper.cpp
+${CMAKE_CURRENT_BINARY_DIR}/PySide/QtNetwork/qhttp_wrapper.cpp
 ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtNetwork/qhttpheader_wrapper.cpp
 ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtNetwork/qhttprequestheader_wrapper.cpp
 ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtNetwork/qhttpresponseheader_wrapper.cpp
-${CMAKE_CURRENT_BINARY_DIR}/PySide/QtNetwork/qhttp_wrapper.cpp
 ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtNetwork/qipv6address_wrapper.cpp
 ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtNetwork/qlocalserver_wrapper.cpp
 ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtNetwork/qlocalsocket_wrapper.cpp
 ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtNetwork/qnetworkaccessmanager_wrapper.cpp
 ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtNetwork/qnetworkaddressentry_wrapper.cpp
-${CMAKE_CURRENT_BINARY_DIR}/PySide/QtNetwork/qnetworkcookiejar_wrapper.cpp
+${CMAKE_CURRENT_BINARY_DIR}/PySide/QtNetwork/qnetworkcachemetadata_wrapper.cpp
 ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtNetwork/qnetworkcookie_wrapper.cpp
+${CMAKE_CURRENT_BINARY_DIR}/PySide/QtNetwork/qnetworkcookiejar_wrapper.cpp
+${CMAKE_CURRENT_BINARY_DIR}/PySide/QtNetwork/qnetworkdiskcache_wrapper.cpp
 ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtNetwork/qnetworkinterface_wrapper.cpp
 ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtNetwork/qnetworkproxy_wrapper.cpp
+${CMAKE_CURRENT_BINARY_DIR}/PySide/QtNetwork/qnetworkproxyfactory_wrapper.cpp
+${CMAKE_CURRENT_BINARY_DIR}/PySide/QtNetwork/qnetworkproxyquery_wrapper.cpp
 ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtNetwork/qnetworkreply_wrapper.cpp
 ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtNetwork/qnetworkrequest_wrapper.cpp
 ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtNetwork/qssl_wrapper.cpp
@@ -84,44 +51,33 @@ ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtNetwork/qtcpsocket_wrapper.cpp
 ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtNetwork/qtnetwork_module_wrapper.cpp
 ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtNetwork/qudpsocket_wrapper.cpp
 ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtNetwork/qurlinfo_wrapper.cpp
-${SPECIFIC_OS_FILES}
+
 ${QtNetwork_47_SRC}
+${QtNetwork_OPTIONAL_SRC}
 )
 
-set(OPENSSL_SOURCES
-    ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtNetwork/qsslcipher_wrapper.cpp
-    ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtNetwork/qsslkey_wrapper.cpp
-    ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtNetwork/qsslconfiguration_wrapper.cpp
-    ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtNetwork/qsslerror_wrapper.cpp
-    ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtNetwork/qsslsocket_wrapper.cpp
-)
+set(QtNetwork_typesystem_path "${QtCore_SOURCE_DIR}${PATH_SEP}${QtCore_BINARY_DIR}")
+set(QtNetwork_include_dirs  ${CMAKE_CURRENT_SOURCE_DIR}
+                            ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtNetwork/
+                            ${QT_INCLUDE_DIR}
+                            ${QT_QTNETWORK_INCLUDE_DIR}
+                            ${SHIBOKEN_INCLUDE_DIR}
+                            ${libpyside_SOURCE_DIR}
+                            ${SHIBOKEN_PYTHON_INCLUDE_DIR}
+                            ${QtCore_BINARY_DIR}/PySide/QtCore/)
+set(QtNetwork_libraries pyside
+                        ${SHIBOKEN_PYTHON_LIBRARIES}
+                        ${SHIBOKEN_LIBRARY}
+                        ${QT_QTNETWORK_LIBRARY})
 
-CHECK_QT_NETWORK_MACRO("Network OPENSSL" QT_NO_OPENSSL OPENSSL_SOURCES QtNetwork_SRC)
+set(QtNetwork_deps QtCore)
 
-execute_generator(network QtNetwork_SRC "${CMAKE_CURRENT_SOURCE_DIR}:${QtCore_SOURCE_DIR}")
-
-include_directories(${CMAKE_CURRENT_SOURCE_DIR}
-                    ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtNetwork/
-                    ${QT_INCLUDE_DIR}
-                    ${QT_QTNETWORK_INCLUDE_DIR}
-                    ${SHIBOKEN_INCLUDE_DIR}
-                    ${libpyside_SOURCE_DIR}
-                    ${PYTHON_INCLUDE_PATH}
-                    ${QtCore_BINARY_DIR}/PySide/QtCore/
-                    )
-
-add_library(QtNetwork MODULE ${QtNetwork_SRC})
-set_property(TARGET QtNetwork PROPERTY PREFIX "")
-target_link_libraries(QtNetwork
-                      pyside
-                      ${PYTHON_LIBRARIES}
-                      ${SHIBOKEN_LIBRARY}
-                      ${QT_QTNETWORK_LIBRARY}
-                      )
-add_dependencies(QtNetwork QtCore)
-
-# install
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/QtNetwork${CMAKE_DEBUG_POSTFIX}.so
-        DESTINATION ${SITE_PACKAGE}/PySide)
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtNetwork/pyside_qtnetwork_python.h
-        DESTINATION include/PySide/QtNetwork/)
+create_pyside_module(QtNetwork
+                     QtNetwork_include_dirs
+                     QtNetwork_libraries
+                     QtNetwork_deps
+                     QtNetwork_typesystem_path
+                     QtNetwork_SRC
+                     ""
+                     ""
+                     QtNetwork_DROPPED_ENTRIES)
diff --git a/PySide/QtNetwork/glue/qudpsocket_read_datagram_glue.cpp b/PySide/QtNetwork/glue/qudpsocket_read_datagram_glue.cpp
deleted file mode 100644
index 95ece51..0000000
--- a/PySide/QtNetwork/glue/qudpsocket_read_datagram_glue.cpp
+++ /dev/null
@@ -1,6 +0,0 @@
-    char data[%ARGUMENT_NAMES];
-    QHostAddress ha;
-    quint16 port;
-
-    %RETURN_TYPE retval = %CPPSELF.%FUNCTION_NAME(data, %ARGUMENT_NAMES, &ha, &port);
-    %PYARG_0 = Shiboken::makeTuple(QByteArray(data, retval), ha, port);
diff --git a/PySide/QtNetwork/typesystem_network.xml b/PySide/QtNetwork/typesystem_network.xml
index d3f330e..a8327cd 100644
--- a/PySide/QtNetwork/typesystem_network.xml
+++ b/PySide/QtNetwork/typesystem_network.xml
@@ -1,50 +1,45 @@
 <?xml version="1.0"?>
+<!--
+    This file is part of PySide project.
+    Copyright (C) 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
+    Contact: PySide team <contact@pyside.org>
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+-->
 <typesystem package="PySide.QtNetwork">
   <load-typesystem name="typesystem_core.xml" generate="no"/>
 
     <namespace-type name="QSsl">
+        <enum-type name="AlternateNameEntryType"/>
+        <enum-type name="EncodingFormat"/>
+        <enum-type name="KeyAlgorithm"/>
+        <enum-type name="KeyType"/>
+        <enum-type name="SslProtocol"/>
         <extra-includes>
             <include file-name="qssl.h" location="global"/>
         </extra-includes>
     </namespace-type>
 
     <rejection class="QIPv6Address" field-name="c"/>
-    <rejection class="QSslCertificate"/>
-    <enum-type name="QAbstractSocket::NetworkLayerProtocol"/>
-    <enum-type name="QAbstractSocket::SocketError"/>
-    <enum-type name="QAbstractSocket::SocketOption"/>
-    <enum-type name="QAbstractSocket::SocketState"/>
-    <enum-type name="QAbstractSocket::SocketType"/>
-    <enum-type name="QFtp::Command"/>
-    <enum-type name="QFtp::Error"/>
-    <enum-type name="QFtp::State"/>
-    <enum-type name="QFtp::TransferMode"/>
-    <enum-type name="QFtp::TransferType"/>
-    <enum-type name="QHostAddress::SpecialAddress"/>
-    <enum-type name="QHttp::Error"/>
-    <enum-type name="QHttp::State"/>
-    <enum-type name="QHttp::ConnectionMode"/>
-    <enum-type name="QNetworkInterface::InterfaceFlag" flags="QNetworkInterface::InterfaceFlags"/>
-    <enum-type name="QNetworkProxy::Capability"/>
-    <enum-type name="QNetworkProxy::ProxyType"/>
-    <enum-type name="QUdpSocket::BindFlag" flags="QUdpSocket::BindMode"/>
-    <enum-type name="QUrlInfo::PermissionSpec"/>
-    <enum-type name="QHostInfo::HostInfoError"/>
-    <enum-type name="QSsl::KeyType"/>
-    <enum-type name="QSsl::EncodingFormat"/>
-    <enum-type name="QSsl::KeyAlgorithm"/>
-    <enum-type name="QSsl::AlternateNameEntryType"/>
-    <enum-type name="QSsl::SslProtocol"/>
-    <enum-type name="QLocalSocket::LocalSocketError"/>
-    <enum-type name="QLocalSocket::LocalSocketState"/>
-    <enum-type name="QNetworkAccessManager::Operation"/>
-    <enum-type name="QNetworkCookie::RawForm"/>
-    <enum-type name="QNetworkReply::NetworkError"/>
-    <enum-type name="QNetworkRequest::Attribute" extensible="yes"/>
-    <enum-type name="QNetworkRequest::CacheLoadControl"/>
-    <enum-type name="QNetworkRequest::KnownHeaders"/>
 
     <object-type name="QAbstractSocket">
+        <enum-type name="NetworkLayerProtocol"/>
+        <enum-type name="SocketError"/>
+        <enum-type name="SocketOption" since="4.6"/>
+        <enum-type name="SocketState"/>
+        <enum-type name="SocketType"/>
         <modify-function signature="connectToHost(const QString&amp;, quint16, QFlags&lt;QIODevice::OpenModeFlag>)" allow-thread="yes" />
         <modify-function signature="connectToHost(const QHostAddress&amp;, quint16, QFlags&lt;QIODevice::OpenModeFlag>)" allow-thread="yes" />
         <modify-function signature="disconnectFromHost()" allow-thread="yes" />
@@ -53,6 +48,11 @@
     </object-type>
 
     <object-type name="QFtp">
+        <enum-type name="Command"/>
+        <enum-type name="Error"/>
+        <enum-type name="State"/>
+        <enum-type name="TransferMode"/>
+        <enum-type name="TransferType"/>
         <modify-function signature="connectToHost(const QString&amp;, quint16)" allow-thread="yes" />
         <modify-function signature="login(const QString&amp;, const QString&amp;)" allow-thread="yes" />
         <modify-function signature="close()" allow-thread="yes" />
@@ -81,7 +81,9 @@
     </object-type>
 
     <object-type name="QHttp">
-        <modify-function signature="closeConnection()" remove="all"/>
+        <enum-type name="ConnectionMode"/>
+        <enum-type name="Error"/>
+        <enum-type name="State"/>
         <modify-function signature="readAll()" allow-thread="yes"/>
         <modify-function signature="read(char*, qint64)" allow-thread="yes">
           <modify-argument index="return">
@@ -94,6 +96,9 @@
             <insert-template name="read_wrapper"/>
           </inject-code>
         </modify-function>
+        <!-- ### Obsolete methods -->
+        <modify-function signature="closeConnection()" remove="all"/>
+        <!-- ### -->
     </object-type>
     <object-type name="QTcpServer">
         <modify-function signature="waitForNewConnection(int,bool*)" allow-thread="yes">
@@ -106,7 +111,7 @@
                 <remove-argument/>
             </modify-argument>
             <modify-argument index="return">
-                <replace-type modified-type="PyTuple*"/>
+                <replace-type modified-type="(retval, timeOut)"/>
             </modify-argument>
             <inject-code class="target" position="beginning">
                 <insert-template name="fix_args,bool*"/>
@@ -115,6 +120,7 @@
     </object-type>
     <object-type name="QTcpSocket"/>
     <object-type name="QUdpSocket">
+        <enum-type name="BindFlag" flags="BindMode"/>
         <modify-function signature="readDatagram(char*, qint64, QHostAddress*, quint16*)" allow-thread="yes">
             <modify-argument index="1">
                 <remove-argument/>
@@ -128,19 +134,29 @@
                 <remove-argument/>
             </modify-argument>
             <modify-argument index="return">
-                <replace-type modified-type="PyTuple*"/>
+                <replace-type modified-type="(data, address, port)"/>
             </modify-argument>
-            <inject-code class="target" position="beginning" file="glue/qudpsocket_read_datagram_glue.cpp"/>
+            <inject-code class="target" position="beginning">
+            Shiboken::AutoArrayPointer&lt;char&gt; data(%ARGUMENT_NAMES);
+            QHostAddress ha;
+            quint16 port;
+            %BEGIN_ALLOW_THREADS
+            %RETURN_TYPE retval = %CPPSELF.%FUNCTION_NAME(data, %ARGUMENT_NAMES, &amp;ha, &amp;port);
+            %END_ALLOW_THREADS
+            QByteArray ba(data, retval);
+            %PYARG_0 = PyTuple_New(3);
+            PyTuple_SET_ITEM(%PYARG_0, 0, %CONVERTTOPYTHON[QByteArray](ba));
+            PyTuple_SET_ITEM(%PYARG_0, 1, %CONVERTTOPYTHON[QHostAddress](ha));
+            PyTuple_SET_ITEM(%PYARG_0, 2, %CONVERTTOPYTHON[quint16](port));
+            </inject-code>
         </modify-function>
-        <modify-function signature="writeDatagram(const char*,qint64,const QHostAddress&amp;,quint16)" remove="all"/>
         <modify-function signature="writeDatagram(const QByteArray&amp;, const QHostAddress&amp;, quint16)" allow-thread="yes"/>
+        <!-- ### writeDatagram(QByteArray, ...) does the trick -->
+        <modify-function signature="writeDatagram(const char*,qint64,const QHostAddress&amp;,quint16)" remove="all"/>
+        <!-- ### -->
     </object-type>
 
-    <object-type name="QHttpHeader">
-        <modify-function signature="operator=(QHttpHeader)" remove="all"/>
-
-        <modify-function signature="QHttpHeader(QHttpHeader)" remove="all"/>
-    </object-type>
+    <object-type name="QHttpHeader" />
     <object-type name="QLocalServer">
         <modify-function signature="waitForNewConnection(int,bool*)" allow-thread="yes">
             <!-- FIXME -->
@@ -155,13 +171,30 @@
                 <insert-template name="fix_args,bool*"/>
             </inject-code>
             <modify-argument index="return">
-                <replace-type modified-type="PyTuple*"/>
+                <replace-type modified-type="(retval, timeOut)"/>
             </modify-argument>
 
         </modify-function>
     </object-type>
-    <object-type name="QLocalSocket"/>
+    <object-type name="QLocalSocket">
+        <enum-type name="LocalSocketError"/>
+        <enum-type name="LocalSocketState"/>
+    </object-type>
     <object-type name="QNetworkAccessManager">
+        <enum-type name="NetworkAccessibility" since="4.7"/>
+        <enum-type name="Operation"/>
+        <modify-function signature="createRequest(QNetworkAccessManager::Operation, const QNetworkRequest&amp;, QIODevice *)">
+          <modify-argument index="3" invalidate-after-use="yes"/>
+          <modify-argument index="return">
+            <define-ownership class="target" owner="default"/>
+          </modify-argument>
+        </modify-function>
+        <modify-function signature="get(const QNetworkRequest&amp;)" allow-thread="yes"/>
+        <modify-function signature="post(const QNetworkRequest &amp;, QIODevice *)" allow-thread="yes"/>
+        <modify-function signature="post(const QNetworkRequest &amp;, const QByteArray &amp;)" allow-thread="yes"/>
+        <modify-function signature="put(const QNetworkRequest &amp;, QIODevice *)" allow-thread="yes"/>
+        <modify-function signature="put(const QNetworkRequest &amp;, const QByteArray &amp;)" allow-thread="yes"/>
+        <modify-function signature="sendCustomRequest(const QNetworkRequest &amp;, const QByteArray &amp;, QIODevice *)" allow-thread="yes" since="4.7" />
         <modify-function signature="setCookieJar(QNetworkCookieJar*)">
             <modify-argument index="1">
                 <define-ownership class="target" owner="c++"/>
@@ -169,99 +202,143 @@
         </modify-function>
     </object-type>
     <object-type name="QNetworkCookieJar"/>
-    <object-type name="QNetworkReply"/>
+    <object-type name="QNetworkReply">
+        <enum-type name="NetworkError"/>
+    </object-type>
 
     <value-type name="QHostAddress" hash-function="qHash">
+        <enum-type name="SpecialAddress"/>
+        <!-- ### QHostAddress(QIPv6Address) does this -->
         <modify-function signature="QHostAddress(quint8*)" remove="all" />
-        <modify-function signature="operator=(QString)" remove="all"/>
-        <modify-function signature="operator=(QHostAddress)" remove="all"/>
+        <!-- ### -->
+        <modify-function signature="setAddress(quint8*)" remove="all" />
     </value-type>
 
     <value-type name="QHostInfo">
-        <modify-function signature="operator=(QHostInfo)" remove="all"/>
+        <enum-type name="HostInfoError"/>
         <modify-function signature="lookupHost(QString,QObject*,const char*)" access="private"/>
     </value-type>
 
-    <value-type name="QHttpRequestHeader">
-        <modify-function signature="operator=(QHttpRequestHeader)" remove="all"/>
-    </value-type>
+    <value-type name="QHttpRequestHeader" />
 
-    <value-type name="QHttpResponseHeader">
-        <modify-function signature="operator=(QHttpResponseHeader)" remove="all"/>
-    </value-type>
+    <value-type name="QHttpResponseHeader" />
 
-    <value-type name="QNetworkAddressEntry">
-        <modify-function signature="operator=(QNetworkAddressEntry)" remove="all"/>
-    </value-type>
+    <value-type name="QNetworkAddressEntry" />
 
     <value-type name="QNetworkInterface">
-        <modify-function signature="operator=(QNetworkInterface)" remove="all"/>
+        <enum-type name="InterfaceFlag" flags="InterfaceFlags"/>
     </value-type>
 
     <value-type name="QNetworkProxy">
-        <modify-function signature="operator=(QNetworkProxy)" remove="all"/>
+        <enum-type name="Capability" flags="Capabilities" />
+        <enum-type name="ProxyType"/>
+    </value-type>
+
+    <object-type name="QNetworkProxyFactory" />
+    <value-type name="QNetworkProxyQuery">
+        <enum-type name="QueryType" />
     </value-type>
 
     <value-type name="QUrlInfo">
-        <modify-function signature="operator=(QUrlInfo)" remove="all"/>
+        <enum-type name="PermissionSpec"/>
     </value-type>
 
     <value-type name="QIPv6Address">
-        <modify-function signature="operator[](int)const">
-            <remove/>
-        </modify-function>
-        <modify-function signature="operator[](int)">
-            <remove/>
-        </modify-function>
+        <add-function signature="__len__">
+            <inject-code class="target" position="beginning">
+                return 16;
+            </inject-code>
+        </add-function>
+        <add-function signature="__getitem__">
+            <inject-code class="target" position="beginning">
+            if (_i >= 16) {
+                PyErr_SetString(PyExc_IndexError, "index out of bounds");
+                return 0;
+            }
+            if (_i &lt; 0)
+                _i = 16 - qAbs(_i);
+
+            uint item = %CPPSELF.c[_i];
+            return %CONVERTTOPYTHON[uint](item);
+            </inject-code>
+        </add-function>
+        <add-function signature="__len__">
+            <inject-code class="target" position="beginning">
+                return 16;
+            </inject-code>
+        </add-function>
+        <add-function signature="__setitem__">
+            <inject-code class="target" position="beginning">
+            if (_i >= 16) {
+                PyErr_SetString(PyExc_IndexError, "index out of bounds");
+                return -1;
+            }
+            if (_i &lt; 0)
+                _i = 16 - qAbs(_i);
+            quint8 item = %CONVERTTOCPP[quint8](_value);
+            %CPPSELF.c[_i] = item;
+            return 0;
+            </inject-code>
+        </add-function>
     </value-type>
 
-    <value-type name="QAuthenticator">
-        <modify-function signature="operator=(QAuthenticator)" remove="all"/>
-    </value-type>
+    <value-type name="QAuthenticator" />
     <value-type name="QNetworkCookie">
-        <modify-function signature="operator=(QNetworkCookie)" remove="all"/>
-
+        <enum-type name="RawForm"/>
         <extra-includes>
             <include file-name="QDateTime" location="global"/>
         </extra-includes>
     </value-type>
     <value-type name="QNetworkRequest">
-        <modify-function signature="operator=(QNetworkRequest)" remove="all"/>
+        <enum-type name="Attribute" extensible="yes"/>
+        <enum-type name="LoadControl" since="4.7"/>
+        <enum-type name="Priority" since="4.7"/>
+        <enum-type name="CacheLoadControl"/>
+        <enum-type name="KnownHeaders"/>
     </value-type>
 
-    <enum-type name="QSslError::SslError"/>
-    <enum-type name="QSslCertificate::SubjectInfo"/>
-    <enum-type name="QSslSocket::SslMode"/>
-    <enum-type name="QSslSocket::PeerVerifyMode"/>
-
-    <value-type name="QSslCipher"/>
-    <value-type name="QSslError"/>
-    <value-type name="QSslKey"/>
     <!-- TODO QSslCertificate requires QMultiMap which isn't implemented yet
     <value-type name="QSslCertificate"/>
     -->
-    <value-type name="QSslConfiguration"/>
+    <enum-type name="QSslCertificate::SubjectInfo"/>
 
+    <!-- Qt 4.7 -->
+    <value-type name="QNetworkConfiguration" since="4.7">
+        <enum-type name="BearerType" />
+        <enum-type name="Purpose" since="4.7"/>
+        <enum-type name="StateFlag" flags="StateFlags" since="4.7"/>
+        <enum-type name="Type" since="4.7"/>
+    </value-type>
+    <object-type name="QNetworkConfigurationManager" since="4.7">
+        <enum-type name="Capability" flags="Capabilities" since="4.7"/>
+    </object-type>
+    <object-type name="QNetworkSession" since="4.7">
+        <enum-type name="SessionError" since="4.7"/>
+        <enum-type name="State" since="4.7"/>
+    </object-type>
+
+    <object-type name="QAbstractNetworkCache"/>
+    <object-type name="QNetworkDiskCache"/>
+    <value-type name="QNetworkCacheMetaData"/>
+
+    <suppress-warning text="Shadowing: QAbstractSocket::*"/>
+
+
+    <!-- The following entries may be present in the system or not. Keep this section organized. -->
+    <value-type name="QSslCertificate"/>
+    <value-type name="QSslCipher"/>
+    <value-type name="QSslConfiguration"/>
+    <value-type name="QSslError">
+        <enum-type name="SslError"/>
+    </value-type>
+
+    <value-type name="QSslKey"/>
     <object-type name="QSslSocket">
+        <enum-type name="SslMode"/>
+        <enum-type name="PeerVerifyMode"/>
         <modify-function signature="connectToHostEncrypted(const QString&amp;, quint16, QFlags&lt;QIODevice::OpenModeFlag>)" allow-thread="yes" />
         <modify-function signature="waitForEncrypted(int)" allow-thread="yes" />
     </object-type>
-
-
-    <!-- Qt 4.7 -->
-    <enum-type name="QNetworkConfiguration::Purpose" since="4.7"/>
-    <enum-type name="QNetworkConfiguration::StateFlag" flags="QNetworkConfiguration::StateFlags" since="4.7"/>
-    <enum-type name="QNetworkConfiguration::Type" since="4.7"/>
-    <enum-type name="QNetworkConfigurationManager::Capability" flags="QNetworkConfigurationManager::Capabilities" since="4.7"/>
-    <enum-type name="QNetworkSession::SessionError" since="4.7"/>
-    <enum-type name="QNetworkSession::State" since="4.7"/>
-    <enum-type name="QNetworkAccessManager::NetworkAccessibility" since="4.7"/>
-    <enum-type name="QNetworkRequest::Priority" since="4.7"/>
-    <enum-type name="QNetworkRequest::LoadControl" since="4.7"/>
-
-    <value-type name="QNetworkConfiguration" since="4.7"/>
-    <object-type name="QNetworkConfigurationManager" since="4.7"/>
-    <object-type name="QNetworkSession" since="4.7"/>
-
-    <suppress-warning text="Shadowing: QAbstractSocket::*"/>
+    <!-- The above entries may be present in the system or not. Keep this section organized. -->
 </typesystem>
+
diff --git a/PySide/QtOpenGL/CMakeLists.txt b/PySide/QtOpenGL/CMakeLists.txt
index 1d79e6c..3f977db 100644
--- a/PySide/QtOpenGL/CMakeLists.txt
+++ b/PySide/QtOpenGL/CMakeLists.txt
@@ -32,31 +32,27 @@ set(QtOpenGL_SRC
     ${QtOpenGL_47_SRC}
 )
 
-execute_generator(opengl QtOpenGL_SRC "${CMAKE_CURRENT_BINARY_DIR}:${QtCore_SOURCE_DIR}:${QtGui_BINARY_DIR}:${QtGui_SOURCE_DIR}:${QtOpenGL_SOURCE_DIR}")
-
-include_directories(${CMAKE_CURRENT_SOURCE_DIR}
-                    ${QT_QTCORE_INCLUDE_DIR}
-                    ${QT_QTGUI_INCLUDE_DIR}
-                    ${QT_QTOPENGL_INCLUDE_DIR}
-                    ${PYTHON_INCLUDE_PATH}
-                    ${SHIBOKEN_INCLUDE_DIR}
-                    ${libpyside_SOURCE_DIR}
-                    ${QtGui_BINARY_DIR}/PySide/QtGui/
-                    ${QtCore_BINARY_DIR}/PySide/QtCore/
-                    ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtOpenGL)
-add_library(QtOpenGL MODULE ${QtOpenGL_SRC})
-set_target_properties(QtOpenGL PROPERTIES PREFIX "")
-target_link_libraries(QtOpenGL
-                      pyside
-                      ${PYTHON_LIBRARIES}
-                      ${QT_QTCORE_LIBRARY}
-                      ${QT_QTGUI_LIBRARY}
-                      ${QT_QTOPENGL_LIBRARY})
-add_dependencies(QtOpenGL QtGui)
-
-# install
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/QtOpenGL${CMAKE_DEBUG_POSTFIX}.so
-        DESTINATION ${SITE_PACKAGE}/PySide)
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtOpenGL/pyside_qtopengl_python.h
-        DESTINATION include/PySide/QtOpenGL/)
-
+set(QtOpenGL_typesystem_path "${QtCore_SOURCE_DIR}${PATH_SEP}${QtCore_BINARY_DIR}${PATH_SEP}${QtGui_SOURCE_DIR}${PATH_SEP}${QtOpenGL_SOURCE_DIR}${PATH_SEP}${QtGui_BINARY_DIR}")
+set(QtOpenGL_include_dirs   ${CMAKE_CURRENT_SOURCE_DIR}
+                            ${QT_QTCORE_INCLUDE_DIR}
+                            ${QT_QTGUI_INCLUDE_DIR}
+                            ${QT_QTOPENGL_INCLUDE_DIR}
+                            ${SHIBOKEN_PYTHON_INCLUDE_DIR}
+                            ${SHIBOKEN_INCLUDE_DIR}
+                            ${libpyside_SOURCE_DIR}
+                            ${QtGui_BINARY_DIR}/PySide/QtGui/
+                            ${QtCore_BINARY_DIR}/PySide/QtCore/
+                            ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtOpenGL)
+set(QtOpenGL_libraries      pyside
+                            ${SHIBOKEN_PYTHON_LIBRARIES}
+                            ${QT_QTCORE_LIBRARY}
+                            ${QT_QTGUI_LIBRARY}
+                            ${QT_QTOPENGL_LIBRARY})
+set(QtOpenGL_deps QtGui)
+create_pyside_module(QtOpenGL
+                    QtOpenGL_include_dirs
+                    QtOpenGL_libraries
+                    QtOpenGL_deps
+                    QtOpenGL_typesystem_path
+                    QtOpenGL_SRC
+                    "")
diff --git a/PySide/QtOpenGL/typesystem_opengl.xml b/PySide/QtOpenGL/typesystem_opengl.xml
index c2f3ba3..60a2d18 100644
--- a/PySide/QtOpenGL/typesystem_opengl.xml
+++ b/PySide/QtOpenGL/typesystem_opengl.xml
@@ -1,35 +1,65 @@
 <?xml version="1.0"?>
+<!--
+    This file is part of PySide project.
+    Copyright (C) 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
+    Contact: PySide team <contact@pyside.org>
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+-->
 <typesystem package="PySide.QtOpenGL">
   <load-typesystem name="typesystem_gui.xml" generate="no" />
 
-  <rejection class="QGLColormap::QGLColormapData"/>
-  <rejection class="QGLWidget" function-name="setMouseTracking"/>
+  <primitive-type name="GLbitfield"/>
+  <primitive-type name="GLboolean"/>
+  <primitive-type name="GLbyte"/>
+  <primitive-type name="GLclampd"/>
+  <primitive-type name="GLclampf"/>
+  <primitive-type name="GLdouble"/>
+  <primitive-type name="GLenum"/>
+  <primitive-type name="GLfloat"/>
+  <primitive-type name="GLint"/>
+  <primitive-type name="GLshort"/>
+  <primitive-type name="GLsizei"/>
+  <primitive-type name="GLubyte"/>
+  <primitive-type name="GLuint"/>
+  <primitive-type name="GLushort"/>
 
-  <enum-type name="QGL::FormatOption" flags="QGL::FormatOptions" force-integer="yes"/>
-  <enum-type name="QGLContext::BindOption" flags="QGLContext::BindOptions"/>
-  <enum-type name="QGLFormat::OpenGLVersionFlag" flags="QGLFormat::OpenGLVersionFlags"/>
-  <enum-type name="QGLFramebufferObject::Attachment"/>
-  <enum-type name="QGLShader::ShaderTypeBit" flags="QGLShader::ShaderType"/>
+  <rejection class="QGLColormap::QGLColormapData"/>
+  <rejection class="QGLContext" field-name="currentCtx"/>
 
   <namespace-type name="QGL">
+    <enum-type name="FormatOption" flags="FormatOptions" force-integer="yes"/>
     <extra-includes>
         <include file-name="qgl.h" location="global"/>
     </extra-includes>
   </namespace-type>
 
   <value-type name="QGLColormap">
-    <modify-function signature="operator=(QGLColormap)" remove="all"/>
-
     <modify-function signature="setEntries(int,const unsigned int*,int)">
         <access modifier="private"/>
     </modify-function>
   </value-type>
 
   <value-type name="QGLFormat">
-    <modify-function signature="operator=(QGLFormat)" remove="all"/>
+    <enum-type name="OpenGLContextProfile" since="4.7"/>
+    <enum-type name="OpenGLVersionFlag" flags="OpenGLVersionFlags"/>
   </value-type>
 
+  <rejection class="QGLContext" field-name="currentCtx" />
   <object-type name="QGLContext">
+    <enum-type name="BindOption" flags="BindOptions" since="4.6"/>
     <modify-function signature="chooseContext(const QGLContext*)">
         <modify-argument index="1" invalidate-after-use="yes"/>
     </modify-function>
@@ -37,18 +67,14 @@
         <modify-argument index="1" invalidate-after-use="yes"/>
     </modify-function>
 
-    <modify-function signature="getProcAddress(QString)const">
-        <remove/>
-    </modify-function>
-    <modify-field name="currentCtx" read="false" write="false"/>
-    <modify-function signature="setDevice(QPaintDevice*)">
-        <remove/>
-    </modify-function>
+    <!-- ### Obsolete functions and ctors -->
     <modify-function signature="generateFontDisplayLists(QFont, int)" remove="all"/>
-    <modify-function signature="tryVisual(const QGLFormat&amp;, int)" remove="all"/>
-    <modify-function signature="chooseVisual()" remove="all"/>
+    <modify-function signature="QGLContext(const QGLFormat&amp;, QPaintDevice*)" remove="all" />
+    <!-- ### -->
+  </object-type>
+  <object-type name="QGLFramebufferObject">
+    <enum-type name="Attachment"/>
   </object-type>
-  <object-type name="QGLFramebufferObject"/>
   <object-type name="QGLPixelBuffer">
     <extra-includes>
         <include file-name="QImage" location="global"/>
@@ -67,80 +93,645 @@
         <parent index="2" action="add"/>
       </modify-argument>
     </modify-function>
-    <!--- Obsolete -->
+    <!-- ### Not part of Qt public API -->
     <modify-function signature="setContext(QGLContext*,const QGLContext*,bool)" remove="all" />
+    <!-- ### -->
+    <!--- ### Obsolete functions -->
     <modify-function signature="fontDisplayListBase(QFont, int)" remove="all"/>
     <modify-function signature="setFormat(QGLFormat)" remove="all"/>
+    <!-- ### -->
   </object-type>
 
-  <value-type name="QGLFramebufferObjectFormat"/>
-  <object-type name="QGLShader"/>
-  <object-type name="QGLShaderProgram">
-    <!-- use QMatrixZxY overloads -->
-    <modify-function signature="setUniformValue(int, Array)" remove="all" />
-    <modify-function signature="setUniformValue(const char*, Array)" remove="all" />
-    <modify-function signature="setAttributeValue(int,const float*,int,int)" remove="all" />
-    <modify-function signature="setAttributeValue(const char*,const float*,int,int)" remove="all" />
-    <modify-function signature="setAttributeArray(int, uint, const void*, int, int)" remove="all" since="4.7" />
-    <modify-function signature="setAttributeArray(const char*, uint, const void*, int, int)" remove="all" since="4.7" />
+  <value-type name="QGLFramebufferObjectFormat" since="4.6"/>
+  <object-type name="QGLShader" since="4.6">
+    <enum-type name="ShaderTypeBit" flags="ShaderType"/>
+  </object-type>
+
+  <template name="callArrayFunction">
+      int _size = PySequence_Size(%PYARG_2);
+      if (_size) {
+          $ATTR_TYPE *_list = new $ATTR_TYPE[_size];
+          if (_size) {
+            Shiboken::AutoDecRef fast(PySequence_Fast(%PYARG_2, "Failed to parse sequence with type %VECTOR_TYPE."));
+            for(int i=0; i &lt; _size; i++) {
+                PyObject* pv = PySequence_Fast_GET_ITEM(fast.object(), i);
+                _list[i] = %CONVERTTOCPP[$ATTR_TYPE](pv);
+            }
+          }
+          %CPPSELF.%FUNCTION_NAME(%1, _list, $ARG0);
+          delete[] _list;
+       } else {
+          %CPPSELF.%FUNCTION_NAME(%1, ($ATTR_TYPE*)NULL, $ARG1);
+       }
+  </template>
+
+  <object-type name="QGLShaderProgram" since="4.6">
+    <!-- setAttributeArray -->
+    <modify-function signature="setAttributeArray(int, const QVector2D*, int)" rename="setAttributeArray2D">
+        <modify-argument index="2" >
+            <replace-type modified-type="PySequence" />
+        </modify-argument>
+        <inject-code>
+            <insert-template name="callArrayFunction">
+                <replace from="$ARG0" to="%3" />
+                <replace from="$ARG1" to="%3" />
+                <replace from="$ATTR_TYPE" to="QVector2D"/>
+            </insert-template>
+        </inject-code>
+    </modify-function>
+
+    <modify-function signature="setAttributeArray(int, const QVector3D*, int)" rename="setAttributeArray3D">
+        <modify-argument index="2" >
+            <replace-type modified-type="PySequence" />
+        </modify-argument>
+        <inject-code>
+            <insert-template name="callArrayFunction">
+                <replace from="$ARG0" to="%3" />
+                <replace from="$ARG1" to="%3" />
+                <replace from="$ATTR_TYPE" to="QVector3D"/>
+            </insert-template>
+        </inject-code>
+    </modify-function>
+
+    <modify-function signature="setAttributeArray(int, const QVector4D*, int)" rename="setAttributeArray4D">
+        <modify-argument index="2" >
+            <replace-type modified-type="PySequence" />
+        </modify-argument>
+        <inject-code>
+            <insert-template name="callArrayFunction">
+                <replace from="$ARG0" to="%3" />
+                <replace from="$ARG1" to="%3" />
+                <replace from="$ATTR_TYPE" to="QVector4D"/>
+            </insert-template>
+        </inject-code>
+    </modify-function>
+
+    <modify-function signature="setAttributeArray(const char*, const QVector2D*, int)" rename="setAttributeArray2D">
+        <modify-argument index="2" >
+            <replace-type modified-type="PySequence" />
+        </modify-argument>
+        <inject-code>
+            <insert-template name="callArrayFunction">
+                <replace from="$ARG0" to="%3" />
+                <replace from="$ARG1" to="%3" />
+                <replace from="$ATTR_TYPE" to="QVector2D"/>
+            </insert-template>
+        </inject-code>
+    </modify-function>
+
+    <modify-function signature="setAttributeArray(const char*, const QVector3D*, int)" rename="setAttributeArray3D">
+        <modify-argument index="2" >
+            <replace-type modified-type="PySequence" />
+        </modify-argument>
+        <inject-code>
+            <insert-template name="callArrayFunction">
+                <replace from="$ARG0" to="%3" />
+                <replace from="$ARG1" to="%3" />
+                <replace from="$ATTR_TYPE" to="QVector3D"/>
+            </insert-template>
+        </inject-code>
+    </modify-function>
+
+    <modify-function signature="setAttributeArray(const char*, const QVector4D*, int)" rename="setAttributeArray4D">
+        <modify-argument index="2" >
+            <replace-type modified-type="PySequence" />
+        </modify-argument>
+        <inject-code>
+            <insert-template name="callArrayFunction">
+                <replace from="$ARG0" to="%3" />
+                <replace from="$ARG1" to="%3" />
+                <replace from="$ATTR_TYPE" to="QVector4D"/>
+            </insert-template>
+        </inject-code>
+    </modify-function>
+
+    <!-- setUniformValueArray -->
+    <modify-function signature="setUniformValueArray(int, const GLint*, int)" rename="setUniformValueArrayInt">
+        <modify-argument index="2" >
+            <replace-type modified-type="PySequence" />
+        </modify-argument>
+        <modify-argument index="3">
+             <remove-argument />
+        </modify-argument>
+        <inject-code>
+            <insert-template name="callArrayFunction">
+                <replace from="$ARG0" to="_size" />
+                <replace from="$ARG1" to="0" />
+                <replace from="$ATTR_TYPE" to="GLint"/>
+            </insert-template>
+        </inject-code>
+    </modify-function>
+
+    <modify-function signature="setUniformValueArray(int, const GLuint*, int)" rename="setUniformValueArrayUint">
+        <modify-argument index="2" >
+            <replace-type modified-type="PySequence" />
+        </modify-argument>
+        <modify-argument index="3">
+             <remove-argument />
+        </modify-argument>
+        <inject-code>
+            <insert-template name="callArrayFunction">
+                <replace from="$ARG0" to="_size" />
+                <replace from="$ARG1" to="0" />
+                <replace from="$ATTR_TYPE" to="GLuint"/>
+            </insert-template>
+        </inject-code>
+    </modify-function>
+
+    <modify-function signature="setUniformValueArray(int, const QVector2D*, int)" rename="setUniformValueArray2D">
+        <modify-argument index="2" >
+            <replace-type modified-type="PySequence" />
+        </modify-argument>
+        <modify-argument index="3">
+             <remove-argument />
+        </modify-argument>
+        <inject-code>
+            <insert-template name="callArrayFunction">
+                <replace from="$ARG0" to="_size" />
+                <replace from="$ARG1" to="0" />
+                <replace from="$ATTR_TYPE" to="QVector2D"/>
+            </insert-template>
+        </inject-code>
+    </modify-function>
+
+    <modify-function signature="setUniformValueArray(int, const QVector3D*, int)" rename="setUniformValueArray3D">
+        <modify-argument index="2" >
+            <replace-type modified-type="PySequence" />
+        </modify-argument>
+        <modify-argument index="3">
+             <remove-argument />
+        </modify-argument>
+        <inject-code>
+            <insert-template name="callArrayFunction">
+                <replace from="$ARG0" to="_size" />
+                <replace from="$ARG1" to="0" />
+                <replace from="$ATTR_TYPE" to="QVector3D"/>
+            </insert-template>
+        </inject-code>
+    </modify-function>
+
+    <modify-function signature="setUniformValueArray(int, const QVector4D*, int)" rename="setUniformValueArray4D">
+        <modify-argument index="2" >
+            <replace-type modified-type="PySequence" />
+        </modify-argument>
+        <modify-argument index="3">
+             <remove-argument />
+        </modify-argument>
+        <inject-code>
+            <insert-template name="callArrayFunction">
+                <replace from="$ARG0" to="_size" />
+                <replace from="$ARG1" to="0" />
+                <replace from="$ATTR_TYPE" to="QVector4D"/>
+            </insert-template>
+        </inject-code>
+    </modify-function>
+
+    <modify-function signature="setUniformValueArray(int, const QMatrix2x2*, int)" rename="setUniformValueArray2x2">
+        <modify-argument index="2" >
+            <replace-type modified-type="PySequence" />
+        </modify-argument>
+        <modify-argument index="3">
+             <remove-argument />
+        </modify-argument>
+        <inject-code>
+            <insert-template name="callArrayFunction">
+                <replace from="$ARG0" to="_size" />
+                <replace from="$ARG1" to="0" />
+                <replace from="$ATTR_TYPE" to="QMatrix2x2"/>
+            </insert-template>
+        </inject-code>
+    </modify-function>
+
+    <modify-function signature="setUniformValueArray(int, const QMatrix2x3*, int)" rename="setUniformValueArray2x3">
+        <modify-argument index="2" >
+            <replace-type modified-type="PySequence" />
+        </modify-argument>
+        <modify-argument index="3">
+             <remove-argument />
+        </modify-argument>
+        <inject-code>
+            <insert-template name="callArrayFunction">
+                <replace from="$ARG0" to="_size" />
+                <replace from="$ARG1" to="0" />
+                <replace from="$ATTR_TYPE" to="QMatrix2x3"/>
+            </insert-template>
+        </inject-code>
+    </modify-function>
+
+    <modify-function signature="setUniformValueArray(int, const QMatrix2x4*, int)" rename="setUniformValueArray2x4">
+        <modify-argument index="2" >
+            <replace-type modified-type="PySequence" />
+        </modify-argument>
+        <modify-argument index="3">
+             <remove-argument />
+        </modify-argument>
+        <inject-code>
+            <insert-template name="callArrayFunction">
+                <replace from="$ARG0" to="_size" />
+                <replace from="$ARG1" to="0" />
+                <replace from="$ATTR_TYPE" to="QMatrix2x4"/>
+            </insert-template>
+        </inject-code>
+    </modify-function>
+
+    <modify-function signature="setUniformValueArray(int, const QMatrix3x2*, int)" rename="setUniformValueArray3x2">
+        <modify-argument index="2" >
+            <replace-type modified-type="PySequence" />
+        </modify-argument>
+        <modify-argument index="3">
+             <remove-argument />
+        </modify-argument>
+        <inject-code>
+            <insert-template name="callArrayFunction">
+                <replace from="$ARG0" to="_size" />
+                <replace from="$ARG1" to="0" />
+                <replace from="$ATTR_TYPE" to="QMatrix3x2"/>
+            </insert-template>
+        </inject-code>
+    </modify-function>
+
+    <modify-function signature="setUniformValueArray(int, const QMatrix3x3*, int)" rename="setUniformValueArray3x3">
+        <modify-argument index="2" >
+            <replace-type modified-type="PySequence" />
+        </modify-argument>
+        <modify-argument index="3">
+             <remove-argument />
+        </modify-argument>
+        <inject-code>
+            <insert-template name="callArrayFunction">
+                <replace from="$ARG0" to="_size" />
+                <replace from="$ARG1" to="0" />
+                <replace from="$ATTR_TYPE" to="QMatrix3x3"/>
+            </insert-template>
+        </inject-code>
+    </modify-function>
+
+    <modify-function signature="setUniformValueArray(int, const QMatrix3x4*, int)" rename="setUniformValueArray3x4">
+        <modify-argument index="2" >
+            <replace-type modified-type="PySequence" />
+        </modify-argument>
+        <modify-argument index="3">
+             <remove-argument />
+        </modify-argument>
+        <inject-code>
+            <insert-template name="callArrayFunction">
+                <replace from="$ARG0" to="_size" />
+                <replace from="$ARG1" to="0" />
+                <replace from="$ATTR_TYPE" to="QMatrix3x4"/>
+            </insert-template>
+        </inject-code>
+    </modify-function>
+
+    <modify-function signature="setUniformValueArray(int, const QMatrix4x2*, int)" rename="setUniformValueArray4x2">
+        <modify-argument index="2" >
+            <replace-type modified-type="PySequence" />
+        </modify-argument>
+        <modify-argument index="3">
+             <remove-argument />
+        </modify-argument>
+        <inject-code>
+            <insert-template name="callArrayFunction">
+                <replace from="$ARG0" to="_size" />
+                <replace from="$ARG1" to="0" />
+                <replace from="$ATTR_TYPE" to="QMatrix4x2"/>
+            </insert-template>
+        </inject-code>
+    </modify-function>
+
+    <modify-function signature="setUniformValueArray(int, const QMatrix4x3*, int)" rename="setUniformValueArray4x3">
+        <modify-argument index="2" >
+            <replace-type modified-type="PySequence" />
+        </modify-argument>
+        <modify-argument index="3">
+             <remove-argument />
+        </modify-argument>
+        <inject-code>
+            <insert-template name="callArrayFunction">
+                <replace from="$ARG0" to="_size" />
+                <replace from="$ARG1" to="0" />
+                <replace from="$ATTR_TYPE" to="QMatrix4x3"/>
+            </insert-template>
+        </inject-code>
+    </modify-function>
+
+    <modify-function signature="setUniformValueArray(int, const QMatrix4x4*, int)" rename="setUniformValueArray4x4">
+        <modify-argument index="2" >
+            <replace-type modified-type="PySequence" />
+        </modify-argument>
+        <modify-argument index="3">
+             <remove-argument />
+        </modify-argument>
+        <inject-code>
+            <insert-template name="callArrayFunction">
+                <replace from="$ARG0" to="_size" />
+                <replace from="$ARG1" to="0" />
+                <replace from="$ATTR_TYPE" to="QMatrix4x4"/>
+            </insert-template>
+        </inject-code>
+    </modify-function>
+
+    <modify-function signature="setUniformValueArray(const char*, const GLint*, int)" rename="setUniformValueArrayInt">
+        <modify-argument index="2" >
+            <replace-type modified-type="PySequence" />
+        </modify-argument>
+        <modify-argument index="3">
+             <remove-argument />
+        </modify-argument>
+        <inject-code>
+            <insert-template name="callArrayFunction">
+                <replace from="$ARG0" to="_size" />
+                <replace from="$ARG1" to="0" />
+                <replace from="$ATTR_TYPE" to="GLint"/>
+            </insert-template>
+        </inject-code>
+    </modify-function>
+
+    <modify-function signature="setUniformValueArray(const char*, const GLuint*, int)" rename="setUniformValueArrayUint">
+        <modify-argument index="2" >
+            <replace-type modified-type="PySequence" />
+        </modify-argument>
+        <modify-argument index="3">
+             <remove-argument />
+        </modify-argument>
+        <inject-code>
+            <insert-template name="callArrayFunction">
+                <replace from="$ARG0" to="_size" />
+                <replace from="$ARG1" to="0" />
+                <replace from="$ATTR_TYPE" to="GLuint"/>
+            </insert-template>
+        </inject-code>
+    </modify-function>
+
+    <modify-function signature="setUniformValueArray(const char*, const QVector2D*, int)" rename="setUniformValueArray2D">
+        <modify-argument index="2" >
+            <replace-type modified-type="PySequence" />
+        </modify-argument>
+        <modify-argument index="3">
+             <remove-argument />
+        </modify-argument>
+        <inject-code>
+            <insert-template name="callArrayFunction">
+                <replace from="$ARG0" to="_size" />
+                <replace from="$ARG1" to="0" />
+                <replace from="$ATTR_TYPE" to="QVector2D"/>
+            </insert-template>
+        </inject-code>
+    </modify-function>
+
+    <modify-function signature="setUniformValueArray(const char*, const QVector3D*, int)" rename="setUniformValueArray3D">
+        <modify-argument index="2" >
+            <replace-type modified-type="PySequence" />
+        </modify-argument>
+        <modify-argument index="3">
+             <remove-argument />
+        </modify-argument>
+        <inject-code>
+            <insert-template name="callArrayFunction">
+                <replace from="$ARG0" to="_size" />
+                <replace from="$ARG1" to="0" />
+                <replace from="$ATTR_TYPE" to="QVector3D"/>
+            </insert-template>
+        </inject-code>
+    </modify-function>
+
+    <modify-function signature="setUniformValueArray(const char*, const QVector4D*, int)" rename="setUniformValueArray4D">
+        <modify-argument index="2" >
+            <replace-type modified-type="PySequence" />
+        </modify-argument>
+        <modify-argument index="3">
+             <remove-argument />
+        </modify-argument>
+        <inject-code>
+            <insert-template name="callArrayFunction">
+                <replace from="$ARG0" to="_size" />
+                <replace from="$ARG1" to="0" />
+                <replace from="$ATTR_TYPE" to="QVector4D"/>
+            </insert-template>
+        </inject-code>
+    </modify-function>
+
+    <modify-function signature="setUniformValueArray(const char*, const QMatrix2x2*, int)" rename="setUniformValueArray2x2">
+        <modify-argument index="2" >
+            <replace-type modified-type="PySequence" />
+        </modify-argument>
+        <modify-argument index="3">
+             <remove-argument />
+        </modify-argument>
+        <inject-code>
+            <insert-template name="callArrayFunction">
+                <replace from="$ARG0" to="_size" />
+                <replace from="$ARG1" to="0" />
+                <replace from="$ATTR_TYPE" to="QMatrix2x2"/>
+            </insert-template>
+        </inject-code>
+    </modify-function>
+
+    <modify-function signature="setUniformValueArray(const char*, const QMatrix2x3*, int)" rename="setUniformValueArray2x3">
+        <modify-argument index="2" >
+            <replace-type modified-type="PySequence" />
+        </modify-argument>
+        <modify-argument index="3">
+             <remove-argument />
+        </modify-argument>
+        <inject-code>
+            <insert-template name="callArrayFunction">
+                <replace from="$ARG0" to="_size" />
+                <replace from="$ARG1" to="0" />
+                <replace from="$ATTR_TYPE" to="QMatrix2x3"/>
+            </insert-template>
+        </inject-code>
+    </modify-function>
+
+    <modify-function signature="setUniformValueArray(const char*, const QMatrix2x4*, int)" rename="setUniformValueArray2x4">
+        <modify-argument index="2" >
+            <replace-type modified-type="PySequence" />
+        </modify-argument>
+        <modify-argument index="3">
+             <remove-argument />
+        </modify-argument>
+        <inject-code>
+            <insert-template name="callArrayFunction">
+                <replace from="$ARG0" to="_size" />
+                <replace from="$ARG1" to="0" />
+                <replace from="$ATTR_TYPE" to="QMatrix2x4"/>
+            </insert-template>
+        </inject-code>
+    </modify-function>
+
+    <modify-function signature="setUniformValueArray(const char*, const QMatrix3x2*, int)" rename="setUniformValueArray3x2">
+        <modify-argument index="2" >
+            <replace-type modified-type="PySequence" />
+        </modify-argument>
+        <modify-argument index="3">
+             <remove-argument />
+        </modify-argument>
+        <inject-code>
+            <insert-template name="callArrayFunction">
+                <replace from="$ARG0" to="_size" />
+                <replace from="$ARG1" to="0" />
+                <replace from="$ATTR_TYPE" to="QMatrix3x2"/>
+            </insert-template>
+        </inject-code>
+    </modify-function>
+
+    <modify-function signature="setUniformValueArray(const char*, const QMatrix3x3*, int)" rename="setUniformValueArray3x3">
+        <modify-argument index="2" >
+            <replace-type modified-type="PySequence" />
+        </modify-argument>
+        <modify-argument index="3">
+             <remove-argument />
+        </modify-argument>
+        <inject-code>
+            <insert-template name="callArrayFunction">
+                <replace from="$ARG0" to="_size" />
+                <replace from="$ARG1" to="0" />
+                <replace from="$ATTR_TYPE" to="QMatrix3x3"/>
+            </insert-template>
+        </inject-code>
+    </modify-function>
+
+    <modify-function signature="setUniformValueArray(const char*, const QMatrix3x4*, int)" rename="setUniformValueArray3x4">
+        <modify-argument index="2" >
+            <replace-type modified-type="PySequence" />
+        </modify-argument>
+        <modify-argument index="3">
+             <remove-argument />
+        </modify-argument>
+        <inject-code>
+            <insert-template name="callArrayFunction">
+                <replace from="$ARG0" to="_size" />
+                <replace from="$ARG1" to="0" />
+                <replace from="$ATTR_TYPE" to="QMatrix3x4"/>
+            </insert-template>
+        </inject-code>
+    </modify-function>
+
+    <modify-function signature="setUniformValueArray(const char*, const QMatrix4x2*, int)" rename="setUniformValueArray4x2">
+        <modify-argument index="2" >
+            <replace-type modified-type="PySequence" />
+        </modify-argument>
+        <modify-argument index="3">
+             <remove-argument />
+        </modify-argument>
+        <inject-code>
+            <insert-template name="callArrayFunction">
+                <replace from="$ARG0" to="_size" />
+                <replace from="$ARG1" to="0" />
+                <replace from="$ATTR_TYPE" to="QMatrix4x2"/>
+            </insert-template>
+        </inject-code>
+    </modify-function>
+
+    <modify-function signature="setUniformValueArray(const char*, const QMatrix4x3*, int)" rename="setUniformValueArray4x3">
+        <modify-argument index="2" >
+            <replace-type modified-type="PySequence" />
+        </modify-argument>
+        <modify-argument index="3">
+             <remove-argument />
+        </modify-argument>
+        <inject-code>
+            <insert-template name="callArrayFunction">
+                <replace from="$ARG0" to="_size" />
+                <replace from="$ARG1" to="0" />
+                <replace from="$ATTR_TYPE" to="QMatrix4x3"/>
+            </insert-template>
+        </inject-code>
+    </modify-function>
+
+    <modify-function signature="setUniformValueArray(const char*, const QMatrix4x4*, int)" rename="setUniformValueArray4x4">
+        <modify-argument index="2" >
+            <replace-type modified-type="PySequence" />
+        </modify-argument>
+        <modify-argument index="3">
+             <remove-argument />
+        </modify-argument>
+        <inject-code>
+            <insert-template name="callArrayFunction">
+                <replace from="$ARG0" to="_size" />
+                <replace from="$ARG1" to="0" />
+                <replace from="$ATTR_TYPE" to="QMatrix4x4"/>
+            </insert-template>
+        </inject-code>
+    </modify-function>
+
+    <!-- ### TODO: must evaluate if anything other than removal should be done. -->
+    <modify-function signature="setAttributeArray(int,const GLfloat*,int,int)" remove="all" />
+    <modify-function signature="setAttributeArray(const char*,const GLfloat*,int,int)" remove="all" />
+    <modify-function signature="setUniformValueArray(int,const GLfloat*,int,int)" remove="all" />
+    <modify-function signature="setUniformValueArray(const char*,const GLfloat*,int,int)" remove="all" />
+    <!-- ### -->
+
+    <!-- ### Use QMatrixZxY overloads -->
+    <modify-function signature="setUniformValue(int,Array)" remove="all" />
+    <modify-function signature="setUniformValue(const char*,Array)" remove="all" />
+    <modify-function signature="setAttributeValue(int,const GLfloat*,int,int)" remove="all" />
+    <modify-function signature="setAttributeValue(const char*,const GLfloat*,int,int)" remove="all" />
+    <modify-function signature="setAttributeArray(int, GLenum, const void*, int, int)" remove="all" since="4.7" />
+    <modify-function signature="setAttributeArray(const char*, GLenum, const void*, int, int)" remove="all" since="4.7" />
+    <!-- ### -->
   </object-type>
 
   <!-- Qt 4.7 -->
-  <enum-type name="QGLFormat::OpenGLContextProfile" since="4.7"/>
-  <enum-type name="QGLBuffer::Access" since="4.7"/>
-  <enum-type name="QGLBuffer::Type" since="4.7"/>
-  <enum-type name="QGLBuffer::UsagePattern" since="4.7"/>
-
   <object-type name="QGLBuffer" since="4.7">
+    <enum-type name="Access" since="4.7"/>
+    <enum-type name="Type" since="4.7"/>
+    <enum-type name="UsagePattern" since="4.7"/>
     <modify-function signature="allocate(const void*, int)">
       <modify-argument index="1">
-        <replace-type modified-type="const QByteArray&amp;"/>
+        <replace-type modified-type="QByteArray&amp;"/>
       </modify-argument>
       <modify-argument index="2">
         <replace-default-expression with="-1"/>
       </modify-argument>
       <inject-code class="target" position="beginning">
-        int size = %2;
-        if (size &lt; 0)
-            size = %1->size();
-        %CPPSELF.allocate((const void*) %1->data(), size);
+        int size = (%2 &lt; 0) ? %1.size() : %2;
+        %CPPSELF.allocate((const void*) %1.data(), size);
       </inject-code>
     </modify-function>
     <modify-function signature="map(QGLBuffer::Access)">
-      <inject-code class="target" position="beginning">
-        void *data = %CPPSELF.map(%1);
-        QByteArray ret;
-        if (data)
-            ret.append((const char*)data, %CPPSELF.size());
-        %PYARG_0 = %CONVERTTOPYTHON[QByteArray](ret);
+      <inject-code>
+        Py_ssize_t dataSize = %CPPSELF.size();
+        void* data = %CPPSELF.map(%1);
+
+        if (!data) {
+            Py_INCREF(Py_None);
+            %PYARG_0 = Py_None;
+        } else if (%1 == QGLBuffer::ReadOnly) {
+            %PYARG_0 = Shiboken::Buffer::newObject(data, dataSize, Shiboken::Buffer::ReadOnly);
+        } else {
+            %PYARG_0 = Shiboken::Buffer::newObject(data, dataSize, Shiboken::Buffer::ReadWrite);
+        }
       </inject-code>
     </modify-function>
     <modify-function signature="read(int, void*, int)">
       <modify-argument index="2">
         <remove-argument/>
       </modify-argument>
+      <modify-argument index="return">
+        <replace-type modified-type="(retval, data)"/>
+      </modify-argument>
       <inject-code class="target" position="beginning">
         char *data = new char[%3];
         bool result = %CPPSELF.read(%1, data, %3);
         QByteArray ret;
         if (result)
             ret.append((const char*)data, %3);
-        %PYARG_0 = Shiboken::makeTuple(result, ret);
+        %PYARG_0 = PyTuple_New(2);
+        PyTuple_SET_ITEM(%PYARG_0, 0, %CONVERTTOPYTHON[bool](result));
+        PyTuple_SET_ITEM(%PYARG_0, 1, %CONVERTTOPYTHON[QByteArray](ret));
         delete[] data;
       </inject-code>
     </modify-function>
     <modify-function signature="write(int, const void*, int)">
       <modify-argument index="2">
-        <replace-type modified-type="const QByteArray&amp;"/>
+        <replace-type modified-type="QByteArray&amp;"/>
       </modify-argument>
       <modify-argument index="3">
         <replace-default-expression with="-1"/>
       </modify-argument>
       <inject-code class="target" position="beginning">
-        int size = %3;
-        if (size &lt; 0)
-            size = %2->size();
-        %CPPSELF.write(%1, (const void*) %2->data(), size);
+        int size = (%3 &lt; 0) ? %2.size() : %3;
+        %CPPSELF.write(%1, (const void*) %2.data(), size);
       </inject-code>
     </modify-function>
   </object-type>
diff --git a/PySide/QtScript/CMakeLists.txt b/PySide/QtScript/CMakeLists.txt
index 6419439..48dc85f 100644
--- a/PySide/QtScript/CMakeLists.txt
+++ b/PySide/QtScript/CMakeLists.txt
@@ -1,10 +1,10 @@
 project(QtScript)
 
-if (${QT_VERSION_MAJOR} EQUAL 4 AND ${QT_VERSION_MINOR} LESS 6)
-    set (QtCore_46_SRC )
+if (${QT_VERSION_MAJOR} EQUAL 4 AND ${QT_VERSION_MINOR} LESS 7)
+    set (QtScript_47_SRC )
 else()
-    set(QtScript_46_SRC
-    ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtScript/qscriptprogram_wrapper.cpp
+    set(QtScript_47_SRC
+        ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtScript/qscriptprogram_wrapper.cpp
     )
 endif()
 
@@ -22,33 +22,28 @@ ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtScript/qscriptextensionplugin_wrapper.cpp
 ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtScript/qscriptstring_wrapper.cpp
 ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtScript/qscriptvalue_wrapper.cpp
 ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtScript/qscriptvalueiterator_wrapper.cpp
-${QtScript_46_SRC}
+${QtScript_47_SRC}
 )
 
-execute_generator(script QtScript_SRC "${CMAKE_CURRENT_BINARY_DIR}:${QtCore_SOURCE_DIR}")
-
-include_directories(${CMAKE_CURRENT_SOURCE_DIR}
-                    ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtScript
-                    ${QT_INCLUDE_DIR}
-                    ${QT_QTSCRIPT_INCLUDE_DIR}
-                    ${SHIBOKEN_INCLUDE_DIR}
-                    ${libpyside_SOURCE_DIR}
-                    ${PYTHON_INCLUDE_PATH}
-                    ${QtCore_BINARY_DIR}/PySide/QtCore
-                    )
-add_library(QtScript MODULE ${QtScript_SRC})
-set_property(TARGET QtScript PROPERTY PREFIX "")
-target_link_libraries(QtScript
-                      pyside
-                      ${PYTHON_LIBRARIES}
-                      ${SHIBOKEN_LIBRARY}
-                      ${QT_QTCORE_LIBRARY}
-                      ${QT_QTSCRIPT_LIBRARY}
-                      )
-add_dependencies(QtScript QtCore)
-
-# install
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/QtScript${CMAKE_DEBUG_POSTFIX}.so DESTINATION ${SITE_PACKAGE}/PySide)
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtScript/pyside_qtscript_python.h
-        DESTINATION include/PySide/QtScript/)
-
+set(QtScript_typesystem_path "${QtCore_SOURCE_DIR}${PATH_SEP}${QtCore_BINARY_DIR}")
+set(QtScript_include_dirs   ${CMAKE_CURRENT_SOURCE_DIR}
+                            ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtScript
+                            ${QT_INCLUDE_DIR}
+                            ${QT_QTSCRIPT_INCLUDE_DIR}
+                            ${SHIBOKEN_INCLUDE_DIR}
+                            ${libpyside_SOURCE_DIR}
+                            ${SHIBOKEN_PYTHON_INCLUDE_DIR}
+                            ${QtCore_BINARY_DIR}/PySide/QtCore )
+set(QtScript_libraries      pyside
+                            ${SHIBOKEN_PYTHON_LIBRARIES}
+                            ${SHIBOKEN_LIBRARY}
+                            ${QT_QTCORE_LIBRARY}
+                            ${QT_QTSCRIPT_LIBRARY})
+set(QtScript_deps QtCore)
+create_pyside_module(QtScript
+                     QtScript_include_dirs
+                     QtScript_libraries
+                     QtScript_deps
+                     QtScript_typesystem_path
+                     QtScript_SRC
+                     "")
diff --git a/PySide/QtScript/typesystem_script.xml b/PySide/QtScript/typesystem_script.xml
index 81ba5b3..d787b22 100644
--- a/PySide/QtScript/typesystem_script.xml
+++ b/PySide/QtScript/typesystem_script.xml
@@ -1,31 +1,115 @@
 <?xml version="1.0"?>
+<!--
+    This file is part of PySide project.
+    Copyright (C) 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
+    Contact: PySide team <contact@pyside.org>
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+-->
 <typesystem package="PySide.QtScript">
     <load-typesystem name="typesystem_core.xml" generate="no" />
 
-    <enum-type name="QScriptContext::Error"/>
-    <enum-type name="QScriptContext::ExecutionState"/>
-    <enum-type name="QScriptContextInfo::FunctionType"/>
-    <enum-type name="QScriptEngine::ValueOwnership"/>
-    <enum-type name="QScriptEngine::QObjectWrapOption" flags="QScriptEngine::QObjectWrapOptions"/>
-    <enum-type name="QScriptEngineAgent::Extension"/>
-    <enum-type name="QScriptValue::ResolveFlag"/>
-    <enum-type name="QScriptValue::PropertyFlag"/>
-    <enum-type name="QScriptValue::SpecialValue"/>
-    <enum-type name="QScriptClass::QueryFlag"/>
-    <enum-type name="QScriptClass::Extension"/>
-
     <object-type name="QScriptable"/>
-    <object-type name="QScriptClass"/>
+    <object-type name="QScriptClass">
+        <enum-type name="Extension"/>
+        <enum-type name="QueryFlag"/>
+    </object-type>
     <object-type name="QScriptClassPropertyIterator"/>
-    <object-type name="QScriptContext"/>
-    <value-type name="QScriptContextInfo"/>
-    <object-type name="QScriptEngineAgent"/>
-    <object-type name="QScriptEngine"/>
+    <object-type name="QScriptContext">
+        <enum-type name="Error"/>
+        <enum-type name="ExecutionState"/>
+    </object-type>
+    <value-type name="QScriptContextInfo">
+        <enum-type name="FunctionType"/>
+    </value-type>
+    <object-type name="QScriptEngineAgent">
+        <enum-type name="Extension"/>
+    </object-type>
+    <object-type name="QScriptEngine">
+        <enum-type name="QObjectWrapOption" flags="QObjectWrapOptions"/>
+        <enum-type name="ValueOwnership"/>
+        <!-- Not supported BUG #957-->
+        <modify-function signature="scriptValueFromQMetaObject()" remove="all" />
+    </object-type>
     <object-type name="QScriptExtensionInterface"/>
     <object-type name="QScriptExtensionPlugin"/>
-    <object-type name="QScriptProgram"/>
-    <value-type name="QScriptString"/>
-    <value-type name="QScriptValue"/>
-    <object-type name="QScriptValueIterator"/>
+    <value-type name="QScriptProgram" since="4.7"/>
+    <value-type name="QScriptString">
+        <modify-function signature="toArrayIndex(bool*)const">
+            <modify-argument index="1">
+                <remove-argument/>
+            </modify-argument>
+            <inject-code class="target" position="beginning">
+                <insert-template name="fix_bool*"/>
+            </inject-code>
+        </modify-function>
+    </value-type>
+    <value-type name="QScriptValue">
+        <enum-type name="PropertyFlag" flags="PropertyFlags"/>
+        <enum-type name="ResolveFlag" flags="ResolveFlags"/>
+        <enum-type name="SpecialValue"/>
+        <add-function signature="__repr__" return-type="PyObject*">
+            <inject-code class="target" position="beginning">
+                if (%CPPSELF.isVariant() || %CPPSELF.isString()) {
+                    QString format = QString().sprintf("%s(\"%s\")", ((PyObject*)%PYSELF)->ob_type->tp_name, qPrintable(%CPPSELF.toString()));
+                    %PYARG_0 = Shiboken::String::fromCString(qPrintable(format));
+                 } else {
+                    %PYARG_0 = Shiboken::String::fromCString(
+                                    ((PyObject* )%PYSELF)->ob_type->tp_name);
+                }
+            </inject-code>
+        </add-function>
+        <add-function signature="__mgetitem__">
+            <inject-code>
+                Shiboken::AutoDecRef key(PyObject_Str(_key));
+                QVariant res = %CPPSELF.property(Shiboken::String::toCString(key.object())).toVariant();
+                if (res.isValid()) {
+                    return %CONVERTTOPYTHON[QVariant](res);
+                } else {
+                    PyObject* errorType = PyInt_Check(_key) ? PyExc_IndexError : PyExc_KeyError;
+                    PyErr_SetString(errorType, "Key not found.");
+                    return 0;
+                }
+            </inject-code>
+        </add-function>
+        <add-function signature="__iter__()" return-type="PyObject*">
+            <inject-code>
+                %PYARG_0 = Shiboken::createWrapper(new QScriptValueIterator(*%CPPSELF), true, true);
+            </inject-code>
+        </add-function>
+    </value-type>
+    <object-type name="QScriptValueIterator">
+        <add-function signature="__iter__()" return-type="PyObject*">
+            <inject-code>
+                <insert-template name="__iter__" />
+            </inject-code>
+        </add-function>
+        <add-function signature="__next__()" return-type="PyObject*">
+            <inject-code>
+            if (%CPPSELF.hasNext()) {
+                %CPPSELF.next();
+                QString name = %CPPSELF.name();
+                QVariant value = %CPPSELF.value().toVariant();
+                %PYARG_0 = PyTuple_New(2);
+                PyTuple_SET_ITEM(%PYARG_0, 0, %CONVERTTOPYTHON[QString](name));
+                PyTuple_SET_ITEM(%PYARG_0, 1, %CONVERTTOPYTHON[QVariant](value));
+            } else {
+                PyErr_SetNone(PyExc_StopIteration);
+            }
+            </inject-code>
+        </add-function>
+    </object-type>
 </typesystem>
 
diff --git a/PySide/QtScriptTools/CMakeLists.txt b/PySide/QtScriptTools/CMakeLists.txt
index 1d53ff7..0a98042 100644
--- a/PySide/QtScriptTools/CMakeLists.txt
+++ b/PySide/QtScriptTools/CMakeLists.txt
@@ -5,36 +5,33 @@ set(QtScriptTools_SRC
     ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtScriptTools/qscriptenginedebugger_wrapper.cpp
 )
 
-execute_generator(scripttools QtScriptTools_SRC "${CMAKE_CURRENT_BINARY_DIR}:${QtCore_SOURCE_DIR}:${QtGui_SOURCE_DIR}:${QtGui_BINARY_DIR}:${QtScript_SOURCE_DIR}:${QtScriptTools_SOURCE_DIR}")
+set(QtScriptTools_typesystem_path "${QtCore_SOURCE_DIR}${PATH_SEP}${QtCore_BINARY_DIR}${PATH_SEP}${QtGui_SOURCE_DIR}${PATH_SEP}${QtScript_SOURCE_DIR}${PATH_SEP}${QtScriptTools_SOURCE_DIR}${PATH_SEP}${QtGui_BINARY_DIR}")
 
-include_directories(${CMAKE_CURRENT_SOURCE_DIR}
-                    ${QT_QTCORE_INCLUDE_DIR}
-                    ${QT_GUI_INCLUDE_DIR}
-                    ${QT_QTSCRIPT_INCLUDE_DIR}
-                    ${QT_QTSCRIPTTOOLS_INCLUDE_DIR}
-                    ${PYTHON_INCLUDE_PATH}
-                    ${SHIBOKEN_INCLUDE_DIR}
-                    ${libpyside_SOURCE_DIR}
-                    ${QtCore_BINARY_DIR}/PySide/QtCore/
-                    ${QtGui_BINARY_DIR}/PySide/QtGui/
-                    ${QtScript_BINARY_DIR}/PySide/QtScript/
-                    ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtScriptTools)
+set(QtScriptTools_include_dirs ${CMAKE_CURRENT_SOURCE_DIR}
+                                ${QT_QTCORE_INCLUDE_DIR}
+                                ${QT_GUI_INCLUDE_DIR}
+                                ${QT_QTSCRIPT_INCLUDE_DIR}
+                                ${QT_QTSCRIPTTOOLS_INCLUDE_DIR}
+                                ${SHIBOKEN_PYTHON_INCLUDE_DIR}
+                                ${SHIBOKEN_INCLUDE_DIR}
+                                ${libpyside_SOURCE_DIR}
+                                ${QtCore_BINARY_DIR}/PySide/QtCore/
+                                ${QtGui_BINARY_DIR}/PySide/QtGui/
+                                ${QtScript_BINARY_DIR}/PySide/QtScript/
+                                ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtScriptTools)
 
-add_library(QtScriptTools MODULE ${QtScriptTools_SRC})
-set_target_properties(QtScriptTools PROPERTIES PREFIX "")
-target_link_libraries(QtScriptTools
-                      pyside
-                      ${PYTHON_LIBRARIES}
-                      ${QT_QTCORE_LIBRARY}
-                      ${QT_GUI_LIBRARY}
-                      ${QT_QTSCRIPT_LIBRARY}
-                      ${QT_QTSCRIPTTOOLS_LIBRARY})
-
-add_dependencies(QtScriptTools QtCore QtScript QtGui)
-
-# install
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/QtScriptTools${CMAKE_DEBUG_POSTFIX}.so
-        DESTINATION ${SITE_PACKAGE}/PySide)
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtScriptTools/pyside_qtscripttools_python.h
-        DESTINATION include/PySide/QtScriptTools/)
+set(QtScriptTools_libraries     pyside
+                                ${SHIBOKEN_PYTHON_LIBRARIES}
+                                ${QT_QTCORE_LIBRARY}
+                                ${QT_GUI_LIBRARY}
+                                ${QT_QTSCRIPT_LIBRARY}
+                                ${QT_QTSCRIPTTOOLS_LIBRARY})
+set(QtScriptTools_deps QtCore QtScript QtGui)
 
+create_pyside_module(QtScriptTools
+                     QtScriptTools_include_dirs
+                     QtScriptTools_libraries
+                     QtScriptTools_deps
+                     QtScriptTools_typesystem_path
+                     QtScriptTools_SRC
+                     "")
diff --git a/PySide/QtScriptTools/typesystem_scripttools.xml b/PySide/QtScriptTools/typesystem_scripttools.xml
index 45bc04b..5c2b5e0 100644
--- a/PySide/QtScriptTools/typesystem_scripttools.xml
+++ b/PySide/QtScriptTools/typesystem_scripttools.xml
@@ -1,15 +1,31 @@
 <?xml version="1.0"?>
+<!--
+    This file is part of PySide project.
+    Copyright (C) 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
+    Contact: PySide team <contact@pyside.org>
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+-->
 <typesystem package="PySide.QtScriptTools">
     <load-typesystem name="typesystem_script.xml" generate="no" />
     <load-typesystem name="typesystem_gui.xml" generate="no" />
 
-    <!-- enums -->
-    <enum-type name="QScriptEngineDebugger::DebuggerAction"/>
-    <enum-type name="QScriptEngineDebugger::DebuggerWidget"/>
-    <enum-type name="QScriptEngineDebugger::DebuggerState"/>
-
-    <!-- classes -->
     <object-type name="QScriptEngineDebugger">
+        <enum-type name="DebuggerAction"/>
+        <enum-type name="DebuggerState" since="4.6"/>
+        <enum-type name="DebuggerWidget"/>
         <extra-includes>
             <include file-name="QScriptEngine" location="global"/>
         </extra-includes>
diff --git a/PySide/QtSql/CMakeLists.txt b/PySide/QtSql/CMakeLists.txt
index 8040f01..f1dc384 100644
--- a/PySide/QtSql/CMakeLists.txt
+++ b/PySide/QtSql/CMakeLists.txt
@@ -21,32 +21,27 @@ set(QtSql_SRC
     ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtSql/qtsql_module_wrapper.cpp
 )
 
-execute_generator(sql QtSql_SRC "${CMAKE_CURRENT_BINARY_DIR}:${QtCore_SOURCE_DIR}:${QtGui_BINARY_DIR}:${QtGui_SOURCE_DIR}:${QtSql_SOURCE_DIR}")
-
-include_directories(${CMAKE_CURRENT_SOURCE_DIR}
-                    ${QT_QTCORE_INCLUDE_DIR}
-                    ${QT_QTGUI_INCLUDE_DIR}
-                    ${QT_QTSQL_INCLUDE_DIR}
-                    ${PYTHON_INCLUDE_PATH}
-                    ${SHIBOKEN_INCLUDE_DIR}
-                    ${libpyside_SOURCE_DIR}
-                    ${QtCore_BINARY_DIR}/PySide/QtCore/
-                    ${QtGui_BINARY_DIR}/PySide/QtGui/
-                    ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtSql/)
-add_library(QtSql MODULE ${QtSql_SRC})
-set_target_properties(QtSql PROPERTIES PREFIX "")
-target_link_libraries(QtSql
-                      pyside
-                      ${PYTHON_LIBRARIES}
-                      ${QT_QTCORE_LIBRARY}
-                      ${QT_QTGUI_LIBRARY}
-                      ${QT_QTSQL_LIBRARY})
-
-add_dependencies(QtSql QtGui)
-
-# install
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/QtSql${CMAKE_DEBUG_POSTFIX}.so
-        DESTINATION ${SITE_PACKAGE}/PySide)
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtSql/pyside_qtsql_python.h
-        DESTINATION include/PySide/QtSql/)
-
+set(QtSql_typesystem_path "${QtCore_SOURCE_DIR}${PATH_SEP}${QtCore_BINARY_DIR}${PATH_SEP}${QtGui_SOURCE_DIR}${PATH_SEP}${QtSql_SOURCE_DIR}${PATH_SEP}${QtGui_BINARY_DIR}")
+set(QtSql_include_dirs  ${CMAKE_CURRENT_SOURCE_DIR}
+                        ${QT_QTCORE_INCLUDE_DIR}
+                        ${QT_QTGUI_INCLUDE_DIR}
+                        ${QT_QTSQL_INCLUDE_DIR}
+                        ${SHIBOKEN_PYTHON_INCLUDE_DIR}
+                        ${SHIBOKEN_INCLUDE_DIR}
+                        ${libpyside_SOURCE_DIR}
+                        ${QtCore_BINARY_DIR}/PySide/QtCore/
+                        ${QtGui_BINARY_DIR}/PySide/QtGui/
+                        ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtSql/)
+set(QtSql_libraries     pyside
+                        ${SHIBOKEN_PYTHON_LIBRARIES}
+                        ${QT_QTCORE_LIBRARY}
+                        ${QT_QTGUI_LIBRARY}
+                        ${QT_QTSQL_LIBRARY})
+set(QtSql_deps QtGui)
+create_pyside_module(QtSql
+                     QtSql_include_dirs
+                     QtSql_libraries
+                     QtSql_deps
+                     QtSql_typesystem_path
+                     QtSql_SRC
+                     "")
diff --git a/PySide/QtSql/typesystem_sql.xml b/PySide/QtSql/typesystem_sql.xml
index 31cc8d3..2efe429 100644
--- a/PySide/QtSql/typesystem_sql.xml
+++ b/PySide/QtSql/typesystem_sql.xml
@@ -1,4 +1,23 @@
 <?xml version="1.0"?>
+<!--
+    This file is part of PySide project.
+    Copyright (C) 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
+    Contact: PySide team <contact@pyside.org>
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+-->
 <typesystem package="PySide.QtSql">
   <load-typesystem name="typesystem_gui.xml" generate="no"/>
 
@@ -7,6 +26,10 @@
   <rejection class="QSqlDriverFactoryInterface"/>
 
   <namespace-type name="QSql">
+    <enum-type name="Location"/>
+    <enum-type name="ParamTypeFlag" flags="ParamType"/>
+    <enum-type name="TableType"/>
+    <enum-type name="NumericalPrecisionPolicy"/>
     <extra-includes>
         <include file-name="QtSql/qsql.h" location="global"/>
     </extra-includes>
@@ -21,7 +44,6 @@
         <include file-name="QStringList" location="global"/>
         <include file-name="QSize" location="global"/>
     </extra-includes>
-    <modify-function signature="operator=(QSqlDatabase)" remove="all"/>
     <modify-function signature="exec(QString)const" rename="exec_" allow-thread="yes" />
     <modify-function signature="open()" allow-thread="yes" />
     <modify-function signature="open(const QString&amp;, const QString&amp;)" allow-thread="yes" />
@@ -36,6 +58,7 @@
   </value-type>
 
   <value-type name="QSqlQuery">
+    <enum-type name="BatchExecutionMode"/>
     <extra-includes>
         <include file-name="QSqlError" location="global"/>
         <include file-name="QSqlRecord" location="global"/>
@@ -44,7 +67,6 @@
     </extra-includes>
     <modify-function signature="exec()" rename="exec_" allow-thread="yes" />
     <modify-function signature="exec(const QString &amp;)" rename="exec_" allow-thread="yes" />
-    <modify-function signature="operator=(QSqlQuery)" remove="all"/>
     <modify-function signature="prepare(const QString&amp;)" allow-thread="yes" />
     <modify-function signature="clear()" allow-thread="yes" />
     <modify-function signature="last()" allow-thread="yes" />
@@ -59,26 +81,26 @@
         <include file-name="QSqlField" location="global"/>
     </extra-includes>
     <modify-function signature="append(QSqlField)" access="non-final"/>
-    <modify-function signature="operator=(QSqlRecord)" remove="all"/>
   </value-type>
 
   <value-type name="QSqlError">
-    <modify-function signature="operator=(QSqlError)" remove="all"/>
+    <enum-type name="ErrorType"/>
   </value-type>
 
-  <value-type name="QSqlIndex">
-    <modify-function signature="operator=(QSqlIndex)" remove="all"/>
-  </value-type>
+  <value-type name="QSqlIndex" />
 
   <value-type name="QSqlRelation"/>
 
   <object-type name="QSqlRelationalDelegate"/>
 
   <value-type name="QSqlField">
-    <modify-function signature="operator=(QSqlField)" remove="all"/>
+      <enum-type name="RequiredStatus"/>
   </value-type>
 
   <object-type name="QSqlDriver">
+    <enum-type name="DriverFeature"/>
+    <enum-type name="IdentifierType"/>
+    <enum-type name="StatementType"/>
     <extra-includes>
         <include file-name="QSqlQuery" location="global"/>
         <include file-name="QSqlError" location="global"/>
@@ -91,7 +113,9 @@
     <modify-function signature="commitTransaction()" allow-thread="yes" />
     <modify-function signature="rollbackTransaction()" allow-thread="yes" />
     <modify-function signature="open(const QString &amp;, const QString&amp;, const QString&amp;, const QString&amp;, int, const QString&amp;)" allow-thread="yes" />
+    <!-- ### This is too low level for Python, and pointer would be useless for the Python programmer -->
     <modify-function signature="handle() const" remove="all"/>
+    <!-- ### -->
   </object-type>
 
   <object-type name="QSqlQueryModel">
@@ -112,6 +136,8 @@
     </extra-includes>
   </object-type>
   <object-type name="QSqlResult">
+      <enum-type name="BindingSyntax"/>
+      <enum-type name="VirtualHookOperation"/>
       <extra-includes>
         <include file-name="QSqlError" location="global"/>
         <include file-name="QSqlQuery" location="global"/>
@@ -119,7 +145,9 @@
         <include file-name="QStringList" location="global"/>
         <include file-name="QSize" location="global"/>
       </extra-includes>
+      <!-- ### This isn't part of Qt public API -->
       <modify-function signature="virtual_hook(int,void*)" remove="all" />
+      <!-- ### -->
       <modify-function signature="exec()" rename="exec_" allow-thread="yes" />
       <modify-function signature="fetchLast()" allow-thread="yes" />
       <modify-function signature="fetchFirst()" allow-thread="yes" />
@@ -129,6 +157,7 @@
       <modify-function signature="prepare(QString)" allow-thread="yes" />
   </object-type>
   <object-type name="QSqlTableModel">
+    <enum-type name="EditStrategy"/>
     <extra-includes>
         <include file-name="QSqlIndex" location="global"/>
         <include file-name="QStringList" location="global"/>
@@ -141,18 +170,4 @@
     </extra-includes>
   </object-type>
 
-  <enum-type name="QSql::Location"/>
-  <enum-type name="QSql::ParamTypeFlag" flags="QSql::ParamType"/>
-  <enum-type name="QSql::TableType"/>
-  <enum-type name="QSql::NumericalPrecisionPolicy"/>
-  <enum-type name="QSqlDriver::DriverFeature"/>
-  <enum-type name="QSqlDriver::IdentifierType"/>
-  <enum-type name="QSqlDriver::StatementType"/>
-  <enum-type name="QSqlError::ErrorType"/>
-  <enum-type name="QSqlField::RequiredStatus"/>
-  <enum-type name="QSqlQuery::BatchExecutionMode"/>
-  <enum-type name="QSqlResult::BindingSyntax"/>
-  <enum-type name="QSqlResult::VirtualHookOperation"/>
-  <enum-type name="QSqlTableModel::EditStrategy"/>
-
 </typesystem>
diff --git a/PySide/QtSvg/CMakeLists.txt b/PySide/QtSvg/CMakeLists.txt
index 42129c7..eb0f9a2 100644
--- a/PySide/QtSvg/CMakeLists.txt
+++ b/PySide/QtSvg/CMakeLists.txt
@@ -1,63 +1,35 @@
 project(QtSvg)
 
-if(Q_WS_X11)
-    set(MODULE_NAME svg_x11)
-    set(SPECIFIC_OS_FILES
-       )
-elseif(Q_WS_MAC)
-    set(MODULE_NAME svg_mac)
-    set(SPECIFIC_OS_FILES
-       )
-else()
-    message(FATAL_ERROR "OS not supported")
-endif(Q_WS_X11)
-
-if (${QT_VERSION_MAJOR} EQUAL 4 AND ${QT_VERSION_MINOR} LESS 6)
-    set (QtSvg_46_SRC )
-else ()
-    set(QtSvg_46_SRC
-    )
-endif (${QT_VERSION_MAJOR} EQUAL 4 AND ${QT_VERSION_MINOR} LESS 6)
-
 set(QtSvg_SRC
 ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtSvg/qgraphicssvgitem_wrapper.cpp
 ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtSvg/qsvggenerator_wrapper.cpp
 ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtSvg/qsvgrenderer_wrapper.cpp
 ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtSvg/qsvgwidget_wrapper.cpp
 ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtSvg/qtsvg_module_wrapper.cpp
-
-${SPECIFIC_OS_FILES}
-${QtSvg_46_SRC}
 )
 
-execute_generator(svg QtSvg_SRC "${CMAKE_CURRENT_BINARY_DIR}:${QtCore_SOURCE_DIR}:${QtGui_SOURCE_DIR}:${QtGui_BINARY_DIR}")
-
-include_directories(${CMAKE_CURRENT_SOURCE_DIR}
-                    ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtSvg/
-                    ${QT_INCLUDE_DIR}
-                    ${QT_QTCORE_INCLUDE_DIR}
-                    ${QT_QTGUI_INCLUDE_DIR}
-                    ${QT_QTSVG_INCLUDE_DIR}
-                    ${SHIBOKEN_INCLUDE_DIR}
-                    ${libpyside_SOURCE_DIR}
-                    ${PYTHON_INCLUDE_PATH}
-                    ${QtCore_BINARY_DIR}/PySide/QtCore/
-                    ${QtGui_BINARY_DIR}/PySide/QtGui/
-                    )
-
-add_library(QtSvg MODULE ${QtSvg_SRC})
-set_property(TARGET QtSvg PROPERTY PREFIX "")
-target_link_libraries(QtSvg
-                      pyside
-                      ${PYTHON_LIBRARIES}
-                      ${SHIBOKEN_LIBRARY}
-                      ${QT_QTSVG_LIBRARY}
-                      ${QT_QTGUI_LIBRARY}
-                      )
-add_dependencies(QtSvg QtGui)
-
-# install
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/QtSvg${CMAKE_DEBUG_POSTFIX}.so
-        DESTINATION ${SITE_PACKAGE}/PySide)
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtSvg/pyside_qtsvg_python.h
-        DESTINATION include/PySide/QtSvg/)
+set(QtSvg_typesystem_path "${QtCore_SOURCE_DIR}${PATH_SEP}${QtCore_BINARY_DIR}${PATH_SEP}${QtGui_SOURCE_DIR}${PATH_SEP}${QtGui_BINARY_DIR}")
+set(QtSvg_include_dirs  ${CMAKE_CURRENT_SOURCE_DIR}
+                        ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtSvg/
+                        ${QT_INCLUDE_DIR}
+                        ${QT_QTCORE_INCLUDE_DIR}
+                        ${QT_QTGUI_INCLUDE_DIR}
+                        ${QT_QTSVG_INCLUDE_DIR}
+                        ${SHIBOKEN_INCLUDE_DIR}
+                        ${libpyside_SOURCE_DIR}
+                        ${SHIBOKEN_PYTHON_INCLUDE_DIR}
+                        ${QtCore_BINARY_DIR}/PySide/QtCore/
+                        ${QtGui_BINARY_DIR}/PySide/QtGui/)
+set(QtSvg_libraries     pyside
+                        ${SHIBOKEN_PYTHON_LIBRARIES}
+                        ${SHIBOKEN_LIBRARY}
+                        ${QT_QTSVG_LIBRARY}
+                        ${QT_QTGUI_LIBRARY})
+set(QtSvg_deps QtGui)
+create_pyside_module(QtSvg
+                     QtSvg_include_dirs
+                     QtSvg_libraries
+                     QtSvg_deps
+                     QtSvg_typesystem_path
+                     QtSvg_SRC
+                     "")
diff --git a/PySide/QtSvg/typesystem_svg.xml b/PySide/QtSvg/typesystem_svg.xml
index 5cc1b51..0592fc6 100644
--- a/PySide/QtSvg/typesystem_svg.xml
+++ b/PySide/QtSvg/typesystem_svg.xml
@@ -1,4 +1,23 @@
 <?xml version="1.0"?>
+<!--
+    This file is part of PySide project.
+    Copyright (C) 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
+    Contact: PySide team <contact@pyside.org>
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+-->
 <typesystem package="PySide.QtSvg">
   <load-typesystem name="typesystem_gui.xml" generate="no"/>
 
@@ -8,7 +27,7 @@
   <object-type name="QSvgGenerator">
     <modify-function signature="setOutputDevice(QIODevice*)">
       <modify-argument index="1">
-          <reference-count action="add"/>
+          <reference-count action="set"/>
       </modify-argument>
     </modify-function>
 
diff --git a/PySide/QtTest/CMakeLists.txt b/PySide/QtTest/CMakeLists.txt
index e6e2953..bf86ad5 100644
--- a/PySide/QtTest/CMakeLists.txt
+++ b/PySide/QtTest/CMakeLists.txt
@@ -1,51 +1,42 @@
 project(QtTest)
 
-if(Q_WS_X11)
-    set(MODULE_NAME test_x11)
-    set(SPECIFIC_OS_FILES
-       )
-elseif(Q_WS_MAC)
-    set(MODULE_NAME test_mac)
-    set(SPECIFIC_OS_FILES
-       )
+if (${QT_VERSION_MAJOR} EQUAL 4 AND ${QT_VERSION_MINOR} LESS 6)
+    set(QtTest_46_SRC "")
 else()
-    message(FATAL_ERROR "OS not supported")
-endif(Q_WS_X11)
+    set(QtTest_46_SRC
+        ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtTest/qtest_pysideqtoucheventsequence_wrapper.cpp
+        )
+endif()
 
 set(QtTest_SRC
 ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtTest/qtest_wrapper.cpp
 ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtTest/qttest_module_wrapper.cpp
-${SPECIFIC_OS_FILES}
+${QtTest_46_SRC}
 )
 
-execute_generator(test QtTest_SRC "${CMAKE_CURRENT_BINARY_DIR}:${QtCore_SOURCE_DIR}:${QtGui_SOURCE_DIR}:${QtGui_BINARY_DIR}")
-
-include_directories(${CMAKE_CURRENT_SOURCE_DIR}
-                    ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtTest/
-                    ${QT_INCLUDE_DIR}
-                    ${QT_QTCORE_INCLUDE_DIR}
-                    ${QT_QTGUI_INCLUDE_DIR}
-                    ${QT_QTTEST_INCLUDE_DIR}
-                    ${SHIBOKEN_INCLUDE_DIR}
-                    ${libpyside_SOURCE_DIR}
-                    ${PYTHON_INCLUDE_PATH}
-                    ${QtCore_BINARY_DIR}/PySide/QtCore/
-                    ${QtGui_BINARY_DIR}/PySide/QtGui/
-                    )
-
-add_library(QtTest MODULE ${QtTest_SRC})
-set_property(TARGET QtTest PROPERTY PREFIX "")
-target_link_libraries(QtTest
-                      ${PYTHON_LIBRARIES}
-                      ${SHIBOKEN_LIBRARY}
-                      ${QT_QTTEST_LIBRARY}
-                      ${QT_QTGUI_LIBRARY}
-                      ${QT_QTCORE_LIBRARY}
-                      )
-add_dependencies(QtTest QtGui)
-
-# install
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/QtTest${CMAKE_DEBUG_POSTFIX}.so
-        DESTINATION ${SITE_PACKAGE}/PySide)
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtTest/pyside_qttest_python.h
-        DESTINATION include/PySide/QtTest/)
+set(QtTest_typesystem_path "${QtCore_SOURCE_DIR}${PATH_SEP}${QtCore_BINARY_DIR}${PATH_SEP}${QtGui_SOURCE_DIR}${PATH_SEP}${QtGui_BINARY_DIR}")
+set(QtTest_include_dirs ${CMAKE_CURRENT_SOURCE_DIR}
+                        ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtTest/
+                        ${QT_INCLUDE_DIR}
+                        ${QT_QTCORE_INCLUDE_DIR}
+                        ${QT_QTGUI_INCLUDE_DIR}
+                        ${QT_QTTEST_INCLUDE_DIR}
+                        ${SHIBOKEN_INCLUDE_DIR}
+                        ${libpyside_SOURCE_DIR}
+                        ${SHIBOKEN_PYTHON_INCLUDE_DIR}
+                        ${QtCore_BINARY_DIR}/PySide/QtCore/
+                        ${QtGui_BINARY_DIR}/PySide/QtGui/)
+set(QtTest_libraries    pyside
+                        ${SHIBOKEN_PYTHON_LIBRARIES}
+                        ${SHIBOKEN_LIBRARY}
+                        ${QT_QTTEST_LIBRARY}
+                        ${QT_QTGUI_LIBRARY}
+                        ${QT_QTCORE_LIBRARY})
+set(QtTest_deps  QtGui)
+create_pyside_module(QtTest
+                     QtTest_include_dirs
+                     QtTest_libraries
+                     QtTest_deps
+                     QtTest_typesystem_path
+                     QtTest_SRC
+                     "")
diff --git a/PySide/QtTest/typesystem_test.xml b/PySide/QtTest/typesystem_test.xml
index cbf8add..4a1a72c 100644
--- a/PySide/QtTest/typesystem_test.xml
+++ b/PySide/QtTest/typesystem_test.xml
@@ -1,4 +1,23 @@
 <?xml version="1.0"?>
+<!--
+    This file is part of PySide project.
+    Copyright (C) 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
+    Contact: PySide team <contact@pyside.org>
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+-->
 <typesystem package="PySide.QtTest">
   <load-typesystem name="typesystem_gui.xml" generate="no"/>
 
@@ -6,6 +25,8 @@
   <rejection class="QTest" function-name="qCompare&lt;char*&gt;"/>
   <rejection class="QTest" function-name="qCompare&lt;double&gt;"/>
   <rejection class="QTest" function-name="qCompare&lt;float&gt;"/>
+  <rejection class="QTest" function-name="qCompare&lt;double,qreal&gt;"/>
+  <rejection class="QTest" function-name="qCompare&lt;qreal,double&gt;"/>
   <rejection class="QTest" function-name="qCompare"/>
   <rejection class="QTest" function-name="qVerify"/>
   <rejection class="QTest" function-name="qSleep"/>
@@ -16,24 +37,65 @@
   <rejection class="QTest" function-name="qData"/>
   <rejection class="QTest" function-name="qWarn"/>
   <rejection class="QTest" function-name="toString"/>
+  <rejection class="QTest" function-name="toString&lt;bool>"/>
+  <rejection class="QTest" function-name="toString&lt;char>"/>
+  <rejection class="QTest" function-name="toString&lt;double>"/>
+  <rejection class="QTest" function-name="toString&lt;float>"/>
+  <rejection class="QTest" function-name="toString&lt;int>"/>
+  <rejection class="QTest" function-name="toString&lt;long>"/>
+  <rejection class="QTest" function-name="toString&lt;qint64>"/>
+  <rejection class="QTest" function-name="toString&lt;quint64>"/>
+  <rejection class="QTest" function-name="toString&lt;short>"/>
+  <rejection class="QTest" function-name="toString&lt;uint>"/>
+  <rejection class="QTest" function-name="toString&lt;ulong>"/>
+  <rejection class="QTest" function-name="toString&lt;ushort>"/>
+  <rejection class="QTest" function-name="qt_snprintf"/>
+
   <rejection class="QTest" function-name="compare_helper"/>
+  <rejection class="QTest" function-name="touchEvent"/>
 
   <namespace-type name="QTest">
+    <enum-type name="AttributeIndex" since="4.6"/>
+    <enum-type name="KeyAction"/>
+    <enum-type name="LogElementType" since="4.6"/>
+    <enum-type name="MouseAction"/>
+    <enum-type name="QBenchmarkMetric" since="4.7"/>
+    <enum-type name="SkipMode"/>
+    <enum-type name="TestFailMode"/>
     <extra-includes>
         <include file-name="QtTest" location="global"/>
     </extra-includes>
     <!--<modify-function signature="qCompare<char>(char">-->
+    <rejection class="QTouchEventSequence"/>
+    <object-type name="PySideQTouchEventSequence" target-lang-name="QTouchEventSequence" since="4.6" >
+        <modify-function signature="press(int, const QPoint&amp;, QWidget*)">
+            <modify-argument index="return">
+                <define-ownership class="target" owner="default"/>
+            </modify-argument>
+        </modify-function>
+        <modify-function signature="move(int, const QPoint&amp;, QWidget*)">
+            <modify-argument index="return">
+                <define-ownership class="target" owner="default"/>
+            </modify-argument>
+        </modify-function>
+        <modify-function signature="release(int, const QPoint&amp;, QWidget*)">
+            <modify-argument index="return">
+                <define-ownership class="target" owner="default"/>
+            </modify-argument>
+        </modify-function>
+        <modify-function signature="stationary(int)">
+            <modify-argument index="return">
+                <define-ownership class="target" owner="default"/>
+            </modify-argument>
+        </modify-function>
+    </object-type>
+    <modify-function signature="generateTouchEvent(QWidget*, QTouchEvent::DeviceType)" rename="touchEvent" since="4.6">
+        <modify-argument index="return">
+            <define-ownership class="target" owner="target"/>
+        </modify-argument>
+    </modify-function>
   </namespace-type>
 
-  <rejection class="QTouchEventSequence"/>
-
-  <enum-type name="QTest::AttributeIndex"/>
-  <enum-type name="QTest::KeyAction"/>
-  <enum-type name="QTest::LogElementType"/>
-  <enum-type name="QTest::MouseAction"/>
-  <enum-type name="QTest::SkipMode"/>
-  <enum-type name="QTest::TestFailMode"/>
-
   <rejection class="QSignalSpy"/>
   <rejection class="QTestEventList"/>
 </typesystem>
diff --git a/PySide/QtUiTools/CMakeLists.txt b/PySide/QtUiTools/CMakeLists.txt
index eaea414..89d2988 100644
--- a/PySide/QtUiTools/CMakeLists.txt
+++ b/PySide/QtUiTools/CMakeLists.txt
@@ -5,35 +5,34 @@ set(QtUiTools_SRC
     ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtUiTools/quiloader_wrapper.cpp
 )
 
-execute_generator(uitools QtUiTools_SRC "${CMAKE_CURRENT_BINARY_DIR}:${QtCore_SOURCE_DIR}:${QtGui_BINARY_DIR}:${QtGui_SOURCE_DIR}:${QtXml_SOURCE_DIR}:${QtUiTools_SOURCE_DIR}")
-
-include_directories(${CMAKE_CURRENT_SOURCE_DIR}
-                    ${QT_QTCORE_INCLUDE_DIR}
-                    ${QT_QTGUI_INCLUDE_DIR}
-                    ${QT_QTXML_INCLUDE_DIR}
-                    ${QT_QTUITOOLS_INCLUDE_DIR}
-                    ${PYTHON_INCLUDE_PATH}
-                    ${SHIBOKEN_INCLUDE_DIR}
-                    ${libpyside_SOURCE_DIR}
-                    ${QtCore_BINARY_DIR}/PySide/QtCore/
-                    ${QtXml_BINARY_DIR}/PySide/QtXml/
-                    ${QtGui_BINARY_DIR}/PySide/QtGui/
-                    ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtUiTools)
-
-add_library(QtUiTools MODULE ${QtUiTools_SRC})
-set_target_properties(QtUiTools PROPERTIES PREFIX "")
-target_link_libraries(QtUiTools
-                      pyside
-                      ${PYTHON_LIBRARIES}
-                      ${QT_QTCORE_LIBRARY}
-                      ${QT_QTGUI_LIBRARY}
-                      ${QT_QTUITOOLS_LIBRARY})
-
-add_dependencies(QtUiTools QtGui QtXml)
-
-# install
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/QtUiTools${CMAKE_DEBUG_POSTFIX}.so
-        DESTINATION ${SITE_PACKAGE}/PySide)
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtUiTools/pyside_qtuitools_python.h
-        DESTINATION include/PySide/QtUiTools/)
+set(QtUiTools_typesystem_path "${QtCore_SOURCE_DIR}${PATH_SEP}${QtCore_BINARY_DIR}${PATH_SEP}${QtGui_SOURCE_DIR}${PATH_SEP}${QtXml_SOURCE_DIR}${PATH_SEP}${QtUiTools_SOURCE_DIR}${PATH_SEP}${QtGui_BINARY_DIR}")
+set(QtUiTools_include_dirs  ${CMAKE_CURRENT_SOURCE_DIR}
+                            ${QT_QTCORE_INCLUDE_DIR}
+                            ${QT_QTGUI_INCLUDE_DIR}
+                            ${QT_QTXML_INCLUDE_DIR}
+                            ${QT_QTDESIGNER_INCLUDE_DIR}
+                            ${QT_QTUITOOLS_INCLUDE_DIR}
+                            ${SHIBOKEN_PYTHON_INCLUDE_DIR}
+                            ${SHIBOKEN_INCLUDE_DIR}
+                            ${libpyside_SOURCE_DIR}
+                            ${plugins_SOURCE_DIR}
+                            ${QtCore_BINARY_DIR}/PySide/QtCore/
+                            ${QtXml_BINARY_DIR}/PySide/QtXml/
+                            ${QtGui_BINARY_DIR}/PySide/QtGui/
+                            ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtUiTools)
+set(QtUiTools_libraries     pyside
+                            uiplugin
+                            ${SHIBOKEN_PYTHON_LIBRARIES}
+                            ${QT_QTUITOOLS_LIBRARY}
+                            ${QT_QTDESIGNER_LIBRARY}
+                            ${QT_QTCORE_LIBRARY}
+                            ${QT_QTGUI_LIBRARY})
+set(QtUiTools_deps QtGui QtXml)
+create_pyside_module(QtUiTools
+                     QtUiTools_include_dirs
+                     QtUiTools_libraries
+                     QtUiTools_deps
+                     QtUiTools_typesystem_path
+                     QtUiTools_SRC
+                     "")
 
diff --git a/PySide/QtUiTools/glue/plugins.h b/PySide/QtUiTools/glue/plugins.h
new file mode 100644
index 0000000..78e5a20
--- /dev/null
+++ b/PySide/QtUiTools/glue/plugins.h
@@ -0,0 +1,47 @@
+/*
+ * This file is part of the PySide project.
+ *
+ * Copyright (C) 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
+ *
+ * Contact: PySide team <contact@pyside.org>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+#ifndef _PLUGIN_H_
+#define _PLUGIN_H_
+
+#include <QPluginLoader>
+#include "customwidgets.h"
+
+inline void registerCustomWidget(PyObject* obj)
+{
+    static PyCustomWidgets* plugin = 0;
+
+    if (plugin == 0) {
+        foreach(QObject* o, QPluginLoader::staticInstances()) {
+            plugin = qobject_cast<PyCustomWidgets*>(o);
+            if (plugin)
+                break;
+        }
+    }
+
+    if (!plugin)
+        qDebug() << "Failed to load uiloader plugin.";
+    else
+        plugin->registerWidgetType(obj);
+}
+
+#endif
diff --git a/PySide/QtUiTools/glue/uitools_loadui.cpp b/PySide/QtUiTools/glue/uitools_loadui.cpp
new file mode 100644
index 0000000..829adf7
--- /dev/null
+++ b/PySide/QtUiTools/glue/uitools_loadui.cpp
@@ -0,0 +1,52 @@
+/*
+ * Based on code provided by:
+ *          Antonio Valentino <antonio.valentino at tiscali.it>
+ *          Frédéric <frederic.mantegazza at gbiloba.org>
+ */
+
+#include <shiboken.h>
+#include <QUiLoader>
+#include <QFile>
+#include <QWidget>
+
+static void createChildrenNameAttributes(PyObject* root, QObject* object)
+{
+    foreach (QObject* child, object->children()) {
+        const QByteArray name = child->objectName().toLocal8Bit();
+
+        if (!name.isEmpty() && !name.startsWith("_") && !name.startsWith("qt_")) {
+            bool hasAttr = PyObject_HasAttrString(root, name.constData());
+            if (!hasAttr) {
+                Shiboken::AutoDecRef pyChild(%CONVERTTOPYTHON[QObject*](child));
+                PyObject_SetAttrString(root, name.constData(), pyChild);
+            }
+            createChildrenNameAttributes(root, child);
+        }
+        createChildrenNameAttributes(root, child);
+    }
+}
+
+static PyObject* QUiLoadedLoadUiFromDevice(QUiLoader* self, QIODevice* dev, QWidget* parent)
+{
+    QWidget* wdg = self->load(dev, parent);
+
+    if (wdg) {
+        PyObject* pyWdg = %CONVERTTOPYTHON[QWidget*](wdg);
+        createChildrenNameAttributes(pyWdg, wdg);
+        if (parent) {
+            Shiboken::AutoDecRef pyParent(%CONVERTTOPYTHON[QWidget*](parent));
+            Shiboken::Object::setParent(pyParent, pyWdg);
+        }
+        return pyWdg;
+    }
+
+    if (!PyErr_Occurred())
+        PyErr_SetString(PyExc_RuntimeError, "Unable to open/read ui device");
+    return 0;
+}
+
+static PyObject* QUiLoaderLoadUiFromFileName(QUiLoader* self, const QString& uiFile, QWidget* parent)
+{
+    QFile fd(uiFile);
+    return QUiLoadedLoadUiFromDevice(self, &fd, parent);
+}
diff --git a/PySide/QtUiTools/typesystem_uitools.xml b/PySide/QtUiTools/typesystem_uitools.xml
index c155bff..08e98bd 100644
--- a/PySide/QtUiTools/typesystem_uitools.xml
+++ b/PySide/QtUiTools/typesystem_uitools.xml
@@ -1,50 +1,126 @@
-<typesystem package="PySide.QtUiTools">
+<?xml version="1.0"?>
+<!--
+    This file is part of PySide project.
+    Copyright (C) 2009-2011 Nokia Corporation and/or its subsidiary(-ies).
+    Contact: PySide team <contact@pyside.org>
 
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+-->
+<typesystem package="PySide.QtUiTools">
     <load-typesystem name="typesystem_gui.xml" generate="no" />
     <load-typesystem name="typesystem_xml.xml" generate="no" />
 
     <object-type name="QUiLoader">
-      <modify-function signature="createAction(QObject *, const QString&amp;)">
+      <extra-includes>
+        <include file-name="glue/plugins.h" location="local"/>
+      </extra-includes>
+      <inject-code class="native" position="beginning" file="glue/uitools_loadui.cpp"/>
+      <inject-code>
+          Q_IMPORT_PLUGIN(uiplugin);
+      </inject-code>
+      <add-function signature="registerCustomWidget(PyObject*)" return-type="void">
+         <modify-argument index="1">
+            <rename to="customWidgetType" />
+         </modify-argument>
+         <inject-documentation format="target" mode="append">
+         Registers a Python created custom widget to QUiLoader, so it can be recognized when
+         loading a `.ui` file. The custom widget type is passed via the ``customWidgetType`` argument.
+         This is needed when you want to override a virtual method of some widget in the interface,
+         since duck punching will not work with widgets created by QUiLoader based on the contents
+         of the `.ui` file.
+
+         (Remember that `duck punching virtual methods is an invitation for your own demise!
+         &lt;http://www.pyside.org/docs/shiboken/wordsofadvice.html#duck-punching-and-virtual-methods>`_)
+
+         Let's see an obvious example. If you want to create a new widget it's probable you'll end up
+         overriding :class:`~PySide.QtGui.QWidget`'s :meth:`~PySide.QtGui.QWidget.paintEvent` method.
+
+         .. code-block:: python
+
+            class Circle(QWidget):
+                def paintEvent(self, event):
+                    painter = QPainter(self)
+                    painter.setPen(self.pen)
+                    painter.setBrush(QBrush(self.color))
+                    painter.drawEllipse(event.rect().center(), 20, 20)
+
+            # ...
+
+            loader = QUiLoader()
+            loader.registerCustomWidget(Circle)
+            circle = loader.load('circle.ui')
+            circle.show()
+
+            # ...
+         </inject-documentation>
+         <inject-code class="target" position="beginning">
+             registerCustomWidget(%PYARG_1);
+             %CPPSELF.addPluginPath(""); // force reload widgets
+         </inject-code>
+      </add-function>
+      <modify-function signature="createAction(QObject*, const QString&amp;)">
         <modify-argument index="return">
           <parent index="1" action="add"/>
         </modify-argument>
       </modify-function>
 
-      <modify-function signature="createActionGroup(QObject *, const QString&amp;)">
+      <modify-function signature="createActionGroup(QObject*, const QString&amp;)">
         <modify-argument index="return">
           <parent index="1" action="add"/>
         </modify-argument>
       </modify-function>
 
-      <modify-function signature="createLayout(const QString&amp;,QObject *, const QString&amp;)">
+      <modify-function signature="createLayout(const QString&amp;, QObject*, const QString&amp;)">
         <modify-argument index="return">
           <parent index="2" action="add"/>
         </modify-argument>
       </modify-function>
 
-      <modify-function signature="createWidget(const QString&amp;,QWidget*, const QString&amp;)">
+      <modify-function signature="createWidget(const QString&amp;, QWidget*, const QString&amp;)">
         <modify-argument index="return">
-          <parent index="2" action="add"/>
+            <parent index="2" action="add"/>
+            <define-ownership class="target" owner="default"/>
         </modify-argument>
       </modify-function>
 
       <modify-function signature="load(QIODevice*, QWidget*)">
-        <modify-argument index="return">
-          <parent index="2" action="add"/>
+        <modify-argument index="2">
+          <replace-default-expression with="0" />
+          <rename to="parentWidget" />
         </modify-argument>
-      </modify-function>
-
-      <!-- Syntax sugar -->
-      <add-function signature="load(const char*, QWidget*)" return-type="QWidget*">
         <modify-argument index="return">
-          <parent index="2" action="add"/>
+           <define-ownership class="target" owner="target"/>
         </modify-argument>
         <inject-code>
-            QFile f(%1);
-            if (f.open(QIODevice::ReadOnly | QIODevice::Text))
-                %PYARG_0 = %CONVERTTOPYTHON[QWidget*](%CPPSELF.load(&amp;f, %2));
-            else
-                PyErr_SetString(PyExc_RuntimeError, "Unable to open ui file");
+            // Avoid calling the original function: %CPPSELF.%FUNCTION_NAME()
+            %PYARG_0 = QUiLoadedLoadUiFromDevice(%CPPSELF, %1, %2);
+        </inject-code>
+     </modify-function>
+
+      <!-- Syntax sugar -->
+      <add-function signature="load(QString, QWidget*)" return-type="QWidget*">
+        <modify-argument index="2">
+          <replace-default-expression with="0" />
+          <rename to="parentWidget" />
+        </modify-argument>
+        <modify-argument index="return">
+          <define-ownership class="target" owner="target"/>
+        </modify-argument>
+        <inject-code>
+            // Avoid calling the original function: %CPPSELF.%FUNCTION_NAME()
+            %PYARG_0 = QUiLoaderLoadUiFromFileName(%CPPSELF, %1, %2);
         </inject-code>
       </add-function>
     </object-type>
diff --git a/PySide/QtWebKit/CMakeLists.txt b/PySide/QtWebKit/CMakeLists.txt
index 09f5bfa..74d89f8 100644
--- a/PySide/QtWebKit/CMakeLists.txt
+++ b/PySide/QtWebKit/CMakeLists.txt
@@ -1,17 +1,5 @@
 project(QtWebKit)
 
-if(Q_WS_X11)
-    set(MODULE_NAME webkit_x11)
-    set(SPECIFIC_OS_FILES
-       )
-elseif(Q_WS_MAC)
-    set(MODULE_NAME webkit_mac)
-    set(SPECIFIC_OS_FILES
-       )
-else()
-    message(FATAL_ERROR "OS not supported")
-endif(Q_WS_X11)
-
 if (${QT_VERSION_MAJOR} EQUAL 4 AND ${QT_VERSION_MINOR} LESS 6)
     set (QtWebKit_46_SRC )
 else ()
@@ -19,9 +7,11 @@ else ()
     ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtWebKit/qwebelement_wrapper.cpp
     ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtWebKit/qwebelementcollection_wrapper.cpp
     ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtWebKit/qwebinspector_wrapper.cpp
+    ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtWebKit/qwebpage_errorpageextensionoption_wrapper.cpp
+    ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtWebKit/qwebpage_errorpageextensionreturn_wrapper.cpp
     ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtWebKit/qgraphicswebview_wrapper.cpp
     )
-endif (${QT_VERSION_MAJOR} EQUAL 4 AND ${QT_VERSION_MINOR} LESS 6)
+endif ()
 
 set(QtWebKit_SRC
 ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtWebKit/qtwebkit_module_wrapper.cpp
@@ -32,6 +22,10 @@ ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtWebKit/qwebhistoryitem_wrapper.cpp
 ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtWebKit/qwebhistory_wrapper.cpp
 ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtWebKit/qwebhittestresult_wrapper.cpp
 ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtWebKit/qwebpage_wrapper.cpp
+${CMAKE_CURRENT_BINARY_DIR}/PySide/QtWebKit/qwebpage_choosemultiplefilesextensionoption_wrapper.cpp
+${CMAKE_CURRENT_BINARY_DIR}/PySide/QtWebKit/qwebpage_choosemultiplefilesextensionreturn_wrapper.cpp
+${CMAKE_CURRENT_BINARY_DIR}/PySide/QtWebKit/qwebpage_extensionoption_wrapper.cpp
+${CMAKE_CURRENT_BINARY_DIR}/PySide/QtWebKit/qwebpage_extensionreturn_wrapper.cpp
 ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtWebKit/qwebpluginfactory_mimetype_wrapper.cpp
 ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtWebKit/qwebpluginfactory_plugin_wrapper.cpp
 ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtWebKit/qwebpluginfactory_wrapper.cpp
@@ -40,42 +34,35 @@ ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtWebKit/qwebsettings_wrapper.cpp
 ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtWebKit/qwebview_wrapper.cpp
 ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtWebKit/webcore_wrapper.cpp
 
-${SPECIFIC_OS_FILES}
 ${QtWebKit_46_SRC}
 )
 
-execute_generator(webkit QtWebKit_SRC "${CMAKE_CURRENT_BINARY_DIR}:${QtCore_SOURCE_DIR}:${QtGui_SOURCE_DIR}:${QtGui_BINARY_DIR}:${QtNetwork_SOURCE_DIR}")
+set(QtWebKit_typesystem_path "${QtCore_SOURCE_DIR}${PATH_SEP}${QtCore_BINARY_DIR}${PATH_SEP}${QtGui_SOURCE_DIR}${PATH_SEP}${QtNetwork_SOURCE_DIR}${PATH_SEP}${QtGui_BINARY_DIR}")
+set(QtWebkit_include_dirs   ${CMAKE_CURRENT_SOURCE_DIR}
+                            ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtWebkit/
+                            ${QT_INCLUDE_DIR}
+                            ${QT_QTCORE_INCLUDE_DIR}
+                            ${QT_QTGUI_INCLUDE_DIR}
+                            ${QT_QTNETWORK_INCLUDE_DIR}
+                            ${QT_QTWEBKIT_INCLUDE_DIR}
+                            ${SHIBOKEN_INCLUDE_DIR}
+                            ${libpyside_SOURCE_DIR}
+                            ${SHIBOKEN_PYTHON_INCLUDE_DIR}
+                            ${QtCore_BINARY_DIR}/PySide/QtCore/
+                            ${QtGui_BINARY_DIR}/PySide/QtGui/
+                            ${QtNetwork_BINARY_DIR}/PySide/QtNetwork/ )
+set(QtWebKit_libraries      pyside
+                            ${SHIBOKEN_PYTHON_LIBRARIES}
+                            ${SHIBOKEN_LIBRARY}
+                            ${QT_QTWEBKIT_LIBRARY}
+                            ${QT_QTNETWORK_LIBRARY}
+                            ${QT_QTGUI_LIBRARY})
+set(QtWebKit_deps QtGui QtNetwork)
+create_pyside_module(QtWebKit
+                     QtWebkit_include_dirs
+                     QtWebKit_libraries
+                     QtWebKit_deps
+                     QtWebKit_typesystem_path
+                     QtWebKit_SRC
+                     "")
 
-include_directories(${CMAKE_CURRENT_SOURCE_DIR}
-                    ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtWebkit/
-                    ${QT_INCLUDE_DIR}
-                    ${QT_QTCORE_INCLUDE_DIR}
-                    ${QT_QTGUI_INCLUDE_DIR}
-                    ${QT_QTNETWORK_INCLUDE_DIR}
-                    ${QT_QTWEBKIT_INCLUDE_DIR}
-                    ${SHIBOKEN_INCLUDE_DIR}
-                    ${libpyside_SOURCE_DIR}
-                    ${PYTHON_INCLUDE_PATH}
-                    ${QtCore_BINARY_DIR}/PySide/QtCore/
-                    ${QtGui_BINARY_DIR}/PySide/QtGui/
-                    ${QtNetwork_BINARY_DIR}/PySide/QtNetwork/
-                    )
-
-add_library(QtWebKit MODULE ${QtWebKit_SRC})
-set_property(TARGET QtWebKit PROPERTY PREFIX "")
-target_link_libraries(QtWebKit
-                      pyside
-                      ${PYTHON_LIBRARIES}
-                      ${SHIBOKEN_LIBRARY}
-                      ${QT_QTWEBKIT_LIBRARY}
-                      ${QT_QTNETWORK_LIBRARY}
-                      ${QT_QTGUI_LIBRARY}
-                      )
-add_dependencies(QtWebKit QtGui)
-add_dependencies(QtWebKit QtNetwork)
-
-# install
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/QtWebKit${CMAKE_DEBUG_POSTFIX}.so
-        DESTINATION ${SITE_PACKAGE}/PySide)
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtWebKit/pyside_qtwebkit_python.h
-        DESTINATION include/PySide/QtWebKit/)
diff --git a/PySide/QtWebKit/typesystem_webkit.xml b/PySide/QtWebKit/typesystem_webkit.xml
index dd3b5ba..86b8431 100644
--- a/PySide/QtWebKit/typesystem_webkit.xml
+++ b/PySide/QtWebKit/typesystem_webkit.xml
@@ -1,4 +1,23 @@
 <?xml version="1.0"?>
+<!--
+    This file is part of PySide project.
+    Copyright (C) 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
+    Contact: PySide team <contact@pyside.org>
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+-->
 <typesystem package="PySide.QtWebKit">
   <load-typesystem name="typesystem_core.xml" generate="no"/>
   <load-typesystem name="typesystem_gui.xml" generate="no"/>
@@ -6,60 +25,208 @@
 
   <namespace-type name="WebCore"/>
 
-  <enum-type name="QWebSettings::FontFamily"/>
-  <enum-type name="QWebSettings::FontSize"/>
-  <enum-type name="QWebSettings::WebGraphic"/>
-  <enum-type name="QWebSettings::WebAttribute"/>
-  <enum-type name="QWebPage::ErrorDomain"/>
-  <enum-type name="QWebPage::NavigationType"/>
-  <enum-type name="QWebPage::WebAction"/>
-  <enum-type name="QWebPage::WebWindowType"/>
-  <enum-type name="QWebPage::FindFlag" flags="QWebPage::FindFlags"/>
-  <enum-type name="QWebPage::LinkDelegationPolicy"/>
-  <enum-type name="QWebPluginFactory::Extension"/>
-
-  <!-- Qt 4.6 -->
-  <enum-type name="QWebElement::StyleResolveStrategy"/>
-  <enum-type name="QWebFrame::RenderLayer"/>
-  <enum-type name="QWebPage:ErrorDomain"/>
-  <enum-type name="QWebPage::Extension"/>
-
-  <!-- unsuported property with type QList<MimeType> -->
-  <rejection class="QWebPluginFactory::Plugin" field-name="mimeTypes"/>
-
   <object-type name="QWebView">
     <modify-function signature="setPage(QWebPage*)">
         <modify-argument index="1">
-            <define-ownership class="target" owner="c++"/>
+            <reference-count action="set"/>
         </modify-argument>
     </modify-function>
+    <modify-function signature="page() const">
+        <modify-argument index="return">
+            <define-ownership class="target" owner="default"/>
+        </modify-argument>
+        <inject-code position="end">
+            SbkObject* _pyReturn = reinterpret_cast&lt;SbkObject*&gt;(%PYARG_0);
+            if (!Shiboken::Object::hasParentInfo(_pyReturn))
+                Shiboken::Object::setParent(%PYSELF, %PYARG_0);
+        </inject-code>
+    </modify-function>
     <modify-function signature="print(QPrinter*)const" rename="print_" />
   </object-type>
   <object-type name="QWebFrame">
+    <enum-type name="RenderLayer" since="4.6"/>
     <modify-function signature="addToJavaScriptWindowObject(QString,QObject*)">
       <modify-argument index="2">
           <parent index="this" action="add"/>
       </modify-argument>
     </modify-function>
-    <!-- TODO QMultiMap isn't implemented yet -->
-    <modify-function signature="metaData()const" remove="all" />
+    <modify-function signature="print(QPrinter*)const" rename="print_" />
+    <modify-function signature="metaData()const">
+        <modify-argument index="return">
+            <replace-type modified-type="PyObject" />
+        </modify-argument>
+        <inject-code position="end">
+            <insert-template name="convertFromMultiMap">
+                <replace from="%MAP_NAME" to="%0"/>
+                <replace from="%RETURN_NAME" to="%PYARG_0"/>
+                <replace from="%KEY_TYPE" to="QString"/>
+                <replace from="%VALUE_TYPE" to="QString"/>
+            </insert-template>
+        </inject-code>
+    </modify-function>
   </object-type>
 
-  <object-type name="QWebSettings"/>
-  <object-type name="QWebPage"/>
+  <object-type name="QWebSettings">
+    <enum-type name="FontFamily"/>
+    <enum-type name="FontSize"/>
+    <enum-type name="WebAttribute"/>
+    <enum-type name="WebGraphic"/>
+  </object-type>
+  <object-type name="QWebPage">
+    <enum-type name="FindFlag" flags="FindFlags"/>
+    <enum-type name="LinkDelegationPolicy"/>
+    <enum-type name="NavigationType"/>
+    <enum-type name="WebAction"/>
+    <enum-type name="WebWindowType"/>
+    <!-- Qt 4.6 -->
+    <enum-type name="ErrorDomain" since="4.6"/>
+    <enum-type name="Extension"/>
+    <!-- Qt 4.8 -->
+    <enum-type name="Feature" since="4.8" revision="4800" />
+    <enum-type name="PermissionPolicy" since="4.8" revision="4800" />
+
+   <value-type name="ChooseMultipleFilesExtensionOption" />
+   <value-type name="ChooseMultipleFilesExtensionReturn" />
+   <value-type name="ErrorPageExtensionOption" since="4.6" />
+   <value-type name="ErrorPageExtensionReturn" since="4.6" />
+   <value-type name="ExtensionOption" />
+   <value-type name="ExtensionReturn" />
+
+   <modify-function signature="extension(QWebPage::Extension, const QWebPage::ExtensionOption*, QWebPage::ExtensionReturn*)">
+        <template name="qwebpage_extension_argument_conversion">
+        PyObject* %out = 0;
+        // Cast the parameters according to the extension type
+        if (extension == QWebPage::ChooseMultipleFilesExtension) {
+            const ChooseMultipleFilesExtension$TYPE_SUFFIX* _in = reinterpret_cast&lt;const ChooseMultipleFilesExtension$TYPE_SUFFIX*>(%in);
+            %out = %CONVERTTOPYTHON[const QWebPage::ChooseMultipleFilesExtension$TYPE_SUFFIX*](_in);
+        #if QT_VERSION >= 0x040600
+        } else if (extension == QWebPage::ErrorPageExtension) {
+            const ErrorPageExtension$TYPE_SUFFIX* _in = reinterpret_cast&lt;const ErrorPageExtension$TYPE_SUFFIX*>(%in);
+            %out = %CONVERTTOPYTHON[const QWebPage::ErrorPageExtension$TYPE_SUFFIX*](_in);
+        #endif
+        }
+        </template>
+        <modify-argument index="2" invalidate-after-use="yes">
+            <conversion-rule class="target">
+                <insert-template name="qwebpage_extension_argument_conversion">
+                    <replace from="$TYPE_SUFFIX" to="Option"/>
+                </insert-template>
+            </conversion-rule>
+        </modify-argument>
+        <modify-argument index="3" invalidate-after-use="yes">
+            <conversion-rule class="target">
+                <insert-template name="qwebpage_extension_argument_conversion">
+                    <replace from="$TYPE_SUFFIX" to="Return"/>
+                </insert-template>
+            </conversion-rule>
+        </modify-argument>
+   </modify-function>
+
+   <modify-function signature="setNetworkAccessManager(QNetworkAccessManager*)">
+        <modify-argument index="1">
+            <reference-count action="set"/>
+        </modify-argument>
+   </modify-function>
+   <modify-function signature="networkAccessManager()const">
+        <modify-argument index="return">
+            <reference-count action="set" variable-name="setNetworkAccessManager(QNetworkAccessManager*)1" />
+        </modify-argument>
+   </modify-function>
+   <modify-function signature="view()const">
+        <modify-argument index="return">
+            <define-ownership owner="default"/>
+        </modify-argument>
+   </modify-function>
+   <modify-function signature="pluginFactory()const">
+        <modify-argument index="return">
+            <define-ownership owner="default"/>
+        </modify-argument>
+   </modify-function>
+
+    <modify-function signature="javaScriptPrompt(QWebFrame*,const QString &amp;,const QString &amp;,QString*)">
+      <modify-argument index="4">
+        <remove-argument />
+        <conversion-rule class="native">
+        QString _local;
+        QString* %4 = &amp;_local;
+        </conversion-rule>
+      </modify-argument>
+      <modify-argument index="return">
+          <replace-type modified-type="PySequence"/>
+          <conversion-rule class="native">
+          Shiboken::AutoDecRef pyRes(PySequence_GetItem(%PYARG_0, 0));
+          Shiboken::AutoDecRef pyStr(PySequence_GetItem(%PYARG_0, 1));
+          %RETURN_TYPE %out = %CONVERTTOCPP[%RETURN_TYPE](pyRes);
+          *%4 = %CONVERTTOCPP[QString](pyStr);
+          </conversion-rule>
+          <conversion-rule class="target">
+          %PYARG_0 = PyTuple_New(2);
+          PyTuple_SET_ITEM(%PYARG_0, 0, %CONVERTTOPYTHON[%RETURN_TYPE](%0));
+          PyTuple_SET_ITEM(%PYARG_0, 1, %CONVERTTOPYTHON[QString](*%4));
+          </conversion-rule>
+      </modify-argument>
+    </modify-function>
+
+    <add-function signature="qt_metacall()">
+        <inject-code class="native">
+            static int _signalIndex = -1;
+            static QMetaMethod _m;
+
+            if (_signalIndex == -1) {
+                _signalIndex = QWebPage::staticMetaObject.indexOfSlot("shouldInterruptJavaScript()");
+                _m = QWebPage::staticMetaObject.method(_signalIndex);
+            }
+
+            if (_signalIndex == id) {
+                Shiboken::GilState gil;
+                PyObject* self = (PyObject*)Shiboken::BindingManager::instance().retrieveWrapper(this);
+                if (self) {
+                    Shiboken::AutoDecRef _pyMethod(PyObject_GetAttrString(self, "shouldInterruptJavaScript"));
+                    return PySide::SignalManager::callPythonMetaMethod(_m, args, _pyMethod, false);
+                }
+            }
+        </inject-code>
+    </add-function>
+  </object-type>
   <object-type name="QWebHistory"/>
   <object-type name="QWebHistoryInterface"/>
-  <object-type name="QWebPluginFactory"/>
-  <value-type name="QWebPluginFactory::Plugin"/>
-  <value-type name="QWebPluginFactory::MimeType"/>
+  <object-type name="QWebPluginFactory">
+    <enum-type name="Extension"/>
+    <value-type name="Plugin"/>
+    <value-type name="MimeType"/>
+    <modify-function signature="create(const QString &amp;, const QUrl &amp;, const QStringList &amp;, const QStringList &amp;) const">
+        <modify-argument index="return">
+            <define-ownership class="native" owner="c++"/>
+            <define-ownership class="target" owner="target"/>
+        </modify-argument>
+    </modify-function>
+  </object-type>
   <value-type name="QWebDatabase"/>
   <value-type name="QWebHistoryItem"/>
   <value-type name="QWebHitTestResult"/>
   <value-type name="QWebSecurityOrigin"/>
 
   <!-- Qt 4.6 -->
-  <object-type name="QGraphicsWebView"/>
-  <object-type name="QWebInspector"/>
-  <value-type name="QWebElement"/>
-  <value-type name="QWebElementCollection"/>
+  <object-type name="QGraphicsWebView" since="4.6"/>
+  <object-type name="QWebInspector" since="4.6"/>
+  <value-type name="QWebElement" since="4.6">
+    <enum-type name="StyleResolveStrategy"/>
+  </value-type>
+  <value-type name="QWebElementCollection" since="4.6">
+    <add-function signature="__len__">
+        <inject-code>
+        return %CPPSELF.count();
+        </inject-code>
+    </add-function>
+    <add-function signature="__getitem__">
+        <inject-code>
+        if (_i &lt; 0 || _i >= %CPPSELF.count()) {
+            PyErr_SetString(PyExc_IndexError, "index out of bounds");
+            return 0;
+        }
+        QWebElement element = %CPPSELF.at(_i);
+        return %CONVERTTOPYTHON[QWebElement](element);
+        </inject-code>
+    </add-function>
+  </value-type>
 </typesystem>
diff --git a/PySide/QtWebKit/typesystem_webkit_simulator.xml b/PySide/QtWebKit/typesystem_webkit_simulator.xml
new file mode 100644
index 0000000..ff195be
--- /dev/null
+++ b/PySide/QtWebKit/typesystem_webkit_simulator.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0"?>
+<!--
+    This file is part of PySide project.
+    Copyright (C) 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
+    Contact: PySide team <contact@pyside.org>
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+-->
+<typesystem package="PySide.QtWebKit">
+  <object-type name="QWebFrame">
+    <modify-function signature="print(QPrinter*)const" remove="all"/>
+  </object-type>
+  <object-type name="QWebView">
+    <modify-function signature="print(QPrinter*)const" remove="all"/>
+  </object-type>
+
+  <load-typesystem name="typesystem_webkit.xml" generate="yes"/>
+</typesystem>
diff --git a/PySide/QtXml/CMakeLists.txt b/PySide/QtXml/CMakeLists.txt
index 6ee39d7..3e5a7c7 100644
--- a/PySide/QtXml/CMakeLists.txt
+++ b/PySide/QtXml/CMakeLists.txt
@@ -35,31 +35,26 @@ ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtXml/qxmlreader_wrapper.cpp
 ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtXml/qxmlsimplereader_wrapper.cpp
 )
 
-execute_generator(xml QtXml_SRC "${CMAKE_CURRENT_BINARY_DIR}:${QtCore_SOURCE_DIR}")
-
-include_directories(${CMAKE_CURRENT_SOURCE_DIR}
-                    ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtXml
-                    ${CMAKE_SOURCE_DIR}
-                    ${QT_INCLUDE_DIR}
-                    ${QT_QTCORE_INCLUDE_DIR}
-                    ${QT_QTXML_INCLUDE_DIR}
-                    ${SHIBOKEN_INCLUDE_DIR}
-                    ${libpyside_SOURCE_DIR}
-                    ${PYTHON_INCLUDE_PATH}
-                    ${QtCore_BINARY_DIR}/PySide/QtCore
-                    )
-add_library(QtXml MODULE ${QtXml_SRC})
-set_property(TARGET QtXml PROPERTY PREFIX "")
-target_link_libraries(QtXml
-                      pyside
-                      ${PYTHON_LIBRARIES}
-                      ${SHIBOKEN_LIBRARY}
-                      ${QT_QTXML_LIBRARY}
-                      )
-add_dependencies(QtXml QtCore)
-
-# install
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/QtXml${CMAKE_DEBUG_POSTFIX}.so DESTINATION ${SITE_PACKAGE}/PySide)
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtXml/pyside_qtxml_python.h
-        DESTINATION include/PySide/QtXml/)
-
+set(QtXml_typesystem_path "${QtCore_SOURCE_DIR}${PATH_SEP}${QtCore_BINARY_DIR}")
+set(QtXml_include_dirs      ${CMAKE_CURRENT_SOURCE_DIR}
+                            ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtXml
+                            ${CMAKE_SOURCE_DIR}
+                            ${QT_INCLUDE_DIR}
+                            ${QT_QTCORE_INCLUDE_DIR}
+                            ${QT_QTXML_INCLUDE_DIR}
+                            ${SHIBOKEN_INCLUDE_DIR}
+                            ${libpyside_SOURCE_DIR}
+                            ${SHIBOKEN_PYTHON_INCLUDE_DIR}
+                            ${QtCore_BINARY_DIR}/PySide/QtCore)
+set(QtXml_libraries         pyside
+                            ${SHIBOKEN_PYTHON_LIBRARIES}
+                            ${SHIBOKEN_LIBRARY}
+                            ${QT_QTXML_LIBRARY})
+set(QtXml_deps QtCore)
+create_pyside_module(QtXml
+                     QtXml_include_dirs
+                     QtXml_libraries
+                     QtXml_deps
+                     QtXml_typesystem_path
+                     QtXml_SRC
+                     "")
diff --git a/PySide/QtXml/typesystem_xml.xml b/PySide/QtXml/typesystem_xml.xml
index 5c0811e..19b1520 100644
--- a/PySide/QtXml/typesystem_xml.xml
+++ b/PySide/QtXml/typesystem_xml.xml
@@ -1,4 +1,23 @@
 <?xml version="1.0"?>
+<!--
+    This file is part of PySide project.
+    Copyright (C) 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
+    Contact: PySide team <contact@pyside.org>
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+-->
 <typesystem package="PySide.QtXml">
     <load-typesystem name="typesystem_templates.xml" generate="no" />
     <load-typesystem name="typesystem_core.xml" generate="no" />
@@ -8,46 +27,26 @@
     <rejection class="QXmlInputSource" field-name="EndOfData"/>
     <rejection class="QXmlInputSource" field-name="EndOfDocument"/>
 
-    <enum-type name="QDomNode::NodeType"/>
-    <enum-type name="QDomNode::EncodingPolicy"/>
-    <enum-type name="QDomImplementation::InvalidDataPolicy"/>
-<!--
-    <enum-type name="QXmlStreamReader::Error" />
-    <enum-type name="QXmlStreamReader::TokenType" />
--->
-
-    <value-type name="QDomAttr">
-        <modify-function signature="operator=(QDomAttr)" remove="all"/>
-        <modify-function signature="nodeType()const" remove="all"/>
-    </value-type>
-
-    <value-type name="QDomCDATASection">
-        <modify-function signature="operator=(QDomCDATASection)" remove="all"/>
-        <modify-function signature="nodeType()const" remove="all"/>
-    </value-type>
-
-    <value-type name="QDomCharacterData">
-        <modify-function signature="operator=(QDomCharacterData)" remove="all"/>
-        <modify-function signature="nodeType()const" remove="all"/>
-    </value-type>
-
-    <value-type name="QDomComment">
-        <modify-function signature="operator=(QDomComment)" remove="all"/>
-        <modify-function signature="nodeType()const" remove="all"/>
-    </value-type>
+    <value-type name="QDomAttr" />
+    <value-type name="QDomCDATASection" />
+    <value-type name="QDomCharacterData" />
+    <value-type name="QDomComment" />
 
     <template name="qdomdocument_setcontent">
-        QString _errorMsg_;
-        int _errorLine_ = 0;
-        int _errorColumn_ = 0;
-        bool _ret_ = %CPPSELF.%FUNCTION_NAME(%ARGUMENT_NAMES, &amp;_errorMsg_, &amp;_errorLine_, &amp;_errorColumn_);
-        %PYARG_0 = Shiboken::makeTuple(_ret_, _errorMsg_, _errorLine_, _errorColumn_);
+    QString _errorMsg_;
+    int _errorLine_ = 0;
+    int _errorColumn_ = 0;
+    %BEGIN_ALLOW_THREADS
+    bool _ret_ = %CPPSELF.%FUNCTION_NAME(%ARGUMENT_NAMES, &amp;_errorMsg_, &amp;_errorLine_, &amp;_errorColumn_);
+    %END_ALLOW_THREADS
+    %PYARG_0 = PyTuple_New(4);
+    PyTuple_SET_ITEM(%PYARG_0, 0, %CONVERTTOPYTHON[bool](_ret_));
+    PyTuple_SET_ITEM(%PYARG_0, 1, %CONVERTTOPYTHON[QString](_errorMsg_));
+    PyTuple_SET_ITEM(%PYARG_0, 2, %CONVERTTOPYTHON[int](_errorLine_));
+    PyTuple_SET_ITEM(%PYARG_0, 3, %CONVERTTOPYTHON[int](_errorColumn_));
     </template>
 
     <value-type name="QDomDocument">
-        <modify-function signature="nodeType()const" remove="all"/>
-        <modify-function signature="operator=(QDomDocument)" remove="all"/>
-
         <!-- will be replaced in inject code -->
         <modify-function signature="setContent(const QByteArray&amp;, bool, QString*, int*, int*)">
             <modify-argument index="3">
@@ -62,6 +61,9 @@
                 <remove-argument/>
                 <remove-default-expression/>
             </modify-argument>
+            <modify-argument index="return">
+                <replace-type modified-type="(retval, errorMsg, errorLine, errorColumn)"/>
+            </modify-argument>
             <inject-code class="target" position="beginning">
                 <insert-template name="qdomdocument_setcontent" />
             </inject-code>
@@ -79,6 +81,9 @@
                 <remove-argument/>
                 <remove-default-expression/>
             </modify-argument>
+            <modify-argument index="return">
+                <replace-type modified-type="(retval, errorMsg, errorLine, errorColumn)"/>
+            </modify-argument>
             <inject-code class="target" position="beginning">
                 <insert-template name="qdomdocument_setcontent" />
             </inject-code>
@@ -96,6 +101,9 @@
                 <remove-argument/>
                 <remove-default-expression/>
             </modify-argument>
+            <modify-argument index="return">
+                <replace-type modified-type="(retval, errorMsg, errorLine, errorColumn)"/>
+            </modify-argument>
             <inject-code class="target" position="beginning">
                 <insert-template name="qdomdocument_setcontent" />
             </inject-code>
@@ -113,6 +121,9 @@
                 <remove-argument/>
                 <remove-default-expression/>
             </modify-argument>
+            <modify-argument index="return">
+                <replace-type modified-type="(retval, errorMsg, errorLine, errorColumn)"/>
+            </modify-argument>
             <inject-code class="target" position="beginning">
                 <insert-template name="qdomdocument_setcontent" />
             </inject-code>
@@ -130,6 +141,9 @@
                 <remove-argument/>
                 <remove-default-expression/>
             </modify-argument>
+            <modify-argument index="return">
+                <replace-type modified-type="(retval, errorMsg, errorLine, errorColumn)"/>
+            </modify-argument>
             <inject-code class="target" position="beginning">
                 <insert-template name="qdomdocument_setcontent" />
             </inject-code>
@@ -147,6 +161,9 @@
                 <remove-argument/>
                 <remove-default-expression/>
             </modify-argument>
+            <modify-argument index="return">
+                <replace-type modified-type="(retval, errorMsg, errorLine, errorColumn)"/>
+            </modify-argument>
             <inject-code class="target" position="beginning">
                 <insert-template name="qdomdocument_setcontent" />
             </inject-code>
@@ -164,6 +181,9 @@
                 <remove-argument/>
                 <remove-default-expression/>
             </modify-argument>
+            <modify-argument index="return">
+                <replace-type modified-type="(retval, errorMsg, errorLine, errorColumn)"/>
+            </modify-argument>
             <inject-code class="target" position="beginning">
                 <insert-template name="qdomdocument_setcontent" />
             </inject-code>
@@ -181,80 +201,42 @@
                 <remove-argument/>
                 <remove-default-expression/>
             </modify-argument>
+            <modify-argument index="return">
+                <replace-type modified-type="(retval, errorMsg, errorLine, errorColumn)"/>
+            </modify-argument>
             <inject-code class="target" position="beginning">
                 <insert-template name="qdomdocument_setcontent" />
             </inject-code>
         </modify-function>
     </value-type>
 
-    <value-type name="QDomDocumentFragment">
-        <modify-function signature="nodeType()const" remove="all"/>
-        <modify-function signature="operator=(QDomDocumentFragment)" remove="all"/>
-    </value-type>
-
-    <value-type name="QDomDocumentType">
-        <modify-function signature="nodeType()const" remove="all"/>
-        <modify-function signature="operator=(QDomDocumentType)" remove="all"/>
-    </value-type>
-
-    <value-type name="QDomEntity">
-        <modify-function signature="nodeType()const" remove="all"/>
-        <modify-function signature="operator=(QDomEntity)" remove="all"/>
-    </value-type>
-
-    <value-type name="QDomEntityReference">
-        <modify-function signature="nodeType()const" remove="all"/>
-        <modify-function signature="operator=(QDomEntityReference)" remove="all"/>
-    </value-type>
-
+    <value-type name="QDomDocumentFragment" />
+    <value-type name="QDomDocumentType" />
+    <value-type name="QDomEntity" />
+    <value-type name="QDomEntityReference" />
     <value-type name="QDomImplementation">
-        <modify-function signature="operator=(QDomImplementation)" remove="all"/>
+        <enum-type name="InvalidDataPolicy"/>
     </value-type>
 
-    <value-type name="QDomNamedNodeMap">
-        <modify-function signature="operator=(QDomNamedNodeMap)" remove="all"/>
-    </value-type>
+    <value-type name="QDomNamedNodeMap" />
 
     <value-type name="QDomNode">
-        <modify-function signature="operator=(QDomNode)" remove="all"/>
+        <enum-type name="EncodingPolicy"/>
+        <enum-type name="NodeType"/>
         <modify-function signature="save(QTextStream&amp;, int)const" allow-thread="yes"/>
         <modify-function signature="save(QTextStream&amp;, int, QDomNode::EncodingPolicy)const" allow-thread="yes"/>
     </value-type>
 
-    <value-type name="QDomNodeList">
-        <modify-function signature="operator=(const QDomNodeList &amp;)" remove="all"/>
-    </value-type>
+    <value-type name="QDomNodeList" />
+    <value-type name="QDomNotation" />
+    <value-type name="QDomProcessingInstruction" />
 
-    <value-type name="QDomNotation">
-        <modify-function signature="nodeType()const" remove="all"/>
-        <modify-function signature="operator=(QDomNotation)" remove="all"/>
-    </value-type>
+    <value-type name="QDomText" />
 
-    <value-type name="QDomProcessingInstruction">
-        <modify-function signature="nodeType()const" remove="all"/>
-        <modify-function signature="operator=(QDomProcessingInstruction)" remove="all"/>
-    </value-type>
-
-    <value-type name="QDomText">
-        <modify-function signature="nodeType()const" remove="all"/>
-        <modify-function signature="operator=(const QDomText &amp;)" remove="all"/>
-    </value-type>
-
-    <value-type name="QXmlParseException"/>
-
-<!-- These are defined in QtCore
-    <value-type name="QXmlStreamAttribute"/>
-    <value-type name="QXmlStreamAttributes"/>
-
-    <value-type name="QXmlStreamNamespaceDeclaration"/>
-    <value-type name="QXmlStreamNotationDeclaration"/>
-    <value-type name="QXmlStreamEntityDeclaration"/>
--->
+    <object-type name="QXmlParseException"/>
 
     <value-type name="QXmlAttributes"/>
 
-    <!-- FIXME: This needs to be changed to value-type if
-         QXmlNamespaceSupport is ever passed by value -->
     <object-type name="QXmlNamespaceSupport"/>
 
     <value-type name="QDomElement"/>
@@ -272,8 +254,8 @@
     <object-type name="QXmlLexicalHandler"/>
 
     <template name="QXmlEntityResolver_resolveEntity_return_conversion_native">
-        AutoDecRef _py_ok_(PySequence_GetItem(%PYARG_0, 0));
-        AutoDecRef _py_ret_(PySequence_GetItem(%PYARG_0, 1));
+        Shiboken::AutoDecRef  _py_ok_(PySequence_GetItem(%PYARG_0, 0));
+        Shiboken::AutoDecRef  _py_ret_(PySequence_GetItem(%PYARG_0, 1));
         %RETURN_TYPE %out = %CONVERTTOCPP[%RETURN_TYPE](_py_ok_);
         %3 = %CONVERTTOCPP[QXmlInputSource*](_py_ret_);
     </template>
@@ -290,9 +272,13 @@
                 </conversion-rule>
             </modify-argument>
             <inject-code class="target" position="end">
-                QXmlInputSource* _qxmlinputsource_arg_ = 0;
-                %RETURN_TYPE %0 = %CPPSELF.%FUNCTION_NAME(%1, %2, _qxmlinputsource_arg_);
-                %PYARG_0 = Shiboken::makeTuple(%0, _qxmlinputsource_arg_);
+            QXmlInputSource* _qxmlinputsource_arg_ = 0;
+            %BEGIN_ALLOW_THREADS
+            %RETURN_TYPE %0 = %CPPSELF.%FUNCTION_NAME(%1, %2, _qxmlinputsource_arg_);
+            %END_ALLOW_THREADS
+            %PYARG_0 = PyTuple_New(2);
+            PyTuple_SET_ITEM(%PYARG_0, 0, %CONVERTTOPYTHON[%RETURN_TYPE](%0));
+            PyTuple_SET_ITEM(%PYARG_0, 1, %CONVERTTOPYTHON[QXmlInputSource*](_qxmlinputsource_arg_));
             </inject-code>
         </modify-function>
     </object-type>
@@ -313,23 +299,19 @@
                 </conversion-rule>
             </modify-argument>
             <inject-code class="target" position="end">
-                QXmlInputSource* _qxmlinputsource_arg_ = 0;
-                %RETURN_TYPE %0 = %CPPSELF.%TYPE::%FUNCTION_NAME(%1, %2, _qxmlinputsource_arg_);
-                %PYARG_0 = Shiboken::makeTuple(%0, _qxmlinputsource_arg_);
+            QXmlInputSource* _qxmlinputsource_arg_ = 0;
+            %BEGIN_ALLOW_THREADS
+            %RETURN_TYPE %0 = %CPPSELF.%TYPE::%FUNCTION_NAME(%1, %2, _qxmlinputsource_arg_);
+            %END_ALLOW_THREADS
+            %PYARG_0 = PyTuple_New(2);
+            PyTuple_SET_ITEM(%PYARG_0, 0, %CONVERTTOPYTHON[%RETURN_TYPE](%0));
+            PyTuple_SET_ITEM(%PYARG_0, 1, %CONVERTTOPYTHON[QXmlInputSource*](_qxmlinputsource_arg_));
             </inject-code>
         </modify-function>
     </object-type>
     <object-type name="QXmlInputSource"/>
     <object-type name="QXmlLocator"/>
 
-<!-- These are defined already in QtCore
-    <object-type name="QXmlStreamReader">
-    </object-type>
-
-    <object-type name="QXmlStreamWriter">
-    </object-type>
--->
-
     <object-type name="QXmlReader">
         <modify-function signature="parse(const QXmlInputSource*)">
             <modify-argument index="1" invalidate-after-use="yes"/>
@@ -432,9 +414,5 @@
             </inject-code>
         </modify-function>
     </object-type>
-
-    <suppress-warning text="Shadowing: QDomNode::attributes() const and QDomElement::attributes() const"/>
-    <suppress-warning text="Shadowing: QDomNode::nodeType() const and QDomElement::nodeType() const"/>
-
 </typesystem>
 
diff --git a/PySide/QtXmlPatterns/CMakeLists.txt b/PySide/QtXmlPatterns/CMakeLists.txt
index 73c6e1d..6efa4b0 100644
--- a/PySide/QtXmlPatterns/CMakeLists.txt
+++ b/PySide/QtXmlPatterns/CMakeLists.txt
@@ -26,28 +26,25 @@ set(QtXmlPatterns_SRC
     ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtXmlPatterns/qxmlserializer_wrapper.cpp
     ${QtXmlPatterns_46_SRC}
 )
-
-execute_generator(xmlpatterns QtXmlPatterns_SRC "${CMAKE_CURRENT_BINARY_DIR}:${QtCore_SOURCE_DIR}")
-
-include_directories(${CMAKE_CURRENT_SOURCE_DIR}
-                    ${QT_QTCORE_INCLUDE_DIR}
-                    ${QT_QTXMLPATTERNS_INCLUDE_DIR}
-                    ${PYTHON_INCLUDE_PATH}
-                    ${SHIBOKEN_INCLUDE_DIR}
-                    ${libpyside_SOURCE_DIR}
-                    ${QtCore_BINARY_DIR}/PySide/QtCore/
-                    ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtXmlPatterns)
-add_library(QtXmlPatterns MODULE ${QtXmlPatterns_SRC})
-set_target_properties(QtXmlPatterns PROPERTIES PREFIX "")
-target_link_libraries(QtXmlPatterns
-                      pyside
-                      ${PYTHON_LIBRARIES}
-                      ${QT_QTCORE_LIBRARY}
-                      ${QT_QTXMLPATTERNS_LIBRARY})
-add_dependencies(QtXmlPatterns QtCore)
-# install
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/QtXmlPatterns${CMAKE_DEBUG_POSTFIX}.so
-        DESTINATION ${SITE_PACKAGE}/PySide)
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtXmlPatterns/pyside_qtxmlpatterns_python.h
-        DESTINATION include/PySide/QtXmlPatterns/)
+set(QtXmlPatterns_typesystem_path "${QtCore_SOURCE_DIR}${PATH_SEP}${QtCore_BINARY_DIR}")
+set(QtXmlPatterns_include_dirs  ${CMAKE_CURRENT_SOURCE_DIR}
+                                ${QT_QTCORE_INCLUDE_DIR}
+                                ${QT_QTXMLPATTERNS_INCLUDE_DIR}
+                                ${SHIBOKEN_PYTHON_INCLUDE_DIR}
+                                ${SHIBOKEN_INCLUDE_DIR}
+                                ${libpyside_SOURCE_DIR}
+                                ${QtCore_BINARY_DIR}/PySide/QtCore/
+                                ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtXmlPatterns)
+set(QtXmlPatterns_libraries     pyside
+                                ${SHIBOKEN_PYTHON_LIBRARIES}
+                                ${QT_QTCORE_LIBRARY}
+                                ${QT_QTXMLPATTERNS_LIBRARY})
+set(QtXmlPatterns_deps QtCore)
+create_pyside_module(QtXmlPatterns
+                     QtXmlPatterns_include_dirs
+                     QtXmlPatterns_libraries
+                     QtXmlPatterns_deps
+                     QtXmlPatterns_typesystem_path
+                     QtXmlPatterns_SRC
+                     "")
 
diff --git a/PySide/QtXmlPatterns/typesystem_xmlpatterns.xml b/PySide/QtXmlPatterns/typesystem_xmlpatterns.xml
index 4f10bda..d3ae58f 100644
--- a/PySide/QtXmlPatterns/typesystem_xmlpatterns.xml
+++ b/PySide/QtXmlPatterns/typesystem_xmlpatterns.xml
@@ -1,24 +1,51 @@
 <?xml version="1.0"?>
+<!--
+    This file is part of PySide project.
+    Copyright (C) 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
+    Contact: PySide team <contact@pyside.org>
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+-->
 <typesystem package="PySide.QtXmlPatterns">
     <load-typesystem name="typesystem_core.xml" generate="no"/>
 
-    <enum-type name="QAbstractXmlNodeModel::SimpleAxis" />
-    <enum-type name="QAbstractXmlNodeModel::NodeCopySetting" />
-    <enum-type name="QXmlNodeModelIndex::NodeKind" />
-    <enum-type name="QXmlNodeModelIndex::DocumentOrder" />
-    <enum-type name="QXmlNodeModelIndex::Axis"/>
-    <enum-type name="QXmlQuery::QueryLanguage" />
-
-    <value-type name="QXmlSchema"/>
-    <object-type name="QXmlSchemaValidator"/>
+    <object-type name="QXmlSchema" since="4.6" /> <!-- Qt scoped pointer does not allow declare this as value type -->
+    <object-type name="QXmlSchemaValidator" since="4.6">
+      <modify-function signature="schema() const">
+        <modify-argument index="return">
+          <replace-type modified-type="QXmlSchema*"/>
+          <define-ownership owner="target"/>
+        </modify-argument>
+        <inject-code>
+          QXmlSchema* %0 = new QXmlSchema(%CPPSELF.schema());
+          %PYARG_0 = %CONVERTTOPYTHON[QXmlSchema*](%0);
+        </inject-code>
+      </modify-function>
+    </object-type>
     <object-type name="QAbstractMessageHandler" />
     <object-type name="QAbstractUriResolver" />
-    <object-type name="QAbstractXmlNodeModel" />
+    <object-type name="QAbstractXmlNodeModel">
+        <enum-type name="NodeCopySetting" />
+        <enum-type name="SimpleAxis" />
+    </object-type>
     <object-type name="QAbstractXmlReceiver" />
     <value-type name="QSourceLocation" />
     <object-type name="QXmlFormatter" />
     <value-type name="QXmlItem" />
     <value-type name="QXmlName">
+        <!-- ### These methods aren't part of Qt public API -->
         <modify-function signature="QXmlName(short, short, short)" remove="all" />
         <modify-function signature="setNamespaceURI(short)" remove="all" />
         <modify-function signature="localName()const" remove="all" />
@@ -30,11 +57,19 @@
         <modify-function signature="setPrefix(short)" remove="all" />
         <modify-function signature="setLocalName(short)" remove="all" />
         <modify-function signature="code()const" remove="all" />
+        <!-- ### -->
     </value-type>
     <value-type name="QXmlNamePool" />
+
+    <rejection class="QXmlNodeModelIndex" function-name="type" />
+    <rejection class="QXmlNodeModelIndex" function-name="sequencedTypedValue" />
+    <rejection class="QXmlNodeModelIndex" function-name="iterate" />
+    <!-- ### This enum isn't part of Qt public API -->
+    <suppress-warning text="enum 'QXmlNodeModelIndex::Axis' does not have a type entry or is not an enum"/>
     <value-type name="QXmlNodeModelIndex">
-        <modify-function signature="internalPointer()const" remove="all" />
-        <!-- Qt internal methods -->
+        <enum-type name="DocumentOrder" />
+        <enum-type name="NodeKind" />
+        <!-- ### Qt internal methods -->
         <modify-function signature="name()const" remove="all" />
         <modify-function signature="root()const" remove="all" />
         <modify-function signature="documentUri()const" remove="all" />
@@ -48,13 +83,19 @@
         <modify-function signature="stringValue()const" remove="all" />
         <modify-function signature="is(const QXmlNodeModelIndex &amp;)const" remove="all" />
         <modify-function signature="reset()" remove="all" />
+        <!-- ### -->
     </value-type>
 
-    <value-type name="QXmlQuery" />
+    <value-type name="QXmlQuery">
+        <!-- ### TODO: must evaluate if anything other than removal is needed. -->
+        <enum-type name="QueryLanguage" />
+        <modify-function signature="evaluateTo(QStringList*)const" remove="all" />
+        <modify-function signature="evaluateTo(QString*)const" remove="all" />
+        <!-- ### -->
+    </value-type>
     <object-type name="QXmlResultItems" />
     <object-type name="QXmlSerializer" />
 
-
-    <suppress-warning text="unhandled enum value: ForwardAxis in QXmlNodeModelIndex::Axis"/>
-    <suppress-warning text="unhandled enum value: ReverseAxis in QXmlNodeModelIndex::Axis"/>
+    <suppress-warning text="class 'QAbstractXmlNodeModel' inherits from unknown base class 'QSharedData'"/>
+    <suppress-warning text="class not found for setup inheritance 'QSharedData'"/>
 </typesystem>
diff --git a/PySide/__init__.py b/PySide/__init__.py
deleted file mode 100644
index d9db08e..0000000
--- a/PySide/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-__all__ = ['QtCore', 'QtGui', 'QtNetwork', 'QtOpenGL', 'QtSql', 'QtSvg', 'QtTest', 'QtWebKit', 'QtScript']
diff --git a/PySide/__init__.py.in b/PySide/__init__.py.in
new file mode 100644
index 0000000..da6cd69
--- /dev/null
+++ b/PySide/__init__.py.in
@@ -0,0 +1,3 @@
+__all__ = ['QtCore', 'QtGui', 'QtNetwork', 'QtOpenGL', 'QtSql', 'QtSvg', 'QtTest', 'QtWebKit', 'QtScript']
+__version__         = "@BINDING_API_VERSION_FULL@"
+__version_info__    = (@BINDING_API_MAJOR_VERSION@, @BINDING_API_MINOR_VERSION@, @BINDING_API_MICRO_VERSION@, "@BINDING_API_RELEASE_LEVEL@", @BINDING_API_SERIAL@)
diff --git a/PySide/global.h.in b/PySide/global.h.in
index c9c8ba8..acd30d0 100644
--- a/PySide/global.h.in
+++ b/PySide/global.h.in
@@ -5,12 +5,6 @@
 ** This file is part of the QtCore module of the Qt Toolkit, plus some
 ** modifications by PySide team.
 **
-** Commercial Usage
-** Licensees holding valid Qt Commercial licenses may use this file in
-** accordance with the Qt Commercial License Agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Nokia.
-**
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
 ** General Public License version 2.1 as published by the Free Software
@@ -19,19 +13,6 @@
 ** ensure the GNU Lesser General Public License version 2.1 requirements
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** In addition, as a special exception, Nokia gives you certain
-** additional rights. These rights are described in the Nokia Qt LGPL
-** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
 **
@@ -39,8 +20,9 @@
 
 #undef QT_NO_STL
 #undef QT_NO_STL_WCHAR
+#define Q_BYTE_ORDER // used to enable QSysInfo.Endian detection on MacOSX
 
-#include <QtCore/qnamespace.h>
+#include "@QT_QTCORE_INCLUDE_DIR@/qnamespace.h"
 
 QT_BEGIN_HEADER
 
@@ -337,1171 +319,101 @@ QT_END_HEADER
 #elif @ENABLE_MAC@
   #define Q_WS_MAC
 #elif @ENABLE_WIN@
+  #include "pysidewtypes.h"
   #define Q_WS_WIN
+#elif @ENABLE_SIMULATOR@
+  #define Q_WS_SIMULATOR
 #endif
 
 // There are symbols in Qt that exist in Debug but
 // not in release
 #define QT_NO_DEBUG
 
-#include <QtCore/QtCore>
-#if @ENABLE_MAC@
+#include "@QT_QTCORE_INCLUDE_DIR@/QtCore"
+#if @ENABLE_MAC@ || @ENABLE_WIN@
+  // Workaround to parse the QApplication header
+  #define Q_INTERNAL_QAPP_SRC
   #undef qdoc
 #endif
-#include <QtGui/QtGui>
+#include "@QT_QTGUI_INCLUDE_DIR@/QtGui"
+#include "qpytextobject.h"  // PySide class
 #if @ENABLE_X11@
-  #include <QtGui/QX11Info>
+  #include "@QT_QTGUI_INCLUDE_DIR@/QX11Info"
+  #include "@QT_QTGUI_INCLUDE_DIR@/QX11EmbedContainer"
+  #include "@QT_QTGUI_INCLUDE_DIR@/QX11EmbedWidget"
+#elif @ENABLE_MAC@
+  #include "@QT_QTGUI_INCLUDE_DIR@/qmacstyle_mac.h"
 #endif
-#include <QtXml/QtXml>
-#include <QtUiTools/QtUiTools>
-#include <QtNetwork/QtNetwork>
-#include <QtScript/QtScript>
-#include <QtScriptTools/QtScriptTools>
-#include <QtMultimedia/QtMultimedia>
+#include "@QT_QTXML_INCLUDE_DIR@/QtXml"
+#include "@QT_QTUITOOLS_INCLUDE_DIR@/QtUiTools"
+#include "@QT_QTNETWORK_INCLUDE_DIR@/QtNetwork"
+#include "@QT_QTSCRIPT_INCLUDE_DIR@/QtScript"
+#include "@QT_QTSCRIPTTOOLS_INCLUDE_DIR@/QtScriptTools"
+#include "@QT_QTMULTIMEDIA_INCLUDE_DIR@/QtMultimedia"
 #include <QtMaemo5/QtMaemo5>
-#include <QtDeclarative/QtDeclarative>
+#include "@QT_QTDECLARATIVE_INCLUDE_DIR@/QtDeclarative"
 
 // QT_GUI_LIB must be defined to QSqlRelationalDelegate become visible
 #define QT_GUI_LIB
 #undef Q_DECLARE_INTERFACE
-#include <QtSql/QtSql>
-#include <QtSvg/QtSvg>
+#include "@QT_QTSQL_INCLUDE_DIR@/QtSql"
+#include "@QT_QTSVG_INCLUDE_DIR@/QtSvg"
 
-#ifndef QT_NO_XMLPATTERNS
-#  include <QtXmlPatterns/QtXmlPatterns>
+#if @QT_QTXMLPATTERNS_FOUND@
+#  include "@QT_QTXMLPATTERNS_INCLUDE_DIR@/QtXmlPatterns"
 #endif
 
-#ifndef QT_NO_WEBKIT
-#  include <QtWebKit/QtWebKit>
+#if @QT_QTWEBKIT_FOUND@
+#  include "@QT_QTWEBKIT_INCLUDE_DIR@/QtWebKit"
 #endif
 
-#ifndef QT_NO_TEST
-#  include <QtTest/QtTest>
+#if @QT_QTTEST_FOUND@
+#  include "@QT_QTTEST_INCLUDE_DIR@/QtTest"
+#if @QT_VERSION_MINOR@ > 5
+#  include "pysideqtesttouch.h"
+#endif
 #endif
 
 // Phonon
 #include "phonon/pyside_phonon.h"
-#include<phonon/abstractaudiooutput.h>
-#include<phonon/abstractmediastream.h>
-#include<phonon/abstractvideooutput.h>
-#include<phonon/addoninterface.h>
-#include<phonon/audiooutput.h>
-#include<phonon/audiooutputinterface.h>
-#include<phonon/backendcapabilities.h>
-#include<phonon/backendinterface.h>
-#include<phonon/effect.h>
-#include<phonon/effectinterface.h>
-#include<phonon/effectparameter.h>
-#include<phonon/effectwidget.h>
-#include<phonon/mediacontroller.h>
-#include<phonon/medianode.h>
-#include<phonon/mediaobject.h>
-#include<phonon/mediaobjectinterface.h>
-#include<phonon/mediasource.h>
-#include<phonon/objectdescription.h>
-#include<phonon/objectdescriptionmodel.h>
-#include<phonon/path.h>
-#include<phonon/phonon_export.h>
-#include<phonon/phonondefs.h>
-#include<phonon/phononnamespace.h>
-#include<phonon/platformplugin.h>
-#include<phonon/seekslider.h>
-#include<phonon/streaminterface.h>
-#include<phonon/videoplayer.h>
-#include<phonon/videowidget.h>
-#include<phonon/videowidgetinterface.h>
-#include<phonon/volumefadereffect.h>
-#include<phonon/volumefaderinterface.h>
-#include<phonon/volumeslider.h>
+#include "@QT_PHONON_INCLUDE_DIR@/abstractaudiooutput.h"
+#include "@QT_PHONON_INCLUDE_DIR@/abstractmediastream.h"
+#include "@QT_PHONON_INCLUDE_DIR@/abstractvideooutput.h"
+#include "@QT_PHONON_INCLUDE_DIR@/addoninterface.h"
+#include "@QT_PHONON_INCLUDE_DIR@/audiooutput.h"
+#include "@QT_PHONON_INCLUDE_DIR@/audiooutputinterface.h"
+#include "@QT_PHONON_INCLUDE_DIR@/backendcapabilities.h"
+#include "@QT_PHONON_INCLUDE_DIR@/backendinterface.h"
+#include "@QT_PHONON_INCLUDE_DIR@/effect.h"
+#include "@QT_PHONON_INCLUDE_DIR@/effectinterface.h"
+#include "@QT_PHONON_INCLUDE_DIR@/effectparameter.h"
+#include "@QT_PHONON_INCLUDE_DIR@/effectwidget.h"
+#include "@QT_PHONON_INCLUDE_DIR@/mediacontroller.h"
+#include "@QT_PHONON_INCLUDE_DIR@/medianode.h"
+#include "@QT_PHONON_INCLUDE_DIR@/mediaobject.h"
+#include "@QT_PHONON_INCLUDE_DIR@/mediaobjectinterface.h"
+#include "@QT_PHONON_INCLUDE_DIR@/mediasource.h"
+#include "@QT_PHONON_INCLUDE_DIR@/objectdescription.h"
+#include "@QT_PHONON_INCLUDE_DIR@/objectdescriptionmodel.h"
+#include "@QT_PHONON_INCLUDE_DIR@/path.h"
+#include "@QT_PHONON_INCLUDE_DIR@/phonon_export.h"
+#include "@QT_PHONON_INCLUDE_DIR@/phonondefs.h"
+#include "@QT_PHONON_INCLUDE_DIR@/phononnamespace.h"
+#include "@QT_PHONON_INCLUDE_DIR@/platformplugin.h"
+#include "@QT_PHONON_INCLUDE_DIR@/seekslider.h"
+#include "@QT_PHONON_INCLUDE_DIR@/streaminterface.h"
+#include "@QT_PHONON_INCLUDE_DIR@/videoplayer.h"
+#include "@QT_PHONON_INCLUDE_DIR@/videowidget.h"
+#include "@QT_PHONON_INCLUDE_DIR@/videowidgetinterface.h"
+#include "@QT_PHONON_INCLUDE_DIR@/volumefadereffect.h"
+#include "@QT_PHONON_INCLUDE_DIR@/volumefaderinterface.h"
+#include "@QT_PHONON_INCLUDE_DIR@/volumeslider.h"
 
 //QtHelp need be included after QtSql
-#include <QtHelp/QtHelp>
+#include "@QT_QTHELP_INCLUDE_DIR@/QtHelp"
 
 #ifndef QT_NO_OPENGL
-#define GL_ACCUM                          0x0100
-#define GL_LOAD                           0x0101
-#define GL_RETURN                         0x0102
-#define GL_MULT                           0x0103
-#define GL_ADD                            0x0104
-
-/* AlphaFunction */
-#define GL_NEVER                          0x0200
-#define GL_LESS                           0x0201
-#define GL_EQUAL                          0x0202
-#define GL_LEQUAL                         0x0203
-#define GL_GREATER                        0x0204
-#define GL_NOTEQUAL                       0x0205
-#define GL_GEQUAL                         0x0206
-#define GL_ALWAYS                         0x0207
-
-/* AttribMask */
-#define GL_CURRENT_BIT                    0x00000001
-#define GL_POINT_BIT                      0x00000002
-#define GL_LINE_BIT                       0x00000004
-#define GL_POLYGON_BIT                    0x00000008
-#define GL_POLYGON_STIPPLE_BIT            0x00000010
-#define GL_PIXEL_MODE_BIT                 0x00000020
-#define GL_LIGHTING_BIT                   0x00000040
-#define GL_FOG_BIT                        0x00000080
-#define GL_DEPTH_BUFFER_BIT               0x00000100
-#define GL_ACCUM_BUFFER_BIT               0x00000200
-#define GL_STENCIL_BUFFER_BIT             0x00000400
-#define GL_VIEWPORT_BIT                   0x00000800
-#define GL_TRANSFORM_BIT                  0x00001000
-#define GL_ENABLE_BIT                     0x00002000
-#define GL_COLOR_BUFFER_BIT               0x00004000
-#define GL_HINT_BIT                       0x00008000
-#define GL_EVAL_BIT                       0x00010000
-#define GL_LIST_BIT                       0x00020000
-#define GL_TEXTURE_BIT                    0x00040000
-#define GL_SCISSOR_BIT                    0x00080000
-#define GL_ALL_ATTRIB_BITS                0x000fffff
-
-/* BeginMode */
-#define GL_POINTS                         0x0000
-#define GL_LINES                          0x0001
-#define GL_LINE_LOOP                      0x0002
-#define GL_LINE_STRIP                     0x0003
-#define GL_TRIANGLES                      0x0004
-#define GL_TRIANGLE_STRIP                 0x0005
-#define GL_TRIANGLE_FAN                   0x0006
-#define GL_QUADS                          0x0007
-#define GL_QUAD_STRIP                     0x0008
-#define GL_POLYGON                        0x0009
-
-/* BlendingFactorDest */
-#define GL_ZERO                           0
-#define GL_ONE                            1
-#define GL_SRC_COLOR                      0x0300
-#define GL_ONE_MINUS_SRC_COLOR            0x0301
-#define GL_SRC_ALPHA                      0x0302
-#define GL_ONE_MINUS_SRC_ALPHA            0x0303
-#define GL_DST_ALPHA                      0x0304
-#define GL_ONE_MINUS_DST_ALPHA            0x0305
-
-/* BlendingFactorSrc */
-/*      GL_ZERO */
-/*      GL_ONE */
-#define GL_DST_COLOR                      0x0306
-#define GL_ONE_MINUS_DST_COLOR            0x0307
-#define GL_SRC_ALPHA_SATURATE             0x0308
-/*      GL_SRC_ALPHA */
-/*      GL_ONE_MINUS_SRC_ALPHA */
-/*      GL_DST_ALPHA */
-/*      GL_ONE_MINUS_DST_ALPHA */
-
-/* Boolean */
-#define GL_TRUE                           1
-#define GL_FALSE                          0
-
-/* ClearBufferMask */
-/*      GL_COLOR_BUFFER_BIT */
-/*      GL_ACCUM_BUFFER_BIT */
-/*      GL_STENCIL_BUFFER_BIT */
-/*      GL_DEPTH_BUFFER_BIT */
-
-/* ClientArrayType */
-/*      GL_VERTEX_ARRAY */
-/*      GL_NORMAL_ARRAY */
-/*      GL_COLOR_ARRAY */
-/*      GL_INDEX_ARRAY */
-/*      GL_TEXTURE_COORD_ARRAY */
-/*      GL_EDGE_FLAG_ARRAY */
-
-/* ClipPlaneName */
-#define GL_CLIP_PLANE0                    0x3000
-#define GL_CLIP_PLANE1                    0x3001
-#define GL_CLIP_PLANE2                    0x3002
-#define GL_CLIP_PLANE3                    0x3003
-#define GL_CLIP_PLANE4                    0x3004
-#define GL_CLIP_PLANE5                    0x3005
-
-/* ColorMaterialFace */
-/*      GL_FRONT */
-/*      GL_BACK */
-/*      GL_FRONT_AND_BACK */
-
-/* ColorMaterialParameter */
-/*      GL_AMBIENT */
-/*      GL_DIFFUSE */
-/*      GL_SPECULAR */
-/*      GL_EMISSION */
-/*      GL_AMBIENT_AND_DIFFUSE */
-
-/* ColorPointerType */
-/*      GL_BYTE */
-/*      GL_UNSIGNED_BYTE */
-/*      GL_SHORT */
-/*      GL_UNSIGNED_SHORT */
-/*      GL_INT */
-/*      GL_UNSIGNED_INT */
-/*      GL_FLOAT */
-/*      GL_DOUBLE */
-
-/* CullFaceMode */
-/*      GL_FRONT */
-/*      GL_BACK */
-/*      GL_FRONT_AND_BACK */
-
-/* DataType */
-#define GL_BYTE                           0x1400
-#define GL_UNSIGNED_BYTE                  0x1401
-#define GL_SHORT                          0x1402
-#define GL_UNSIGNED_SHORT                 0x1403
-#define GL_INT                            0x1404
-#define GL_UNSIGNED_INT                   0x1405
-#define GL_FLOAT                          0x1406
-#define GL_2_BYTES                        0x1407
-#define GL_3_BYTES                        0x1408
-#define GL_4_BYTES                        0x1409
-#define GL_DOUBLE                         0x140A
-
-/* DepthFunction */
-/*      GL_NEVER */
-/*      GL_LESS */
-/*      GL_EQUAL */
-/*      GL_LEQUAL */
-/*      GL_GREATER */
-/*      GL_NOTEQUAL */
-/*      GL_GEQUAL */
-/*      GL_ALWAYS */
-
-/* DrawBufferMode */
-#define GL_NONE                           0
-#define GL_FRONT_LEFT                     0x0400
-#define GL_FRONT_RIGHT                    0x0401
-#define GL_BACK_LEFT                      0x0402
-#define GL_BACK_RIGHT                     0x0403
-#define GL_FRONT                          0x0404
-#define GL_BACK                           0x0405
-#define GL_LEFT                           0x0406
-#define GL_RIGHT                          0x0407
-#define GL_FRONT_AND_BACK                 0x0408
-#define GL_AUX0                           0x0409
-#define GL_AUX1                           0x040A
-#define GL_AUX2                           0x040B
-#define GL_AUX3                           0x040C
-
-/* Enable */
-/*      GL_FOG */
-/*      GL_LIGHTING */
-/*      GL_TEXTURE_1D */
-/*      GL_TEXTURE_2D */
-/*      GL_LINE_STIPPLE */
-/*      GL_POLYGON_STIPPLE */
-/*      GL_CULL_FACE */
-/*      GL_ALPHA_TEST */
-/*      GL_BLEND */
-/*      GL_INDEX_LOGIC_OP */
-/*      GL_COLOR_LOGIC_OP */
-/*      GL_DITHER */
-/*      GL_STENCIL_TEST */
-/*      GL_DEPTH_TEST */
-/*      GL_CLIP_PLANE0 */
-/*      GL_CLIP_PLANE1 */
-/*      GL_CLIP_PLANE2 */
-/*      GL_CLIP_PLANE3 */
-/*      GL_CLIP_PLANE4 */
-/*      GL_CLIP_PLANE5 */
-/*      GL_LIGHT0 */
-/*      GL_LIGHT1 */
-/*      GL_LIGHT2 */
-/*      GL_LIGHT3 */
-/*      GL_LIGHT4 */
-/*      GL_LIGHT5 */
-/*      GL_LIGHT6 */
-/*      GL_LIGHT7 */
-/*      GL_TEXTURE_GEN_S */
-/*      GL_TEXTURE_GEN_T */
-/*      GL_TEXTURE_GEN_R */
-/*      GL_TEXTURE_GEN_Q */
-/*      GL_MAP1_VERTEX_3 */
-/*      GL_MAP1_VERTEX_4 */
-/*      GL_MAP1_COLOR_4 */
-/*      GL_MAP1_INDEX */
-/*      GL_MAP1_NORMAL */
-/*      GL_MAP1_TEXTURE_COORD_1 */
-/*      GL_MAP1_TEXTURE_COORD_2 */
-/*      GL_MAP1_TEXTURE_COORD_3 */
-/*      GL_MAP1_TEXTURE_COORD_4 */
-/*      GL_MAP2_VERTEX_3 */
-/*      GL_MAP2_VERTEX_4 */
-/*      GL_MAP2_COLOR_4 */
-/*      GL_MAP2_INDEX */
-/*      GL_MAP2_NORMAL */
-/*      GL_MAP2_TEXTURE_COORD_1 */
-/*      GL_MAP2_TEXTURE_COORD_2 */
-/*      GL_MAP2_TEXTURE_COORD_3 */
-/*      GL_MAP2_TEXTURE_COORD_4 */
-/*      GL_POINT_SMOOTH */
-/*      GL_LINE_SMOOTH */
-/*      GL_POLYGON_SMOOTH */
-/*      GL_SCISSOR_TEST */
-/*      GL_COLOR_MATERIAL */
-/*      GL_NORMALIZE */
-/*      GL_AUTO_NORMAL */
-/*      GL_VERTEX_ARRAY */
-/*      GL_NORMAL_ARRAY */
-/*      GL_COLOR_ARRAY */
-/*      GL_INDEX_ARRAY */
-/*      GL_TEXTURE_COORD_ARRAY */
-/*      GL_EDGE_FLAG_ARRAY */
-/*      GL_POLYGON_OFFSET_POINT */
-/*      GL_POLYGON_OFFSET_LINE */
-/*      GL_POLYGON_OFFSET_FILL */
-
-/* ErrorCode */
-#define GL_NO_ERROR                       0
-#define GL_INVALID_ENUM                   0x0500
-#define GL_INVALID_VALUE                  0x0501
-#define GL_INVALID_OPERATION              0x0502
-#define GL_STACK_OVERFLOW                 0x0503
-#define GL_STACK_UNDERFLOW                0x0504
-#define GL_OUT_OF_MEMORY                  0x0505
-
-/* FeedBackMode */
-#define GL_2D                             0x0600
-#define GL_3D                             0x0601
-#define GL_3D_COLOR                       0x0602
-#define GL_3D_COLOR_TEXTURE               0x0603
-#define GL_4D_COLOR_TEXTURE               0x0604
-
-/* FeedBackToken */
-#define GL_PASS_THROUGH_TOKEN             0x0700
-#define GL_POINT_TOKEN                    0x0701
-#define GL_LINE_TOKEN                     0x0702
-#define GL_POLYGON_TOKEN                  0x0703
-#define GL_BITMAP_TOKEN                   0x0704
-#define GL_DRAW_PIXEL_TOKEN               0x0705
-#define GL_COPY_PIXEL_TOKEN               0x0706
-#define GL_LINE_RESET_TOKEN               0x0707
-
-/* FogMode */
-/*      GL_LINEAR */
-#define GL_EXP                            0x0800
-#define GL_EXP2                           0x0801
-
-
-/* FogParameter */
-/*      GL_FOG_COLOR */
-/*      GL_FOG_DENSITY */
-/*      GL_FOG_END */
-/*      GL_FOG_INDEX */
-/*      GL_FOG_MODE */
-/*      GL_FOG_START */
-
-/* FrontFaceDirection */
-#define GL_CW                             0x0900
-#define GL_CCW                            0x0901
-
-/* GetMapTarget */
-#define GL_COEFF                          0x0A00
-#define GL_ORDER                          0x0A01
-#define GL_DOMAIN                         0x0A02
-
-/* GetPixelMap */
-/*      GL_PIXEL_MAP_I_TO_I */
-/*      GL_PIXEL_MAP_S_TO_S */
-/*      GL_PIXEL_MAP_I_TO_R */
-/*      GL_PIXEL_MAP_I_TO_G */
-/*      GL_PIXEL_MAP_I_TO_B */
-/*      GL_PIXEL_MAP_I_TO_A */
-/*      GL_PIXEL_MAP_R_TO_R */
-/*      GL_PIXEL_MAP_G_TO_G */
-/*      GL_PIXEL_MAP_B_TO_B */
-/*      GL_PIXEL_MAP_A_TO_A */
-
-/* GetPointerTarget */
-/*      GL_VERTEX_ARRAY_POINTER */
-/*      GL_NORMAL_ARRAY_POINTER */
-/*      GL_COLOR_ARRAY_POINTER */
-/*      GL_INDEX_ARRAY_POINTER */
-/*      GL_TEXTURE_COORD_ARRAY_POINTER */
-/*      GL_EDGE_FLAG_ARRAY_POINTER */
-
-/* GetTarget */
-#define GL_CURRENT_COLOR                  0x0B00
-#define GL_CURRENT_INDEX                  0x0B01
-#define GL_CURRENT_NORMAL                 0x0B02
-#define GL_CURRENT_TEXTURE_COORDS         0x0B03
-#define GL_CURRENT_RASTER_COLOR           0x0B04
-#define GL_CURRENT_RASTER_INDEX           0x0B05
-#define GL_CURRENT_RASTER_TEXTURE_COORDS  0x0B06
-#define GL_CURRENT_RASTER_POSITION        0x0B07
-#define GL_CURRENT_RASTER_POSITION_VALID  0x0B08
-#define GL_CURRENT_RASTER_DISTANCE        0x0B09
-#define GL_POINT_SMOOTH                   0x0B10
-#define GL_POINT_SIZE                     0x0B11
-#define GL_POINT_SIZE_RANGE               0x0B12
-#define GL_POINT_SIZE_GRANULARITY         0x0B13
-#define GL_LINE_SMOOTH                    0x0B20
-#define GL_LINE_WIDTH                     0x0B21
-#define GL_LINE_WIDTH_RANGE               0x0B22
-#define GL_LINE_WIDTH_GRANULARITY         0x0B23
-#define GL_LINE_STIPPLE                   0x0B24
-#define GL_LINE_STIPPLE_PATTERN           0x0B25
-#define GL_LINE_STIPPLE_REPEAT            0x0B26
-#define GL_LIST_MODE                      0x0B30
-#define GL_MAX_LIST_NESTING               0x0B31
-#define GL_LIST_BASE                      0x0B32
-#define GL_LIST_INDEX                     0x0B33
-#define GL_POLYGON_MODE                   0x0B40
-#define GL_POLYGON_SMOOTH                 0x0B41
-#define GL_POLYGON_STIPPLE                0x0B42
-#define GL_EDGE_FLAG                      0x0B43
-#define GL_CULL_FACE                      0x0B44
-#define GL_CULL_FACE_MODE                 0x0B45
-#define GL_FRONT_FACE                     0x0B46
-#define GL_LIGHTING                       0x0B50
-#define GL_LIGHT_MODEL_LOCAL_VIEWER       0x0B51
-#define GL_LIGHT_MODEL_TWO_SIDE           0x0B52
-#define GL_LIGHT_MODEL_AMBIENT            0x0B53
-#define GL_SHADE_MODEL                    0x0B54
-#define GL_COLOR_MATERIAL_FACE            0x0B55
-#define GL_COLOR_MATERIAL_PARAMETER       0x0B56
-#define GL_COLOR_MATERIAL                 0x0B57
-#define GL_FOG                            0x0B60
-#define GL_FOG_INDEX                      0x0B61
-#define GL_FOG_DENSITY                    0x0B62
-#define GL_FOG_START                      0x0B63
-#define GL_FOG_END                        0x0B64
-#define GL_FOG_MODE                       0x0B65
-#define GL_FOG_COLOR                      0x0B66
-#define GL_DEPTH_RANGE                    0x0B70
-#define GL_DEPTH_TEST                     0x0B71
-#define GL_DEPTH_WRITEMASK                0x0B72
-#define GL_DEPTH_CLEAR_VALUE              0x0B73
-#define GL_DEPTH_FUNC                     0x0B74
-#define GL_ACCUM_CLEAR_VALUE              0x0B80
-#define GL_STENCIL_TEST                   0x0B90
-#define GL_STENCIL_CLEAR_VALUE            0x0B91
-#define GL_STENCIL_FUNC                   0x0B92
-#define GL_STENCIL_VALUE_MASK             0x0B93
-#define GL_STENCIL_FAIL                   0x0B94
-#define GL_STENCIL_PASS_DEPTH_FAIL        0x0B95
-#define GL_STENCIL_PASS_DEPTH_PASS        0x0B96
-#define GL_STENCIL_REF                    0x0B97
-#define GL_STENCIL_WRITEMASK              0x0B98
-#define GL_MATRIX_MODE                    0x0BA0
-#define GL_NORMALIZE                      0x0BA1
-#define GL_VIEWPORT                       0x0BA2
-#define GL_MODELVIEW_STACK_DEPTH          0x0BA3
-#define GL_PROJECTION_STACK_DEPTH         0x0BA4
-#define GL_TEXTURE_STACK_DEPTH            0x0BA5
-#define GL_MODELVIEW_MATRIX               0x0BA6
-#define GL_PROJECTION_MATRIX              0x0BA7
-#define GL_TEXTURE_MATRIX                 0x0BA8
-#define GL_ATTRIB_STACK_DEPTH             0x0BB0
-#define GL_CLIENT_ATTRIB_STACK_DEPTH      0x0BB1
-#define GL_ALPHA_TEST                     0x0BC0
-#define GL_ALPHA_TEST_FUNC                0x0BC1
-#define GL_ALPHA_TEST_REF                 0x0BC2
-#define GL_DITHER                         0x0BD0
-#define GL_BLEND_DST                      0x0BE0
-#define GL_BLEND_SRC                      0x0BE1
-#define GL_BLEND                          0x0BE2
-#define GL_LOGIC_OP_MODE                  0x0BF0
-#define GL_INDEX_LOGIC_OP                 0x0BF1
-#define GL_COLOR_LOGIC_OP                 0x0BF2
-#define GL_AUX_BUFFERS                    0x0C00
-#define GL_DRAW_BUFFER                    0x0C01
-#define GL_READ_BUFFER                    0x0C02
-#define GL_SCISSOR_BOX                    0x0C10
-#define GL_SCISSOR_TEST                   0x0C11
-#define GL_INDEX_CLEAR_VALUE              0x0C20
-#define GL_INDEX_WRITEMASK                0x0C21
-#define GL_COLOR_CLEAR_VALUE              0x0C22
-#define GL_COLOR_WRITEMASK                0x0C23
-#define GL_INDEX_MODE                     0x0C30
-#define GL_RGBA_MODE                      0x0C31
-#define GL_DOUBLEBUFFER                   0x0C32
-#define GL_STEREO                         0x0C33
-#define GL_RENDER_MODE                    0x0C40
-#define GL_PERSPECTIVE_CORRECTION_HINT    0x0C50
-#define GL_POINT_SMOOTH_HINT              0x0C51
-#define GL_LINE_SMOOTH_HINT               0x0C52
-#define GL_POLYGON_SMOOTH_HINT            0x0C53
-#define GL_FOG_HINT                       0x0C54
-#define GL_TEXTURE_GEN_S                  0x0C60
-#define GL_TEXTURE_GEN_T                  0x0C61
-#define GL_TEXTURE_GEN_R                  0x0C62
-#define GL_TEXTURE_GEN_Q                  0x0C63
-#define GL_PIXEL_MAP_I_TO_I               0x0C70
-#define GL_PIXEL_MAP_S_TO_S               0x0C71
-#define GL_PIXEL_MAP_I_TO_R               0x0C72
-#define GL_PIXEL_MAP_I_TO_G               0x0C73
-#define GL_PIXEL_MAP_I_TO_B               0x0C74
-#define GL_PIXEL_MAP_I_TO_A               0x0C75
-#define GL_PIXEL_MAP_R_TO_R               0x0C76
-#define GL_PIXEL_MAP_G_TO_G               0x0C77
-#define GL_PIXEL_MAP_B_TO_B               0x0C78
-#define GL_PIXEL_MAP_A_TO_A               0x0C79
-#define GL_PIXEL_MAP_I_TO_I_SIZE          0x0CB0
-#define GL_PIXEL_MAP_S_TO_S_SIZE          0x0CB1
-#define GL_PIXEL_MAP_I_TO_R_SIZE          0x0CB2
-#define GL_PIXEL_MAP_I_TO_G_SIZE          0x0CB3
-#define GL_PIXEL_MAP_I_TO_B_SIZE          0x0CB4
-#define GL_PIXEL_MAP_I_TO_A_SIZE          0x0CB5
-#define GL_PIXEL_MAP_R_TO_R_SIZE          0x0CB6
-#define GL_PIXEL_MAP_G_TO_G_SIZE          0x0CB7
-#define GL_PIXEL_MAP_B_TO_B_SIZE          0x0CB8
-#define GL_PIXEL_MAP_A_TO_A_SIZE          0x0CB9
-#define GL_UNPACK_SWAP_BYTES              0x0CF0
-#define GL_UNPACK_LSB_FIRST               0x0CF1
-#define GL_UNPACK_ROW_LENGTH              0x0CF2
-#define GL_UNPACK_SKIP_ROWS               0x0CF3
-#define GL_UNPACK_SKIP_PIXELS             0x0CF4
-#define GL_UNPACK_ALIGNMENT               0x0CF5
-#define GL_PACK_SWAP_BYTES                0x0D00
-#define GL_PACK_LSB_FIRST                 0x0D01
-#define GL_PACK_ROW_LENGTH                0x0D02
-#define GL_PACK_SKIP_ROWS                 0x0D03
-#define GL_PACK_SKIP_PIXELS               0x0D04
-#define GL_PACK_ALIGNMENT                 0x0D05
-#define GL_MAP_COLOR                      0x0D10
-#define GL_MAP_STENCIL                    0x0D11
-#define GL_INDEX_SHIFT                    0x0D12
-#define GL_INDEX_OFFSET                   0x0D13
-#define GL_RED_SCALE                      0x0D14
-#define GL_RED_BIAS                       0x0D15
-#define GL_ZOOM_X                         0x0D16
-#define GL_ZOOM_Y                         0x0D17
-#define GL_GREEN_SCALE                    0x0D18
-#define GL_GREEN_BIAS                     0x0D19
-#define GL_BLUE_SCALE                     0x0D1A
-#define GL_BLUE_BIAS                      0x0D1B
-#define GL_ALPHA_SCALE                    0x0D1C
-#define GL_ALPHA_BIAS                     0x0D1D
-#define GL_DEPTH_SCALE                    0x0D1E
-#define GL_DEPTH_BIAS                     0x0D1F
-#define GL_MAX_EVAL_ORDER                 0x0D30
-#define GL_MAX_LIGHTS                     0x0D31
-#define GL_MAX_CLIP_PLANES                0x0D32
-#define GL_MAX_TEXTURE_SIZE               0x0D33
-#define GL_MAX_PIXEL_MAP_TABLE            0x0D34
-#define GL_MAX_ATTRIB_STACK_DEPTH         0x0D35
-#define GL_MAX_MODELVIEW_STACK_DEPTH      0x0D36
-#define GL_MAX_NAME_STACK_DEPTH           0x0D37
-#define GL_MAX_PROJECTION_STACK_DEPTH     0x0D38
-#define GL_MAX_TEXTURE_STACK_DEPTH        0x0D39
-#define GL_MAX_VIEWPORT_DIMS              0x0D3A
-#define GL_MAX_CLIENT_ATTRIB_STACK_DEPTH  0x0D3B
-#define GL_SUBPIXEL_BITS                  0x0D50
-#define GL_INDEX_BITS                     0x0D51
-#define GL_RED_BITS                       0x0D52
-#define GL_GREEN_BITS                     0x0D53
-#define GL_BLUE_BITS                      0x0D54
-#define GL_ALPHA_BITS                     0x0D55
-#define GL_DEPTH_BITS                     0x0D56
-#define GL_STENCIL_BITS                   0x0D57
-#define GL_ACCUM_RED_BITS                 0x0D58
-#define GL_ACCUM_GREEN_BITS               0x0D59
-#define GL_ACCUM_BLUE_BITS                0x0D5A
-#define GL_ACCUM_ALPHA_BITS               0x0D5B
-#define GL_NAME_STACK_DEPTH               0x0D70
-#define GL_AUTO_NORMAL                    0x0D80
-#define GL_MAP1_COLOR_4                   0x0D90
-#define GL_MAP1_INDEX                     0x0D91
-#define GL_MAP1_NORMAL                    0x0D92
-#define GL_MAP1_TEXTURE_COORD_1           0x0D93
-#define GL_MAP1_TEXTURE_COORD_2           0x0D94
-#define GL_MAP1_TEXTURE_COORD_3           0x0D95
-#define GL_MAP1_TEXTURE_COORD_4           0x0D96
-#define GL_MAP1_VERTEX_3                  0x0D97
-#define GL_MAP1_VERTEX_4                  0x0D98
-#define GL_MAP2_COLOR_4                   0x0DB0
-#define GL_MAP2_INDEX                     0x0DB1
-#define GL_MAP2_NORMAL                    0x0DB2
-#define GL_MAP2_TEXTURE_COORD_1           0x0DB3
-#define GL_MAP2_TEXTURE_COORD_2           0x0DB4
-#define GL_MAP2_TEXTURE_COORD_3           0x0DB5
-#define GL_MAP2_TEXTURE_COORD_4           0x0DB6
-#define GL_MAP2_VERTEX_3                  0x0DB7
-#define GL_MAP2_VERTEX_4                  0x0DB8
-#define GL_MAP1_GRID_DOMAIN               0x0DD0
-#define GL_MAP1_GRID_SEGMENTS             0x0DD1
-#define GL_MAP2_GRID_DOMAIN               0x0DD2
-#define GL_MAP2_GRID_SEGMENTS             0x0DD3
-#define GL_TEXTURE_1D                     0x0DE0
-#define GL_TEXTURE_2D                     0x0DE1
-#define GL_FEEDBACK_BUFFER_POINTER        0x0DF0
-#define GL_FEEDBACK_BUFFER_SIZE           0x0DF1
-#define GL_FEEDBACK_BUFFER_TYPE           0x0DF2
-#define GL_SELECTION_BUFFER_POINTER       0x0DF3
-#define GL_SELECTION_BUFFER_SIZE          0x0DF4
-/*      GL_TEXTURE_BINDING_1D */
-/*      GL_TEXTURE_BINDING_2D */
-/*      GL_VERTEX_ARRAY */
-/*      GL_NORMAL_ARRAY */
-/*      GL_COLOR_ARRAY */
-/*      GL_INDEX_ARRAY */
-/*      GL_TEXTURE_COORD_ARRAY */
-/*      GL_EDGE_FLAG_ARRAY */
-/*      GL_VERTEX_ARRAY_SIZE */
-/*      GL_VERTEX_ARRAY_TYPE */
-/*      GL_VERTEX_ARRAY_STRIDE */
-/*      GL_NORMAL_ARRAY_TYPE */
-/*      GL_NORMAL_ARRAY_STRIDE */
-/*      GL_COLOR_ARRAY_SIZE */
-/*      GL_COLOR_ARRAY_TYPE */
-/*      GL_COLOR_ARRAY_STRIDE */
-/*      GL_INDEX_ARRAY_TYPE */
-/*      GL_INDEX_ARRAY_STRIDE */
-/*      GL_TEXTURE_COORD_ARRAY_SIZE */
-/*      GL_TEXTURE_COORD_ARRAY_TYPE */
-/*      GL_TEXTURE_COORD_ARRAY_STRIDE */
-/*      GL_EDGE_FLAG_ARRAY_STRIDE */
-/*      GL_POLYGON_OFFSET_FACTOR */
-/*      GL_POLYGON_OFFSET_UNITS */
-
-/* GetTextureParameter */
-/*      GL_TEXTURE_MAG_FILTER */
-/*      GL_TEXTURE_MIN_FILTER */
-/*      GL_TEXTURE_WRAP_S */
-/*      GL_TEXTURE_WRAP_T */
-#define GL_TEXTURE_WIDTH                  0x1000
-#define GL_TEXTURE_HEIGHT                 0x1001
-#define GL_TEXTURE_INTERNAL_FORMAT        0x1003
-#define GL_TEXTURE_BORDER_COLOR           0x1004
-#define GL_TEXTURE_BORDER                 0x1005
-/*      GL_TEXTURE_RED_SIZE */
-/*      GL_TEXTURE_GREEN_SIZE */
-/*      GL_TEXTURE_BLUE_SIZE */
-/*      GL_TEXTURE_ALPHA_SIZE */
-/*      GL_TEXTURE_LUMINANCE_SIZE */
-/*      GL_TEXTURE_INTENSITY_SIZE */
-/*      GL_TEXTURE_PRIORITY */
-/*      GL_TEXTURE_RESIDENT */
-
-/* HintMode */
-#define GL_DONT_CARE                      0x1100
-#define GL_FASTEST                        0x1101
-#define GL_NICEST                         0x1102
-
-/* HintTarget */
-/*      GL_PERSPECTIVE_CORRECTION_HINT */
-/*      GL_POINT_SMOOTH_HINT */
-/*      GL_LINE_SMOOTH_HINT */
-/*      GL_POLYGON_SMOOTH_HINT */
-/*      GL_FOG_HINT */
-/*      GL_PHONG_HINT */
-
-/* IndexPointerType */
-/*      GL_SHORT */
-/*      GL_INT */
-/*      GL_FLOAT */
-/*      GL_DOUBLE */
-
-/* LightModelParameter */
-/*      GL_LIGHT_MODEL_AMBIENT */
-/*      GL_LIGHT_MODEL_LOCAL_VIEWER */
-/*      GL_LIGHT_MODEL_TWO_SIDE */
-
-/* LightName */
-#define GL_LIGHT0                         0x4000
-#define GL_LIGHT1                         0x4001
-#define GL_LIGHT2                         0x4002
-#define GL_LIGHT3                         0x4003
-#define GL_LIGHT4                         0x4004
-#define GL_LIGHT5                         0x4005
-#define GL_LIGHT6                         0x4006
-#define GL_LIGHT7                         0x4007
-
-/* LightParameter */
-#define GL_AMBIENT                        0x1200
-#define GL_DIFFUSE                        0x1201
-#define GL_SPECULAR                       0x1202
-#define GL_POSITION                       0x1203
-#define GL_SPOT_DIRECTION                 0x1204
-#define GL_SPOT_EXPONENT                  0x1205
-#define GL_SPOT_CUTOFF                    0x1206
-#define GL_CONSTANT_ATTENUATION           0x1207
-#define GL_LINEAR_ATTENUATION             0x1208
-#define GL_QUADRATIC_ATTENUATION          0x1209
-
-/* InterleavedArrays */
-/*      GL_V2F */
-/*      GL_V3F */
-/*      GL_C4UB_V2F */
-/*      GL_C4UB_V3F */
-/*      GL_C3F_V3F */
-/*      GL_N3F_V3F */
-/*      GL_C4F_N3F_V3F */
-/*      GL_T2F_V3F */
-/*      GL_T4F_V4F */
-/*      GL_T2F_C4UB_V3F */
-/*      GL_T2F_C3F_V3F */
-/*      GL_T2F_N3F_V3F */
-/*      GL_T2F_C4F_N3F_V3F */
-/*      GL_T4F_C4F_N3F_V4F */
-
-/* ListMode */
-#define GL_COMPILE                        0x1300
-#define GL_COMPILE_AND_EXECUTE            0x1301
-
-/* ListNameType */
-/*      GL_BYTE */
-/*      GL_UNSIGNED_BYTE */
-/*      GL_SHORT */
-/*      GL_UNSIGNED_SHORT */
-/*      GL_INT */
-/*      GL_UNSIGNED_INT */
-/*      GL_FLOAT */
-/*      GL_2_BYTES */
-/*      GL_3_BYTES */
-/*      GL_4_BYTES */
-
-/* LogicOp */
-#define GL_CLEAR                          0x1500
-#define GL_AND                            0x1501
-#define GL_AND_REVERSE                    0x1502
-#define GL_COPY                           0x1503
-#define GL_AND_INVERTED                   0x1504
-#define GL_NOOP                           0x1505
-#define GL_XOR                            0x1506
-#define GL_OR                             0x1507
-#define GL_NOR                            0x1508
-#define GL_EQUIV                          0x1509
-#define GL_INVERT                         0x150A
-#define GL_OR_REVERSE                     0x150B
-#define GL_COPY_INVERTED                  0x150C
-#define GL_OR_INVERTED                    0x150D
-#define GL_NAND                           0x150E
-#define GL_SET                            0x150F
-
-/* MapTarget */
-/*      GL_MAP1_COLOR_4 */
-/*      GL_MAP1_INDEX */
-/*      GL_MAP1_NORMAL */
-/*      GL_MAP1_TEXTURE_COORD_1 */
-/*      GL_MAP1_TEXTURE_COORD_2 */
-/*      GL_MAP1_TEXTURE_COORD_3 */
-/*      GL_MAP1_TEXTURE_COORD_4 */
-/*      GL_MAP1_VERTEX_3 */
-/*      GL_MAP1_VERTEX_4 */
-/*      GL_MAP2_COLOR_4 */
-/*      GL_MAP2_INDEX */
-/*      GL_MAP2_NORMAL */
-/*      GL_MAP2_TEXTURE_COORD_1 */
-/*      GL_MAP2_TEXTURE_COORD_2 */
-/*      GL_MAP2_TEXTURE_COORD_3 */
-/*      GL_MAP2_TEXTURE_COORD_4 */
-/*      GL_MAP2_VERTEX_3 */
-/*      GL_MAP2_VERTEX_4 */
-
-/* MaterialFace */
-/*      GL_FRONT */
-/*      GL_BACK */
-/*      GL_FRONT_AND_BACK */
-
-/* MaterialParameter */
-#define GL_EMISSION                       0x1600
-#define GL_SHININESS                      0x1601
-#define GL_AMBIENT_AND_DIFFUSE            0x1602
-#define GL_COLOR_INDEXES                  0x1603
-/*      GL_AMBIENT */
-/*      GL_DIFFUSE */
-/*      GL_SPECULAR */
-
-/* MatrixMode */
-#define GL_MODELVIEW                      0x1700
-#define GL_PROJECTION                     0x1701
-#define GL_TEXTURE                        0x1702
-
-/* MeshMode1 */
-/*      GL_POINT */
-/*      GL_LINE */
-
-/* MeshMode2 */
-/*      GL_POINT */
-/*      GL_LINE */
-/*      GL_FILL */
-
-/* NormalPointerType */
-/*      GL_BYTE */
-/*      GL_SHORT */
-/*      GL_INT */
-/*      GL_FLOAT */
-/*      GL_DOUBLE */
-
-/* PixelCopyType */
-#define GL_COLOR                          0x1800
-#define GL_DEPTH                          0x1801
-#define GL_STENCIL                        0x1802
-
-/* PixelFormat */
-#define GL_COLOR_INDEX                    0x1900
-#define GL_STENCIL_INDEX                  0x1901
-#define GL_DEPTH_COMPONENT                0x1902
-#define GL_RED                            0x1903
-#define GL_GREEN                          0x1904
-#define GL_BLUE                           0x1905
-#define GL_ALPHA                          0x1906
-#define GL_RGB                            0x1907
-#define GL_RGBA                           0x1908
-#define GL_LUMINANCE                      0x1909
-#define GL_LUMINANCE_ALPHA                0x190A
-
-/* PixelMap */
-/*      GL_PIXEL_MAP_I_TO_I */
-/*      GL_PIXEL_MAP_S_TO_S */
-/*      GL_PIXEL_MAP_I_TO_R */
-/*      GL_PIXEL_MAP_I_TO_G */
-/*      GL_PIXEL_MAP_I_TO_B */
-/*      GL_PIXEL_MAP_I_TO_A */
-/*      GL_PIXEL_MAP_R_TO_R */
-/*      GL_PIXEL_MAP_G_TO_G */
-/*      GL_PIXEL_MAP_B_TO_B */
-/*      GL_PIXEL_MAP_A_TO_A */
-
-/* PixelStore */
-/*      GL_UNPACK_SWAP_BYTES */
-/*      GL_UNPACK_LSB_FIRST */
-/*      GL_UNPACK_ROW_LENGTH */
-/*      GL_UNPACK_SKIP_ROWS */
-/*      GL_UNPACK_SKIP_PIXELS */
-/*      GL_UNPACK_ALIGNMENT */
-/*      GL_PACK_SWAP_BYTES */
-/*      GL_PACK_LSB_FIRST */
-/*      GL_PACK_ROW_LENGTH */
-/*      GL_PACK_SKIP_ROWS */
-/*      GL_PACK_SKIP_PIXELS */
-/*      GL_PACK_ALIGNMENT */
-
-/* PixelTransfer */
-/*      GL_MAP_COLOR */
-/*      GL_MAP_STENCIL */
-/*      GL_INDEX_SHIFT */
-/*      GL_INDEX_OFFSET */
-/*      GL_RED_SCALE */
-/*      GL_RED_BIAS */
-/*      GL_GREEN_SCALE */
-/*      GL_GREEN_BIAS */
-/*      GL_BLUE_SCALE */
-/*      GL_BLUE_BIAS */
-/*      GL_ALPHA_SCALE */
-/*      GL_ALPHA_BIAS */
-/*      GL_DEPTH_SCALE */
-/*      GL_DEPTH_BIAS */
-
-/* PixelType */
-#define GL_BITMAP                         0x1A00
-/*      GL_BYTE */
-/*      GL_UNSIGNED_BYTE */
-/*      GL_SHORT */
-/*      GL_UNSIGNED_SHORT */
-/*      GL_INT */
-/*      GL_UNSIGNED_INT */
-/*      GL_FLOAT */
-
-/* PolygonMode */
-#define GL_POINT                          0x1B00
-#define GL_LINE                           0x1B01
-#define GL_FILL                           0x1B02
-
-/* ReadBufferMode */
-/*      GL_FRONT_LEFT */
-/*      GL_FRONT_RIGHT */
-/*      GL_BACK_LEFT */
-/*      GL_BACK_RIGHT */
-/*      GL_FRONT */
-/*      GL_BACK */
-/*      GL_LEFT */
-/*      GL_RIGHT */
-/*      GL_AUX0 */
-/*      GL_AUX1 */
-/*      GL_AUX2 */
-/*      GL_AUX3 */
-
-/* RenderingMode */
-#define GL_RENDER                         0x1C00
-#define GL_FEEDBACK                       0x1C01
-#define GL_SELECT                         0x1C02
-
-/* ShadingModel */
-#define GL_FLAT                           0x1D00
-#define GL_SMOOTH                         0x1D01
-
-
-/* StencilFunction */
-/*      GL_NEVER */
-/*      GL_LESS */
-/*      GL_EQUAL */
-/*      GL_LEQUAL */
-/*      GL_GREATER */
-/*      GL_NOTEQUAL */
-/*      GL_GEQUAL */
-/*      GL_ALWAYS */
-
-/* StencilOp */
-/*      GL_ZERO */
-#define GL_KEEP                           0x1E00
-#define GL_REPLACE                        0x1E01
-#define GL_INCR                           0x1E02
-#define GL_DECR                           0x1E03
-/*      GL_INVERT */
-
-/* StringName */
-#define GL_VENDOR                         0x1F00
-#define GL_RENDERER                       0x1F01
-#define GL_VERSION                        0x1F02
-#define GL_EXTENSIONS                     0x1F03
-
-/* TextureCoordName */
-#define GL_S                              0x2000
-#define GL_T                              0x2001
-#define GL_R                              0x2002
-#define GL_Q                              0x2003
-
-/* TexCoordPointerType */
-/*      GL_SHORT */
-/*      GL_INT */
-/*      GL_FLOAT */
-/*      GL_DOUBLE */
-
-/* TextureEnvMode */
-#define GL_MODULATE                       0x2100
-#define GL_DECAL                          0x2101
-/*      GL_BLEND */
-/*      GL_REPLACE */
-
-/* TextureEnvParameter */
-#define GL_TEXTURE_ENV_MODE               0x2200
-#define GL_TEXTURE_ENV_COLOR              0x2201
-
-/* TextureEnvTarget */
-#define GL_TEXTURE_ENV                    0x2300
-
-/* TextureGenMode */
-#define GL_EYE_LINEAR                     0x2400
-#define GL_OBJECT_LINEAR                  0x2401
-#define GL_SPHERE_MAP                     0x2402
-
-/* TextureGenParameter */
-#define GL_TEXTURE_GEN_MODE               0x2500
-#define GL_OBJECT_PLANE                   0x2501
-#define GL_EYE_PLANE                      0x2502
-
-/* TextureMagFilter */
-#define GL_NEAREST                        0x2600
-#define GL_LINEAR                         0x2601
-
-/* TextureMinFilter */
-/*      GL_NEAREST */
-/*      GL_LINEAR */
-#define GL_NEAREST_MIPMAP_NEAREST         0x2700
-#define GL_LINEAR_MIPMAP_NEAREST          0x2701
-#define GL_NEAREST_MIPMAP_LINEAR          0x2702
-#define GL_LINEAR_MIPMAP_LINEAR           0x2703
-
-/* TextureParameterName */
-#define GL_TEXTURE_MAG_FILTER             0x2800
-#define GL_TEXTURE_MIN_FILTER             0x2801
-#define GL_TEXTURE_WRAP_S                 0x2802
-#define GL_TEXTURE_WRAP_T                 0x2803
-/*      GL_TEXTURE_BORDER_COLOR */
-/*      GL_TEXTURE_PRIORITY */
-
-/* TextureTarget */
-/*      GL_TEXTURE_1D */
-/*      GL_TEXTURE_2D */
-/*      GL_PROXY_TEXTURE_1D */
-/*      GL_PROXY_TEXTURE_2D */
-
-/* TextureWrapMode */
-#define GL_CLAMP                          0x2900
-#define GL_REPEAT                         0x2901
-
-/* VertexPointerType */
-/*      GL_SHORT */
-/*      GL_INT */
-/*      GL_FLOAT */
-/*      GL_DOUBLE */
-
-/* ClientAttribMask */
-#define GL_CLIENT_PIXEL_STORE_BIT         0x00000001
-#define GL_CLIENT_VERTEX_ARRAY_BIT        0x00000002
-#define GL_CLIENT_ALL_ATTRIB_BITS         0xffffffff
-
-/* polygon_offset */
-#define GL_POLYGON_OFFSET_FACTOR          0x8038
-#define GL_POLYGON_OFFSET_UNITS           0x2A00
-#define GL_POLYGON_OFFSET_POINT           0x2A01
-#define GL_POLYGON_OFFSET_LINE            0x2A02
-#define GL_POLYGON_OFFSET_FILL            0x8037
-
-/* texture */
-#define GL_ALPHA4                         0x803B
-#define GL_ALPHA8                         0x803C
-#define GL_ALPHA12                        0x803D
-#define GL_ALPHA16                        0x803E
-#define GL_LUMINANCE4                     0x803F
-#define GL_LUMINANCE8                     0x8040
-#define GL_LUMINANCE12                    0x8041
-#define GL_LUMINANCE16                    0x8042
-#define GL_LUMINANCE4_ALPHA4              0x8043
-#define GL_LUMINANCE6_ALPHA2              0x8044
-#define GL_LUMINANCE8_ALPHA8              0x8045
-#define GL_LUMINANCE12_ALPHA4             0x8046
-#define GL_LUMINANCE12_ALPHA12            0x8047
-#define GL_LUMINANCE16_ALPHA16            0x8048
-#define GL_INTENSITY                      0x8049
-#define GL_INTENSITY4                     0x804A
-#define GL_INTENSITY8                     0x804B
-#define GL_INTENSITY12                    0x804C
-#define GL_INTENSITY16                    0x804D
-#define GL_R3_G3_B2                       0x2A10
-#define GL_RGB4                           0x804F
-#define GL_RGB5                           0x8050
-#define GL_RGB8                           0x8051
-#define GL_RGB10                          0x8052
-#define GL_RGB12                          0x8053
-#define GL_RGB16                          0x8054
-#define GL_RGBA2                          0x8055
-#define GL_RGBA4                          0x8056
-#define GL_RGB5_A1                        0x8057
-#define GL_RGBA8                          0x8058
-#define GL_RGB10_A2                       0x8059
-#define GL_RGBA12                         0x805A
-#define GL_RGBA16                         0x805B
-#define GL_TEXTURE_RED_SIZE               0x805C
-#define GL_TEXTURE_GREEN_SIZE             0x805D
-#define GL_TEXTURE_BLUE_SIZE              0x805E
-#define GL_TEXTURE_ALPHA_SIZE             0x805F
-#define GL_TEXTURE_LUMINANCE_SIZE         0x8060
-#define GL_TEXTURE_INTENSITY_SIZE         0x8061
-#define GL_PROXY_TEXTURE_1D               0x8063
-#define GL_PROXY_TEXTURE_2D               0x8064
-
-/* texture_object */
-#define GL_TEXTURE_PRIORITY               0x8066
-#define GL_TEXTURE_RESIDENT               0x8067
-#define GL_TEXTURE_BINDING_1D             0x8068
-#define GL_TEXTURE_BINDING_2D             0x8069
-
-/* vertex_array */
-#define GL_VERTEX_ARRAY                   0x8074
-#define GL_NORMAL_ARRAY                   0x8075
-#define GL_COLOR_ARRAY                    0x8076
-#define GL_INDEX_ARRAY                    0x8077
-#define GL_TEXTURE_COORD_ARRAY            0x8078
-#define GL_EDGE_FLAG_ARRAY                0x8079
-#define GL_VERTEX_ARRAY_SIZE              0x807A
-#define GL_VERTEX_ARRAY_TYPE              0x807B
-#define GL_VERTEX_ARRAY_STRIDE            0x807C
-#define GL_NORMAL_ARRAY_TYPE              0x807E
-#define GL_NORMAL_ARRAY_STRIDE            0x807F
-#define GL_COLOR_ARRAY_SIZE               0x8081
-#define GL_COLOR_ARRAY_TYPE               0x8082
-#define GL_COLOR_ARRAY_STRIDE             0x8083
-#define GL_INDEX_ARRAY_TYPE               0x8085
-#define GL_INDEX_ARRAY_STRIDE             0x8086
-#define GL_TEXTURE_COORD_ARRAY_SIZE       0x8088
-#define GL_TEXTURE_COORD_ARRAY_TYPE       0x8089
-#define GL_TEXTURE_COORD_ARRAY_STRIDE     0x808A
-#define GL_EDGE_FLAG_ARRAY_STRIDE         0x808C
-#define GL_VERTEX_ARRAY_POINTER           0x808E
-#define GL_NORMAL_ARRAY_POINTER           0x808F
-#define GL_COLOR_ARRAY_POINTER            0x8090
-#define GL_INDEX_ARRAY_POINTER            0x8091
-#define GL_TEXTURE_COORD_ARRAY_POINTER    0x8092
-#define GL_EDGE_FLAG_ARRAY_POINTER        0x8093
-#define GL_V2F                            0x2A20
-#define GL_V3F                            0x2A21
-#define GL_C4UB_V2F                       0x2A22
-#define GL_C4UB_V3F                       0x2A23
-#define GL_C3F_V3F                        0x2A24
-#define GL_N3F_V3F                        0x2A25
-#define GL_C4F_N3F_V3F                    0x2A26
-#define GL_T2F_V3F                        0x2A27
-#define GL_T4F_V4F                        0x2A28
-#define GL_T2F_C4UB_V3F                   0x2A29
-#define GL_T2F_C3F_V3F                    0x2A2A
-#define GL_T2F_N3F_V3F                    0x2A2B
-#define GL_T2F_C4F_N3F_V3F                0x2A2C
-#define GL_T4F_C4F_N3F_V4F                0x2A2D
-
-/* Extensions */
-#define GL_EXT_vertex_array               1
-#define GL_EXT_bgra                       1
-#define GL_EXT_paletted_texture           1
-#define GL_WIN_swap_hint                  1
-#define GL_WIN_draw_range_elements        1
-// #define GL_WIN_phong_shading              1
-// #define GL_WIN_specular_fog               1
-
-/* EXT_vertex_array */
-#define GL_VERTEX_ARRAY_EXT               0x8074
-#define GL_NORMAL_ARRAY_EXT               0x8075
-#define GL_COLOR_ARRAY_EXT                0x8076
-#define GL_INDEX_ARRAY_EXT                0x8077
-#define GL_TEXTURE_COORD_ARRAY_EXT        0x8078
-#define GL_EDGE_FLAG_ARRAY_EXT            0x8079
-#define GL_VERTEX_ARRAY_SIZE_EXT          0x807A
-#define GL_VERTEX_ARRAY_TYPE_EXT          0x807B
-#define GL_VERTEX_ARRAY_STRIDE_EXT        0x807C
-#define GL_VERTEX_ARRAY_COUNT_EXT         0x807D
-#define GL_NORMAL_ARRAY_TYPE_EXT          0x807E
-#define GL_NORMAL_ARRAY_STRIDE_EXT        0x807F
-#define GL_NORMAL_ARRAY_COUNT_EXT         0x8080
-#define GL_COLOR_ARRAY_SIZE_EXT           0x8081
-#define GL_COLOR_ARRAY_TYPE_EXT           0x8082
-#define GL_COLOR_ARRAY_STRIDE_EXT         0x8083
-#define GL_COLOR_ARRAY_COUNT_EXT          0x8084
-#define GL_INDEX_ARRAY_TYPE_EXT           0x8085
-#define GL_INDEX_ARRAY_STRIDE_EXT         0x8086
-#define GL_INDEX_ARRAY_COUNT_EXT          0x8087
-#define GL_TEXTURE_COORD_ARRAY_SIZE_EXT   0x8088
-#define GL_TEXTURE_COORD_ARRAY_TYPE_EXT   0x8089
-#define GL_TEXTURE_COORD_ARRAY_STRIDE_EXT 0x808A
-#define GL_TEXTURE_COORD_ARRAY_COUNT_EXT  0x808B
-#define GL_EDGE_FLAG_ARRAY_STRIDE_EXT     0x808C
-#define GL_EDGE_FLAG_ARRAY_COUNT_EXT      0x808D
-#define GL_VERTEX_ARRAY_POINTER_EXT       0x808E
-#define GL_NORMAL_ARRAY_POINTER_EXT       0x808F
-#define GL_COLOR_ARRAY_POINTER_EXT        0x8090
-#define GL_INDEX_ARRAY_POINTER_EXT        0x8091
-#define GL_TEXTURE_COORD_ARRAY_POINTER_EXT 0x8092
-#define GL_EDGE_FLAG_ARRAY_POINTER_EXT    0x8093
-#define GL_DOUBLE_EXT                     GL_DOUBLE
-
-/* EXT_bgra */
-#define GL_BGR_EXT                        0x80E0
-#define GL_BGRA_EXT                       0x80E1
-
-/* EXT_paletted_texture */
-
-/* These must match the GL_COLOR_TABLE_*_SGI enumerants */
-#define GL_COLOR_TABLE_FORMAT_EXT         0x80D8
-#define GL_COLOR_TABLE_WIDTH_EXT          0x80D9
-#define GL_COLOR_TABLE_RED_SIZE_EXT       0x80DA
-#define GL_COLOR_TABLE_GREEN_SIZE_EXT     0x80DB
-#define GL_COLOR_TABLE_BLUE_SIZE_EXT      0x80DC
-#define GL_COLOR_TABLE_ALPHA_SIZE_EXT     0x80DD
-#define GL_COLOR_TABLE_LUMINANCE_SIZE_EXT 0x80DE
-#define GL_COLOR_TABLE_INTENSITY_SIZE_EXT 0x80DF
-
-#define GL_COLOR_INDEX1_EXT               0x80E2
-#define GL_COLOR_INDEX2_EXT               0x80E3
-#define GL_COLOR_INDEX4_EXT               0x80E4
-#define GL_COLOR_INDEX8_EXT               0x80E5
-#define GL_COLOR_INDEX12_EXT              0x80E6
-#define GL_COLOR_INDEX16_EXT              0x80E7
-
-/* WIN_draw_range_elements */
-#define GL_MAX_ELEMENTS_VERTICES_WIN      0x80E8
-#define GL_MAX_ELEMENTS_INDICES_WIN       0x80E9
-
-/* WIN_phong_shading */
-#define GL_PHONG_WIN                      0x80EA
-#define GL_PHONG_HINT_WIN                 0x80EB
-
-/* WIN_specular_fog */
-#define GL_FOG_SPECULAR_TEXTURE_WIN       0x80EC
-
-/* For compatibility with OpenGL v1.0 */
-#define GL_LOGIC_OP GL_INDEX_LOGIC_OP
-#define GL_TEXTURE_COMPONENTS GL_TEXTURE_INTERNAL_FORMAT
-#include <QtOpenGL/QtOpenGL>
+#include <@GL_H@>
+#include <@QT_QTOPENGL_INCLUDE_DIR@/QtOpenGL>
 #endif // QT_NO_OPENGL
 
diff --git a/PySide/licensecomment.txt b/PySide/licensecomment.txt
index fdf9745..dfeef80 100644
--- a/PySide/licensecomment.txt
+++ b/PySide/licensecomment.txt
@@ -1,7 +1,7 @@
 /*
  * This file is part of PySide: Python for Qt
  *
- * Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+ * Copyright (C) 2009-2011 Nokia Corporation and/or its subsidiary(-ies).
  *
  * Contact: PySide team <contact@pyside.org>
  *
diff --git a/PySide/phonon/CMakeLists.txt b/PySide/phonon/CMakeLists.txt
index 01b1f6a..0564029 100644
--- a/PySide/phonon/CMakeLists.txt
+++ b/PySide/phonon/CMakeLists.txt
@@ -1,5 +1,14 @@
 project(phonon)
 
+# workaround for a cmake bug under MacOSX, it finds phonon but not the include path
+if (NOT QT_PHONON_INCLUDE_DIR AND CMAKE_HOST_APPLE)
+    set(QT_PHONON_INCLUDE_DIR "${QT_LIBRARY_DIR}/phonon.framework/Headers")
+endif ()
+
+set(phonon_OPTIONAL_SRC )
+set(phonon_DROPPED_ENTRIES )
+check_qt_class(phonon VideoCaptureDevice    phonon_OPTIONAL_SRC phonon_DROPPED_ENTRIES Phonon ObjectDescription)
+
 set(phonon_SRC
 ${CMAKE_CURRENT_BINARY_DIR}/PySide/phonon/phonon_abstractaudiooutput_wrapper.cpp
 ${CMAKE_CURRENT_BINARY_DIR}/PySide/phonon/phonon_abstractmediastream_wrapper.cpp
@@ -37,32 +46,33 @@ ${CMAKE_CURRENT_BINARY_DIR}/PySide/phonon/phonon_volumefaderinterface_wrapper.cp
 ${CMAKE_CURRENT_BINARY_DIR}/PySide/phonon/phonon_volumeslider_wrapper.cpp
 ${CMAKE_CURRENT_BINARY_DIR}/PySide/phonon/phonon_wrapper.cpp
 ${CMAKE_CURRENT_BINARY_DIR}/PySide/phonon/phonon_backendcapabilities_notifierwrapper_wrapper.cpp
+${phonon_OPTIONAL_SRC}
 )
 
-execute_generator(phonon phonon_SRC "${CMAKE_CURRENT_BINARY_DIR}:${QtCore_SOURCE_DIR}:${QtGui_BINARY_DIR}:${QtGui_SOURCE_DIR}:${phonon_SOURCE_DIR}")
-
-include_directories(${CMAKE_CURRENT_SOURCE_DIR}
-                    ${QT_QTCORE_INCLUDE_DIR}
-                    ${QT_QTGUI_INCLUDE_DIR}
-                    ${QT_PHONON_INCLUDE_DIR}
-                    ${PYTHON_INCLUDE_PATH}
-                    ${SHIBOKEN_INCLUDE_DIR}
-                    ${libpyside_SOURCE_DIR}
-                    ${QtGui_BINARY_DIR}/PySide/QtGui/
-                    ${QtCore_BINARY_DIR}/PySide/QtCore/
-                    ${CMAKE_CURRENT_BINARY_DIR}/PySide/phonon)
-add_library(phonon MODULE ${phonon_SRC})
-set_target_properties(phonon PROPERTIES PREFIX "")
-target_link_libraries(phonon
-                      pyside
-                      ${PYTHON_LIBRARIES}
+set(phonon_typesystem_path "${QtCore_SOURCE_DIR}${PATH_SEP}${QtCore_BINARY_DIR}${PATH_SEP}${QtGui_SOURCE_DIR}${PATH_SEP}${phonon_SOURCE_DIR}${PATH_SEP}${QtGui_BINARY_DIR}")
+set(phonon_include_dirs ${CMAKE_CURRENT_SOURCE_DIR}
+                        ${QT_QTCORE_INCLUDE_DIR}
+                        ${QT_QTGUI_INCLUDE_DIR}
+                        ${QT_PHONON_INCLUDE_DIR}
+                        ${SHIBOKEN_PYTHON_INCLUDE_DIR}
+                        ${SHIBOKEN_INCLUDE_DIR}
+                        ${libpyside_SOURCE_DIR}
+                        ${QtGui_BINARY_DIR}/PySide/QtGui/
+                        ${QtCore_BINARY_DIR}/PySide/QtCore/
+                        ${CMAKE_CURRENT_BINARY_DIR}/PySide/phonon)
+set(phonon_libraries  pyside
+                      ${SHIBOKEN_PYTHON_LIBRARIES}
                       ${QT_QTCORE_LIBRARY}
                       ${QT_QTGUI_LIBRARY}
                       ${QT_PHONON_LIBRARY})
-add_dependencies(phonon QtGui)
+set(phonon_deps QtGui)
 
-# install
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/phonon${CMAKE_DEBUG_POSTFIX}.so
-        DESTINATION ${SITE_PACKAGE}/PySide)
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/PySide/phonon/pyside_phonon_python.h
-        DESTINATION include/PySide/phonon/)
+create_pyside_module(phonon
+                     phonon_include_dirs
+                     phonon_libraries
+                     phonon_deps
+                     phonon_typesystem_path
+                     phonon_SRC
+                     ""
+                     ""
+                     phonon_DROPPED_ENTRIES)
diff --git a/PySide/phonon/typesystem_phonon.xml b/PySide/phonon/typesystem_phonon.xml
index 1a2a486..509e053 100644
--- a/PySide/phonon/typesystem_phonon.xml
+++ b/PySide/phonon/typesystem_phonon.xml
@@ -1,4 +1,23 @@
 <?xml version="1.0"?>
+<!--
+    This file is part of PySide project.
+    Copyright (C) 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
+    Contact: PySide team <contact@pyside.org>
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+-->
 <typesystem package="PySide.phonon">
     <load-typesystem name="typesystem_gui.xml" generate="no" />
 
@@ -18,164 +37,279 @@
         <extra-includes>
           <include file-name="phononnamespace.h" location="global"/>
         </extra-includes>
+
+        <namespace-type name="BackendCapabilities" >
+           <inject-code class="native">
+            Phonon::BackendCapabilities::NotifierWrapper* Phonon::BackendCapabilities::NotifierWrapper::m_instance = 0;
+            Phonon::BackendCapabilities::Notifier* Phonon::BackendCapabilities::NotifierWrapper::m_notifier = 0;
+           </inject-code>
+
+           <add-function signature="notifier()" return-type="Phonon::BackendCapabilities::NotifierWrapper">
+              <inject-code class="target">
+                Phonon::BackendCapabilities::NotifierWrapper *_notifierWrapper =  Phonon::BackendCapabilities::NotifierWrapper::notifier();
+                %PYARG_0 = %CONVERTTOPYTHON[Phonon::BackendCapabilities::NotifierWrapper*](_notifierWrapper);
+              </inject-code>
+           </add-function>
+
+            <!-- ### causes moc-related linker error -->
+            <!-- <object-type name="Notifier"/> -->
+            <object-type name="NotifierWrapper" target-lang-name="Notifier">
+              <inject-documentation format="target" mode="append">
+.. class: Notifier
+
+   Notifications about backend capabilities
+
+.. method:: capabilitiesChanged()
+
+    This signal is emitted if the capabilities have changed. This can happen if the user has requested a backend change.
+
+.. method:: availableAudioOutputDevicesChanged()
+
+    This signal is emitted when audio capture devices were plugged or unplugged.
+
+    Check :meth:`PySide.phonon.BackendCapabilities.availableAudioOutputDevices` to get the current list of available devices.
+
+.. method:: availableAudioCaptureDevicesChanged()
+
+    This signal is emitted when audio capture devices were plugged or unplugged.
+
+    Check :meth:`PySide.phonon.BackendCapabilities.availableAudioCaptureDevices` to get the current list of available devices.
+              </inject-documentation>
+                <include file-name="backendcapabilities.h" location="global"/>
+                <include file-name="pyside_phonon.h" location="local"/>
+
+                <!-- ### This isn't part of Qt public API -->
+                <modify-function signature="notifier()" remove="all"/>
+                <modify-function signature="Phonon::BackendCapabilities::NotifierWrapper(Phonon::BackendCapabilities::Notifier*)">
+                  <access modifier="private"/>
+                </modify-function>
+                <!-- ### -->
+              <inject-code class="target" position="end">
+                   PySideSignal* signal_item;
+
+                   signal_item = PySide::Signal::newObject("capabilitiesChanged", "void", NULL);
+                   PyDict_SetItemString(Sbk_Phonon_BackendCapabilities_NotifierWrapper_Type.super.ht_type.tp_dict, "capabilitiesChanged", (PyObject*)signal_item);
+                   Py_DECREF((PyObject*)signal_item);
+
+                   signal_item = PySide::Signal::newObject("availableAudioOutputDevicesChanged", "void", NULL);
+                   PyDict_SetItemString( Sbk_Phonon_BackendCapabilities_NotifierWrapper_Type.super.ht_type.tp_dict, "availableAudioOutputDevicesChanged",  (PyObject*)signal_item);
+                   Py_DECREF((PyObject*)signal_item);
+              </inject-code>
+            </object-type>
+        </namespace-type>
+
+        <enum-type name="Category" />
+        <enum-type name="DiscType"/>
+        <enum-type name="ErrorType"/>
+        <enum-type name="MetaData"/>
+        <enum-type name="ObjectDescriptionType"/>
+        <enum-type name="State"/>
+        <enum-type name="CaptureCategory"/>
+
+        <object-type name="AbstractVideoOutput"/>
+        <object-type name="AddonInterface">
+            <enum-type name="AngleCommand"/>
+            <enum-type name="AudioChannelCommand"/>
+            <enum-type name="ChapterCommand"/>
+            <enum-type name="Interface"/>
+            <enum-type name="NavigationCommand"/>
+            <enum-type name="SubtitleCommand"/>
+            <enum-type name="TitleCommand"/>
+        </object-type>
+        <object-type name="BackendInterface">
+            <enum-type name="Class"/>
+        </object-type>
+        <object-type name="EffectInterface"/>
+        <object-type name="MediaNode"/>
+
+        <object-type name="MediaObjectInterface"/>
+        <object-type name="PlatformPlugin"/>
+        <object-type name="StreamInterface"/>
+        <object-type name="VideoWidgetInterface"/>
+        <object-type name="VolumeFaderInterface"/>
+
+        <value-type name="EffectParameter">
+            <enum-type name="Hint" flags="Hints"/>
+            <!-- ### Internal methods and ctors -->
+            <modify-function signature="EffectParameter()" remove="all"/>
+            <modify-function signature="operator&lt;(const Phonon::EffectParameter &amp;)const" remove="all"/>
+            <modify-function signature="operator&gt;(const Phonon::EffectParameter &amp;)const" remove="all"/>
+            <modify-function signature="id()const" remove="all"/>
+            <modify-function signature="operator==(Phonon::EffectParameter)const" remove="all"/>
+            <!-- ### -->
+        </value-type>
+        <value-type name="MediaSource">
+            <enum-type name="Type"/>
+        </value-type>
+        <value-type name="Path">
+            <modify-function signature="disconnect()" rename="disconnectPath"/>
+            <modify-function signature="insertEffect(Phonon::EffectDescription,Phonon::Effect*)">
+                <modify-argument index="1">
+                    <parent index="this" action="add"/>
+                </modify-argument>
+            </modify-function>
+            <modify-function signature="insertEffect(Phonon::Effect*,Phonon::Effect*)">
+                <modify-argument index="1">
+                    <parent index="this" action="add"/>
+                </modify-argument>
+            </modify-function>
+            <modify-function signature="removeEffect(Phonon::Effect*)">
+                <modify-argument index="1">
+                    <parent index="this" action="remove"/>
+                </modify-argument>
+            </modify-function>
+            <modify-function signature="sink() const">
+                <modify-argument index="return">
+                    <define-ownership class="target" owner="default"/>
+                </modify-argument>
+            </modify-function>
+            <modify-function signature="source() const">
+                <modify-argument index="return">
+                    <define-ownership class="target" owner="default"/>
+                </modify-argument>
+            </modify-function>
+        </value-type>
+        <value-type name="ObjectDescription" generate="no"/>
+        <value-type name="EffectDescription">
+            <modify-function signature="operator==(Phonon::ObjectDescription)const">
+                <modify-argument index="1">
+                    <replace-type modified-type="Phonon::EffectDescription"/>
+                </modify-argument>
+            </modify-function>
+            <modify-function signature="operator!=(Phonon::ObjectDescription)const">
+                <modify-argument index="1">
+                    <replace-type modified-type="Phonon::EffectDescription"/>
+                </modify-argument>
+            </modify-function>
+            <modify-function signature="fromIndex(int)">
+              <modify-argument index="return">
+                <replace-type modified-type="EffectDescription"/>
+              </modify-argument>
+            </modify-function>
+        </value-type>
+        <value-type name="AudioOutputDevice">
+            <modify-function signature="operator==(Phonon::ObjectDescription)const">
+                <modify-argument index="1">
+                    <replace-type modified-type="Phonon::AudioOutputDevice"/>
+                </modify-argument>
+            </modify-function>
+            <modify-function signature="operator!=(Phonon::ObjectDescription)const">
+                <modify-argument index="1">
+                    <replace-type modified-type="Phonon::AudioOutputDevice"/>
+                </modify-argument>
+            </modify-function>
+            <modify-function signature="fromIndex(int)">
+              <modify-argument index="return">
+                <replace-type modified-type="AudioOutputDevice"/>
+              </modify-argument>
+            </modify-function>
+        </value-type>
+       <value-type name="AudioCaptureDevice">
+            <modify-function signature="operator==(Phonon::ObjectDescription)const">
+                <modify-argument index="1">
+                    <replace-type modified-type="Phonon::AudioCaptureDevice"/>
+                </modify-argument>
+            </modify-function>
+            <modify-function signature="operator!=(Phonon::ObjectDescription)const">
+                <modify-argument index="1">
+                    <replace-type modified-type="Phonon::AudioCaptureDevice"/>
+                </modify-argument>
+            </modify-function>
+            <modify-function signature="fromIndex(int)">
+              <modify-argument index="return">
+                <replace-type modified-type="AudioCaptureDevice"/>
+              </modify-argument>
+            </modify-function>
+        </value-type>
+        <value-type name="AudioChannelDescription">
+            <modify-function signature="operator==(Phonon::ObjectDescription)const">
+                <modify-argument index="1">
+                    <replace-type modified-type="Phonon::AudioChannelDescription"/>
+                </modify-argument>
+            </modify-function>
+            <modify-function signature="operator!=(Phonon::ObjectDescription)const">
+                <modify-argument index="1">
+                    <replace-type modified-type="Phonon::AudioChannelDescription"/>
+                </modify-argument>
+            </modify-function>
+            <modify-function signature="fromIndex(int)">
+              <modify-argument index="return">
+                <replace-type modified-type="AudioChannelDescription"/>
+              </modify-argument>
+            </modify-function>
+        </value-type>
+        <value-type name="SubtitleDescription">
+            <modify-function signature="operator==(Phonon::ObjectDescription)const">
+                <modify-argument index="1">
+                    <replace-type modified-type="Phonon::SubtitleDescription"/>
+                </modify-argument>
+            </modify-function>
+            <modify-function signature="operator!=(Phonon::ObjectDescription)const">
+                <modify-argument index="1">
+                    <replace-type modified-type="Phonon::SubtitleDescription"/>
+                </modify-argument>
+            </modify-function>
+            <modify-function signature="fromIndex(int)">
+              <modify-argument index="return">
+                <replace-type modified-type="SubtitleDescription"/>
+              </modify-argument>
+            </modify-function>
+        </value-type>
+        <object-type name="ObjectDescriptionModel" generate="no"/>
+        <object-type name="EffectDescriptionModel" />
+        <object-type name="AudioOutputDeviceModel" />
+
+        <object-type name="AbstractAudioOutput"/>
+        <object-type name="AbstractMediaStream"/>
+        <object-type name="AudioOutput"/>
+        <object-type name="Effect"/>
+        <object-type name="EffectWidget"/>
+        <object-type name="MediaController">
+            <enum-type name="Feature" flags="Features"/>
+            <enum-type name="NavigationMenu"/>
+        </object-type>
+        <object-type name="MediaObject" />
+        <object-type name="SeekSlider">
+            <modify-function signature="setMediaObject(Phonon::MediaObject*)">
+                <modify-argument index="1">
+                    <parent index="this" action="add"/>
+                </modify-argument>
+            </modify-function>
+        </object-type>
+        <object-type name="VideoPlayer"/>
+        <object-type name="VideoWidget">
+            <enum-type name="AspectRatio"/>
+            <enum-type name="ScaleMode"/>
+        </object-type>
+        <object-type name="VolumeFaderEffect">
+            <enum-type name="FadeCurve"/>
+        </object-type>
+        <object-type name="VolumeSlider">
+            <modify-function signature="setAudioOutput(Phonon::AudioOutput*)">
+                <modify-argument index="1">
+                    <parent index="this" action="add"/>
+                </modify-argument>
+            </modify-function>
+        </object-type>
+
+        <!-- ### The following entries may be present in the system or not. Keep this section organized. -->
+        <value-type name="VideoCaptureDevice">
+            <modify-function signature="operator==(Phonon::ObjectDescription)const">
+                <modify-argument index="1">
+                    <replace-type modified-type="Phonon::VideoCaptureDevice" />
+                </modify-argument>
+            </modify-function>
+            <modify-function signature="operator!=(Phonon::ObjectDescription)const">
+                <modify-argument index="1">
+                    <replace-type modified-type="Phonon::VideoCaptureDevice"/>
+                </modify-argument>
+            </modify-function>
+            <modify-function signature="fromIndex(int)">
+              <modify-argument index="return">
+                <replace-type modified-type="VideoCaptureDevice"/>
+              </modify-argument>
+            </modify-function>
+        </value-type>
+        <!-- ### -->
     </namespace-type>
-    <namespace-type name="Phonon::BackendCapabilities" >
-       <inject-code class="native">
-        Phonon::BackendCapabilities::NotifierWrapper* Phonon::BackendCapabilities::NotifierWrapper::m_instance = 0;
-        Phonon::BackendCapabilities::Notifier* Phonon::BackendCapabilities::NotifierWrapper::m_notifier = 0;
-       </inject-code>
-
-       <add-function signature="notifier()" return-type="Phonon::BackendCapabilities::NotifierWrapper">
-          <inject-code class="target">
-            Phonon::BackendCapabilities::NotifierWrapper *_notifierWrapper =  Phonon::BackendCapabilities::NotifierWrapper::notifier();
-            %PYARG_0 = %CONVERTTOPYTHON[Phonon::BackendCapabilities::NotifierWrapper*](_notifierWrapper);
-          </inject-code>
-       </add-function>
-    </namespace-type>
-
-    <!-- ### causes moc-related linker error -->
-    <!-- <object-type name="Phonon::BackendCapabilities::Notifier"/> -->
-    <object-type name="Phonon::BackendCapabilities::NotifierWrapper" target-lang-name="Notifier">
-        <include file-name="backendcapabilities.h" location="global"/>
-        <include file-name="pyside_phonon.h" location="local"/>
-
-        <modify-function signature="notifier()" remove="all"/>
-        <modify-function signature="Phonon::BackendCapabilities::NotifierWrapper(Phonon::BackendCapabilities::Notifier*)">
-          <access modifier="private"/>
-        </modify-function>
-    </object-type>
-
-    <enum-type name="Phonon::Category" />
-    <enum-type name="Phonon::DiscType"/>
-    <enum-type name="Phonon::ErrorType"/>
-    <enum-type name="Phonon::MetaData"/>
-    <enum-type name="Phonon::ObjectDescriptionType"/>
-    <enum-type name="Phonon::State"/>
-
-    <enum-type name="Phonon::AddonInterface::AngleCommand"/>
-    <enum-type name="Phonon::AddonInterface::ChapterCommand"/>
-    <enum-type name="Phonon::AddonInterface::Interface"/>
-    <enum-type name="Phonon::AddonInterface::NavigationCommand"/>
-    <enum-type name="Phonon::AddonInterface::TitleCommand"/>
-    <enum-type name="Phonon::AddonInterface::SubtitleCommand"/>
-    <enum-type name="Phonon::AddonInterface::AudioChannelCommand"/>
-    <enum-type name="Phonon::BackendInterface::Class"/>
-    <enum-type name="Phonon::EffectParameter::Hint" flags="Phonon::EffectParameter::Hints"/>
-    <enum-type name="Phonon::MediaController::Feature" flags="Phonon::MediaController::Features"/>
-    <enum-type name="Phonon::MediaSource::Type"/>
-    <enum-type name="Phonon::VideoWidget::AspectRatio"/>
-    <enum-type name="Phonon::VideoWidget::ScaleMode"/>
-    <enum-type name="Phonon::VolumeFaderEffect::FadeCurve"/>
-
-    <object-type name="Phonon::AbstractVideoOutput"/>
-    <object-type name="Phonon::AddonInterface"/>
-    <object-type name="Phonon::BackendInterface"/>
-    <object-type name="Phonon::EffectInterface"/>
-    <object-type name="Phonon::MediaNode"/>
-
-    <object-type name="Phonon::MediaObjectInterface"/>
-    <object-type name="Phonon::PlatformPlugin"/>
-    <object-type name="Phonon::StreamInterface"/>
-    <object-type name="Phonon::VideoWidgetInterface"/>
-    <object-type name="Phonon::VolumeFaderInterface"/>
-
-    <value-type name="Phonon::EffectParameter">
-        <modify-function signature="EffectParameter()" remove="all"/> <!-- internal -->
-        <modify-function signature="operator&lt;(const Phonon::EffectParameter &amp;)const" remove="all"/> <!-- internal -->
-        <modify-function signature="operator&gt;(const Phonon::EffectParameter &amp;)const" remove="all"/> <!-- internal -->
-        <modify-function signature="id()const" remove="all"/> <!-- internal -->
-        <modify-function signature="operator=(Phonon::EffectParameter)" remove="all"/> <!-- Covered by copy constructor -->
-        <modify-function signature="EffectParameter(Phonon::EffectParameter)" remove="all"/>
-        <modify-function signature="operator==(Phonon::EffectParameter)const" remove="all"/>
-    </value-type>
-    <value-type name="Phonon::MediaSource">
-        <modify-function signature="operator=(Phonon::MediaSource)" remove="all"/> <!-- Covered by copy constructor -->
-    </value-type>
-    <value-type name="Phonon::Path">
-        <modify-function signature="disconnect()" rename="disconnectPath"/>
-        <modify-function signature="operator=(Phonon::Path)" remove="all"/> <!-- Covered by copy constructor -->
-        <modify-function signature="insertEffect(Phonon::EffectDescription,Phonon::Effect*)">
-            <modify-argument index="1">
-                <parent index="this" action="add"/>
-            </modify-argument>
-        </modify-function>
-        <modify-function signature="insertEffect(Phonon::Effect*,Phonon::Effect*)">
-            <modify-argument index="1">
-                <parent index="this" action="add"/>
-            </modify-argument>
-        </modify-function>
-        <modify-function signature="removeEffect(Phonon::Effect*)">
-            <modify-argument index="1">
-                <parent index="this" action="remove"/>
-            </modify-argument>
-        </modify-function>
-        <modify-function signature="sink() const">
-            <modify-argument index="return">
-                <define-ownership class="target" owner="default"/>
-            </modify-argument>
-        </modify-function>
-        <modify-function signature="source() const">
-            <modify-argument index="return">
-                <define-ownership class="target" owner="default"/>
-            </modify-argument>
-        </modify-function>
-    </value-type>
-    <value-type name="Phonon::ObjectDescription" generate="no"/>
-    <value-type name="Phonon::EffectDescription">
-        <modify-function signature="operator==(Phonon::ObjectDescription)const" remove="all"/>
-        <modify-function signature="operator!=(Phonon::ObjectDescription)const" remove="all"/>
-        <modify-function signature="fromIndex(int)" remove="all"/>
-    </value-type>
-    <value-type name="Phonon::AudioOutputDevice">
-        <modify-function signature="operator==(Phonon::ObjectDescription)const" remove="all"/>
-        <modify-function signature="operator!=(Phonon::ObjectDescription)const" remove="all"/>
-        <modify-function signature="fromIndex(int)" remove="all"/>
-    </value-type>
-
-    <value-type name="Phonon::AudioCaptureDevice">
-        <modify-function signature="operator==(Phonon::ObjectDescription)const" remove="all"/>
-        <modify-function signature="operator!=(Phonon::ObjectDescription)const" remove="all"/>
-        <modify-function signature="fromIndex(int)" remove="all"/>
-    </value-type>
-    <value-type name="Phonon::AudioChannelDescription">
-        <modify-function signature="operator==(Phonon::ObjectDescription)const" remove="all"/>
-        <modify-function signature="operator!=(Phonon::ObjectDescription)const" remove="all"/>
-        <modify-function signature="fromIndex(int)" remove="all"/>
-    </value-type>
-    <value-type name="Phonon::SubtitleDescription">
-        <modify-function signature="operator==(Phonon::ObjectDescription)const" remove="all"/>
-        <modify-function signature="operator!=(Phonon::ObjectDescription)const" remove="all"/>
-        <modify-function signature="fromIndex(int)" remove="all"/>
-    </value-type>
-
-
-    <object-type name="Phonon::ObjectDescriptionModel" generate="no"/>
-    <object-type name="Phonon::EffectDescriptionModel" />
-    <object-type name="Phonon::AudioOutputDeviceModel" />
-
-    <object-type name="Phonon::AbstractAudioOutput"/>
-    <object-type name="Phonon::AbstractMediaStream"/>
-    <object-type name="Phonon::AudioOutput"/>
-    <object-type name="Phonon::Effect"/>
-    <object-type name="Phonon::EffectWidget"/>
-    <object-type name="Phonon::MediaController"/>
-    <object-type name="Phonon::MediaObject" />
-    <object-type name="Phonon::SeekSlider">
-        <modify-function signature="setMediaObject(Phonon::MediaObject*)">
-            <modify-argument index="1">
-                <parent index="this" action="add"/>
-            </modify-argument>
-        </modify-function>
-    </object-type>
-    <object-type name="Phonon::VideoPlayer"/>
-    <object-type name="Phonon::VideoWidget"/>
-    <object-type name="Phonon::VolumeFaderEffect"/>
-    <object-type name="Phonon::VolumeSlider">
-        <modify-function signature="setAudioOutput(Phonon::AudioOutput*)">
-            <modify-argument index="1">
-                <parent index="this" action="add"/>
-            </modify-argument>
-        </modify-function>
-    </object-type>
-
 </typesystem>
diff --git a/PySide/pysideqtesttouch.h b/PySide/pysideqtesttouch.h
new file mode 100644
index 0000000..fa7d2e4
--- /dev/null
+++ b/PySide/pysideqtesttouch.h
@@ -0,0 +1,147 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtTest module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef PYSIDEQTESTTOUCH_H
+#define PYSIDEQTESTTOUCH_H
+
+#include <QtTest/qtest_global.h>
+#include <QtTest/qtestassert.h>
+#include <QtTest/qtestsystem.h>
+#include <QtTest/qtestspontaneevent.h>
+#include <QtTest/qtesttouch.h>
+
+#include <QtCore/qmap.h>
+#include <QtGui/qevent.h>
+#include <QtGui/qwidget.h>
+
+QT_BEGIN_NAMESPACE
+
+namespace QTest
+{
+
+    class PySideQTouchEventSequence
+    {
+    public:
+        ~PySideQTouchEventSequence()
+        {
+            commit();
+        }
+
+        PySideQTouchEventSequence* press(int touchId, const QPoint &pt, QWidget *widget = 0)
+        {
+            QTouchEvent::TouchPoint &p = point(touchId);
+            p.setScreenPos(mapToScreen(widget, pt));
+            p.setState(Qt::TouchPointPressed);
+            return this;
+        }
+
+        PySideQTouchEventSequence* move(int touchId, const QPoint &pt, QWidget *widget = 0)
+        {
+            QTouchEvent::TouchPoint &p = point(touchId);
+            p.setScreenPos(mapToScreen(widget, pt));
+            p.setState(Qt::TouchPointMoved);
+            return this;
+        }
+
+        PySideQTouchEventSequence* release(int touchId, const QPoint &pt, QWidget *widget = 0)
+        {
+            QTouchEvent::TouchPoint &p = point(touchId);
+            p.setScreenPos(mapToScreen(widget, pt));
+            p.setState(Qt::TouchPointReleased);
+            return this;
+        }
+
+        PySideQTouchEventSequence* stationary(int touchId)
+        {
+            QTouchEvent::TouchPoint &p = point(touchId);
+            p.setState(Qt::TouchPointStationary);
+            return this;
+        }
+
+        void commit()
+        {
+            qt_translateRawTouchEvent(targetWidget, deviceType, points.values());
+            targetWidget = 0;
+            points.clear();
+        }
+
+    private:
+        PySideQTouchEventSequence(QWidget *widget, QTouchEvent::DeviceType aDeviceType)
+            : targetWidget(widget), deviceType(aDeviceType)
+        {
+        }
+
+        PySideQTouchEventSequence(const PySideQTouchEventSequence &v);
+
+        void operator=(const PySideQTouchEventSequence&);
+
+        QTouchEvent::TouchPoint &point(int touchId)
+        {
+            if (!points.contains(touchId))
+                points[touchId] = QTouchEvent::TouchPoint(touchId);
+            return points[touchId];
+        }
+
+        QPoint mapToScreen(QWidget *widget, const QPoint &pt)
+        {
+            if (widget)
+                return widget->mapToGlobal(pt);
+            return targetWidget ? targetWidget->mapToGlobal(pt) : pt;
+        }
+
+        QMap<int, QTouchEvent::TouchPoint> points;
+        QWidget *targetWidget;
+        QTouchEvent::DeviceType deviceType;
+        friend PySideQTouchEventSequence* generateTouchEvent(QWidget *, QTouchEvent::DeviceType);
+    };
+
+    inline
+    PySideQTouchEventSequence* generateTouchEvent(QWidget *widget = 0,
+                                                  QTouchEvent::DeviceType deviceType = QTouchEvent::TouchScreen)
+    {
+        return new PySideQTouchEventSequence(widget, deviceType);
+    }
+
+}
+
+QT_END_NAMESPACE
+
+#endif // PYSIDEQTESTTOUCH_H
diff --git a/PySide/pysidewtypes.h b/PySide/pysidewtypes.h
new file mode 100644
index 0000000..4d9d4f0
--- /dev/null
+++ b/PySide/pysidewtypes.h
@@ -0,0 +1,27 @@
+#ifndef __PYSIDEWTYPES__
+#define __PYSIDEWTYPES__
+
+typedef struct HWND__ *HWND;
+typedef unsigned UINT;
+typedef long LONG;
+typedef unsigned long DWORD;
+typedef UINT WPARAM;
+typedef LONG LPARAM;
+
+struct POINT
+{
+    LONG x;
+    LONG y;
+};
+
+struct MSG
+{
+    HWND hwnd;
+    UINT message;
+    WPARAM wParam;
+    LPARAM lParam;
+    DWORD time;
+    POINT pt;
+};
+
+#endif
diff --git a/PySide/qpytextobject.cpp b/PySide/qpytextobject.cpp
new file mode 100644
index 0000000..90462f5
--- /dev/null
+++ b/PySide/qpytextobject.cpp
@@ -0,0 +1,33 @@
+/*
+ * This file is part of the PySide project.
+ *
+ * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+ *
+ * Contact: PySide team <contact@pyside.org>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+#include "qpytextobject.h"
+
+/*!
+    \class QPyTextObject
+    \brief Workaround to make possible use QTextObjectInterface on PySide.
+    \ingroup richtext-processing
+    Due to the technical details of how to bind C++ classes to Python, you need to use this class when you need to implement
+    your own QTextObjectInterface rather than create a class inheriting from QObject and QTextObjectInterface.
+
+    \sa QTextObjectInterface
+*/
diff --git a/PySide/qpytextobject.h b/PySide/qpytextobject.h
new file mode 100644
index 0000000..6616270
--- /dev/null
+++ b/PySide/qpytextobject.h
@@ -0,0 +1,40 @@
+/*
+ * This file is part of the PySide project.
+ *
+ * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+ *
+ * Contact: PySide team <contact@pyside.org>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+#ifndef QPYTEXTOBJECT
+#define QPYTEXTOBJECT
+
+#include <QObject>
+#include <QTextObjectInterface>
+
+class QPyTextObject : public QObject, public QTextObjectInterface
+{
+    Q_OBJECT
+    Q_INTERFACES(QTextObjectInterface)
+public:
+    QPyTextObject(QObject* parent = 0) : QObject(parent) {}
+    void drawObject(QPainter* painter, const QRectF& rect, QTextDocument* doc, int posInDocument, const QTextFormat& format ) = 0;
+    QSizeF intrinsicSize(QTextDocument* doc, int posInDocument, const QTextFormat& format ) = 0;
+};
+#endif
+
+
diff --git a/PySide/typesystem_templates.xml b/PySide/typesystem_templates.xml
index 3badcf2..2903ae4 100644
--- a/PySide/typesystem_templates.xml
+++ b/PySide/typesystem_templates.xml
@@ -1,50 +1,109 @@
 <?xml version="1.0"?>
+<!--
+    This file is part of PySide project.
+    Copyright (C) 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
+    Contact: PySide team <contact@pyside.org>
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+-->
 <typesystem>
+    <template name="replace_child">
+        $CHILD_TYPE* oldChild = %CPPSELF.$FUNCTION_GET_OLD();
+        if (oldChild &amp;&amp; (oldChild != $CPPARG)) {
+            Shiboken::AutoDecRef pyChild(%CONVERTTOPYTHON[$CHILD_TYPE*](oldChild));
+            Shiboken::Object::setParent(0, pyChild);
+            Shiboken::Object::releaseOwnership(pyChild);
+        }
+        Shiboken::Object::setParent(%PYSELF, $PYARG);
+    </template>
+
     <!-- Templates to fix bool* parameters -->
+    <template name="tuple_retval_ok">
+    %PYARG_0 = PyTuple_New(2);
+    PyTuple_SET_ITEM(%PYARG_0, 0, %CONVERTTOPYTHON[%RETURN_TYPE](retval_));
+    PyTuple_SET_ITEM(%PYARG_0, 1, %CONVERTTOPYTHON[bool](ok_));
+    </template>
     <template name="fix_bool*">
         bool ok_;
+        %BEGIN_ALLOW_THREADS
         %RETURN_TYPE retval_ = %CPPSELF.%FUNCTION_NAME(&amp;ok_);
-        %PYARG_0 = Shiboken::makeTuple(retval_, ok_);
+        %END_ALLOW_THREADS
+        <insert-template name="tuple_retval_ok"/>
     </template>
     <template name="fix_args,bool*">
         bool ok_;
+        %BEGIN_ALLOW_THREADS
         %RETURN_TYPE retval_ = %CPPSELF.%FUNCTION_NAME(%ARGUMENT_NAMES, &amp;ok_);
-        %PYARG_0 = Shiboken::makeTuple(retval_, ok_);
+        %END_ALLOW_THREADS
+        <insert-template name="tuple_retval_ok"/>
     </template>
     <template name="fix_arg,bool*,arg">
         bool ok_;
+        %BEGIN_ALLOW_THREADS
         %RETURN_TYPE retval_ = %CPPSELF.%FUNCTION_NAME(%1, &amp;ok_, %3);
-        %PYARG_0 = Shiboken::makeTuple(retval_, ok_);
+        %END_ALLOW_THREADS
+        <insert-template name="tuple_retval_ok"/>
     </template>
     <template name="fix_bool*,arg">
         bool ok_;
+        %BEGIN_ALLOW_THREADS
         %RETURN_TYPE retval_ = %CPPSELF.%FUNCTION_NAME(&amp;ok_, %2);
-        %PYARG_0 = Shiboken::makeTuple(retval_, ok_);
+        %END_ALLOW_THREADS
+        <insert-template name="tuple_retval_ok"/>
     </template>
     <template name="fix_bool*,arg,arg">
         bool ok_;
+        %BEGIN_ALLOW_THREADS
         %RETURN_TYPE retval_ = %CPPSELF.%FUNCTION_NAME(&amp;ok_, %2, %3);
-        %PYARG_0 = Shiboken::makeTuple(retval_, ok_);
+        %END_ALLOW_THREADS
+        <insert-template name="tuple_retval_ok"/>
     </template>
     <template name="fix_bool*,arg,arg,arg">
         bool ok_;
+        %BEGIN_ALLOW_THREADS
         %RETURN_TYPE retval_ = %CPPSELF.%FUNCTION_NAME(&amp;ok_, %2, %3, %4);
-        %PYARG_0 = Shiboken::makeTuple(retval_, ok_);
+        %END_ALLOW_THREADS
+        <insert-template name="tuple_retval_ok"/>
+    </template>
+    <template name="fix_bool*,arg,arg,arg,arg">
+        bool ok_;
+        %BEGIN_ALLOW_THREADS
+        %RETURN_TYPE retval_ = %CPPSELF.%FUNCTION_NAME(&amp;ok_, %2, %3, %4, %5);
+        %END_ALLOW_THREADS
+        <insert-template name="tuple_retval_ok"/>
     </template>
     <template name="fix_arg,arg,arg,arg,arg,arg,arg,bool*,arg">
         bool ok_;
+        %BEGIN_ALLOW_THREADS
         %RETURN_TYPE retval_ = %CPPSELF.%FUNCTION_NAME(%1, %2, %3, %4, %5, %6, %7, &amp;ok_, %9);
-        %PYARG_0 = Shiboken::makeTuple(retval_, ok_);
+        %END_ALLOW_THREADS
+        <insert-template name="tuple_retval_ok"/>
     </template>
     <template name="fix_arg,arg,arg,arg,arg,arg,bool*,arg">
         bool ok_;
+        %BEGIN_ALLOW_THREADS
         %RETURN_TYPE retval_ = %CPPSELF.%FUNCTION_NAME(%1, %2, %3, %4, %5, %6, &amp;ok_, %8);
-        %PYARG_0 = Shiboken::makeTuple(retval_, ok_);
+        %END_ALLOW_THREADS
+        <insert-template name="tuple_retval_ok"/>
     </template>
     <template name="fix_arg,arg,arg,arg,arg,bool*,arg">
         bool ok_;
+        %BEGIN_ALLOW_THREADS
         %RETURN_TYPE retval_ = %CPPSELF.%FUNCTION_NAME(%1, %2, %3, %4, %5, &amp;ok_, %7);
-        %PYARG_0 = Shiboken::makeTuple(retval_, ok_);
+        %END_ALLOW_THREADS
+        <insert-template name="tuple_retval_ok"/>
     </template>
     <template name="get_slice">
         %TYPE* sequence;
@@ -74,70 +133,296 @@
 
     <template name="fix_args,QRectF*">
         QRectF rect_;
+        %BEGIN_ALLOW_THREADS
         %CPPSELF.%FUNCTION_NAME(%ARGUMENT_NAMES, &amp;rect_);
+        %END_ALLOW_THREADS
         %PYARG_0 = %CONVERTTOPYTHON[QRectF](rect_);
     </template>
 
     <template name="fix_args,QRect*">
         QRect rect_;
+        %BEGIN_ALLOW_THREADS
         %CPPSELF.%FUNCTION_NAME(%ARGUMENT_NAMES, &amp;rect_);
+        %END_ALLOW_THREADS
         %PYARG_0 = %CONVERTTOPYTHON[QRect](rect_);
     </template>
 
     <template name="fix_char*">
-        char val_;
-        %RETURN_TYPE retval_ = %CPPSELF.%FUNCTION_NAME(&amp;val_);
-        %PYARG_0 = Shiboken::makeTuple(retval_, val_);
+    char val_;
+    %BEGIN_ALLOW_THREADS
+    %RETURN_TYPE retval_ = %CPPSELF.%FUNCTION_NAME(&amp;val_);
+    %END_ALLOW_THREADS
+    %PYARG_0 = PyTuple_New(2);
+    PyTuple_SET_ITEM(%PYARG_0, 0, %CONVERTTOPYTHON[%RETURN_TYPE](retval_));
+    PyTuple_SET_ITEM(%PYARG_0, 1, %CONVERTTOPYTHON[char](val_));
     </template>
 
-    <template name="fix_int*,int*,int*,int*">
-        int a, b, c, d;
-        %CPPSELF.%FUNCTION_NAME(&amp;a, &amp;b, &amp;c, &amp;d);
-        %PYARG_0 = Shiboken::makeTuple(a, b, c, d);
+    <template name="tuple_abcd_same_type">
+    %PYARG_0 = PyTuple_New(4);
+    PyTuple_SET_ITEM(%PYARG_0, 0, %CONVERTTOPYTHON[$TYPE](a));
+    PyTuple_SET_ITEM(%PYARG_0, 1, %CONVERTTOPYTHON[$TYPE](b));
+    PyTuple_SET_ITEM(%PYARG_0, 2, %CONVERTTOPYTHON[$TYPE](c));
+    PyTuple_SET_ITEM(%PYARG_0, 3, %CONVERTTOPYTHON[$TYPE](d));
     </template>
-    <template name="fix_qreal*,qreal*,qreal*,qreal*">
-        qreal a, b, c, d;
-        %CPPSELF.%FUNCTION_NAME(&amp;a, &amp;b, &amp;c, &amp;d);
-        %PYARG_0 = Shiboken::makeTuple(a, b, c, d);
+    <template name="fix_number*,number*,number*,number*">
+    $TYPE a, b, c, d;
+    %BEGIN_ALLOW_THREADS
+    %CPPSELF->::%TYPE::%FUNCTION_NAME(&amp;a, &amp;b, &amp;c, &amp;d);
+    %END_ALLOW_THREADS
+    <insert-template name="tuple_abcd_same_type"/>
+    </template>
+    <template name="fix_number*,number*,number*,number*,args">
+    $TYPE a, b, c, d;
+    %BEGIN_ALLOW_THREADS
+    %CPPSELF->::%TYPE::%FUNCTION_NAME(&amp;a, &amp;b, &amp;c, &amp;d, %ARGUMENT_NAMES);
+    %END_ALLOW_THREADS
+    <insert-template name="tuple_abcd_same_type"/>
     </template>
 
-    <template name="fix_int*,int*,int*,int*,int*">
-        int a, b, c, d, e;
-        %CPPSELF.%FUNCTION_NAME(&amp;a, &amp;b, &amp;c, &amp;d, &amp;e);
-        %PYARG_0 = Shiboken::makeTuple(a, b, c, d, e);
+    <template name="fix_native_return_number*,number*,number*,number*">
+        PyObject* _obj = %PYARG_0.object();
+        if (!PySequence_Check(_obj)
+            || PySequence_Fast_GET_SIZE(_obj) != 4
+            || !SbkNumber_Check(PySequence_Fast_GET_ITEM(_obj, 0))
+            || !SbkNumber_Check(PySequence_Fast_GET_ITEM(_obj, 1))
+            || !SbkNumber_Check(PySequence_Fast_GET_ITEM(_obj, 2))
+            || !SbkNumber_Check(PySequence_Fast_GET_ITEM(_obj, 3))) {
+            PyErr_SetString(PyExc_TypeError, "Sequence of 4 numbers expected");
+        } else {
+            *%1 = %CONVERTTOCPP[$TYPE](PySequence_Fast_GET_ITEM(_obj, 0));
+            *%2 = %CONVERTTOCPP[$TYPE](PySequence_Fast_GET_ITEM(_obj, 1));
+            *%3 = %CONVERTTOCPP[$TYPE](PySequence_Fast_GET_ITEM(_obj, 2));
+            *%4 = %CONVERTTOCPP[$TYPE](PySequence_Fast_GET_ITEM(_obj, 3));
+        }
     </template>
-    <template name="fix_qreal*,qreal*,qreal*,qreal*,qreal*">
-        qreal a, b, c, d, e;
-        %CPPSELF.%FUNCTION_NAME(&amp;a, &amp;b, &amp;c, &amp;d, &amp;e);
-        %PYARG_0 = Shiboken::makeTuple(a, b, c, d, e);
+
+    <template name="fix_number*,number*,number*,number*,number*">
+    $TYPE a, b, c, d, e;
+    %BEGIN_ALLOW_THREADS
+    %CPPSELF.%FUNCTION_NAME(&amp;a, &amp;b, &amp;c, &amp;d, &amp;e);
+    %END_ALLOW_THREADS
+    %PYARG_0 = PyTuple_New(5);
+    PyTuple_SET_ITEM(%PYARG_0, 0, %CONVERTTOPYTHON[$TYPE](a));
+    PyTuple_SET_ITEM(%PYARG_0, 1, %CONVERTTOPYTHON[$TYPE](b));
+    PyTuple_SET_ITEM(%PYARG_0, 2, %CONVERTTOPYTHON[$TYPE](c));
+    PyTuple_SET_ITEM(%PYARG_0, 3, %CONVERTTOPYTHON[$TYPE](d));
+    PyTuple_SET_ITEM(%PYARG_0, 4, %CONVERTTOPYTHON[$TYPE](e));
     </template>
+
     <template name="read_wrapper">
-        char _data[%2];
+        Shiboken::AutoArrayPointer&lt;char&gt; _data(%2);
         qint64 _size = %CPPSELF.%FUNCTION_NAME(_data, %2);
+        QByteArray ba;
         if (_size > 0)
-            %PYARG_0 = %CONVERTTOPYTHON[QByteArray](QByteArray(_data, _size));
-        else
-            %PYARG_0 = %CONVERTTOPYTHON[QByteArray](QByteArray());
+            ba = QByteArray(_data, _size);
+        %PYARG_0 = %CONVERTTOPYTHON[QByteArray](ba);
     </template>
-    <template name="fix_return_args,int*">
-        RETURNTYPE _ret;
-        int _arg;
-        _ret = %CPPSELF.%FUNCTION_NAME(%ARGUMENT_NAMES, &amp;_arg);
-        %PYARG_0 = Shiboken::makeTuple(_ret, _arg);
+
+    <template name="fix_args,number*,number*">
+    $TYPE a, b;
+    %BEGIN_ALLOW_THREADS
+    %CPPSELF.%FUNCTION_NAME(%ARGUMENT_NAMES, &amp;a, &amp;b);
+    %END_ALLOW_THREADS
+    %PYARG_0 = PyTuple_New(2);
+    PyTuple_SET_ITEM(%PYARG_0, 0, %CONVERTTOPYTHON[$TYPE](a));
+    PyTuple_SET_ITEM(%PYARG_0, 1, %CONVERTTOPYTHON[$TYPE](b));
     </template>
 
     <template name="fix_virtual_method_return_value_and_bool*">
-        AutoDecRef _py_ret_(PySequence_GetItem(%PYARG_0, 0));
-        AutoDecRef _py_ok_(PySequence_GetItem(%PYARG_0, 1));
+        Shiboken::AutoDecRef _py_ret_(PySequence_GetItem(%PYARG_0, 0));
+        Shiboken::AutoDecRef _py_ok_(PySequence_GetItem(%PYARG_0, 1));
         %RETURN_TYPE %out = %CONVERTTOCPP[%RETURN_TYPE](_py_ret_);
         *%2 = %CONVERTTOCPP[bool](_py_ok_);
     </template>
 
     <template name="fix_arg,int*,int*">
-        %RETURN_TYPE _ret;
-        int a, b;
-        _ret = %CPPSELF.%FUNCTION_NAME(%1, &amp;a, &amp;b);
-        %PYARG_0 = Shiboken::makeTuple(_ret, a, b);
+    %RETURN_TYPE _ret;
+    int a, b;
+    %BEGIN_ALLOW_THREADS
+    _ret = %CPPSELF.%FUNCTION_NAME(%1, &amp;a, &amp;b);
+    %END_ALLOW_THREADS
+    %PYARG_0 = PyTuple_New(3);
+    PyTuple_SET_ITEM(%PYARG_0, 0, %CONVERTTOPYTHON[%RETURN_TYPE](_ret));
+    PyTuple_SET_ITEM(%PYARG_0, 1, %CONVERTTOPYTHON[int](a));
+    PyTuple_SET_ITEM(%PYARG_0, 2, %CONVERTTOPYTHON[int](b));
     </template>
-</typesystem>
 
+    <template name="return_QString">
+        %PYARG_0 = %CONVERTTOPYTHON[QString](%1);
+    </template>
+
+    <template name="return_tuple_QValidator_QString_int">
+    %BEGIN_ALLOW_THREADS
+    %RETURN_TYPE retval_ = %RETURN_TYPE(%CPPSELF.%FUNCTION_NAME(%1, %2));
+    %END_ALLOW_THREADS
+    %PYARG_0 = PyTuple_New(3);
+    PyTuple_SET_ITEM(%PYARG_0, 0, %CONVERTTOPYTHON[%RETURN_TYPE](retval_));
+    PyTuple_SET_ITEM(%PYARG_0, 1, %CONVERTTOPYTHON[%ARG1_TYPE](%1));
+    PyTuple_SET_ITEM(%PYARG_0, 2, %CONVERTTOPYTHON[%ARG2_TYPE](%2));
+    </template>
+
+    <template name="return_for_QFileDialog">
+    %BEGIN_ALLOW_THREADS
+    %RETURN_TYPE retval_ = %CPPSELF.%FUNCTION_NAME(%1, %2, %3, %4, &amp;%5, %6);
+    %END_ALLOW_THREADS
+    %PYARG_0 = PyTuple_New(2);
+    PyTuple_SET_ITEM(%PYARG_0, 0, %CONVERTTOPYTHON[%RETURN_TYPE](retval_));
+    PyTuple_SET_ITEM(%PYARG_0, 1, %CONVERTTOPYTHON[%ARG5_TYPE](%5));
+    </template>
+    <template name="set_qapp_parent_for_orphan">
+        if (%PYARG_0 &amp;&amp; (%PYARG_0 != Py_None)) {
+            SbkObject* _pySelf = reinterpret_cast&lt;SbkObject*&gt;(%PYARG_0);
+            if (!Shiboken::Object::hasParentInfo(_pySelf))
+                Shiboken::Object::setParent(%CONVERTTOPYTHON[QApplication*](qApp), %PYARG_0);
+        }
+    </template>
+    <!-- templates for __repr__ -->
+    <template name="repr_code">
+        QString format = QString().sprintf("%s(%REPR_FORMAT)", ((PyObject*)%PYSELF)->ob_type->tp_name, %REPR_ARGS);
+        %PYARG_0 = Shiboken::String::fromCString(qPrintable(format));
+    </template>
+    <template name="repr_code_matrix">
+        QString format= QString("%1((").arg(((PyObject*)%PYSELF)->ob_type->tp_name);
+
+        QList&lt; %MATRIX_TYPE &gt; cppArgs;
+        %MATRIX_TYPE data[%MATRIX_SIZE];
+        %CPPSELF.copyDataTo(data);
+        int matrixSize = %MATRIX_SIZE;
+        for(int size=0; size &lt; matrixSize; size++) {
+            if (size > 0)
+                format += ", ";
+            format += QString::number(data[size]);
+        }
+        format += "))";
+
+        %PYARG_0 = Shiboken::String::fromCString(qPrintable(format));
+    </template>
+
+    <template name="return_internal_pointer">
+        %PYARG_0 = reinterpret_cast&lt;PyObject*>(%CPPSELF.%FUNCTION_NAME());
+        if (!%PYARG_0)
+            %PYARG_0 = Py_None;
+        Py_INCREF(%PYARG_0);
+    </template>
+
+    <!-- templates for __reduce__ -->
+    <template name="reduce_code">
+        %PYARG_0 = Py_BuildValue("(N(%REDUCE_FORMAT))", PyObject_Type(%PYSELF), %REDUCE_ARGS);
+    </template>
+    <template name="reduce_code_matrix">
+        QList&lt; %MATRIX_TYPE &gt; cppArgs;
+        %MATRIX_TYPE data[%MATRIX_SIZE];
+        %CPPSELF.copyDataTo(data);
+        int matrixSize = %MATRIX_SIZE;
+        for(int size=0; size &lt; matrixSize; size++)
+            cppArgs.append(data[size]);
+
+        PyObject *type = PyObject_Type(%PYSELF);
+        PyObject *args = Py_BuildValue("(N)", %CONVERTTOPYTHON[QList&lt;%MATRIX_TYPE&gt; ](cppArgs));
+        %PYARG_0 = Py_BuildValue("(NN)", type, args);
+    </template>
+
+    <!-- Matrix Aux functions -->
+    <template name="matrix_constructor">
+        if (PySequence_Size(%PYARG_1) == %SIZE) {
+            Shiboken::AutoDecRef fast(PySequence_Fast(%PYARG_1, "Failed to parse sequence on %TYPE constructor."));
+            qreal values[%SIZE];
+            for(int i=0; i &lt; %SIZE; i++) {
+                PyObject *pv = PySequence_Fast_GET_ITEM(fast.object(), i);
+                values[i] = %CONVERTTOCPP[qreal](pv);
+            }
+            %0 = new %TYPE(values);
+        }
+    </template>
+
+    <template name="matrix_data_function">
+        const qreal* data = %CPPSELF.constData();
+        PyObject *pyData = PyTuple_New(%MATRIX_SIZE);
+        if (data) {
+            for(int i=0; i &lt; %MATRIX_SIZE; i++)
+                PyTuple_SET_ITEM(pyData, i, %CONVERTTOPYTHON[qreal](data[i]));
+        }
+        return pyData;
+    </template>
+
+    <template name="matrix_fill_function">
+        qreal value = %CONVERTTOCPP[qreal](%PYARG_1);
+        %CPPSELF.fill(value);
+    </template>
+
+    <template name="matrix_transposed_function">
+        %TRANSPOSED_TYPE transp = %CPPSELF.transposed();
+        return %CONVERTTOPYTHON[%TRANSPOSED_TYPE](transp);
+    </template>
+
+    <!-- Replace '#' for the argument number you want. -->
+    <template name="return_argument">
+        Py_INCREF(%PYARG_#);
+        %PYARG_0 = %PYARG_#;
+    </template>
+
+    <!-- Iterator -->
+    <template name="__iter__">
+        Py_INCREF(%PYSELF);
+        %PYARG_0 = %PYSELF;
+    </template>
+
+    <template name="__iter_parent__">
+        %CPPSELF_TYPE _tmp = %CPPSELF.begin();
+        %PYARG_0 = %CONVERTTOPYTHON[%CPPSELF_TYPE](_tmp);
+    </template>
+
+    <template name="__next__">
+        if (!%CPPSELF.atEnd()) {
+            %PYARG_0 = %CONVERTTOPYTHON[%CPPSELF_TYPE](*%CPPSELF);
+            ++(*%CPPSELF);
+        }
+    </template>
+
+    <template name="convertFromMultiMap">
+        %RETURN_NAME = PyDict_New();
+        foreach(%KEY_TYPE _key, %MAP_NAME.keys()) {
+            Shiboken::AutoDecRef _pyValueList(PyList_New(0));
+            foreach(%VALUE_TYPE _value, %MAP_NAME.values(_key)) {
+                Shiboken::AutoDecRef _pyValue(%CONVERTTOPYTHON[%VALUE_TYPE](_value));
+                PyList_Append(_pyValueList, _pyValue);
+            }
+
+            Shiboken::AutoDecRef _pyKey(%CONVERTTOPYTHON[%KEY_TYPE](_key));
+            PyDict_SetItem(%RETURN_NAME, _pyKey, _pyValueList);
+        }
+    </template>
+
+    <template name="to_tuple">
+        %PYARG_0 = Py_BuildValue("%TT_FORMAT", %TT_ARGS);
+    </template>
+
+    <template name="cpplist_to_pylist_convertion">
+    PyObject* %out = PyList_New((int) %in.size());
+    %INTYPE::const_iterator it = %in.begin();
+    for (int idx = 0; it != %in.end(); ++it, ++idx) {
+        %INTYPE_0 cppItem(*it);
+        PyList_SET_ITEM(%out, idx, %CONVERTTOPYTHON[%INTYPE_0](cppItem));
+    }
+    return %out;
+    </template>
+    <template name="pyseq_to_cpplist_convertion">
+    for (int i = 0; i &lt; PySequence_Size(%in); i++) {
+        Shiboken::AutoDecRef pyItem(PySequence_GetItem(%in, i));
+        %OUTTYPE_0 cppItem = %CONVERTTOCPP[%OUTTYPE_0](pyItem);
+        %out &lt;&lt; cppItem;
+    }
+    </template>
+
+    <template name="checkPyCapsuleOrPyCObject_func">
+    static bool checkPyCapsuleOrPyCObject(PyObject* pyObj)
+    {
+        #ifdef IS_PY3K
+        return PyCapsule_CheckExact(pyObj);
+        #else
+        return PyCObject_Check(pyObj);
+        #endif
+    }
+    </template>
+
+</typesystem>
diff --git a/cmake/Macros/FindQt4Extra.cmake b/cmake/Macros/FindQt4Extra.cmake
new file mode 100644
index 0000000..dc7e5c4
--- /dev/null
+++ b/cmake/Macros/FindQt4Extra.cmake
@@ -0,0 +1,54 @@
+#
+# Try to find QtMultimedia
+# TODO: Remove this hack when cmake support QtMultimedia module
+if (NOT QT_QTMULTIMEDIA_FOUND AND ${QTVERSION} VERSION_GREATER 4.5.9)
+    find_path(QT_QTMULTIMEDIA_INCLUDE_DIR QtMultimedia
+            PATHS ${QT_HEADERS_DIR}/QtMultimedia
+                ${QT_LIBRARY_DIR}/QtMultimedia.framework/Headers
+            NO_DEFAULT_PATH)
+    find_library(QT_QTMULTIMEDIA_LIBRARY QtMultimedia PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
+    if (QT_QTMULTIMEDIA_INCLUDE_DIR AND QT_QTMULTIMEDIA_LIBRARY)
+        set(QT_QTMULTIMEDIA_FOUND ON)
+    else()
+        #Replace this on documentation
+        set(if_QtMultimedia "<!--")
+        set(end_QtMultimedia "-->")
+    endif()
+endif ()
+
+# Try to find QtMaemo5 - it has to be done before QtGui to enable some QtMaemo5 flags
+# TODO: Remove this hack when cmake support QtMaemo5 module
+if (NOT QT_QTMAEMO5_FOUND AND ${QTVERSION} VERSION_GREATER 4.5.9)
+    find_path(QT_QTMAEMO5_INCLUDE_DIR QtMaemo5
+            PATHS ${QT_HEADERS_DIR}/QtMaemo5
+                ${QT_LIBRARY_DIR}/QtMaemo5.framework/Headers
+            NO_DEFAULT_PATH)
+    find_library(QT_QTMAEMO5_LIBRARY QtMaemo5 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
+    if (QT_QTMAEMO5_INCLUDE_DIR AND QT_QTMAEMO5_LIBRARY)
+        set(QT_QTMAEMO5_FOUND ON)
+        set(Q_WS_MAEMO_5 ON)
+    else()
+        #Replace this on documentation
+        set(if_Maemo5 "<!--")
+        set(end_Maemo5 "-->")
+    endif()
+endif ()
+
+# Try to find QtDeclarative
+# TODO: Remove this hack when cmake support QtDeclarative module
+if (NOT QT_QTDECLARATIVE_FOUND AND ${QTVERSION} VERSION_GREATER 4.6.0)
+    find_path(QT_QTDECLARATIVE_INCLUDE_DIR QtDeclarative
+            PATHS ${QT_HEADERS_DIR}/QtDeclarative
+                ${QT_LIBRARY_DIR}/QtDeclarative.framework/Headers
+            NO_DEFAULT_PATH)
+    find_library(QT_QTDECLARATIVE_LIBRARY QtDeclarative PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
+    if (QT_QTDECLARATIVE_INCLUDE_DIR AND QT_QTDECLARATIVE_LIBRARY)
+        set(QT_QTDECLARATIVE_FOUND ON)
+    else()
+        #Replace this on documentation
+        set(if_QtDeclarative "<!--")
+        set(end_QtDeclarative "-->")
+    endif()
+endif ()
+
+
diff --git a/cmake/Macros/PySideModules.cmake b/cmake/Macros/PySideModules.cmake
new file mode 100644
index 0000000..2fe6cd1
--- /dev/null
+++ b/cmake/Macros/PySideModules.cmake
@@ -0,0 +1,127 @@
+macro(create_pyside_module module_name module_include_dir module_libraries module_deps module_typesystem_path module_sources module_static_sources)
+    string(TOLOWER ${module_name} _module)
+    string(REGEX REPLACE ^qt "" _module ${_module})
+
+    if(${ARGC} GREATER 7)
+        set (typesystem_name ${ARGV7})
+    else()
+        set (typesystem_name "")
+    endif()
+    if(${ARGC} GREATER 8)
+        string(REPLACE ";" "\\;" dropped_entries "${${ARGV8}}")
+    else()
+        set (dropped_entries "")
+    endif()
+
+    if (NOT EXISTS ${typesystem_name})
+        set(typesystem_path ${CMAKE_CURRENT_SOURCE_DIR}/typesystem_${_module}.xml)
+    else()
+        set(typesystem_path ${typesystem_name})
+    endif()
+
+    add_custom_command(OUTPUT ${${module_sources}}
+                        COMMAND ${SHIBOKEN_BINARY} ${GENERATOR_EXTRA_FLAGS}
+                        ${pyside_BINARY_DIR}/pyside_global.h
+                        --include-paths=${pyside_SOURCE_DIR}${PATH_SEP}${QT_INCLUDE_DIR}
+                        --typesystem-paths=${pyside_SOURCE_DIR}${PATH_SEP}${${module_typesystem_path}}
+                        --output-directory=${CMAKE_CURRENT_BINARY_DIR}
+                        --license-file=${CMAKE_CURRENT_SOURCE_DIR}/../licensecomment.txt
+                        ${typesystem_path}
+                        --api-version=${SUPPORTED_QT_VERSION}
+                        --drop-type-entries="${dropped_entries}"
+                        WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+                        COMMENT "Running generator for ${module_name}...")
+
+    include_directories(${module_name} ${${module_include_dir}} ${pyside_SOURCE_DIR})
+    add_library(${module_name} MODULE ${${module_sources}} ${${module_static_sources}})
+    set_target_properties(${module_name} PROPERTIES PREFIX "" LIBRARY_OUTPUT_DIRECTORY ${pyside_BINARY_DIR})
+    if(WIN32)
+        set_target_properties(${module_name} PROPERTIES SUFFIX ".pyd")
+        set(${module_name}_suffix ".pyd")
+    else()
+        set(${module_name}_suffix ${CMAKE_SHARED_MODULE_SUFFIX})
+    endif()
+    target_link_libraries(${module_name} ${${module_libraries}})
+    if(${module_deps})
+        add_dependencies(${module_name} ${${module_deps}})
+    endif()
+
+
+    # install
+    install(TARGETS ${module_name} LIBRARY DESTINATION ${SITE_PACKAGE}/PySide)
+    string(TOLOWER ${module_name} lower_module_name)
+    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/PySide/${module_name}/pyside_${lower_module_name}_python.h
+            DESTINATION include/PySide${pyside_SUFFIX}/${module_name}/)
+    file(GLOB typesystem_files ${CMAKE_CURRENT_SOURCE_DIR}/typesystem_*.xml ${typesystem_path})
+    install(FILES ${typesystem_files} DESTINATION share/PySide${pyside_SUFFIX}/typesystems)
+endmacro()
+
+#macro(check_qt_class_with_namespace module namespace class optional_source_files dropped_entries [namespace] [module])
+macro(check_qt_class module class optional_source_files dropped_entries)
+    if (${ARGC} GREATER 4)
+        set (namespace ${ARGV4})
+        string(TOLOWER ${namespace} _namespace)
+    else ()
+        set (namespace "")
+    endif ()
+    if (${ARGC} GREATER 5)
+        set (include_file ${ARGV5})
+    else ()
+        set (include_file ${class})
+    endif ()
+    string(TOLOWER ${class} _class)
+    string(TOUPPER ${module} _module)
+    if (_namespace)
+        set(_cppfile ${CMAKE_CURRENT_BINARY_DIR}/PySide/${module}/${_namespace}_${_class}_wrapper.cpp)
+    else ()
+        set(_cppfile ${CMAKE_CURRENT_BINARY_DIR}/PySide/${module}/${_class}_wrapper.cpp)
+    endif ()
+    if (DEFINED PYSIDE_${class})
+        if (PYSIDE_${class})
+            list(APPEND ${optional_source_files} ${_cppfile})
+        else()
+            list(APPEND ${dropped_entries} PySide.${module}.${class})
+        endif()
+    else()
+        if (NOT ${namespace} STREQUAL "" )
+            set (NAMESPACE_USE "using namespace ${namespace};")
+        else ()
+            set (NAMESPACE_USE "")
+        endif ()
+        set(SRC_FILE ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/test${class}.cxx)
+        file(WRITE ${SRC_FILE}
+             "#include <${include_file}>\n"
+             "${NAMESPACE_USE}\n"
+             "int main() { sizeof(${class}); }\n"
+        )
+        try_compile(Q_WORKS ${CMAKE_BINARY_DIR}
+                    ${SRC_FILE}
+                    CMAKE_FLAGS
+                        "-DLINK_LIBRARIES=${QT_${_module}_LIBRARY}"
+                        "-DLINK_DIRECTORIES=${QT_LIBRARY_DIR}"
+                        "-DINCLUDE_DIRECTORIES=${QT_INCLUDE_DIR};${QT_${_module}_INCLUDE_DIR}"
+                    OUTPUT_VARIABLE OUTPUT)
+        file(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeCheckQtClassTest.log ${OUTPUT})
+
+        set("PYSIDE_${class}" ${Q_WORKS} CACHE STRING "Has ${class} class been found?")
+        if(Q_WORKS)
+            message(STATUS "Checking for ${class} in ${module} -- found")
+            list(APPEND ${optional_source_files} ${_cppfile})
+        else()
+            message(STATUS "Checking for ${class} in ${module} -- not found")
+            list(APPEND ${dropped_entries} PySide.${module}.${class})
+        endif()
+    endif()
+endmacro()
+
+
+# Only add subdirectory if the associated Qt module is found.
+macro(HAS_QT_MODULE var name)
+    if (NOT DISABLE_${name} AND ${var})
+        add_subdirectory(${name})
+    else()
+        # Used on documentation to skip modules
+        set("if_${name}" "<!--" PARENT_SCOPE)
+        set("end_${name}" "-->" PARENT_SCOPE)
+    endif()
+endmacro()
diff --git a/icecc.cmake b/cmake/Macros/icecc.cmake
similarity index 100%
rename from icecc.cmake
rename to cmake/Macros/icecc.cmake
diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
index 7bad422..967c289 100644
--- a/doc/CMakeLists.txt
+++ b/doc/CMakeLists.txt
@@ -1,89 +1,60 @@
-find_program(graphviz_exec dot)
+project(doc)
 
-if (QT_SRC_DIR)
+set(DOC_DATA_DIR "${CMAKE_CURRENT_BINARY_DIR}/qdoc3-output")
+configure_file("pyside.qdocconf.in" "pyside.qdocconf" @ONLY)
 
-if (NOT ${graphviz_exec} STREQUAL graphviz_exec-NOTFOUND)
+add_custom_target(qdoc3
+                COMMAND qdoc3 pyside.qdocconf
+                COMMENT "Running qdoc3 against Qt source code..."
+                SOURCE "pyside.qdocconf")
 
+
+find_program(SPHINX_BUILD NAMES sphinx-build)
+if (${SPHINX_BUILD} MATCHES "SPHINX_BUILD-NOTFOUND")
+    message(FATAL_ERROR "sphinx-build command not found.")
+endif()
 add_custom_target(apidoc
                   COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}/rst
-                  COMMAND sphinx-build -b html  ${CMAKE_CURRENT_BINARY_DIR}/rst htmldocs
+                  COMMAND ${SHIBOKEN_PYTHON_INTERPRETER} ${SPHINX_BUILD} -b html  ${CMAKE_CURRENT_BINARY_DIR}/rst html
                  )
 
 # create conf.py based on conf.py.in
 configure_file("conf.py.in" "rst/conf.py" @ONLY)
+configure_file(typesystem_doc.xml.in typesystem_doc.xml @ONLY)
 
-# copy pyside.qdocconf to qt source dir.
-configure_file("pyside.qdocconf" "${QT_SRC_DIR}/tools/qdoc3/test/pyside.qdocconf" @ONLY)
-set(DOC_DATA_DIR "${CMAKE_CURRENT_BINARY_DIR}/qt4xmldoc")
-set(ENV{QTDIR} ${QT_SRC_DIR} )
-
-add_custom_target(qdoc3
-                  COMMAND QTDIR=${QT_SRC_DIR} qdoc3 pyside.qdocconf
-                  WORKING_DIRECTORY "${QT_SRC_DIR}/tools/qdoc3/test"
-                  COMMENT "Running qdoc3 against Qt source code..."
-                  SOURCE "pyside.qdocconf")
-
-macro(create_doc module typesystem_path)
-string(REGEX REPLACE "^Qt" "" module_name ${module})
-string(TOLOWER ${module_name} module_name)
-add_custom_target("${module}-apidoc"
-COMMAND ${GENERATOR} --generatorSet=qtdoc
-        ${pyside_BINARY_DIR}/global.h
-        --include-paths=${QT_INCLUDE_DIR}:${QT_QTCORE_INCLUDE_DIR}
-        --typesystem-paths=${pyside_SOURCE_DIR}:${${module}_BINARY_DIR}:${typesystem_path}
-        ${pyside_SOURCE_DIR}/${module}/typesystem_${module_name}.xml
-        --library-source-dir=${QT_SRC_DIR}
-        --documentation-only
-        --documentation-data-dir=${DOC_DATA_DIR}
-        --documentation-out-dir=${CMAKE_CURRENT_BINARY_DIR}/rst
-        --documentation-code-snippets-dir=${CMAKE_CURRENT_SOURCE_DIR}/codesnippets
-WORKING_DIRECTORY ${${module}_SOURCE_DIR}
-
-COMMENT "Running generator to generate documentation of ${module}..."
+add_custom_target("docrsts"
+    COMMAND ${SHIBOKEN_BINARY} --generator-set=qtdoc
+            ${pyside_BINARY_DIR}/pyside_global.h
+            --include-paths="${QT_INCLUDE_DIR}${PATH_SEP}${pyside_SOURCE_DIR}"
+            --api-version=${SUPPORTED_QT_VERSION}
+            --typesystem-paths="${pyside_SOURCE_DIR}${PATH_SEP}${QtCore_SOURCE_DIR}${PATH_SEP}${QtDeclarative_SOURCE_DIR}${PATH_SEP}${QtGui_SOURCE_DIR}${PATH_SEP}${QtGui_BINARY_DIR}${PATH_SEP}${QtHelp_SOURCE_DIR}${PATH_SEP}${QtMaemo5_SOURCE_DIR}${PATH_SEP}${QtMultimedia_SOURCE_DIR}${PATH_SEP}${QtNetwork_SOURCE_DIR}${PATH_SEP}${QtOpenGL_SOURCE_DIR}${PATH_SEP}${QtScript_SOURCE_DIR}${PATH_SEP}${QtScriptTools_SOURCE_DIR}${PATH_SEP}${QtSql_SOURCE_DIR}${PATH_SEP}${QtSvg_SOURCE_DIR}${PATH_SEP}${QtTest_SOURCE_DIR}${PATH_SEP}${QtUiTools_SOURCE_DIR}${PATH_SEP}${QtWebKit_SOURCE_DIR}${PATH_SEP}${QtXml_SOURCE_DIR}${PATH_SEP}${QtXmlPatterns_SOURCE_DIR}${PATH_SEP}${phonon_SOURCE_DIR}"
+            --library-source-dir=${QT_SRC_DIR}
+            --documentation-only
+            --documentation-data-dir=${DOC_DATA_DIR}
+            --output-directory=${CMAKE_CURRENT_BINARY_DIR}/rst
+            --documentation-code-snippets-dir=${CMAKE_CURRENT_SOURCE_DIR}/codesnippets${PATH_SEP}${CMAKE_CURRENT_SOURCE_DIR}/codesnippets/examples
+            --documentation-extra-sections-dir=${CMAKE_CURRENT_SOURCE_DIR}/extras
+            ${CMAKE_CURRENT_BINARY_DIR}/typesystem_doc.xml
+    WORKING_DIRECTORY ${${module}_SOURCE_DIR}
+    COMMENT "Running generator to generate documentation..."
 )
-add_dependencies("${module}-apidoc" qdoc3)
-add_dependencies(apidoc "${module}-apidoc")
-endmacro(create_doc module)
+add_dependencies(apidoc docrsts)
+add_dependencies(docrsts qdoc3)
 
-create_doc(QtCore "")
-create_doc(QtGui "${QtCore_SOURCE_DIR}")
-create_doc(QtHelp "${QtCore_SOURCE_DIR}:${QtGui_BINARY_DIR}:${QtGui_SOURCE_DIR}:${QtHelp_SOURCE_DIR}")
-create_doc(QtNetwork "${QtCore_SOURCE_DIR}")
-create_doc(QtOpengl "${QtCore_SOURCE_DIR}:${QtGui_BINARY_DIR}:${QtGui_SOURCE_DIR}:${QtOpenGL_SOURCE_DIR}")
-create_doc(QtSql "${QtCore_SOURCE_DIR}:${QtGui_BINARY_DIR}:${QtGui_SOURCE_DIR}:${QtSql_SOURCE_DIR}")
-create_doc(QtSvg "${QtCore_SOURCE_DIR}:${QtGui_SOURCE_DIR}:${QtGui_BINARY_DIR}")
-create_doc(QtUitools "${QtCore_SOURCE_DIR}:${QtGui_BINARY_DIR}:${QtGui_SOURCE_DIR}:${QtXml_SOURCE_DIR}:${QtUiTools_SOURCE_DIR}")
-create_doc(QtXml "${QtCore_SOURCE_DIR}")
-create_doc(QtWebKit "${QtCore_SOURCE_DIR}:${QtGui_SOURCE_DIR}:${QtGui_BINARY_DIR}:${QtNetwork_SOURCE_DIR}")
-create_doc(QtMultimedia "${QtCore_SOURCE_DIR}:${QtGui_SOURCE_DIR}:${QtGui_BINARY_DIR}")
-create_doc(QtScript "${QtCore_SOURCE_DIR}")
-create_doc(QtScriptTools "${QtCore_SOURCE_DIR}:${QtScript_SOURCE_DIR}:${QtGui_SOURCE_DIR}:${QtGui_BINARY_DIR}")
-create_doc(QtTest "${QtCore_SOURCE_DIR}:${QtGui_SOURCE_DIR}:${QtGui_BINARY_DIR}")
-create_doc(QtXmlPatterns "${QtCore_SOURCE_DIR}")
-create_doc(phonon "${QtCore_SOURCE_DIR}:${QtGui_SOURCE_DIR}:${QtGui_BINARY_DIR}")
-create_doc(QtDeclarative "${QtCore_SOURCE_DIR}:${QtGui_SOURCE_DIR}:${QtGui_BINARY_DIR}:${QtNetwork_SOURCE_DIR}")
-
-#create devhelp file
-add_custom_target(apidevhelp
-    COMMAND python;${CMAKE_CURRENT_SOURCE_DIR}/pyhtml2devhelp.py;${CMAKE_BINARY_DIR}/apidoc/html;index.html >
-            ${CMAKE_BINARY_DIR}/apidoc/html/PySide.devhelp;${BINDING_API_VERSION}&&;
-            gzip;-9v;-f;${CMAKE_BINARY_DIR}/apidoc/html/PySide.devhelp
-    COMMAND ${CMAKE_COMMAND} -E make_directory "${CMAKE_INSTALL_PREFIX}/share/devhelp/books"
-    COMMAND ${CMAKE_COMMAND} -E create_symlink "${CMAKE_INSTALL_PREFIX}/share/doc/${BINDING_NAME}/html" "${CMAKE_INSTALL_PREFIX}/share/devhelp/books/${BINDING_NAME}"
-)
+# #create devhelp file
+# add_custom_target(apidevhelp
+#     COMMAND python;${CMAKE_CURRENT_SOURCE_DIR}/pyhtml2devhelp.py;${CMAKE_BINARY_DIR}/apidoc/html;index.html >
+#             ${CMAKE_BINARY_DIR}/apidoc/html/PySide.devhelp;${BINDING_API_VERSION}&&;
+#             gzip;-9v;-f;${CMAKE_BINARY_DIR}/apidoc/html/PySide.devhelp
+#     COMMAND ${CMAKE_COMMAND} -E make_directory "${CMAKE_INSTALL_PREFIX}/share/devhelp/books"
+#     COMMAND ${CMAKE_COMMAND} -E create_symlink "${CMAKE_INSTALL_PREFIX}/share/doc/${BINDING_NAME}/html" "${CMAKE_INSTALL_PREFIX}/share/devhelp/books/${BINDING_NAME}"
+# )
 
 #install files
 add_custom_target(apidocinstall
-    COMMAND mkdir -p ${CMAKE_INSTALL_PREFIX}/share/doc/${BINDING_NAME} && cp -rv ${CMAKE_BINARY_DIR}/apidoc/* ${CMAKE_INSTALL_PREFIX}/share/doc/${BINDING_NAME}
+    COMMAND mkdir -p ${CMAKE_INSTALL_PREFIX}/share/doc/PySide-${BINDING_API_VERSION} && cp -rv ${CMAKE_CURRENT_BINARY_DIR}/html/* ${CMAKE_INSTALL_PREFIX}/share/doc/PySide-${BINDING_API_VERSION}
 )
 
-add_dependencies(apidocinstall apidevhelp)
-
-else (NOT ${graphviz_exec} STREQUAL graphviz_exec-NOTFOUND)
-    message(STATUS "Missing graphviz tool (dot), apidoc generation targets disabled.")
-endif (NOT ${graphviz_exec} STREQUAL graphviz_exec-NOTFOUND)
-
-else (QT_SRC_DIR)
-    message(STATUS "QT_SRC_DIR variable not set, apidoc generation targets disabled.")
-endif (QT_SRC_DIR)
+add_dependencies(apidocinstall apidoc)
+# add_dependencies(apidocinstall apidevhelp)
 
diff --git a/doc/_static/.gitignore b/doc/_static/.gitignore
deleted file mode 100644
index e69de29..0000000
diff --git a/doc/_static/basic.css b/doc/_static/basic.css
deleted file mode 100644
index 2509c22..0000000
--- a/doc/_static/basic.css
+++ /dev/null
@@ -1,417 +0,0 @@
-/**
- * Sphinx stylesheet -- basic theme
- * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- */
-
-/* -- main layout ----------------------------------------------------------- */
-
-div.documentwrapper {
-    float: left;
-    width: 100%;
-}
-
-div.bodywrapper {
-    margin: 0 0 0 230px;
-}
-
-div.clearer {
-    clear: both;
-}
-
-/* -- relbar ---------------------------------------------------------------- */
-
-div.related {
-    width: 100%;
-    font-size: 90%;
-}
-
-div.related h3 {
-    display: none;
-}
-
-div.related ul {
-    margin: 0;
-    padding: 0 0 0 0px;
-    list-style: none;
-}
-
-div.related li {
-	float: left;
-    display: inline;
-	padding-right:17px;
-	padding-left:10px;
-	background-image:url(images/bread_crumb.png);
-	background-position:right;
-	background-repeat:no-repeat;
-}
-
-div.related li.right {
-    float: right;
-    margin-right: 5px;
-	padding: 0 0 0 0px;
-	background-image:none;
-}
-
-/* -- sidebar --------------------------------------------------------------- */
-
-div.sphinxsidebarwrapper {
-    padding: 10px 5px 0 10px;
-}
-
-div.sphinxsidebar {
-    float: left;
-    width: 230px;
-    margin-left: -100%;
-    font-size: 90%;
-}
-
-div.sphinxsidebar ul {
-    list-style: none;
-}
-
-div.sphinxsidebar ul ul,
-div.sphinxsidebar ul.want-points {
-    margin-left: 20px;
-    list-style: square;
-}
-
-div.sphinxsidebar ul ul {
-    margin-top: 0;
-    margin-bottom: 0;
-}
-
-div.sphinxsidebar form {
-    margin-top: 10px;
-}
-
-img {
-    border: 0;
-}
-
-/* -- search page ----------------------------------------------------------- */
-
-ul.search {
-    margin: 10px 0 0 20px;
-    padding: 0;
-}
-
-ul.search li {
-    padding: 5px 0 5px 20px;
-    background-image: url(file.png);
-    background-repeat: no-repeat;
-    background-position: 0 7px;
-}
-
-ul.search li a {
-    font-weight: bold;
-}
-
-ul.search li div.context {
-    color: #888;
-    margin: 2px 0 0 30px;
-    text-align: left;
-}
-
-ul.keywordmatches li.goodmatch a {
-    font-weight: bold;
-}
-
-/* -- index page ------------------------------------------------------------ */
-
-table.contentstable {
-    text-align: left;
-    width: 90%;
-}
-
-table.contentstable p.biglink {
-    line-height: 150%;
-}
-
-a.biglink {
-    font-size: 1.3em;
-}
-
-span.linkdescr {
-    text-align: left;
-    padding-top: 5px;
-    font-size: 90%;
-}
-
-/* -- general index --------------------------------------------------------- */
-
-table.indextable td {
-    text-align: left;
-    vertical-align: top;
-}
-
-table.indextable dl, table.indextable dd {
-    margin-top: 0;
-    margin-bottom: 0;
-}
-
-table.indextable tr.pcap {
-    height: 10px;
-}
-
-table.indextable tr.cap {
-    margin-top: 10px;
-    background-color: #f2f2f2;
-}
-
-img.toggler {
-    margin-right: 3px;
-    margin-top: 3px;
-    cursor: pointer;
-}
-
-/* -- general body styles --------------------------------------------------- */
-
-a.headerlink {
-    visibility: hidden;
-}
-
-h1:hover > a.headerlink,
-h2:hover > a.headerlink,
-h3:hover > a.headerlink,
-h4:hover > a.headerlink,
-h5:hover > a.headerlink,
-h6:hover > a.headerlink,
-dt:hover > a.headerlink {
-    visibility: visible;
-}
-
-div.body p.caption {
-    text-align: inherit;
-}
-
-div.body td {
-    text-align: left;
-}
-
-.field-list ul {
-    padding-left: 1em;
-}
-
-.first {
-    margin-top: 0 !important;
-}
-
-p.rubric {
-    margin-top: 30px;
-    font-weight: bold;
-}
-
-/* -- sidebars -------------------------------------------------------------- */
-
-div.sidebar {
-    margin: 0 0 0.5em 1em;
-    border: 1px solid #ddb;
-    padding: 7px 7px 0 7px;
-    background-color: #ffe;
-    width: 40%;
-    float: right;
-}
-
-p.sidebar-title {
-    font-weight: bold;
-}
-
-/* -- topics ---------------------------------------------------------------- */
-
-div.topic {
-    border: 1px solid #ccc;
-    padding: 7px 7px 0 7px;
-    margin: 10px 0 10px 0;
-}
-
-p.topic-title {
-    font-size: 1.1em;
-    font-weight: bold;
-    margin-top: 10px;
-}
-
-/* -- admonitions ----------------------------------------------------------- */
-
-div.admonition {
-    margin-top: 10px;
-    margin-bottom: 10px;
-    padding: 7px;
-}
-
-div.admonition dt {
-    font-weight: bold;
-}
-
-div.admonition dl {
-    margin-bottom: 0;
-}
-
-p.admonition-title {
-    margin: 0px 10px 5px 0px;
-    font-weight: bold;
-}
-
-div.body p.centered {
-    text-align: center;
-    margin-top: 25px;
-}
-
-/* -- tables ---------------------------------------------------------------- */
-
-table.docutils {
-    border: 0;
-    border-collapse: collapse;
-}
-
-table.docutils td, table.docutils th {
-    padding: 2px 8px 2px 8px;
-    border-top: 0;
-    border-left: 0;
-    border-right: 0;
-    border-bottom: 1px solid #aaa;
-}
-
-table.field-list td, table.field-list th {
-    border: 0 !important;
-}
-
-table.footnote td, table.footnote th {
-    border: 0 !important;
-}
-
-th {
-    text-align: left;
-    padding-right: 5px;
-}
-
-/* -- other body styles ----------------------------------------------------- */
-
-dl {
-    margin-bottom: 15px;
-}
-
-dd p {
-    margin-top: 0px;
-}
-
-dd ul, dd table {
-    margin-bottom: 10px;
-}
-
-dd {
-    margin-top: 3px;
-    margin-bottom: 10px;
-    margin-left: 30px;
-}
-
-dt:target, .highlight {
-    background-color: #fbe54e;
-}
-
-dl.glossary dt {
-    font-weight: bold;
-    font-size: 1.1em;
-}
-
-.field-list ul {
-    margin: 0;
-    padding-left: 1em;
-}
-
-.field-list p {
-    margin: 0;
-}
-
-.refcount {
-    color: #060;
-}
-
-.optional {
-    font-size: 1.3em;
-}
-
-.versionmodified {
-    font-style: italic;
-}
-
-.system-message {
-    background-color: #fda;
-    padding: 5px;
-    border: 3px solid red;
-}
-
-.footnote:target  {
-    background-color: #ffa
-}
-
-/* -- code displays --------------------------------------------------------- */
-
-pre {
-    overflow: auto;
-}
-
-td.linenos pre {
-    padding: 5px 0px;
-    border: 0;
-    background-color: transparent;
-    color: #aaa;
-}
-
-table.highlighttable {
-    margin-left: 0.5em;
-}
-
-table.highlighttable td {
-    padding: 0 0.5em 0 0.5em;
-}
-
-tt.descname {
-    background-color: transparent;
-    font-weight: bold;
-    font-size: 1.2em;
-}
-
-tt.descclassname {
-    background-color: transparent;
-}
-
-tt.xref, a tt {
-    background-color: transparent;
-    font-weight: bold;
-}
-
-h1 tt, h2 tt, h3 tt, h4 tt, h5 tt, h6 tt {
-    background-color: transparent;
-}
-
-/* -- math display ---------------------------------------------------------- */
-
-img.math {
-    vertical-align: middle;
-}
-
-div.math p {
-    text-align: center;
-}
-
-span.eqno {
-    float: right;
-}
-
-/* -- printout stylesheet --------------------------------------------------- */
-
-@media print {
-    div.document,
-    div.documentwrapper,
-    div.bodywrapper {
-        margin: 0;
-        width: 100%;
-    }
-
-    div.sphinxsidebar,
-    div.related,
-    div.footer,
-    #top-link {
-        display: none;
-    }
-}
diff --git a/doc/_static/default.css b/doc/_static/default.css
deleted file mode 100644
index 721ceb7..0000000
--- a/doc/_static/default.css
+++ /dev/null
@@ -1,248 +0,0 @@
-/**
- * Sphinx stylesheet -- default theme
- * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- */
-
-@import url("basic.css");
-
-/* -- page layout ----------------------------------------------------------- */
-
-body {
-    font-family: sans-serif;
-    font-size: 100%;
-    background-color: #000000;
-    color: #000;
-    margin: 0;
-    padding: 0;
-}
-
-div.document {
-    background-image:url(images/side_background.jpg);
-    background-repeat:repeat-y;
-    background-color:#ffd800;
-}
-
-div.body {
-    position:relative;
-    background-color:#fff;
-    color: #000000;
-    padding: 0 20px 30px 20px;
-}
-
-div.footer {
-    color: #ffffff;
-    width: 100%;
-    padding: 9px 0 9px 0;
-    text-align: center;
-    font-size: 75%;
-}
-
-div.footer a {
-    color: #ffffff;
-    text-decoration: underline;
-}
-
-div.related {
-    background-image:url(images/top_background.jpg);
-    background-repeat:repeat-x;
-    background-color: #d7aa00;
-    line-height:33px;
-    height:33px;
-    color: #000000;
-}
-
-div.related a {
-    color: #000000;
-}
-
-div.related img {
-    padding-top:3px;
-}
-
-div.sphinxsidebar {
-}
-
-div.sphinxsidebar h3 {
-    font-family: Arial, Verdana, sans-serif;
-    color: #000000;
-    font-size: 1.4em;
-    font-weight: normal;
-    margin: 0;
-    padding: 0;
-}
-
-div.sphinxsidebar h3 a {
-    color: #000000;
-}
-
-div.sphinxsidebar h4 {
-    font-family: Arial, Verdana, sans-serif;
-    color: #000000;
-    font-size: 1.3em;
-    font-weight: normal;
-    margin: 5px 0 0 0;
-    padding: 0;
-}
-
-div.sphinxsidebar p {
-    color: #ffffff;
-}
-
-div.sphinxsidebar p.topless {
-    margin: 5px 10px 10px 10px;
-}
-
-div.sphinxsidebar ul {
-    margin: 10px;
-    padding: 0;
-    color: #ffffff;
-}
-
-div#searchbox p.searchtip {
-    color:#000000;
-    font-size:90%;
-    padding-top:50px;
-}
-
-div#searchbox {
-    background-image:url(images/background_search.jpg);
-    background-repeat:no-repeat;
-    background-position:center;
-    border:none;
-}
-
-div.sphinxsidebar a {
-    color: #009491;
-}
-
-
-/* -- body styles ----------------------------------------------------------- */
-
-a {
-    color: #009491;
-    text-decoration: underline;
-}
-
-a:hover {
-    text-decoration: underline;
-}
-
-div.body p, div.body dd, div.body li {
-    text-align: left;
-    line-height: 130%;
-}
-
-div.body h1 {
-    font-family: Arial, Verdana, sans-serif;
-    background-color: #f2f2f2;
-    font-weight: normal;
-    color: #20435c;
-    border-bottom: 1px solid #ccc;
-    margin: 20px -20px 10px -20px;
-    padding: 3px 0 3px 10px;
-}
-
-div.body h2,
-div.body h3,
-div.body h4,
-div.body h5,
-div.body h6 {
-    font-family: Arial, Verdana, Helvetica, sans-serif;
-    font-size:12px;
-    font-weight:normal;
-    border-left-width: 1px;
-    border-right-width: 1px;
-    border-top-width: 1px;
-    border-bottom-width: 2px;
-    border-style: solid;
-    border-left-color: #b1b1b1;
-    border-right-color: #b1b1b1;
-    border-top-color: #b1b1b1;
-    border-bottom-color: #009491;
-    background-color: #e0e0e0;
-    padding-left:5px;
-}
-
-div.body h1 { margin-top: 0; font-size: 200%; }
-div.body h2 { font-size: 120%; }
-div.body h3 { font-size: 115%; }
-div.body h4 { font-size: 110%; }
-div.body h5 { font-size: 105%; }
-div.body h6 { font-size: 100%; }
-
-a.headerlink {
-    color: #c60f0f;
-    font-size: 0.8em;
-    padding: 0 4px 0 4px;
-    text-decoration: none;
-}
-
-a.headerlink:hover {
-    background-color: #c60f0f;
-    color: white;
-}
-
-div.body p, div.body dd, div.body li {
-    text-align: left;
-    line-height: 130%;
-}
-
-div.admonition p.admonition-title + p {
-    display: inline;
-}
-
-div.note {
-    background-color: #eee;
-    border: 1px solid #ccc;
-}
-
-div.seealso {
-    background-color: #ffc;
-    border: 1px solid #ff6;
-}
-
-div.topic {
-    background-color: #eee;
-}
-
-div.warning {
-    background-color: #ffe4e4;
-    border: 1px solid #f66;
-}
-
-p.admonition-title {
-    display: inline;
-}
-
-p.admonition-title:after {
-    content: ":";
-}
-
-input[type=text]{
-    background-color: #009491;
-    font: 11px verdana, arial, helvetica, sans-serif;
-    color:#FFFFFF;
-    width: 150px;
-    height: 18px;
-    border: 1px solid #009491;
-    margin-left:13px;
-    margin-top:15px;
-    margin-bottom:4px;
-    border:none;
-}
-
-pre {
-    padding: 5px;
-    background-color: #eeffcc;
-    color: #333333;
-    line-height: 120%;
-    border: 1px solid #ac9;
-    border-left: none;
-    border-right: none;
-}
-
-tt {
-    background-color: #ecf0f3;
-    padding: 0 1px 0 1px;
-    font-size: 0.95em;
-}
diff --git a/doc/_static/images/._background_search.jpg b/doc/_static/images/._background_search.jpg
deleted file mode 100755
index d5c689c..0000000
Binary files a/doc/_static/images/._background_search.jpg and /dev/null differ
diff --git a/doc/_static/images/._bread_crumb.png b/doc/_static/images/._bread_crumb.png
deleted file mode 100755
index 46b8591..0000000
Binary files a/doc/_static/images/._bread_crumb.png and /dev/null differ
diff --git a/doc/_static/images/._button_search.jpg b/doc/_static/images/._button_search.jpg
deleted file mode 100755
index d5c689c..0000000
Binary files a/doc/_static/images/._button_search.jpg and /dev/null differ
diff --git a/doc/_static/images/._side_background.jpg b/doc/_static/images/._side_background.jpg
deleted file mode 100755
index a79b91c..0000000
Binary files a/doc/_static/images/._side_background.jpg and /dev/null differ
diff --git a/doc/_static/images/._top_background.jpg b/doc/_static/images/._top_background.jpg
deleted file mode 100755
index d5c689c..0000000
Binary files a/doc/_static/images/._top_background.jpg and /dev/null differ
diff --git a/doc/_static/images/background_search.jpg b/doc/_static/images/background_search.jpg
deleted file mode 100644
index c0481c5..0000000
Binary files a/doc/_static/images/background_search.jpg and /dev/null differ
diff --git a/doc/_static/images/bg.jpg b/doc/_static/images/bg.jpg
deleted file mode 100644
index 2ceb195..0000000
Binary files a/doc/_static/images/bg.jpg and /dev/null differ
diff --git a/doc/_static/images/bread_crumb.png b/doc/_static/images/bread_crumb.png
deleted file mode 100644
index f7ebd20..0000000
Binary files a/doc/_static/images/bread_crumb.png and /dev/null differ
diff --git a/doc/_static/images/button_search.png b/doc/_static/images/button_search.png
deleted file mode 100644
index 0160b81..0000000
Binary files a/doc/_static/images/button_search.png and /dev/null differ
diff --git a/doc/_static/images/side_background.jpg b/doc/_static/images/side_background.jpg
deleted file mode 100644
index 6e66675..0000000
Binary files a/doc/_static/images/side_background.jpg and /dev/null differ
diff --git a/doc/_static/images/top_background.jpg b/doc/_static/images/top_background.jpg
deleted file mode 100644
index aafe1f7..0000000
Binary files a/doc/_static/images/top_background.jpg and /dev/null differ
diff --git a/doc/_templates/index.html b/doc/_templates/index.html
index e618231..e1fb247 100644
--- a/doc/_templates/index.html
+++ b/doc/_templates/index.html
@@ -2,36 +2,28 @@
 {% set title = 'Overview' %}
 {% block body %}
 <div class="section">
-  <h1>PySide {{ version }}</h1>
+  <h1>PySide {{ version }} Reference</h1>
 
     <p><a href="http://www.qtsoftware.com/">Qt</a> is a cross-platform application framework from Qt Software (owned by Nokia).
     It features a large number of libraries providing services like network abstraction and XML handling, along with a very rich
     GUI package, allowing C++ developers to write their applications once and run them unmodified in different systems.
     PySide aims to provide Python developers access to the Qt libraries in the most natural way.</p>
 
-    <p>PySide is built using the BoostPythonGenerator.</p>
+    <p>PySide is built using the <a href="http://www.pyside.org/docs/shiboken">Shiboken</a> binding generator.</p>
 
-  <h2>Documentation</h2>
-  <table class="contentstable" align="center" style="margin-left: 30px"><tr>
-    <td width="50%">
-      <p class="biglink"><a class="biglink" href="{{ pathto("issuesdiff") }}">PyQt Incompatibilities</a><br/>
-         <span class="linkdescr">PySide issues and specificities</span></p>
-      <p class="biglink"><a class="biglink" href="{{ pathto("howto-build/index") }}">How to build</a><br/>
-         <span class="linkdescr">building compiling and installing PySide</span></p>
-      <p class="biglink"><a class="biglink" href="{{ pathto("newsigslot") }}">New-style signal/slot</a><br/>
-         <span class="linkdescr">using the new-style signal/slot scheme</span></p>
-    </td>
-    <td width="50%">
-      <p class="biglink"><a class="biglink" href="{{ pathto("contents") }}">Contents</a><br/>
-         <span class="linkdescr">for a complete overview</span></p>
-      <p class="biglink"><a class="biglink" href="{{ pathto("dbus") }}">DBus</a><br/>
-         <span class="linkdescr">DBus integration</span></p>
+  <h2>Notes</h2>
 
-    </td></tr>
-  </table>
+    <h3>About 0 vs None</h3>
+
+    <p>The PySide class reference documentation is automatically generated from the original Qt documentation for C++, some parts were tuned to fit the Python world. However, it's not possible to rewrite all Qt docs as it would require a really huge effort, so if the documentation says you can use 0 on an QObject argument, interpret it as None.</p>
+
+    <h3>About keyword arguments</h3>
+
+    <p>Only optional arguments can be used as keyword arguments.</p>
 
   <h2>Modules</h2>
-  <table class="contentstable" align="center" style="margin-left: 30px"><tr>
+
+  <table class="contentstable" align="center" ><tr>
     <td width="50%">
       <p class="biglink"><a class="biglink" href="{{ pathto("PySide/QtCore/index") }}">QtCore</a><br/>
          <span class="linkdescr">core non-GUI functionality</span></p>
@@ -68,5 +60,16 @@
           content in Qt applications</span></p>
     </td></tr>
   </table>
+
+  <h2>Tutorials and examples</h2>
+
+  <p>A collection of <a href="{{ pathto("tutorials/index") }}">tutorials</a> and "walkthrough" guides are provided with PySide to help new users get started with PySide development. These documents were ported from C++ to Python and cover a range of topics, from basic use of widgets to step-by-step <a href="{{ pathto("tutorials/index") }}">tutorials</a> that show how an application is put together.</p>
+
+  <h2>Other stuff</h2>
+
+  <ul>
+    <li class="toctree-l1"><a class="reference internal" href="pysideapi2.html">PySide API 2</a></li>
+    <li class="toctree-l1"><a class="reference internal" href="pysideversion.html">Getting PySide and Qt version</a></li>
+  </ul>
 </div>
 {% endblock %}
diff --git a/doc/_templates/layout.html b/doc/_templates/layout.html
new file mode 100644
index 0000000..9dc5372
--- /dev/null
+++ b/doc/_templates/layout.html
@@ -0,0 +1,41 @@
+{% extends "!layout.html" %}
+
+# Invert sidebars
+{%- block sidebar1 %}{{ sidebar() }}{%- endblock %}
+{%- block sidebar2 %}{%- endblock %}
+
+{%- block header %}
+<div id="container">
+<div class="header">
+    <div class="header_container">
+        <div class="logo"><a href="http://www.pyside.org"><img alt="PySide" src="{{ pathto('_static/pysidelogo.png', 1) }}" width="199" height="102" /></a></div>
+        <div class="related">
+            <ul>
+                {%- block rootrellink %}
+                <li><a href="{{ pathto( 'index' ) }}">{{ shorttitle|e }}</a></li>
+                {%- endblock %}
+                {%- for parent in parents %}
+                <li>{{ reldelim1 }} <a href="{{ parent.link|e }}" {% if loop.last %}{{ accesskey("U") }}{% endif %}>{{ parent.title }}</a></li>
+                {%- endfor %}
+                {%- block relbaritems %} {% endblock %}
+            </ul>
+        </div>
+    </div>
+</div>
+{%- endblock -%}
+
+{%- block footer %}
+    <div class="footer">
+    <a href="http://www.indt.org.br"><img src="{{ pathto('_static/logo_indt.jpg', 1) }}" alt="Indt" border="0" /></a>
+    <a href="http://www.openbossa.org"><img src="{{ pathto('_static/logo_openbossa.png', 1) }}" alt="Openbossa" border="0" /></a>
+    <a href="http://qt.nokia.com/"><img src="{{ pathto('_static/logo_qt.png', 1) }}" alt="Qt" border="0" /></a>
+    <a href="http://www.python.org"><img src="{{ pathto('_static/logo_python.jpg', 1) }}" alt="Python" border="0" /></a>
+    </div>
+</div>
+{%- endblock %}
+
+# No top relbar.
+{%- block relbar1 %}{%- endblock %}
+
+# No bottom relbar.
+{%- block relbar2 %}{%- endblock %}
diff --git a/doc/_themes/pysidedocs/defindex.html b/doc/_themes/pysidedocs/defindex.html
deleted file mode 100644
index 40f4f4c..0000000
--- a/doc/_themes/pysidedocs/defindex.html
+++ /dev/null
@@ -1,26 +0,0 @@
-{% extends "layout.html" %}
-{% set title = _('Overview') %}
-{% block body %}
-  <h1>{{ docstitle|e }}</h1>
-  <p>
-    Welcome! This is
-    {% block description %}the documentation for {{ project|e }}
-    {{ release|e }}{% if last_updated %}, last updated {{ last_updated|e }}{% endif %}{% endblock %}.
-  </p>
-  {% block tables %}
-  <p><strong>{{ _('Indices and tables:') }}</strong></p>
-  <table class="contentstable" align="center"><tr>
-    <td width="50%">
-      <p class="biglink"><a class="biglink" href="{{ pathto("contents") }}">{{ _('Complete Table of Contents') }}</a><br>
-         <span class="linkdescr">{{ _('lists all sections and subsections') }}</span></p>
-      <p class="biglink"><a class="biglink" href="{{ pathto("search") }}">{{ _('Search Page') }}</a><br>
-         <span class="linkdescr">{{ _('search this documentation') }}</span></p>
-    </td><td width="50%">
-      <p class="biglink"><a class="biglink" href="{{ pathto("modindex") }}">{{ _('Global Module Index') }}</a><br>
-         <span class="linkdescr">{{ _('quick access to all modules') }}</span></p>
-      <p class="biglink"><a class="biglink" href="{{ pathto("genindex") }}">{{ _('General Index') }}</a><br>
-         <span class="linkdescr">{{ _('all functions, classes, terms') }}</span></p>
-    </td></tr>
-  </table>
-  {% endblock %}
-{% endblock %}
diff --git a/doc/_themes/pysidedocs/domainindex.html b/doc/_themes/pysidedocs/domainindex.html
new file mode 100644
index 0000000..c136cdd
--- /dev/null
+++ b/doc/_themes/pysidedocs/domainindex.html
@@ -0,0 +1,57 @@
+{#
+    basic/domainindex.html
+    ~~~~~~~~~~~~~~~~~~~~~~
+
+    Template for domain indices (module index, ...).
+
+    :copyright: Copyright 2007-2010 by the Sphinx team, see AUTHORS.
+    :license: BSD, see LICENSE for details.
+#}
+{% extends "layout.html" %}
+{% set title = indextitle %}
+{% block extrahead %}
+{{ super() }}
+{% if not embedded and collapse_index %}
+    <script type="text/javascript">
+      DOCUMENTATION_OPTIONS.COLLAPSE_INDEX = true;
+    </script>
+{% endif %}
+{% endblock %}
+{% block body %}
+<div class="section">
+   {%- set curr_group = 0 %}
+
+   <h1>{{ indextitle }}</h1>
+
+   <div class="modindex-jumpbox">
+   {%- for (letter, entries) in content %}
+   <a href="#cap-{{ letter }}"><strong>{{ letter }}</strong></a>
+     {%- if not loop.last %} | {% endif %}
+   {%- endfor %}
+   </div>
+
+   <table class="indextable modindextable" cellspacing="0" cellpadding="2">
+   {%- for letter, entries in content %}
+     <tr class="pcap"><td></td><td>&nbsp;</td><td></td></tr>
+     <tr class="cap"><td></td><td><a name="cap-{{ letter }}">
+           <strong>{{ letter }}</strong></a></td><td></td></tr>
+     {%- for (name, grouptype, page, anchor, extra, qualifier, description)
+             in entries %}
+     {%- if grouptype == 1 %}{% set curr_group = curr_group + 1 %}{% endif %}
+     <tr{% if grouptype == 2 %} class="cg-{{ curr_group }}"{% endif %}>
+       <td>{% if grouptype == 1 -%}
+         <img src="{{ pathto('_static/minus.png', 1) }}" id="toggle-{{ curr_group }}"
+              class="toggler" style="display: none" alt="-" />
+           {%- endif %}</td>
+       <td>{% if grouptype == 2 %}&nbsp;&nbsp;&nbsp;{% endif %}
+       {% if page %}<a href="{{ pathto(page) }}#{{ anchor }}">{% endif -%}
+       <tt class="xref">{{ name|e }}</tt>
+       {%- if page %}</a>{% endif %}
+     {%- if extra %} <em>({{ extra|e }})</em>{% endif -%}
+     </td><td>{% if qualifier %}<strong>{{ qualifier|e }}:</strong>{% endif %}
+       <em>{{ description|e }}</em></td></tr>
+     {%- endfor %}
+   {%- endfor %}
+   </table>
+</div>
+{% endblock %}
diff --git a/doc/_themes/pysidedocs/genindex-single.html b/doc/_themes/pysidedocs/genindex-single.html
deleted file mode 100644
index 9aaaeb0..0000000
--- a/doc/_themes/pysidedocs/genindex-single.html
+++ /dev/null
@@ -1,46 +0,0 @@
-{% extends "layout.html" %}
-{% set title = _('Index') %}
-{% block body %}
-
-   <h1 id="index">{% trans key=key %}Index &ndash; {{ key }}{% endtrans %}</h1>
-
-<table width="100%" class="indextable"><tr><td width="33%" valign="top">
-<dl>
-{%- set breakat = count // 2 %}
-{%- set numcols = 1 %}
-{%- set numitems = 0 %}
-{% for entryname, (links, subitems) in entries %}
-<dt>{%- if links -%}<a href="{{ links[0] }}">{{ entryname|e }}</a>
-  {%- for link in links[1:] %}, <a href="{{ link }}">[{{ loop.index }}]</a>{% endfor -%}
-  {%- else -%}
-{{ entryname|e }}
-  {%- endif -%}</dt>
-  {%- if subitems %}
-  <dd><dl>
-    {%- for subentryname, subentrylinks in subitems %}
-    <dt><a href="{{ subentrylinks[0] }}">{{ subentryname|e }}</a>
-    {%- for link in subentrylinks[1:] %}, <a href="{{ link }}">[{{ loop.index }}]</a>{% endfor -%}
-    </dt>
-    {%- endfor %}
-  </dl></dd>
-  {%- endif -%}
-{%- set numitems = numitems + 1 + (subitems|length) -%}
-{%- if numcols < 2 and numitems > breakat -%}
-{%- set numcols = numcols+1 -%}
-</dl></td><td width="33%" valign="top"><dl>
-{%- endif -%}
-{%- endfor %}
-</dl></td></tr></table>
-
-{% endblock %}
-
-{% block sidebarrel %}
-   <h4>Index</h4>
-   <p>{% for key, dummy in genindexentries -%}
-   <a href="{{ pathto('genindex-' + key) }}"><strong>{{ key }}</strong></a>
-     {% if not loop.last %}| {% endif %}
-   {%- endfor %}</p>
-
-   <p><a href="{{ pathto('genindex-all') }}"><strong>{{ _('Full index on one page') }}</strong></a></p>
-   {{ super() }}
-{% endblock %}
diff --git a/doc/_themes/pysidedocs/genindex-split.html b/doc/_themes/pysidedocs/genindex-split.html
deleted file mode 100644
index ab099e5..0000000
--- a/doc/_themes/pysidedocs/genindex-split.html
+++ /dev/null
@@ -1,30 +0,0 @@
-{% extends "layout.html" %}
-{% set title = _('Index') %}
-{% block body %}
-
-   <h1 id="index">{{ _('Index') }}</h1>
-
-   <p>{{ _('Index pages by letter') }}:</p>
-
-   <p>{% for key, dummy in genindexentries -%}
-   <a href="{{ pathto('genindex-' + key) }}"><strong>{{ key }}</strong></a>
-     {% if not loop.last %}| {% endif %}
-   {%- endfor %}</p>
-
-   <p><a href="{{ pathto('genindex-all') }}"><strong>{{ _('Full index on one page') }}</strong>
-                                               ({{ _('can be huge') }})</a></p>
-
-{% endblock %}
-
-{% block sidebarrel %}
-{% if split_index %}
-   <h4>Index</h4>
-   <p>{% for key, dummy in genindexentries -%}
-   <a href="{{ pathto('genindex-' + key) }}"><strong>{{ key }}</strong></a>
-     {% if not loop.last %}| {% endif %}
-   {%- endfor %}</p>
-
-   <p><a href="{{ pathto('genindex-all') }}"><strong>{{ _('Full index on one page') }}</strong></a></p>
-{% endif %}
-   {{ super() }}
-{% endblock %}
diff --git a/doc/_themes/pysidedocs/genindex.html b/doc/_themes/pysidedocs/genindex.html
deleted file mode 100644
index a19aa80..0000000
--- a/doc/_themes/pysidedocs/genindex.html
+++ /dev/null
@@ -1,57 +0,0 @@
-{% extends "layout.html" %}
-{% set title = _('Index') %}
-{% block body %}
-
-   <h1 id="index">{{ _('Index') }}</h1>
-
-   {% for key, dummy in genindexentries -%}
-   <a href="#{{ key }}"><strong>{{ key }}</strong></a> {% if not loop.last %}| {% endif %}
-   {%- endfor %}
-
-   <hr />
-
-   {% for key, entries in genindexentries %}
-<h2 id="{{ key }}">{{ key }}</h2>
-<table width="100%" class="indextable"><tr><td width="33%" valign="top">
-<dl>
-{%- set breakat = genindexcounts[loop.index0] // 2 %}
-{%- set numcols = 1 %}
-{%- set numitems = 0 %}
-{% for entryname, (links, subitems) in entries %}
-<dt>{%- if links -%}<a href="{{ links[0] }}">{{ entryname|e }}</a>
-  {%- for link in links[1:] %}, <a href="{{ link }}">[{{ loop.index }}]</a>{% endfor -%}
-  {%- else -%}
-{{ entryname|e }}
-  {%- endif -%}</dt>
-  {%- if subitems %}
-  <dd><dl>
-    {%- for subentryname, subentrylinks in subitems %}
-    <dt><a href="{{ subentrylinks[0] }}">{{ subentryname|e }}</a>
-    {%- for link in subentrylinks[1:] %}, <a href="{{ link }}">[{{ loop.index }}]</a>{% endfor -%}
-    </dt>
-    {%- endfor %}
-  </dl></dd>
-  {%- endif -%}
-{%- set numitems = numitems + 1 + (subitems|length) -%}
-{%- if numcols < 2 and numitems > breakat -%}
-{%- set numcols = numcols+1 -%}
-</dl></td><td width="33%" valign="top"><dl>
-{%- endif -%}
-{%- endfor %}
-</dl></td></tr></table>
-{% endfor %}
-
-{% endblock %}
-
-{% block sidebarrel %}
-{% if split_index %}
-   <h4>{{ _('Index') }}</h4>
-   <p>{% for key, dummy in genindexentries -%}
-   <a href="{{ pathto('genindex-' + key) }}"><strong>{{ key }}</strong></a>
-     {% if not loop.last %}| {% endif %}
-   {%- endfor %}</p>
-
-   <p><a href="{{ pathto('genindex-all') }}"><strong>{{ _('Full index on one page') }}</strong></a></p>
-{% endif %}
-   {{ super() }}
-{% endblock %}
diff --git a/doc/_themes/pysidedocs/layout.html b/doc/_themes/pysidedocs/layout.html
deleted file mode 100644
index f6d9ac9..0000000
--- a/doc/_themes/pysidedocs/layout.html
+++ /dev/null
@@ -1,147 +0,0 @@
-{%- block doctype -%}
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-{%- endblock %}
-{%- set reldelim1 = reldelim1 is not defined and ' &raquo;' or reldelim1 %}
-{%- set reldelim2 = reldelim2 is not defined and ' |' or reldelim2 %}
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    {{ metatags }}
-    <title>{{ title }} &mdash; {{ project }}</title>
-    <link rel="stylesheet" href="{{ pathto('_static/pysidedocs.css', 1) }}" type="text/css" />
-    <link rel="stylesheet" href="{{ pathto('_static/pygments.css', 1) }}" type="text/css" />
-
-    {%- if not embedded %}
-    <script type="text/javascript">
-    var DOCUMENTATION_OPTIONS = {
-        URL_ROOT:    '{{ pathto("", 1) }}',
-        VERSION:     '{{ release|e }}',
-        COLLAPSE_MODINDEX: false,
-        FILE_SUFFIX: '{{ file_suffix }}',
-        HAS_SOURCE:  {{ has_source|lower }}
-    };
-    </script>
-    {%- for scriptfile in script_files %}
-    <script type="text/javascript" src="{{ pathto(scriptfile, 1) }}"></script>
-    {%- endfor %}
-    {%- if pagename == "screenshots" %}
-    {%- endif %}
-    <!--[if lt IE 7]>
-    <style media="screen" type="text/css">
-    #container {
-        height:100%;
-    }
-    </style>
-    <![endif]-->
-
-    {%- if use_opensearch %}
-    <link rel="search" type="application/opensearchdescription+xml"
-          title="{% trans docstitle=docstitle|e %}Search within {{ docstitle }}{% endtrans %}"
-          href="{{ pathto('_static/opensearch.xml', 1) }}"/>
-    {%- endif %}
-    {%- if favicon %}
-    <link rel="shortcut icon" href="{{ pathto('_static/' + favicon, 1) }}"/>
-    {%- endif %}
-    {%- endif %}
-{%- block linktags %}
-    {%- if hasdoc('about') %}
-    <link rel="author" title="{{ _('About these documents') }}" href="{{ pathto('about') }}" />
-    {%- endif %}
-    {%- if hasdoc('genindex') %}
-    <link rel="index" title="{{ _('Index') }}" href="{{ pathto('genindex') }}" />
-    {%- endif %}
-    {%- if hasdoc('search') %}
-    <link rel="search" title="{{ _('Search') }}" href="{{ pathto('search') }}" />
-    {%- endif %}
-    {%- if hasdoc('copyright') %}
-    <link rel="copyright" title="{{ _('Copyright') }}" href="{{ pathto('copyright') }}" />
-    {%- endif %}
-    <link rel="top" title="{{ docstitle|e }}" href="{{ pathto('index') }}" />
-    {%- if parents %}
-    <link rel="up" title="{{ parents[-1].title|striptags }}" href="{{ parents[-1].link|e }}" />
-    {%- endif %}
-    {%- if next %}
-    <link rel="next" title="{{ next.title|striptags }}" href="{{ next.link|e }}" />
-    {%- endif %}
-    {%- if prev %}
-    <link rel="prev" title="{{ prev.title|striptags }}" href="{{ prev.link|e }}" />
-    {%- endif %}
-{%- endblock %}
-{%- block extrahead %} {% endblock %}
-  </head>
-  <body id="{{ pagename }}">
-{%- block header %}{% endblock %}
-
-<div id="container">
-<div id="header">
-    <div id="header_container">
-        <div id="logo"></div>
-        <ul id="relbar">
-            {%- for rellink in rellinks %}
-            <li class="right">
-            <a href="{{ pathto(rellink[0]) }}" title="{{ rellink[1]|striptags }}"
-                {{ accesskey(rellink[2]) }}>{{ rellink[3] }}</a>
-            {%- if not loop.first %}{{ reldelim2 }}{% endif %}</li>
-            {%- endfor %}
-            {%- block rootrellink %}
-            <li><a href="{{ pathto(master_doc) }}">{{ shorttitle|e }}</a>{{ reldelim1 }}</li>
-            {%- endblock %}
-            {%- for parent in parents %}
-            <li><a href="{{ parent.link|e }}" {% if loop.last %}{{ accesskey("U") }}{% endif %}>{{ parent.title }}</a>{{ reldelim1 }}</li>
-            {%- endfor %}
-            {%- block relbaritems %} {% endblock %}
-        </ul>
-    </div>
-</div>
-
-<div id="body" >
-    <div id="sidebar">
-          {%- block sidebartoc %}
-          {%- if display_toc %}
-            <h3><a href="{{ pathto(master_doc) }}">{{ _('Table Of Contents') }}</a></h3>
-            {{ toc }}
-          {%- endif %}
-          {%- endblock %}
-          {%- block sidebarrel %}
-          {%- if prev %}
-            <h3>{{ _('Previous topic') }}</h3>
-            <p class="topless"><a href="{{ prev.link|e }}"
-                                  title="{{ _('previous chapter') }}">{{ prev.title }}</a></p>
-          {%- endif %}
-          {%- if next %}
-            <h3>{{ _('Next topic') }}</h3>
-            <p class="topless"><a href="{{ next.link|e }}"
-                                  title="{{ _('next chapter') }}">{{ next.title }}</a></p>
-          {%- endif %}
-          {%- endblock %}
-
-        <div id="search_box">
-        <h3>Quick search</h3>
-        <form action="{{ pathto('search') }}" method="get">
-        <input type="text" name="q" id="q" />
-        <input type="submit" value="Go" id="search_button" />
-        <input type="hidden" name="check_keywords" value="yes" />
-        <input type="hidden" name="area" value="default" />
-        </form>
-        </div>
-
-    </div>
-
-    {%- block document %}
-    {% block body %} {% endblock %}
-    {%- endblock %}
-</div> <!-- container    -->
-
-{%- block footer %}
-<div id="footer">
-    <a href="http://www.indt.org.br"><img src="{{ pathto('_static/logo_indt.jpg', 1) }}" alt="Indt" border="0" /></a>
-    <a href="http://www.openbossa.org"><img src="{{ pathto('_static/logo_openbossa.png', 1) }}" alt="Openbossa" border="0" /></a>
-    <a href="http://qt.nokia.com/"><img src="{{ pathto('_static/logo_qt.png', 1) }}" alt="Qt" border="0" /></a>
-    <a href="http://www.python.org"><img src="{{ pathto('_static/logo_python.jpg', 1) }}" alt="Python" border="0" /></a>
-</div>
-{%- endblock %}
-</div>
-</body>
-</html>
diff --git a/doc/_themes/pysidedocs/modindex.html b/doc/_themes/pysidedocs/modindex.html
deleted file mode 100644
index b00a440..0000000
--- a/doc/_themes/pysidedocs/modindex.html
+++ /dev/null
@@ -1,40 +0,0 @@
-{% extends "layout.html" %}
-{% set title = _('Global Module Index') %}
-{% block extrahead %}
-{{ super() }}
-{% if not embedded and collapse_modindex %}
-    <script type="text/javascript">
-      DOCUMENTATION_OPTIONS.COLLAPSE_MODINDEX = true;
-    </script>
-{% endif %}
-{% endblock %}
-{% block body %}
-<div class="section">
-   <h1 id="global-module-index">{{ _('Global Module Index') }}</h1>
-
-   {%- for letter in letters %}
-   <a href="#cap-{{ letter }}"><strong>{{ letter }}</strong></a> {% if not loop.last %}| {% endif %}
-   {%- endfor %}
-   <hr/>
-
-   <table class="indextable" cellspacing="0" cellpadding="2">
-   {%- for modname, collapse, cgroup, indent, fname, synops, pform, dep, stripped in modindexentries %}
-   {%- if not modname -%}
-   {%- else -%}
-   <tr{% if indent %} class="cg-{{ cgroup }}"{% endif %}>
-     <td>{% if collapse -%}
-       <img src="{{ pathto('_static/minus.png', 1) }}" id="toggle-{{ cgroup }}"
-            class="toggler" style="display: none" alt="-" />
-         {%- endif %}</td>
-     <td>{% if indent %}&nbsp;&nbsp;&nbsp;{% endif %}
-     {% if fname %}<a href="{{ fname }}">{% endif -%}
-     <tt class="xref">{{ stripped|e }}{{ modname|e }}</tt>
-     {%- if fname %}</a>{% endif %}
-   {%- if pform and pform[0] %} <em>({{ pform|join(', ') }})</em>{% endif -%}
-   </td><td>{% if dep %}<strong>{{ _('Deprecated')}}:</strong>{% endif %}
-     <em>{{ synops|e }}</em></td></tr>
-   {%- endif -%}
-   {% endfor %}
-   </table>
-</section>
-{% endblock %}
diff --git a/doc/_themes/pysidedocs/opensearch.xml b/doc/_themes/pysidedocs/opensearch.xml
deleted file mode 100644
index 03875be..0000000
--- a/doc/_themes/pysidedocs/opensearch.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<OpenSearchDescription xmlns="http://a9.com/-/spec/opensearch/1.1/">
-  <ShortName>{{ project|e }}</ShortName>
-  <Description>{% trans docstitle=docstitle|e %}Search {{ docstitle }}{% endtrans %}</Description>
-  <InputEncoding>utf-8</InputEncoding>
-  <Url type="text/html" method="get"
-       template="{{ use_opensearch }}/{{ pathto('search') }}?q={searchTerms}&amp;check_keywords=yes&amp;area=default"/>
-  <LongName>{{ docstitle|e }}</LongName>
-{% block extra %} {# Put e.g. an <Image> element here. #} {% endblock %}
-</OpenSearchDescription>
diff --git a/doc/_themes/pysidedocs/page.html b/doc/_themes/pysidedocs/page.html
deleted file mode 100644
index 17a9301..0000000
--- a/doc/_themes/pysidedocs/page.html
+++ /dev/null
@@ -1,4 +0,0 @@
-{% extends "layout.html" %}
-{% block body %}
-  {{ body }}
-{% endblock %}
diff --git a/doc/_themes/pysidedocs/search.html b/doc/_themes/pysidedocs/search.html
deleted file mode 100644
index d745532..0000000
--- a/doc/_themes/pysidedocs/search.html
+++ /dev/null
@@ -1,26 +0,0 @@
-{% extends "layout.html" %}
-{% set title = _('Search') %}
-{% set script_files = script_files + ['_static/searchtools.js'] %}
-{% block body %}
-<div class="section">
-  <h1 id="search-documentation">Search Results</h1>
-  <div id="fallback" class="admonition warning">
-  <script type="text/javascript">$('#fallback').hide();</script>
-  <p>
-    {% trans %}Please activate JavaScript to enable the search
-    functionality.{% endtrans %}
-  </p>
-  </div>
-  {% if search_performed %}
-    {% if not search_results %}
-      <p>{{ _('Your search did not match any results.') }}</p>
-    {% endif %}
-  {% endif %}
-  <div id="search-results">
-  </div>
-</div>
-{% endblock %}
-{% block footer %}
-  {{ super() }}
-  <script type="text/javascript" src="searchindex.js"></script>
-{% endblock %}
diff --git a/doc/_themes/pysidedocs/searchbox.html b/doc/_themes/pysidedocs/searchbox.html
new file mode 100644
index 0000000..55a9721
--- /dev/null
+++ b/doc/_themes/pysidedocs/searchbox.html
@@ -0,0 +1,12 @@
+{%- if pagename != "search" %}
+<div id="searchbox" style="display: none">
+  <h3>{{ _('Quick search') }}</h3>
+    <form class="search" action="{{ pathto('search') }}" method="get">
+      <input type="text" name="q" id="q" size="18" />
+      <input type="submit" value="{{ _('Go') }}" id="search_button" />
+      <input type="hidden" name="check_keywords" value="yes" />
+      <input type="hidden" name="area" value="default" />
+    </form>
+</div>
+<script type="text/javascript">$('#searchbox').show(0);</script>
+{%- endif %}
diff --git a/doc/_themes/pysidedocs/static/.directory b/doc/_themes/pysidedocs/static/.directory
deleted file mode 100644
index 176338d..0000000
--- a/doc/_themes/pysidedocs/static/.directory
+++ /dev/null
@@ -1,3 +0,0 @@
-[Dolphin]
-ShowPreview=true
-Timestamp=2009,10,13,10,27,39
diff --git a/doc/_themes/pysidedocs/static/doctools.js b/doc/_themes/pysidedocs/static/doctools.js
deleted file mode 100644
index 9447678..0000000
--- a/doc/_themes/pysidedocs/static/doctools.js
+++ /dev/null
@@ -1,232 +0,0 @@
-/// XXX: make it cross browser
-
-/**
- * make the code below compatible with browsers without
- * an installed firebug like debugger
- */
-if (!window.console || !console.firebug) {
-  var names = ["log", "debug", "info", "warn", "error", "assert", "dir", "dirxml",
-      "group", "groupEnd", "time", "timeEnd", "count", "trace", "profile", "profileEnd"];
-  window.console = {};
-  for (var i = 0; i < names.length; ++i)
-    window.console[names[i]] = function() {}
-}
-
-/**
- * small helper function to urldecode strings
- */
-jQuery.urldecode = function(x) {
-  return decodeURIComponent(x).replace(/\+/g, ' ');
-}
-
-/**
- * small helper function to urlencode strings
- */
-jQuery.urlencode = encodeURIComponent;
-
-/**
- * This function returns the parsed url parameters of the
- * current request. Multiple values per key are supported,
- * it will always return arrays of strings for the value parts.
- */
-jQuery.getQueryParameters = function(s) {
-  if (typeof s == 'undefined')
-    s = document.location.search;
-  var parts = s.substr(s.indexOf('?') + 1).split('&');
-  var result = {};
-  for (var i = 0; i < parts.length; i++) {
-    var tmp = parts[i].split('=', 2);
-    var key = jQuery.urldecode(tmp[0]);
-    var value = jQuery.urldecode(tmp[1]);
-    if (key in result)
-      result[key].push(value);
-    else
-      result[key] = [value];
-  }
-  return result;
-}
-
-/**
- * small function to check if an array contains
- * a given item.
- */
-jQuery.contains = function(arr, item) {
-  for (var i = 0; i < arr.length; i++) {
-    if (arr[i] == item)
-      return true;
-  }
-  return false;
-}
-
-/**
- * highlight a given string on a jquery object by wrapping it in
- * span elements with the given class name.
- */
-jQuery.fn.highlightText = function(text, className) {
-  function highlight(node) {
-    if (node.nodeType == 3) {
-      var val = node.nodeValue;
-      var pos = val.toLowerCase().indexOf(text);
-      if (pos >= 0 && !jQuery.className.has(node.parentNode, className)) {
-        var span = document.createElement("span");
-        span.className = className;
-        span.appendChild(document.createTextNode(val.substr(pos, text.length)));
-        node.parentNode.insertBefore(span, node.parentNode.insertBefore(
-          document.createTextNode(val.substr(pos + text.length)),
-          node.nextSibling));
-        node.nodeValue = val.substr(0, pos);
-      }
-    }
-    else if (!jQuery(node).is("button, select, textarea")) {
-      jQuery.each(node.childNodes, function() {
-        highlight(this)
-      });
-    }
-  }
-  return this.each(function() {
-    highlight(this);
-  });
-}
-
-/**
- * Small JavaScript module for the documentation.
- */
-var Documentation = {
-
-  init : function() {
-    this.fixFirefoxAnchorBug();
-    this.highlightSearchWords();
-    this.initModIndex();
-  },
-
-  /**
-   * i18n support
-   */
-  TRANSLATIONS : {},
-  PLURAL_EXPR : function(n) { return n == 1 ? 0 : 1; },
-  LOCALE : 'unknown',
-
-  // gettext and ngettext don't access this so that the functions
-  // can savely bound to a different name (_ = Documentation.gettext)
-  gettext : function(string) {
-    var translated = Documentation.TRANSLATIONS[string];
-    if (typeof translated == 'undefined')
-      return string;
-    return (typeof translated == 'string') ? translated : translated[0];
-  },
-
-  ngettext : function(singular, plural, n) {
-    var translated = Documentation.TRANSLATIONS[singular];
-    if (typeof translated == 'undefined')
-      return (n == 1) ? singular : plural;
-    return translated[Documentation.PLURALEXPR(n)];
-  },
-
-  addTranslations : function(catalog) {
-    for (var key in catalog.messages)
-      this.TRANSLATIONS[key] = catalog.messages[key];
-    this.PLURAL_EXPR = new Function('n', 'return +(' + catalog.plural_expr + ')');
-    this.LOCALE = catalog.locale;
-  },
-
-  /**
-   * add context elements like header anchor links
-   */
-  addContextElements : function() {
-    $('div[id] > :header:first').each(function() {
-      $('<a class="headerlink">\u00B6</a>').
-      attr('href', '#' + this.id).
-      attr('title', _('Permalink to this headline')).
-      appendTo(this);
-    });
-    $('dt[id]').each(function() {
-      $('<a class="headerlink">\u00B6</a>').
-      attr('href', '#' + this.id).
-      attr('title', _('Permalink to this definition')).
-      appendTo(this);
-    });
-  },
-
-  /**
-   * workaround a firefox stupidity
-   */
-  fixFirefoxAnchorBug : function() {
-    if (document.location.hash && $.browser.mozilla)
-      window.setTimeout(function() {
-        document.location.href += '';
-      }, 10);
-  },
-
-  /**
-   * highlight the search words provided in the url in the text
-   */
-  highlightSearchWords : function() {
-    var params = $.getQueryParameters();
-    var terms = (params.highlight) ? params.highlight[0].split(/\s+/) : [];
-    if (terms.length) {
-      var body = $('div.body');
-      window.setTimeout(function() {
-        $.each(terms, function() {
-          body.highlightText(this.toLowerCase(), 'highlight');
-        });
-      }, 10);
-      $('<li class="highlight-link"><a href="javascript:Documentation.' +
-        'hideSearchWords()">' + _('Hide Search Matches') + '</a></li>')
-          .appendTo($('.sidebar .this-page-menu'));
-    }
-  },
-
-  /**
-   * init the modindex toggle buttons
-   */
-  initModIndex : function() {
-    var togglers = $('img.toggler').click(function() {
-      var src = $(this).attr('src');
-      var idnum = $(this).attr('id').substr(7);
-      console.log($('tr.cg-' + idnum).toggle());
-      if (src.substr(-9) == 'minus.png')
-        $(this).attr('src', src.substr(0, src.length-9) + 'plus.png');
-      else
-        $(this).attr('src', src.substr(0, src.length-8) + 'minus.png');
-    }).css('display', '');
-    if (DOCUMENTATION_OPTIONS.COLLAPSE_MODINDEX) {
-        togglers.click();
-    }
-  },
-
-  /**
-   * helper function to hide the search marks again
-   */
-  hideSearchWords : function() {
-    $('.sidebar .this-page-menu li.highlight-link').fadeOut(300);
-    $('span.highlight').removeClass('highlight');
-  },
-
-  /**
-   * make the url absolute
-   */
-  makeURL : function(relativeURL) {
-    return DOCUMENTATION_OPTIONS.URL_ROOT + '/' + relativeURL;
-  },
-
-  /**
-   * get the current relative url
-   */
-  getCurrentURL : function() {
-    var path = document.location.pathname;
-    var parts = path.split(/\//);
-    $.each(DOCUMENTATION_OPTIONS.URL_ROOT.split(/\//), function() {
-      if (this == '..')
-        parts.pop();
-    });
-    var url = parts.join('/');
-    return path.substring(url.lastIndexOf('/') + 1, path.length - 1);
-  }
-};
-
-// quick alias for translations
-_ = Documentation.gettext;
-
-$(document).ready(function() {
-  Documentation.init();
-});
diff --git a/doc/_themes/pysidedocs/static/jquery.js b/doc/_themes/pysidedocs/static/jquery.js
deleted file mode 100644
index 82b98e1..0000000
--- a/doc/_themes/pysidedocs/static/jquery.js
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * jQuery 1.2.6 - New Wave Javascript
- *
- * Copyright (c) 2008 John Resig (jquery.com)
- * Dual licensed under the MIT (MIT-LICENSE.txt)
- * and GPL (GPL-LICENSE.txt) licenses.
- *
- * $Date: 2008-05-24 14:22:17 -0400 (Sat, 24 May 2008) $
- * $Rev: 5685 $
- */
-(function(){var _jQuery=window.jQuery,_$=window.$;var jQuery=window.jQuery=window.$=function(selector,context){return new jQuery.fn.init(selector,context);};var quickExpr=/^[^<]*(<(.|\s)+>)[^>]*$|^#(\w+)$/,isSimple=/^.[^:#\[\.]*$/,undefined;jQuery.fn=jQuery.prototype={init:function(selector,context){selector=selector||document;if(selector.nodeType){this[0]=selector;this.length=1;return this;}if(typeof selector=="string"){var match=quickExpr.exec(selector);if(match&&(match[1]||!context)){if(match[1])selector=jQuery.clean([match[1]],context);else{var elem=document.getElementById(match[3]);if(elem){if(elem.id!=match[3])return jQuery().find(selector);return jQuery(elem);}selector=[];}}else
-return jQuery(context).find(selector);}else if(jQuery.isFunction(selector))return jQuery(document)[jQuery.fn.ready?"ready":"load"](selector);return this.setArray(jQuery.makeArray(selector));},jquery:"1.2.6",size:function(){return this.length;},length:0,get:function(num){return num==undefined?jQuery.makeArray(this):this[num];},pushStack:function(elems){var ret=jQuery(elems);ret.prevObject=this;return ret;},setArray:function(elems){this.length=0;Array.prototype.push.apply(this,elems);return this;},each:function(callback,args){return jQuery.each(this,callback,args);},index:function(elem){var ret=-1;return jQuery.inArray(elem&&elem.jquery?elem[0]:elem,this);},attr:function(name,value,type){var options=name;if(name.constructor==String)if(value===undefined)return this[0]&&jQuery[type||"attr"](this[0],name);else{options={};options[name]=value;}return this.each(function(i){for(name in options)jQuery.attr(type?this.style:this,name,jQuery.prop(this,options[name],type,i,name));});},css:function(key,value){if((key=='width'||key=='height')&&parseFloat(value)<0)value=undefined;return this.attr(key,value,"curCSS");},text:function(text){if(typeof text!="object"&&text!=null)return this.empty().append((this[0]&&this[0].ownerDocument||document).createTextNode(text));var ret="";jQuery.each(text||this,function(){jQuery.each(this.childNodes,function(){if(this.nodeType!=8)ret+=this.nodeType!=1?this.nodeValue:jQuery.fn.text([this]);});});return ret;},wrapAll:function(html){if(this[0])jQuery(html,this[0].ownerDocument).clone().insertBefore(this[0]).map(function(){var elem=this;while(elem.firstChild)elem=elem.firstChild;return elem;}).append(this);return this;},wrapInner:function(html){return this.each(function(){jQuery(this).contents().wrapAll(html);});},wrap:function(html){return this.each(function(){jQuery(this).wrapAll(html);});},append:function(){return this.domManip(arguments,true,false,function(elem){if(this.nodeType==1)this.appendChild(elem);});},prepend:function(){return this.domManip(arguments,true,true,function(elem){if(this.nodeType==1)this.insertBefore(elem,this.firstChild);});},before:function(){return this.domManip(arguments,false,false,function(elem){this.parentNode.insertBefore(elem,this);});},after:function(){return this.domManip(arguments,false,true,function(elem){this.parentNode.insertBefore(elem,this.nextSibling);});},end:function(){return this.prevObject||jQuery([]);},find:function(selector){var elems=jQuery.map(this,function(elem){return jQuery.find(selector,elem);});return this.pushStack(/[^+>] [^+>]/.test(selector)||selector.indexOf("..")>-1?jQuery.unique(elems):elems);},clone:function(events){var ret=this.map(function(){if(jQuery.browser.msie&&!jQuery.isXMLDoc(this)){var clone=this.cloneNode(true),container=document.createElement("div");container.appendChild(clone);return jQuery.clean([container.innerHTML])[0];}else
-return this.cloneNode(true);});var clone=ret.find("*").andSelf().each(function(){if(this[expando]!=undefined)this[expando]=null;});if(events===true)this.find("*").andSelf().each(function(i){if(this.nodeType==3)return;var events=jQuery.data(this,"events");for(var type in events)for(var handler in events[type])jQuery.event.add(clone[i],type,events[type][handler],events[type][handler].data);});return ret;},filter:function(selector){return this.pushStack(jQuery.isFunction(selector)&&jQuery.grep(this,function(elem,i){return selector.call(elem,i);})||jQuery.multiFilter(selector,this));},not:function(selector){if(selector.constructor==String)if(isSimple.test(selector))return this.pushStack(jQuery.multiFilter(selector,this,true));else
-selector=jQuery.multiFilter(selector,this);var isArrayLike=selector.length&&selector[selector.length-1]!==undefined&&!selector.nodeType;return this.filter(function(){return isArrayLike?jQuery.inArray(this,selector)<0:this!=selector;});},add:function(selector){return this.pushStack(jQuery.unique(jQuery.merge(this.get(),typeof selector=='string'?jQuery(selector):jQuery.makeArray(selector))));},is:function(selector){return!!selector&&jQuery.multiFilter(selector,this).length>0;},hasClass:function(selector){return this.is("."+selector);},val:function(value){if(value==undefined){if(this.length){var elem=this[0];if(jQuery.nodeName(elem,"select")){var index=elem.selectedIndex,values=[],options=elem.options,one=elem.type=="select-one";if(index<0)return null;for(var i=one?index:0,max=one?index+1:options.length;i<max;i++){var option=options[i];if(option.selected){value=jQuery.browser.msie&&!option.attributes.value.specified?option.text:option.value;if(one)return value;values.push(value);}}return values;}else
-return(this[0].value||"").replace(/\r/g,"");}return undefined;}if(value.constructor==Number)value+='';return this.each(function(){if(this.nodeType!=1)return;if(value.constructor==Array&&/radio|checkbox/.test(this.type))this.checked=(jQuery.inArray(this.value,value)>=0||jQuery.inArray(this.name,value)>=0);else if(jQuery.nodeName(this,"select")){var values=jQuery.makeArray(value);jQuery("option",this).each(function(){this.selected=(jQuery.inArray(this.value,values)>=0||jQuery.inArray(this.text,values)>=0);});if(!values.length)this.selectedIndex=-1;}else
-this.value=value;});},html:function(value){return value==undefined?(this[0]?this[0].innerHTML:null):this.empty().append(value);},replaceWith:function(value){return this.after(value).remove();},eq:function(i){return this.slice(i,i+1);},slice:function(){return this.pushStack(Array.prototype.slice.apply(this,arguments));},map:function(callback){return this.pushStack(jQuery.map(this,function(elem,i){return callback.call(elem,i,elem);}));},andSelf:function(){return this.add(this.prevObject);},data:function(key,value){var parts=key.split(".");parts[1]=parts[1]?"."+parts[1]:"";if(value===undefined){var data=this.triggerHandler("getData"+parts[1]+"!",[parts[0]]);if(data===undefined&&this.length)data=jQuery.data(this[0],key);return data===undefined&&parts[1]?this.data(parts[0]):data;}else
-return this.trigger("setData"+parts[1]+"!",[parts[0],value]).each(function(){jQuery.data(this,key,value);});},removeData:function(key){return this.each(function(){jQuery.removeData(this,key);});},domManip:function(args,table,reverse,callback){var clone=this.length>1,elems;return this.each(function(){if(!elems){elems=jQuery.clean(args,this.ownerDocument);if(reverse)elems.reverse();}var obj=this;if(table&&jQuery.nodeName(this,"table")&&jQuery.nodeName(elems[0],"tr"))obj=this.getElementsByTagName("tbody")[0]||this.appendChild(this.ownerDocument.createElement("tbody"));var scripts=jQuery([]);jQuery.each(elems,function(){var elem=clone?jQuery(this).clone(true)[0]:this;if(jQuery.nodeName(elem,"script"))scripts=scripts.add(elem);else{if(elem.nodeType==1)scripts=scripts.add(jQuery("script",elem).remove());callback.call(obj,elem);}});scripts.each(evalScript);});}};jQuery.fn.init.prototype=jQuery.fn;function evalScript(i,elem){if(elem.src)jQuery.ajax({url:elem.src,async:false,dataType:"script"});else
-jQuery.globalEval(elem.text||elem.textContent||elem.innerHTML||"");if(elem.parentNode)elem.parentNode.removeChild(elem);}function now(){return+new Date;}jQuery.extend=jQuery.fn.extend=function(){var target=arguments[0]||{},i=1,length=arguments.length,deep=false,options;if(target.constructor==Boolean){deep=target;target=arguments[1]||{};i=2;}if(typeof target!="object"&&typeof target!="function")target={};if(length==i){target=this;--i;}for(;i<length;i++)if((options=arguments[i])!=null)for(var name in options){var src=target[name],copy=options[name];if(target===copy)continue;if(deep&&copy&&typeof copy=="object"&&!copy.nodeType)target[name]=jQuery.extend(deep,src||(copy.length!=null?[]:{}),copy);else if(copy!==undefined)target[name]=copy;}return target;};var expando="jQuery"+now(),uuid=0,windowData={},exclude=/z-?index|font-?weight|opacity|zoom|line-?height/i,defaultView=document.defaultView||{};jQuery.extend({noConflict:function(deep){window.$=_$;if(deep)window.jQuery=_jQuery;return jQuery;},isFunction:function(fn){return!!fn&&typeof fn!="string"&&!fn.nodeName&&fn.constructor!=Array&&/^[\s[]?function/.test(fn+"");},isXMLDoc:function(elem){return elem.documentElement&&!elem.body||elem.tagName&&elem.ownerDocument&&!elem.ownerDocument.body;},globalEval:function(data){data=jQuery.trim(data);if(data){var head=document.getElementsByTagName("head")[0]||document.documentElement,script=document.createElement("script");script.type="text/javascript";if(jQuery.browser.msie)script.text=data;else
-script.appendChild(document.createTextNode(data));head.insertBefore(script,head.firstChild);head.removeChild(script);}},nodeName:function(elem,name){return elem.nodeName&&elem.nodeName.toUpperCase()==name.toUpperCase();},cache:{},data:function(elem,name,data){elem=elem==window?windowData:elem;var id=elem[expando];if(!id)id=elem[expando]=++uuid;if(name&&!jQuery.cache[id])jQuery.cache[id]={};if(data!==undefined)jQuery.cache[id][name]=data;return name?jQuery.cache[id][name]:id;},removeData:function(elem,name){elem=elem==window?windowData:elem;var id=elem[expando];if(name){if(jQuery.cache[id]){delete jQuery.cache[id][name];name="";for(name in jQuery.cache[id])break;if(!name)jQuery.removeData(elem);}}else{try{delete elem[expando];}catch(e){if(elem.removeAttribute)elem.removeAttribute(expando);}delete jQuery.cache[id];}},each:function(object,callback,args){var name,i=0,length=object.length;if(args){if(length==undefined){for(name in object)if(callback.apply(object[name],args)===false)break;}else
-for(;i<length;)if(callback.apply(object[i++],args)===false)break;}else{if(length==undefined){for(name in object)if(callback.call(object[name],name,object[name])===false)break;}else
-for(var value=object[0];i<length&&callback.call(value,i,value)!==false;value=object[++i]){}}return object;},prop:function(elem,value,type,i,name){if(jQuery.isFunction(value))value=value.call(elem,i);return value&&value.constructor==Number&&type=="curCSS"&&!exclude.test(name)?value+"px":value;},className:{add:function(elem,classNames){jQuery.each((classNames||"").split(/\s+/),function(i,className){if(elem.nodeType==1&&!jQuery.className.has(elem.className,className))elem.className+=(elem.className?" ":"")+className;});},remove:function(elem,classNames){if(elem.nodeType==1)elem.className=classNames!=undefined?jQuery.grep(elem.className.split(/\s+/),function(className){return!jQuery.className.has(classNames,className);}).join(" "):"";},has:function(elem,className){return jQuery.inArray(className,(elem.className||elem).toString().split(/\s+/))>-1;}},swap:function(elem,options,callback){var old={};for(var name in options){old[name]=elem.style[name];elem.style[name]=options[name];}callback.call(elem);for(var name in options)elem.style[name]=old[name];},css:function(elem,name,force){if(name=="width"||name=="height"){var val,props={position:"absolute",visibility:"hidden",display:"block"},which=name=="width"?["Left","Right"]:["Top","Bottom"];function getWH(){val=name=="width"?elem.offsetWidth:elem.offsetHeight;var padding=0,border=0;jQuery.each(which,function(){padding+=parseFloat(jQuery.curCSS(elem,"padding"+this,true))||0;border+=parseFloat(jQuery.curCSS(elem,"border"+this+"Width",true))||0;});val-=Math.round(padding+border);}if(jQuery(elem).is(":visible"))getWH();else
-jQuery.swap(elem,props,getWH);return Math.max(0,val);}return jQuery.curCSS(elem,name,force);},curCSS:function(elem,name,force){var ret,style=elem.style;function color(elem){if(!jQuery.browser.safari)return false;var ret=defaultView.getComputedStyle(elem,null);return!ret||ret.getPropertyValue("color")=="";}if(name=="opacity"&&jQuery.browser.msie){ret=jQuery.attr(style,"opacity");return ret==""?"1":ret;}if(jQuery.browser.opera&&name=="display"){var save=style.outline;style.outline="0 solid black";style.outline=save;}if(name.match(/float/i))name=styleFloat;if(!force&&style&&style[name])ret=style[name];else if(defaultView.getComputedStyle){if(name.match(/float/i))name="float";name=name.replace(/([A-Z])/g,"-$1").toLowerCase();var computedStyle=defaultView.getComputedStyle(elem,null);if(computedStyle&&!color(elem))ret=computedStyle.getPropertyValue(name);else{var swap=[],stack=[],a=elem,i=0;for(;a&&color(a);a=a.parentNode)stack.unshift(a);for(;i<stack.length;i++)if(color(stack[i])){swap[i]=stack[i].style.display;stack[i].style.display="block";}ret=name=="display"&&swap[stack.length-1]!=null?"none":(computedStyle&&computedStyle.getPropertyValue(name))||"";for(i=0;i<swap.length;i++)if(swap[i]!=null)stack[i].style.display=swap[i];}if(name=="opacity"&&ret=="")ret="1";}else if(elem.currentStyle){var camelCase=name.replace(/\-(\w)/g,function(all,letter){return letter.toUpperCase();});ret=elem.currentStyle[name]||elem.currentStyle[camelCase];if(!/^\d+(px)?$/i.test(ret)&&/^\d/.test(ret)){var left=style.left,rsLeft=elem.runtimeStyle.left;elem.runtimeStyle.left=elem.currentStyle.left;style.left=ret||0;ret=style.pixelLeft+"px";style.left=left;elem.runtimeStyle.left=rsLeft;}}return ret;},clean:function(elems,context){var ret=[];context=context||document;if(typeof context.createElement=='undefined')context=context.ownerDocument||context[0]&&context[0].ownerDocument||document;jQuery.each(elems,function(i,elem){if(!elem)return;if(elem.constructor==Number)elem+='';if(typeof elem=="string"){elem=elem.replace(/(<(\w+)[^>]*?)\/>/g,function(all,front,tag){return tag.match(/^(abbr|br|col|img|input|link|meta|param|hr|area|embed)$/i)?all:front+"></"+tag+">";});var tags=jQuery.trim(elem).toLowerCase(),div=context.createElement("div");var wrap=!tags.indexOf("<opt")&&[1,"<select multiple='multiple'>","</select>"]||!tags.indexOf("<leg")&&[1,"<fieldset>","</fieldset>"]||tags.match(/^<(thead|tbody|tfoot|colg|cap)/)&&[1,"<table>","</table>"]||!tags.indexOf("<tr")&&[2,"<table><tbody>","</tbody></table>"]||(!tags.indexOf("<td")||!tags.indexOf("<th"))&&[3,"<table><tbody><tr>","</tr></tbody></table>"]||!tags.indexOf("<col")&&[2,"<table><tbody></tbody><colgroup>","</colgroup></table>"]||jQuery.browser.msie&&[1,"div<div>","</div>"]||[0,"",""];div.innerHTML=wrap[1]+elem+wrap[2];while(wrap[0]--)div=div.lastChild;if(jQuery.browser.msie){var tbody=!tags.indexOf("<table")&&tags.indexOf("<tbody")<0?div.firstChild&&div.firstChild.childNodes:wrap[1]=="<table>"&&tags.indexOf("<tbody")<0?div.childNodes:[];for(var j=tbody.length-1;j>=0;--j)if(jQuery.nodeName(tbody[j],"tbody")&&!tbody[j].childNodes.length)tbody[j].parentNode.removeChild(tbody[j]);if(/^\s/.test(elem))div.insertBefore(context.createTextNode(elem.match(/^\s*/)[0]),div.firstChild);}elem=jQuery.makeArray(div.childNodes);}if(elem.length===0&&(!jQuery.nodeName(elem,"form")&&!jQuery.nodeName(elem,"select")))return;if(elem[0]==undefined||jQuery.nodeName(elem,"form")||elem.options)ret.push(elem);else
-ret=jQuery.merge(ret,elem);});return ret;},attr:function(elem,name,value){if(!elem||elem.nodeType==3||elem.nodeType==8)return undefined;var notxml=!jQuery.isXMLDoc(elem),set=value!==undefined,msie=jQuery.browser.msie;name=notxml&&jQuery.props[name]||name;if(elem.tagName){var special=/href|src|style/.test(name);if(name=="selected"&&jQuery.browser.safari)elem.parentNode.selectedIndex;if(name in elem&&notxml&&!special){if(set){if(name=="type"&&jQuery.nodeName(elem,"input")&&elem.parentNode)throw"type property can't be changed";elem[name]=value;}if(jQuery.nodeName(elem,"form")&&elem.getAttributeNode(name))return elem.getAttributeNode(name).nodeValue;return elem[name];}if(msie&&notxml&&name=="style")return jQuery.attr(elem.style,"cssText",value);if(set)elem.setAttribute(name,""+value);var attr=msie&&notxml&&special?elem.getAttribute(name,2):elem.getAttribute(name);return attr===null?undefined:attr;}if(msie&&name=="opacity"){if(set){elem.zoom=1;elem.filter=(elem.filter||"").replace(/alpha\([^)]*\)/,"")+(parseInt(value)+''=="NaN"?"":"alpha(opacity="+value*100+")");}return elem.filter&&elem.filter.indexOf("opacity=")>=0?(parseFloat(elem.filter.match(/opacity=([^)]*)/)[1])/100)+'':"";}name=name.replace(/-([a-z])/ig,function(all,letter){return letter.toUpperCase();});if(set)elem[name]=value;return elem[name];},trim:function(text){return(text||"").replace(/^\s+|\s+$/g,"");},makeArray:function(array){var ret=[];if(array!=null){var i=array.length;if(i==null||array.split||array.setInterval||array.call)ret[0]=array;else
-while(i)ret[--i]=array[i];}return ret;},inArray:function(elem,array){for(var i=0,length=array.length;i<length;i++)if(array[i]===elem)return i;return-1;},merge:function(first,second){var i=0,elem,pos=first.length;if(jQuery.browser.msie){while(elem=second[i++])if(elem.nodeType!=8)first[pos++]=elem;}else
-while(elem=second[i++])first[pos++]=elem;return first;},unique:function(array){var ret=[],done={};try{for(var i=0,length=array.length;i<length;i++){var id=jQuery.data(array[i]);if(!done[id]){done[id]=true;ret.push(array[i]);}}}catch(e){ret=array;}return ret;},grep:function(elems,callback,inv){var ret=[];for(var i=0,length=elems.length;i<length;i++)if(!inv!=!callback(elems[i],i))ret.push(elems[i]);return ret;},map:function(elems,callback){var ret=[];for(var i=0,length=elems.length;i<length;i++){var value=callback(elems[i],i);if(value!=null)ret[ret.length]=value;}return ret.concat.apply([],ret);}});var userAgent=navigator.userAgent.toLowerCase();jQuery.browser={version:(userAgent.match(/.+(?:rv|it|ra|ie)[\/: ]([\d.]+)/)||[])[1],safari:/webkit/.test(userAgent),opera:/opera/.test(userAgent),msie:/msie/.test(userAgent)&&!/opera/.test(userAgent),mozilla:/mozilla/.test(userAgent)&&!/(compatible|webkit)/.test(userAgent)};var styleFloat=jQuery.browser.msie?"styleFloat":"cssFloat";jQuery.extend({boxModel:!jQuery.browser.msie||document.compatMode=="CSS1Compat",props:{"for":"htmlFor","class":"className","float":styleFloat,cssFloat:styleFloat,styleFloat:styleFloat,readonly:"readOnly",maxlength:"maxLength",cellspacing:"cellSpacing"}});jQuery.each({parent:function(elem){return elem.parentNode;},parents:function(elem){return jQuery.dir(elem,"parentNode");},next:function(elem){return jQuery.nth(elem,2,"nextSibling");},prev:function(elem){return jQuery.nth(elem,2,"previousSibling");},nextAll:function(elem){return jQuery.dir(elem,"nextSibling");},prevAll:function(elem){return jQuery.dir(elem,"previousSibling");},siblings:function(elem){return jQuery.sibling(elem.parentNode.firstChild,elem);},children:function(elem){return jQuery.sibling(elem.firstChild);},contents:function(elem){return jQuery.nodeName(elem,"iframe")?elem.contentDocument||elem.contentWindow.document:jQuery.makeArray(elem.childNodes);}},function(name,fn){jQuery.fn[name]=function(selector){var ret=jQuery.map(this,fn);if(selector&&typeof selector=="string")ret=jQuery.multiFilter(selector,ret);return this.pushStack(jQuery.unique(ret));};});jQuery.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(name,original){jQuery.fn[name]=function(){var args=arguments;return this.each(function(){for(var i=0,length=args.length;i<length;i++)jQuery(args[i])[original](this);});};});jQuery.each({removeAttr:function(name){jQuery.attr(this,name,"");if(this.nodeType==1)this.removeAttribute(name);},addClass:function(classNames){jQuery.className.add(this,classNames);},removeClass:function(classNames){jQuery.className.remove(this,classNames);},toggleClass:function(classNames){jQuery.className[jQuery.className.has(this,classNames)?"remove":"add"](this,classNames);},remove:function(selector){if(!selector||jQuery.filter(selector,[this]).r.length){jQuery("*",this).add(this).each(function(){jQuery.event.remove(this);jQuery.removeData(this);});if(this.parentNode)this.parentNode.removeChild(this);}},empty:function(){jQuery(">*",this).remove();while(this.firstChild)this.removeChild(this.firstChild);}},function(name,fn){jQuery.fn[name]=function(){return this.each(fn,arguments);};});jQuery.each(["Height","Width"],function(i,name){var type=name.toLowerCase();jQuery.fn[type]=function(size){return this[0]==window?jQuery.browser.opera&&document.body["client"+name]||jQuery.browser.safari&&window["inner"+name]||document.compatMode=="CSS1Compat"&&document.documentElement["client"+name]||document.body["client"+name]:this[0]==document?Math.max(Math.max(document.body["scroll"+name],document.documentElement["scroll"+name]),Math.max(document.body["offset"+name],document.documentElement["offset"+name])):size==undefined?(this.length?jQuery.css(this[0],type):null):this.css(type,size.constructor==String?size:size+"px");};});function num(elem,prop){return elem[0]&&parseInt(jQuery.curCSS(elem[0],prop,true),10)||0;}var chars=jQuery.browser.safari&&parseInt(jQuery.browser.version)<417?"(?:[\\w*_-]|\\\\.)":"(?:[\\w\u0128-\uFFFF*_-]|\\\\.)",quickChild=new RegExp("^>\\s*("+chars+"+)"),quickID=new RegExp("^("+chars+"+)(#)("+chars+"+)"),quickClass=new RegExp("^([#.]?)("+chars+"*)");jQuery.extend({expr:{"":function(a,i,m){return m[2]=="*"||jQuery.nodeName(a,m[2]);},"#":function(a,i,m){return a.getAttribute("id")==m[2];},":":{lt:function(a,i,m){return i<m[3]-0;},gt:function(a,i,m){return i>m[3]-0;},nth:function(a,i,m){return m[3]-0==i;},eq:function(a,i,m){return m[3]-0==i;},first:function(a,i){return i==0;},last:function(a,i,m,r){return i==r.length-1;},even:function(a,i){return i%2==0;},odd:function(a,i){return i%2;},"first-child":function(a){return a.parentNode.getElementsByTagName("*")[0]==a;},"last-child":function(a){return jQuery.nth(a.parentNode.lastChild,1,"previousSibling")==a;},"only-child":function(a){return!jQuery.nth(a.parentNode.lastChild,2,"previousSibling");},parent:function(a){return a.firstChild;},empty:function(a){return!a.firstChild;},contains:function(a,i,m){return(a.textContent||a.innerText||jQuery(a).text()||"").indexOf(m[3])>=0;},visible:function(a){return"hidden"!=a.type&&jQuery.css(a,"display")!="none"&&jQuery.css(a,"visibility")!="hidden";},hidden:function(a){return"hidden"==a.type||jQuery.css(a,"display")=="none"||jQuery.css(a,"visibility")=="hidden";},enabled:function(a){return!a.disabled;},disabled:function(a){return a.disabled;},checked:function(a){return a.checked;},selected:function(a){return a.selected||jQuery.attr(a,"selected");},text:function(a){return"text"==a.type;},radio:function(a){return"radio"==a.type;},checkbox:function(a){return"checkbox"==a.type;},file:function(a){return"file"==a.type;},password:function(a){return"password"==a.type;},submit:function(a){return"submit"==a.type;},image:function(a){return"image"==a.type;},reset:function(a){return"reset"==a.type;},button:function(a){return"button"==a.type||jQuery.nodeName(a,"button");},input:function(a){return/input|select|textarea|button/i.test(a.nodeName);},has:function(a,i,m){return jQuery.find(m[3],a).length;},header:function(a){return/h\d/i.test(a.nodeName);},animated:function(a){return jQuery.grep(jQuery.timers,function(fn){return a==fn.elem;}).length;}}},parse:[/^(\[) *@?([\w-]+) *([!*$^~=]*) *('?"?)(.*?)\4 *\]/,/^(:)([\w-]+)\("?'?(.*?(\(.*?\))?[^(]*?)"?'?\)/,new RegExp("^([:.#]*)("+chars+"+)")],multiFilter:function(expr,elems,not){var old,cur=[];while(expr&&expr!=old){old=expr;var f=jQuery.filter(expr,elems,not);expr=f.t.replace(/^\s*,\s*/,"");cur=not?elems=f.r:jQuery.merge(cur,f.r);}return cur;},find:function(t,context){if(typeof t!="string")return[t];if(context&&context.nodeType!=1&&context.nodeType!=9)return[];context=context||document;var ret=[context],done=[],last,nodeName;while(t&&last!=t){var r=[];last=t;t=jQuery.trim(t);var foundToken=false,re=quickChild,m=re.exec(t);if(m){nodeName=m[1].toUpperCase();for(var i=0;ret[i];i++)for(var c=ret[i].firstChild;c;c=c.nextSibling)if(c.nodeType==1&&(nodeName=="*"||c.nodeName.toUpperCase()==nodeName))r.push(c);ret=r;t=t.replace(re,"");if(t.indexOf(" ")==0)continue;foundToken=true;}else{re=/^([>+~])\s*(\w*)/i;if((m=re.exec(t))!=null){r=[];var merge={};nodeName=m[2].toUpperCase();m=m[1];for(var j=0,rl=ret.length;j<rl;j++){var n=m=="~"||m=="+"?ret[j].nextSibling:ret[j].firstChild;for(;n;n=n.nextSibling)if(n.nodeType==1){var id=jQuery.data(n);if(m=="~"&&merge[id])break;if(!nodeName||n.nodeName.toUpperCase()==nodeName){if(m=="~")merge[id]=true;r.push(n);}if(m=="+")break;}}ret=r;t=jQuery.trim(t.replace(re,""));foundToken=true;}}if(t&&!foundToken){if(!t.indexOf(",")){if(context==ret[0])ret.shift();done=jQuery.merge(done,ret);r=ret=[context];t=" "+t.substr(1,t.length);}else{var re2=quickID;var m=re2.exec(t);if(m){m=[0,m[2],m[3],m[1]];}else{re2=quickClass;m=re2.exec(t);}m[2]=m[2].replace(/\\/g,"");var elem=ret[ret.length-1];if(m[1]=="#"&&elem&&elem.getElementById&&!jQuery.isXMLDoc(elem)){var oid=elem.getElementById(m[2]);if((jQuery.browser.msie||jQuery.browser.opera)&&oid&&typeof oid.id=="string"&&oid.id!=m[2])oid=jQuery('[@id="'+m[2]+'"]',elem)[0];ret=r=oid&&(!m[3]||jQuery.nodeName(oid,m[3]))?[oid]:[];}else{for(var i=0;ret[i];i++){var tag=m[1]=="#"&&m[3]?m[3]:m[1]!=""||m[0]==""?"*":m[2];if(tag=="*"&&ret[i].nodeName.toLowerCase()=="object")tag="param";r=jQuery.merge(r,ret[i].getElementsByTagName(tag));}if(m[1]==".")r=jQuery.classFilter(r,m[2]);if(m[1]=="#"){var tmp=[];for(var i=0;r[i];i++)if(r[i].getAttribute("id")==m[2]){tmp=[r[i]];break;}r=tmp;}ret=r;}t=t.replace(re2,"");}}if(t){var val=jQuery.filter(t,r);ret=r=val.r;t=jQuery.trim(val.t);}}if(t)ret=[];if(ret&&context==ret[0])ret.shift();done=jQuery.merge(done,ret);return done;},classFilter:function(r,m,not){m=" "+m+" ";var tmp=[];for(var i=0;r[i];i++){var pass=(" "+r[i].className+" ").indexOf(m)>=0;if(!not&&pass||not&&!pass)tmp.push(r[i]);}return tmp;},filter:function(t,r,not){var last;while(t&&t!=last){last=t;var p=jQuery.parse,m;for(var i=0;p[i];i++){m=p[i].exec(t);if(m){t=t.substring(m[0].length);m[2]=m[2].replace(/\\/g,"");break;}}if(!m)break;if(m[1]==":"&&m[2]=="not")r=isSimple.test(m[3])?jQuery.filter(m[3],r,true).r:jQuery(r).not(m[3]);else if(m[1]==".")r=jQuery.classFilter(r,m[2],not);else if(m[1]=="["){var tmp=[],type=m[3];for(var i=0,rl=r.length;i<rl;i++){var a=r[i],z=a[jQuery.props[m[2]]||m[2]];if(z==null||/href|src|selected/.test(m[2]))z=jQuery.attr(a,m[2])||'';if((type==""&&!!z||type=="="&&z==m[5]||type=="!="&&z!=m[5]||type=="^="&&z&&!z.indexOf(m[5])||type=="$="&&z.substr(z.length-m[5].length)==m[5]||(type=="*="||type=="~=")&&z.indexOf(m[5])>=0)^not)tmp.push(a);}r=tmp;}else if(m[1]==":"&&m[2]=="nth-child"){var merge={},tmp=[],test=/(-?)(\d*)n((?:\+|-)?\d*)/.exec(m[3]=="even"&&"2n"||m[3]=="odd"&&"2n+1"||!/\D/.test(m[3])&&"0n+"+m[3]||m[3]),first=(test[1]+(test[2]||1))-0,last=test[3]-0;for(var i=0,rl=r.length;i<rl;i++){var node=r[i],parentNode=node.parentNode,id=jQuery.data(parentNode);if(!merge[id]){var c=1;for(var n=parentNode.firstChild;n;n=n.nextSibling)if(n.nodeType==1)n.nodeIndex=c++;merge[id]=true;}var add=false;if(first==0){if(node.nodeIndex==last)add=true;}else if((node.nodeIndex-last)%first==0&&(node.nodeIndex-last)/first>=0)add=true;if(add^not)tmp.push(node);}r=tmp;}else{var fn=jQuery.expr[m[1]];if(typeof fn=="object")fn=fn[m[2]];if(typeof fn=="string")fn=eval("false||function(a,i){return "+fn+";}");r=jQuery.grep(r,function(elem,i){return fn(elem,i,m,r);},not);}}return{r:r,t:t};},dir:function(elem,dir){var matched=[],cur=elem[dir];while(cur&&cur!=document){if(cur.nodeType==1)matched.push(cur);cur=cur[dir];}return matched;},nth:function(cur,result,dir,elem){result=result||1;var num=0;for(;cur;cur=cur[dir])if(cur.nodeType==1&&++num==result)break;return cur;},sibling:function(n,elem){var r=[];for(;n;n=n.nextSibling){if(n.nodeType==1&&n!=elem)r.push(n);}return r;}});jQuery.event={add:function(elem,types,handler,data){if(elem.nodeType==3||elem.nodeType==8)return;if(jQuery.browser.msie&&elem.setInterval)elem=window;if(!handler.guid)handler.guid=this.guid++;if(data!=undefined){var fn=handler;handler=this.proxy(fn,function(){return fn.apply(this,arguments);});handler.data=data;}var events=jQuery.data(elem,"events")||jQuery.data(elem,"events",{}),handle=jQuery.data(elem,"handle")||jQuery.data(elem,"handle",function(){if(typeof jQuery!="undefined"&&!jQuery.event.triggered)return jQuery.event.handle.apply(arguments.callee.elem,arguments);});handle.elem=elem;jQuery.each(types.split(/\s+/),function(index,type){var parts=type.split(".");type=parts[0];handler.type=parts[1];var handlers=events[type];if(!handlers){handlers=events[type]={};if(!jQuery.event.special[type]||jQuery.event.special[type].setup.call(elem)===false){if(elem.addEventListener)elem.addEventListener(type,handle,false);else if(elem.attachEvent)elem.attachEvent("on"+type,handle);}}handlers[handler.guid]=handler;jQuery.event.global[type]=true;});elem=null;},guid:1,global:{},remove:function(elem,types,handler){if(elem.nodeType==3||elem.nodeType==8)return;var events=jQuery.data(elem,"events"),ret,index;if(events){if(types==undefined||(typeof types=="string"&&types.charAt(0)=="."))for(var type in events)this.remove(elem,type+(types||""));else{if(types.type){handler=types.handler;types=types.type;}jQuery.each(types.split(/\s+/),function(index,type){var parts=type.split(".");type=parts[0];if(events[type]){if(handler)delete events[type][handler.guid];else
-for(handler in events[type])if(!parts[1]||events[type][handler].type==parts[1])delete events[type][handler];for(ret in events[type])break;if(!ret){if(!jQuery.event.special[type]||jQuery.event.special[type].teardown.call(elem)===false){if(elem.removeEventListener)elem.removeEventListener(type,jQuery.data(elem,"handle"),false);else if(elem.detachEvent)elem.detachEvent("on"+type,jQuery.data(elem,"handle"));}ret=null;delete events[type];}}});}for(ret in events)break;if(!ret){var handle=jQuery.data(elem,"handle");if(handle)handle.elem=null;jQuery.removeData(elem,"events");jQuery.removeData(elem,"handle");}}},trigger:function(type,data,elem,donative,extra){data=jQuery.makeArray(data);if(type.indexOf("!")>=0){type=type.slice(0,-1);var exclusive=true;}if(!elem){if(this.global[type])jQuery("*").add([window,document]).trigger(type,data);}else{if(elem.nodeType==3||elem.nodeType==8)return undefined;var val,ret,fn=jQuery.isFunction(elem[type]||null),event=!data[0]||!data[0].preventDefault;if(event){data.unshift({type:type,target:elem,preventDefault:function(){},stopPropagation:function(){},timeStamp:now()});data[0][expando]=true;}data[0].type=type;if(exclusive)data[0].exclusive=true;var handle=jQuery.data(elem,"handle");if(handle)val=handle.apply(elem,data);if((!fn||(jQuery.nodeName(elem,'a')&&type=="click"))&&elem["on"+type]&&elem["on"+type].apply(elem,data)===false)val=false;if(event)data.shift();if(extra&&jQuery.isFunction(extra)){ret=extra.apply(elem,val==null?data:data.concat(val));if(ret!==undefined)val=ret;}if(fn&&donative!==false&&val!==false&&!(jQuery.nodeName(elem,'a')&&type=="click")){this.triggered=true;try{elem[type]();}catch(e){}}this.triggered=false;}return val;},handle:function(event){var val,ret,namespace,all,handlers;event=arguments[0]=jQuery.event.fix(event||window.event);namespace=event.type.split(".");event.type=namespace[0];namespace=namespace[1];all=!namespace&&!event.exclusive;handlers=(jQuery.data(this,"events")||{})[event.type];for(var j in handlers){var handler=handlers[j];if(all||handler.type==namespace){event.handler=handler;event.data=handler.data;ret=handler.apply(this,arguments);if(val!==false)val=ret;if(ret===false){event.preventDefault();event.stopPropagation();}}}return val;},fix:function(event){if(event[expando]==true)return event;var originalEvent=event;event={originalEvent:originalEvent};var props="altKey attrChange attrName bubbles button cancelable charCode clientX clientY ctrlKey currentTarget data detail eventPhase fromElement handler keyCode metaKey newValue originalTarget pageX pageY prevValue relatedNode relatedTarget screenX screenY shiftKey srcElement target timeStamp toElement type view wheelDelta which".split(" ");for(var i=props.length;i;i--)event[props[i]]=originalEvent[props[i]];event[expando]=true;event.preventDefault=function(){if(originalEvent.preventDefault)originalEvent.preventDefault();originalEvent.returnValue=false;};event.stopPropagation=function(){if(originalEvent.stopPropagation)originalEvent.stopPropagation();originalEvent.cancelBubble=true;};event.timeStamp=event.timeStamp||now();if(!event.target)event.target=event.srcElement||document;if(event.target.nodeType==3)event.target=event.target.parentNode;if(!event.relatedTarget&&event.fromElement)event.relatedTarget=event.fromElement==event.target?event.toElement:event.fromElement;if(event.pageX==null&&event.clientX!=null){var doc=document.documentElement,body=document.body;event.pageX=event.clientX+(doc&&doc.scrollLeft||body&&body.scrollLeft||0)-(doc.clientLeft||0);event.pageY=event.clientY+(doc&&doc.scrollTop||body&&body.scrollTop||0)-(doc.clientTop||0);}if(!event.which&&((event.charCode||event.charCode===0)?event.charCode:event.keyCode))event.which=event.charCode||event.keyCode;if(!event.metaKey&&event.ctrlKey)event.metaKey=event.ctrlKey;if(!event.which&&event.button)event.which=(event.button&1?1:(event.button&2?3:(event.button&4?2:0)));return event;},proxy:function(fn,proxy){proxy.guid=fn.guid=fn.guid||proxy.guid||this.guid++;return proxy;},special:{ready:{setup:function(){bindReady();return;},teardown:function(){return;}},mouseenter:{setup:function(){if(jQuery.browser.msie)return false;jQuery(this).bind("mouseover",jQuery.event.special.mouseenter.handler);return true;},teardown:function(){if(jQuery.browser.msie)return false;jQuery(this).unbind("mouseover",jQuery.event.special.mouseenter.handler);return true;},handler:function(event){if(withinElement(event,this))return true;event.type="mouseenter";return jQuery.event.handle.apply(this,arguments);}},mouseleave:{setup:function(){if(jQuery.browser.msie)return false;jQuery(this).bind("mouseout",jQuery.event.special.mouseleave.handler);return true;},teardown:function(){if(jQuery.browser.msie)return false;jQuery(this).unbind("mouseout",jQuery.event.special.mouseleave.handler);return true;},handler:function(event){if(withinElement(event,this))return true;event.type="mouseleave";return jQuery.event.handle.apply(this,arguments);}}}};jQuery.fn.extend({bind:function(type,data,fn){return type=="unload"?this.one(type,data,fn):this.each(function(){jQuery.event.add(this,type,fn||data,fn&&data);});},one:function(type,data,fn){var one=jQuery.event.proxy(fn||data,function(event){jQuery(this).unbind(event,one);return(fn||data).apply(this,arguments);});return this.each(function(){jQuery.event.add(this,type,one,fn&&data);});},unbind:function(type,fn){return this.each(function(){jQuery.event.remove(this,type,fn);});},trigger:function(type,data,fn){return this.each(function(){jQuery.event.trigger(type,data,this,true,fn);});},triggerHandler:function(type,data,fn){return this[0]&&jQuery.event.trigger(type,data,this[0],false,fn);},toggle:function(fn){var args=arguments,i=1;while(i<args.length)jQuery.event.proxy(fn,args[i++]);return this.click(jQuery.event.proxy(fn,function(event){this.lastToggle=(this.lastToggle||0)%i;event.preventDefault();return args[this.lastToggle++].apply(this,arguments)||false;}));},hover:function(fnOver,fnOut){return this.bind('mouseenter',fnOver).bind('mouseleave',fnOut);},ready:function(fn){bindReady();if(jQuery.isReady)fn.call(document,jQuery);else
-jQuery.readyList.push(function(){return fn.call(this,jQuery);});return this;}});jQuery.extend({isReady:false,readyList:[],ready:function(){if(!jQuery.isReady){jQuery.isReady=true;if(jQuery.readyList){jQuery.each(jQuery.readyList,function(){this.call(document);});jQuery.readyList=null;}jQuery(document).triggerHandler("ready");}}});var readyBound=false;function bindReady(){if(readyBound)return;readyBound=true;if(document.addEventListener&&!jQuery.browser.opera)document.addEventListener("DOMContentLoaded",jQuery.ready,false);if(jQuery.browser.msie&&window==top)(function(){if(jQuery.isReady)return;try{document.documentElement.doScroll("left");}catch(error){setTimeout(arguments.callee,0);return;}jQuery.ready();})();if(jQuery.browser.opera)document.addEventListener("DOMContentLoaded",function(){if(jQuery.isReady)return;for(var i=0;i<document.styleSheets.length;i++)if(document.styleSheets[i].disabled){setTimeout(arguments.callee,0);return;}jQuery.ready();},false);if(jQuery.browser.safari){var numStyles;(function(){if(jQuery.isReady)return;if(document.readyState!="loaded"&&document.readyState!="complete"){setTimeout(arguments.callee,0);return;}if(numStyles===undefined)numStyles=jQuery("style, link[rel=stylesheet]").length;if(document.styleSheets.length!=numStyles){setTimeout(arguments.callee,0);return;}jQuery.ready();})();}jQuery.event.add(window,"load",jQuery.ready);}jQuery.each(("blur,focus,load,resize,scroll,unload,click,dblclick,"+"mousedown,mouseup,mousemove,mouseover,mouseout,change,select,"+"submit,keydown,keypress,keyup,error").split(","),function(i,name){jQuery.fn[name]=function(fn){return fn?this.bind(name,fn):this.trigger(name);};});var withinElement=function(event,elem){var parent=event.relatedTarget;while(parent&&parent!=elem)try{parent=parent.parentNode;}catch(error){parent=elem;}return parent==elem;};jQuery(window).bind("unload",function(){jQuery("*").add(document).unbind();});jQuery.fn.extend({_load:jQuery.fn.load,load:function(url,params,callback){if(typeof url!='string')return this._load(url);var off=url.indexOf(" ");if(off>=0){var selector=url.slice(off,url.length);url=url.slice(0,off);}callback=callback||function(){};var type="GET";if(params)if(jQuery.isFunction(params)){callback=params;params=null;}else{params=jQuery.param(params);type="POST";}var self=this;jQuery.ajax({url:url,type:type,dataType:"html",data:params,complete:function(res,status){if(status=="success"||status=="notmodified")self.html(selector?jQuery("<div/>").append(res.responseText.replace(/<script(.|\s)*?\/script>/g,"")).find(selector):res.responseText);self.each(callback,[res.responseText,status,res]);}});return this;},serialize:function(){return jQuery.param(this.serializeArray());},serializeArray:function(){return this.map(function(){return jQuery.nodeName(this,"form")?jQuery.makeArray(this.elements):this;}).filter(function(){return this.name&&!this.disabled&&(this.checked||/select|textarea/i.test(this.nodeName)||/text|hidden|password/i.test(this.type));}).map(function(i,elem){var val=jQuery(this).val();return val==null?null:val.constructor==Array?jQuery.map(val,function(val,i){return{name:elem.name,value:val};}):{name:elem.name,value:val};}).get();}});jQuery.each("ajaxStart,ajaxStop,ajaxComplete,ajaxError,ajaxSuccess,ajaxSend".split(","),function(i,o){jQuery.fn[o]=function(f){return this.bind(o,f);};});var jsc=now();jQuery.extend({get:function(url,data,callback,type){if(jQuery.isFunction(data)){callback=data;data=null;}return jQuery.ajax({type:"GET",url:url,data:data,success:callback,dataType:type});},getScript:function(url,callback){return jQuery.get(url,null,callback,"script");},getJSON:function(url,data,callback){return jQuery.get(url,data,callback,"json");},post:function(url,data,callback,type){if(jQuery.isFunction(data)){callback=data;data={};}return jQuery.ajax({type:"POST",url:url,data:data,success:callback,dataType:type});},ajaxSetup:function(settings){jQuery.extend(jQuery.ajaxSettings,settings);},ajaxSettings:{url:location.href,global:true,type:"GET",timeout:0,contentType:"application/x-www-form-urlencoded",processData:true,async:true,data:null,username:null,password:null,accepts:{xml:"application/xml, text/xml",html:"text/html",script:"text/javascript, application/javascript",json:"application/json, text/javascript",text:"text/plain",_default:"*/*"}},lastModified:{},ajax:function(s){s=jQuery.extend(true,s,jQuery.extend(true,{},jQuery.ajaxSettings,s));var jsonp,jsre=/=\?(&|$)/g,status,data,type=s.type.toUpperCase();if(s.data&&s.processData&&typeof s.data!="string")s.data=jQuery.param(s.data);if(s.dataType=="jsonp"){if(type=="GET"){if(!s.url.match(jsre))s.url+=(s.url.match(/\?/)?"&":"?")+(s.jsonp||"callback")+"=?";}else if(!s.data||!s.data.match(jsre))s.data=(s.data?s.data+"&":"")+(s.jsonp||"callback")+"=?";s.dataType="json";}if(s.dataType=="json"&&(s.data&&s.data.match(jsre)||s.url.match(jsre))){jsonp="jsonp"+jsc++;if(s.data)s.data=(s.data+"").replace(jsre,"="+jsonp+"$1");s.url=s.url.replace(jsre,"="+jsonp+"$1");s.dataType="script";window[jsonp]=function(tmp){data=tmp;success();complete();window[jsonp]=undefined;try{delete window[jsonp];}catch(e){}if(head)head.removeChild(script);};}if(s.dataType=="script"&&s.cache==null)s.cache=false;if(s.cache===false&&type=="GET"){var ts=now();var ret=s.url.replace(/(\?|&)_=.*?(&|$)/,"$1_="+ts+"$2");s.url=ret+((ret==s.url)?(s.url.match(/\?/)?"&":"?")+"_="+ts:"");}if(s.data&&type=="GET"){s.url+=(s.url.match(/\?/)?"&":"?")+s.data;s.data=null;}if(s.global&&!jQuery.active++)jQuery.event.trigger("ajaxStart");var remote=/^(?:\w+:)?\/\/([^\/?#]+)/;if(s.dataType=="script"&&type=="GET"&&remote.test(s.url)&&remote.exec(s.url)[1]!=location.host){var head=document.getElementsByTagName("head")[0];var script=document.createElement("script");script.src=s.url;if(s.scriptCharset)script.charset=s.scriptCharset;if(!jsonp){var done=false;script.onload=script.onreadystatechange=function(){if(!done&&(!this.readyState||this.readyState=="loaded"||this.readyState=="complete")){done=true;success();complete();head.removeChild(script);}};}head.appendChild(script);return undefined;}var requestDone=false;var xhr=window.ActiveXObject?new ActiveXObject("Microsoft.XMLHTTP"):new XMLHttpRequest();if(s.username)xhr.open(type,s.url,s.async,s.username,s.password);else
-xhr.open(type,s.url,s.async);try{if(s.data)xhr.setRequestHeader("Content-Type",s.contentType);if(s.ifModified)xhr.setRequestHeader("If-Modified-Since",jQuery.lastModified[s.url]||"Thu, 01 Jan 1970 00:00:00 GMT");xhr.setRequestHeader("X-Requested-With","XMLHttpRequest");xhr.setRequestHeader("Accept",s.dataType&&s.accepts[s.dataType]?s.accepts[s.dataType]+", */*":s.accepts._default);}catch(e){}if(s.beforeSend&&s.beforeSend(xhr,s)===false){s.global&&jQuery.active--;xhr.abort();return false;}if(s.global)jQuery.event.trigger("ajaxSend",[xhr,s]);var onreadystatechange=function(isTimeout){if(!requestDone&&xhr&&(xhr.readyState==4||isTimeout=="timeout")){requestDone=true;if(ival){clearInterval(ival);ival=null;}status=isTimeout=="timeout"&&"timeout"||!jQuery.httpSuccess(xhr)&&"error"||s.ifModified&&jQuery.httpNotModified(xhr,s.url)&&"notmodified"||"success";if(status=="success"){try{data=jQuery.httpData(xhr,s.dataType,s.dataFilter);}catch(e){status="parsererror";}}if(status=="success"){var modRes;try{modRes=xhr.getResponseHeader("Last-Modified");}catch(e){}if(s.ifModified&&modRes)jQuery.lastModified[s.url]=modRes;if(!jsonp)success();}else
-jQuery.handleError(s,xhr,status);complete();if(s.async)xhr=null;}};if(s.async){var ival=setInterval(onreadystatechange,13);if(s.timeout>0)setTimeout(function(){if(xhr){xhr.abort();if(!requestDone)onreadystatechange("timeout");}},s.timeout);}try{xhr.send(s.data);}catch(e){jQuery.handleError(s,xhr,null,e);}if(!s.async)onreadystatechange();function success(){if(s.success)s.success(data,status);if(s.global)jQuery.event.trigger("ajaxSuccess",[xhr,s]);}function complete(){if(s.complete)s.complete(xhr,status);if(s.global)jQuery.event.trigger("ajaxComplete",[xhr,s]);if(s.global&&!--jQuery.active)jQuery.event.trigger("ajaxStop");}return xhr;},handleError:function(s,xhr,status,e){if(s.error)s.error(xhr,status,e);if(s.global)jQuery.event.trigger("ajaxError",[xhr,s,e]);},active:0,httpSuccess:function(xhr){try{return!xhr.status&&location.protocol=="file:"||(xhr.status>=200&&xhr.status<300)||xhr.status==304||xhr.status==1223||jQuery.browser.safari&&xhr.status==undefined;}catch(e){}return false;},httpNotModified:function(xhr,url){try{var xhrRes=xhr.getResponseHeader("Last-Modified");return xhr.status==304||xhrRes==jQuery.lastModified[url]||jQuery.browser.safari&&xhr.status==undefined;}catch(e){}return false;},httpData:function(xhr,type,filter){var ct=xhr.getResponseHeader("content-type"),xml=type=="xml"||!type&&ct&&ct.indexOf("xml")>=0,data=xml?xhr.responseXML:xhr.responseText;if(xml&&data.documentElement.tagName=="parsererror")throw"parsererror";if(filter)data=filter(data,type);if(type=="script")jQuery.globalEval(data);if(type=="json")data=eval("("+data+")");return data;},param:function(a){var s=[];if(a.constructor==Array||a.jquery)jQuery.each(a,function(){s.push(encodeURIComponent(this.name)+"="+encodeURIComponent(this.value));});else
-for(var j in a)if(a[j]&&a[j].constructor==Array)jQuery.each(a[j],function(){s.push(encodeURIComponent(j)+"="+encodeURIComponent(this));});else
-s.push(encodeURIComponent(j)+"="+encodeURIComponent(jQuery.isFunction(a[j])?a[j]():a[j]));return s.join("&").replace(/%20/g,"+");}});jQuery.fn.extend({show:function(speed,callback){return speed?this.animate({height:"show",width:"show",opacity:"show"},speed,callback):this.filter(":hidden").each(function(){this.style.display=this.oldblock||"";if(jQuery.css(this,"display")=="none"){var elem=jQuery("<"+this.tagName+" />").appendTo("body");this.style.display=elem.css("display");if(this.style.display=="none")this.style.display="block";elem.remove();}}).end();},hide:function(speed,callback){return speed?this.animate({height:"hide",width:"hide",opacity:"hide"},speed,callback):this.filter(":visible").each(function(){this.oldblock=this.oldblock||jQuery.css(this,"display");this.style.display="none";}).end();},_toggle:jQuery.fn.toggle,toggle:function(fn,fn2){return jQuery.isFunction(fn)&&jQuery.isFunction(fn2)?this._toggle.apply(this,arguments):fn?this.animate({height:"toggle",width:"toggle",opacity:"toggle"},fn,fn2):this.each(function(){jQuery(this)[jQuery(this).is(":hidden")?"show":"hide"]();});},slideDown:function(speed,callback){return this.animate({height:"show"},speed,callback);},slideUp:function(speed,callback){return this.animate({height:"hide"},speed,callback);},slideToggle:function(speed,callback){return this.animate({height:"toggle"},speed,callback);},fadeIn:function(speed,callback){return this.animate({opacity:"show"},speed,callback);},fadeOut:function(speed,callback){return this.animate({opacity:"hide"},speed,callback);},fadeTo:function(speed,to,callback){return this.animate({opacity:to},speed,callback);},animate:function(prop,speed,easing,callback){var optall=jQuery.speed(speed,easing,callback);return this[optall.queue===false?"each":"queue"](function(){if(this.nodeType!=1)return false;var opt=jQuery.extend({},optall),p,hidden=jQuery(this).is(":hidden"),self=this;for(p in prop){if(prop[p]=="hide"&&hidden||prop[p]=="show"&&!hidden)return opt.complete.call(this);if(p=="height"||p=="width"){opt.display=jQuery.css(this,"display");opt.overflow=this.style.overflow;}}if(opt.overflow!=null)this.style.overflow="hidden";opt.curAnim=jQuery.extend({},prop);jQuery.each(prop,function(name,val){var e=new jQuery.fx(self,opt,name);if(/toggle|show|hide/.test(val))e[val=="toggle"?hidden?"show":"hide":val](prop);else{var parts=val.toString().match(/^([+-]=)?([\d+-.]+)(.*)$/),start=e.cur(true)||0;if(parts){var end=parseFloat(parts[2]),unit=parts[3]||"px";if(unit!="px"){self.style[name]=(end||1)+unit;start=((end||1)/e.cur(true))*start;self.style[name]=start+unit;}if(parts[1])end=((parts[1]=="-="?-1:1)*end)+start;e.custom(start,end,unit);}else
-e.custom(start,val,"");}});return true;});},queue:function(type,fn){if(jQuery.isFunction(type)||(type&&type.constructor==Array)){fn=type;type="fx";}if(!type||(typeof type=="string"&&!fn))return queue(this[0],type);return this.each(function(){if(fn.constructor==Array)queue(this,type,fn);else{queue(this,type).push(fn);if(queue(this,type).length==1)fn.call(this);}});},stop:function(clearQueue,gotoEnd){var timers=jQuery.timers;if(clearQueue)this.queue([]);this.each(function(){for(var i=timers.length-1;i>=0;i--)if(timers[i].elem==this){if(gotoEnd)timers[i](true);timers.splice(i,1);}});if(!gotoEnd)this.dequeue();return this;}});var queue=function(elem,type,array){if(elem){type=type||"fx";var q=jQuery.data(elem,type+"queue");if(!q||array)q=jQuery.data(elem,type+"queue",jQuery.makeArray(array));}return q;};jQuery.fn.dequeue=function(type){type=type||"fx";return this.each(function(){var q=queue(this,type);q.shift();if(q.length)q[0].call(this);});};jQuery.extend({speed:function(speed,easing,fn){var opt=speed&&speed.constructor==Object?speed:{complete:fn||!fn&&easing||jQuery.isFunction(speed)&&speed,duration:speed,easing:fn&&easing||easing&&easing.constructor!=Function&&easing};opt.duration=(opt.duration&&opt.duration.constructor==Number?opt.duration:jQuery.fx.speeds[opt.duration])||jQuery.fx.speeds.def;opt.old=opt.complete;opt.complete=function(){if(opt.queue!==false)jQuery(this).dequeue();if(jQuery.isFunction(opt.old))opt.old.call(this);};return opt;},easing:{linear:function(p,n,firstNum,diff){return firstNum+diff*p;},swing:function(p,n,firstNum,diff){return((-Math.cos(p*Math.PI)/2)+0.5)*diff+firstNum;}},timers:[],timerId:null,fx:function(elem,options,prop){this.options=options;this.elem=elem;this.prop=prop;if(!options.orig)options.orig={};}});jQuery.fx.prototype={update:function(){if(this.options.step)this.options.step.call(this.elem,this.now,this);(jQuery.fx.step[this.prop]||jQuery.fx.step._default)(this);if(this.prop=="height"||this.prop=="width")this.elem.style.display="block";},cur:function(force){if(this.elem[this.prop]!=null&&this.elem.style[this.prop]==null)return this.elem[this.prop];var r=parseFloat(jQuery.css(this.elem,this.prop,force));return r&&r>-10000?r:parseFloat(jQuery.curCSS(this.elem,this.prop))||0;},custom:function(from,to,unit){this.startTime=now();this.start=from;this.end=to;this.unit=unit||this.unit||"px";this.now=this.start;this.pos=this.state=0;this.update();var self=this;function t(gotoEnd){return self.step(gotoEnd);}t.elem=this.elem;jQuery.timers.push(t);if(jQuery.timerId==null){jQuery.timerId=setInterval(function(){var timers=jQuery.timers;for(var i=0;i<timers.length;i++)if(!timers[i]())timers.splice(i--,1);if(!timers.length){clearInterval(jQuery.timerId);jQuery.timerId=null;}},13);}},show:function(){this.options.orig[this.prop]=jQuery.attr(this.elem.style,this.prop);this.options.show=true;this.custom(0,this.cur());if(this.prop=="width"||this.prop=="height")this.elem.style[this.prop]="1px";jQuery(this.elem).show();},hide:function(){this.options.orig[this.prop]=jQuery.attr(this.elem.style,this.prop);this.options.hide=true;this.custom(this.cur(),0);},step:function(gotoEnd){var t=now();if(gotoEnd||t>this.options.duration+this.startTime){this.now=this.end;this.pos=this.state=1;this.update();this.options.curAnim[this.prop]=true;var done=true;for(var i in this.options.curAnim)if(this.options.curAnim[i]!==true)done=false;if(done){if(this.options.display!=null){this.elem.style.overflow=this.options.overflow;this.elem.style.display=this.options.display;if(jQuery.css(this.elem,"display")=="none")this.elem.style.display="block";}if(this.options.hide)this.elem.style.display="none";if(this.options.hide||this.options.show)for(var p in this.options.curAnim)jQuery.attr(this.elem.style,p,this.options.orig[p]);}if(done)this.options.complete.call(this.elem);return false;}else{var n=t-this.startTime;this.state=n/this.options.duration;this.pos=jQuery.easing[this.options.easing||(jQuery.easing.swing?"swing":"linear")](this.state,n,0,1,this.options.duration);this.now=this.start+((this.end-this.start)*this.pos);this.update();}return true;}};jQuery.extend(jQuery.fx,{speeds:{slow:600,fast:200,def:400},step:{scrollLeft:function(fx){fx.elem.scrollLeft=fx.now;},scrollTop:function(fx){fx.elem.scrollTop=fx.now;},opacity:function(fx){jQuery.attr(fx.elem.style,"opacity",fx.now);},_default:function(fx){fx.elem.style[fx.prop]=fx.now+fx.unit;}}});jQuery.fn.offset=function(){var left=0,top=0,elem=this[0],results;if(elem)with(jQuery.browser){var parent=elem.parentNode,offsetChild=elem,offsetParent=elem.offsetParent,doc=elem.ownerDocument,safari2=safari&&parseInt(version)<522&&!/adobeair/i.test(userAgent),css=jQuery.curCSS,fixed=css(elem,"position")=="fixed";if(elem.getBoundingClientRect){var box=elem.getBoundingClientRect();add(box.left+Math.max(doc.documentElement.scrollLeft,doc.body.scrollLeft),box.top+Math.max(doc.documentElement.scrollTop,doc.body.scrollTop));add(-doc.documentElement.clientLeft,-doc.documentElement.clientTop);}else{add(elem.offsetLeft,elem.offsetTop);while(offsetParent){add(offsetParent.offsetLeft,offsetParent.offsetTop);if(mozilla&&!/^t(able|d|h)$/i.test(offsetParent.tagName)||safari&&!safari2)border(offsetParent);if(!fixed&&css(offsetParent,"position")=="fixed")fixed=true;offsetChild=/^body$/i.test(offsetParent.tagName)?offsetChild:offsetParent;offsetParent=offsetParent.offsetParent;}while(parent&&parent.tagName&&!/^body|html$/i.test(parent.tagName)){if(!/^inline|table.*$/i.test(css(parent,"display")))add(-parent.scrollLeft,-parent.scrollTop);if(mozilla&&css(parent,"overflow")!="visible")border(parent);parent=parent.parentNode;}if((safari2&&(fixed||css(offsetChild,"position")=="absolute"))||(mozilla&&css(offsetChild,"position")!="absolute"))add(-doc.body.offsetLeft,-doc.body.offsetTop);if(fixed)add(Math.max(doc.documentElement.scrollLeft,doc.body.scrollLeft),Math.max(doc.documentElement.scrollTop,doc.body.scrollTop));}results={top:top,left:left};}function border(elem){add(jQuery.curCSS(elem,"borderLeftWidth",true),jQuery.curCSS(elem,"borderTopWidth",true));}function add(l,t){left+=parseInt(l,10)||0;top+=parseInt(t,10)||0;}return results;};jQuery.fn.extend({position:function(){var left=0,top=0,results;if(this[0]){var offsetParent=this.offsetParent(),offset=this.offset(),parentOffset=/^body|html$/i.test(offsetParent[0].tagName)?{top:0,left:0}:offsetParent.offset();offset.top-=num(this,'marginTop');offset.left-=num(this,'marginLeft');parentOffset.top+=num(offsetParent,'borderTopWidth');parentOffset.left+=num(offsetParent,'borderLeftWidth');results={top:offset.top-parentOffset.top,left:offset.left-parentOffset.left};}return results;},offsetParent:function(){var offsetParent=this[0].offsetParent;while(offsetParent&&(!/^body|html$/i.test(offsetParent.tagName)&&jQuery.css(offsetParent,'position')=='static'))offsetParent=offsetParent.offsetParent;return jQuery(offsetParent);}});jQuery.each(['Left','Top'],function(i,name){var method='scroll'+name;jQuery.fn[method]=function(val){if(!this[0])return;return val!=undefined?this.each(function(){this==window||this==document?window.scrollTo(!i?val:jQuery(window).scrollLeft(),i?val:jQuery(window).scrollTop()):this[method]=val;}):this[0]==window||this[0]==document?self[i?'pageYOffset':'pageXOffset']||jQuery.boxModel&&document.documentElement[method]||document.body[method]:this[0][method];};});jQuery.each(["Height","Width"],function(i,name){var tl=i?"Left":"Top",br=i?"Right":"Bottom";jQuery.fn["inner"+name]=function(){return this[name.toLowerCase()]()+num(this,"padding"+tl)+num(this,"padding"+br);};jQuery.fn["outer"+name]=function(margin){return this["inner"+name]()+num(this,"border"+tl+"Width")+num(this,"border"+br+"Width")+(margin?num(this,"margin"+tl)+num(this,"margin"+br):0);};});})();
\ No newline at end of file
diff --git a/doc/_themes/pysidedocs/static/pysidedocs.css b/doc/_themes/pysidedocs/static/pysidedocs.css
index 2d99138..1692dc3 100644
--- a/doc/_themes/pysidedocs/static/pysidedocs.css
+++ b/doc/_themes/pysidedocs/static/pysidedocs.css
@@ -19,7 +19,7 @@ strong {
     font-weight:bold;
 }
 
-#body {
+.document {
     padding-bottom: 90px;
 }
 
@@ -31,8 +31,8 @@ strong {
     background-color: white;
 }
 
-#footer {
-    position:absolute;
+.footer {
+    position: absolute;
     bottom: 0px;
     margin-top: 50px;
     text-align:center;
@@ -43,40 +43,40 @@ strong {
     width: 100%;
 }
 
-#footer img {
+.footer img {
     margin-left: 8px;
     margin-right: 8px;
 }
 
-#sidebar {
+.sphinxsidebar {
     float: left;
     width: 250px;
     padding: 0px 10px 0px 10px;
     text-align: left;
 }
 
-#sidebar ul {
+.sphinxsidebar ul {
     padding: 0px;
     margin: 0px;
     list-style-position: inside;
 }
 
-#sidebar > ul {
+.sphinxsidebar > ul {
     padding: 0px;
     margin: 0px;
 }
 
-#sidebar ul li {
+.sphinxsidebar ul li {
     margin-left: 10px;
     padding: 0px;
 }
 
-#sidebar h3, #sidebar h3 a {
+.sphinxsidebar h3, .sphinxsidebar h3 a {
     font-weight: bold;
     color: #333;
 }
 
-#body > div.section {
+.documentwrapper {
     margin-left: 270px;
     text-align: left;
     background-color: #ffffff;
@@ -92,7 +92,7 @@ h1 {
     padding-bottom: 15px;
     padding-top: 15px;
     border-bottom: 1px solid #c2c2c2;
-    text-transform:uppercase;
+/*     text-transform:uppercase; */
     margin-right: -100px;
     position: relative;
     left: -50px;
@@ -136,8 +136,23 @@ pre * {
     font: 100% monospace;
 }
 
+.pre {
+    font: 100% monospace;
+}
+
 .headerlink {
-    display: none;
+    font-size: 100%;
+    color: inherit;
+    float: right;
+    visibility: Hidden
+}
+
+h1 .headerlink {
+    padding-right: 50px;
+}
+
+h1:hover .headerlink, h2:hover .headerlink, h3:hover .headerlink {
+    visibility: Visible;
 }
 
 a, a:visited {
@@ -250,26 +265,24 @@ hr {
 }
 
 /******************* TOPO *****************************/
-#header {
+.header {
     background-image: url(bg_topo.jpg);
     background-repeat: repeat-x;
     height: 147px;
 }
 
-#header_container {
+.header_container {
     background-image: url(bg_header.png);
     background-repeat: no-repeat;
     background-position: 100px 0px;
 }
 
-#logo {
-    background-image: url(pysidelogo.png);
-    background-repeat: no-repeat;
-/*     background-position: 0px 4px; */
-    height: 112px;
+.logo {
+    text-align: left;
+    margin-bottom: 10px;
 }
 
-#search_box {
+#searchbox {
     border-top: 1px solid #989898;
     padding-top: 10px;
     margin-left: -10px;
@@ -337,31 +350,39 @@ em {
 
 /********   REL bar     *********/
 
-#relbar {
-    padding: 0px 10px 0px 10px;
+.related {
+    display: inline;
+}
+
+.related ul {
+    padding: 0px 0px 0px 10px;
     margin: 0px;
     text-align: left;
     background-image: url(relbar_bg.png);
 }
 
-#relbar li {
+.related li {
     display: inline;
     color: white;
     font-weight: bold;
 }
 
-#relbar li a {
+.related li a {
     color: inherit;
     line-height: 35px;
     font-weight: bold;
     vertical-align: middle;
 }
 
-#relbar li.right {
+.related li.right {
     float: right;
     margin-right: 5px;
 }
 
+.related h3 {
+    display: none;
+}
+
 .align-center {
     text-align: center;
 }
@@ -400,13 +421,57 @@ table.footnote {
 }
 
 tt.descname {
+    font-size: 120%;
     font-weight: bold;
 }
 
-dl.method {
-    border-top: 1px solid #c2c2c2;
-    margin-right: -100px;
-    position: relative;
-    left: -50px;
-    padding: 10px 50px 0px 50px;
+#functions ul, #virtual-functions ul, #slots ul, #signals ul, #static-functions ul {
+    list-style: none;
+    margin: 0px;
+    padding: 10px;
+    border: 1px solid #ddd;
+    background-color: #f4f4f4;
+    -moz-border-radius:10px;
+    -webkit-border-radius:10px;
+    -khtml-border-radius:10px;
 }
+
+#synopsis span.pre {
+    color: #009491;
+    font-weight: bolder;
+}
+
+#detailed-description .class dt, #detailed-description .method dt, #detailed-description .attribute dt  {
+    margin: 0px;
+    padding: 10px;
+    border: 1px solid #ddd;
+    background-color: #f4f4f4;
+    -moz-border-radius:10px;
+    -webkit-border-radius:10px;
+    -khtml-border-radius:10px;
+}
+
+.pysidetoc ul {
+    list-style: none;
+    padding: 0px;
+    margin: 0px;
+}
+
+.pysidetoc em {
+    font-style: normal;
+}
+
+.pysidetoc strong {
+    display: block;
+    padding: 5px;
+    border: 1px solid #ddd;
+    background-color: #f4f4f4;
+    -moz-border-radius:6px;
+    -webkit-border-radius:6px;
+    -khtml-border-radius:6px;
+}
+
+.hide {
+    display: none;
+}
+
diff --git a/doc/_themes/pysidedocs/static/searchtools.js b/doc/_themes/pysidedocs/static/searchtools.js
deleted file mode 100644
index e022625..0000000
--- a/doc/_themes/pysidedocs/static/searchtools.js
+++ /dev/null
@@ -1,467 +0,0 @@
-/**
- * helper function to return a node containing the
- * search summary for a given text. keywords is a list
- * of stemmed words, hlwords is the list of normal, unstemmed
- * words. the first one is used to find the occurance, the
- * latter for highlighting it.
- */
-
-jQuery.makeSearchSummary = function(text, keywords, hlwords) {
-  var textLower = text.toLowerCase();
-  var start = 0;
-  $.each(keywords, function() {
-    var i = textLower.indexOf(this.toLowerCase());
-    if (i > -1)
-      start = i;
-  });
-  start = Math.max(start - 120, 0);
-  var excerpt = ((start > 0) ? '...' : '') +
-  $.trim(text.substr(start, 240)) +
-  ((start + 240 - text.length) ? '...' : '');
-  var rv = $('<div class="context"></div>').text(excerpt);
-  $.each(hlwords, function() {
-    rv = rv.highlightText(this, 'highlight');
-  });
-  return rv;
-}
-
-/**
- * Porter Stemmer
- */
-var PorterStemmer = function() {
-
-  var step2list = {
-    ational: 'ate',
-    tional: 'tion',
-    enci: 'ence',
-    anci: 'ance',
-    izer: 'ize',
-    bli: 'ble',
-    alli: 'al',
-    entli: 'ent',
-    eli: 'e',
-    ousli: 'ous',
-    ization: 'ize',
-    ation: 'ate',
-    ator: 'ate',
-    alism: 'al',
-    iveness: 'ive',
-    fulness: 'ful',
-    ousness: 'ous',
-    aliti: 'al',
-    iviti: 'ive',
-    biliti: 'ble',
-    logi: 'log'
-  };
-
-  var step3list = {
-    icate: 'ic',
-    ative: '',
-    alize: 'al',
-    iciti: 'ic',
-    ical: 'ic',
-    ful: '',
-    ness: ''
-  };
-
-  var c = "[^aeiou]";          // consonant
-  var v = "[aeiouy]";          // vowel
-  var C = c + "[^aeiouy]*";    // consonant sequence
-  var V = v + "[aeiou]*";      // vowel sequence
-
-  var mgr0 = "^(" + C + ")?" + V + C;                      // [C]VC... is m>0
-  var meq1 = "^(" + C + ")?" + V + C + "(" + V + ")?$";    // [C]VC[V] is m=1
-  var mgr1 = "^(" + C + ")?" + V + C + V + C;              // [C]VCVC... is m>1
-  var s_v   = "^(" + C + ")?" + v;                         // vowel in stem
-
-  this.stemWord = function (w) {
-    var stem;
-    var suffix;
-    var firstch;
-    var origword = w;
-
-    if (w.length < 3)
-      return w;
-
-    var re;
-    var re2;
-    var re3;
-    var re4;
-
-    firstch = w.substr(0,1);
-    if (firstch == "y")
-      w = firstch.toUpperCase() + w.substr(1);
-
-    // Step 1a
-    re = /^(.+?)(ss|i)es$/;
-    re2 = /^(.+?)([^s])s$/;
-
-    if (re.test(w))
-      w = w.replace(re,"$1$2");
-    else if (re2.test(w))
-      w = w.replace(re2,"$1$2");
-
-    // Step 1b
-    re = /^(.+?)eed$/;
-    re2 = /^(.+?)(ed|ing)$/;
-    if (re.test(w)) {
-      var fp = re.exec(w);
-      re = new RegExp(mgr0);
-      if (re.test(fp[1])) {
-        re = /.$/;
-        w = w.replace(re,"");
-      }
-    }
-    else if (re2.test(w)) {
-      var fp = re2.exec(w);
-      stem = fp[1];
-      re2 = new RegExp(s_v);
-      if (re2.test(stem)) {
-        w = stem;
-        re2 = /(at|bl|iz)$/;
-        re3 = new RegExp("([^aeiouylsz])\\1$");
-        re4 = new RegExp("^" + C + v + "[^aeiouwxy]$");
-        if (re2.test(w))
-          w = w + "e";
-        else if (re3.test(w)) {
-          re = /.$/;
-          w = w.replace(re,"");
-        }
-        else if (re4.test(w))
-          w = w + "e";
-      }
-    }
-
-    // Step 1c
-    re = /^(.+?)y$/;
-    if (re.test(w)) {
-      var fp = re.exec(w);
-      stem = fp[1];
-      re = new RegExp(s_v);
-      if (re.test(stem))
-        w = stem + "i";
-    }
-
-    // Step 2
-    re = /^(.+?)(ational|tional|enci|anci|izer|bli|alli|entli|eli|ousli|ization|ation|ator|alism|iveness|fulness|ousness|aliti|iviti|biliti|logi)$/;
-    if (re.test(w)) {
-      var fp = re.exec(w);
-      stem = fp[1];
-      suffix = fp[2];
-      re = new RegExp(mgr0);
-      if (re.test(stem))
-        w = stem + step2list[suffix];
-    }
-
-    // Step 3
-    re = /^(.+?)(icate|ative|alize|iciti|ical|ful|ness)$/;
-    if (re.test(w)) {
-      var fp = re.exec(w);
-      stem = fp[1];
-      suffix = fp[2];
-      re = new RegExp(mgr0);
-      if (re.test(stem))
-        w = stem + step3list[suffix];
-    }
-
-    // Step 4
-    re = /^(.+?)(al|ance|ence|er|ic|able|ible|ant|ement|ment|ent|ou|ism|ate|iti|ous|ive|ize)$/;
-    re2 = /^(.+?)(s|t)(ion)$/;
-    if (re.test(w)) {
-      var fp = re.exec(w);
-      stem = fp[1];
-      re = new RegExp(mgr1);
-      if (re.test(stem))
-        w = stem;
-    }
-    else if (re2.test(w)) {
-      var fp = re2.exec(w);
-      stem = fp[1] + fp[2];
-      re2 = new RegExp(mgr1);
-      if (re2.test(stem))
-        w = stem;
-    }
-
-    // Step 5
-    re = /^(.+?)e$/;
-    if (re.test(w)) {
-      var fp = re.exec(w);
-      stem = fp[1];
-      re = new RegExp(mgr1);
-      re2 = new RegExp(meq1);
-      re3 = new RegExp("^" + C + v + "[^aeiouwxy]$");
-      if (re.test(stem) || (re2.test(stem) && !(re3.test(stem))))
-        w = stem;
-    }
-    re = /ll$/;
-    re2 = new RegExp(mgr1);
-    if (re.test(w) && re2.test(w)) {
-      re = /.$/;
-      w = w.replace(re,"");
-    }
-
-    // and turn initial Y back to y
-    if (firstch == "y")
-      w = firstch.toLowerCase() + w.substr(1);
-    return w;
-  }
-}
-
-
-/**
- * Search Module
- */
-var Search = {
-
-  _index : null,
-  _queued_query : null,
-  _pulse_status : -1,
-
-  init : function() {
-      var params = $.getQueryParameters();
-      if (params.q) {
-          var query = params.q[0];
-          $('input[name="q"]')[0].value = query;
-          this.performSearch(query);
-      }
-  },
-
-  /**
-   * Sets the index
-   */
-  setIndex : function(index) {
-    var q;
-    this._index = index;
-    if ((q = this._queued_query) !== null) {
-      this._queued_query = null;
-      Search.query(q);
-    }
-  },
-
-  hasIndex : function() {
-      return this._index !== null;
-  },
-
-  deferQuery : function(query) {
-      this._queued_query = query;
-  },
-
-  stopPulse : function() {
-      this._pulse_status = 0;
-  },
-
-  startPulse : function() {
-    if (this._pulse_status >= 0)
-        return;
-    function pulse() {
-      Search._pulse_status = (Search._pulse_status + 1) % 4;
-      var dotString = '';
-      for (var i = 0; i < Search._pulse_status; i++)
-        dotString += '.';
-      Search.dots.text(dotString);
-      if (Search._pulse_status > -1)
-        window.setTimeout(pulse, 500);
-    };
-    pulse();
-  },
-
-  /**
-   * perform a search for something
-   */
-  performSearch : function(query) {
-    // create the required interface elements
-    this.out = $('#search-results');
-    this.title = $('<h2>' + _('Searching') + '</h2>').appendTo(this.out);
-    this.dots = $('<span></span>').appendTo(this.title);
-    this.status = $('<p style="display: none"></p>').appendTo(this.out);
-    this.output = $('<ul class="search"/>').appendTo(this.out);
-
-    $('#search-progress').text(_('Preparing search...'));
-    this.startPulse();
-
-    // index already loaded, the browser was quick!
-    if (this.hasIndex())
-      this.query(query);
-    else
-      this.deferQuery(query);
-  },
-
-  query : function(query) {
-    // stem the searchterms and add them to the
-    // correct list
-    var stemmer = new PorterStemmer();
-    var searchterms = [];
-    var excluded = [];
-    var hlterms = [];
-    var tmp = query.split(/\s+/);
-    var object = (tmp.length == 1) ? tmp[0].toLowerCase() : null;
-    for (var i = 0; i < tmp.length; i++) {
-      // stem the word
-      var word = stemmer.stemWord(tmp[i]).toLowerCase();
-      // select the correct list
-      if (word[0] == '-') {
-        var toAppend = excluded;
-        word = word.substr(1);
-      }
-      else {
-        var toAppend = searchterms;
-        hlterms.push(tmp[i].toLowerCase());
-      }
-      // only add if not already in the list
-      if (!$.contains(toAppend, word))
-        toAppend.push(word);
-    };
-    var highlightstring = '?highlight=' + $.urlencode(hlterms.join(" "));
-
-    console.debug('SEARCH: searching for:');
-    console.info('required: ', searchterms);
-    console.info('excluded: ', excluded);
-
-    // prepare search
-    var filenames = this._index.filenames;
-    var titles = this._index.titles;
-    var terms = this._index.terms;
-    var descrefs = this._index.descrefs;
-    var modules = this._index.modules;
-    var desctypes = this._index.desctypes;
-    var fileMap = {};
-    var files = null;
-    var objectResults = [];
-    var regularResults = [];
-    $('#search-progress').empty();
-
-    // lookup as object
-    if (object != null) {
-      for (var module in modules) {
-        if (module.indexOf(object) > -1) {
-          fn = modules[module];
-          descr = _('module, in ') + titles[fn];
-          objectResults.push([filenames[fn], module, '#module-'+module, descr]);
-        }
-      }
-      for (var prefix in descrefs) {
-        for (var name in descrefs[prefix]) {
-          var fullname = (prefix ? prefix + '.' : '') + name;
-          if (fullname.toLowerCase().indexOf(object) > -1) {
-            match = descrefs[prefix][name];
-            descr = desctypes[match[1]] + _(', in ') + titles[match[0]];
-            objectResults.push([filenames[match[0]], fullname, '#'+fullname, descr]);
-          }
-        }
-      }
-    }
-
-    // sort results descending
-    objectResults.sort(function(a, b) {
-      return (a[1] > b[1]) ? -1 : ((a[1] < b[1]) ? 1 : 0);
-    });
-
-
-    // perform the search on the required terms
-    for (var i = 0; i < searchterms.length; i++) {
-      var word = searchterms[i];
-      // no match but word was a required one
-      if ((files = terms[word]) == null)
-        break;
-      if (files.length == undefined) {
-        files = [files];
-      }
-      // create the mapping
-      for (var j = 0; j < files.length; j++) {
-        var file = files[j];
-        if (file in fileMap)
-          fileMap[file].push(word);
-        else
-          fileMap[file] = [word];
-      }
-    }
-
-    // now check if the files don't contain excluded terms
-    for (var file in fileMap) {
-      var valid = true;
-
-      // check if all requirements are matched
-      if (fileMap[file].length != searchterms.length)
-        continue;
-
-      // ensure that none of the excluded terms is in the
-      // search result.
-      for (var i = 0; i < excluded.length; i++) {
-        if (terms[excluded[i]] == file ||
-            $.contains(terms[excluded[i]] || [], file)) {
-          valid = false;
-          break;
-        }
-      }
-
-      // if we have still a valid result we can add it
-      // to the result list
-      if (valid)
-        regularResults.push([filenames[file], titles[file], '', null]);
-    }
-
-    // delete unused variables in order to not waste
-    // memory until list is retrieved completely
-    delete filenames, titles, terms;
-
-    // now sort the regular results descending by title
-    regularResults.sort(function(a, b) {
-      var left = a[1].toLowerCase();
-      var right = b[1].toLowerCase();
-      return (left > right) ? -1 : ((left < right) ? 1 : 0);
-    });
-
-    // combine both
-    var results = regularResults.concat(objectResults);
-
-    // print the results
-    var resultCount = results.length;
-    function displayNextItem() {
-      // results left, load the summary and display it
-      if (results.length) {
-        var item = results.pop();
-        var listItem = $('<li style="display:none"></li>');
-        listItem.append($('<a/>').attr(
-          'href',
-          item[0] + DOCUMENTATION_OPTIONS.FILE_SUFFIX +
-          highlightstring + item[2]).html(item[1]));
-        if (item[3]) {
-          listItem.append($('<span> (' + item[3] + ')</span>'));
-          Search.output.append(listItem);
-          listItem.slideDown(5, function() {
-            displayNextItem();
-          });
-        } else if (DOCUMENTATION_OPTIONS.HAS_SOURCE) {
-          $.get('_sources/' + item[0] + '.txt', function(data) {
-            listItem.append($.makeSearchSummary(data, searchterms, hlterms));
-            Search.output.append(listItem);
-            listItem.slideDown(5, function() {
-              displayNextItem();
-            });
-          });
-        } else {
-          // no source available, just display title
-          Search.output.append(listItem);
-          listItem.slideDown(5, function() {
-            displayNextItem();
-          });
-        }
-      }
-      // search finished, update title and status message
-      else {
-        Search.stopPulse();
-        Search.title.text(_('Search Results'));
-        if (!resultCount)
-          Search.status.text(_('Your search did not match any documents. Please make sure that all words are spelled correctly and that you\'ve selected enough categories.'));
-        else
-            Search.status.text(_('Search finished, found %s page(s) matching the search query.').replace('%s', resultCount));
-        Search.status.fadeIn(500);
-      }
-    }
-    displayNextItem();
-  }
-}
-
-$(document).ready(function() {
-  Search.init();
-});
diff --git a/doc/_themes/pysidedocs/theme.conf b/doc/_themes/pysidedocs/theme.conf
index d1fe6d1..e0a652a 100644
--- a/doc/_themes/pysidedocs/theme.conf
+++ b/doc/_themes/pysidedocs/theme.conf
@@ -1,6 +1,6 @@
 [theme]
-inherit = none
-stylesheet = basic.css
+inherit = default
+stylesheet = pysidedocs.css
 pygments_style = none
 
 [options]
diff --git a/doc/codesnippets/doc/src/snippets/audio/main.cpp b/doc/codesnippets/doc/src/snippets/audio/main.cpp
new file mode 100644
index 0000000..5b3e9eb
--- /dev/null
+++ b/doc/codesnippets/doc/src/snippets/audio/main.cpp
@@ -0,0 +1,55 @@
+
+class Window2 (QWidget):
+//![0]
+    @Slot(QAudio.State)
+    def stateChanged(self, newState):
+        if newState == QAudio.StopState:
+            if self.input.error() != QAudio.NoError:
+                # Error handling
+//![0]
+
+class Window (QWidget):
+    def __init__(self):
+        QWidget.__init__(self)
+        self.output = QAudioOutput()
+        self.output.stateChanged[QAudio.State].connect(self.stateChanged)
+
+    def setupFormat(self):
+//![1]
+        format = QAudioFormat()
+        format.setFrequency(44100)
+//![1]
+        format.setChannels(2)
+        format.setSampleSize(16)
+        format.setCodec("audio/pcm")
+        format.setByteOrder(QAudioFormat.LittleEndian)
+//![2]
+        format.setSampleType(QAudioFormat.SignedInt)
+
+        info = QAudioDeviceInfo(QAudioDeviceInfo.defaultOutputDevice())
+
+        if not info.isFormatSupported(format):
+            format = info.nearestFormat(format)
+//![2]
+
+//![3]
+    @Slot(QAudio.State)
+    def stateChanged(self, newState):
+        if newState == QAudio.StopState:
+            if self.output.error() != QAudio.NoError:
+                # Perform error handling
+            else:
+                # Normal stop
+//![3]
+
+        # Handle
+        elif newState == QAudio.ActiveState:
+            # Handle active state...
+
+app = QApplication(sys.argv)
+
+window = Window()
+window.show()
+sys.exit(app.exec_())
+
+
diff --git a/doc/codesnippets/doc/src/snippets/brush/brush.pro b/doc/codesnippets/doc/src/snippets/brush/brush.pro
deleted file mode 100644
index 6a5f0da..0000000
--- a/doc/codesnippets/doc/src/snippets/brush/brush.pro
+++ /dev/null
@@ -1 +0,0 @@
-SOURCES += brush.cpp
diff --git a/doc/codesnippets/doc/src/snippets/brushstyles/brushstyles.pro b/doc/codesnippets/doc/src/snippets/brushstyles/brushstyles.pro
deleted file mode 100644
index 80de531..0000000
--- a/doc/codesnippets/doc/src/snippets/brushstyles/brushstyles.pro
+++ /dev/null
@@ -1,12 +0,0 @@
-######################################################################
-# Automatically generated by qmake (2.00a) Wed Dec 14 11:46:57 2005
-######################################################################
-
-TEMPLATE = app
-TARGET += 
-DEPENDPATH += .
-INCLUDEPATH += .
-
-# Input
-HEADERS += renderarea.h stylewidget.h
-SOURCES += main.cpp renderarea.cpp stylewidget.cpp
diff --git a/doc/codesnippets/doc/src/snippets/buffer/buffer.pro b/doc/codesnippets/doc/src/snippets/buffer/buffer.pro
deleted file mode 100644
index 87eab9f..0000000
--- a/doc/codesnippets/doc/src/snippets/buffer/buffer.pro
+++ /dev/null
@@ -1,14 +0,0 @@
-######################################################################
-# Automatically generated by qmake (1.08a) Tue Jan 4 13:19:41 2005
-######################################################################
-
-TEMPLATE = app
-CONFIG -= moc
-DEPENDPATH += .
-INCLUDEPATH += .
-
-# Input
-SOURCES += buffer.cpp
-CONFIG += qt warn_on debug  create_prl link_prl
-OBJECTS_DIR=.obj/debug-shared
-MOC_DIR=.moc/debug-shared
diff --git a/doc/codesnippets/doc/src/snippets/clipboard/clipboard.pro b/doc/codesnippets/doc/src/snippets/clipboard/clipboard.pro
deleted file mode 100644
index a26fea6..0000000
--- a/doc/codesnippets/doc/src/snippets/clipboard/clipboard.pro
+++ /dev/null
@@ -1,3 +0,0 @@
-HEADERS     = clipwindow.h
-SOURCES     = clipwindow.cpp \
-              main.cpp
diff --git a/doc/codesnippets/doc/src/snippets/code/doc.src.qtscripttools.qdoc b/doc/codesnippets/doc/src/snippets/code/doc.src.qtscripttools.qdoc
deleted file mode 100644
index c691f17..0000000
--- a/doc/codesnippets/doc/src/snippets/code/doc.src.qtscripttools.qdoc
+++ /dev/null
@@ -1,8 +0,0 @@
-//! [0]
-      #include <QtScriptTools>
-//! [0]
-
-
-//! [1]
-      QT += scripttools
-//! [1]
diff --git a/doc/codesnippets/doc/src/snippets/code/doc_src_activeqt-dumpcpp.qdoc b/doc/codesnippets/doc/src/snippets/code/doc_src_activeqt-dumpcpp.qdoc
deleted file mode 100644
index df1d542..0000000
--- a/doc/codesnippets/doc/src/snippets/code/doc_src_activeqt-dumpcpp.qdoc
+++ /dev/null
@@ -1,25 +0,0 @@
-//! [0]
-Outlook::Application *outlook = new Outlook::Application;
-//! [0]
-
-
-//! [1]
-Outlook::_NameSpace *session = outlook->Session();
-//! [1]
-
-
-//! [2]
-Outlook::NameSpace *session = outlook->Session();
-//! [2]
-
-
-//! [3]
-Outlook::_NameSpace *tmp = outlook->Session();
-Outlook::NameSpace *session = new Outlook::NameSpace(tmp);
-delete tmp; // or any other use of tmp: segfault
-//! [3]
-
-
-//! [4]
-Outlook::NameSpace *session = new Outlook::NameSpace(outlook->Session()); 
-//! [4]
diff --git a/doc/codesnippets/doc/src/snippets/code/doc_src_appicon.qdoc b/doc/codesnippets/doc/src/snippets/code/doc_src_appicon.qdoc
deleted file mode 100644
index c8883fe..0000000
--- a/doc/codesnippets/doc/src/snippets/code/doc_src_appicon.qdoc
+++ /dev/null
@@ -1,23 +0,0 @@
-//! [0]
-IDI_ICON1               ICON    DISCARDABLE     "myappico.ico"
-//! [0]
-
-
-//! [1]
-RC_FILE = myapp.rc
-//! [1]
-
-
-//! [2]
-ICON = myapp.icns
-//! [2]
-
-
-//! [3]
-kde-config --path icon
-//! [3]
-
-
-//! [4]
-gnome-config --datadir
-//! [4]
diff --git a/doc/codesnippets/doc/src/snippets/code/doc_src_assistant-manual.qdoc b/doc/codesnippets/doc/src/snippets/code/doc_src_assistant-manual.qdoc
deleted file mode 100644
index 383bd61..0000000
--- a/doc/codesnippets/doc/src/snippets/code/doc_src_assistant-manual.qdoc
+++ /dev/null
@@ -1,110 +0,0 @@
-//! [0]
-assistant -collectionFile file
-//! [0]
-
-
-//! [1]
-<?xml version="1.0" encoding="utf-8" ?>
-<QHelpCollectionProject version="1.0">
-    <assistant>
-        <title>My Application Help</title>
-        <startPage>qthelp://com.mycompany.1_0_0/doc/index.html</startPage>
-        <currentFilter>myfilter</currentFilter>
-        <applicationIcon>application.png</applicationIcon>
-        <enableFilterFunctionality>false</enableFilterFunctionality>
-        <enableDocumentationManager>false</enableDocumentationManager>
-        <enableAddressBar visible="true">true</enableAddressBar>
-        <cacheDirectory>mycompany/myapplication</cacheDirectory>
-        <aboutMenuText>
-            <text>About My Application</text>
-            <text language="de">Über meine Applikation...</text>
-        </aboutMenuText>
-        <aboutDialog>
-            <file>about.txt</file>
-            <file language="de">ueber.txt</file>
-            <icon>about.png</icon>
-        </aboutDialog>
-    </assistant>
-    <docFiles>
-        <generate>
-            <file>
-                <input>myapplication-manual.qhp</input>
-                <output>myapplication-manual.qch</output>
-            </file>
-        </generate>
-        <register>
-            <file>myapplication-manual.qch</file>
-        </register>
-    </docFiles>
-</QHelpCollectionProject>
-//! [1]
-
-
-//! [2]
-QProcess *process = new QProcess;
-QStringList args;
-args << QLatin1String("-collectionFile")
-    << QLatin1String("mycollection.qhc")
-    << QLatin1String("-enableRemoteControl");
-process->start(QLatin1String("assistant"), args);
-if (!process->waitForStarted())
-    return;
-//! [2]
-
-
-//! [3]
-QByteArray ba;
-ba.append("setSource qthelp://com.mycompany.1_0_0/doc/index.html");
-ba.append('\0');
-process->write(ba);
-//! [3]
-
-
-//! [4]
-QByteArray ba;
-ba.append("hide bookmarks;");
-ba.append("hide index;");
-ba.append("setSource qthelp://com.mycompany.1_0_0/doc/index.html");
-ba.append('\0');
-process->write(ba);
-//! [4]
-
-//! [5]
-<?xml version="1.0" encoding="utf-8" ?>
-<QHelpCollectionProject version="1.0">
-    ...
-    <docFiles>
-        <register>
-            <file>myapplication-manual.qch</file>
-            <file>another-manual.qch</file>
-        </register>
-    </docFiles>
-</QHelpCollectionProject>
-//! [5]
-
-//! [6]
-assistant -collectionFile mycollection.qhc -register myapplication-manual.qch
-//! [6]
-
-//! [7]
-<?xml version="1.0" encoding="utf-8" ?>
-<QHelpCollectionProject version="1.0">
-    <assistant>
-        <title>My Application Help</title>
-        <cacheDirectory>mycompany/myapplication</cacheDirectory>
-        ...
-    </assistant>
-</QHelpCollectionProject>
-//! [7]
-
-//! [8]
-assistant -collectionFile mycollection.qhc
-//! [8]
-
-//! [9]
-%QDesktopServices::DataLocation%/mycompany/myapplication/mycollection.qhc
-//! [9]
-
-//! [10]
-qcollectiongenerator mycollection.qhcp -o mycollection.qhc
-//! [10]
diff --git a/doc/codesnippets/doc/src/snippets/code/doc_src_atomic-operations.qdoc b/doc/codesnippets/doc/src/snippets/code/doc_src_atomic-operations.qdoc
deleted file mode 100644
index acda5e4..0000000
--- a/doc/codesnippets/doc/src/snippets/code/doc_src_atomic-operations.qdoc
+++ /dev/null
@@ -1,71 +0,0 @@
-//! [0]
-if (*ptr == expected) {
-    *ptr = newval;
-    return !0;
-}
-return 0;
-//! [0]
-
-
-//! [1]
-if (*ptr == expected) {
-    *ptr = newval;
-    return !0;
-}
-return 0;
-//! [1]
-
-
-//! [2]
-++(*ptr);
-return *ptr ? !0 : 0;
-//! [2]
-
-
-//! [3]
-return ++(*ptr);
-//! [3]
-
-
-//! [4]
-++(*ptr);
-return !(ControlRegister & ZeroFlag);
-//! [4]
-
-
-//! [5]
---(*ptr);
-return *ptr ?  : 0;
-//! [5]
-
-
-//! [6]
-return --(*ptr);
-//! [6]
-
-
-//! [7]
---(*ptr);
-return !(ControlRegister & ZeroFlag);
-//! [7]
-
-
-//! [8]
-tmp = *ptr;
-*ptr = newval;
-return tmp;
-//! [8]
-
-
-//! [9]
-tmp = *ptr;
-*ptr = newval;
-return tmp;
-//! [9]
-
-
-//! [10]
-tmp = *ptr;
-*ptr += value;
-return tmp;
-//! [10]
diff --git a/doc/codesnippets/doc/src/snippets/code/doc_src_compiler-notes.qdoc b/doc/codesnippets/doc/src/snippets/code/doc_src_compiler-notes.qdoc
deleted file mode 100644
index 12095d0..0000000
--- a/doc/codesnippets/doc/src/snippets/code/doc_src_compiler-notes.qdoc
+++ /dev/null
@@ -1,8 +0,0 @@
-//! [0]
-QTDIR=C:\Progra~1\Qt
-//! [0]
-
-
-//! [1]
-/usr/vacpp/bin/makeC++SharedLib -o shr1.o cplussource1.o
-//! [1]
diff --git a/doc/codesnippets/doc/src/snippets/code/doc_src_containers.qdoc b/doc/codesnippets/doc/src/snippets/code/doc_src_containers.qdoc
deleted file mode 100644
index 9d6ba8d..0000000
--- a/doc/codesnippets/doc/src/snippets/code/doc_src_containers.qdoc
+++ /dev/null
@@ -1,235 +0,0 @@
-//! [0]
-class Employee
-{
-public:
-    Employee() {}
-    Employee(const Employee &other);
-
-    Employee &operator=(const Employee &other);
-
-private:
-    QString myName;
-    QDate myDateOfBirth;
-};
-//! [0]
-
-
-//! [1]
-QList<QString> list;
-list << "A" << "B" << "C" << "D";
-
-QListIterator<QString> i(list);
-while (i.hasNext())
-    qDebug() << i.next();
-//! [1]
-
-
-//! [2]
-QListIterator<QString> i(list);
-i.toBack();
-while (i.hasPrevious())
-    qDebug() << i.previous();
-//! [2]
-
-
-//! [3]
-QMutableListIterator<int> i(list);
-while (i.hasNext()) {
-    if (i.next() % 2 != 0)
-        i.remove();
-}
-//! [3]
-
-
-//! [4]
-QMutableListIterator<int> i(list);
-i.toBack();
-while (i.hasPrevious()) {
-    if (i.previous() % 2 != 0)
-        i.remove();
-}
-//! [4]
-
-
-//! [5]
-QMutableListIterator<int> i(list);
-while (i.hasNext()) {
-    if (i.next() > 128)
-        i.setValue(128);
-}
-//! [5]
-
-
-//! [6]
-QMutableListIterator<int> i(list);
-while (i.hasNext())
-    i.next() *= 2;
-//! [6]
-
-
-//! [7]
-QMap<QString, QString> map;
-map.insert("Paris", "France");
-map.insert("Guatemala City", "Guatemala");
-map.insert("Mexico City", "Mexico");
-map.insert("Moscow", "Russia");
-...
-
-QMutableMapIterator<QString, QString> i(map);
-while (i.hasNext()) {
-    if (i.next().key().endsWith("City"))
-        i.remove();
-}
-//! [7]
-
-
-//! [8]
-QMap<int, QWidget *> map;
-QHash<int, QWidget *> hash;
-
-QMapIterator<int, QWidget *> i(map);
-while (i.hasNext()) {
-    i.next();
-    hash.insert(i.key(), i.value());
-}
-//! [8]
-
-
-//! [9]
-QMutableMapIterator<int, QWidget *> i(map);
-while (i.findNext(widget))
-    i.remove();
-//! [9]
-
-
-//! [10]
-QList<QString> list;
-list << "A" << "B" << "C" << "D";
-
-QList<QString>::iterator i;
-for (i = list.begin(); i != list.end(); ++i)
-    *i = (*i).toLower();
-//! [10]
-
-
-//! [11]
-QList<QString> list;
-list << "A" << "B" << "C" << "D";
-
-QList<QString>::iterator i = list.end();
-while (i != list.begin()) {
-    --i;
-    *i = (*i).toLower();
-}
-//! [11]
-
-
-//! [12]
-QList<QString>::const_iterator i;
-for (i = list.constBegin(); i != list.constEnd(); ++i)
-    qDebug() << *i;
-//! [12]
-
-
-//! [13]
-QMap<int, int> map;
-...
-QMap<int, int>::const_iterator i;
-for (i = map.constBegin(); i != map.constEnd(); ++i)
-    qDebug() << i.key() << ":" << i.value();
-//! [13]
-
-
-//! [14]
-// RIGHT
-const QList<int> sizes = splitter->sizes();
-QList<int>::const_iterator i;
-for (i = sizes.begin(); i != sizes.end(); ++i)
-    ...
-
-// WRONG
-QList<int>::const_iterator i;
-for (i = splitter->sizes().begin();
-        i != splitter->sizes().end(); ++i)
-    ...
-//! [14]
-
-
-//! [15]
-QLinkedList<QString> list;
-...
-QString str;
-foreach (str, list)
-    qDebug() << str;
-//! [15]
-
-
-//! [16]
-QLinkedList<QString> list;
-...
-QLinkedListIterator<QString> i(list);
-while (i.hasNext())
-    qDebug() << i.next();
-//! [16]
-
-
-//! [17]
-QLinkedList<QString> list;
-...
-foreach (QString str, list)
-    qDebug() << str;
-//! [17]
-
-
-//! [18]
-QLinkedList<QString> list;
-...
-foreach (QString str, list) {
-    if (str.isEmpty())
-        break;
-    qDebug() << str;
-}
-//! [18]
-
-
-//! [19]
-QMap<QString, int> map;
-...
-foreach (QString str, map.keys())
-    qDebug() << str << ":" << map.value(str);
-//! [19]
-
-
-//! [20]
-QMultiMap<QString, int> map;
-...
-foreach (QString str, map.uniqueKeys()) {
-    foreach (int i, map.values(str))
-        qDebug() << str << ":" << i;
-}
-//! [20]
-
-
-//! [21]
-forever {
-    ...
-}
-//! [21]
-
-
-//! [22]
-CONFIG += no_keywords
-//! [22]
-
-
-//! [23]
-QString onlyLetters(const QString &in)
-{
-    QString out;
-    for (int j = 0; j < in.size(); ++j) {
-        if (in[j].isLetter())
-            out += in[j];
-    }
-    return out;
-}
-//! [23]
diff --git a/doc/codesnippets/doc/src/snippets/code/doc_src_coordsys.qdoc b/doc/codesnippets/doc/src/snippets/code/doc_src_coordsys.qdoc
deleted file mode 100644
index 4674e75..0000000
--- a/doc/codesnippets/doc/src/snippets/code/doc_src_coordsys.qdoc
+++ /dev/null
@@ -1,47 +0,0 @@
-//! [0]
-QPainter painter(this);
-
-painter.setPen(Qt::darkGreen);
-painter.drawRect(1, 2, 6, 4);
-//! [0]
-
-
-//! [1]
-QPainter painter(this);
-
-painter.setPen(Qt::darkGreen);
-painter.drawLine(2, 7, 6, 1);
-//! [1]
-
-
-//! [2]
-QPainter painter(this);
-painter.setRenderHint(
-    QPainter::Antialiasing);
-painter.setPen(Qt::darkGreen);
-painter.drawRect(1, 2, 6, 4);
-//! [2]
-
-
-//! [3]
-QPainter painter(this);
-painter.setRenderHint(
-    QPainter::Antialiasing);
-painter.setPen(Qt::darkGreen);
-painter.drawLine(2, 7, 6, 1);
-//! [3]
-
-
-//! [4]
-QPainter painter(this);
-painter.setWindow(QRect(-50, -50, 100, 100));
-//! [4]
-
-
-//! [5]
-int side = qMin(width(), height())
-int x = (width() - side / 2);
-int y = (height() - side / 2);
-
-painter.setViewport(x, y, side, side);
-//! [5]
diff --git a/doc/codesnippets/doc/src/snippets/code/doc_src_debug.qdoc b/doc/codesnippets/doc/src/snippets/code/doc_src_debug.qdoc
deleted file mode 100644
index 0e8a1c5..0000000
--- a/doc/codesnippets/doc/src/snippets/code/doc_src_debug.qdoc
+++ /dev/null
@@ -1,24 +0,0 @@
-//! [0]
-qDebug() << "Widget" << widget << "at position" << widget->pos();
-//! [0]
-
-
-//! [1]
-char *alloc(int size)
-{
-    Q_ASSERT(size > 0);
-    char *ptr = new char[size];
-    Q_CHECK_PTR(ptr);
-    return ptr;
-}
-//! [1]
-
-
-//! [2]
-char *alloc(int size)
-{
-    char *ptr;
-    Q_CHECK_PTR(ptr = new char[size]);  // WRONG
-    return ptr;
-}
-//! [2]
diff --git a/doc/codesnippets/doc/src/snippets/code/doc_src_deployment.qdoc b/doc/codesnippets/doc/src/snippets/code/doc_src_deployment.qdoc
deleted file mode 100644
index b8bf571..0000000
--- a/doc/codesnippets/doc/src/snippets/code/doc_src_deployment.qdoc
+++ /dev/null
@@ -1,414 +0,0 @@
-//! [0]
-cd /path/to/Qt
-./configure -static -prefix /path/to/Qt <other parameters>
-make sub-src
-//! [0]
-
-
-//! [1]
-cd /path/to/Qt/examples/tools/plugandpaint
-//! [1]
-
-
-//! [2]
-make clean
-PATH=/path/to/Qt/bin:$PATH
-export PATH
-qmake -config release
-make
-//! [2]
-
-
-//! [3]
-ldd ./application
-//! [3]
-
-
-//! [4]
-cd /path/to/Qt/examples/tools/plugandpaint
-//! [4]
-
-
-//! [5]
-make clean
-qmake -config release
-make
-//! [5]
-
-
-//! [6]
-cd ../plugandpaintplugins
-make clean
-qmake -config release
-make
-//! [6]
-
-
-//! [7]
-#!/bin/sh
-appname=`basename $0 | sed s,\.sh$,,`
-
-dirname=`dirname $0`
-tmp="${dirname#?}"
-
-if [ "${dirname%$tmp}" != "/" ]; then
-dirname=$PWD/$dirname
-fi
-LD_LIBRARY_PATH=$dirname
-export LD_LIBRARY_PATH
-$dirname/$appname $*
-//! [7]
-
-
-//! [8]
-DESTDIR = /path/to/Qt/plugandpaint/plugins
-//! [8]
-
-
-//! [9]
-qApp->addLibraryPath("/some/other/path");
-//! [9]
-
-
-//! [10]
-ldd ./application
-//! [10]
-
-
-//! [11]
-cd C:\path\to\Qt
-configure -static <any other options you need>
-//! [11]
-
-
-//! [12]
-nmake sub-src
-//! [12]
-
-
-//! [13]
-cd examples\tools\plugandpaint
-//! [13]
-
-
-//! [14]
-nmake clean
-qmake -config release
-nmake
-//! [14]
-
-
-//! [15]
-cd examples\tools\plugandpaint
-//! [15]
-
-
-//! [16]
-nmake clean
-qmake -config release
-nmake
-//! [16]
-
-
-//! [17]
-cd ..\plugandpaintplugins
-nmake clean
-qmake -config release
-nmake
-//! [17]
-
-
-//! [18]
-plugins\pnp_basictools.dll
-plugins\pnp_extrafilters.dll
-//! [18]
-
-
-//! [19]
-qApp->addLibraryPath("C:\some\other\path");
-//! [19]
-
-
-//! [20]
-embed_manifest_dll
-embed_manifest_exe
-//! [20]
-
-
-//! [21]
-CONFIG += embed_manifest_exe
-//! [21]
-
-
-//! [22]
-<Visual Studio Install Path>\VC\redist\<Architecture>\Microsoft.VC80.CRT
-//! [22]
-
-
-//! [23]
-CONFIG-=embed_manifest_dll
-//! [23]
-
-
-//! [24]
-depends <application executable>
-//! [24]
-
-
-//! [25]
-C:<path to Qt>\plugins
-//! [25]
-
-
-//! [26]
-CONFIG-=app_bundle
-//! [26]
-
-
-//! [27]
-cd /path/to/Qt
-./configure -static <other parameters>
-make sub-src
-//! [27]
-
-
-//! [28]
-cd /path/to/Qt/examples/tools/plugandpaint
-//! [28]
-
-
-//! [29]
-make clean
-qmake -config release
-make
-//! [29]
-
-
-//! [30]
-otool -L plugandpaint.app/Contents/MacOs/plugandpaint
-//! [30]
-
-
-//! [31]
-plugandpaint.app/Contents/MacOS/plugandpaint:
-/System/Library/Frameworks/Carbon.framework/Versions/A/Carbon
-        (compatibility version 2.0.0, current version 128.0.0)
-/System/Library/Frameworks/QuickTime.framework/Versions/A/QuickTime
-        (compatibility version 1.0.0, current version 10.0.0)
-/usr/lib/libz.1.dylib
-        (compatibility version 1.0.0, current version 1.2.3)
-/System/Library/Frameworks/ApplicationServices.framework/Versions/A/ApplicationServices
-        (compatibility version 1.0.0, current version 22.0.0)
-/usr/lib/libstdc++.6.dylib
-        (compatibility version 7.0.0, current version 7.3.0)
-/usr/lib/libgcc_s.1.dylib
-        (compatibility version 1.0.0, current version 1.0.0)
-/usr/lib/libmx.A.dylib
-        (compatibility version 1.0.0, current version 92.0.0)
-/usr/lib/libSystem.B.dylib
-        (compatibility version 1.0.0, current version 88.0.0)
-//! [31]
-
-
-//! [32]
--lQtGui
-//! [32]
-
-
-//! [33]
-/where/static/qt/lib/is/libQtGui.a
-//! [33]
-
-
-//! [34]
-cd /path/to/Qt/examples/tools/plugandpaint
-//! [34]
-
-
-//! [35]
-make clean
-qmake -config release
-make
-//! [35]
-
-
-//! [36]
-cd ../plugandpaintplugins
-make clean
-qmake -config release
-make
-//! [36]
-
-
-//! [37]
-otool -L QtGui.framework/QtGui
-//! [37]
-
-
-//! [38]
-QtGui.framework/QtGui:
-/path/to/Qt/lib/QtGui.framework/Versions/4.0/QtGui
-        (compatibility version 4.0.0, current version 4.0.1)
-/System/Library/Frameworks/Carbon.framework/Versions/A/Carbon
-        (compatibility version 2.0.0, current version 128.0.0)
-/System/Library/Frameworks/QuickTime.framework/Versions/A/QuickTime
-        (compatibility version 1.0.0, current version 10.0.0)
-/path/to/Qt/QtCore.framework/Versions/4.0/QtCore
-        (compatibility version 4.0.0, current version 4.0.1)
-/usr/lib/libz.1.dylib
-        (compatibility version 1.0.0, current version 1.2.3)
-/System/Library/Frameworks/ApplicationServices.framework/Versions/A/ApplicationServices
-        (compatibility version 1.0.0, current version 22.0.0)
-/usr/lib/libstdc++.6.dylib
-        (compatibility version 7.0.0, current version 7.3.0)
-/usr/lib/libgcc_s.1.dylib
-        (compatibility version 1.0.0, current version 1.0.0)
-/usr/lib/libmx.A.dylib
-        (compatibility version 1.0.0, current version 92.0.0)
-/usr/lib/libSystem.B.dylib
-        (compatibility version 1.0.0, current version 88.0.0)
-//! [38]
-
-
-//! [39]
-mkdir plugandpaint.app/Contents/Frameworks
-cp -R /path/to/Qt/lib/QtCore.framework
-        plugandpaint.app/Contents/Frameworks
-cp -R /path/to/Qt/lib/QtGui.framework
-       plugandpaint.app/Contents/Frameworks
-//! [39]
-
-
-//! [40]
-install_name_tool -id @executable_path/../Frameworks/QtCore.framework/Versions/4.0/QtCore
-       plugandpaint.app/Contents/Frameworks/QtCore.framework/Versions/4.0/QtCore
-install_name_tool -id @executable_path/../Frameworks/QtGui.framework/Versions/4.0/QtGui
-       plugandpaint.app/Contents/Frameworks/QtGui.framework/Versions/4.0/QtGui
-//! [40]
-
-
-//! [41]
-install_name_tool -change path/to/Qt/lib/QtCore.framework/Versions/4.0/QtCore
-        @executable_path/../Frameworks/QtCore.framework/Versions/4.0/QtCore
-        plugandpaint.app/Contents/MacOs/plugandpaint
-install_name_tool -change path/to/qt/lib/QtGui.framework/Versions/4.0/QtGui
-        @executable_path/../Frameworks/QtGui.framework/Versions/4.0/QtGui
-        plugandpaint.app/Contents/MacOs/plugandpaint
-//! [41]
-
-
-//! [42]
-install_name_tool -change path/to/Qt/lib/QtCore.framework/Versions/4.0/QtCore
-        @executable_path/../Frameworks/QtCore.framework/Versions/4.0/QtCore
-        plugandpaint.app/Contents/Frameworks/QtGui.framework/Versions/4.0/QtGui
-//! [42]
-
-
-//! [43]
-mv plugins plugandpaint.app/Contents
-//! [43]
-
-
-//! [44]
-libpnp_basictools.dylib:
-libpnp_basictools.dylib
-       (compatibility version 0.0.0, current version 0.0.0)
-/path/to/Qt/lib/QtGui.framework/Versions/4.0/QtGui
-       (compatibility version 4.0.0, current version 4.0.1)
-/System/Library/Frameworks/Carbon.framework/Versions/A/Carbon
-       (compatibility version 2.0.0, current version 128.0.0)
-/System/Library/Frameworks/QuickTime.framework/Versions/A/QuickTime
-       (compatibility version 1.0.0, current version 10.0.0)
-/path/to/Qt/lib/QtCore.framework/Versions/4.0/QtCore
-       (compatibility version 4.0.0, current version 4.0.1)
-/usr/lib/libz.1.dylib
-       (compatibility version 1.0.0, current version 1.2.3)
-/System/Library/Frameworks/ApplicationServices.framework/Versions/A/ApplicationServices
-       (compatibility version 1.0.0, current version 22.0.0)
-/usr/lib/libstdc++.6.dylib
-       (compatibility version 7.0.0, current version 7.3.0)
-/usr/lib/libgcc_s.1.dylib
-       (compatibility version 1.0.0, current version 1.0.0)
-/usr/lib/libmx.A.dylib
-       (compatibility version 1.0.0, current version 92.0.0)
-/usr/lib/libSystem.B.dylib
-       (compatibility version 1.0.0, current version 88.0.0)
-//! [44]
-
-
-//! [45]
-install_name_tool -change /path/to/Qt/lib/QtCore.framework/Versions/4.0/QtCore
-        @executable_path/../Frameworks/QtCore.framework/Versions/4.0/QtCore
-        plugandpaint.app/Contents/plugins/libpnp_basictools.dylib
-install_name_tool -change /path/to/Qt/lib/QtGui.framework/Versions/4.0/QtGui
-        @executable_path/../Frameworks/QtGui.framework/Versions/4.0/QtGui
-        plugandpaint.app/Contents/plugins/libpnp_basictools.dylib
-//! [45]
-
-
-//! [46]
-#elif defined(Q_OS_MAC)
-if (pluginsDir.dirName() == "MacOS") {
-    pluginsDir.cdUp();
-}
-#endif
-//! [46]
-
-
-//! [47]
-cp -R /path/to/Qt/plugins/imageformats
-        pluginandpaint.app/Contents/plugins
-//! [47]
-
-
-//! [48]
-install_name_tool -change /path/to/Qt/lib/QtGui.framework/Versions/4.0/QtGui
-        @executable_path/../Frameworks/QtGui.framework/Versions/4.0/QtGui
-        plugandpaint.app/Contents/plugins/imageformats/libqjpeg.dylib
-install_name_tool -change /path/to/Qt/lib/QtCore.framework/Versions/4.0/QtCore
-        @executable_path/../Frameworks/QtCore.framework/Versions/4.0/QtCore
-        plugandpaint.app/Contents/plugins/imageformats/libqjpeg.dylib
-//! [48]
-
-
-//! [49]
-QDir dir(QApplication::applicationDirPath());
-dir.cdUp();
-dir.cd("plugins");
-QApplication::setLibraryPaths(QStringList(dir.absolutePath()));
-//! [49]
-
-
-//! [50]
-otool -L MyApp.app/Contents/MacOS/MyApp
-//! [50]
-
-
-//! [51]
-QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.3
-//! [51]
-
-//! [51a]
-install_name_tool -change /System/Library/Frameworks/CoreVideo.framework/
-Versions/A/CoreVideo /System/Library/Frameworks/QuartzCore.framework/
-Versions/A/QuartzCore libphonon_qt7.dylib 
-//! [51a]
-
-//! [51b]
-./CONFIGURE - SDK MacOSX10.4u.sdk
-//! [51b]
-
-//! [52]
-./configure (other arguments) -universal -sdk /Developer/SDKs/MacOSX10.4u.sdk
-//! [52]
-
-
-//! [53]
-QMAKE_MAC_SDK=/Developer/SDKs/MacOSX10.4u.sdk
-CONFIG+=x86 ppc
-//! [53]
-
-
-//! [54]
-qApp->addLibraryPath("C:/customPath/plugins");
-//! [54]
diff --git a/doc/codesnippets/doc/src/snippets/code/doc_src_designer-manual.qdoc b/doc/codesnippets/doc/src/snippets/code/doc_src_designer-manual.qdoc
deleted file mode 100644
index 6730815..0000000
--- a/doc/codesnippets/doc/src/snippets/code/doc_src_designer-manual.qdoc
+++ /dev/null
@@ -1,98 +0,0 @@
-//! [0]
-CONFIG += uitools
-//! [0]
-
-
-//! [1]
-#include <QtUiTools>
-//! [1]
-
-
-//! [2]
-void on_<object name>_<signal name>(<signal parameters>);
-//! [2]
-
-
-//! [3]
-CONFIG += release
-//! [3]
-
-
-//! [4]
-target.path = $$[QT_INSTALL_PLUGINS]/designer
-INSTALLS += target
-//! [4]
-
-
-//! [5]
-QT += script
-//! [5]
-
-
-//! [6]
-widget.text = 'Hi - I was built ' + new Date().toString();
-//! [6]
-
-
-//! [7]
-class MyExtension: public QObject,
-                   public QdesignerContainerExtension
-{
-    Q_OBJECT
-    Q_INTERFACE(QDesignerContainerExtension)
-
-    ...
-}
-//! [7]
-
-
-//! [8]
-QObject *ANewExtensionFactory::createExtension(QObject *object,
-        const QString &iid, QObject *parent) const
-{
-    if (iid != Q_TYPEID(QDesignerContainerExtension))
-        return 0;
-
-    if (MyCustomWidget *widget = qobject_cast<MyCustomWidget*>
-            (object))
-        return new MyContainerExtension(widget, parent);
-
-    return 0;
-}
-//! [8]
-
-
-//! [9]
-QObject *AGeneralExtensionFactory::createExtension(QObject *object,
-        const QString &iid, QObject *parent) const
-{
-    MyCustomWidget *widget = qobject_cast<MyCustomWidget*>(object);
-
-    if (widget && (iid == Q_TYPEID(QDesignerTaskMenuExtension))) {
-         return new MyTaskMenuExtension(widget, parent);
-
-    } else if (widget && (iid == Q_TYPEID(QDesignerContainerExtension))) {
-        return new MyContainerExtension(widget, parent);
-
-    } else {
-        return 0;
-    }
-}
-//! [9]
-
-
-//! [10]
-void MyPlugin::initialize(QDesignerFormEditorInterface *formEditor)
-{
-    if (initialized)
-        return;
-
-    QExtensionManager *manager = formEditor->extensionManager();
-    Q_ASSERT(manager != 0);
-
-    manager->registerExtensions(new MyExtensionFactory(manager),
-                                Q_TYPEID(QDesignerTaskMenuExtension));
-
-    initialized = true;
-}
-//! [10]
diff --git a/doc/codesnippets/doc/src/snippets/code/doc_src_dnd.qdoc b/doc/codesnippets/doc/src/snippets/code/doc_src_dnd.qdoc
deleted file mode 100644
index 40df804..0000000
--- a/doc/codesnippets/doc/src/snippets/code/doc_src_dnd.qdoc
+++ /dev/null
@@ -1,34 +0,0 @@
-//! [0]
-void MyQt3Widget::customStartDragFunction()
-{
-    QDragObject *d = new QTextDrag( myHighlightedText(), this );
-    d->dragCopy();
-    // do NOT delete d.
-}
-//! [0]
-
-
-//! [1]
-void MyQt3Widget::dragEnterEvent(QDragEnterEvent* event)
-{
-    event->accept(
-        QTextDrag::canDecode(event) ||
-        QImageDrag::canDecode(event)
-    );
-}
-//! [1]
-
-
-//! [2]
-void MyQt3Widget::dropEvent(QDropEvent* event)
-{
-    QImage image;
-    QString text;
-
-    if ( QImageDrag::decode(event, image) ) {
-        insertImageAt(image, event->pos());
-    } else if ( QTextDrag::decode(event, text) ) {
-        insertTextAt(text, event->pos());
-    }
-}
-//! [2]
diff --git a/doc/codesnippets/doc/src/snippets/code/doc_src_emb-charinput.qdoc b/doc/codesnippets/doc/src/snippets/code/doc_src_emb-charinput.qdoc
deleted file mode 100644
index 2539e13..0000000
--- a/doc/codesnippets/doc/src/snippets/code/doc_src_emb-charinput.qdoc
+++ /dev/null
@@ -1,20 +0,0 @@
-//! [0]
-./configure -help
-//! [0]
-
-
-//! [1]
-configure -qt-kbd-s15000
-//! [1]
-
-
-//! [2]
-export QWS_KEYBOARD=<driver>[:<driver specific options>]
-//! [2]
-
-
-//! [3]
-export QWS_KEYBOARD="<driver>[:<driver specific options>]
-        <driver>[:<driver specific options>]
-        <driver>[:<driver specific options>]"
-//! [3]
diff --git a/doc/codesnippets/doc/src/snippets/code/doc_src_emb-crosscompiling.qdoc b/doc/codesnippets/doc/src/snippets/code/doc_src_emb-crosscompiling.qdoc
deleted file mode 100644
index 3791bfc..0000000
--- a/doc/codesnippets/doc/src/snippets/code/doc_src_emb-crosscompiling.qdoc
+++ /dev/null
@@ -1,36 +0,0 @@
-//! [0]
-export PATH=path/to/cross/compiler:$PATH
-//! [0]
-
-
-//! [1]
-./configure -embedded arm -xplatform qws/linux-arm-g++ <other options>
-//! [1]
-
-
-//! [2]
-cp path/to/QtEmbedded/mkspecs/qws/linux-mips-g++/...
-   path/to/QtEmbedded/mkspecs/qws/linux-myarchitecture-g++/...
-//! [2]
-
-
-//! [3]
-cd path/to/QtEmbedded
-./configure -embedded <architecture> -qt-kbd-<keyboarddriver>
-            -qt-mouse-<mousedriver> -qt-gfx-<screendriver>
-//! [3]
-
-
-//! [4]
-cd path/to/QtEmbedded
-./configure  <other options>
-             -L /path/to/libjpeg/libraries -I /path/to/libjpeg/headers
-//! [4]
-
-
-//! [5]
-cd path/to/myApplication
-qmake -project
-qmake
-make
-//! [5]
diff --git a/doc/codesnippets/doc/src/snippets/code/doc_src_emb-envvars.qdoc b/doc/codesnippets/doc/src/snippets/code/doc_src_emb-envvars.qdoc
deleted file mode 100644
index c242ff3..0000000
--- a/doc/codesnippets/doc/src/snippets/code/doc_src_emb-envvars.qdoc
+++ /dev/null
@@ -1,38 +0,0 @@
-//! [0]
-export QWS_DISPLAY=<driver>[:<driver specific options>]...
-        [:<display num>]
-//! [0]
-
-
-//! [1]
-export QWS_SIZE=<width>x<height>
-//! [1]
-
-
-//! [2]
-export QWS_MOUSE_PROTO=<driver>[:<driver specific options>]
-//! [2]
-
-
-//! [3]
-export QWS_MOUSE_PROTO="<driver>[:<driver specific options>]
-        <driver>[:<driver specific options>]
-        <driver>[:<driver specific options>]"
-//! [3]
-
-
-//! [4]
-export QWS_MOUSE_PROTO="Vr41xx:press=500:/dev/misc/ts"
-//! [4]
-
-
-//! [5]
-export QWS_KEYBOARD=<driver>[:<driver specific options>]
-//! [5]
-
-
-//! [6]
-export QWS_KEYBOARD="<driver>[:<driver specific options>]
-        <driver>[:<driver specific options>]
-        <driver>[:<driver specific options>]"
-//! [6]
diff --git a/doc/codesnippets/doc/src/snippets/code/doc_src_emb-features.qdoc b/doc/codesnippets/doc/src/snippets/code/doc_src_emb-features.qdoc
deleted file mode 100644
index e64a0ae..0000000
--- a/doc/codesnippets/doc/src/snippets/code/doc_src_emb-features.qdoc
+++ /dev/null
@@ -1,18 +0,0 @@
-//! [0]
-configure.exe -D QT_NO_THREAD
-//! [0]
-
-
-//! [1]
-./configure -no-feature-thread
-//! [1]
-
-
-//! [2]
-configure.exe -qconfig myfile
-//! [2]
-
-
-//! [3]
-./configure -qconfig myfile
-//! [3]
diff --git a/doc/codesnippets/doc/src/snippets/code/doc_src_emb-fonts.qdoc b/doc/codesnippets/doc/src/snippets/code/doc_src_emb-fonts.qdoc
deleted file mode 100644
index b39cb6f..0000000
--- a/doc/codesnippets/doc/src/snippets/code/doc_src_emb-fonts.qdoc
+++ /dev/null
@@ -1,3 +0,0 @@
-//! [0]
-name file renderer italic weight size flags
-//! [0]
diff --git a/doc/codesnippets/doc/src/snippets/code/doc_src_emb-install.qdoc b/doc/codesnippets/doc/src/snippets/code/doc_src_emb-install.qdoc
deleted file mode 100644
index 11ff012..0000000
--- a/doc/codesnippets/doc/src/snippets/code/doc_src_emb-install.qdoc
+++ /dev/null
@@ -1,37 +0,0 @@
-//! [0]
-cd <anywhere>
-gunzip qt-embedded-linux-commercial-src-4.5.2.tar.gz
-tar xf qt-embedded-linux-commercial-src-4.5.2.tar
-//! [0]
-
-
-//! [1]
-~/qt-embedded-linux-commercial-src-4.5.2
-//! [1]
-
-
-//! [2]
-cd  ~/qt-embedded-linux-commercial-src-4.5.2
-./configure -embedded [architecture]
-//! [2]
-
-
-//! [3]
-make
-//! [3]
-
-
-//! [4]
-su -c "make install"
-//! [4]
-
-
-//! [5]
-PATH=/usr/local/Trolltech/QtEmbedded-4.5.2/bin:$PATH
-export PATH
-//! [5]
-
-
-//! [6]
-setenv PATH /usr/local/Trolltech/QtEmbedded-4.5.2/bin:$PATH
-//! [6]
diff --git a/doc/codesnippets/doc/src/snippets/code/doc_src_emb-performance.qdoc b/doc/codesnippets/doc/src/snippets/code/doc_src_emb-performance.qdoc
deleted file mode 100644
index 7dcba12..0000000
--- a/doc/codesnippets/doc/src/snippets/code/doc_src_emb-performance.qdoc
+++ /dev/null
@@ -1,36 +0,0 @@
-//! [0]
-./configure -static
-//! [0]
-
-
-//! [1]
-void *operator new[](size_t size)
-{
-    return malloc(size);
-}
-
-void *operator new(size_t size)
-{
-    return malloc(size);
-}
-
-void operator delete[](void *ptr)
-{
-    free(ptr);
-}
-
-void operator delete[](void *ptr, size_t)
-{
-    free(ptr);
-}
-
-void operator delete(void *ptr)
-{
-    free(ptr);
-}
-
-void operator delete(void *ptr, size_t)
-{
-    free(ptr);
-}
-//! [1]
diff --git a/doc/codesnippets/doc/src/snippets/code/doc_src_emb-pointer.qdoc b/doc/codesnippets/doc/src/snippets/code/doc_src_emb-pointer.qdoc
deleted file mode 100644
index 37eb9c6..0000000
--- a/doc/codesnippets/doc/src/snippets/code/doc_src_emb-pointer.qdoc
+++ /dev/null
@@ -1,68 +0,0 @@
-//! [0]
-   <qtopia-root-dir>/qtopiacore/qt/configure -embedded -help |grep -a1 mouse
-//! [0]
-
-
-//! [1]
-   ./configure -extra-qtopiacore-config -qt-mouse-tslib
-//! [1]
-
-
-//! [2]
-   ./configure -help
-//! [2]
-
-
-//! [3]
-   configure -qt-mouse-tslib
-//! [3]
-
-
-//! [4]
-export QWS_MOUSE_PROTO=<driver>[:<driver specific options>]
-//! [4]
-
-
-//! [5]
-export QWS_MOUSE_PROTO="<driver>[:<driver specific options>]
-        <driver>[:<driver specific options>]
-        <driver>[:<driver specific options>]"
-//! [5]
-
-
-//! [6]
-export QWS_MOUSE_PROTO="Vr41xx:press=500:/dev/misc/ts"
-//! [6]
-
-
-//! [7]
-./configure  -L <path to tslib library> -I <path to tslib headers>
-//! [7]
-
-
-//! [8]
-module_raw input
-module linear
-//! [8]
-
-
-//! [9]
-QWS_MOUSE_PROTO=IntelliMouse:/dev/input/mouse0
-//! [9]
-
-
-//! [10]
-cat /dev/input/mouse0 | hexdump
-//! [10]
-
-
-//! [11]
-QWS_MOUSE_PROTO=IntelliMouse:/dev/input/mouse0
-//! [11]
-
-
-//! [12]
-chmod a+rw /dev/input/mouse0
-//! [12]
-
-
diff --git a/doc/codesnippets/doc/src/snippets/code/doc_src_emb-qvfb.qdoc b/doc/codesnippets/doc/src/snippets/code/doc_src_emb-qvfb.qdoc
deleted file mode 100644
index 827c84a..0000000
--- a/doc/codesnippets/doc/src/snippets/code/doc_src_emb-qvfb.qdoc
+++ /dev/null
@@ -1,70 +0,0 @@
-//! [0]
-cd path/to/QtEmbedded
-./configure -qvfb
-make
-//! [0]
-
-
-//! [1]
-cd path/to/Qt/tools/qvfb
-make
-./qvfb
-//! [1]
-
-
-//! [2]
-cd path/to/Qt/tools/qvfb/ClamshellPhone.skin/
-//! [2]
-
-
-//! [3]
-[SkinFile]
-Up=ClamshellPhone1-5.png
-Down=ClamshellPhone1-5-pressed.png
-Closed=ClamshellPhone1-5-closed.png
-Screen=72 84 176 208
-Areas=22
-
-"Power"     0x0100000a 205 563 249 586
-"1"         0x0031      62 414 119 438
-"2"         0x0032     130 414 189 438
-"3"         0x0033     198 413 257 438
-"4"         0x0034      54 444 117 470
-"5"         0x0035     128 444 189 471
-"6"         0x0036     202 444 264 471
-"7"         0x0037      47 477 113 507
-"8"         0x0038     126 477 190 507
-"9"         0x0039     205 478 270 509
-"*"         0x002a      39 515 110 552
-"0"         0x0030     122 515 195 553
-"#"         0x0023     207 516 280 553
-"Context1"  0x01100000 137 360 108 383 123 410 90 409  60 387  63 378
-                       100 362
-"Back"      0x01000061 184 361 206 376 213 387 197 410 226 410 256 392
-                       258 381 244 369
-"Backspace" 0x01000003  68 563 113 587
-"Select"    0x01010000 160 391 172 390 181 386 184 381 180 377 173
-                       373 165 372 155 372 145 375 138 378 136
-                       382 138 387 147 390
-"Left"      0x1000012  141 390 136 385 136 381 143 375 132 371 120
-                       380 121 393 129 401
-"Down"      0x1000015  143 389 130 402 162 412 191 404 175 390
-"Right"     0x1000014  186 370 176 375 184 382 182 387 175 390 190 404
-                       201 396 202 375
-"Up"        0x1000013  133 370 143 374 176 374 185 370 169 362 149 362
-"Flip"      0x01100006  98 325 225 353
-//! [3]
-
-
-//! [4]
-cd path/to/QtEmbedded/examples/widgets/analogclock
-make
-./analogclock -qws
-//! [4]
-
-
-//! [5]
-cd path/to/QtEmbedded/examples/widgets/analogclock
-make
-./analogclock -qws -display QVFb:0
-//! [5]
diff --git a/doc/codesnippets/doc/src/snippets/code/doc_src_emb-running.qdoc b/doc/codesnippets/doc/src/snippets/code/doc_src_emb-running.qdoc
deleted file mode 100644
index b15cfc1..0000000
--- a/doc/codesnippets/doc/src/snippets/code/doc_src_emb-running.qdoc
+++ /dev/null
@@ -1,61 +0,0 @@
-//! [0]
-cd path/to/QtEmbedded/demos/textedit
-./textedit -qws
-//! [0]
-
-
-//! [1]
-./myfirstserverapplication -qws -display "transformed:rot90:1"
-./mysecondserverapplication -qws -display "QVFb:2"
-//! [1]
-
-
-//! [2]
-./myclientapplication -display "QVFb:2"
-//! [2]
-
-
-//! [3]
-./myserverapplication -qws -display "Multi: QVFb:0
-        QVFb:1:offset=0,0 VNC:offset=640,0 :2"
-//! [3]
-
-
-//! [4]
-./myapplication -fn helvetica
-//! [4]
-
-
-//! [5]
-./myapplication -bg blue
-//! [5]
-
-
-//! [6]
-./myapplication -btn green
-//! [6]
-
-
-//! [7]
-./myapplication -fg 'dark blue'
-//! [7]
-
-
-//! [8]
-./myapplication -name texteditapplication
-//! [8]
-
-
-//! [9]
-./myapplication -title 'Text Edit'
-//! [9]
-
-
-//! [10]
-./myapplication -geometry 300x200+50+50
-//! [10]
-
-
-//! [11]
-./myapplication -decoration windows
-//! [11]
diff --git a/doc/codesnippets/doc/src/snippets/code/doc_src_emb-vnc.qdoc b/doc/codesnippets/doc/src/snippets/code/doc_src_emb-vnc.qdoc
deleted file mode 100644
index c35274f..0000000
--- a/doc/codesnippets/doc/src/snippets/code/doc_src_emb-vnc.qdoc
+++ /dev/null
@@ -1,25 +0,0 @@
-//! [0]
-cd path/to/QtEmbedded
-./configure -qt-gfx-vnc
-make
-//! [0]
-
-
-//! [1]
-cd path/to/QtEmbedded/examples/widgets/analogclock
-./analogclock -qws -display VNC:0
-//! [1]
-
-
-//! [2]
-vncviewer localhost:0
-//! [2]
-
-//! [Starting server]
-analogclock -qws -display VNC:0
-//! [Starting server]
-//! [Starting clients]
-calculator -display VNC:0
-scribble -display VNC:0
-imageviewer -display VNC:0
-//! [Starting clients]
diff --git a/doc/codesnippets/doc/src/snippets/code/doc_src_examples_activeqt_comapp.qdoc b/doc/codesnippets/doc/src/snippets/code/doc_src_examples_activeqt_comapp.qdoc
deleted file mode 100644
index 0414e50..0000000
--- a/doc/codesnippets/doc/src/snippets/code/doc_src_examples_activeqt_comapp.qdoc
+++ /dev/null
@@ -1,39 +0,0 @@
-//! [0]
-Private Application As comappLib.Application
-Private MyApp As Boolean
-
-Private Sub UpdateList()
-    DocumentList.Clear
-    DocumentsCount.Caption = Application.documents.Count
-    For Index = 0 To Application.documents.Count - 1
-       DocumentList.AddItem (Application.documents.Item(Index).Title)
-    Next
-End Sub
-
-Private Sub Form_Load()
-    On Error GoTo CreateNew
-    Set Application = GetObject(, "comapp.Application")
-    MyApp = False
-    GoTo Initialized
-CreateNew:
-    On Error GoTo InitializeFailed
-    Set Application = New Application
-    Application.Visible = True
-    MyApp = True
-Initialized:
-    Caption = Application.id
-    UpdateList
-InitializeFailed:
-End Sub
-
-Private Sub Form_Unload(Cancel As Integer)
-    If MyApp Then
-        Application.quit
-    End If
-End Sub
-
-Private Sub NewDocument_Click()
-    Application.documents.addDocument
-    UpdateList
-End Sub
-//! [0]
diff --git a/doc/codesnippets/doc/src/snippets/code/doc_src_examples_activeqt_dotnet.qdoc b/doc/codesnippets/doc/src/snippets/code/doc_src_examples_activeqt_dotnet.qdoc
deleted file mode 100644
index 3bdf9fa..0000000
--- a/doc/codesnippets/doc/src/snippets/code/doc_src_examples_activeqt_dotnet.qdoc
+++ /dev/null
@@ -1,4 +0,0 @@
-//! [0]
-' VB is case insensitive, but our C++ controls are not.
-' Me.resetButton.enabled = True
-//! [0]
diff --git a/doc/codesnippets/doc/src/snippets/code/doc_src_examples_activeqt_menus.qdoc b/doc/codesnippets/doc/src/snippets/code/doc_src_examples_activeqt_menus.qdoc
deleted file mode 100644
index 18849dd..0000000
--- a/doc/codesnippets/doc/src/snippets/code/doc_src_examples_activeqt_menus.qdoc
+++ /dev/null
@@ -1,6 +0,0 @@
-//! [0]
-<object ID="QMenus" CLASSID="CLSID:4dc3f340-a6f7-44e4-a79b-3e9217695fbd"
-CODEBASE="http://qtsoftware.com/demos/menusax.cab">
-[Object not available! Did you forget to build and register the server?]
-</object>
-//! [0]
diff --git a/doc/codesnippets/doc/src/snippets/code/doc_src_examples_ahigl.qdoc b/doc/codesnippets/doc/src/snippets/code/doc_src_examples_ahigl.qdoc
deleted file mode 100644
index bf29cda..0000000
--- a/doc/codesnippets/doc/src/snippets/code/doc_src_examples_ahigl.qdoc
+++ /dev/null
@@ -1,8 +0,0 @@
-//! [0]
-myApplication -qws -display ahigl
-//! [0]
-
-
-//! [1]
-myApplication -qws -display ahigl
-//! [1]
diff --git a/doc/codesnippets/doc/src/snippets/code/doc_src_examples_application.qdoc b/doc/codesnippets/doc/src/snippets/code/doc_src_examples_application.qdoc
deleted file mode 100644
index 85e04f7..0000000
--- a/doc/codesnippets/doc/src/snippets/code/doc_src_examples_application.qdoc
+++ /dev/null
@@ -1,5 +0,0 @@
-//! [0]
-application -style=windows
-application -style=motif
-application -style=cde
-//! [0]
diff --git a/doc/codesnippets/doc/src/snippets/code/doc_src_examples_arrowpad.qdoc b/doc/codesnippets/doc/src/snippets/code/doc_src_examples_arrowpad.qdoc
deleted file mode 100644
index ba7f8eb..0000000
--- a/doc/codesnippets/doc/src/snippets/code/doc_src_examples_arrowpad.qdoc
+++ /dev/null
@@ -1,19 +0,0 @@
-//! [0]
-qApp->translate("ArrowPad", x)
-//! [0]
-
-
-//! [1]
-lrelease arrowpad.pro
-//! [1]
-
-
-//! [2]
-export LANG=fr
-setenv LANG fr
-//! [2]
-
-
-//! [3]
-set LANG=fr
-//! [3]
diff --git a/doc/codesnippets/doc/src/snippets/code/doc_src_examples_containerextension.qdoc b/doc/codesnippets/doc/src/snippets/code/doc_src_examples_containerextension.qdoc
deleted file mode 100644
index 299c0dc..0000000
--- a/doc/codesnippets/doc/src/snippets/code/doc_src_examples_containerextension.qdoc
+++ /dev/null
@@ -1,4 +0,0 @@
-//! [0]
-target.path = $$[QT_INSTALL_PLUGINS]/designer
-INSTALLS += target
-//! [0]
diff --git a/doc/codesnippets/doc/src/snippets/code/doc_src_examples_customwidgetplugin.qdoc b/doc/codesnippets/doc/src/snippets/code/doc_src_examples_customwidgetplugin.qdoc
deleted file mode 100644
index 299c0dc..0000000
--- a/doc/codesnippets/doc/src/snippets/code/doc_src_examples_customwidgetplugin.qdoc
+++ /dev/null
@@ -1,4 +0,0 @@
-//! [0]
-target.path = $$[QT_INSTALL_PLUGINS]/designer
-INSTALLS += target
-//! [0]
diff --git a/doc/codesnippets/doc/src/snippets/code/doc_src_examples_dropsite.qdoc b/doc/codesnippets/doc/src/snippets/code/doc_src_examples_dropsite.qdoc
deleted file mode 100644
index fd949ea..0000000
--- a/doc/codesnippets/doc/src/snippets/code/doc_src_examples_dropsite.qdoc
+++ /dev/null
@@ -1,3 +0,0 @@
-//! [0]
-foreach(variable, container)
-//! [0]
diff --git a/doc/codesnippets/doc/src/snippets/code/doc_src_examples_editabletreemodel.qdoc b/doc/codesnippets/doc/src/snippets/code/doc_src_examples_editabletreemodel.qdoc
deleted file mode 100644
index 2475842..0000000
--- a/doc/codesnippets/doc/src/snippets/code/doc_src_examples_editabletreemodel.qdoc
+++ /dev/null
@@ -1,8 +0,0 @@
-//! [0]
-QVariant a = model->index(0, 0, QModelIndex()).data();
-//! [0]
-
-
-//! [1]
-QVariant b = model->index(1, 0, QModelIndex()).data();
-//! [1]
diff --git a/doc/codesnippets/doc/src/snippets/code/doc_src_examples_hellotr.qdoc b/doc/codesnippets/doc/src/snippets/code/doc_src_examples_hellotr.qdoc
deleted file mode 100644
index 4f31bc0..0000000
--- a/doc/codesnippets/doc/src/snippets/code/doc_src_examples_hellotr.qdoc
+++ /dev/null
@@ -1,31 +0,0 @@
-//! [0]
-lupdate -verbose hellotr.pro
-//! [0]
-
-
-//! [1]
-<!DOCTYPE TS><TS>
-<context>
-    <name>QPushButton</name>
-    <message>
-        <source>Hello world!</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
-//! [1]
-
-
-//! [2]
-linguist hellotr_la.ts
-//! [2]
-
-
-//! [3]
-<translation type='unfinished'></translation>
-//! [3]
-
-
-//! [4]
-<translation>Orbis, te saluto!</translation>
-//! [4]
diff --git a/doc/codesnippets/doc/src/snippets/code/doc_src_examples_icons.qdoc b/doc/codesnippets/doc/src/snippets/code/doc_src_examples_icons.qdoc
deleted file mode 100644
index 3d33dff..0000000
--- a/doc/codesnippets/doc/src/snippets/code/doc_src_examples_icons.qdoc
+++ /dev/null
@@ -1,14 +0,0 @@
-//! [0]
-if (!condition)
-     qFatal("ASSERT: "condition" in file ...");
-//! [0]
-
-
-//! [1]
-qmake "CONFIG += debug" icons.pro
-//! [1]
-
-
-//! [2]
-qmake "CONFIG += release" icons.pro
-//! [2]
diff --git a/doc/codesnippets/doc/src/snippets/code/doc_src_examples_imageviewer.qdoc b/doc/codesnippets/doc/src/snippets/code/doc_src_examples_imageviewer.qdoc
deleted file mode 100644
index c1854ec..0000000
--- a/doc/codesnippets/doc/src/snippets/code/doc_src_examples_imageviewer.qdoc
+++ /dev/null
@@ -1,24 +0,0 @@
-//! [0]
-imageLabel->resize(imageLabel->pixmap()->size());
-//! [0]
-
-
-//! [1]
-if (!imageLabel->pixmap())
-     qFatal("ASSERT: "imageLabel->pixmap()" in file ...");
-//! [1]
-
-
-//! [2]
-qmake "CONFIG += debug" foo.pro
-//! [2]
-
-
-//! [3]
-qmake "CONFIG += release" foo.pro
-//! [3]
-
-
-//! [4]
-scrollBar->setValue(int(factor * scrollBar->value()));
-//! [4]
diff --git a/doc/codesnippets/doc/src/snippets/code/doc_src_examples_qtscriptcustomclass.qdoc b/doc/codesnippets/doc/src/snippets/code/doc_src_examples_qtscriptcustomclass.qdoc
deleted file mode 100644
index f958cc9..0000000
--- a/doc/codesnippets/doc/src/snippets/code/doc_src_examples_qtscriptcustomclass.qdoc
+++ /dev/null
@@ -1,35 +0,0 @@
-//! [0]
-var ba = new ByteArray();    // constructs an empty ByteArray
-var ba2 = new ByteArray(10); // constructs a ByteArray of length 10 (all bytes initialized to 0)
-//! [0]
-
-
-//! [1]
-for (var i = 0; i < ba.length; ++i)
-    ba[i] = 123;
-//! [1]
-
-
-//! [2]
-ba[0] = 257;
-print(ba[0]);  // 1
-//! [2]
-
-
-//! [3]
-var ba3 = new ByteArray();
-print(ba3.length); // 0
-ba[0] = 64;
-print(ba3.length); // 1
-//! [3]
-
-
-//! [4]
-ba["foo"] = "Hello";
-//! [4]
-
-
-//! [5]
-var ba64 = ba.toBase64();
-print(ba64.toLatin1String());
-//! [5]
diff --git a/doc/codesnippets/doc/src/snippets/code/doc_src_examples_simpledommodel.qdoc b/doc/codesnippets/doc/src/snippets/code/doc_src_examples_simpledommodel.qdoc
deleted file mode 100644
index c74a176..0000000
--- a/doc/codesnippets/doc/src/snippets/code/doc_src_examples_simpledommodel.qdoc
+++ /dev/null
@@ -1,20 +0,0 @@
-//! [0]
-// file is an open QFile object.
-QDomDocument document;
-if (document.setContent(&file)) {
-
-    QDomElement documentElement = document.documentElement();
-    QString text;
-    QDomNode node = documentElement.firstChild();
-
-    while (!node.isNull()) {
-        if (node.isText())
-            text += node.nodeValue();
-        else if (node.hasChildNodes()) {
-            // Examine the node's children and read any text found.
-            ...
-        }
-        node = node.nextSibling();
-    }
-}
-//! [0]
diff --git a/doc/codesnippets/doc/src/snippets/code/doc_src_examples_simpletreemodel.qdoc b/doc/codesnippets/doc/src/snippets/code/doc_src_examples_simpletreemodel.qdoc
deleted file mode 100644
index 907f3db..0000000
--- a/doc/codesnippets/doc/src/snippets/code/doc_src_examples_simpletreemodel.qdoc
+++ /dev/null
@@ -1,12 +0,0 @@
-//! [0]
-Getting Started                         How to familiarize yourself with Qt Designer
-    Launching Designer                  Running the Qt Designer application
-    The User Interface                  How to interact with Qt Designer
-//! [0]
-
-
-//! [1]
-Connection Editing Mode                 Connecting widgets together with signals and slots
-    Connecting Objects                  Making connections in Qt Designer
-    Editing Connections                 Changing existing connections
-//! [1]
diff --git a/doc/codesnippets/doc/src/snippets/code/doc_src_examples_svgalib.qdoc b/doc/codesnippets/doc/src/snippets/code/doc_src_examples_svgalib.qdoc
deleted file mode 100644
index 3b63146..0000000
--- a/doc/codesnippets/doc/src/snippets/code/doc_src_examples_svgalib.qdoc
+++ /dev/null
@@ -1,3 +0,0 @@
-//! [0]
-myApplication -qws -display svgalib
-//! [0]
diff --git a/doc/codesnippets/doc/src/snippets/code/doc_src_examples_taskmenuextension.qdoc b/doc/codesnippets/doc/src/snippets/code/doc_src_examples_taskmenuextension.qdoc
deleted file mode 100644
index 299c0dc..0000000
--- a/doc/codesnippets/doc/src/snippets/code/doc_src_examples_taskmenuextension.qdoc
+++ /dev/null
@@ -1,4 +0,0 @@
-//! [0]
-target.path = $$[QT_INSTALL_PLUGINS]/designer
-INSTALLS += target
-//! [0]
diff --git a/doc/codesnippets/doc/src/snippets/code/doc_src_examples_textfinder.qdoc b/doc/codesnippets/doc/src/snippets/code/doc_src_examples_textfinder.qdoc
deleted file mode 100644
index 349becf..0000000
--- a/doc/codesnippets/doc/src/snippets/code/doc_src_examples_textfinder.qdoc
+++ /dev/null
@@ -1,6 +0,0 @@
-//! [0]
-CONFIG      += uitools
-HEADERS     = textfinder.h
-RESOURCES   = textfinder.qrc
-SOURCES     = textfinder.cpp main.cpp
-//! [0]
diff --git a/doc/codesnippets/doc/src/snippets/code/doc_src_examples_trollprint.qdoc b/doc/codesnippets/doc/src/snippets/code/doc_src_examples_trollprint.qdoc
deleted file mode 100644
index 7f51a15..0000000
--- a/doc/codesnippets/doc/src/snippets/code/doc_src_examples_trollprint.qdoc
+++ /dev/null
@@ -1,35 +0,0 @@
-//! [0]
-twoSidedEnabledRadio = new QRadioButton(tr("Enabled", "two-sided"));
-twoSidedDisabledRadio = new QRadioButton(tr("Disabled", "two-sided"));
-//! [0]
-
-
-//! [1]
-colorsEnabledRadio = new QRadioButton(tr("Enabled", "colors"), colors);
-colorsDisabledRadio = new QRadioButton(tr("Disabled", "colors"), colors);
-//! [1]
-
-
-//! [2]
-/*
-   TRANSLATOR MainWindow
-
-   In this application the whole application is a MainWindow.
-   Choose Help|About from the menu bar to see some text
-   belonging to MainWindow.
-
-   ...
-//! [2]
-
-
-//! [3]
-/*
-   TRANSLATOR ZClientErrorDialog
-
-   Choose Client|Edit to reach the Client Edit dialog, then choose
-   Client Specification from the drop down list at the top and pick
-   client Bartel Leendert van der Waerden. Now check the Profile
-   checkbox and then click the Start Processing button. You should
-   now see a pop up window with the text "Error: Name too long!".
-   This window is a ZClientErrorDialog.
-//! [3]
diff --git a/doc/codesnippets/doc/src/snippets/code/doc_src_examples_tutorial.qdoc b/doc/codesnippets/doc/src/snippets/code/doc_src_examples_tutorial.qdoc
deleted file mode 100644
index 0b79563..0000000
--- a/doc/codesnippets/doc/src/snippets/code/doc_src_examples_tutorial.qdoc
+++ /dev/null
@@ -1,10 +0,0 @@
-//! [0]
-qmake -project
-qmake
-//! [0]
-
-
-//! [1]
-qmake -project
-qmake
-//! [1]
diff --git a/doc/codesnippets/doc/src/snippets/code/doc_src_examples_worldtimeclockplugin.qdoc b/doc/codesnippets/doc/src/snippets/code/doc_src_examples_worldtimeclockplugin.qdoc
deleted file mode 100644
index 299c0dc..0000000
--- a/doc/codesnippets/doc/src/snippets/code/doc_src_examples_worldtimeclockplugin.qdoc
+++ /dev/null
@@ -1,4 +0,0 @@
-//! [0]
-target.path = $$[QT_INSTALL_PLUGINS]/designer
-INSTALLS += target
-//! [0]
diff --git a/doc/codesnippets/doc/src/snippets/code/doc_src_exportedfunctions.qdoc b/doc/codesnippets/doc/src/snippets/code/doc_src_exportedfunctions.qdoc
deleted file mode 100644
index f0e5fb5..0000000
--- a/doc/codesnippets/doc/src/snippets/code/doc_src_exportedfunctions.qdoc
+++ /dev/null
@@ -1,17 +0,0 @@
-//! [0]
-#ifdef Q_WS_X11
-void qt_x11_wait_for_window_manager(QWidget *widget);
-#endif
-
-int main(int argc, char *argv[])
-{
-    QApplication app(argc, argv);
-    ...
-    window.show();
-#ifdef Q_WS_X11
-    qt_x11_wait_for_window_manager(&window);
-#endif
-    ...
-    return app.exec();
-}
-//! [0]
diff --git a/doc/codesnippets/doc/src/snippets/code/doc_src_gpl.qdoc b/doc/codesnippets/doc/src/snippets/code/doc_src_gpl.qdoc
deleted file mode 100644
index b6ef954..0000000
--- a/doc/codesnippets/doc/src/snippets/code/doc_src_gpl.qdoc
+++ /dev/null
@@ -1,679 +0,0 @@
-//! [GPL v3]
- You may use, distribute and copy the Qt GUI Toolkit under the terms of
- GNU General Public License version 3, which is displayed below.
-
-                    GNU GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The GNU General Public License is a free, copyleft license for
-software and other kinds of works.
-
-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-the GNU General Public License is intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.  We, the Free Software Foundation, use the
-GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors.  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
-  To protect your rights, we need to prevent others from denying you
-these rights or asking you to surrender the rights.  Therefore, you have
-certain responsibilities if you distribute copies of the software, or if
-you modify it: responsibilities to respect the freedom of others.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received.  You must make sure that they, too, receive
-or can get the source code.  And you must show them these terms so they
-know their rights.
-
-  Developers that use the GNU GPL protect your rights with two steps:
-(1) assert copyright on the software, and (2) offer you this License
-giving you legal permission to copy, distribute and/or modify it.
-
-  For the developers' and authors' protection, the GPL clearly explains
-that there is no warranty for this free software.  For both users' and
-authors' sake, the GPL requires that modified versions be marked as
-changed, so that their problems will not be attributed erroneously to
-authors of previous versions.
-
-  Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the manufacturer
-can do so.  This is fundamentally incompatible with the aim of
-protecting users' freedom to change the software.  The systematic
-pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable.  Therefore, we
-have designed this version of the GPL to prohibit the practice for those
-products.  If such problems arise substantially in other domains, we
-stand ready to extend this provision to those domains in future versions
-of the GPL, as needed to protect the freedom of users.
-
-  Finally, every program is threatened constantly by software patents.
-States should not allow patents to restrict development and use of
-software on general-purpose computers, but in those that do, we wish to
-avoid the special danger that patents applied to a free program could
-make it effectively proprietary.  To prevent this, the GPL assures that
-patents cannot be used to render the program non-free.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                       TERMS AND CONDITIONS
-
-  0. Definitions.
-
-  "This License" refers to version 3 of the GNU General Public License.
-
-  "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
-  "The Program" refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as "you".  "Licensees" and
-"recipients" may be individuals or organizations.
-
-  To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
-  A "covered work" means either the unmodified Program or a work based
-on the Program.
-
-  To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
-  To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
-  An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
-  1. Source Code.
-
-  The "source code" for a work means the preferred form of the work
-for making modifications to it.  "Object code" means any non-source
-form of a work.
-
-  A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
-  The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
-  The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
-  The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
-  The Corresponding Source for a work in source code form is that
-same work.
-
-  2. Basic Permissions.
-
-  All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
-  You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
-  Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.
-
-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-  No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
-  When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
-  4. Conveying Verbatim Copies.
-
-  You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
-  You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
-  5. Conveying Modified Source Versions.
-
-  You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
-    a) The work must carry prominent notices stating that you modified
-    it, and giving a relevant date.
-
-    b) The work must carry prominent notices stating that it is
-    released under this License and any conditions added under section
-    7.  This requirement modifies the requirement in section 4 to
-    "keep intact all notices".
-
-    c) You must license the entire work, as a whole, under this
-    License to anyone who comes into possession of a copy.  This
-    License will therefore apply, along with any applicable section 7
-    additional terms, to the whole of the work, and all its parts,
-    regardless of how they are packaged.  This License gives no
-    permission to license the work in any other way, but it does not
-    invalidate such permission if you have separately received it.
-
-    d) If the work has interactive user interfaces, each must display
-    Appropriate Legal Notices; however, if the Program has interactive
-    interfaces that do not display Appropriate Legal Notices, your
-    work need not make them do so.
-
-  A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit.  Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
-  6. Conveying Non-Source Forms.
-
-  You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
-    a) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by the
-    Corresponding Source fixed on a durable physical medium
-    customarily used for software interchange.
-
-    b) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by a
-    written offer, valid for at least three years and valid for as
-    long as you offer spare parts or customer support for that product
-    model, to give anyone who possesses the object code either (1) a
-    copy of the Corresponding Source for all the software in the
-    product that is covered by this License, on a durable physical
-    medium customarily used for software interchange, for a price no
-    more than your reasonable cost of physically performing this
-    conveying of source, or (2) access to copy the
-    Corresponding Source from a network server at no charge.
-
-    c) Convey individual copies of the object code with a copy of the
-    written offer to provide the Corresponding Source.  This
-    alternative is allowed only occasionally and noncommercially, and
-    only if you received the object code with such an offer, in accord
-    with subsection 6b.
-
-    d) Convey the object code by offering access from a designated
-    place (gratis or for a charge), and offer equivalent access to the
-    Corresponding Source in the same way through the same place at no
-    further charge.  You need not require recipients to copy the
-    Corresponding Source along with the object code.  If the place to
-    copy the object code is a network server, the Corresponding Source
-    may be on a different server (operated by you or a third party)
-    that supports equivalent copying facilities, provided you maintain
-    clear directions next to the object code saying where to find the
-    Corresponding Source.  Regardless of what server hosts the
-    Corresponding Source, you remain obligated to ensure that it is
-    available for as long as needed to satisfy these requirements.
-
-    e) Convey the object code using peer-to-peer transmission, provided
-    you inform other peers where the object code and Corresponding
-    Source of the work are being offered to the general public at no
-    charge under subsection 6d.
-
-  A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
-  A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling.  In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage.  For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product.  A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
-  "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source.  The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
-  If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
-  The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed.  Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
-  Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
-  7. Additional Terms.
-
-  "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
-  When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it.  (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.)  You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
-  Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
-    a) Disclaiming warranty or limiting liability differently from the
-    terms of sections 15 and 16 of this License; or
-
-    b) Requiring preservation of specified reasonable legal notices or
-    author attributions in that material or in the Appropriate Legal
-    Notices displayed by works containing it; or
-
-    c) Prohibiting misrepresentation of the origin of that material, or
-    requiring that modified versions of such material be marked in
-    reasonable ways as different from the original version; or
-
-    d) Limiting the use for publicity purposes of names of licensors or
-    authors of the material; or
-
-    e) Declining to grant rights under trademark law for use of some
-    trade names, trademarks, or service marks; or
-
-    f) Requiring indemnification of licensors and authors of that
-    material by anyone who conveys the material (or modified versions of
-    it) with contractual assumptions of liability to the recipient, for
-    any liability that these contractual assumptions directly impose on
-    those licensors and authors.
-
-  All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10.  If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
-  If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
-  Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
-  8. Termination.
-
-  You may not propagate or modify a covered work except as expressly
-provided under this License.  Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
-  However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
-  Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
-  Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
-  9. Acceptance Not Required for Having Copies.
-
-  You are not required to accept this License in order to receive or
-run a copy of the Program.  Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance.  However,
-nothing other than this License grants you permission to propagate or
-modify any covered work.  These actions infringe copyright if you do
-not accept this License.  Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
-  10. Automatic Licensing of Downstream Recipients.
-
-  Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License.  You are not responsible
-for enforcing compliance by third parties with this License.
-
-  An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations.  If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
-  You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License.  For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
-  11. Patents.
-
-  A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based.  The
-work thus licensed is called the contributor's "contributor version".
-
-  A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
-  Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
-  In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement).  To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
-  If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
-  If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
-  A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License.  You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
-  Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
-  12. No Surrender of Others' Freedom.
-
-  If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
-  13. Use with the GNU Affero General Public License.
-
-  Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU Affero General Public License into a single
-combined work, and to convey the resulting work.  The terms of this
-License will continue to apply to the part which is the covered work,
-but the special requirements of the GNU Affero General Public License,
-section 13, concerning interaction through a network will apply to the
-combination as such.
-
-  14. Revised Versions of this License.
-
-  The Free Software Foundation may publish revised and/or new versions of
-the GNU General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-  Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation.  If the Program does not specify a version number of the
-GNU General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
-  If the Program specifies that a proxy can decide which future
-versions of the GNU General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
-  Later license versions may give you additional or different
-permissions.  However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
-  15. Disclaimer of Warranty.
-
-  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. Limitation of Liability.
-
-  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
-  17. Interpretation of Sections 15 and 16.
-
-  If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
-  If the program does terminal interaction, make it output a short
-notice like this when it starts in an interactive mode:
-
-    <program>  Copyright (C) <year>  <name of author>
-    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, your program's commands
-might be different; for a GUI interface, you would use an "about box".
-
-  You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU GPL, see
-<http://www.gnu.org/licenses/>.
-
-  The GNU General Public License does not permit incorporating your program
-into proprietary programs.  If your program is a subroutine library, you
-may consider it more useful to permit linking proprietary applications with
-the library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.  But first, please read
-<http://www.gnu.org/philosophy/why-not-lgpl.html>.
-//! [GPL v3]
diff --git a/doc/codesnippets/doc/src/snippets/code/doc_src_graphicsview.qdoc b/doc/codesnippets/doc/src/snippets/code/doc_src_graphicsview.qdoc
deleted file mode 100644
index 4c19784..0000000
--- a/doc/codesnippets/doc/src/snippets/code/doc_src_graphicsview.qdoc
+++ /dev/null
@@ -1,77 +0,0 @@
-//! [0]
-QGraphicsScene scene;
-QGraphicsRectItem *rect = scene.addRect(QRectF(0, 0, 100, 100));
-
-QGraphicsItem *item = scene.itemAt(50, 50);
-// item == rect
-//! [0]
-
-
-//! [1]
-QGraphicsScene scene;
-myPopulateScene(&scene);
-
-QGraphicsView view(&scene);
-view.show();
-//! [1]
-
-
-//! [2]
-class View : public QGraphicsView
-{
-Q_OBJECT
-    ...
-public slots:
-    void zoomIn() { scale(1.2, 1.2); }
-    void zoomOut() { scale(1 / 1.2, 1 / 1.2); }
-    void rotateLeft() { rotate(-10); }
-    void rotateRight() { rotate(10); }
-    ...
-};
-//! [2]
-
-
-//! [3]
-QGraphicsScene scene;
-scene.addRect(QRectF(0, 0, 100, 200), QPen(Qt::black), QBrush(Qt::green));
-
-QPrinter printer;
-if (QPrintDialog(&printer).exec() == QDialog::Accepted) {
-    QPainter painter(&printer);
-    painter.setRenderHint(QPainter::Antialiasing);
-    scene.render(&painter);
-}
-//! [3]
-
-
-//! [4]
-QGraphicsScene scene;
-scene.addRect(QRectF(0, 0, 100, 200), QPen(Qt::black), QBrush(Qt::green));
-
-QPixmap pixmap;
-QPainter painter(&pixmap);
-painter.setRenderHint(QPainter::Antialiasing);
-scene.render(&painter);
-painter.end();
-
-pixmap.save("scene.png");
-//! [4]
-
-
-//! [5]
-void CustomItem::mousePressEvent(QGraphicsSceneMouseEvent *event)
-{
-    QMimeData *data = new QMimeData;
-    data->setColor(Qt::green);
-
-    QDrag *drag = new QDrag(event->widget());
-    drag->setMimeData(data);
-    drag->start();
-}
-//! [5]
-
-
-//! [6]
-QGraphicsView view(&scene);
-view.setViewport(new QGLWidget(QGLFormat(QGL::SampleBuffers)));
-//! [6]
diff --git a/doc/codesnippets/doc/src/snippets/code/doc_src_groups.qdoc b/doc/codesnippets/doc/src/snippets/code/doc_src_groups.qdoc
deleted file mode 100644
index 51c2944..0000000
--- a/doc/codesnippets/doc/src/snippets/code/doc_src_groups.qdoc
+++ /dev/null
@@ -1,26 +0,0 @@
-//! [0]
-void QPen::setStyle(Qt::PenStyle style)
-{
-    detach();           // detach from common data
-    d->style = style;   // set the style member
-}
-
-void QPen::detach()
-{
-    if (d->ref != 1) {
-        ...             // perform a deep copy
-    }
-}
-//! [0]
-
-
-//! [1]
-QPixmap p1, p2;
-p1.load("image.bmp");
-p2 = p1;                        // p1 and p2 share data
-
-QPainter paint;
-paint.begin(&p2);               // cuts p2 loose from p1
-paint.drawText(0,50, "Hi");
-paint.end();
-//! [1]
diff --git a/doc/codesnippets/doc/src/snippets/code/doc_src_i18n.qdoc b/doc/codesnippets/doc/src/snippets/code/doc_src_i18n.qdoc
deleted file mode 100644
index 857e70c..0000000
--- a/doc/codesnippets/doc/src/snippets/code/doc_src_i18n.qdoc
+++ /dev/null
@@ -1,155 +0,0 @@
-//! [0]
-LoginWidget::LoginWidget()
-{
-    QLabel *label = new QLabel(tr("Password:"));
-    ...
-}
-//! [0]
-
-
-//! [1]
-void some_global_function(LoginWidget *logwid)
-{
-    QLabel *label = new QLabel(
-                LoginWidget::tr("Password:"), logwid);
-}
-
-void same_global_function(LoginWidget *logwid)
-{
-    QLabel *label = new QLabel(
-                qApp->translate("LoginWidget", "Password:"), logwid);
-}
-//! [1]
-
-
-//! [2]
-QString FriendlyConversation::greeting(int type)
-{
-    static const char *greeting_strings[] = {
-        QT_TR_NOOP("Hello"),
-        QT_TR_NOOP("Goodbye")
-    };
-    return tr(greeting_strings[type]);
-}
-//! [2]
-
-
-//! [3]
-static const char *greeting_strings[] = {
-    QT_TRANSLATE_NOOP("FriendlyConversation", "Hello"),
-    QT_TRANSLATE_NOOP("FriendlyConversation", "Goodbye")
-};
-
-QString FriendlyConversation::greeting(int type)
-{
-    return tr(greeting_strings[type]);
-}
-
-QString global_greeting(int type)
-{
-    return qApp->translate("FriendlyConversation",
-                           greeting_strings[type]);
-}
-//! [3]
-
-
-//! [4]
-void FileCopier::showProgress(int done, int total,
-                              const QString &currentFile)
-{
-    label.setText(tr("%1 of %2 files copied.\nCopying: %3")
-                  .arg(done)
-                  .arg(total)
-                  .arg(currentFile));
-}
-//! [4]
-
-
-//! [5]
-QString s1 = "%1 of %2 files copied. Copying: %3";
-QString s2 = "Kopierer nu %3. Av totalt %2 filer er %1 kopiert.";
-
-qDebug() << s1.arg(5).arg(10).arg("somefile.txt");
-qDebug() << s2.arg(5).arg(10).arg("somefile.txt");
-//! [5]
-
-
-//! [6]
-5 of 10 files copied. Copying: somefile.txt
-Kopierer nu somefile.txt. Av totalt 10 filer er 5 kopiert.
-//! [6]
-
-
-//! [7]
-HEADERS         = funnydialog.h \
-                  wackywidget.h
-SOURCES         = funnydialog.cpp \
-                  main.cpp \
-                  wackywidget.cpp
-FORMS           = fancybox.ui
-TRANSLATIONS    = superapp_dk.ts \
-                  superapp_fi.ts \
-                  superapp_no.ts \
-                  superapp_se.ts
-//! [7]
-
-
-//! [8]
-int main(int argc, char *argv[])
-{
-    QApplication app(argc, argv);
-
-    QTranslator qtTranslator;
-    qtTranslator.load("qt_" + QLocale::system().name(),
-            QLibraryInfo::location(QLibraryInfo::TranslationsPath));
-    app.installTranslator(&qtTranslator);
-
-    QTranslator myappTranslator;
-    myappTranslator.load("myapp_" + QLocale::system().name());
-    app.installTranslator(&myappTranslator);
-
-    ...
-    return app.exec();
-}
-//! [8]
-
-
-//! [9]
-QString string = ...; // some Unicode text
-
-QTextCodec *codec = QTextCodec::codecForName("ISO 8859-5");
-QByteArray encodedString = codec->fromUnicode(string);
-//! [9]
-
-
-//! [10]
-QByteArray encodedString = ...; // some ISO 8859-5 encoded text
-
-QTextCodec *codec = QTextCodec::codecForName("ISO 8859-5");
-QString string = codec->toUnicode(encodedString);
-//! [10]
-
-
-//! [11]
-void Clock::setTime(const QTime &time)
-{
-    if (tr("AMPM") == "AMPM") {
-        // 12-hour clock
-    } else {
-        // 24-hour clock
-    }
-}
-//! [11]
-
-
-//! [12]
-void QWidget::changeEvent(QEvent *event)
-{
-    if (e->type() == QEvent::LanguageChange) {
-        titleLabel->setText(tr("Document Title"));
-        ...
-        okPushButton->setText(tr("&OK"));
-    } else
-        QWidget::changeEvent(event);
-}
-//! [12]
diff --git a/doc/codesnippets/doc/src/snippets/code/doc_src_installation.qdoc b/doc/codesnippets/doc/src/snippets/code/doc_src_installation.qdoc
deleted file mode 100644
index 761df44..0000000
--- a/doc/codesnippets/doc/src/snippets/code/doc_src_installation.qdoc
+++ /dev/null
@@ -1,127 +0,0 @@
-//! [0]
-cd /tmp
-gunzip qt-x11-opensource-desktop-4.5.2.tar.gz        # uncompress the archive
-tar xvf qt-x11-opensource-desktop-4.5.2.tar          # unpack it
-//! [0]
-
-
-//! [1]
-cd /tmp/qt-x11-opensource-desktop-4.5.2
-./configure
-//! [1]
-
-
-//! [2]
-make
-//! [2]
-
-
-//! [3]
-make install
-//! [3]
-
-
-//! [4]
-PATH               - to locate qmake, moc and other Qt tools
-//! [4]
-
-
-//! [5]
-PATH=/usr/local/Trolltech/Qt-4.5.2/bin:$PATH
-export PATH
-//! [5]
-
-
-//! [6]
-setenv PATH /usr/local/Trolltech/Qt-4.5.2/bin:$PATH
-//! [6]
-
-
-//! [7]
-PATH               - to locate qmake, moc and other Qt tools
-//! [7]
-
-
-//! [8]
-C:
-cd /D C:\Qt\4.5.2
-configure
-//! [8]
-
-
-//! [9]
-configure -platform win32-msvc
-//! [9]
-
-
-//! [10]
-nmake
-//! [10]
-
-
-//! [11]
-cd /tmp
-gunzip qt-mac-opensource-desktop-4.5.2.tar.gz        # uncompress the archive
-tar xvf qt-mac-opensource-desktop-4.5.2.tar          # unpack it
-//! [11]
-
-
-//! [12]
-cd /tmp/qt-mac-opensource-desktop-4.5.2
-./configure
-//! [12]
-
-
-//! [13]
-make
-//! [13]
-
-
-//! [14]
-sudo make -j1 install
-//! [14]
-
-
-//! [15]
-PATH               - to locate qmake, moc and other Qt tools
-//! [15]
-
-
-//! [16]
-PATH=/usr/local/Trolltech/Qt-4.5.2/bin:$PATH
-export PATH
-//! [16]
-
-
-//! [17]
-setenv PATH /usr/local/Trolltech/Qt-4.5.2/bin:$PATH
-//! [17]
-
-
-//! [18]
-PATH               - to locate qmake, moc and other Qt tools
-//! [18]
-
-
-//! [19]
-C:
-cd \Qt\4.5.2
-configure -platform win32-msvc2005 -xplatform wincewm50pocket-msvc2005
-//! [19]
-
-
-//! [20]
-set INCLUDE=C:\Program Files\Microsoft Visual Studio 8\VC\ce\include;C:\Program Files\Windows CE Tools\wce500\Windows Mobile 5.0 Pocket PC SDK\Include\Armv4i
-set LIB=C:\Program Files\Microsoft Visual Studio 8\VC\ce\lib\armv4i;C:\Program Files\Windows CE Tools\wce500\Windows Mobile 5.0 Pocket PC SDK\Lib\ARMV4I
-set PATH=C:\Program Files\Microsoft Visual Studio 8\VC\ce\bin\x86_arm;%PATH%
-//! [20]
-
-
-//! [21]
-setcepaths wincewm50pocket-msvc2005
-//! [21]
-
-
-//! [22]
-nmake
-//! [22]
diff --git a/doc/codesnippets/doc/src/snippets/code/doc_src_introtodbus.qdoc b/doc/codesnippets/doc/src/snippets/code/doc_src_introtodbus.qdoc
deleted file mode 100644
index bedfe7f..0000000
--- a/doc/codesnippets/doc/src/snippets/code/doc_src_introtodbus.qdoc
+++ /dev/null
@@ -1,3 +0,0 @@
-//! [0]
-org.freedesktop.DBus
-//! [0]
diff --git a/doc/codesnippets/doc/src/snippets/code/doc_src_layout.qdoc b/doc/codesnippets/doc/src/snippets/code/doc_src_layout.qdoc
deleted file mode 100644
index 60f36b0..0000000
--- a/doc/codesnippets/doc/src/snippets/code/doc_src_layout.qdoc
+++ /dev/null
@@ -1,126 +0,0 @@
-//! [0]
-#ifndef CARD_H
-#define CARD_H
-
-#include <QtGui>
-#include <QList>
-
-class CardLayout : public QLayout
-{
-public:
-    CardLayout(QWidget *parent, int dist): QLayout(parent, 0, dist) {}
-    CardLayout(QLayout *parent, int dist): QLayout(parent, dist) {}
-    CardLayout(int dist): QLayout(dist) {}
-    ~CardLayout();
-
-    void addItem(QLayoutItem *item);
-    QSize sizeHint() const;
-    QSize minimumSize() const;
-	QLayoutItem *count() const;
-    QLayoutItem *itemAt(int) const;
-    QLayoutItem *takeAt(int);
-    void setGeometry(const QRect &rect);
-
-private:
-    QList<QLayoutItem*> list;
-};
-#endif
-//! [0]
-
-
-//! [1]
-//#include "card.h"
-//! [1]
-
-//! [2]
-QLayoutItem *CardLayout::count() const
-{
-	// QList::size() returns the number of QLayoutItems in the list
-    return list.size();
-}
-//! [2]
-
-//! [3]
-QLayoutItem *CardLayout::itemAt(int idx) const
-{
-    // QList::value() performs index checking, and returns 0 if we are
-    // outside the valid range
-    return list.value(idx);
-}
-
-QLayoutItem *CardLayout::takeAt(int idx)
-{
-    // QList::take does not do index checking
-    return idx >= 0 && idx < list.size() ? list.takeAt(idx) : 0;
-}
-//! [3]
-
-
-//! [4]
-void CardLayout::addItem(QLayoutItem *item)
-{
-    list.append(item);
-}
-//! [4]
-
-
-//! [5]
-CardLayout::~CardLayout()
-{
-     QLayoutItem *item;
-     while ((item = takeAt(0)))
-         delete item;
-}
-//! [5]
-
-
-//! [6]
-void CardLayout::setGeometry(const QRect &r)
-{
-    QLayout::setGeometry(r);
-
-    if (list.size() == 0)
-        return;
-
-    int w = r.width() - (list.count() - 1) * spacing();
-    int h = r.height() - (list.count() - 1) * spacing();
-    int i = 0;
-    while (i < list.size()) {
-        QLayoutItem *o = list.at(i);
-        QRect geom(r.x() + i * spacing(), r.y() + i * spacing(), w, h);
-        o->setGeometry(geom);
-        ++i;
-    }
-}
-//! [6]
-
-
-//! [7]
-QSize CardLayout::sizeHint() const
-{
-    QSize s(0,0);
-    int n = list.count();
-    if (n > 0)
-        s = QSize(100,70); //start with a nice default size
-    int i = 0;
-    while (i < n) {
-        QLayoutItem *o = list.at(i);
-        s = s.expandedTo(o->sizeHint());
-        ++i;
-    }
-    return s + n*QSize(spacing(), spacing());
-}
-
-QSize CardLayout::minimumSize() const
-{
-    QSize s(0,0);
-    int n = list.count();
-    int i = 0;
-    while (i < n) {
-        QLayoutItem *o = list.at(i);
-        s = s.expandedTo(o->minimumSize());
-        ++i;
-    }
-    return s + n*QSize(spacing(), spacing());
-}
-//! [7]
diff --git a/doc/codesnippets/doc/src/snippets/code/doc_src_lgpl.qdoc b/doc/codesnippets/doc/src/snippets/code/doc_src_lgpl.qdoc
deleted file mode 100644
index dc76d85..0000000
--- a/doc/codesnippets/doc/src/snippets/code/doc_src_lgpl.qdoc
+++ /dev/null
@@ -1,507 +0,0 @@
-//! [LGPL v2.1]
-		  GNU LESSER GENERAL PUBLIC LICENSE
-		       Version 2.1, February 1999
-
- Copyright (C) 1991, 1999 Free Software Foundation, Inc.
- 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-[This is the first released version of the Lesser GPL.  It also counts
- as the successor of the GNU Library Public License, version 2, hence
- the version number 2.1.]
-
-			    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-Licenses are intended to guarantee your freedom to share and change
-free software--to make sure the software is free for all its users.
-
-  This license, the Lesser General Public License, applies to some
-specially designated software packages--typically libraries--of the
-Free Software Foundation and other authors who decide to use it.  You
-can use it too, but we suggest you first think carefully about whether
-this license or the ordinary General Public License is the better
-strategy to use in any particular case, based on the explanations below.
-
-  When we speak of free software, we are referring to freedom of use,
-not price.  Our General Public Licenses are designed to make sure that
-you have the freedom to distribute copies of free software (and charge
-for this service if you wish); that you receive source code or can get
-it if you want it; that you can change the software and use pieces of
-it in new free programs; and that you are informed that you can do
-these things.
-
-  To protect your rights, we need to make restrictions that forbid
-distributors to deny you these rights or to ask you to surrender these
-rights.  These restrictions translate to certain responsibilities for
-you if you distribute copies of the library or if you modify it.
-
-  For example, if you distribute copies of the library, whether gratis
-or for a fee, you must give the recipients all the rights that we gave
-you.  You must make sure that they, too, receive or can get the source
-code.  If you link other code with the library, you must provide
-complete object files to the recipients, so that they can relink them
-with the library after making changes to the library and recompiling
-it.  And you must show them these terms so they know their rights.
-
-  We protect your rights with a two-step method: (1) we copyright the
-library, and (2) we offer you this license, which gives you legal
-permission to copy, distribute and/or modify the library.
-
-  To protect each distributor, we want to make it very clear that
-there is no warranty for the free library.  Also, if the library is
-modified by someone else and passed on, the recipients should know
-that what they have is not the original version, so that the original
-author's reputation will not be affected by problems that might be
-introduced by others.
-
-  Finally, software patents pose a constant threat to the existence of
-any free program.  We wish to make sure that a company cannot
-effectively restrict the users of a free program by obtaining a
-restrictive license from a patent holder.  Therefore, we insist that
-any patent license obtained for a version of the library must be
-consistent with the full freedom of use specified in this license.
-
-  Most GNU software, including some libraries, is covered by the
-ordinary GNU General Public License.  This license, the GNU Lesser
-General Public License, applies to certain designated libraries, and
-is quite different from the ordinary General Public License.  We use
-this license for certain libraries in order to permit linking those
-libraries into non-free programs.
-
-  When a program is linked with a library, whether statically or using
-a shared library, the combination of the two is legally speaking a
-combined work, a derivative of the original library.  The ordinary
-General Public License therefore permits such linking only if the
-entire combination fits its criteria of freedom.  The Lesser General
-Public License permits more lax criteria for linking other code with
-the library.
-
-  We call this license the "Lesser" General Public License because it
-does Less to protect the user's freedom than the ordinary General
-Public License.  It also provides other free software developers Less
-of an advantage over competing non-free programs.  These disadvantages
-are the reason we use the ordinary General Public License for many
-libraries.  However, the Lesser license provides advantages in certain
-special circumstances.
-
-  For example, on rare occasions, there may be a special need to
-encourage the widest possible use of a certain library, so that it becomes
-a de-facto standard.  To achieve this, non-free programs must be
-allowed to use the library.  A more frequent case is that a free
-library does the same job as widely used non-free libraries.  In this
-case, there is little to gain by limiting the free library to free
-software only, so we use the Lesser General Public License.
-
-  In other cases, permission to use a particular library in non-free
-programs enables a greater number of people to use a large body of
-free software.  For example, permission to use the GNU C Library in
-non-free programs enables many more people to use the whole GNU
-operating system, as well as its variant, the GNU/Linux operating
-system.
-
-  Although the Lesser General Public License is Less protective of the
-users' freedom, it does ensure that the user of a program that is
-linked with the Library has the freedom and the wherewithal to run
-that program using a modified version of the Library.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.  Pay close attention to the difference between a
-"work based on the library" and a "work that uses the library".  The
-former contains code derived from the library, whereas the latter must
-be combined with the library in order to run.
-
-		  GNU LESSER GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License Agreement applies to any software library or other
-program which contains a notice placed by the copyright holder or
-other authorized party saying it may be distributed under the terms of
-this Lesser General Public License (also called "this License").
-Each licensee is addressed as "you".
-
-  A "library" means a collection of software functions and/or data
-prepared so as to be conveniently linked with application programs
-(which use some of those functions and data) to form executables.
-
-  The "Library", below, refers to any such software library or work
-which has been distributed under these terms.  A "work based on the
-Library" means either the Library or any derivative work under
-copyright law: that is to say, a work containing the Library or a
-portion of it, either verbatim or with modifications and/or translated
-straightforwardly into another language.  (Hereinafter, translation is
-included without limitation in the term "modification".)
-
-  "Source code" for a work means the preferred form of the work for
-making modifications to it.  For a library, complete source code means
-all the source code for all modules it contains, plus any associated
-interface definition files, plus the scripts used to control compilation
-and installation of the library.
-
-  Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running a program using the Library is not restricted, and output from
-such a program is covered only if its contents constitute a work based
-on the Library (independent of the use of the Library in a tool for
-writing it).  Whether that is true depends on what the Library does
-and what the program that uses the Library does.
-  
-  1. You may copy and distribute verbatim copies of the Library's
-complete source code as you receive it, in any medium, provided that
-you conspicuously and appropriately publish on each copy an
-appropriate copyright notice and disclaimer of warranty; keep intact
-all the notices that refer to this License and to the absence of any
-warranty; and distribute a copy of this License along with the
-Library.
-
-  You may charge a fee for the physical act of transferring a copy,
-and you may at your option offer warranty protection in exchange for a
-fee.
-
-  2. You may modify your copy or copies of the Library or any portion
-of it, thus forming a work based on the Library, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) The modified work must itself be a software library.
-
-    b) You must cause the files modified to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    c) You must cause the whole of the work to be licensed at no
-    charge to all third parties under the terms of this License.
-
-    d) If a facility in the modified Library refers to a function or a
-    table of data to be supplied by an application program that uses
-    the facility, other than as an argument passed when the facility
-    is invoked, then you must make a good faith effort to ensure that,
-    in the event an application does not supply such function or
-    table, the facility still operates, and performs whatever part of
-    its purpose remains meaningful.
-
-    (For example, a function in a library to compute square roots has
-    a purpose that is entirely well-defined independent of the
-    application.  Therefore, Subsection 2d requires that any
-    application-supplied function or table used by this function must
-    be optional: if the application does not supply it, the square
-    root function must still compute square roots.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Library,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Library, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote
-it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Library.
-
-In addition, mere aggregation of another work not based on the Library
-with the Library (or with a work based on the Library) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may opt to apply the terms of the ordinary GNU General Public
-License instead of this License to a given copy of the Library.  To do
-this, you must alter all the notices that refer to this License, so
-that they refer to the ordinary GNU General Public License, version 2,
-instead of to this License.  (If a newer version than version 2 of the
-ordinary GNU General Public License has appeared, then you can specify
-that version instead if you wish.)  Do not make any other change in
-these notices.
-
-  Once this change is made in a given copy, it is irreversible for
-that copy, so the ordinary GNU General Public License applies to all
-subsequent copies and derivative works made from that copy.
-
-  This option is useful when you wish to copy part of the code of
-the Library into a program that is not a library.
-
-  4. You may copy and distribute the Library (or a portion or
-derivative of it, under Section 2) in object code or executable form
-under the terms of Sections 1 and 2 above provided that you accompany
-it with the complete corresponding machine-readable source code, which
-must be distributed under the terms of Sections 1 and 2 above on a
-medium customarily used for software interchange.
-
-  If distribution of object code is made by offering access to copy
-from a designated place, then offering equivalent access to copy the
-source code from the same place satisfies the requirement to
-distribute the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  5. A program that contains no derivative of any portion of the
-Library, but is designed to work with the Library by being compiled or
-linked with it, is called a "work that uses the Library".  Such a
-work, in isolation, is not a derivative work of the Library, and
-therefore falls outside the scope of this License.
-
-  However, linking a "work that uses the Library" with the Library
-creates an executable that is a derivative of the Library (because it
-contains portions of the Library), rather than a "work that uses the
-library".  The executable is therefore covered by this License.
-Section 6 states terms for distribution of such executables.
-
-  When a "work that uses the Library" uses material from a header file
-that is part of the Library, the object code for the work may be a
-derivative work of the Library even though the source code is not.
-Whether this is true is especially significant if the work can be
-linked without the Library, or if the work is itself a library.  The
-threshold for this to be true is not precisely defined by law.
-
-  If such an object file uses only numerical parameters, data
-structure layouts and accessors, and small macros and small inline
-functions (ten lines or less in length), then the use of the object
-file is unrestricted, regardless of whether it is legally a derivative
-work.  (Executables containing this object code plus portions of the
-Library will still fall under Section 6.)
-
-  Otherwise, if the work is a derivative of the Library, you may
-distribute the object code for the work under the terms of Section 6.
-Any executables containing that work also fall under Section 6,
-whether or not they are linked directly with the Library itself.
-
-  6. As an exception to the Sections above, you may also combine or
-link a "work that uses the Library" with the Library to produce a
-work containing portions of the Library, and distribute that work
-under terms of your choice, provided that the terms permit
-modification of the work for the customer's own use and reverse
-engineering for debugging such modifications.
-
-  You must give prominent notice with each copy of the work that the
-Library is used in it and that the Library and its use are covered by
-this License.  You must supply a copy of this License.  If the work
-during execution displays copyright notices, you must include the
-copyright notice for the Library among them, as well as a reference
-directing the user to the copy of this License.  Also, you must do one
-of these things:
-
-    a) Accompany the work with the complete corresponding
-    machine-readable source code for the Library including whatever
-    changes were used in the work (which must be distributed under
-    Sections 1 and 2 above); and, if the work is an executable linked
-    with the Library, with the complete machine-readable "work that
-    uses the Library", as object code and/or source code, so that the
-    user can modify the Library and then relink to produce a modified
-    executable containing the modified Library.  (It is understood
-    that the user who changes the contents of definitions files in the
-    Library will not necessarily be able to recompile the application
-    to use the modified definitions.)
-
-    b) Use a suitable shared library mechanism for linking with the
-    Library.  A suitable mechanism is one that (1) uses at run time a
-    copy of the library already present on the user's computer system,
-    rather than copying library functions into the executable, and (2)
-    will operate properly with a modified version of the library, if
-    the user installs one, as long as the modified version is
-    interface-compatible with the version that the work was made with.
-
-    c) Accompany the work with a written offer, valid for at
-    least three years, to give the same user the materials
-    specified in Subsection 6a, above, for a charge no more
-    than the cost of performing this distribution.
-
-    d) If distribution of the work is made by offering access to copy
-    from a designated place, offer equivalent access to copy the above
-    specified materials from the same place.
-
-    e) Verify that the user has already received a copy of these
-    materials or that you have already sent this user a copy.
-
-  For an executable, the required form of the "work that uses the
-Library" must include any data and utility programs needed for
-reproducing the executable from it.  However, as a special exception,
-the materials to be distributed need not include anything that is
-normally distributed (in either source or binary form) with the major
-components (compiler, kernel, and so on) of the operating system on
-which the executable runs, unless that component itself accompanies
-the executable.
-
-  It may happen that this requirement contradicts the license
-restrictions of other proprietary libraries that do not normally
-accompany the operating system.  Such a contradiction means you cannot
-use both them and the Library together in an executable that you
-distribute.
-
-  7. You may place library facilities that are a work based on the
-Library side-by-side in a single library together with other library
-facilities not covered by this License, and distribute such a combined
-library, provided that the separate distribution of the work based on
-the Library and of the other library facilities is otherwise
-permitted, and provided that you do these two things:
-
-    a) Accompany the combined library with a copy of the same work
-    based on the Library, uncombined with any other library
-    facilities.  This must be distributed under the terms of the
-    Sections above.
-
-    b) Give prominent notice with the combined library of the fact
-    that part of it is a work based on the Library, and explaining
-    where to find the accompanying uncombined form of the same work.
-
-  8. You may not copy, modify, sublicense, link with, or distribute
-the Library except as expressly provided under this License.  Any
-attempt otherwise to copy, modify, sublicense, link with, or
-distribute the Library is void, and will automatically terminate your
-rights under this License.  However, parties who have received copies,
-or rights, from you under this License will not have their licenses
-terminated so long as such parties remain in full compliance.
-
-  9. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Library or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Library (or any work based on the
-Library), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Library or works based on it.
-
-  10. Each time you redistribute the Library (or any work based on the
-Library), the recipient automatically receives a license from the
-original licensor to copy, distribute, link with or modify the Library
-subject to these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties with
-this License.
-
-  11. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Library at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Library by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Library.
-
-If any portion of this section is held invalid or unenforceable under any
-particular circumstance, the balance of the section is intended to apply,
-and the section as a whole is intended to apply in other circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  12. If the distribution and/or use of the Library is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Library under this License may add
-an explicit geographical distribution limitation excluding those countries,
-so that distribution is permitted only in or among countries not thus
-excluded.  In such case, this License incorporates the limitation as if
-written in the body of this License.
-
-  13. The Free Software Foundation may publish revised and/or new
-versions of the Lesser General Public License from time to time.
-Such new versions will be similar in spirit to the present version,
-but may differ in detail to address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Library
-specifies a version number of this License which applies to it and
-"any later version", you have the option of following the terms and
-conditions either of that version or of any later version published by
-the Free Software Foundation.  If the Library does not specify a
-license version number, you may choose any version ever published by
-the Free Software Foundation.
-
-  14. If you wish to incorporate parts of the Library into other free
-programs whose distribution conditions are incompatible with these,
-write to the author to ask for permission.  For software which is
-copyrighted by the Free Software Foundation, write to the Free
-Software Foundation; we sometimes make exceptions for this.  Our
-decision will be guided by the two goals of preserving the free status
-of all derivatives of our free software and of promoting the sharing
-and reuse of software generally.
-
-			    NO WARRANTY
-
-  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
-WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
-EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
-OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
-KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
-LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
-THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
-WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
-AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
-FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
-CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
-LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
-RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
-FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
-SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGES.
-
-		     END OF TERMS AND CONDITIONS
-
-           How to Apply These Terms to Your New Libraries
-
-  If you develop a new library, and you want it to be of the greatest
-possible use to the public, we recommend making it free software that
-everyone can redistribute and change.  You can do so by permitting
-redistribution under these terms (or, alternatively, under the terms of the
-ordinary General Public License).
-
-  To apply these terms, attach the following notices to the library.  It is
-safest to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least the
-"copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the library's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-
-Also add information on how to contact you by electronic and paper mail.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the library, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the
-  library `Frob' (a library for tweaking knobs) written by James Random Hacker.
-
-  <signature of Ty Coon>, 1 April 1990
-  Ty Coon, President of Vice
-
-That's all there is to it!
-
-
-
-//! [LGPL v2.1]
diff --git a/doc/codesnippets/doc/src/snippets/code/doc_src_licenses.qdoc b/doc/codesnippets/doc/src/snippets/code/doc_src_licenses.qdoc
deleted file mode 100644
index 4a95a50..0000000
--- a/doc/codesnippets/doc/src/snippets/code/doc_src_licenses.qdoc
+++ /dev/null
@@ -1,108 +0,0 @@
-//! [1]
-    [utopiafonts] 1999 free font
-    ----------------------------------------------------
-
-    this font is provided free for personal or commercial use,
-    it can be redistributed however it may not be sold.  
-    ----------------------------------------------------
-    (C) 1999 utopiafonts. dale_thorpe@bssc.edu.au
-//! [1]
-
-
-//! [2]
-    Bitstream Vera Fonts Copyright
-    ------------------------------
-
-    Copyright (c) 2003 by Bitstream, Inc. All Rights Reserved. Bitstream Vera is
-    a trademark of Bitstream, Inc.
-
-    Permission is hereby granted, free of charge, to any person obtaining a copy
-    of the fonts accompanying this license ("Fonts") and associated
-    documentation files (the "Font Software"), to reproduce and distribute the
-    Font Software, including without limitation the rights to use, copy, merge,
-    publish, distribute, and/or sell copies of the Font Software, and to permit
-    persons to whom the Font Software is furnished to do so, subject to the
-    following conditions:
-
-    The above copyright and trademark notices and this permission notice shall
-    be included in all copies of one or more of the Font Software typefaces.
-
-    The Font Software may be modified, altered, or added to, and in particular
-    the designs of glyphs or characters in the Fonts may be modified and
-    additional glyphs or characters may be added to the Fonts, only if the fonts
-    are renamed to names not containing either the words "Bitstream" or the word
-    "Vera".
-
-    This License becomes null and void to the extent applicable to Fonts or Font
-    Software that has been modified and is distributed under the "Bitstream
-    Vera" names.
-
-    The Font Software may be sold as part of a larger software package but no
-    copy of one or more of the Font Software typefaces may be sold by itself.
-
-    THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-    OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF MERCHANTABILITY,
-    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF COPYRIGHT, PATENT,
-    TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL BITSTREAM OR THE GNOME
-    FOUNDATION BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, INCLUDING
-    ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL DAMAGES,
-    WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
-    THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM OTHER DEALINGS IN THE
-    FONT SOFTWARE.
-
-    Except as contained in this notice, the names of Gnome, the Gnome
-    Foundation, and Bitstream Inc., shall not be used in advertising or
-    otherwise to promote the sale, use or other dealings in this Font Software
-    without prior written authorization from the Gnome Foundation or Bitstream
-    Inc., respectively. For further information, contact: fonts at gnome dot
-    org. 
-
-    Arev Fonts Copyright
-    ------------------------------
-
-    Copyright (c) 2006 by Tavmjong Bah. All Rights Reserved.
-
-    Permission is hereby granted, free of charge, to any person obtaining
-    a copy of the fonts accompanying this license ("Fonts") and
-    associated documentation files (the "Font Software"), to reproduce
-    and distribute the modifications to the Bitstream Vera Font Software,
-    including without limitation the rights to use, copy, merge, publish,
-    distribute, and/or sell copies of the Font Software, and to permit
-    persons to whom the Font Software is furnished to do so, subject to
-    the following conditions:
-
-    The above copyright and trademark notices and this permission notice
-    shall be included in all copies of one or more of the Font Software
-    typefaces.
-
-    The Font Software may be modified, altered, or added to, and in
-    particular the designs of glyphs or characters in the Fonts may be
-    modified and additional glyphs or characters may be added to the
-    Fonts, only if the fonts are renamed to names not containing either
-    the words "Tavmjong Bah" or the word "Arev".
-
-    This License becomes null and void to the extent applicable to Fonts
-    or Font Software that has been modified and is distributed under the 
-    "Tavmjong Bah Arev" names.
-
-    The Font Software may be sold as part of a larger software package but
-    no copy of one or more of the Font Software typefaces may be sold by
-    itself.
-
-    THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-    EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
-    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-    OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL
-    TAVMJONG BAH BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-    INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
-    DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-    FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
-    OTHER DEALINGS IN THE FONT SOFTWARE.
-
-    Except as contained in this notice, the name of Tavmjong Bah shall not
-    be used in advertising or otherwise to promote the sale, use or other
-    dealings in this Font Software without prior written authorization
-    from Tavmjong Bah. For further information, contact: tavmjong @ free
-    . fr.
-
-//! [2]
diff --git a/doc/codesnippets/doc/src/snippets/code/doc_src_linguist-manual.qdoc b/doc/codesnippets/doc/src/snippets/code/doc_src_linguist-manual.qdoc
deleted file mode 100644
index ce3b997..0000000
--- a/doc/codesnippets/doc/src/snippets/code/doc_src_linguist-manual.qdoc
+++ /dev/null
@@ -1,183 +0,0 @@
-//! [0]
-HEADERS         = main-dlg.h \
-                  options-dlg.h
-SOURCES         = main-dlg.cpp \
-                  options-dlg.cpp \
-                  main.cpp
-FORMS           = search-dlg.ui
-TRANSLATIONS    = superapp_dk.ts \
-                  superapp_fi.ts \
-                  superapp_no.ts \
-                  superapp_se.ts
-//! [0]
-
-
-//! [1]
-CODECFORTR      = ISO-8859-5
-//! [1]
-
-
-//! [2]
-CODECFORSRC     = UTF-8
-//! [2]
-
-
-//! [3]
-label->setText(tr("F\374r \310lise"));
-//! [3]
-
-
-//! [4]
-Usage:
-    lupdate [options] [project-file]
-    lupdate [options] [source-file|path]... -ts ts-files
-Options:
-    -help  Display this information and exit.
-    -noobsolete
-           Drop all obsolete strings.
-    -extensions <ext>[,<ext>]...
-           Process files with the given extensions only.
-           The extension list must be separated with commas, not with whitespace.
-           Default: 'ui,c,c++,cc,cpp,cxx,ch,h,h++,hh,hpp,hxx'.
-    -pluralonly
-           Only include plural form messages.
-    -silent
-           Don't explain what is being done.
-    -version
-           Display the version of lupdate and exit.
-//! [4]
-
-
-//! [5]
-Usage:
-    lrelease [options] project-file
-    lrelease [options] ts-files [-qm qm-file]
-Options:
-    -help  Display this information and exit
-    -compress
-           Compress the .qm files
-    -nounfinished
-           Do not include unfinished translations
-    -removeidentical
-           If the translated text is the same as
-           the source text, do not include the message
-    -silent
-           Don't explain what is being done
-    -version
-           Display the version of lrelease and exit
-//! [5]
-
-
-void wrapInFunction()
-{
-//! [6]
-button = new QPushButton("&Quit", this);
-//! [6]
-
-
-//! [7]
-button = new QPushButton(tr("&Quit"), this);
-//! [7]
-
-
-//! [8]
-QPushButton::tr("&Quit")
-//! [8]
-
-
-//! [9]
-QObject::tr("&Quit")
-//! [9]
-
-
-//! [10]
-rbc = new QRadioButton(tr("Enabled", "Color frame"), this);
-//! [10]
-
-
-//! [11]
-rbh = new QRadioButton(tr("Enabled", "Hue frame"), this);
-//! [11]
-}
-
-
-//! [12]
-/*
-    TRANSLATOR FindDialog
-
-    Choose Edit|Find from the menu bar or press Ctrl+F to pop up the
-    Find dialog.
-
-    ...
-*/
-//! [12]
-
-//! [13]
-/*
-    TRANSLATOR MyNamespace::MyClass
-
-    Necessary for lupdate.
-
-    ...
-*/
-//! [13]
-
-//! [14]
-void some_global_function(LoginWidget *logwid)
-{
-    QLabel *label = new QLabel(
-            LoginWidget::tr("Password:"), logwid);
-}
-
-void same_global_function(LoginWidget *logwid)
-{
-    QLabel *label = new QLabel(
-            qApp->translate("LoginWidget", "Password:"),
-            logwid);
-}
-//! [14]
-
-
-//! [15]
-QString FriendlyConversation::greeting(int greet_type)
-{
-    static const char* greeting_strings[] = {
-        QT_TR_NOOP("Hello"),
-        QT_TR_NOOP("Goodbye")
-    };
-    return tr(greeting_strings[greet_type]);
-}
-//! [15]
-
-
-//! [16]
-static const char* greeting_strings[] = {
-    QT_TRANSLATE_NOOP("FriendlyConversation", "Hello"),
-    QT_TRANSLATE_NOOP("FriendlyConversation", "Goodbye")
-};
-
-QString FriendlyConversation::greeting(int greet_type)
-{
-    return tr(greeting_strings[greet_type]);
-}
-
-QString global_greeting(int greet_type)
-{
-    return qApp->translate("FriendlyConversation",
-                            greeting_strings[greet_type]);
-}
-//! [16]
-
-void wrapInFunction()
-{
-
-//! [17]
-QString tr(const char *text, const char *comment, int n);
-//! [17]
-
-//! [18]
-tr("%n item(s) replaced", "", count);
-//! [18]
-
-}
-
diff --git a/doc/codesnippets/doc/src/snippets/code/doc_src_moc.qdoc b/doc/codesnippets/doc/src/snippets/code/doc_src_moc.qdoc
deleted file mode 100644
index 59739e1..0000000
--- a/doc/codesnippets/doc/src/snippets/code/doc_src_moc.qdoc
+++ /dev/null
@@ -1,124 +0,0 @@
-//! [0]
-moc_%.cpp: %.h
-        moc $(DEFINES) $(INCPATH) $< -o $@
-//! [0]
-
-
-//! [1]
-moc_foo.cpp: foo.h
-        moc $(DEFINES) $(INCPATH) $< -o $@
-//! [1]
-
-
-//! [2]
-foo.o: foo.moc
-
-foo.moc: foo.cpp
-        moc $(DEFINES) $(INCPATH) -i $< -o $@
-//! [2]
-
-
-//! [3]
-#include "foo.moc"
-//! [3]
-
-
-//! [4]
-#ifndef Q_MOC_RUN
-    ... 
-#endif
-//! [4]
-
-
-//! [5]
-class SomeTemplate<int> : public QFrame
-{
-    Q_OBJECT
-    ...
-
-signals:
-    void mySignal(int);
-};
-//! [5]
-
-
-//! [6]
-// correct
-class SomeClass : public QObject, public OtherClass
-{
-    ...
-};
-//! [6]
-
-
-//! [7]
-class SomeClass : public QObject
-{
-    Q_OBJECT
-
-public slots:
-    void apply(void (*apply)(List *, void *), char *); // WRONG
-};
-//! [7]
-
-
-//! [8]
-typedef void (*ApplyFunction)(List *, void *);
-
-class SomeClass : public QObject
-{
-    Q_OBJECT
-
-public slots:
-    void apply(ApplyFunction, char *);
-};
-//! [8]
-
-
-//! [9]
-class MyClass : public QObject
-{
-    Q_OBJECT
-
-    enum Error {
-        ConnectionRefused,
-        RemoteHostClosed,
-        UnknownError
-    };
-
-signals:
-    void stateChanged(MyClass::Error error);
-};
-//! [9]
-
-
-//! [10]
-#ifdef ultrix
-#define SIGNEDNESS(a) unsigned a
-#else
-#define SIGNEDNESS(a) a
-#endif
-
-class Whatever : public QObject
-{
-    Q_OBJECT
-
-signals:
-    void someSignal(SIGNEDNESS(int));
-};
-//! [10]
-
-
-//! [11]
-class A
-{
-public:
-    class B
-    {
-        Q_OBJECT
-
-    public slots:   // WRONG
-        void b();
-    };
-};
-//! [11]
diff --git a/doc/codesnippets/doc/src/snippets/code/doc_src_model-view-programming.qdoc b/doc/codesnippets/doc/src/snippets/code/doc_src_model-view-programming.qdoc
deleted file mode 100644
index 3501ce0..0000000
--- a/doc/codesnippets/doc/src/snippets/code/doc_src_model-view-programming.qdoc
+++ /dev/null
@@ -1,36 +0,0 @@
-//! [0]
-QAbstractItemModel *model = index.model();
-//! [0]
-
-
-//! [1]
-QModelIndex index = model->index(row, column, ...);
-//! [1]
-
-
-//! [2]
-QModelIndex indexA = model->index(0, 0, QModelIndex());
-QModelIndex indexB = model->index(1, 1, QModelIndex());
-QModelIndex indexC = model->index(2, 1, QModelIndex());
-//! [2]
-
-
-//! [3]
-QModelIndex index = model->index(row, column, parent);
-//! [3]
-
-
-//! [4]
-QModelIndex indexA = model->index(0, 0, QModelIndex());
-QModelIndex indexC = model->index(2, 1, QModelIndex());
-//! [4]
-
-
-//! [5]
-QModelIndex indexB = model->index(1, 0, indexA);
-//! [5]
-
-
-//! [6]
-QVariant value = model->data(index, role);
-//! [6]
diff --git a/doc/codesnippets/doc/src/snippets/code/doc_src_modules.qdoc b/doc/codesnippets/doc/src/snippets/code/doc_src_modules.qdoc
deleted file mode 100644
index e9006fd..0000000
--- a/doc/codesnippets/doc/src/snippets/code/doc_src_modules.qdoc
+++ /dev/null
@@ -1,3 +0,0 @@
-//! [0]
-QT -= gui
-//! [0]
diff --git a/doc/codesnippets/doc/src/snippets/code/doc_src_objecttrees.qdoc b/doc/codesnippets/doc/src/snippets/code/doc_src_objecttrees.qdoc
deleted file mode 100644
index 216027f..0000000
--- a/doc/codesnippets/doc/src/snippets/code/doc_src_objecttrees.qdoc
+++ /dev/null
@@ -1,20 +0,0 @@
-//![0]
-int main()
-{
-    QWidget window;
-    QPushButton quit("Quit", &window);
-    ...
-}
-//![0]
-
-
-//![1]
-int main()
-{
-    QPushButton quit("Quit");
-    QWidget window;
-
-    quit.setParent(&window);
-    ...
-}
-//![1]
diff --git a/doc/codesnippets/doc/src/snippets/code/doc_src_phonon-api.qdoc b/doc/codesnippets/doc/src/snippets/code/doc_src_phonon-api.qdoc
index e230792..3f0771e 100644
--- a/doc/codesnippets/doc/src/snippets/code/doc_src_phonon-api.qdoc
+++ b/doc/codesnippets/doc/src/snippets/code/doc_src_phonon-api.qdoc
@@ -1,224 +1,192 @@
 //! [0]
-PushStream::PushStream(QObject *parent)
-  : AbstractMediaStream(parent), m_timer(new QTimer(this))
-{
-  setStreamSize(getMediaStreamSize());
+class PushStream (AbstractMediaStream):
+    def __init__(self, parent = None):
+        AbstractMediaStream.__init(self, parent)
+        self.timer = QTimer(self)
+        self.setStreamSize(self.getMediaStreamSize())
 
-  connect(m_timer, SIGNAL(timeout()), SLOT(moreData()));
-  m_timer->setInterval(0);
-}
+        self.timer.timeout.connect(self.moreData)
+        self.timer.setInterval(0)
 
-void PushStream::moreData()
-{
-  const QByteArray data = getMediaData();
-  if (data.isEmpty()) {
-    endOfData();
-  } else {
-    writeData(data);
-  }
-}
+    @Slot()
+    def moreData(self):
+        data = self.getMediaData()
+        if data.isEmpty():
+            self.endOfData()
+        else:
+            self.writeData(data)
 
-void PushStream::needData()
-{
-  m_timer->start();
-  moreData();
-}
+    def needData(self):
+        self.timer.start()
+        self.moreData()
 
-void PushStream::enoughData()
-{
-  m_timer->stop();
-}
+    def enoughData(self):
+        self.timer.stop()
 //! [0]
 
 
 //! [1]
-PullStream::PullStream(QObject *parent)
-  : AbstractMediaStream(parent)
-{
-  setStreamSize(getMediaStreamSize());
-}
+class PushStream (AbstractMediaStream):
+    def __init__(self, parent = None):
+        AbstractMediaStream.__init(self, parent)
+        self.setStreamSize(self.getMediaStreamSize())
 
-void PullStream::needData()
-{
-  const QByteArray data = getMediaData();
-  if (data.isEmpty()) {
-    endOfData();
-  } else {
-    writeData(data);
-  }
-}
+    @Slot()
+    def needData(self):
+        data = self.getMediaData()
+        if data.isEmpty():
+            self.endOfData()
+        else:
+            self.writeData(data)
 //! [1]
 
 
 //! [2]
-seekStream(0);
+self.seekStream(0)
 //! [2]
 
 
 //! [3]
-MediaObject m;
-QString fileName("/home/foo/bar.ogg");
-QUrl url("http://www.example.com/stream.mp3");
-QBuffer *someBuffer;
-m.setCurrentSource(fileName);
-m.setCurrentSource(url);
-m.setCurrentSource(someBuffer);
-m.setCurrentSource(Phonon::Cd);
+m = MediaObject()
+fileName = "/home/foo/bar.ogg"
+url = QUrl("http://www.example.com/stream.mp3")
+someBuffer = QBuffer()
+m.setCurrentSource(fileName)
+m.setCurrentSource(url)
+m.setCurrentSource(someBuffer)
+m.setCurrentSource(Phonon.Cd)
 //! [3]
 
 
 //! [4]
-VideoPlayer *player = new VideoPlayer(Phonon::VideoCategory, parentWidget);
-connect(player, SIGNAL(finished()), player, SLOT(deleteLater()));
-player->play(url);
+player = VideoPlayer(Phonon.VideoCategory, parentWidget)
+player.finished.connect(player.deleteLater)
+player.play(url)
 //! [4]
 
 
 //! [5]
-audioPlayer->load(url);
-audioPlayer->play();
+audioPlayer.load(url)
+audioPlayer.play()
 //! [5]
 
 
 //! [6]
-media = new MediaObject(this);
-connect(media, SIGNAL(finished()), SLOT(slotFinished());
-media->setCurrentSource("/home/username/music/filename.ogg");
+media = MediaObject(self)
+media.finished.connect(self.slotFinished)
+media.setCurrentSource("/home/username/music/filename.ogg")
 
-...
+# ...
 
-media->play();
+media.play()
 //! [6]
 
 
 //! [7]
-media->setCurrentSource(":/sounds/startsound.ogg");
-media->enqueue("/home/username/music/song.mp3");
-media->enqueue(":/sounds/endsound.ogg");
+media.setCurrentSource(":/sounds/startsound.ogg")
+media.enqueue("/home/username/music/song.mp3")
+media.enqueue(":/sounds/endsound.ogg")
 //! [7]
 
 
 //! [8]
-  media->setCurrentSource(":/sounds/startsound.ogg");
-  connect(media, SIGNAL(aboutToFinish()), SLOT(enqueueNextSource()));
-}
-
-void enqueueNextSource()
-{
-  media->enqueue("/home/username/music/song.mp3");
-}
+  media.setCurrentSource(":/sounds/startsound.ogg")
+  media.aboutToFinish.connect(lambda : media.enqueue("/home/username/music/song.mp3"))
 //! [8]
 
 
 //! [9]
-int x = 200;
-media->setTickInterval(x);
-Q_ASSERT(x == producer->tickInterval());
+x = 200
+media.setTickInterval(x)
+assert(x == producer.tickInterval())
 //! [9]
 
 
 //! [10]
-int x = 200;
-media->setTickInterval(x);
-Q_ASSERT(x >= producer->tickInterval() &&
-         x <= 2producer->tickInterval());
+x = 200
+media.setTickInterval(x)
+assert(x >= producer.tickInterval() and x <= * producer.tickInterval())
 //! [10]
 
 
 //! [11]
-  connect(media, SIGNAL(hasVideoChanged(bool)), hasVideoChanged(bool));
-  media->setCurrentSource("somevideo.avi");
-  media->hasVideo(); // returns false;
-}
+//! [12]
+    self.media.hasVideoChanged[bool].connect(hasVideoChanged)
+    self.media.setCurrentSource("somevideo.avi")
+    self.media.hasVideo() # returns false
 
-void hasVideoChanged(bool b)
-{
-  // b == true
-  media->hasVideo(); // returns true;
-}
+    @Slot(bool)
+    def hasVideoChanged(self, b):
+        # b == true
+        media.hasVideo() # returns true
+//! [12]
 //! [11]
 
-
-//! [12]
-  connect(media, SIGNAL(hasVideoChanged(bool)), hasVideoChanged(bool));
-  media->setCurrentSource("somevideo.avi");
-  media->hasVideo(); // returns false;
-}
-
-void hasVideoChanged(bool b)
-{
-  // b == true
-  media->hasVideo(); // returns true;
-}
-//! [12]
-
-
 //! [13]
-setMetaArtist(media->metaData("ARTIST"));
-setMetaAlbum(media->metaData("ALBUM"));
-setMetaTitle(media->metaData("TITLE"));
-setMetaDate(media->metaData("DATE"));
-setMetaGenre(media->metaData("GENRE"));
-setMetaTrack(media->metaData("TRACKNUMBER"));
-setMetaComment(media->metaData("DESCRIPTION"));
+self.setMetaArtist(media.metaData("ARTIST"))
+self.setMetaAlbum(media.metaData("ALBUM"))
+self.setMetaTitle(media.metaData("TITLE"))
+self.setMetaDate(media.metaData("DATE"))
+self.setMetaGenre(media.metaData("GENRE"))
+self.setMetaTrack(media.metaData("TRACKNUMBER"))
+self.setMetaComment(media.metaData("DESCRIPTION"))
 //! [13]
 
 
 //! [14]
-QUrl url("http://www.example.com/music.ogg");
-media->setCurrentSource(url);
+url = QUrl("http://www.example.com/music.ogg")
+media.setCurrentSource(url)
 //! [14]
 
 
 //! [15]
-progressBar->setRange(0, 100); // this is the default
-connect(media, SIGNAL(bufferStatus(int)), progressBar, SLOT(setValue(int)));
+progressBar.setRange(0, 100) # this is the default
+self.media.bufferStatus[int].connect(progressBar.setValue)
 //! [15]
 
 
 //! [16]
-QObject::connect(BackendCapabilities::notifier(), SIGNAL(capabilitiesChanged()), ...
+BackendCapabilities.notifier.capabilitiesChanged.connect(...)
 //! [16]
 
 
 //! [17]
-QComboBox *cb = new QComboBox(parentWidget);
-ObjectDescriptionModel *model = new ObjectDescriptionModel(cb);
-model->setModelData(BackendCapabilities::availableAudioOutputDevices());
-cb->setModel(model);
-cb->setCurrentIndex(0); // select first entry
+cb = QComboBox(parentWidget)
+model = ObjectDescriptionModel(cb)
+model.setModelData(BackendCapabilities.availableAudioOutputDevices())
+cb.setModel(model)
+cb.setCurrentIndex(0) # select first entry
 //! [17]
 
 
 //! [18]
-int cbIndex = cb->currentIndex();
-AudioOutputDevice selectedDevice = model->modelData(cbIndex);
+cbIndex = cb.currentIndex()
+selectedDevice = model.modelData(cbIndex)
 //! [18]
 
 
 //! [19]
-Path path = Phonon::createPath(...);
-Effect *effect = new Effect(this);
-path.insertEffect(effect);
+path = Phonon.createPath(...)
+effect = Effect(this)
+path.insertEffect(effect)
 //! [19]
 
 
 //! [20]
-MediaObject *media = new MediaObject;
-AudioOutput *output = new AudioOutput(Phonon::MusicCategory);
-Path path = Phonon::createPath(media, output);
-Q_ASSERT(path.isValid()); // for this simple case the path should always be
-                          //valid - there are unit tests to ensure it
-// insert an effect
-QList<EffectDescription> effectList = BackendCapabilities::availableAudioEffects();
-if (!effectList.isEmpty()) {
-    Effect *effect = path.insertEffect(effectList.first());
-}
+media = MediaObject()
+output = AudioOutput(Phonon.MusicCategory)
+path = Phonon.createPath(media, output)
+assert(path.isValid()) # for this simple case the path should always be
+                       # valid - there are unit tests to ensure it
+# insert an effect
+effectList = BackendCapabilities.availableAudioEffects()
+if effectList:
+    effect = path.insertEffect(effectList[0])
 //! [20]
 
 
 //! [21]
-MediaObject *media = new MediaObject(parent);
-VideoWidget *vwidget = new VideoWidget(parent);
-Phonon::createPath(media, vwidget);
+media = MediaObject(parent)
+vwidget = VideoWidget(parent)
+Phonon.createPath(media, vwidget)
 //! [21]
diff --git a/doc/codesnippets/doc/src/snippets/code/doc_src_phonon.qdoc b/doc/codesnippets/doc/src/snippets/code/doc_src_phonon.qdoc
deleted file mode 100644
index 3e4bce4..0000000
--- a/doc/codesnippets/doc/src/snippets/code/doc_src_phonon.qdoc
+++ /dev/null
@@ -1,13 +0,0 @@
-//! [0]
-QT += phonon
-//! [0]
-
-
-//! [1]
-QT += phonon
-//! [1]
-
-
-//! [2]
-#include <Phonon/MediaObject>
-//! [2]
diff --git a/doc/codesnippets/doc/src/snippets/code/doc_src_platform-notes.qdoc b/doc/codesnippets/doc/src/snippets/code/doc_src_platform-notes.qdoc
deleted file mode 100644
index ed56a08..0000000
--- a/doc/codesnippets/doc/src/snippets/code/doc_src_platform-notes.qdoc
+++ /dev/null
@@ -1,39 +0,0 @@
-//! [0]
-undefined reference to `_vt.11QPushButton'
-//! [0]
-
-
-//! [1]
-ANSI C++ forbids declaration ... with no type
-//! [1]
-
-
-//! [2]
-c:\program.obj not found
-//! [2]
-
-
-//! [3]
--universal -sdk /Developer/SDKs/MacOSX10.4u.sdk
-//! [3]
-
-
-//! [4]
-QMAKE_MAC_SDK=/Developer/SDKs/MacOSX10.4u.sdk 
-CONFIG+=x86 ppc
-//! [4]
-
-
-//! [5]
-/usr/bin/ld: /System/Library/Frameworks/Carbon.framework/Carbon
-load command 20 unknown cmd field
-/usr/bin/ld: /usr/lib/libSystem.dylib
-load command 6 unknown cmd field
-//! [5]
-
-
-//! [6]
-ld: common symbols not allowed with MH_DYLIB output format with the -multi_module option
-/usr/local/mysql/lib/libmysqlclient.a(my_error.o) definition of common _errbuff (size 512)
-/usr/bin/libtool: internal link edit command failed
-//! [6]
diff --git a/doc/codesnippets/doc/src/snippets/code/doc_src_plugins-howto.qdoc b/doc/codesnippets/doc/src/snippets/code/doc_src_plugins-howto.qdoc
deleted file mode 100644
index 45c8690..0000000
--- a/doc/codesnippets/doc/src/snippets/code/doc_src_plugins-howto.qdoc
+++ /dev/null
@@ -1,67 +0,0 @@
-//! [0]
-class MyStylePlugin : public QStylePlugin
-{
-public:
-    QStringList keys() const;
-    QStyle *create(const QString &key);
-};
-//! [0]
-
-
-//! [1]
-#include "mystyleplugin.h"
-
-QStringList MyStylePlugin::keys() const
-{
-    return QStringList() << "MyStyle";
-}
-
-QStyle *MyStylePlugin::create(const QString &key)
-{
-    if (key.toLower() == "mystyle")
-        return new MyStyle;
-    return 0;
-}
-
-Q_EXPORT_PLUGIN2(pnp_mystyleplugin, MyStylePlugin)
-//! [1]
-
-
-//! [2]
-QApplication::setStyle(QStyleFactory::create("MyStyle"));
-//! [2]
-
-
-//! [3]
-CONFIG += release
-//! [3]
-
-
-//! [4]
-#include <QApplication>
-#include <QtPlugin>
-
-Q_IMPORT_PLUGIN(qjpeg)
-Q_IMPORT_PLUGIN(qgif)
-Q_IMPORT_PLUGIN(qkrcodecs)
-
-int main(int argc, char *argv[])
-{
-    QApplication app(argc, argv);
-    ...
-    return app.exec();
-}
-//! [4]
-
-
-//! [5]
-QTPLUGIN     += qjpeg \
-                qgif \
-                qkrcodecs
-//! [5]
-
-
-//! [6]
-HKEY_CURRENT_USER\Software\Trolltech\OrganizationDefaults\Qt Plugin Cache 4.2.debug
-HKEY_CURRENT_USER\Software\Trolltech\OrganizationDefaults\Qt Plugin Cache 4.2.false
-//! [6]
diff --git a/doc/codesnippets/doc/src/snippets/code/doc_src_porting-qsa.qdoc b/doc/codesnippets/doc/src/snippets/code/doc_src_porting-qsa.qdoc
deleted file mode 100644
index 0dc572c..0000000
--- a/doc/codesnippets/doc/src/snippets/code/doc_src_porting-qsa.qdoc
+++ /dev/null
@@ -1,187 +0,0 @@
-//! [0]
-point = new Object();
-point.x = 12;
-point.y = 35;
-//! [0]
-
-
-//! [1]
-function manhattanLength(point) {  
-    return point.x + point.y;
-}
-//! [1]
-
-
-//! [2]
-manhattanLength = function(point) {
-   return point.x + point.y;
-}
-//! [2]
-
-
-//! [3]
-point.manhattanLength = function() {
-    return this.x + this.y;
-}
-print(point.manhattanLength()); // prints 47
-//! [3]
-
-
-//! [4]
-class Point() {
-    var x;
-    var y;
-    function manhattanLength() { return x + y; }
-}
-//! [4]
-
-
-//! [5]
-point.manhattanLength = function() {
-    return this.x + this.y;
-}
-print(point.manhattanLength()); // prints 47
-//! [5]
-
-
-//! [6]
-class Car {
-    var regNumber;
-    function Car(regnr) {
-        regNumber = regnr;
-    }
-}
-var car = new Car("ABC 123");
-//! [6]
-
-
-//! [7]
-function Car(regnr) {
-    this.regNumber = regnr;
-}
-var car = new Car("ABC 123");
-//! [7]
-
-
-//! [8]
-var car = new Object();
-car.constructor = function(regnr) { ... }
-car.constructor();
-//! [8]
-
-
-//! [9]
-class Car {
-    var regNumber;
-    function Car(regnr) {
-        regNumber = regnr;
-    }
-    function toString() {
-        return regNumber;
-    }
-}
-//! [9]
-
-
-//! [10]
-function Car(regnr) {
-    this.regNumber = regnr;
-    this.toString = function() { return this.regNumber; }
-}
-//! [10]
-
-
-//! [11]
-function Car(regnr) {
-    this.regNumber = regnr;
-}
-Car.prototype.toString = function() { return this.regNumber; }
-//! [11]
-
-
-//! [12]
-class GasolineCar extends Car {
-    function GasolineCar(regnr) {
-        Car(regnr);
-    }
-    function toString() {
-        return "GasolineCar(" + regNumber + ")";
-    }
-}
-//! [12]
-
-
-//! [13]
-function GasolineCar(regnr) {
-    Car(regnr); 
-}
-GasolineCar.prototype = new Car();
-GasolineCar.prototype.toString = function() { 
-    return "GasolineCar(" + this.regNumber + ")"; 
-}
-//! [13]
-
-
-//! [14]
-class Car {
-    static var globalCount = 0;
-}     
-print(Car.globalCount);
-//! [14]
-
-
-//! [15]
-Car.globalCount = 0;
-print(Car.globalCount);
-//! [15]
-
-
-//! [16]
-QPushButton *button = new QPushButton();
-button->setObjectName("button");
-interpreter->addTransientObject(button);
-//! [16]
-
-
-//! [17]
-QPushButton *button = new QPushButton();
-QScriptValue scriptButton = engine.newQObject(button);
-engine.globalObject().setProperty("button", scriptButton);
-//! [17]
-
-
-//! [18]
-ModuleFactory::ModuleFactory()
-{
-    registerClass( "ImageSource", &ImgSource::staticMetaObject);
-    ...
-}
-
-QObject *ModuleFactory::create( const QString &type,
-        			const QVariantList &,
-        			QObject * )
-{
-    if ( type == "ImageSource" )
-        return new ImgSource();
-    ...
-}
-
-...
-
-interpreter.addObjectFactory(new ModuleFactory());
-//! [18]
-
-
-//! [19]
-QScriptValue construct_QPushButton(QScriptContext *, QScriptEngine *engine) {
-    return engine->newQObject(new QPushButton());
-}
-
-...
-
-QScriptValue constructor = engine.newFunction(construct_QPushButton);
-QScriptValue value =
-    engine.newQMetaObject(&QPushButton::staticMetaObject,
-                          constructor);
-engine.globalObject().setProperty("QPushButton", value);
-//! [19]
diff --git a/doc/codesnippets/doc/src/snippets/code/doc_src_porting4-canvas.qdoc b/doc/codesnippets/doc/src/snippets/code/doc_src_porting4-canvas.qdoc
deleted file mode 100644
index e386607..0000000
--- a/doc/codesnippets/doc/src/snippets/code/doc_src_porting4-canvas.qdoc
+++ /dev/null
@@ -1,116 +0,0 @@
-//! [0]
-item->scene().sceneRect().intersects(item->sceneBoundingRect());
-//! [0]
-
-
-//! [1]
-class TileScene : public QGraphicsScene
-{
-public:
-    ...
-
-    void setTiles(const QPixmap &pixmap, int h, int v,
-                  int tileHeight, int tileWidth);
-    void setTile(int x, int y, int tilenum);
-
-private:
-    QRect tileRect(int x, int y) const;
-    QRect tileRect(int tileNum) const;
-
-    QVector<QVector<int> > tiles;
-    QPixmap tilePixmap;
-    int tileW, tileH;
-    int hTiles, vTiles;
-};
-//! [1]
-
-
-//! [2]
-void TileScene::setTiles(const QPixmap &pixmap, int h, int v,
-                         int tileHeight, int tileWidth)
-{
-    tilePixmap = pixmap;
-    tileW = tileWidth;
-    tileH = tileHeight;
-    hTiles = h;
-    vTiles = v;
-
-    tiles.resize(v);
-    for (int y = 0; y < v; ++y)
-        tiles[y].resize(h);
-}
-//! [2]
-
-
-//! [3]
-void TileScene::setTile(int x, int y, int tilenum)
-{
-    tiles[y][x] = tilenum;
-    update(tileRect(x, y));
-}
-//! [3]
-
-
-//! [4]
-QRect TileScene::tileRect(int x, int y) const
-{
-    return QRect(x * tileW, y * tileH, tileW, tileH);
-}
-//! [4]
-
-
-//! [5]
-QRect TileScene::tileRect(int tileNum) const
-{
-    int numHTiles = tilePixmap.width() / tileW;
-    int numVTiles = tilePixmap.height() / tileH;
-    return tileRect(tileNum % numHTiles, tileNum / numHTiles);
-}
-//! [5]
-
-
-//! [6]
-void drawBackground(QPainter *painter, const QRectF &exposed)
-{
-    for (int y = 0; y < vTiles; ++y) {
-        for (int x = 0; x < hTiles; ++x) {
-            QRect destRect = tileRect(x, y);
-            if (exposed.intersects(destRect)) {
-                painter->drawPixmap(destRect, tilePixmap,
-                                    tileRect(tiles[y][x]));
-            }
-        }
-    }
-}
-//! [6]
-
-
-//! [7]
-    // Before
-    Q3CanvasEllipse ellipse(10, 10);
-
-    // After
-    QGraphicsEllipseItem ellipse(-5, -5, 10, 10);
-//! [7]
-
-
-//! [8]
-static QPainterPath fromControlPoints(const Q3PointArray &pa)
-{
-    QPainterPath path;
-    path.moveTo(pa[0]);
-    for (int i = 1; i < pa.size(); i += 3)
-        path.cubicTo(pa[i], pa[(i + 1) % pa.size()], pa[(i + 2) % pa.size()]);
-    return path;
-}
-//! [8]
-
-
-//! [9]
-wildcardPath.replace("%1", "*");
-QFileInfo fi(wildcardPath);
-
-QList<QPixmap> frames;
-foreach (QString entry, QDir(fi.path(), fi.fileName()).entryList())
-    frames << QPixmap(fi.path() + "/" + entry);
-//! [9]
diff --git a/doc/codesnippets/doc/src/snippets/code/doc_src_porting4-designer.qdoc b/doc/codesnippets/doc/src/snippets/code/doc_src_porting4-designer.qdoc
deleted file mode 100644
index d4abaa0..0000000
--- a/doc/codesnippets/doc/src/snippets/code/doc_src_porting4-designer.qdoc
+++ /dev/null
@@ -1,159 +0,0 @@
-//! [0]
-namespace Ui {
-
-class HelloWorld
-{
-public:
-    QVBoxLayout *vboxLayout;
-    QPushButton *pushButton;
-
-    void setupUi(QWidget *HelloWorld)
-    {
-        HelloWorld->setObjectName(QString::fromUtf8("HelloWorld"));
-
-        vboxLayout = new QVBoxLayout(HelloWorld);
-        vboxLayout->setObjectName(QString::fromUtf8("vboxLayout"));
-
-        pushButton = new QPushButton(HelloWorld);
-        pushButton->setObjectName(QString::fromUtf8("pushButton"));
-
-        vboxLayout->addWidget(pushButton);
-
-        retranslateUi(HelloWorld);
-    }
-};
-
-}
-//! [0]
-
-
-//! [1]
-#include <QApplication>
-#include <QWidget>
-
-#include "ui_helloworld.h"   // defines Ui::HelloWorld
-
-int main(int argc, char *argv[])
-{
-    QApplication app(argc, argv);
-
-    QWidget w;
-    Ui::HelloWorld ui;
-    ui.setupUi(&w);
-
-    w.show();
-    return app.exec();
-}
-//! [1]
-
-
-//! [2]
-#include <QApplication>
-#include <QWidget>
-
-#include "ui_helloworld.h"   // defines Ui::HelloWorld
-
-class HelloWorldWidget : public QWidget, public Ui::HelloWorld
-{
-    Q_OBJECT
-
-public:
-    HelloWorldWidget(QWidget *parent = 0)
-        : QWidget(parent)
-    { setupUi(this); }
-};
-
-int main(int argc, char *argv[])
-{
-    QApplication app(argc, argv);
-    HelloWorldWidget w;
-    w.show();
-    return app.exec();
-}
-//! [2]
-
-
-//! [3]
-uic3 myform.ui > myform.h
-uic3 -impl myform.h myform.ui > myform.cpp
-//! [3]
-
-
-//! [4]
-uic3 -convert myform3.ui > myform4.ui
-//! [4]
-
-
-//! [5]
-class HelloWorldWidget : public QWidget, public Ui::HelloWorld
-{
-    Q_OBJECT
-
-public:
-    HelloWorldWidget(QWidget *parent = 0);
-
-public slots:
-    void mySlot();
-};
-
-HelloWorldWidget::HelloWorldWidget(QWidget *parent)
-    : QWidget(parent)
-{
-    setupUi(this);
-
-    QObject::connect(pushButton, SIGNAL(clicked()),
-                     this, SLOT(mySlot()));
-}
-
-void HelloWorldWidget::mySlot()
-{
-    ...
-}
-//! [5]
-
-
-//! [6]
-class HelloWorldWidget : public QWidget, public Ui::HelloWorld
-{
-    Q_OBJECT
-
-public:
-    HelloWorldWidget(QWidget *parent = 0);
-
-public slots:
-    void on_pushButton_clicked();
-};
-
-HelloWorldWidget::HelloWorldWidget(QWidget *parent)
-    : QWidget(parent)
-{
-    setupUi(this);
-}
-
-void HelloWorldWidget::on_pushButton_clicked()
-{
-    ...
-}
-//! [6]
-
-
-//! [7]
-<RCC version="1.0">
-    <qresource prefix="/icons">
-        <file>yes.png</file>
-        <file>no.png</file>
-    </qresource>
-</RCC>
-//! [7]
-
-
-//! [8]
-RESOURCES += icons.qrc
-//! [8]
-
-
-//! [9]
-QFile file(":/icons/yes.png");
-QIcon icon(":/icons/no.png");
-QPixmap pixmap(":/icons/no.png");
-//! [9]
diff --git a/doc/codesnippets/doc/src/snippets/code/doc_src_porting4.qdoc b/doc/codesnippets/doc/src/snippets/code/doc_src_porting4.qdoc
deleted file mode 100644
index 14fddf8..0000000
--- a/doc/codesnippets/doc/src/snippets/code/doc_src_porting4.qdoc
+++ /dev/null
@@ -1,473 +0,0 @@
-//! [0]
-void MyButton::paintEvent(QPaintEvent *)
-{
-    QPainter painter(this);
-    drawButton(&painter);
-}
-//! [0]
-
-
-//! [1]
-ba.at(0) = 'X';
-//! [1]
-
-
-//! [2]
-ba[0] = 'X';
-//! [2]
-
-
-//! [3]
-if (!cache.insert(key, object))
-    delete object;
-//! [3]
-
-
-//! [4]
-cache.insert(key, object);
-//! [4]
-
-
-//! [5]
-Q3Cache<QWidget> cache;
-cache.insert(widget->name(), widget);
-...
-QWidget *foo = cache.take("foo");
-if (foo)
-    foo->show();
-//! [5]
-
-
-//! [6]
-typedef QWidget *QWidgetPtr;
-QCache<QString, QWidgetPtr> cache;
-cache.insert(widget->name(), new QWidgetPtr(widget));
-...
-QWidgetPtr *ptr = cache.take("foo");
-if (ptr) {
-    QWidget *foo = *ptr;
-    delete ptr;
-    foo->show();
-}
-//! [6]
-
-
-//! [7]
-painter.setBrush(palette().brush(QPalette::Text));
-//! [7]
-
-
-//! [8]
-QByteArray ba("Hello");
-ba.size();             // returns 5 (the '\0' is not counted)
-ba.length();           // returns 5
-ba.data()[5];          // returns '\0'
-//! [8]
-
-
-//! [9]
-dict.replace(key, value);
-//! [9]
-
-
-//! [10]
-delete hash.take(key);
-hash.insert(key, value);
-//! [10]
-
-
-//! [11]
-dict.remove(key, value);
-//! [11]
-
-
-//! [12]
-delete hash.take(key);
-//! [12]
-
-
-//! [13]
-dict.clear();
-//! [13]
-
-
-//! [14]
-while (!hash.isEmpty()) {
-    T *value = *hash.begin();
-    hash.erase(hash.begin());
-    delete value;
-}
-//! [14]
-
-
-//! [15]
-qDeleteAll(hash);
-hash.clear();
-//! [15]
-
-
-//! [16]
-Q3DictIterator<QWidget> i(dict);
-while (i.current() != 0) {
-    do_something(i.currentKey(), i.current());
-    ++i;
-}
-//! [16]
-
-
-//! [17]
-QHashIterator<QString, QWidget *> i(hash);
-while (i.hasNext()) {
-    i.next();                   // must come first
-    do_something(i.key(), i.value());
-}
-//! [17]
-
-
-//! [18]
-QList<QWidget *> myWidgets = qFindChildren<QWidget *>(myParent);
-//! [18]
-
-
-//! [19]
-list.replace(index, value);
-//! [19]
-
-
-//! [20]
-delete list[index];
-list[index] = value;
-//! [20]
-
-
-//! [21]
-list.removeFirst();
-//! [21]
-
-
-//! [22]
-delete list.takeFirst();
-//! [22]
-
-
-//! [23]
-list.removeLast();
-//! [23]
-
-
-//! [24]
-delete list.takeLast();
-//! [24]
-
-
-//! [25]
-list.remove(index);
-//! [25]
-
-
-//! [26]
-delete list.takeAt(index);
-//! [26]
-
-
-//! [27]
-list.remove(value);
-//! [27]
-
-
-//! [28]
-int i = list.indexOf(value);
-if (i != -1)
-    delete list.takeAt(i);
-//! [28]
-
-
-//! [29]
-list.remove();
-//! [29]
-
-
-//! [30]
-QMutableListIterator<T *> i;
-...
-delete i.value();
-i.remove();
-//! [30]
-
-
-//! [31]
-list.clear();
-//! [31]
-
-
-//! [32]
-while (!list.isEmpty())
-    delete list.takeFirst();
-//! [32]
-
-
-//! [33]
-qDeleteAll(list);
-list.clear();
-//! [33]
-
-
-//! [34]
-QPtrList<QWidget> list;
-...
-while (list.current() != 0) {
-    do_something(list.current());
-    list.next();
-}
-//! [34]
-
-
-//! [35]
-QList<QWidget *> list;
-...
-QListIterator<QWidget *> i(list);
-while (i.hasNext())
-    do_something(i.next());
-//! [35]
-
-
-//! [36]
-QPtrList<QWidget> list;
-...
-QPtrListIterator<QWidget> i;
-while (i.current() != 0) {
-    do_something(i.current());
-    i.next();
-}
-//! [36]
-
-
-//! [37]
-QList<QWidget *> list;
-...
-QListIterator<QWidget *> i(list);
-while (i.hasNext())
-    do_something(i.next());
-//! [37]
-
-
-//! [38]
-queue.dequeue();
-//! [38]
-
-
-//! [39]
-delete queue.dequeue();
-//! [39]
-
-
-//! [40]
-queue.remove();
-//! [40]
-
-
-//! [41]
-delete queue.dequeue();
-//! [41]
-
-
-//! [42]
-queue.clear();
-//! [42]
-
-
-//! [43]
-while (!queue.isEmpty())
-    delete queue.dequeue();
-//! [43]
-
-
-//! [44]
-qDeleteAll(queue);
-queue.clear();
-//! [44]
-
-
-//! [45]
-stack.pop();
-//! [45]
-
-
-//! [46]
-delete stack.pop();
-//! [46]
-
-
-//! [47]
-stack.remove();
-//! [47]
-
-
-//! [48]
-delete stack.pop();
-//! [48]
-
-
-//! [49]
-stack.clear();
-//! [49]
-
-
-//! [50]
-while (!stack.isEmpty())
-    delete stack.pop();
-//! [50]
-
-
-//! [51]
-qDeleteAll(stack);
-stack.clear();
-//! [51]
-
-
-//! [52]
-vect.insert(i, ptr);
-//! [52]
-
-
-//! [53]
-delete vect[i];
-vect[i] = ptr;
-//! [53]
-
-
-//! [54]
-vect.remove(i);
-//! [54]
-
-
-//! [55]
-delete vect[i];
-vect[i] = 0;
-//! [55]
-
-
-//! [56]
-T *ptr = vect.take(i);
-//! [56]
-
-
-//! [57]
-T *ptr = vect[i];
-vect[i] = 0;
-//! [57]
-
-
-//! [58]
-vect.resize(n)
-//! [58]
-
-
-//! [59]
-while (n > vect.size())
-    vect.append(0);
-while (n < vect.size() {
-    T *ptr = vect.last();
-    vect.remove(vect.size() - 1);
-    delete ptr;
-}
-//! [59]
-
-
-//! [60]
-vect.clear();
-//! [60]
-
-
-//! [61]
-for (int i = 0; i < vect.size(); ++i)
-    T *ptr = vect[i];
-    vect[i] = 0;
-    delete ptr;
-}
-//! [61]
-
-
-//! [62]
-qDeleteAll(vect);
-vect.clear();
-//! [62]
-
-
-//! [63]
-struct Shared
-{
-    Shared() : count(1) {}
-    void ref() { ++count; }
-    bool deref() { return !--count; }
-    uint count;
-};
-//! [63]
-
-//! [63a]
-// Declare the object
-QSimpleRichText richText(text, font);
-
-// Set the width of the paragraph to w
-richText.setWidth(w);
-
-// Or set a resonable default size
-richText.adjustSize();
-
-// Query for its used size
-int width = richText.widthUsed();
-int height = richText.height();
-
-// Draw
-richText.draw(painter, x, y, clipRect, colorGroup);
-//! [63a]
-
-
-//! [63b]
-// Declare the object
-QTextDocument doc;
-
-// If text is rich text, use setHtml()
-doc.setHtml(text);
-
-// Otherwise, use setPlainText()
-doc.setPlainText(text);
-
-// Set the width of the paragraph of text to w
-doc.setTextWidth(w);
-
-// Query for the used size
-int width = doc.idealWidth();
-int height = doc.size().height();
-
-// Draw
-painter.translate(x, y);
-doc.drawContents(painter, clipRect);
-
-// If you have a palette/colorgroup you can draw using lower-level functions:
-QAbstractTextDocumentLayout::PaintContext context;
-context.palette = myPalette;
-doc.documentLayout()->draw(painter, context);
-//! [63b]
-
-//! [63c]
-QSlider *slider;
-slider->style()->subControlRect(CC_Slider, sliderOption, SC_SliderHandle, slider);
-//! [63c]
-
-//! [64]
-QString greeting = "Hello";
-const char *badData = greeting.toAscii().constData(); // data is invalid
-QByteArray asciiData = greeting.toAscii();
-const char *goodData = asciiData.constData();
-//! [64]
-
-
-//! [65]
-str.at(0) = 'X';
-//! [65]
-
-
-//! [66]
-str[0] = 'X';
-//! [66]
diff --git a/doc/codesnippets/doc/src/snippets/code/doc_src_properties.qdoc b/doc/codesnippets/doc/src/snippets/code/doc_src_properties.qdoc
deleted file mode 100644
index 377cc9c..0000000
--- a/doc/codesnippets/doc/src/snippets/code/doc_src_properties.qdoc
+++ /dev/null
@@ -1,78 +0,0 @@
-//! [0]
-Q_PROPERTY(type name
-           READ getFunction
-           [WRITE setFunction]
-           [RESET resetFunction]
-           [NOTIFY notifySignal]
-           [DESIGNABLE bool]
-           [SCRIPTABLE bool]
-           [STORED bool]
-	   [USER bool])
-//! [0]
-
-
-//! [1]
-Q_PROPERTY(bool focus READ hasFocus)
-Q_PROPERTY(bool enabled READ isEnabled WRITE setEnabled)
-Q_PROPERTY(QCursor cursor READ cursor WRITE setCursor RESET unsetCursor)
-//! [1]
-
-
-//! [2]
-Q_PROPERTY(QDate date READ getDate WRITE setDate)
-//! [2]
-
-
-//! [3]
-QPushButton *button = new QPushButton;
-QObject *object = button;
-
-button->setDown(true);
-object->setProperty("down", true);
-//! [3]
-
-
-//! [4]
-QObject *object = ...
-const QMetaObject *metaobject = object->metaObject();
-int count = metaobject->propertyCount();
-for (int i=0; i<count; ++i) {
-    QMetaProperty metaproperty = metaobject->property(i);
-    const char *name = metaproperty.name();
-    QVariant value = object->property(name);
-    ...
-}
-//! [4]
-
-
-//! [5]
-class MyClass : public QObject
-{
-    Q_OBJECT
-    Q_PROPERTY(Priority priority READ priority WRITE setPriority)
-    Q_ENUMS(Priority)
-
-public:
-    MyClass(QObject *parent = 0);
-    ~MyClass();
-
-    enum Priority { High, Low, VeryHigh, VeryLow };
-
-    void setPriority(Priority priority);
-    Priority priority() const;
-};
-//! [5]
-
-
-//! [6]
-MyClass *myinstance = new MyClass;
-QObject *object = myinstance;
-
-myinstance->setPriority(MyClass::VeryHigh);
-object->setProperty("priority", "VeryHigh");
-//! [6]
-
-
-//! [7]
-Q_CLASSINFO("Version", "3.0.0")
-//! [7]
diff --git a/doc/codesnippets/doc/src/snippets/code/doc_src_q3asciidict.qdoc b/doc/codesnippets/doc/src/snippets/code/doc_src_q3asciidict.qdoc
deleted file mode 100644
index e2c876a..0000000
--- a/doc/codesnippets/doc/src/snippets/code/doc_src_q3asciidict.qdoc
+++ /dev/null
@@ -1,52 +0,0 @@
-//! [0]
-Q3AsciiDict<QLineEdit> fields; // char* keys, QLineEdit* values
-fields.insert( "forename", new QLineEdit( this ) );
-fields.insert( "surname", new QLineEdit( this ) );
-
-fields["forename"]->setText( "Homer" );
-fields["surname"]->setText( "Simpson" );
-
-Q3AsciiDictIterator<QLineEdit> it( fields ); // See Q3AsciiDictIterator
-for( ; it.current(); ++it )
-    cout << it.currentKey() << ": " << it.current()->text() << endl;
-cout << endl;
-
-if ( fields["forename"] && fields["surname"] )
-    cout << fields["forename"]->text() << " " 
-	<< fields["surname"]->text() << endl;  // Prints "Homer Simpson"
-
-fields.remove( "forename" ); // Does not delete the line edit
-if ( ! fields["forename"] )
-    cout << "forename is not in the dictionary" << endl;
-//! [0]
-
-
-//! [1]
-Q3AsciiDict<char> dict;
-    ...
-if ( dict.find(key) )
-    dict.remove( key );
-dict.insert( key, item );
-//! [1]
-
-
-//! [2]
-Q3AsciiDict<QLineEdit> fields;
-fields.insert( "forename", new QLineEdit( this ) );
-fields.insert( "surname", new QLineEdit( this ) );
-fields.insert( "age", new QLineEdit( this ) );
-
-fields["forename"]->setText( "Homer" );
-fields["surname"]->setText( "Simpson" );
-fields["age"]->setText( "45" );
-
-Q3AsciiDictIterator<QLineEdit> it( fields );
-for( ; it.current(); ++it )
-    cout << it.currentKey() << ": " << it.current()->text() << endl;
-cout << endl;
-
-// Output (random order):
-//	age: 45
-//	surname: Simpson
-//	forename: Homer
-//! [2]
diff --git a/doc/codesnippets/doc/src/snippets/code/doc_src_q3dict.qdoc b/doc/codesnippets/doc/src/snippets/code/doc_src_q3dict.qdoc
deleted file mode 100644
index f79d0f7..0000000
--- a/doc/codesnippets/doc/src/snippets/code/doc_src_q3dict.qdoc
+++ /dev/null
@@ -1,29 +0,0 @@
-//! [0]
-Q3Dict<char> dict;
-    ...
-if ( dict.find( key ) )
-    dict.remove( key );
-dict.insert( key, item );
-//! [0]
-
-
-//! [1]
-Q3Dict<QLineEdit> fields;
-fields.insert( "forename", new QLineEdit( this ) );
-fields.insert( "surname", new QLineEdit( this ) );
-fields.insert( "age", new QLineEdit( this ) );
-
-fields["forename"]->setText( "Homer" );
-fields["surname"]->setText( "Simpson" );
-fields["age"]->setText( "45" );
-
-Q3DictIterator<QLineEdit> it( fields );
-for( ; it.current(); ++it )
-    cout << it.currentKey() << ": " << it.current()->text() << endl;
-cout << endl;
-
-// Output (random order):
-//	age: 45
-//	surname: Simpson
-//	forename: Homer
-//! [1]
diff --git a/doc/codesnippets/doc/src/snippets/code/doc_src_q3intdict.qdoc b/doc/codesnippets/doc/src/snippets/code/doc_src_q3intdict.qdoc
deleted file mode 100644
index 0fae2c8..0000000
--- a/doc/codesnippets/doc/src/snippets/code/doc_src_q3intdict.qdoc
+++ /dev/null
@@ -1,51 +0,0 @@
-//! [0]
-Q3IntDict<QLineEdit> fields; // long int keys, QLineEdit* values
-for ( int i = 0; i < 3; i++ )
-    fields.insert( i, new QLineEdit( this ) );
-
-fields[0]->setText( "Homer" );
-fields[1]->setText( "Simpson" );
-fields[2]->setText( "45" );
-
-Q3IntDictIterator<QLineEdit> it( fields );
-for ( ; it.current(); ++it )
-    cout << it.currentKey() << ": " << it.current()->text() << endl;
-
-for ( int i = 0; i < 3; i++ )
-    cout << fields[i]->text() << " "; // Prints "Homer Simpson 45"
-cout << endl;
-
-fields.remove( 1 ); // Does not delete the line edit
-for ( int i = 0; i < 3; i++ )
-    if ( fields[i] )
-	cout << fields[i]->text() << " "; // Prints "Homer 45"
-//! [0]
-
-
-//! [1]
-Q3IntDict<char> dict;
-//	...
-if ( dict.find(key) )
-    dict.remove( key );
-dict.insert( key, item );
-//! [1]
-
-
-//! [2]
-Q3IntDict<QLineEdit> fields;
-for ( int i = 0; i < 3; i++ )
-    fields.insert( i, new QLineEdit( this ) );
-
-fields[0]->setText( "Homer" );
-fields[1]->setText( "Simpson" );
-fields[2]->setText( "45" );
-
-Q3IntDictIterator<QLineEdit> it( fields ); 
-for ( ; it.current(); ++it )
-    cout << it.currentKey() << ": " << it.current()->text() << endl;
-
-// Output (random order):
-//	0: Homer
-//	1: Simpson
-//	2: 45
-//! [2]
diff --git a/doc/codesnippets/doc/src/snippets/code/doc_src_q3memarray.qdoc b/doc/codesnippets/doc/src/snippets/code/doc_src_q3memarray.qdoc
deleted file mode 100644
index b56ef4e..0000000
--- a/doc/codesnippets/doc/src/snippets/code/doc_src_q3memarray.qdoc
+++ /dev/null
@@ -1,80 +0,0 @@
-//! [0]
-#include <q3memarray.h>
-#include <stdio.h>
-
-Q3MemArray<int> fib( int num ) // returns fibonacci array
-{
-    Q_ASSERT( num > 2 );
-    Q3MemArray<int> f( num ); // array of ints
-
-    f[0] = f[1] = 1;
-    for ( int i = 2; i < num; i++ )
-	f[i] = f[i-1] + f[i-2];
-
-    return f;
-}
-
-int main()
-{
-    Q3MemArray<int> a = fib( 6 ); // get first 6 fibonaccis
-    for ( int i = 0; i < a.size(); i++ )
-	qDebug( "%d: %d", i, a[i] );
-
-    qDebug( "1 is found %d times", a.contains(1) );
-    qDebug( "5 is found at index %d", a.find(5) );
-
-    return 0;
-}
-//! [0]
-
-
-//! [1]
-0: 1
-1: 1
-2: 2
-3: 3
-4: 5
-5: 8
-1 is found 2 times
-5 is found at index 4
-//! [1]
-
-
-//! [2]
-// MyStruct may be padded to 4 or 8 bytes
-struct MyStruct
-{
-    short i; // 2 bytes
-    char c;  // 1 byte
-};
-
-Q3MemArray<MyStruct> a(1);
-a[0].i = 5;
-a[0].c = 't';
-
-MyStruct x;
-x.i = '5';
-x.c = 't';
-int i = a.find( x ); // may return -1 if the pad bytes differ
-//! [2]
-
-
-//! [3]
-static char bindata[] = { 231, 1, 44, ... };
-QByteArray	a;
-a.setRawData( bindata, sizeof(bindata) );	// a points to bindata
-QDataStream s( a, IO_ReadOnly );		// open on a's data
-s >> <something>;				// read raw bindata
-a.resetRawData( bindata, sizeof(bindata) ); // finished
-//! [3]
-
-
-//! [4]
-static char bindata[] = { 231, 1, 44, ... };
-QByteArray	a, b;
-a.setRawData( bindata, sizeof(bindata) );	// a points to bindata
-a.resize( 8 );				// will crash
-b = a;					// will crash
-a[2] = 123;					// might crash
-// forget to resetRawData: will crash
-//! [4]
diff --git a/doc/codesnippets/doc/src/snippets/code/doc_src_q3ptrdict.qdoc b/doc/codesnippets/doc/src/snippets/code/doc_src_q3ptrdict.qdoc
deleted file mode 100644
index d23824b..0000000
--- a/doc/codesnippets/doc/src/snippets/code/doc_src_q3ptrdict.qdoc
+++ /dev/null
@@ -1,66 +0,0 @@
-//! [0]
-Q3PtrDict<char> fields; // void* keys, char* values
-
-QLineEdit *le1 = new QLineEdit( this );
-le1->setText( "Simpson" );
-QLineEdit *le2 = new QLineEdit( this );
-le2->setText( "Homer" );
-QLineEdit *le3 = new QLineEdit( this );
-le3->setText( "45" );
-
-fields.insert( le1, "Surname" );
-fields.insert( le2, "Forename" );
-fields.insert( le3, "Age" );
-
-Q3PtrDictIterator<char> it( fields );
-for( ; it.current(); ++it )
-    cout << it.current() << endl;
-cout << endl;
-
-if ( fields[le1] ) // Prints "Surname: Simpson"
-    cout << fields[le1] << ": " << le1->text() << endl; 
-if ( fields[le2] ) // Prints "Forename: Homer"
-    cout << fields[le2] << ": " << le2->text() << endl; 
-
-fields.remove( le1 ); // Removes le1 from the dictionary
-cout << le1->text() << endl; // Prints "Simpson"
-//! [0]
-
-
-//! [1]
-Q3PtrDict<ItemType> dict;
-    ...
-if ( dict.find( key ) )
-    dict.remove( key );
-dict.insert( key, item );
-//! [1]
-
-
-//! [2]
-Q3PtrDict<char> fields;
-
-QLineEdit *le1 = new QLineEdit( this );
-le1->setText( "Simpson" );
-QLineEdit *le2 = new QLineEdit( this );
-le2->setText( "Homer" );
-QLineEdit *le3 = new QLineEdit( this );
-le3->setText( "45" );
-
-fields.insert( le1, "Surname" );
-fields.insert( le2, "Forename" );
-fields.insert( le3, "Age" );
-
-Q3PtrDictIterator<char> it( fields );
-for( ; it.current(); ++it ) {
-    QLineEdit *le = (QLineEdit)it.currentKey();
-    cout << it.current() << ": " << le->text() << endl;
-}
-cout << endl;
-
-// Output (random order):
-//  Forename: Homer
-//  Age: 45
-//  Surname: Simpson
-//! [2]
-
-
diff --git a/doc/codesnippets/doc/src/snippets/code/doc_src_q3ptrlist.qdoc b/doc/codesnippets/doc/src/snippets/code/doc_src_q3ptrlist.qdoc
deleted file mode 100644
index f416784..0000000
--- a/doc/codesnippets/doc/src/snippets/code/doc_src_q3ptrlist.qdoc
+++ /dev/null
@@ -1,82 +0,0 @@
-//! [0]
-class Employee
-{
-public:
-    Employee() : sn( 0 ) { }
-    Employee( const QString& forename, const QString& surname, int salary )
-	: fn( forename ), sn( surname ), sal( salary )
-    { }
-
-    void setSalary( int salary ) { sal = salary; }
-
-    QString forename() const { return fn; }
-    QString surname() const { return sn; }
-    int salary() const { return sal; }
-
-private:
-    QString fn;
-    QString sn;
-    int sal;
-};
-
-Q3PtrList<Employee> list;
-list.setAutoDelete( TRUE ); // the list owns the objects
-
-list.append( new Employee("John", "Doe", 50000) );
-list.append( new Employee("Jane", "Williams", 80000) );
-list.append( new Employee("Tom", "Jones", 60000) );
-
-Employee *employee;
-for ( employee = list.first(); employee; employee = list.next() )
-    cout << employee->surname().latin1() << ", " <<
-	    employee->forename().latin1() << " earns " <<
-	    employee->salary() << endl;
-cout << endl;
-
-// very inefficient for big lists
-for ( uint i = 0; i < list.count(); ++i )
-    if ( list.at(i) )
-	cout << list.at( i )->surname().latin1() << endl;
-//! [0]
-
-
-//! [1]
-Doe, John earns 50000
-Williams, Jane earns 80000
-Jones, Tom earns 60000
-
-Doe
-Williams
-Jones
-//! [1]
-
-
-//! [2]
-if ( list.findRef( item ) != -1 )
-    list.remove();
-//! [2]
-
-
-//! [3]
-Q3PtrList<Employee> list;
-
-list.append( new Employee("John", "Doe", 50000) );
-list.append( new Employee("Jane", "Williams", 80000) );
-list.append( new Employee("Tom", "Jones", 60000) );
-
-Q3PtrListIterator<Employee> it( list );
-Employee *employee;
-while ( (employee = it.current()) != 0 ) {
-    ++it;
-    cout << employee->surname().latin1() << ", " <<
-	    employee->forename().latin1() << " earns " <<
-	    employee->salary() << endl;
-}
-//! [3]
-
-
-//! [4]
-Doe, John earns 50000
-Williams, Jane earns 80000
-Jones, Tom earns 60000
-//! [4]
diff --git a/doc/codesnippets/doc/src/snippets/code/doc_src_q3valuelist.qdoc b/doc/codesnippets/doc/src/snippets/code/doc_src_q3valuelist.qdoc
deleted file mode 100644
index 5a6d564..0000000
--- a/doc/codesnippets/doc/src/snippets/code/doc_src_q3valuelist.qdoc
+++ /dev/null
@@ -1,95 +0,0 @@
-//! [0]
-class Employee
-{
-public:
-    Employee(): sn(0) {}
-    Employee( const QString& forename, const QString& surname, int salary )
-	: fn(forename), sn(surname), sal(salary)
-    {}
-
-    QString forename() const { return fn; }
-    QString surname() const { return sn; }
-    int salary() const { return sal; }
-    void setSalary( int salary ) { sal = salary; }
-
-private:
-    QString fn;
-    QString sn;
-    int sal;
-};
-
-typedef Q3ValueList<Employee> EmployeeList;
-EmployeeList list;
-
-list.append( Employee("John", "Doe", 50000) );
-list.append( Employee("Jane", "Williams", 80000) );
-list.append( Employee("Tom", "Jones", 60000) );
-
-Employee mary( "Mary", "Hawthorne", 90000 );
-list.append( mary );
-mary.setSalary( 100000 );
-
-EmployeeList::iterator it;
-for ( it = list.begin(); it != list.end(); ++it )
-    cout << (*it).surname().latin1() << ", " <<
-	    (*it).forename().latin1() << " earns " <<
-	    (*it).salary() << endl;
-
-// Output:
-// Doe, John earns 50000
-// Williams, Jane earns 80000
-// Hawthorne, Mary earns 90000
-// Jones, Tom earns 60000
-//! [0]
-
-
-//! [1]
-Q3ValueList<int> list;
-list.append( 1 );
-list.append( 2 );
-list.append( 3 );
-...
-if ( !list.empty() ) {
-    // OK, modify the first item
-    int& i = list.first();
-    i = 18;
-}
-...
-Q3ValueList<double> dlist;
-double d = dlist.last(); // undefined
-//! [1]
-
-
-//! [2]
-Q3ValueList<int> l;
-...
-Q3ValueList<int>::iterator it = l.end();
---it;
-if ( it != end() )
-    // ...
-//! [2]
-
-
-//! [3]
-Q3ValueList<int> l;
-...
-Q3ValueList<int>::iterator it = l.end();
---it;
-if ( it != end() )
-    // ...
-//! [3]
-
-
-//! [4]
-EmployeeList::iterator it;
-for ( it = list.begin(); it != list.end(); ++it )
-    cout << (*it).surname().latin1() << ", " <<
-	    (*it).forename().latin1() << " earns " <<
-	    (*it).salary() << endl;
-
-// Output:
-// Doe, John earns 50000
-// Williams, Jane earns 80000
-// Hawthorne, Mary earns 90000
-// Jones, Tom earns 60000
-//! [4]
diff --git a/doc/codesnippets/doc/src/snippets/code/doc_src_q3valuestack.qdoc b/doc/codesnippets/doc/src/snippets/code/doc_src_q3valuestack.qdoc
deleted file mode 100644
index 61d564b..0000000
--- a/doc/codesnippets/doc/src/snippets/code/doc_src_q3valuestack.qdoc
+++ /dev/null
@@ -1,13 +0,0 @@
-//! [0]
-Q3ValueStack<int> stack;
-stack.push( 1 );
-stack.push( 2 );
-stack.push( 3 );
-while ( ! stack.isEmpty() )
-    cout << "Item: " << stack.pop() << endl;
-
-// Output:
-//	Item: 3
-//	Item: 2
-//	Item: 1
-//! [0]
diff --git a/doc/codesnippets/doc/src/snippets/code/doc_src_q3valuevector.qdoc b/doc/codesnippets/doc/src/snippets/code/doc_src_q3valuevector.qdoc
deleted file mode 100644
index 792bfac..0000000
--- a/doc/codesnippets/doc/src/snippets/code/doc_src_q3valuevector.qdoc
+++ /dev/null
@@ -1,85 +0,0 @@
-//! [0]
-#include <qvaluevector.h>
-#include <qstring.h>
-#include <stdio.h>
-
-class Employee
-{
-public:
-    Employee(): s(0) {}
-    Employee( const QString& name, int salary )
-	: n( name ), s( salary )
-    { }
-
-    QString name()   const	 	{ return n; }
-    int	salary() const	 	{ return s; }
-    void	setSalary( int salary )	{ s = salary; }
-private:
-    QString n;
-    int     s;
-};
-
-int main()
-{
-    typedef Q3ValueVector<Employee> EmployeeVector;
-    EmployeeVector vec( 3 );  // vector of 3 Employees
-
-    vec[0] = Employee( "Bill", 50000 );
-    vec[1] = Employee( "Steve", 80000 );
-    vec[2] = Employee( "Ron", 60000 );
-
-    Employee joe( "Joe", 50000 );
-    vec.push_back( joe );  // vector expands to accommodate 4 Employees
-    joe.setSalary( 70000 );
-
-    EmployeeVector::iterator it;
-    for( it = vec.begin(); it != vec.end(); ++it )
-	printf( "%s earns %d\n", (*it).name().latin1(), (*it).salary() );
-
-    return 0;
-}
-//! [0]
-
-
-//! [1]
-Bill earns 50000
-Steve earns 80000
-Ron earns 60000
-Joe earns 50000
-//! [1]
-
-
-//! [2]
-Q3ValueVector<int> vec1;  // an empty vector
-vec1[10] = 4;  // WARNING: undefined, probably a crash
-
-Q3ValueVector<QString> vec2(25); // initialize with 25 elements
-vec2[10] = "Dave";  // OK
-//! [2]
-
-
-//! [3]
-void func( Q3ValueVector<int>& vec )
-{
-    if ( vec.size() > 10 ) {
-	vec[9] = 99; // OK
-    }
-};
-//! [3]
-
-
-//! [4]
-Q3ValueVector<int> vec( 3 );
-vec.push_back( 1 );
-vec.push_back( 2 );
-vec.push_back( 3 );
-...
-if ( !vec.empty() ) {
-    // OK: modify the first element
-    int& i = vec.front();
-    i = 18;
-}
-...
-Q3ValueVector<double> dvec;
-double d = dvec.back(); // undefined behavior
-//! [4]
diff --git a/doc/codesnippets/doc/src/snippets/code/doc_src_qalgorithms.qdoc b/doc/codesnippets/doc/src/snippets/code/doc_src_qalgorithms.qdoc
deleted file mode 100644
index 69d943c..0000000
--- a/doc/codesnippets/doc/src/snippets/code/doc_src_qalgorithms.qdoc
+++ /dev/null
@@ -1,314 +0,0 @@
-//! [0]
-QStringList list;
-list << "one" << "two" << "three";
-
-qFill(list.begin(), list.end(), "eleven");
-// list: [ "eleven", "eleven", "eleven" ]
-//! [0]
-
-
-//! [1]
-qFill(list.begin() + 1, list.end(), "six");
-// list: [ "eleven", "six", "six" ]
-//! [1]
-
-
-//! [2]
-QChar resolveEntity(const QString &entity)
-{
-    static const QLatin1String name_table[] = {
-        "AElig", "Aacute", ..., "zwnj"
-    };
-    static const ushort value_table[] = {
-        0x0061, 0x00c1, ..., 0x200c
-    };
-    int N = sizeof(name_table) / sizeof(name_table[0]);
-
-    const QLatin1String *name = qBinaryFind(name_table, name_table + N,
-                                            entity);
-    int index = name - name_table;
-    if (index == N)
-        return QChar();
-
-    return QChar(value_table[index]);
-}
-//! [2]
-
-
-//! [3]
-QChar resolveEntity(const QString &entity)
-{
-    static QMap<QString, int> entityMap;
-
-    if (!entityMap) {
-        entityMap.insert("AElig", 0x0061);
-        entityMap.insert("Aacute", 0x00c1);
-        ...
-        entityMap.insert("zwnj", 0x200c);
-    }
-    return QChar(entityMap.value(entity));
-}
-//! [3]
-
-
-//! [4]
-QStringList list;
-list << "one" << "two" << "three";
-
-QVector<QString> vect1(3);
-qCopy(list.begin(), list.end(), vect1.begin());
-// vect: [ "one", "two", "three" ]
-
-QVector<QString> vect2(8);
-qCopy(list.begin(), list.end(), vect2.begin() + 2);
-// vect: [ "", "", "one", "two", "three", "", "", "" ]
-//! [4]
-
-
-//! [5]
-QStringList list;
-list << "one" << "two" << "three";
-
-QVector<QString> vect(5);
-qCopyBackward(list.begin(), list.end(), vect.end());
-// vect: [ "", "", "one", "two", "three" ]
-//! [5]
-
-
-//! [6]
-QStringList list;
-list << "one" << "two" << "three";
-
-QVector<QString> vect(3);
-vect[0] = "one";
-vect[1] = "two";
-vect[2] = "three";
-
-bool ret1 = qEqual(list.begin(), list.end(), vect.begin());
-// ret1 == true
-
-vect[2] = "seven";
-bool ret2 = qEqual(list.begin(), list.end(), vect.begin());
-// ret2 == false
-//! [6]
-
-
-//! [7]
-QStringList list;
-list << "one" << "two" << "three";
-
-qFill(list.begin(), list.end(), "eleven");
-// list: [ "eleven", "eleven", "eleven" ]
-
-qFill(list.begin() + 1, list.end(), "six");
-// list: [ "eleven", "six", "six" ]
-//! [7]
-
-
-//! [8]
-QStringList list;
-list << "one" << "two" << "three";
-
-QStringList::iterator i1 = qFind(list.begin(), list.end(), "two");
-// i1 == list.begin() + 1
-
-QStringList::iterator i2 = qFind(list.begin(), list.end(), "seventy");
-// i2 == list.end()
-//! [8]
-
-
-//! [9]
-QList<int> list;
-list << 3 << 3 << 6 << 6 << 6 << 8;
-
-int countOf6 = 0;
-qCount(list.begin(), list.end(), 6, countOf6);
-// countOf6 == 3
-
-int countOf7 = 0;
-qCount(list.begin(), list.end(), 7, countOf7);
-// countOf7 == 0
-//! [9]
-
-
-//! [10]
-double pi = 3.14;
-double e = 2.71;
-
-qSwap(pi, e);
-// pi == 2.71, e == 3.14
-//! [10]
-
-
-//! [11]
-QList<int> list;
-list << 33 << 12 << 68 << 6 << 12;
-qSort(list.begin(), list.end());
-// list: [ 6, 12, 12, 33, 68 ]
-//! [11]
-
-
-//! [12]
-bool caseInsensitiveLessThan(const QString &s1, const QString &s2)
-{
-    return s1.toLower() < s2.toLower();
-}
-
-int doSomething()
-{
-    QStringList list;
-    list << "AlPha" << "beTA" << "gamma" << "DELTA";
-    qSort(list.begin(), list.end(), caseInsensitiveLessThan);
-    // list: [ "AlPha", "beTA", "DELTA", "gamma" ]
-}
-//! [12]
-
-
-//! [13]
-QList<int> list;
-list << 33 << 12 << 68 << 6 << 12;
-qSort(list.begin(), list.end(), qGreater<int>());
-// list: [ 68, 33, 12, 12, 6 ]
-//! [13]
-
-
-//! [14]
-QStringList list;
-list << "AlPha" << "beTA" << "gamma" << "DELTA";
-
-QMap<QString, QString> map;
-foreach (QString str, list)
-    map.insert(str.toLower(), str);
-
-list = map.values();
-//! [14]
-
-
-//! [15]
-QList<int> list;
-list << 33 << 12 << 68 << 6 << 12;
-qStableSort(list.begin(), list.end());
-// list: [ 6, 12, 12, 33, 68 ]
-//! [15]
-
-
-//! [16]
-bool caseInsensitiveLessThan(const QString &s1, const QString &s2)
-{
-    return s1.toLower() < s2.toLower();
-}
-
-int doSomething()
-{
-    QStringList list;
-    list << "AlPha" << "beTA" << "gamma" << "DELTA";
-    qStableSort(list.begin(), list.end(), caseInsensitiveLessThan);
-    // list: [ "AlPha", "beTA", "DELTA", "gamma" ]
-}
-//! [16]
-
-
-//! [17]
-QList<int> list;
-list << 33 << 12 << 68 << 6 << 12;
-qStableSort(list.begin(), list.end(), qGreater<int>());
-// list: [ 68, 33, 12, 12, 6 ]
-//! [17]
-
-
-//! [18]
-QList<int> list;
-list << 3 << 3 << 6 << 6 << 6 << 8;
-
-QList<int>::iterator i = qLowerBound(list.begin(), list.end(), 5);
-list.insert(i, 5);
-// list: [ 3, 3, 5, 6, 6, 6, 8 ]
-
-i = qLowerBound(list.begin(), list.end(), 12);
-list.insert(i, 12);
-// list: [ 3, 3, 5, 6, 6, 6, 8, 12 ]
-//! [18]
-
-
-//! [19]
-QVector<int> vect;
-vect << 3 << 3 << 6 << 6 << 6 << 8;
-QVector<int>::iterator begin6 =
-	qLowerBound(vect.begin(), vect.end(), 6);
-QVector<int>::iterator end6 =
-	qUpperBound(begin6, vect.end(), 6);
-
-QVector<int>::iterator i = begin6;
-while (i != end6) {
-    *i = 7;
-    ++i;
-}
-// vect: [ 3, 3, 7, 7, 7, 8 ]
-//! [19]
-
-
-//! [20]
-QList<int> list;
-list << 3 << 3 << 6 << 6 << 6 << 8;
-
-QList<int>::iterator i = qUpperBound(list.begin(), list.end(), 5);
-list.insert(i, 5);
-// list: [ 3, 3, 5, 6, 6, 6, 8 ]
-
-i = qUpperBound(list.begin(), list.end(), 12);
-list.insert(i, 12);
-// list: [ 3, 3, 5, 6, 6, 6, 8, 12 ]
-//! [20]
-
-
-//! [21]
-QVector<int> vect;
-vect << 3 << 3 << 6 << 6 << 6 << 8;
-QVector<int>::iterator begin6 =
-	qLowerBound(vect.begin(), vect.end(), 6);
-QVector<int>::iterator end6 =
-	qUpperBound(vect.begin(), vect.end(), 6);
-
-QVector<int>::iterator i = begin6;
-while (i != end6) {
-    *i = 7;
-    ++i;
-}
-// vect: [ 3, 3, 7, 7, 7, 8 ]
-//! [21]
-
-
-//! [22]
-QVector<int> vect;
-vect << 3 << 3 << 6 << 6 << 6 << 8;
-
-QVector<int>::iterator i =
-	qBinaryFind(vect.begin(), vect.end(), 6);
-// i == vect.begin() + 2 (or 3 or 4)
-//! [22]
-
-
-//! [23]
-QList<Employee *> list;
-list.append(new Employee("Blackpool", "Stephen"));
-list.append(new Employee("Twist", "Oliver"));
-
-qDeleteAll(list.begin(), list.end());
-list.clear();
-//! [23]
-
-
-//! [24]
-QList<int> list;
-list << 33 << 12 << 68 << 6 << 12;
-qSort(list.begin(), list.end(), qLess<int>());
-// list: [ 68, 33, 12, 12, 6 ]
-//! [24]
-
-
-//! [25]
-QList<int> list;
-list << 33 << 12 << 68 << 6 << 12;
-qSort(list.begin(), list.end(), qGreater<int>());
-// list: [ 68, 33, 12, 12, 6 ]
-//! [25]
diff --git a/doc/codesnippets/doc/src/snippets/code/doc_src_qaxcontainer.qdoc b/doc/codesnippets/doc/src/snippets/code/doc_src_qaxcontainer.qdoc
deleted file mode 100644
index 9edd87f..0000000
--- a/doc/codesnippets/doc/src/snippets/code/doc_src_qaxcontainer.qdoc
+++ /dev/null
@@ -1,8 +0,0 @@
-//! [0]
-CONFIG += qaxcontainer
-//! [0]
-
-
-//! [1]
-TYPELIBS = file.tlb
-//! [1]
diff --git a/doc/codesnippets/doc/src/snippets/code/doc_src_qaxserver.qdoc b/doc/codesnippets/doc/src/snippets/code/doc_src_qaxserver.qdoc
deleted file mode 100644
index 9b51e66..0000000
--- a/doc/codesnippets/doc/src/snippets/code/doc_src_qaxserver.qdoc
+++ /dev/null
@@ -1,223 +0,0 @@
-//! [0]
-TEMPLATE = app
-CONFIG  += qaxserver
-
-RC_FILE  = qaxserver.rc
-...
-//! [0]
-
-
-//! [1]
-TEMPLATE = lib
-CONFIG  += qaxserver dll
-
-DEF_FILE = qaxserver.def
-RC_FILE  = qaxserver.rc
-...
-//! [1]
-
-
-//! [2]
-TEMPLATE = lib
-VERSION = 2.5
-...
-//! [2]
-
-
-//! [3]
-#include <QWidget>
-
-class MyActiveX : public QWidget
-{
-    Q_OBJECT
-//! [3]
-
-
-//! [4]
-Q_CLASSINFO("ClassID", "{1D9928BD-4453-4bdd-903D-E525ED17FDE5}")
-Q_CLASSINFO("InterfaceID", "{99F6860E-2C5A-42ec-87F2-43396F4BE389}")
-Q_CLASSINFO("EventsID", "{0A3E9F27-E4F1-45bb-9E47-63099BCCD0E3}")
-//! [4]
-
-
-//! [5]
-Q_PROPERTY(int value READ value WRITE setValue)
-//! [5]
-
-
-//! [6]
-public:
-    MyActiveX(QWidget *parent = 0)
-    ...
-
-    int value() const;
-
-public slots:
-    void setValue(int v);
-    ...
-
-signals:
-    void valueChange(int v);
-    ...
-
-};
-//! [6]
-
-
-//! [7]
-#include <QAxBindable>
-#include <QWidget>
-
-class MyActiveX : public QWidget, public QAxBindable
-{
-    Q_OBJECT
-//! [7]
-
-
-//! [8]
-QAXFACTORY_BEGIN("{ad90301a-849e-4e8b-9a91-0a6dc5f6461f}",
-                 "{a8f21901-7ff7-4f6a-b939-789620c03d83}")
-    QAXCLASS(MyWidget)
-    QAXCLASS(MyWidget2)
-    QAXTYPE(MySubType)
-QAXFACTORY_END()
-//! [8]
-
-
-//! [9]
-#include <QApplication>
-#include <QAxFactory>
-
-int main(int argc, char *argv[])
-{
-    QApplication app(argc, argv);
-    if (!QAxFactory::isServer()) {
-        // create and show main window
-    }
-    return app.exec();
-}
-//! [9]
-
-
-//! [10]
-MyFactory(const QUuid &, const QUuid &);
-//! [10]
-
-
-//! [11]
-HMODULE dll = LoadLibrary("myserver.dll");
-typedef HRESULT(__stdcall *DllRegisterServerProc)();
-DllRegisterServerProc DllRegisterServer = 
-    (DllRegisterServerProc)GetProcAddress(dll, "DllRegisterServer");
-
-HRESULT res = E_FAIL;
-if (DllRegisterServer)
-    res = DllRegisterServer();
-if (res != S_OK)
-    // error handling
-//! [11]
-
-
-//! [12]
-cabarc N simpleax.cab simpleax.exe simple.inf
-//! [12]
-
-
-//! [13]
-<object ID="MyActiveX1" CLASSID="CLSID:ad90301a-849e-4e8b-9a91-0a6dc5f6461f">
-   ...
-<\object>
-//! [13]
-
-
-//! [14]
-<object ID=...>
-    <param name="name" value="value">
-<\object>
-//! [14]
-
-
-//! [15]
-class MyActiveX : public QWidget
-{
-    Q_OBJECT
-    Q_CLASSINFO("Version", "2.0")
-    Q_CLASSINFO("ClassID", "{7a4cffd8-cbcd-4ae9-ae7e-343e1e5710df}")
-    Q_CLASSINFO("InterfaceID", "{6fb035bf-8019-48d8-be51-ef05427d8994}")
-    Q_CLASSINFO("EventsID", "{c42fffdf-6557-47c9-817a-2da2228bc29c}")
-    Q_CLASSINFO("Insertable", "yes")
-    Q_CLASSINFO("ToSuperClass", "MyActiveX")
-    Q_PROPERTY(...)
-
-public:
-    MyActiveX(QWidget *parent = 0);
-
-    ...
-};
-//! [15]
-
-
-//! [16]
-class MyLicensedControl : public QWidget
-{
-    Q_OBJECT
-    Q_CLASSINFO("LicenseKey", "<key string>")
-    ...
-};
-//! [16]
-
-
-//! [17]
-class AxImpl : public QAxAggregated, public ISomeCOMInterface
-{
-public:
-    AxImpl() {}
-
-    long queryInterface(const QUuid &iid, void **iface);
-
-    // IUnknown
-    QAXAGG_IUNKNOWN
-
-    // ISomeCOMInterface
-    ...
-}
-//! [17]
-
-
-//! [18]
-long AxImpl::queryInterface(const QUuid &iid, void **iface)
-{
-    *iface = 0;
-    if (iid == IID_ISomeCOMInterface)
-        *iface = (ISomeCOMInterface *)this;
-    else
-        return E_NOINTERFACE;
-
-    AddRef();
-    return S_OK;
-}
-//! [18]
-
-
-//! [19]
-HRESULT AxImpl::QueryInterface(REFIID iid, void **iface)
-{
-    return controllingUnknown()->QueryInterface(iid, iface);
-}
-//! [19]
-
-
-//! [20]
-class MyActiveX : public QWidget, public QAxBindable
-{
-    Q_OBJECT
-
-public:
-    MyActiveX(QWidget *parent);
-
-    QAxAggregated *createAggregate()
-    {
-        return new AxImpl();
-    }
-};
-//! [20]
diff --git a/doc/codesnippets/doc/src/snippets/code/doc_src_qcache.qdoc b/doc/codesnippets/doc/src/snippets/code/doc_src_qcache.qdoc
deleted file mode 100644
index 66bda6a..0000000
--- a/doc/codesnippets/doc/src/snippets/code/doc_src_qcache.qdoc
+++ /dev/null
@@ -1,17 +0,0 @@
-//! [0]
-QCache<int, Employee> cache;
-//! [0]
-
-
-//! [1]
-Employee *employee = new Employee;
-employee->setId(37);
-employee->setName("Richard Schmit");
-...
-cache.insert(employee->id(), employee);
-//! [1]
-
-
-//! [2]
-QCache<int, MyDataStructure> cache(5000);
-//! [2]
diff --git a/doc/codesnippets/doc/src/snippets/code/doc_src_qdbusadaptors.qdoc b/doc/codesnippets/doc/src/snippets/code/doc_src_qdbusadaptors.qdoc
deleted file mode 100644
index 7f69a90..0000000
--- a/doc/codesnippets/doc/src/snippets/code/doc_src_qdbusadaptors.qdoc
+++ /dev/null
@@ -1,253 +0,0 @@
-//! [0]
-        class MainApplicationAdaptor: public QDBusAbstractAdaptor
-        {
-            Q_OBJECT
-            Q_CLASSINFO("D-Bus Interface", "org.kde.DBus.MainApplication")
-            Q_PROPERTY(QString caption READ caption WRITE setCaption)
-            Q_PROPERTY(QString organizationName READ organizationName)
-            Q_PROPERTY(QString organizationDomain READ organizationDomain)
-
-        private:
-            QApplication *app;
-
-        public:
-            MainApplicationAdaptor(QApplication *application)
-                : QDBusAbstractAdaptor(application), app(application)
-            {
-                connect(application, SIGNAL(aboutToQuit()), SIGNAL(aboutToQuit()));
-                connect(application, SIGNAL(focusChanged(QWidget*, QWidget*)),
-                        SLOT(focusChangedSlot(QWidget*, QWidget*)));
-            }
-
-            QString caption()
-            {
-                if (app->hasMainWindow())
-                    return app->mainWindow()->caption();
-                return QString(""); // must not return a null QString
-            }
-
-            void setCaption(const QString &newCaption)
-            {
-                if (app->hasMainWindow())
-                    app->mainWindow()->setCaption(newCaption);
-            }
-
-            QString organizationName()
-            {
-                return app->organizationName();
-            }
-
-            QString organizationDomain()
-            {
-                return app->organizationDomain();
-            }
-
-        public slots:
-            Q_NOREPLY void quit()
-            { app->quit(); }
-
-            void reparseConfiguration()
-            { app->reparseConfiguration(); }
-
-            QString mainWindowObject()
-            {
-                if (app->hasMainWindow())
-                    return QString("/%1/mainwindow").arg(app->applicationName());
-                return QString();
-            }
-
-            void setSessionManagement(bool enable)
-            {
-                if (enable)
-                   app->enableSessionManagement();
-                else
-                   app->disableSessionManagement();
-            }
-
-        private slots:
-            void focusChangedSlot(QWidget *, QWidget *now)
-            {
-                if (now == app->mainWindow())
-                    emit mainWindowHasFocus();
-            }
-
-        signals:
-            void aboutToQuit();
-            void mainWindowHasFocus();
-        };
-//! [0]
-
-
-//! [1]
-interface org.kde.DBus.MainApplication
-{
-    property readwrite STRING caption
-    property read STRING organizationName
-    property read STRING organizationDomain
-
-    method quit() annotation("org.freedesktop.DBus.Method.NoReply", "true")
-    method reparseConfiguration()
-    method mainWindowObject(out STRING)
-    method disableSessionManagement(in BOOLEAN enable)
-
-    signal aboutToQuit()
-    signal mainWindowHasFocus()
-}
-//! [1]
-
-
-//! [2]
-int main(int argc, char **argv)
-{
-    // create the QApplication object
-    QApplication app(argc, argv);
-
-    // create the MainApplication adaptor:
-    new MainApplicationAdaptor(app);
-
-    // connect to D-Bus and register as an object:
-    QDBusConnection::sessionBus().registerObject("/MainApplication", app);
-
-    // add main window, etc.
-    [...]
-
-    app.exec();
-}
-//! [2]
-
-
-//! [3]
-class MainApplicationAdaptor: public QDBusAbstractAdaptor
-{
-    Q_OBJECT
-    Q_CLASSINFO("D-Bus Interface", "org.kde.DBus.MainApplication")
-//! [3]
-
-
-//! [4]
-    Q_PROPERTY(QString caption READ caption WRITE setCaption)
-    Q_PROPERTY(QString organizationName READ organizationName)
-    Q_PROPERTY(QString organizationDomain READ organizationDomain)
-//! [4]
-
-
-//! [5]
-QString caption()
-{
-    if (app->hasMainWindow())
-        return app->mainWindow()->caption();
-    return QString();
-}
-
-void setCaption(const QString &newCaption)
-{
-    if (app->hasMainWindow())
-        app->mainWindow()->setCaption(newCaption);
-}
-
-QString organizationName()
-{
-    return app->organizationName();
-}
-
-QString organizationDomain()
-{
-    return app->organizationDomain();
-}
-//! [5]
-
-
-//! [6]
-MyInterfaceAdaptor(QApplication *application)
-    : QDBusAbstractAdaptor(application), app(application)
-{
-    connect(application, SIGNAL(aboutToQuit()), SIGNAL(aboutToQuit());
-    connect(application, SIGNAL(focusChanged(QWidget*, QWidget*)),
-            SLOT(focusChangedSlot(QWidget*, QWidget*)));
-}
-//! [6]
-
-
-//! [7]
-public slots:
-    Q_NOREPLY void quit()
-    { app->quit(); }
-
-    void reparseConfiguration()
-    { app->reparseConfiguration(); }
-
-    QString mainWindowObject()
-    {
-        if (app->hasMainWindow())
-            return QString("/%1/mainwindow").arg(app->applicationName());
-        return QString();
-    }
-
-    void setSessionManagement(bool enable)
-    {
-        if (enable)
-           app->enableSessionManagement();
-        else
-           app->disableSessionManagement();
-    }
-//! [7]
-
-
-//! [8]
-signals:
-    void aboutToQuit();
-    void mainWindowHasFocus();
-//! [8]
-
-
-//! [9]
-private slots:
-    void focusChangedSlot(QWidget *, QWidget *now)
-    {
-        if (now == app->mainWindow())
-            emit mainWindowHasFocus();
-    }
-//! [9]
-
-
-//! [10]
-struct RequestData
-{
-    QString request;
-    QString processedData;
-    QDBusMessage reply;
-};
-
-QString processRequest(const QString &request, const QDBusMessage &message)
-{
-    RequestData *data = new RequestData;
-    data->request = request;
-    message.setDelayedReply(true);
-    data->reply = message.createReply();
-    QDBusConnection::sessionBus().send(data->reply);
-
-    appendRequest(data);
-    return QString();
-}
-//! [10]
-
-
-//! [11]
-void sendReply(RequestData *data)
-{
-    // data->processedData has been initialized with the request's reply
-    QDBusMessage &reply = &data->reply;
-
-    // send the reply over D-Bus:
-    reply << data->processedData;
-    QDBusConnection::sessionBus().send(reply);
-
-    // dispose of the transaction data
-    delete data;
-}
-//! [11]
-
-
-//! [12]
-Q_NOREPLY void myMethod();
-//! [12]
diff --git a/doc/codesnippets/doc/src/snippets/code/doc_src_qiterator.qdoc b/doc/codesnippets/doc/src/snippets/code/doc_src_qiterator.qdoc
deleted file mode 100644
index 3dfa68a..0000000
--- a/doc/codesnippets/doc/src/snippets/code/doc_src_qiterator.qdoc
+++ /dev/null
@@ -1,380 +0,0 @@
-//! [0]
-QList<float> list;
-...
-QListIterator<float> i(list);
-while (i.hasNext())
-    qDebug() << i.next();
-//! [0]
-
-
-//! [1]
-QListIterator<float> i(list);
-i.toBack();
-while (i.hasPrevious())
-    qDebug() << i.previous();
-//! [1]
-
-
-//! [2]
-QLinkedList<float> list;
-...
-QLinkedListIterator<float> i(list);
-while (i.hasNext())
-    qDebug() << i.next();
-//! [2]
-
-
-//! [3]
-QLinkedListIterator<float> i(list);
-i.toBack();
-while (i.hasPrevious())
-    qDebug() << i.previous();
-//! [3]
-
-
-//! [4]
-QVector<float> vector;
-...
-QVectorIterator<float> i(vector);
-while (i.hasNext())
-    qDebug() << i.next();
-//! [4]
-
-
-//! [5]
-QVectorIterator<float> i(vector);
-i.toBack();
-while (i.hasPrevious())
-    qDebug() << i.previous();
-//! [5]
-
-
-//! [6]
-QSet<QString> set;
-...
-QSetIterator<QString> i(set);
-while (i.hasNext())
-    qDebug() << i.next();
-//! [6]
-
-
-//! [7]
-QSetIterator<QString> i(set);
-i.toBack();
-while (i.hasPrevious())
-    qDebug() << i.previous();
-//! [7]
-
-
-//! [8]
-QList<float> list;
-...
-QMutableListIterator<float> i(list);
-while (i.hasNext())
-    qDebug() << i.next();
-//! [8]
-
-
-//! [9]
-QMutableListIterator<float> i(list);
-i.toBack();
-while (i.hasPrevious())
-    qDebug() << i.previous();
-//! [9]
-
-
-//! [10]
-QMutableListIterator<int> i(list);
-while (i.hasNext()) {
-    int val = i.next();
-    if (val < 0) {
-        i.setValue(-val);
-    } else if (val == 0) {
-        i.remove();
-    }
-}
-//! [10]
-
-
-//! [11]
-QLinkedList<float> list;
-...
-QMutableLinkedListIterator<float> i(list);
-while (i.hasNext())
-    qDebug() << i.next();
-//! [11]
-
-
-//! [12]
-QMutableLinkedListIterator<float> i(list);
-i.toBack();
-while (i.hasPrevious())
-    qDebug() << i.previous();
-//! [12]
-
-
-//! [13]
-QMutableLinkedListIterator<int> i(list);
-while (i.hasNext()) {
-    int val = i.next();
-    if (val < 0) {
-        i.setValue(-val);
-    } else if (val == 0) {
-        i.remove();
-    }
-}
-//! [13]
-
-
-//! [14]
-QVector<float> vector;
-...
-QMutableVectorIterator<float> i(vector);
-while (i.hasNext())
-    qDebug() << i.next();
-//! [14]
-
-
-//! [15]
-QMutableVectorIterator<float> i(vector);
-i.toBack();
-while (i.hasPrevious())
-    qDebug() << i.previous();
-//! [15]
-
-
-//! [16]
-QMutableVectorIterator<int> i(vector);
-while (i.hasNext()) {
-    int val = i.next();
-    if (val < 0) {
-        i.setValue(-val);
-    } else if (val == 0) {
-        i.remove();
-    }
-}
-//! [16]
-
-
-//! [17]
-QSet<float> set;
-...
-QMutableSetIterator<float> i(set);
-while (i.hasNext())
-    qDebug() << i.next();
-//! [17]
-
-
-//! [18]
-QMutableSetIterator<float> i(set);
-i.toBack();
-while (i.hasPrevious())
-    qDebug() << i.previous();
-//! [18]
-
-
-//! [19]
-QMutableListIterator<int> i(list);
-while (i.hasNext()) {
-    int val = i.next();
-    if (val < -32768 || val > 32767)
-	i.remove();
-}
-//! [19]
-
-
-//! [20]
-QMutableLinkedListIterator<int> i(list);
-while (i.hasNext()) {
-    int val = i.next();
-    if (val < -32768 || val > 32767)
-	i.remove();
-}
-//! [20]
-
-
-//! [21]
-QMutableVectorIterator<int> i(vector);
-while (i.hasNext()) {
-    int val = i.next();
-    if (val < -32768 || val > 32767)
-	i.remove();
-}
-//! [21]
-
-
-//! [22]
-QMutableSetIterator<int> i(set);
-while (i.hasNext()) {
-    int val = i.next();
-    if (val < -32768 || val > 32767)
-	i.remove();
-}
-//! [22]
-
-
-//! [23]
-QMutableListIterator<double> i(list);
-while (i.hasNext()) {
-    double val = i.next();
-    i.setValue(sqrt(val));
-}
-//! [23]
-
-
-//! [24]
-QMutableLinkedListIterator<double> i(list);
-while (i.hasNext()) {
-    double val = i.next();
-    i.setValue(sqrt(val));
-}
-//! [24]
-
-
-//! [25]
-QMutableVectorIterator<double> i(list);
-while (i.hasNext()) {
-    double val = i.next();
-    i.setValue(sqrt(val));
-}
-//! [25]
-
-
-//! [26]
-QMap<int, QWidget *> map;
-...
-QMapIterator<int, QWidget *> i(map);
-while (i.hasNext()) {
-    i.next();
-    qDebug() << i.key() << ": " << i.value();
-}
-//! [26]
-
-
-//! [27]
-QMapIterator<int, QWidget *> i(map);
-i.toBack();
-while (i.hasPrevious()) {
-    i.previous();
-    qDebug() << i.key() << ": " << i.value();
-}
-//! [27]
-
-
-//! [28]
-QMapIterator<int, QWidget *> i(map);
-while (i.findNext(widget)) {
-    qDebug() << "Found widget " << widget << " under key "
-	     << i.key();
-}
-//! [28]
-
-
-//! [29]
-QHash<int, QWidget *> hash;
-...
-QHashIterator<int, QWidget *> i(hash);
-while (i.hasNext()) {
-    i.next();
-    qDebug() << i.key() << ": " << i.value();
-}
-//! [29]
-
-
-//! [30]
-QHashIterator<int, QWidget *> i(hash);
-i.toBack();
-while (i.hasPrevious()) {
-    i.previous();
-    qDebug() << i.key() << ": " << i.value();
-}
-//! [30]
-
-
-//! [31]
-QHashIterator<int, QWidget *> i(hash);
-while (i.findNext(widget)) {
-    qDebug() << "Found widget " << widget << " under key "
-	     << i.key();
-}
-//! [31]
-
-
-//! [32]
-QMap<int, QWidget *> map;
-...
-QMutableMapIterator<int, QWidget *> i(map);
-while (i.hasNext()) {
-    i.next();
-    qDebug() << i.key() << ": " << i.value();
-}
-//! [32]
-
-
-//! [33]
-QMutableMapIterator<int, QWidget *> i(map);
-i.toBack();
-while (i.hasPrevious()) {
-    i.previous();
-    qDebug() << i.key() << ": " << i.value();
-}
-//! [33]
-
-
-//! [34]
-QMutableMapIterator<int, QWidget *> i(map);
-while (i.findNext(widget)) {
-    qDebug() << "Found widget " << widget << " under key "
-	     << i.key();
-}
-//! [34]
-
-
-//! [35]
-QMutableMapIterator<QString, QString> i(map);
-while (i.hasNext()) {
-    i.next();
-    if (i.key() == i.value())
-        i.remove();
-}
-//! [35]
-
-
-//! [36]
-QHash<int, QWidget *> hash;
-...
-QMutableHashIterator<QString, QWidget *> i(hash);
-while (i.hasNext()) {
-    i.next();
-    qDebug() << i.key() << ": " << i.value();
-}
-//! [36]
-
-
-//! [37]
-QMutableHashIterator<int, QWidget *> i(hash);
-i.toBack();
-while (i.hasPrevious()) {
-    i.previous();
-    qDebug() << i.key() << ": " << i.value();
-}
-//! [37]
-
-
-//! [38]
-QMutableHashIterator<int, QWidget *> i(hash);
-while (i.findNext(widget)) {
-    qDebug() << "Found widget " << widget << " under key "
-	     << i.key();
-}
-//! [38]
-
-
-//! [39]
-QMutableHashIterator<QString, QString> i(hash);
-while (i.hasNext()) {
-    i.next();
-    if (i.key() == i.value())
-        i.remove();
-}
-//! [39]
diff --git a/doc/codesnippets/doc/src/snippets/code/doc_src_qmake-manual.qdoc b/doc/codesnippets/doc/src/snippets/code/doc_src_qmake-manual.qdoc
deleted file mode 100644
index edb66bc..0000000
--- a/doc/codesnippets/doc/src/snippets/code/doc_src_qmake-manual.qdoc
+++ /dev/null
@@ -1,813 +0,0 @@
-//! [0]
-make all
-//! [0]
-
-
-//! [1]
-CONFIG += qt thread debug
-//! [1]
-
-
-//! [2]
-CONFIG += qt
-QT += network xml
-//! [2]
-
-
-//! [3]
-QT = network xml # This will omit the core and gui modules.
-//! [3]
-
-
-//! [4]
-QT -= gui # Only the core module is used.
-//! [4]
-
-
-//! [5]
-CONFIG += link_pkgconfig
-PKGCONFIG += ogg dbus-1
-//! [5]
-
-
-//! [6]
-LIBS += -L/usr/local/lib -lmath
-//! [6]
-
-
-//! [7]
-INCLUDEPATH = c:/msdev/include d:/stl/include
-//! [7]
-
-
-//! [8]
-qmake [mode] [options] files
-//! [8]
-
-
-//! [9]
-qmake -makefile [options] files
-//! [9]
-
-
-//! [10]
-qmake -makefile -unix -o Makefile "CONFIG+=test" test.pro
-//! [10]
-
-
-//! [11]
-qmake "CONFIG+=test" test.pro
-//! [11]
-
-
-//! [12]
-qmake -project [options] files
-//! [12]
-
-
-//! [13]
-qmake -spec macx-g++
-//! [13]
-
-
-//! [14]
-QMAKE_LFLAGS += -F/path/to/framework/directory/
-//! [14]
-
-
-//! [15]
-LIBS += -framework TheFramework
-//! [15]
-
-
-//! [16]
-TEMPLATE = lib
-CONFIG += lib_bundle
-//! [16]
-
-
-//! [17]
-FRAMEWORK_HEADERS.version = Versions
-FRAMEWORK_HEADERS.files = path/to/header_one.h path/to/header_two.h
-FRAMEWORK_HEADERS.path = Headers
-QMAKE_BUNDLE_DATA += FRAMEWORK_HEADERS
-//! [17]
-
-
-//! [18]
-CONFIG += x86 ppc
-//! [18]
-
-
-//! [19]
-qmake -spec macx-xcode project.pro
-//! [19]
-
-
-//! [20]
-qmake -tp vc
-//! [20]
-
-
-//! [21]
-qmake -tp vc -r
-//! [21]
-
-
-//! [22]
-CONFIG -= embed_manifest_exe
-//! [22]
-
-
-//! [23]
-CONFIG -= embed_manifest_dll
-//! [23]
-
-
-//! [24]
-make all
-//! [24]
-
-
-//! [25]
-build_pass:CONFIG(debug, debug|release) {
-    unix: TARGET = $$join(TARGET,,,_debug)
-    else: TARGET = $$join(TARGET,,,d)
-}
-//! [25]
-
-
-//! [26]
-CONFIG += qt console newstuff
-...
-newstuff {
-    SOURCES += new.cpp
-    HEADERS += new.h
-}
-//! [26]
-
-
-//! [27]
-DEFINES += USE_MY_STUFF QT_DLL
-//! [27]
-
-
-//! [28]
-myFiles.sources = path\*.png
-DEPLOYMENT += myFiles
-//! [28]
-
-
-//! [29]
-myFiles.sources = path\file1.ext1 path2\file2.ext1 path3\*
-myFiles.path = \some\path\on\device
-someother.sources = C:\additional\files\*
-someother.path = \myFiles\path2
-DEPLOYMENT += myFiles someother
-//! [29]
-
-
-//! [30]
-DESTDIR = ../../lib
-//! [30]
-
-
-//! [31]
-DISTFILES += ../program.txt
-//! [31]
-
-
-//! [32]
-FORMS = mydialog.ui \
-    mywidget.ui \
-        myconfig.ui
-//! [32]
-
-
-//! [33]
-FORMS3 = my_uic3_dialog.ui \
-     my_uic3_widget.ui \
-         my_uic3_config.ui
-//! [33]
-
-
-//! [34]
-HEADERS = myclass.h \
-          login.h \
-          mainwindow.h
-//! [34]
-
-
-//! [35]
-INCLUDEPATH = c:/msdev/include d:/stl/include
-//! [35]
-
-
-//! [36]
-target.path += $$[QT_INSTALL_PLUGINS]/imageformats
-INSTALLS += target
-//! [36]
-
-
-//! [37]
-LEXSOURCES = lexer.l
-//! [37]
-
-
-//! [38]
-unix:LIBS += -L/usr/local/lib -lmath
-win32:LIBS += c:/mylibs/math.lib
-//! [38]
-
-
-//! [39]
-CONFIG += no_lflags_merge
-//! [39]
-
-
-//! [40]
-unix:MOC_DIR = ../myproject/tmp
-win32:MOC_DIR = c:/myproject/tmp
-//! [40]
-
-
-//! [41]
-unix:OBJECTS_DIR = ../myproject/tmp
-win32:OBJECTS_DIR = c:/myproject/tmp
-//! [41]
-
-
-//! [42]
-app {
-    # Conditional code for 'app' template here
-}
-//! [42]
-
-
-//! [43]
-FRAMEWORK_HEADERS.version = Versions
-FRAMEWORK_HEADERS.files = path/to/header_one.h path/to/header_two.h
-FRAMEWORK_HEADERS.path = Headers
-QMAKE_BUNDLE_DATA += FRAMEWORK_HEADERS
-//! [43]
-
-
-//! [44]
-QMAKE_BUNDLE_EXTENSION = .myframework
-//! [44]
-
-
-//! [45]
-QMAKE_RESOURCE_FLAGS += -threshold 0 -compress 9
-//! [45]
-
-
-//! [46]
-QMAKE_UIC = uic -L /path/to/plugin
-//! [46]
-
-
-//! [47]
-QT -= gui # Only the core module is used.
-//! [47]
-
-
-//! [48]
-unix:RCC_DIR = ../myproject/resources
-win32:RCC_DIR = c:/myproject/resources
-//! [48]
-
-
-//! [49]
-SOURCES = myclass.cpp \
-      login.cpp \
-      mainwindow.cpp
-//! [49]
-
-
-//! [50]
-SUBDIRS = kernel \
-          tools
-//! [50]
-
-
-//! [51]
-CONFIG += ordered
-//! [51]
-
-
-//! [52]
-TEMPLATE = app
-TARGET = myapp
-SOURCES = main.cpp
-//! [52]
-
-
-//! [53]
-TEMPLATE = lib
-SOURCES = main.cpp
-TARGET = mylib
-//! [53]
-
-
-//! [54]
-unix:UI_DIR = ../myproject/ui
-win32:UI_DIR = c:/myproject/ui
-//! [54]
-
-
-//! [55]
-unix:UI_HEADERS_DIR = ../myproject/ui/include
-win32:UI_HEADERS_DIR = c:/myproject/ui/include
-//! [55]
-
-
-//! [56]
-unix:UI_SOURCES_DIR = ../myproject/ui/src
-win32:UI_SOURCES_DIR = c:/myproject/ui/src
-//! [56]
-
-
-//! [57]
-VERSION = 1.2.3
-//! [57]
-
-
-//! [58]
-YACCSOURCES = moc.y
-//! [58]
-
-
-//! [59]
-FILE = /etc/passwd
-FILENAME = $$basename(FILE) #passwd
-//! [59]
-
-
-//! [60]
-CONFIG = debug
-CONFIG += release
-CONFIG(release, debug|release):message(Release build!) #will print
-CONFIG(debug, debug|release):message(Debug build!) #no print
-//! [60]
-
-
-//! [61]
-contains( drivers, network ) {
-    # drivers contains 'network'
-    message( "Configuring for network build..." )
-    HEADERS += network.h
-    SOURCES += network.cpp
-}
-//! [61]
-
-
-//! [62]
-error(An error has occurred in the configuration process.)
-//! [62]
-
-
-//! [63]
-exists( $(QTDIR)/lib/libqt-mt* ) {
-      message( "Configuring for multi-threaded Qt..." )
-      CONFIG += thread
-}
-//! [63]
-
-
-//! [64]
-MY_VAR = one two three four
-MY_VAR2 = $$join(MY_VAR, " -L", -L) -Lfive
-MY_VAR3 = $$member(MY_VAR, 2) $$find(MY_VAR, t.*)
-//! [64]
-
-
-//! [65]
-LIST = 1 2 3
-for(a, LIST):exists(file.$${a}):message(I see a file.$${a}!)
-//! [65]
-
-
-//! [66]
-include( shared.pri )
-OPTIONS = standard custom
-!include( options.pri ) {
-    message( "No custom build options specified" )
-OPTIONS -= custom
-}
-//! [66]
-
-
-//! [67]
-isEmpty( CONFIG ) {
-CONFIG += qt warn_on debug
-}
-//! [67]
-
-
-//! [68]
-message( "This is a message" )
-//! [68]
-
-
-//! [69]
-!build_pass:message( "This is a message" )
-//! [69]
-
-
-//! [70]
-This is a test.
-//! [70]
-
-
-//! [71]
-system(ls /bin):HAS_BIN=FALSE
-//! [71]
-
-
-//! [72]
-UNAME = $$system(uname -s)
-contains( UNAME, [lL]inux ):message( This looks like Linux ($$UNAME) to me )
-//! [72]
-
-
-//! [73]
-ARGS = 1 2 3 2 5 1
-ARGS = $$unique(ARGS) #1 2 3 5
-//! [73]
-
-
-//! [74]
-qmake -set VARIABLE VALUE
-//! [74]
-
-
-//! [75]
-qmake -query VARIABLE
-qmake -query #queries all current VARIABLE/VALUE pairs..
-//! [75]
-
-
-//! [76]
-qmake -query "1.06a/VARIABLE"
-//! [76]
-
-
-//! [77]
-qmake -query "QT_INSTALL_PREFIX"
-//! [77]
-
-
-//! [78]
-QMAKE_VERS = $$[QMAKE_VERSION]
-//! [78]
-
-
-//! [79]
-documentation.path = /usr/local/program/doc
-documentation.files = docs/*
-//! [79]
-
-
-//! [80]
-INSTALLS += documentation
-//! [80]
-
-
-//! [81]
-unix:documentation.extra = create_docs; mv master.doc toc.doc
-//! [81]
-
-
-//! [82]
-target.path = /usr/local/myprogram
-INSTALLS += target
-//! [82]
-
-
-//! [83]
-CONFIG += create_prl
-//! [83]
-
-
-//! [84]
-CONFIG += link_prl
-//! [84]
-
-
-//! [85]
-QMAKE_EXT_MOC = .mymoc
-//! [85]
-
-
-//! [86]
-mytarget.target = .buildfile
-mytarget.commands = touch $$mytarget.target
-mytarget.depends = mytarget2
-
-mytarget2.commands = @echo Building $$mytarget.target
-//! [86]
-
-
-//! [87]
-QMAKE_EXTRA_TARGETS += mytarget mytarget2
-//! [87]
-
-
-//! [88]
-new_moc.output  = moc_${QMAKE_FILE_BASE}.cpp
-new_moc.commands = moc ${QMAKE_FILE_NAME} -o ${QMAKE_FILE_OUT}
-new_moc.depend_command = g++ -E -M ${QMAKE_FILE_NAME} | sed "s,^.*: ,,"
-new_moc.input = NEW_HEADERS
-QMAKE_EXTRA_COMPILERS += new_moc
-//! [88]
-
-
-//! [89]
-TARGET = myapp
-//! [89]
-
-
-//! [90]
-DEFINES += QT_DLL
-//! [90]
-
-
-//! [91]
-DEFINES -= QT_DLL
-//! [91]
-
-
-//! [92]
-DEFINES *= QT_DLL
-//! [92]
-
-
-//! [93]
-DEFINES ~= s/QT_[DT].+/QT
-//! [93]
-
-
-//! [94]
-EVERYTHING = $$SOURCES $$HEADERS
-message("The project contains the following files:")
-message($$EVERYTHING)
-//! [94]
-
-
-//! [95]
-win32:DEFINES += QT_DLL
-//! [95]
-
-
-//! [96]
-win32:xml {
-    message(Building for Windows)
-    SOURCES += xmlhandler_win.cpp
-} else:xml {
-    SOURCES += xmlhandler.cpp
-} else {
-    message("Unknown configuration")
-}
-//! [96]
-
-
-//! [97]
-MY_VARIABLE = value
-//! [97]
-
-
-//! [98]
-MY_DEFINES = $$DEFINES
-//! [98]
-
-
-//! [99]
-MY_DEFINES = $${DEFINES}
-//! [99]
-
-
-//! [100]
-TARGET = myproject_$${TEMPLATE}
-//! [100]
-
-
-//! [101]
-target.path = $$[QT_INSTALL_PLUGINS]/designer
-INSTALLS += target
-//! [101]
-
-
-//! [102]
-defineReplace(functionName){
-    #function code
-}
-//! [102]
-
-
-//! [103]
-CONFIG += myfeatures
-//! [103]
-
-
-//! [104]
-// Add C includes here
-
-#if defined __cplusplus
-// Add C++ includes here
-#include <stdlib>
-#include <iostream>
-#include <vector>
-#include <QApplication> // Qt includes
-#include <QPushButton>
-#include <QLabel>
-#include "thirdparty/include/libmain.h"
-#include "my_stable_class.h"
-...
-#endif
-//! [104]
-
-
-//! [105]
-PRECOMPILED_HEADER = stable.h
-//! [105]
-
-
-//! [106]
-precompile_header:!isEmpty(PRECOMPILED_HEADER) {
-DEFINES += USING_PCH
-}
-//! [106]
-
-
-//! [107]
-PRECOMPILED_HEADER = window.h
-SOURCES            = window.cpp
-//! [107]
-
-
-//! [108]
-SOURCES += hello.cpp
-//! [108]
-
-
-//! [109]
-SOURCES += hello.cpp
-SOURCES += main.cpp
-//! [109]
-
-
-//! [110]
-SOURCES = hello.cpp \
-          main.cpp
-//! [110]
-
-
-//! [111]
-HEADERS += hello.h
-SOURCES += hello.cpp
-SOURCES += main.cpp
-//! [111]
-
-
-//! [112]
-TARGET = helloworld
-//! [112]
-
-
-//! [113]
-CONFIG += qt
-HEADERS += hello.h
-SOURCES += hello.cpp
-SOURCES += main.cpp
-//! [113]
-
-
-//! [114]
-qmake -o Makefile hello.pro
-//! [114]
-
-
-//! [115]
-qmake -tp vc -o hello.dsp hello.pro
-//! [115]
-
-
-//! [116]
-CONFIG += qt debug
-HEADERS += hello.h
-SOURCES += hello.cpp
-SOURCES += main.cpp
-//! [116]
-
-
-//! [117]
-win32 {
-    SOURCES += hellowin.cpp
-}
-//! [117]
-
-
-//! [118]
-CONFIG += qt debug
-HEADERS += hello.h
-SOURCES += hello.cpp
-SOURCES += main.cpp
-win32 {
-    SOURCES += hellowin.cpp
-}
-unix {
-    SOURCES += hellounix.cpp
-}
-//! [118]
-
-
-//! [119]
-!exists( main.cpp ) {
-    error( "No main.cpp file found" )
-}
-//! [119]
-
-
-//! [120]
-CONFIG += qt debug
-HEADERS += hello.h
-SOURCES += hello.cpp
-SOURCES += main.cpp
-win32 {
-    SOURCES += hellowin.cpp
-}
-unix {
-    SOURCES += hellounix.cpp
-}
-!exists( main.cpp ) {
-    error( "No main.cpp file found" )
-}
-//! [120]
-
-
-//! [121]
-win32 {
-    debug {
-        CONFIG += console
-    }
-}
-//! [121]
-
-
-//! [122]
-CONFIG += qt debug
-HEADERS += hello.h
-SOURCES += hello.cpp
-SOURCES += main.cpp
-win32 {
-    SOURCES += hellowin.cpp
-}
-unix {
-    SOURCES += hellounix.cpp
-}
-!exists( main.cpp ) {
-    error( "No main.cpp file found" )
-}
-win32:debug {
-    CONFIG += console
-}
-//! [122]
-
-
-//! [123]
-TEMPLATE = app
-DESTDIR  = c:/helloapp
-HEADERS += hello.h
-SOURCES += hello.cpp
-SOURCES += main.cpp
-DEFINES += QT_DLL
-CONFIG  += qt warn_on release
-//! [123]
-
-
-//! [124]
-make all
-//! [124]
-
-
-//! [125]
-make
-//! [125]
-
-
-//! [126]
-make install
-//! [126]
-
-
-//! [127]
-CONFIG(debug, debug|release) {
-    mac: TARGET = $$join(TARGET,,,_debug)
-    win32: TARGET = $$join(TARGET,,d)
-}
-//! [127]
-
-//! [128]
-DEPLOYMENT_PLUGIN += qjpeg
-//! [128]
diff --git a/doc/codesnippets/doc/src/snippets/code/doc_src_qnamespace.qdoc b/doc/codesnippets/doc/src/snippets/code/doc_src_qnamespace.qdoc
index 250d62d..6bd0bce 100644
--- a/doc/codesnippets/doc/src/snippets/code/doc_src_qnamespace.qdoc
+++ b/doc/codesnippets/doc/src/snippets/code/doc_src_qnamespace.qdoc
@@ -1,24 +1,18 @@
+
 //! [0]
 QObject::connect: Cannot queue arguments of type 'MyType'
 //! [0]
 
 
 //! [1]
-enum CustomEventPriority
-{
-    // An important event
-    ImportantEventPriority = Qt::HighEventPriority,
-
-    // A more important event
-    MoreImportantEventPriority = ImportantEventPriority + 1,
-
-    // A critical event
-    CriticalEventPriority = 100 * MoreImportantEventPriority,
-
-    // Not that important
-    StatusEventPriority = Qt::LowEventPriority,
-
-    // These are less important than Status events
-    IdleProcessingDoneEventPriority = StatusEventPriority - 1
-};
+# An important event
+ImportantEventPriority = Qt.HighEventPriority
+# A more important event
+MoreImportantEventPriority = ImportantEventPriority + 1
+# A critical event
+CriticalEventPriority = 100 * MoreImportantEventPriority
+# Not that important
+StatusEventPriority = Qt.LowEventPriority
+# These are less important than Status events
+IdleProcessingDoneEventPriority = StatusEventPriority - 1
 //! [1]
diff --git a/doc/codesnippets/doc/src/snippets/code/doc_src_qpair.qdoc b/doc/codesnippets/doc/src/snippets/code/doc_src_qpair.qdoc
deleted file mode 100644
index 74c7c83..0000000
--- a/doc/codesnippets/doc/src/snippets/code/doc_src_qpair.qdoc
+++ /dev/null
@@ -1,15 +0,0 @@
-//! [0]
-QPair<QString, double> pair;
-//! [0]
-
-
-//! [1]
-pair.first = "pi";
-pair.second = 3.14159265358979323846;
-//! [1]
-
-
-//! [2]
-QList<QPair<int, double> > list;
-list.append(qMakePair(66, 3.14159));
-//! [2]
diff --git a/doc/codesnippets/doc/src/snippets/code/doc_src_qplugin.qdoc b/doc/codesnippets/doc/src/snippets/code/doc_src_qplugin.qdoc
deleted file mode 100644
index d9b627e..0000000
--- a/doc/codesnippets/doc/src/snippets/code/doc_src_qplugin.qdoc
+++ /dev/null
@@ -1,24 +0,0 @@
-//! [0]
-namespace Foo
-{
-    struct MyInterface { ... };
-}
-
-Q_DECLARE_INTERFACE(Foo::MyInterface, "org.examples.MyInterface")
-//! [0]
-
-
-//! [1]
-Q_EXPORT_PLUGIN2(pnp_extrafilters, ExtraFiltersPlugin)
-//! [1]
-
-
-//! [2]
-Q_IMPORT_PLUGIN(qjpeg)
-//! [2]
-
-
-//! [3]
-TEMPLATE      = app
-QTPLUGIN     += qjpeg qgif qmng    # image formats
-//! [3]
diff --git a/doc/codesnippets/doc/src/snippets/code/doc_src_qset.qdoc b/doc/codesnippets/doc/src/snippets/code/doc_src_qset.qdoc
deleted file mode 100644
index 7469d2a..0000000
--- a/doc/codesnippets/doc/src/snippets/code/doc_src_qset.qdoc
+++ /dev/null
@@ -1,126 +0,0 @@
-//! [0]
-QSet<QString> set;
-//! [0]
-
-
-//! [1]
-set.insert("one");
-set.insert("three");
-set.insert("seven");
-//! [1]
-
-
-//! [2]
-set << "twelve" << "fifteen" << "nineteen";
-//! [2]
-
-
-//! [3]
-if (!set.contains("ninety-nine"))
-    ...
-//! [3]
-
-
-//! [4]
-QSetIterator<QWidget *> i(set);
-while (i.hasNext())
-    qDebug() << i.next();
-//! [4]
-
-
-//! [5]
-QSet<QWidget *>::const_iterator i = set.constBegin();
-while (i != set.constEnd()) {
-    qDebug() << *i;
-    ++i;
-}
-//! [5]
-
-
-//! [6]
-QSet<QString> set;
-...
-foreach (QString value, set)
-    qDebug() << value;
-//! [6]
-
-
-//! [7]
-QSet<QString> set;
-set.reserve(20000);
-for (int i = 0; i < 20000; ++i)
-    set.insert(values[i]);
-//! [7]
-
-
-//! [8]
-QSet<QString> set;
-set << "January" << "February" << ... << "December";
-
-QSet<QString>::iterator i;
-for (i = set.begin(); i != set.end(); ++i)
-    qDebug() << *i;
-//! [8]
-
-
-//! [9]
-QSet<QString> set;
-set << "January" << "February" << ... << "December";
-
-QSet<QString>::iterator i = set.begin();
-while (i != set.end()) {
-    if ((*i).startsWith('J')) {
-        i = set.erase(i);
-    } else {
-        ++i;
-    }
-}
-//! [9]
-
-
-//! [10]
-QSet<QString> set;
-...
-QSet<QString>::iterator it = qFind(set.begin(), set.end(), "Jeanette");
-if (it != set.end())
-    cout << "Found Jeanette" << endl;
-//! [10]
-
-
-//! [11]
-QSet<QString> set;
-set << "January" << "February" << ... << "December";
-
-QSet<QString>::const_iterator i;
-for (i = set.begin(); i != set.end(); ++i)
-    qDebug() << *i;
-//! [11]
-
-
-//! [12]
-QSet<QString> set;
-...
-QSet<QString>::iterator it = qFind(set.begin(), set.end(), "Jeanette");
-if (it != set.constEnd())
-    cout << "Found Jeanette" << endl;
-//! [12]
-
-
-//! [13]
-QSet<QString> set;
-set << "red" << "green" << "blue" << ... << "black";
-
-QList<QString> list = set.toList();
-qSort(list);
-//! [13]
-
-
-//! [14]
-QStringList list;
-list << "Julia" << "Mike" << "Mike" << "Julia" << "Julia";
-
-QSet<QString> set = QSet<QString>::fromList(list);
-set.contains("Julia");  // returns true
-set.contains("Mike");   // returns true
-set.size();             // returns 2
-//! [14]
diff --git a/doc/codesnippets/doc/src/snippets/code/doc_src_qsignalspy.qdoc b/doc/codesnippets/doc/src/snippets/code/doc_src_qsignalspy.qdoc
deleted file mode 100644
index d6b65dc..0000000
--- a/doc/codesnippets/doc/src/snippets/code/doc_src_qsignalspy.qdoc
+++ /dev/null
@@ -1,41 +0,0 @@
-//! [0]
-QCheckBox *box = ...;
-QSignalSpy spy(box, SIGNAL(clicked(bool)));
-
-// do something that triggers the signal
-box->animateClick();
-
-QCOMPARE(spy.count(), 1); // make sure the signal was emitted exactly one time
-QList<QVariant> arguments = spy.takeFirst(); // take the first signal
-
-QVERIFY(arguments.at(0).toBool() == true); // verify the first argument
-//! [0]
-
-
-//! [1]
-QSignalSpy spy(myCustomObject, SIGNAL(mySignal(int, QString, double)));
-
-myCustomObject->doSomething(); // trigger emission of the signal
-
-QList<QVariant> arguments = spy.takeFirst();
-QVERIFY(arguments.at(0).type() == QVariant::Int);
-QVERIFY(arguments.at(1).type() == QVariant::QString);
-QVERIFY(arguments.at(2).type() == QVariant::double);
-//! [1]
-
-
-//! [2]
-qRegisterMetaType<QModelIndex>("QModelIndex");
-QSignalSpy spy(&model, SIGNAL(whatever(QModelIndex)));
-//! [2]
-
-
-//! [3]
-// get the first argument from the first received signal:
-QModelIndex result = qvariant_cast<QModelIndex>(spy.at(0).at(0));
-//! [3]
-
-
-//! [4]
-QSignalSpy spy(myPushButton, SIGNAL(clicked(bool)));
-//! [4]
diff --git a/doc/codesnippets/doc/src/snippets/code/doc_src_qt-conf.qdoc b/doc/codesnippets/doc/src/snippets/code/doc_src_qt-conf.qdoc
deleted file mode 100644
index d675795..0000000
--- a/doc/codesnippets/doc/src/snippets/code/doc_src_qt-conf.qdoc
+++ /dev/null
@@ -1,14 +0,0 @@
-//! [0]
-[Paths]
-Prefix = /some/path
-Translations = i18n
-//! [0]
-
-
-//! [1]
-Paths
-Paths/4
-Paths/4.1
-Paths/4.2.5
-Paths/6
-//! [1]
diff --git a/doc/codesnippets/doc/src/snippets/code/doc_src_qt-embedded-displaymanagement.qdoc b/doc/codesnippets/doc/src/snippets/code/doc_src_qt-embedded-displaymanagement.qdoc
deleted file mode 100644
index a3ab4dd..0000000
--- a/doc/codesnippets/doc/src/snippets/code/doc_src_qt-embedded-displaymanagement.qdoc
+++ /dev/null
@@ -1,51 +0,0 @@
-//! [0]
-$QPEDIR/qtopiacore/qt/configure -help
-//! [0]
-
-
-//! [1]
-./configure -help
-//! [1]
-
-
-//! [2]
-./configure -extra-qt-embedded-config "-qt-gfx-transformed"
-//! [2]
-
-
-//! [3]
-./configure -qt-gfx-transformed
-//! [3]
-
-
-//! [4]
-export QWS_DISPLAY="<driver>[:<driver specific options>]...
-         [:<display num>]"
-//! [4]
-
-
-//! [5]
-myApplication -display "<driver>[:<driver specific options>]...
-         [:<display num>]"
-//! [5]
-
-
-//! [6]
-export QWS_DISPLAY="<driver>[:<subdriver>][:<subdriver options>]...
-        [ :<display num>]"
-//! [6]
-
-
-//! [7]
-export QWS_DISPLAY="Multi: QVFb:0 QVFb:offset=640,0:1 :2"
-//! [7]
-
-
-//! [8]
-export QWS_DISPLAY="VNC:size=720x480:depth=32"
-//! [8]
-
-
-//! [9]
-export QWS_DISPLAY="VNC:LinuxFb"
-//! [9]
diff --git a/doc/codesnippets/doc/src/snippets/code/doc_src_qt3support.qdoc b/doc/codesnippets/doc/src/snippets/code/doc_src_qt3support.qdoc
deleted file mode 100644
index e6f0272..0000000
--- a/doc/codesnippets/doc/src/snippets/code/doc_src_qt3support.qdoc
+++ /dev/null
@@ -1,8 +0,0 @@
-//! [0]
-#include <Qt3Support>
-//! [0]
-
-
-//! [1]
-QT += qt3support
-//! [1]
diff --git a/doc/codesnippets/doc/src/snippets/code/doc_src_qt3to4.qdoc b/doc/codesnippets/doc/src/snippets/code/doc_src_qt3to4.qdoc
deleted file mode 100644
index da0832d..0000000
--- a/doc/codesnippets/doc/src/snippets/code/doc_src_qt3to4.qdoc
+++ /dev/null
@@ -1,26 +0,0 @@
-//! [0]
-qt3to4 myfile.cpp
-qt3to4 myapp.pro
-//! [0]
-
-
-//! [1]
-<Rules>
-  <Include>/path/to/q3porting.xml</Include>
-
-  <item Type="RenamedHeader" Disable="True" >
-    <Qt4>q3sqlselectcursor.h</Qt4>
-    <Qt3>qsqlselectcursor.h</Qt3>
-  </item>
-
-  <item Type="RenamedHeader" >
-    <Qt4>newclass.h</Qt4>
-    <Qt3>oldclass.h</Qt3>
-  </item>
-</Rules>
-//! [1]
-
-
-//! [2]
-using namespace Qt;
-//! [2]
diff --git a/doc/codesnippets/doc/src/snippets/code/doc_src_qt4-accessibility.qdoc b/doc/codesnippets/doc/src/snippets/code/doc_src_qt4-accessibility.qdoc
deleted file mode 100644
index 8bed0a9..0000000
--- a/doc/codesnippets/doc/src/snippets/code/doc_src_qt4-accessibility.qdoc
+++ /dev/null
@@ -1,59 +0,0 @@
-//! [environment]
-export QT_ACCESSIBILITY=1
-//! [environment]
-
-//! [0]
-class MyWidgetInterface : public QAccessibleWidget
-{
-public:
-    MyWidgetInterface(QWidget *widget, Role role);
-
-    QString text(Text text, int child) const;
-    State state(int child) const;
-    QString actionText(int action, Text text, int child) const;
-    bool doAction(int action, int child, const QVariantList &params);
-    ...
-};
-//! [0]
-
-
-//! [1]
-bool MyWidgetInterface::doAction(int action, int child,
-                                 const QVariantList &params)
-{
-    if (child || !widget()->isEnabled())
-        return false;
-
-    switch (action) {
-    case DefaultAction:
-    case Press:
-        {
-            MyWidget *widget = qobject_cast<MyWidget *>(object());
-            if (widget)
-                widget->click();
-        }
-        return true;
-    }
-    return QAccessibleWidget::doAction(action, child, params);
-}
-//! [1]
-
-
-//! [2]
-QStringList MyFactory::keys() const
-{
-    return QStringList() << "MyWidget" << "MyOtherWidget";
-}
-
-QAccessibleInterface *MyFactory::create(const QString &className,
-                                        QObject *object)
-{
-    if (classname == "MyWidget")
-        return new MyWidgetInterface(object);
-    if (classname == "MyOtherWidget")
-        return new MyOtherWidgetInterface(object);
-    return 0;
-}
-
-Q_EXPORT_PLUGIN2(myfactory, MyFactory)
-//! [2]
diff --git a/doc/codesnippets/doc/src/snippets/code/doc_src_qt4-arthur.qdoc b/doc/codesnippets/doc/src/snippets/code/doc_src_qt4-arthur.qdoc
deleted file mode 100644
index 6ac30ae..0000000
--- a/doc/codesnippets/doc/src/snippets/code/doc_src_qt4-arthur.qdoc
+++ /dev/null
@@ -1,104 +0,0 @@
-//! [0]
-QLinearGradient gradient(0, 0, 100, 100);
-gradient.setColorAt(0, Qt::red);
-gradient.setColorAt(0.5, Qt::green);
-gradient.setColorAt(1, Qt::blue);
-painter.setBrush(gradient);
-painter.drawRect(0, 0, 100, 100);
-//! [0]
-
-
-//! [1]
-QRadialGradient gradient(50, 50, 50, 30, 30);
-gradient.setColorAt(0.2, Qt::white);
-gradient.setColorAt(0.8, Qt::green);
-gradient.setColorAt(1, Qt::black);
-painter.setBrush(gradient);
-painter.drawEllipse(0, 0, 100, 100);
-//! [1]
-
-
-//! [2]
-QConicalGradient gradient(60, 40, 0);
-gradient.setColorAt(0, Qt::black);
-gradient.setColorAt(0.4, Qt::green);
-gradient.setColorAt(0.6, Qt::white);
-gradient.setColorAt(1, Qt::black);
-painter.setBrush(gradient);
-painter.drawEllipse(0, 0, 100, 100);
-//! [2]
-
-
-//! [3]
-// Specfiy semi-transparent red
-painter.setBrush(QColor(255, 0, 0, 127));
-painter.drawRect(0, 0, width()/2, height());
-
-// Specify semi-transparend blue
-painter.setBrush(QColor(0, 0, 255, 127));
-painter.drawRect(0, 0, width(), height()/2);
-//! [3]
-
-
-//! [4]
-// One line without anti-aliasing
-painter.drawLine(0, 0, width()/2, height());
-
-// One line with anti-aliasing
-painter.setRenderHint(QPainter::Antialiasing);
-painter.drawLine(width()/2, 0, width()/2, height());
-//! [4]
-
-
-//! [5]
-QPainterPath path;
-path.addRect(20, 20, 60, 60);
-path.addBezier(0, 0,  99, 0,  50, 50,  99, 99);
-path.addBezier(99, 99,  0, 99,  50, 50,  0, 0);
-painter.drawPath(path);
-//! [5]
-
-
-//! [6]
-QPixmap buffer(size());
-QPainter painter(&buffer);
-
-// Paint code here
-
-painter.end();
-bitBlt(this, 0, 0, &buffer);
-//! [6]
-
-
-//! [7]
-QPainter painter(this);
-
-// Paint code here
-
-painter.end();
-//! [7]
-
-
-//! [8]
-unbufferedWidget->setAttribute(Qt::WA_PaintOnScreen);
-//! [8]
-
-
-//! [9]
-QLinearGradient gradient(0, 0, 100, 100);
-gradient.setColorAt(0, Qt::blue);
-gradient.setColorAt(1, Qt::red);
-painter.setPen(QPen(gradient, 0));
-for (int y=fontSize; y<100; y+=fontSize)
-    drawText(0, y, text);
-//! [9]
-
-
-//! [10]
-QImage image(100, 100, 32);
-QPainter painter(&image);
-
-// painter commands.
-
-painter.end();
-//! [10]
diff --git a/doc/codesnippets/doc/src/snippets/code/doc_src_qt4-intro.qdoc b/doc/codesnippets/doc/src/snippets/code/doc_src_qt4-intro.qdoc
deleted file mode 100644
index ced563e..0000000
--- a/doc/codesnippets/doc/src/snippets/code/doc_src_qt4-intro.qdoc
+++ /dev/null
@@ -1,101 +0,0 @@
-//! [0]
-QT -= gui
-//! [0]
-
-
-//! [1]
-QT += network opengl sql qt3support
-//! [1]
-
-
-//! [2]
-CONFIG += uic3
-//! [2]
-
-
-//! [3]
-#include <QClassName>
-//! [3]
-
-
-//! [4]
-#include <QString>
-#include <QApplication>
-#include <QSqlTableModel>
-//! [4]
-
-
-//! [5]
-#include <qclassname.h>
-//! [5]
-
-
-//! [6]
-#include <QtCore>
-//! [6]
-
-
-//! [7]
-using namespace Qt;
-//! [7]
-
-
-//! [8]
-QLabel *label1 = new QLabel("Hello", this);
-QLabel *label2 = new QLabel(this, "Hello");
-//! [8]
-
-
-//! [9]
-MyWidget::MyWidget(QWidget *parent, const char *name)
-    : QWidget(parent, name)
-{
-    ...
-}
-//! [9]
-
-
-//! [10]
-// DEPRECATED
-if (obj->inherits("QPushButton")) {
-    QPushButton *pushButton = (QPushButton *)obj;
-    ...
-}
-//! [10]
-
-
-//! [11]
-QPushButton *pushButton = qobject_cast<QPushButton *>(obj);
-if (pushButton) {
-    ...
-}
-//! [11]
-
-
-//! [12]
-QLabel *label = new QLabel;
-QPointer<QLabel> safeLabel = label;
-safeLabel->setText("Hello world!");
-delete label;
-// safeLabel is now 0, whereas label is a dangling pointer
-//! [12]
-
-
-//! [13]
-QT += qt3support
-//! [13]
-
-
-//! [14]
-DEFINES += QT3_SUPPORT
-//! [14]
-
-
-//! [15]
-DEFINES += QT3_SUPPORT_WARNINGS
-//! [15]
-
-
-//! [16]
-DEFINES += QT3_SUPPORT
-//! [16]
diff --git a/doc/codesnippets/doc/src/snippets/code/doc_src_qt4-mainwindow.qdoc b/doc/codesnippets/doc/src/snippets/code/doc_src_qt4-mainwindow.qdoc
deleted file mode 100644
index 9e81fd1..0000000
--- a/doc/codesnippets/doc/src/snippets/code/doc_src_qt4-mainwindow.qdoc
+++ /dev/null
@@ -1,70 +0,0 @@
-//! [0]
-MainWindow::MainWindow(QWidget *parent)
-    : QMainWindow(parent)
-{
-//! [0]
-
-
-//! [1]
-fileToolbar->setAllowedAreas(Qt::TopToolBarArea | Qt::BottomToolBarArea);
-addToolBar(Qt::TopToolBarArea, fileToolbar);
-//! [1]
-
-
-//! [2]
-setCorner(Qt::TopLeftCorner, Qt::LeftDockWidgetArea);
-setCorner(Qt::BottomLeftCorner, Qt::LeftDockWidgetArea);
-setCorner(Qt::TopRightCorner, Qt::RightDockWidgetArea);
-setCorner(Qt::BottomRightCorner, Qt::RightDockWidgetArea);
-//! [2]
-
-
-//! [3]
-QWidget *centralWidget = new QWidget(this);
-setCentralWidget(centralWidget);
-//! [3]
-
-
-//! [4]
-QPopupMenu *fileMenu = new QPopupMenu(this);
-openAction->addTo(fileMenu);
-saveAction->addTo(fileMenu);
-...
-menuBar()->insertItem(tr("&File"), fileMenu);
-//! [4]
-
-
-//! [5]
-QMenu *fileMenu = menuBar()->addMenu(tr("&File"));
-fileMenu->addAction(openAction);
-fileMenu->addAction(saveAction);
-...
-//! [5]
-
-
-//! [6]
-QToolBar *fileTools = new QToolBar(this, "file toolbar");
-openAction->addTo(fileTools);
-saveAction->addTo(fileTools);
-...
-//! [6]
-
-
-//! [7]
-QToolBar *fileTools = addToolBar(tr("File Tool Bar"));
-fileTools->addAction(openAction);
-fileTools->addAction(saveAction);
-...
-//! [7]
-
-
-//! [8]
-QDockWidget *dockWidget = new QDockWidget(this);
-mainWin->moveDockWidget(dockWidget, Qt::DockLeft);
-//! [8]
-
-
-//! [9]
-QDockWidget *dockWidget = new QDockWidget(mainWindow);
-mainWindow->addDockWidget(Qt::LeftDockWidgetArea, dockWidget);
-//! [9]
diff --git a/doc/codesnippets/doc/src/snippets/code/doc_src_qt4-sql.qdoc b/doc/codesnippets/doc/src/snippets/code/doc_src_qt4-sql.qdoc
deleted file mode 100644
index 74b04eb..0000000
--- a/doc/codesnippets/doc/src/snippets/code/doc_src_qt4-sql.qdoc
+++ /dev/null
@@ -1,19 +0,0 @@
-//! [0]
-QSqlQueryModel model;
-model.setQuery("select * from person");
-
-QTableView view;
-view.setModel(&model);
-view.show();
-//! [0]
-
-
-//! [1]
-QSqlTableModel model;
-model.setTable("person");
-model.select();
-
-QTableView view;
-view.setModel(&model);
-view.show();
-//! [1]
diff --git a/doc/codesnippets/doc/src/snippets/code/doc_src_qt4-styles.qdoc b/doc/codesnippets/doc/src/snippets/code/doc_src_qt4-styles.qdoc
deleted file mode 100644
index b75c135..0000000
--- a/doc/codesnippets/doc/src/snippets/code/doc_src_qt4-styles.qdoc
+++ /dev/null
@@ -1,42 +0,0 @@
-//! [0]
-const QStyleOptionFocusRect *focusRectOption =
-        qstyleoption_cast<const QStyleOptionFocusRect *>(option);
-if (focusRectOption) {
-    ...
-}
-//! [0]
-
-
-//! [1]
-void MyWidget::paintEvent(QPaintEvent *event)
-{
-    QPainter painter(this);
-    ...
-
-    QStyleOptionFocusRect option(1);
-    option.init(this);
-    option.backgroundColor = palette().color(QPalette::Window);
-
-    style().drawPrimitive(QStyle::PE_FrameFocusRect, &option, &painter,
-                          this);
-}
-//! [1]
-
-
-//! [2]
-void drawControl(ControlElement element,
-                 QPainter *painter,
-                 const QWidget *widget,
-                 const QRect &rect,
-                 const QColorGroup &colorGroup,
-                 SFlags how = Style_Default,
-                 const QStyleOption &option = QStyleOption::Default) const;
-//! [2]
-
-
-//! [3]
-void drawControl(ControlElement element,
-                 const QStyleOption *option,
-                 QPainter *painter,
-                 const QWidget *widget = 0) const;
-//! [3]
diff --git a/doc/codesnippets/doc/src/snippets/code/doc_src_qt4-tulip.qdoc b/doc/codesnippets/doc/src/snippets/code/doc_src_qt4-tulip.qdoc
deleted file mode 100644
index 2bc5af1..0000000
--- a/doc/codesnippets/doc/src/snippets/code/doc_src_qt4-tulip.qdoc
+++ /dev/null
@@ -1,100 +0,0 @@
-//! [0]
-foreach (variable, container)
-    statement;
-//! [0]
-
-
-//! [1]
-QList<QString> list;
-...
-foreach (QString str, list)
-    cout << str.ascii() << endl;
-//! [1]
-
-
-//! [2]
-QString str;
-foreach (str, list)
-    cout << str.ascii() << endl;
-//! [2]
-
-
-//! [3]
-// forward                                  // backward
-QList<QString> list;                        QList<QString> list;
-...                                         ...
-QListIterator<QString> i(list);             QListIterator<QString> i(list);        
-while (i.hasNext())                         i.toBack();                            
-    cout << i.next().ascii() << endl;       while (i.hasPrev())                    
-                                                cout << i.prev().ascii() << endl;
-//! [3]
-
-
-//! [4]
-// forward                                  // backward
-QMutableListIterator<int> i(list);          QMutableListIterator<int> i(list);  
-while (i.hasNext())                         i.toBack();                         
-    if (i.next() > 128)                     while (i.hasPrev())                 
-        i.setValue(128);                        if (i.prev() > 128)             
-                                                    i.setValue(128);           
-//! [4]
-
-
-//! [5]
-// forward                                  // backward
-QMutableListIterator<int> i(list);          QMutableListIterator<int> i(list);                 
-while (i.hasNext())                         i.toBack();                         
-    if (i.next() % 2 != 0)                  while (i.hasPrev())                        
-        i.remove();                             if (i.prev() % 2 != 0)          
-                                                    i.remove();                 
-//! [5]
-
-
-//! [6]
-// STL-style                                // Java-style
-QMap<int, QWidget *>::const_iterator i;     QMapIterator<int, QWidget *> i(map);
-for (i = map.begin(); i != map.end(); ++i)  while (i.findNext(widget))
-    if (i.value() == widget)                    cout << "Found widget " << widget
-        cout << "Found widget " << widget            << " under key "
-             << " under key "                        << i.key() << endl;
-             << i.key() << endl;
-//! [6]
-
-
-//! [7]
-// STL-style                                // Java-style
-QList<int>::iterator i = list.begin();      QMutableListIterator<int> i(list);
-while (i != list.end()) {                   while (i.hasNext()) {
-    if (*i == 0) {                              int val = i.next();
-        i = list.erase(i);                      if (val < 0)
-    } else {                                        i.setValue(-val);
-        if (*i < 0)                             else if (val == 0)
-            *i = -*i;                               i.remove();
-        ++i;                                }
-    }
-}
-//! [7]
-
-
-//! [8]
-QList<double> list;
-...
-for (int i = 0; i < list.size(); ++i) {
-    if (list[i] < 0.0)
-        list[i] = 0.0;
-}
-//! [8]
-
-
-//! [9]
-QMap<QString, int> map;
-...
-map.value("TIMEOUT", 30);  // returns 30 if "TIMEOUT" isn't in the map
-//! [9]
-
-
-//! [10]
-QMultiMap<QString, int> map;
-...
-QList<int> values = map.values("TIMEOUT");
-//! [10]
diff --git a/doc/codesnippets/doc/src/snippets/code/doc_src_qtcore.qdoc b/doc/codesnippets/doc/src/snippets/code/doc_src_qtcore.qdoc
deleted file mode 100644
index efa155f..0000000
--- a/doc/codesnippets/doc/src/snippets/code/doc_src_qtcore.qdoc
+++ /dev/null
@@ -1,3 +0,0 @@
-//! [0]
-#include <QtCore>
-//! [0]
diff --git a/doc/codesnippets/doc/src/snippets/code/doc_src_qtdbus.qdoc b/doc/codesnippets/doc/src/snippets/code/doc_src_qtdbus.qdoc
deleted file mode 100644
index 4c8c4b0..0000000
--- a/doc/codesnippets/doc/src/snippets/code/doc_src_qtdbus.qdoc
+++ /dev/null
@@ -1,8 +0,0 @@
-//! [0]
-#include <QtDBus>
-//! [0]
-
-
-//! [1]
-QT += dbus
-//! [1]
diff --git a/doc/codesnippets/doc/src/snippets/code/doc_src_qtdesigner.qdoc b/doc/codesnippets/doc/src/snippets/code/doc_src_qtdesigner.qdoc
deleted file mode 100644
index b19a747..0000000
--- a/doc/codesnippets/doc/src/snippets/code/doc_src_qtdesigner.qdoc
+++ /dev/null
@@ -1,293 +0,0 @@
-//! [0]
-#include <QtDesigner>
-//! [0]
-
-
-//! [1]
-CONFIG += designer
-//! [1]
-
-
-//! [2]
-QDesignerMemberSheetExtension *memberSheet  = 0;
-QExtensionManager manager = formEditor->extensionManager();
-
-memberSheet = qt_extension<QDesignerMemberSheetExtension*>(manager, widget);
-int index = memberSheet->indexOf(setEchoMode);
-memberSheet->setVisible(index, false);
-
-delete memberSheet;
-//! [2]
-
-
-//! [3]
-class MyMemberSheetExtension : public QObject,
-        public QDesignerMemberSheetExtension
-{
-    Q_OBJECT
-    Q_INTERFACES(QDesignerMemberSheetExtension)
-
-public:
-    ...
-}
-//! [3]
-
-
-//! [4]
-QObject *ANewExtensionFactory::createExtension(QObject *object,
-        const QString &iid, QObject *parent) const
-{
-    if (iid != Q_TYPEID(QDesignerMemberSheetExtension))
-        return 0;
-
-    if (MyCustomWidget *widget = qobject_cast<MyCustomWidget*>
-           (object))
-        return new MyMemberSheetExtension(widget, parent);
-
-    return 0;
-}
-//! [4]
-
-
-//! [5]
-QObject *AGeneralExtensionFactory::createExtension(QObject *object,
-        const QString &iid, QObject *parent) const
-{
-    MyCustomWidget *widget = qobject_cast<MyCustomWidget*>(object);
-
-    if (widget && (iid == Q_TYPEID(QDesignerTaskMenuExtension))) {
-        return new MyTaskMenuExtension(widget, parent);
-
-    } else if (widget && (iid == Q_TYPEID(QDesignerMemberSheetExtension))) {
-        return new MyMemberSheetExtension(widget, parent);
-
-    } else {
-        return 0;
-    }
-}
-//! [5]
-
-
-//! [6]
-class MyContainerExtension : public QObject,
-       public QDesignerContainerExtension
-{
-    Q_OBJECT
-    Q_INTERFACES(QDesignerContainerExtension)
-
-public:
-    MyContainerExtension(MyCustomWidget *widget,
-                         QObject *parent = 0);
-    int count() const;
-    QWidget *widget(int index) const;
-    int currentIndex() const;
-    void setCurrentIndex(int index);
-    void addWidget(QWidget *widget);
-    void insertWidget(int index, QWidget *widget);
-    void remove(int index);
-
-private:
-    MyCustomWidget *myWidget;
-};
-//! [6]
-
-
-//! [7]
-QObject *ANewExtensionFactory::createExtension(QObject *object,
-        const QString &iid, QObject *parent) const
-{
-    if (iid != Q_TYPEID(QDesignerContainerExtension))
-        return 0;
-
-    if (MyCustomWidget *widget = qobject_cast<MyCustomWidget*>
-           (object))
-        return new MyContainerExtension(widget, parent);
-
-    return 0;
-}
-//! [7]
-
-
-//! [8]
-QObject *AGeneralExtensionFactory::createExtension(QObject *object,
-        const QString &iid, QObject *parent) const
-{
-    MyCustomWidget *widget = qobject_cast<MyCustomWidget*>(object);
-
-    if (widget && (iid == Q_TYPEID(QDesignerTaskMenuExtension))) {
-        return new MyTaskMenuExtension(widget, parent);
-
-    } else if (widget && (iid == Q_TYPEID(QDesignerContainerExtension))) {
-        return new MyContainerExtension(widget, parent);
-
-    } else {
-        return 0;
-    }
-}
-//! [8]
-
-
-//! [9]
-class MyTaskMenuExtension : public QObject,
-        public QDesignerTaskMenuExtension
-{
-    Q_OBJECT
-    Q_INTERFACES(QDesignerTaskMenuExtension)
-
-public:
-    MyTaskMenuExtension(MyCustomWidget *widget, QObject *parent);
-
-    QAction *preferredEditAction() const;
-    QList<QAction *> taskActions() const;
-
-private slots:
-    void mySlot();
-
-private:
-    MyCustomWidget *widget;
-    QAction *myAction;
-};
-//! [9]
-
-
-//! [10]
-QObject *ANewExtensionFactory::createExtension(QObject *object,
-        const QString &iid, QObject *parent) const
-{
-    if (iid != Q_TYPEID(QDesignerTaskMenuExtension))
-        return 0;
-
-    if (MyCustomWidget *widget = qobject_cast<MyCustomWidget*>(object))
-        return new MyTaskMenuExtension(widget, parent);
-
-    return 0;
-}
-//! [10]
-
-
-//! [11]
-QObject *AGeneralExtensionFactory::createExtension(QObject *object,
-        const QString &iid, QObject *parent) const
-{
-    MyCustomWidget *widget = qobject_cast<MyCustomWidget*>(object);
-
-    if (widget && (iid == Q_TYPEID(QDesignerContainerExtension))) {
-        return new MyContainerExtension(widget, parent);
-
-    } else if (widget && (iid == Q_TYPEID(QDesignerTaskMenuExtension))) {
-        return new MyTaskMenuExtension(widget, parent);
-
-    } else {
-        return 0;
-    }
-}
-//! [11]
-
-
-//! [12]
-#include customwidgetoneinterface.h
-#include customwidgettwointerface.h
-#include customwidgetthreeinterface.h
-
-#include <QtDesigner/QtDesigner>
-#include <QtCore/qplugin.h>
-
-class MyCustomWidgets: public QObject, public QDesignerCustomWidgetCollectionInterface
-{
-    Q_OBJECT
-    Q_INTERFACES(QDesignerCustomWidgetCollectionInterface)
-
-public:
-    MyCustomWidgets(QObject *parent = 0);
-
-    virtual QList<QDesignerCustomWidgetInterface*> customWidgets() const;
-
-private:
-    QList<QDesignerCustomWidgetInterface*> widgets;
-};
-//! [12]
-
-
-//! [13]
-MyCustomWidgets::MyCustomWidgets(QObject *parent)
-        : QObject(parent)
-{
-    widgets.append(new CustomWidgetOneInterface(this));
-    widgets.append(new CustomWidgetTwoInterface(this));
-    widgets.append(new CustomWidgetThreeInterface(this));
-}
-
-QList<QDesignerCustomWidgetInterface*> MyCustomWidgets::customWidgets() const
-{
-    return widgets;
-}
-
-Q_EXPORT_PLUGIN2(customwidgetsplugin, MyCustomWidgets)
-//! [13]
-
-
-//! [14]
-Q_EXPORT_PLUGIN2(customwidgetplugin, MyCustomWidget)
-//! [14]
-
-
-//! [15]
-QDesignerPropertySheetExtension *propertySheet  = 0;
-QExtensionManager manager = formEditor->extensionManager();
-
-propertySheet = qt_extension<QDesignerPropertySheetExtension*>(manager, widget);
-int index = propertySheet->indexOf(QLatin1String("margin"));
-
-propertySheet->setProperty(index, 10);
-propertySheet->setChanged(index, true);
-
-delete propertySheet;
-//! [15]
-
-
-//! [16]
-class MyPropertySheetExtension : public QObject,
-        public QDesignerPropertySheetExtension
-{
-    Q_OBJECT
-    Q_INTERFACES(QDesignerPropertySheetExtension)
-
-public:
-    ...
-}
-//! [16]
-
-
-//! [17]
-QObject *ANewExtensionFactory::createExtension(QObject *object,
-        const QString &iid, QObject *parent) const
-{
-    if (iid != Q_TYPEID(QDesignerPropertySheetExtension))
-        return 0;
-
-    if (MyCustomWidget *widget = qobject_cast<MyCustomWidget*>
-           (object))
-        return new MyPropertySheetExtension(widget, parent);
-
-    return 0;
-}
-//! [17]
-
-
-//! [18]
-QObject *AGeneralExtensionFactory::createExtension(QObject *object,
-        const QString &iid, QObject *parent) const
-{
-    MyCustomWidget *widget = qobject_cast<MyCustomWidget*>(object);
-
-    if (widget && (iid == Q_TYPEID(QDesignerTaskMenuExtension))) {
-        return new MyTaskMenuExtension(widget, parent);
-
-    } else if (widget && (iid == Q_TYPEID(QDesignerPropertySheetExtension))) {
-        return new MyPropertySheetExtension(widget, parent);
-
-    } else {
-        return 0;
-    }
-}
-//! [18]
diff --git a/doc/codesnippets/doc/src/snippets/code/doc_src_qtestevent.qdoc b/doc/codesnippets/doc/src/snippets/code/doc_src_qtestevent.qdoc
deleted file mode 100644
index 87591e0..0000000
--- a/doc/codesnippets/doc/src/snippets/code/doc_src_qtestevent.qdoc
+++ /dev/null
@@ -1,11 +0,0 @@
-//! [0]
-QTestEventList events;
-events.addKeyClick('a');
-events.addKeyClick(Qt::Key_Backspace);
-events.addDelay(200);
-
-QLineEdit *lineEdit = new QLineEdit(myParent);
-...
-events.simulate(lineEdit);
-events.simulate(lineEdit);
-//! [0]
diff --git a/doc/codesnippets/doc/src/snippets/code/doc_src_qtestlib.qdoc b/doc/codesnippets/doc/src/snippets/code/doc_src_qtestlib.qdoc
deleted file mode 100644
index 5a7d0ad..0000000
--- a/doc/codesnippets/doc/src/snippets/code/doc_src_qtestlib.qdoc
+++ /dev/null
@@ -1,102 +0,0 @@
-//! [0]
-class MyFirstTest: public QObject
-{
-    Q_OBJECT
-private slots:
-    void initTestCase()
-    { qDebug("called before everything else"); }
-    void myFirstTest()
-    { QVERIFY(1 == 1); }
-    void mySecondTest()
-    { QVERIFY(1 != 2); }
-    void cleanupTestCase()
-    { qDebug("called after myFirstTest and mySecondTest"); }
-};
-//! [0]
-
-
-//! [1]
-QT += testlib
-//! [1]
-
-
-//! [2]
-testname [options] [testfunctions[:testdata]]...
-//! [2]
-
-
-//! [3]
-/myTestDirectory$ testQString toUpper
-//! [3]
-
-
-//! [4]
-/myTestDirectory$ testQString toUpper toInt:zero
-//! [4]
-
-
-//! [5]
-/myTestDirectory$ testMyWidget -vs -eventdelay 500
-//! [5]
-
-
-//! [6]
-cetest [options] ...
-//! [6]
-
-
-//! [7]
-set INCLUDE=C:\Program Files\Windows CE Tools\wce500\Windows Mobile 5.0 Pocket PC SDK\Activesync\Inc;%INCLUDE%
-set LIB=C:\Program Files\Windows CE Tools\wce500\Windows Mobile 5.0 Pocket PC SDK\Activesync\Lib;%LIB%    
-//! [7]
-
-
-//! [8]
-void TestQString::toUpper()
-{
-    QString str = "Hello";
-    QVERIFY(str.toUpper() == "HELLO");
-}
-//! [8]
-
-
-//! [9]
-/myTestDirectory$ qmake -project "CONFIG += qtestlib"
-/myTestDirectory$ qmake
-/myTestDirectory$ make
-//! [9]
-
-
-//! [10]
-********* Start testing of TestQString *********
-Config: Using QTest library 4.5.2, Qt 4.5.2
-PASS   : TestQString::initTestCase()
-PASS   : TestQString::toUpper()
-PASS   : TestQString::cleanupTestCase()
-Totals: 3 passed, 0 failed, 0 skipped
-********* Finished testing of TestQString *********
-//! [10]
-
-
-//! [11]
-QCOMPARE(QString("hello").toUpper(), QString("HELLO"));
-QCOMPARE(QString("Hello").toUpper(), QString("HELLO"));
-QCOMPARE(QString("HellO").toUpper(), QString("HELLO"));
-QCOMPARE(QString("HELLO").toUpper(), QString("HELLO"));
-//! [11]
-
-//! [12]
-class MyFirstBenchmark: public QObject
-{
-    Q_OBJECT
-private slots:
-    void myFirstBenchmark()
-    { 
-        QString string1;
-        QString string2;
-        QBENCHMARK {
-            string1.localeAwareCompare(string2);
-        }
-    }
-};
-//! [12]
diff --git a/doc/codesnippets/doc/src/snippets/code/doc_src_qtgui.qdoc b/doc/codesnippets/doc/src/snippets/code/doc_src_qtgui.qdoc
deleted file mode 100644
index ff3afcf..0000000
--- a/doc/codesnippets/doc/src/snippets/code/doc_src_qtgui.qdoc
+++ /dev/null
@@ -1,3 +0,0 @@
-//! [0]
-#include <QtGui>
-//! [0]
diff --git a/doc/codesnippets/doc/src/snippets/code/doc_src_qthelp.qdoc b/doc/codesnippets/doc/src/snippets/code/doc_src_qthelp.qdoc
deleted file mode 100644
index 11d231f..0000000
--- a/doc/codesnippets/doc/src/snippets/code/doc_src_qthelp.qdoc
+++ /dev/null
@@ -1,161 +0,0 @@
-//! [0]
-#include <QtHelp>
-//! [0]
-
-
-//! [1]
-CONFIG += help
-//! [1]
-
-
-//! [2]
-qhelpgenerator doc.qhp -o doc.qch
-//! [2]
-
-
-//! [3]
-<?xml version="1.0" encoding="utf-8" ?> 
-<QHelpCollectionProject version="1.0">
-    <docFiles>
-        <register>
-            <file>doc.qch</file>
-        </register>
-    </docFiles>
-</QHelpCollectionProject>
-//! [3]
-
-
-//! [4]
-qcollectiongenerator mycollection.qhcp -o mycollection.qhc
-//! [4]
-
-
-//! [5]
-...
-<docFiles>
-    <generate>
-        <file>
-            <input>doc.qhp</input>
-            <output>doc.qch</output>
-        </file>
-    </generate>
-    <register>
-        <file>doc.qch</file>
-    </register>
-</docFiles>
-...
-//! [5]
-
-
-//! [6]
-QHelpEngineCore helpEngine("mycollection.qhc");
-...
-
-// get all file references for the identifier
-QMap<QString, QUrl> links = 
-    helpEngine.linksForIdentifier(QLatin1String("MyDialog::ChangeButton"));    
-
-// If help is available for this keyword, get the help data
-// of the first file reference.
-if (links.count()) {
-    QByteArray helpData = helpEngine->fileData(links.constBegin().value());        
-    // show the documentation to the user
-    if (!helpData.isEmpty())
-        displayHelp(helpData);
-}
-//! [6]
-
-
-//! [7]
-<?xml version="1.0" encoding="UTF-8"?>
-<QtHelpProject version="1.0">
-    <namespace>mycompany.com.myapplication.1_0</namespace>
-    <virtualFolder>doc</virtualFolder>	    
-    <customFilter name="My Application 1.0">
-        <filterAttribute>myapp</filterAttribute>
-        <filterAttribute>1.0</filterAttribute>
-    </customFilter>
-    <filterSection>
-        <filterAttribute>myapp</filterAttribute>
-        <filterAttribute>1.0</filterAttribute>
-        <toc>
-            <section title="My Application Manual" ref="index.html">
-                <section title="Chapter 1" ref="doc.html#chapter1"/>
-                <section title="Chapter 2" ref="doc.html#chapter2"/>
-                <section title="Chapter 3" ref="doc.html#chapter3"/>
-            </section>
-        </toc>
-        <keywords>
-            <keyword name="foo" id="MyApplication::foo" ref="doc.html#foo"/>
-            <keyword name="bar" ref="doc.html#bar"/>
-            <keyword id="MyApplication::foobar" ref="doc.html#foobar"/>
-        </keywords>
-        <files>
-            <file>classic.css</file>
-            <file>index.html</file>
-            <file>doc.html</file>
-        </files>
-    </filterSection>
-</QtHelpProject>
-//! [7]
-
-
-//! [8]
-...
-<virtualFolder>doc</virtualFolder>
-...
-//! [8]
-
-
-//! [9]
-...
-<customFilter name="My Application 1.0">
-    <filterAttribute>myapp</filterAttribute>
-    <filterAttribute>1.0</filterAttribute>
-</customFilter>
-...
-//! [9]
-
-
-//! [10]
-...
-<filterSection>
-    <filterAttribute>myapp</filterAttribute>
-    <filterAttribute>1.0</filterAttribute>
-...
-//! [10]
-
-
-//! [11]
-...
-<toc>
-    <section title="My Application Manual" ref="index.html">
-        <section title="Chapter 1" ref="doc.html#chapter1"/>
-        <section title="Chapter 2" ref="doc.html#chapter2"/>
-        <section title="Chapter 3" ref="doc.html#chapter3"/>
-    </section>
-</toc>
-...
-//! [11]
-
-
-//! [12]
-...
-<keywords>
-   <keyword name="foo" id="MyApplication::foo" ref="doc.html#foo"/>
-   <keyword name="bar" ref="doc.html#bar"/>
-   <keyword id="MyApplication::foobar" ref="doc.html#foobar"/>
-</keywords>
-...
-//! [12]
-
-
-//! [13]
-...
-<files>
-    <file>classic.css</file>
-    <file>index.html</file>
-    <file>doc.html</file>
-</files>
-...
-//! [13]
diff --git a/doc/codesnippets/doc/src/snippets/code/doc_src_qtmac-as-native.qdoc b/doc/codesnippets/doc/src/snippets/code/doc_src_qtmac-as-native.qdoc
deleted file mode 100644
index 6ad42b9..0000000
--- a/doc/codesnippets/doc/src/snippets/code/doc_src_qtmac-as-native.qdoc
+++ /dev/null
@@ -1,3 +0,0 @@
-//! [0]
-qmake -spec macx-xcode project.pro
-//! [0]
diff --git a/doc/codesnippets/doc/src/snippets/code/doc_src_qtnetwork.qdoc b/doc/codesnippets/doc/src/snippets/code/doc_src_qtnetwork.qdoc
deleted file mode 100644
index 4856686..0000000
--- a/doc/codesnippets/doc/src/snippets/code/doc_src_qtnetwork.qdoc
+++ /dev/null
@@ -1,8 +0,0 @@
-//! [0]
-QT += network
-//! [0]
-
-
-//! [1]
-#include <QtNetwork>
-//! [1]
diff --git a/doc/codesnippets/doc/src/snippets/code/doc_src_qtopengl.qdoc b/doc/codesnippets/doc/src/snippets/code/doc_src_qtopengl.qdoc
deleted file mode 100644
index e13cdf0..0000000
--- a/doc/codesnippets/doc/src/snippets/code/doc_src_qtopengl.qdoc
+++ /dev/null
@@ -1,8 +0,0 @@
-//! [0]
-#include <QtOpenGL>
-//! [0]
-
-
-//! [1]
-QT += opengl
-//! [1]
diff --git a/doc/codesnippets/doc/src/snippets/code/doc_src_qtscript.qdoc b/doc/codesnippets/doc/src/snippets/code/doc_src_qtscript.qdoc
deleted file mode 100644
index 4031fef..0000000
--- a/doc/codesnippets/doc/src/snippets/code/doc_src_qtscript.qdoc
+++ /dev/null
@@ -1,948 +0,0 @@
-//! [0]
-#include <QtScript>
-//! [0]
-
-
-//! [1]
-QT += script
-//! [1]
-
-
-//! [2]
-function myInterestingScriptFunction() { ... }
-...
-myQObject.somethingChanged.connect(myInterestingScriptFunction);
-//! [2]
-
-
-//! [3]
-myQObject.somethingChanged.connect(myOtherQObject.doSomething);
-//! [3]
-
-
-//! [4]
-myQObject.somethingChanged.disconnect(myInterestingFunction);
-myQObject.somethingChanged.disconnect(myOtherQObject.doSomething);
-//! [4]
-
-
-//! [5]
-var obj = { x: 123 };
-var fun = function() { print(this.x); };
-myQObject.somethingChanged.connect(obj, fun);
-//! [5]
-
-
-//! [6]
-myQObject.somethingChanged.disconnect(obj, fun);
-//! [6]
-
-
-//! [7]
-var obj = { x: 123, fun: function() { print(this.x); } };
-myQObject.somethingChanged.connect(obj, "fun");
-//! [7]
-
-
-//! [8]
-myQObject.somethingChanged.disconnect(obj, "fun");
-//! [8]
-
-
-//! [9]
-try {
-    myQObject.somethingChanged.connect(myQObject, "slotThatDoesntExist");
-} catch (e) {
-    print(e);
-}
-//! [9]
-
-
-//! [10]
-myQObject.somethingChanged("hello");
-//! [10]
-
-
-//! [11]
-myQObject.myOverloadedSlot(10);   // will call the int overload
-myQObject.myOverloadedSlot("10"); // will call the QString overload
-//! [11]
-
-
-//! [12]
-myQObject['myOverloadedSlot(int)']("10");   // call int overload; the argument is converted to an int
-myQObject['myOverloadedSlot(QString)'](10); // call QString overload; the argument is converted to a string
-//! [12]
-
-
-//! [13]
-Q_PROPERTY(bool enabled READ enabled WRITE setEnabled)
-//! [13]
-
-
-//! [14]
-myQObject.enabled = true;
-
-...
-
-myQObject.enabled = !myQObject.enabled;
-//! [14]
-
-
-//! [15]
-myDialog.okButton
-//! [15]
-
-
-//! [16]
-myDialog.okButton.objectName = "cancelButton";
-// from now on, myDialog.cancelButton references the button
-//! [16]
-
-
-//! [17]
-var okButton = myDialog.findChild("okButton");
-if (okButton != null) {
-   // do something with the OK button
-}
-
-var buttons = myDialog.findChildren(RegExp("button[0-9]+"));
-for (var i = 0; i < buttons.length; ++i) {
-   // do something with buttons[i]
-}
-//! [17]
-
-
-//! [18]
-QScriptValue myQObjectConstructor(QScriptContext *context, QScriptEngine *engine)
-{
-  // let the engine manage the new object's lifetime.
-  return engine->newQObject(new MyQObject(), QScriptEngine::ScriptOwnership);
-}
-//! [18]
-
-
-//! [19]
-class MyObject : public QObject
-{
-    Q_OBJECT
-
-public:
-    MyObject( ... );
-
-    void aNonScriptableFunction();
-
-public slots: // these functions (slots) will be available in QtScript
-    void calculate( ... );
-    void setEnabled( bool enabled );
-    bool isEnabled() const;
-
-private:
-   ....
-
-};
-//! [19]
-
-
-//! [20]
-class MyObject : public QObject
-{
-    Q_OBJECT
-
-    public:
-    Q_INVOKABLE void thisMethodIsInvokableInQtScript();
-    void thisMethodIsNotInvokableInQtScript();
-
-    ...
-};
-//! [20]
-
-
-//! [21]
-var obj = new MyObject;
-obj.setEnabled( true );
-print( "obj is enabled: " + obj.isEnabled() );
-//! [21]
-
-
-//! [22]
-var obj = new MyObject;
-obj.enabled = true;
-print( "obj is enabled: " + obj.enabled );
-//! [22]
-
-
-//! [23]
-class MyObject : public QObject
-{
-    Q_OBJECT
-    // define the enabled property
-    Q_PROPERTY( bool enabled WRITE setEnabled READ isEnabled )
-
-public:
-    MyObject( ... );
-
-    void aNonScriptableFunction();
-
-public slots: // these functions (slots) will be available in QtScript
-    void calculate( ... );
-    void setEnabled( bool enabled );
-    bool isEnabled() const;
-
-private:
-   ....
-
-};
-//! [23]
-
-
-//! [24]
-Q_PROPERTY(int nonScriptableProperty READ foo WRITE bar SCRIPTABLE false)
-//! [24]
-
-
-//! [25]
-class MyObject : public QObject
-{
-    Q_OBJECT
-    // define the enabled property
-    Q_PROPERTY( bool enabled WRITE setEnabled READ isEnabled )
-
-public:
-    MyObject( ... );
-
-    void aNonScriptableFunction();
-
-public slots: // these functions (slots) will be available in QtScript
-    void calculate( ... );
-    void setEnabled( bool enabled );
-    bool isEnabled() const;
-
-signals: // the signals
-    void enabledChanged( bool newState );
-
-private:
-   ....
-
-};
-//! [25]
-
-
-//! [26]
-function enabledChangedHandler( b )
-{
-    print( "state changed to: " + b );
-}
-
-function init()
-{
-    var obj = new MyObject();
-    // connect a script function to the signal
-    obj["enabledChanged(bool)"].connect(enabledChangedHandler);
-    obj.enabled = true;
-    print( "obj is enabled: " + obj.enabled );
-}
-//! [26]
-
-
-//! [27]
-var o = new Object();
-o.foo = 123;
-print(o.hasOwnProperty('foo')); // true
-print(o.hasOwnProperty('bar')); // false
-print(o); // calls o.toString(), which returns "[object Object]"
-//! [27]
-
-
-//! [28]
-function Person(name)
-{
-  this.name = name;
-}
-//! [28]
-
-
-//! [29]
-Person.prototype.toString = function() { return "Person(name: " + this.name + ")"; }
-//! [29]
-
-
-//! [30]
-var p1 = new Person("John Doe");
-var p2 = new Person("G.I. Jane");
-print(p1); // "Person(name: John Doe)"
-print(p2); // "Person(name: G.I. Jane)"
-//! [30]
-
-
-//! [31]
-print(p1.hasOwnProperty('name')); // 'name' is an instance variable, so this returns true
-print(p1.hasOwnProperty('toString')); // returns false; inherited from prototype
-print(p1 instanceof Person); // true
-print(p1 instanceof Object); // true
-//! [31]
-
-
-//! [32]
-function Employee(name, salary)
-{
-  Person.call(this, name); // call base constructor
-
-  this.salary = salary;
-}
-
-// set the prototype to be an instance of the base class
-Employee.prototype = new Person();
-
-// initialize prototype
-Employee.prototype.toString = function() { ... }
-//! [32]
-
-
-//! [33]
-var e = new Employee("Johnny Bravo", 5000000);
-print(e instanceof Employee); // true
-print(e instanceof Person);   // true
-print(e instanceof Object);   // true
-print(e instanceof Array);    // false
-//! [33]
-
-
-//! [34]
-QScriptValue Person_ctor(QScriptContext *context, QScriptEngine *engine)
-{
-  QString name = context->argument(0).toString();
-  context->thisObject().setProperty("name", name);
-  return engine->undefinedValue();
-}
-//! [34]
-
-
-//! [35]
-QScriptValue Person_prototype_toString(QScriptContext *context, QScriptEngine *engine)
-{
-  QString name = context->thisObject().property("name").toString();
-  QString result = QString::fromLatin1("Person(name: %0)").arg(name);
-  return result;
-}
-//! [35]
-
-
-//! [36]
-QScriptEngine engine;
-QScriptValue ctor = engine.newFunction(Person_ctor);
-ctor.property("prototype").setProperty("toString", engine.newFunction(Person_prototype_toString));
-QScriptValue global = engine.globalObject();
-global.setProperty("Person", ctor);
-//! [36]
-
-
-//! [37]
-QScriptValue Employee_ctor(QScriptContext *context, QScriptEngine *engine)
-{
-  QScriptValue super = context->callee().property("prototype").property("constructor");
-  super.call(context->thisObject(), QScriptValueList() << context->argument(0));
-  context->thisObject().setProperty("salary", context->argument(1));
-  return engine->undefinedValue();
-}
-//! [37]
-
-
-//! [38]
-QScriptValue empCtor = engine.newFunction(Employee_ctor);
-empCtor.setProperty("prototype", global.property("Person").construct());
-global.setProperty("Employee", empCtor);
-//! [38]
-
-
-//! [39]
-Q_DECLARE_METATYPE(QPointF)
-Q_DECLARE_METATYPE(QPointF*)
-
-QScriptValue QPointF_prototype_x(QScriptContext *context, QScriptEngine *engine)
-{
-  // Since the point is not to be modified, it's OK to cast to a value here
-    QPointF point = qscriptvalue_cast<QPointF>(context->thisObject());
-    return point.x();
-}
-
-QScriptValue QPointF_prototype_setX(QScriptContext *context, QScriptEngine *engine)
-{
-    // Cast to a pointer to be able to modify the underlying C++ value
-    QPointF *point = qscriptvalue_cast<QPointF*>(context->thisObject());
-    if (!point)
-        return context->throwError(QScriptContext::TypeError, "QPointF.prototype.setX: this object is not a QPointF");
-    point->setX(context->argument(0).toNumber());
-    return engine->undefinedValue();
-}
-//! [39]
-
-
-//! [40]
-var o = new Object();
-(o.__proto__ === Object.prototype); // this evaluates to true
-//! [40]
-
-
-//! [41]
-var o = new Object();
-o.__defineGetter__("x", function() { return 123; });
-var y = o.x; // 123
-//! [41]
-
-
-//! [42]
-var o = new Object();
-o.__defineSetter__("x", function(v) { print("and the value is:", v); });
-o.x = 123; // will print "and the value is: 123"
-//! [42]
-
-
-//! [43]
-class MyObject : public QObject
-{
-    Q_OBJECT
-    ...
-};
-
-Q_DECLARE_METATYPE(MyObject*)
-
-QScriptValue myObjectToScriptValue(QScriptEngine *engine, MyObject* const &in)
-{ return engine->newQObject(in); }
-
-void myObjectFromScriptValue(const QScriptValue &object, MyObject* &out)
-{ out = qobject_cast<MyObject*>(object.toQObject()); }
-
-...
-
-qScriptRegisterMetaType(&engine, myObjectToScriptValue, myObjectFromScriptValue);
-//! [43]
-
-//! [44]
-QScriptValue QPoint_ctor(QScriptContext *context, QScriptEngine *engine)
-{
-    int x = context->argument(0).toInt32();
-    int y = context->argument(1).toInt32();
-    return engine->toScriptValue(QPoint(x, y));
-}
-
-...
-
-engine.globalObject().setProperty("QPoint", engine.newFunction(QPoint_ctor));
-//! [44]
-
-//! [45]
-QScriptValue myPrintFunction(QScriptContext *context, QScriptEngine *engine)
-{
-    QString result;
-    for (int i = 0; i < context->argumentCount(); ++i) {
-        if (i > 0)
-            result.append(" ");
-        result.append(context->argument(i).toString());
-    }
-
-    QScriptValue calleeData = context->callee().data();
-    QPlainTextEdit *edit = qobject_cast<QPlainTextEdit*>(calleeData.toQObject());
-    edit->appendPlainText(result);
-
-    return engine->undefinedValue();
-}
-//! [45]
-
-//! [46]
-int main(int argc, char **argv)
-{
-    QApplication app(argc, argv);
-
-    QScriptEngine eng;
-    QPlainTextEdit edit;
-
-    QScriptValue fun = eng.newFunction(myPrintFunction);
-    fun.setData(eng.newQObject(&edit));
-    eng.globalObject().setProperty("print", fun);
-
-    eng.evaluate("print('hello', 'world')");
-
-    edit.show();
-    return app.exec();
-}
-//! [46]
-
-
-//! [47]
-QScriptEngine eng;
-QLineEdit *edit = new QLineEdit(...);
-QScriptValue handler = eng.evaluate("function(text) { print('text was changed to', text); }");
-qScriptConnect(edit, SIGNAL(textChanged(const QString &)), QScriptValue(), handler);
-//! [47]
-
-//! [48]
-QLineEdit *edit1 = new QLineEdit(...);
-QLineEdit *edit2 = new QLineEdit(...);
-
-QScriptValue handler = eng.evaluate("function() { print('I am', this.name); }");
-QScriptValue obj1 = eng.newObject();
-obj1.setProperty("name", "the walrus");
-QScriptValue obj2 = eng.newObject();
-obj2.setProperty("name", "Sam");
-
-qScriptConnect(edit1, SIGNAL(returnPressed()), obj1, handler);
-qScriptConnect(edit2, SIGNAL(returnPressed()), obj2, handler);
-//! [48]
-
-//! [49]
-var getProperty = function(name) { return this[name]; };
-
-name = "Global Object"; // creates a global variable
-print(getProperty("name")); // "Global Object"
-
-var myObject = { name: 'My Object' };
-print(getProperty.call(myObject, "name")); // "My Object"
-
-myObject.getProperty = getProperty;
-print(myObject.getProperty("name")); // "My Object"
-
-getProperty.name = "The getProperty() function";
-getProperty.getProperty = getProperty;
-getProperty.getProperty("name"); // "The getProperty() function"
-//! [49]
-
-//! [50]
-var o = { a: 1, b: 2, sum: function() { return a + b; } };
-print(o.sum()); // reference error, or sum of global variables a and b!!
-//! [50]
-
-//! [51]
-var o = { a: 1, b: 2, sum: function() { return this.a + this.b; } };
-print(o.sum()); // 3
-//! [51]
-
-//! [52]
-QScriptValue getProperty(QScriptContext *ctx, QScriptEngine *eng)
-{
-    QString name = ctx->argument(0).toString();
-    return ctx->thisObject().property(name);
-}
-//! [52]
-
-//! [53]
-QScriptValue myCompare(QScriptContext *ctx, QScriptEngine *eng)
-{
-    double first = ctx->argument(0).toNumber();
-    double second = ctx->argument(1).toNumber();
-    int result;
-    if (first == second)
-        result = 0;
-    else if (first < second)
-        result = -1;
-    else
-        result = 1;
-    return result;
-}
-//! [53]
-
-//! [54]
-QScriptEngine eng;
-QScriptValue comparefn = eng.newFunction(myCompare);
-QScriptValue array = eng.evaluate("new Array(10, 5, 20, 15, 30)");
-array.property("sort").call(array, QScriptValueList() << comparefn);
-
-// prints "5,10,15,20,30"
-qDebug() << array.toString();
-//! [54]
-
-//! [55]
-QScriptValue rectifier(QScriptContext *ctx, QScriptEngine *eng)
-{
-    QRectF magicRect = qscriptvalue_cast<QRectF>(ctx->callee().data());
-    QRectF sourceRect = qscriptvalue_cast<QRectF>(ctx->argument(0));
-    return eng->toScriptValue(sourceRect.intersected(magicRect));
-}
-
-...
-
-QScriptValue fun = eng.newFunction(rectifier);
-QRectF magicRect = QRectF(10, 20, 30, 40);
-fun.setData(eng.toScriptValue(magicRect));
-eng.globalObject().setProperty("rectifier", fun);
-//! [55]
-
-//! [56]
-function add(a, b) {
-    return a + b;
-}
-//! [56]
-
-//! [57]
-function add() {
-    return arguments[0] + arguments[1];
-}
-//! [57]
-
-//! [58]
-QScriptValue add(QScriptContext *ctx, QScriptEngine *eng)
-{
-    double a = ctx->argument(0).toNumber();
-    double b = ctx->argument(1).toNumber();
-    return a + b;
-}
-//! [58]
-
-//! [59]
-function add() {
-    if (arguments.length != 2)
-        throw Error("add() takes exactly two arguments");
-    return arguments[0] + arguments[1];
-}
-//! [59]
-
-//! [60]
-function add() {
-    if (arguments.length != 2)
-        throw Error("add() takes exactly two arguments");
-    if (typeof arguments[0] != "number")
-        throw TypeError("add(): first argument is not a number");
-    if (typeof arguments[1] != "number")
-        throw TypeError("add(): second argument is not a number");
-    return arguments[0] + arguments[1];
-}
-//! [60]
-
-//! [61]
-function add() {
-    if (arguments.length != 2)
-        throw Error("add() takes exactly two arguments");
-    return Number(arguments[0]) + Number(arguments[1]);
-}
-//! [61]
-
-//! [62]
-QScriptValue add(QScriptContext *ctx, QScriptEngine *eng)
-{
-    if (ctx->argumentCount() != 2)
-        return ctx->throwError("add() takes exactly two arguments");
-    double a = ctx->argument(0).toNumber();
-    double b = ctx->argument(1).toNumber();
-    return a + b;
-}
-//! [62]
-
-//! [63]
-QScriptValue add(QScriptContext *ctx, QScriptEngine *eng)
-{
-    if (ctx->argumentCount() != 2)
-        return ctx->throwError("add() takes exactly two arguments");
-    if (!ctx->argument(0).isNumber())
-        return ctx->throwError(QScriptContext::TypeError, "add(): first argument is not a number");
-    if (!ctx->argument(1).isNumber())
-        return ctx->throwError(QScriptContext::TypeError, "add(): second argument is not a number");
-    double a = ctx->argument(0).toNumber();
-    double b = ctx->argument(1).toNumber();
-    return a + b;
-}
-//! [63]
-
-//! [64]
-function concat() {
-    var result = "";
-    for (var i = 0; i < arguments.length; ++i)
-        result += String(arguments[i]);
-    return result;
-}
-//! [64]
-
-//! [65]
-QScriptValue concat(QScriptContext *ctx, QScriptEngine *eng)
-{
-    QString result = "";
-    for (int i = 0; i < ctx->argumentCount(); ++i)
-        result += ctx->argument(i).toString();
-    return result;
-}
-//! [65]
-
-//! [66]
-function sort(comparefn) {
-    if (comparefn == undefined)
-        comparefn = /* the built-in comparison function */;
-    else if (typeof comparefn != "function")
-        throw TypeError("sort(): argument must be a function");
-    ...
-}
-//! [66]
-
-//! [67]
-QScriptValue sort(QScriptContext *ctx, QScriptEngine *eng)
-{
-    QScriptValue comparefn = ctx->argument(0);
-    if (comparefn.isUndefined())
-        comparefn = /* the built-in comparison function */;
-    else if (!comparefn.isFunction())
-        return ctx->throwError(QScriptContext::TypeError, "sort(): argument is not a function");
-    ...
-}
-//! [67]
-
-//! [68]
-function foo() {
-    // Let bar() take care of this.
-    print("calling bar() with " + arguments.length + "arguments");
-    var result = return bar.apply(this, arguments);
-    print("bar() returned" + result);
-    return result;
-}
-//! [68]
-
-//! [69]
-QScriptValue foo(QScriptContext *ctx, QScriptEngine *eng)
-{
-    QScriptValue bar = eng->globalObject().property("bar");
-    QScriptValue arguments = ctx->argumentsObject();
-    qDebug() << "calling bar() with" << arguments.property("length").toInt32() << "arguments";
-    QScriptValue result = bar.apply(ctx->thisObject(), arguments);
-    qDebug() << "bar() returned" << result.toString();
-    return result;
-}
-//! [69]
-
-//! [70]
-function counter() {
-    var count = 0;
-    return function() {
-        return count++;
-    }
-}
-//! [70]
-
-//! [71]
-var c1 = counter(); // create a new counter function
-var c2 = counter(); // create a new counter function
-print(c1()); // 0
-print(c1()); // 1
-print(c2()); // 0
-print(c2()); // 1
-//! [71]
-
-//! [72]
-QScriptValue counter(QScriptContext *ctx, QScriptEngine *eng)
-{
-    QScriptValue act = ctx->activationObject();
-    act.setProperty("count", 0);
-    QScriptValue result = eng->newFunction(counter_inner);
-    result.setScope(act);
-    return result;
-}
-//! [72]
-
-//! [73]
-QScriptValue counter_inner(QScriptContext *ctx, QScriptEngine *eng)
-{
-    QScriptValue outerAct = ctx->callee().scope();
-    double count = outerAct.property("count").toNumber();
-    outerAct.setProperty("count", count+1);
-    return count;
-}
-//! [73]
-
-//! [74]
-QScriptValue counter_hybrid(QScriptContext *ctx, QScriptEngine *eng)
-{
-    QScriptValue act = ctx->activationObject();
-    act.setProperty("count", 0);
-    return eng->evaluate("function() { return count++; }");
-}
-//! [74]
-
-//! [75]
-function Book(isbn) {
-    this.isbn = isbn;
-}
-
-var coolBook1 = new Book("978-0131872493");
-var coolBook2 = new Book("978-1593271473");
-//! [75]
-
-//! [76]
-QScriptValue Person_ctor(QScriptContext *ctx, QScriptEngine *eng)
-{
-    QScriptValue object;
-    if (ctx->isCalledAsConstructor()) {
-        object = ctx->thisObject();
-    } else {
-        object = eng->newObject();
-        object.setPrototype(ctx->callee().property("prototype"));
-    }
-    object.setProperty("name", ctx->argument(0));
-    return object;
-}
-//! [76]
-
-//! [77]
-QScriptContext *ctx = eng.pushContext();
-QScriptValue act = ctx->activationObject();
-act.setProperty("digit", 7);
-
-qDebug() << eng.evaluate("digit + 1").toNumber(); // 8
-
-eng.popContext();
-//! [77]
-
-//! [78]
-QScriptValue getSet(QScriptContext *ctx, QScriptEngine *eng)
-{
-    QScriptValue obj = ctx->thisObject();
-    QScriptValue data = obj.data();
-    if (!data.isValid()) {
-        data = eng->newObject();
-        obj.setData(data);
-    }
-    QScriptValue result;
-    if (ctx->argumentCount() == 1) {
-        QString str = ctx->argument(0).toString();
-        str.replace("Roberta", "Ken");
-        result = str;
-        data.setProperty("x", result);
-    } else {
-        result = data.property("x");
-    }
-    return result;
-}
-//! [78]
-
-//! [79]
-QScriptEngine eng;
-QScriptValue obj = eng.newObject();
-obj.setProperty("x", eng.newFunction(getSet),
-                QScriptValue::PropertyGetter|QScriptValue::PropertySetter);
-//! [79]
-
-//! [80]
-obj.x = "Roberta sent me";
-print(obj.x); // "Ken sent me"
-obj.x = "I sent the bill to Roberta";
-print(obj.x); // "I sent the bill to Ken"
-//! [80]
-
-//! [81]
-obj = {};
-obj.__defineGetter__("x", function() { return this._x; });
-obj.__defineSetter__("x", function(v) { print("setting x to", v); this._x = v; });
-obj.x = 123;
-//! [81]
-
-//! [82]
-myButton.text = qsTr("Hello world!");
-//! [82]
-
-//! [83]
-myButton.text = qsTranslate("MyAwesomeScript", "Hello world!");
-//! [83]
-
-//! [84]
-FriendlyConversation.prototype.greeting = function(type)
-{
-    if (FriendlyConversation['greeting_strings'] == undefined) {
-        FriendlyConversation['greeting_strings'] = [
-            QT_TR_NOOP("Hello"),
-            QT_TR_NOOP("Goodbye")
-        ];
-    }
-    return qsTr(FriendlyConversation.greeting_strings[type]);
-}
-//! [84]
-
-//! [85]
-FriendlyConversation.prototype.greeting = function(type)
-{
-    if (FriendlyConversation['greeting_strings'] == undefined) {
-        FriendlyConversation['greeting_strings'] = [
-            QT_TRANSLATE_NOOP("FriendlyConversation", "Hello"),
-            QT_TRANSLATE_NOOP("FriendlyConversation", "Goodbye")
-        ];
-    }
-    return qsTranslate("FriendlyConversation", FriendlyConversation.greeting_strings[type]);
-}
-//! [85]
-
-//! [86]
-FileCopier.prototype.showProgress = function(done, total, currentFileName)
-{
-    this.label.text = qsTr("%1 of %2 files copied.\nCopying: %3")
-                      .arg(done)
-                      .arg(total)
-                      .arg(currentFileName));
-}
-//! [86]
-
-//! [87]
-lupdate myscript.qs -ts myscript_la.ts
-//! [87]
-
-//! [88]
-lupdate -extensions qs scripts/ -ts scripts_la.ts
-//! [88]
-
-//! [89]
-lrelease myscript_la.ts
-//! [89]
-
-//! [90]
-({ unitName: "Celsius",
-   toKelvin: function(x) { return x + 273; }
- })
-//! [90]
-
-//! [91]
-QScriptValue object = engine.evaluate("({ unitName: 'Celsius', toKelvin: function(x) { return x + 273; } })");
-QScriptValue toKelvin = object.property("toKelvin");
-QScriptValue result = toKelvin.call(object, QScriptValueList() << 100);
-qDebug() << result.toNumber(); // 373
-//! [91]
-
-//! [92]
-QScriptValue add = engine.globalObject().property("add");
-qDebug() << add.call(QScriptValue(), QScriptValueList() << 1 << 2).toNumber(); // 3
-//! [92]
-
-//! [93]
-typedef QSharedPointer<QXmlStreamReader> XmlStreamReaderPointer;
-
-Q_DECLARE_METATYPE(XmlStreamReaderPointer)
-
-QScriptValue constructXmlStreamReader(QScriptContext *context, QScriptEngine *engine)
-{
-    if (!context->isCalledAsConstructor())
-        return context->throwError(QScriptContext::SyntaxError, "please use the 'new' operator");
-
-    QIODevice *device = qobject_cast<QIODevice*>(context->argument(0).toQObject());
-    if (!device)
-        return context->throwError(QScriptContext::TypeError, "please supply a QIODevice as first argument");
-
-    // Create the C++ object
-    QXmlStreamReader *reader = new QXmlStreamReader(device);
-
-    XmlStreamReaderPointer pointer(reader);
-
-    // store the shared pointer in the script object that we are constructing
-    return engine->newVariant(context->thisObject(), qVariantFromValue(pointer));
-}
-//! [93]
-
-//! [94]
-QScriptValue xmlStreamReader_atEnd(QScriptContext *context, QScriptEngine *)
-{
-    XmlStreamReaderPointer reader = qscriptvalue_cast<XmlStreamReaderPointer>(context->thisObject());
-    if (!reader)
-        return context->throwError(QScriptContext::TypeError, "this object is not an XmlStreamReader");
-    return reader->atEnd();
-}
-//! [94]
-
-//! [95]
-    QScriptEngine engine;
-    QScriptValue xmlStreamReaderProto = engine.newObject();
-    xmlStreamReaderProto.setProperty("atEnd", engine.newFunction(xmlStreamReader_atEnd));
-
-    QScriptValue xmlStreamReaderCtor = engine.newFunction(constructXmlStreamReader, xmlStreamReaderProto);
-    engine.globalObject().setProperty("XmlStreamReader", xmlStreamReaderCtor);
-//! [95]
diff --git a/doc/codesnippets/doc/src/snippets/code/doc_src_qtscriptextensions.qdoc b/doc/codesnippets/doc/src/snippets/code/doc_src_qtscriptextensions.qdoc
deleted file mode 100644
index 24fb254..0000000
--- a/doc/codesnippets/doc/src/snippets/code/doc_src_qtscriptextensions.qdoc
+++ /dev/null
@@ -1,7 +0,0 @@
-//! [0]
-print("importing " + __extension__);
-__setupPackage__("cool.stuff");
-
-cool.stuff.add = function(a, b) { return a + b; }
-cool.stuff.subtract = function(a, b) { return a - b; }
-//! [0]
diff --git a/doc/codesnippets/doc/src/snippets/code/doc_src_qtsql.qdoc b/doc/codesnippets/doc/src/snippets/code/doc_src_qtsql.qdoc
deleted file mode 100644
index 1a687db..0000000
--- a/doc/codesnippets/doc/src/snippets/code/doc_src_qtsql.qdoc
+++ /dev/null
@@ -1,8 +0,0 @@
-//! [0]
-#include <QtSql>
-//! [0]
-
-
-//! [1]
-QT += sql
-//! [1]
diff --git a/doc/codesnippets/doc/src/snippets/code/doc_src_qtsvg.qdoc b/doc/codesnippets/doc/src/snippets/code/doc_src_qtsvg.qdoc
deleted file mode 100644
index c99ea41..0000000
--- a/doc/codesnippets/doc/src/snippets/code/doc_src_qtsvg.qdoc
+++ /dev/null
@@ -1,8 +0,0 @@
-//! [0]
-#include <QtSvg>
-//! [0]
-
-
-//! [1]
-QT += svg
-//! [1]
diff --git a/doc/codesnippets/doc/src/snippets/code/doc_src_qttest.qdoc b/doc/codesnippets/doc/src/snippets/code/doc_src_qttest.qdoc
deleted file mode 100644
index c2aa27b..0000000
--- a/doc/codesnippets/doc/src/snippets/code/doc_src_qttest.qdoc
+++ /dev/null
@@ -1,8 +0,0 @@
-//! [0]
-#include <QtTest>
-//! [0]
-
-
-//! [1]
-CONFIG += qtestlib
-//! [1]
diff --git a/doc/codesnippets/doc/src/snippets/code/doc_src_qtuiloader.qdoc b/doc/codesnippets/doc/src/snippets/code/doc_src_qtuiloader.qdoc
deleted file mode 100644
index 64f3eac..0000000
--- a/doc/codesnippets/doc/src/snippets/code/doc_src_qtuiloader.qdoc
+++ /dev/null
@@ -1,8 +0,0 @@
-//! [0]
-CONFIG += uitools
-//! [0]
-
-
-//! [1]
-#include <QtUiTools>
-//! [1]
diff --git a/doc/codesnippets/doc/src/snippets/code/doc_src_qtxml.qdoc b/doc/codesnippets/doc/src/snippets/code/doc_src_qtxml.qdoc
deleted file mode 100644
index f5dc5a5..0000000
--- a/doc/codesnippets/doc/src/snippets/code/doc_src_qtxml.qdoc
+++ /dev/null
@@ -1,77 +0,0 @@
-//! [0]
-#include <QtXml>
-//! [0]
-
-
-//! [1]
-QT += xml
-//! [1]
-
-
-//! [2]
-QT += xml
-//! [2]
-
-
-//! [3]
-<quote>A quotation.</quote>
-//! [3]
-
-
-//! [4]
-<document xmlns:book = 'http://qtsoftware.com/fnord/book/'
-          xmlns      = 'http://qtsoftware.com/fnord/' >
-//! [4]
-
-
-//! [5]
-<author xmlns:fnord = 'http://qtsoftware.com/fnord/'
-             title="Ms" 
-             fnord:title="Goddess" 
-             name="Eris Kallisti"/>
-//! [5]
-
-
-//! [6]
-<document>
-<book>
-  <title>Practical XML</title>
-  <author title="Ms" name="Eris Kallisti"/>
-  <chapter>
-    <title>A Namespace Called fnord</title>
-  </chapter>
-</book>
-</document>
-//! [6]
-
-
-//! [7]
-<book:title>Practical XML</book:title>
-//! [7]
-
-
-//! [8]
-xmlns="http://qtsoftware.com/fnord/"
-//! [8]
-
-
-//! [9]
-xmlns:book="http://qtsoftware.com/fnord/book/"
-//! [9]
-
-
-//! [10]
-<document xmlns:book = 'http://qtsoftware.com/fnord/book/'
-          xmlns      = 'http://qtsoftware.com/fnord/' >
-<book>
-  <book:title>Practical XML</book:title>
-  <book:author xmlns:fnord = 'http://qtsoftware.com/fnord/'
-               title="Ms"
-               fnord:title="Goddess"
-               name="Eris Kallisti"/>
-  <chapter>
-    <title>A Namespace Called fnord</title>
-  </chapter>
-</book>
-</document>
-//! [10]
diff --git a/doc/codesnippets/doc/src/snippets/code/doc_src_qtxmlpatterns.qdoc b/doc/codesnippets/doc/src/snippets/code/doc_src_qtxmlpatterns.qdoc
deleted file mode 100644
index 638bf93..0000000
--- a/doc/codesnippets/doc/src/snippets/code/doc_src_qtxmlpatterns.qdoc
+++ /dev/null
@@ -1,349 +0,0 @@
-
-void wrapInFunction()
-{
-
-//! [0]
-#include <QtXmlPatterns>
-//! [0]
-
-
-//! [1]
-QT += xmlpatterns
-//! [1]
-
-//! [2]
-xmlpatterns myQuery.xq
-//! [2]
-
-//! [3]
-declare namespace c = "http://cookbook/namespace";
-doc('cookbook.xml')//c:recipe/c:title
-//! [3]
-
-//! [4]
-declare default element namespace "http://cookbook/namespace";
-doc('cookbook.xml')//recipe/title
-//! [4]
-
-//! [5]
-<title xmlns="http://cookbook/namespace">Quick and Easy Mushroom Soup</title>
-<title xmlns="http://cookbook/namespace">Cheese on Toast</title>
-<title xmlns="http://cookbook/namespace">Hard-Boiled Eggs</title>
-//! [5]
-
-//! [6]
-xmlpatterns file.xq
-//! [6]
-
-//! [7]
-doc('cookbook.xml')//@xml:*
-//! [7]
-
-//! [8]
-doc('cookbook.xml')//@*:name
-//! [8]
-
-//! [9]
-declare default element namespace "http://cookbook/namespace";
-doc('cookbook.xml')/cookbook/@*
-//! [9]
-
-//! [10]
-declare default element namespace "http://cookbook/namespace";
-doc("cookbook.xml")/cookbook/recipe[title = "Hard-Boiled Eggs"]
-//! [10]
-
-//! [11]
-declare default element namespace "http://cookbook/namespace";
-doc('cookbook.xml')//method[string-length(.) = 0]
-//! [11]
-
-//! [12]
-declare default element namespace "http://cookbook/namespace";
-doc('cookbook.xml')//method[string-length() = 0]
-//! [12]
-
-//! [13]
-declare default element namespace "http://cookbook/namespace";
-doc('cookbook.xml')/cookbook/recipe[2]
-//! [13]
-
-//! [14]
-declare default element namespace "http://cookbook/namespace";
-doc('cookbook.xml')/cookbook/recipe[position() = 2]
-//! [14]
-
-//! [15]
-declare default element namespace "http://cookbook/namespace";
-doc('cookbook.xml')/cookbook/recipe[position() > 1]
-//! [15]
-
-//! [16]
-declare default element namespace "http://cookbook/namespace";
-doc('cookbook.xml')/cookbook/recipe[last()]
-//! [16]
-
-//! [17]
-declare default element namespace "http://cookbook/namespace";
-doc('cookbook.xml')/cookbook/recipe[last() - 1]
-//! [17]
-
-//! [18]
-doc('cookbook.xml')//recipe
-//! [18]
-
-//! [19]
-doc('cookbook.xml')//recipe/title
-//! [19]
-
-//! [20]
-<recipe/>
-//! [20]
-
-//! [21]
- <html xmlns="http://www.w3.org/1999/xhtml/"
-       xml:id="{doc("other.html")/html/@xml:id}"/>
-//! [21]
-
-//! [22]
-doc('cookbook.xml')/descendant-or-self::element(recipe)/child::element(title)
-//! [22]
-
-//! [23]
-<cookbook>
-//! [23]
-
-//! [24]
-<cookbook xmlns="http://cookbook/namespace">
-//! [24]
-
-//! [25]
-for $i in doc("cookbook.xml")//@xml:*
-return <p>{$i}</p>
-//! [25]
-
-//! [26]
-for $i in doc("cookbook.xml")//@*:name
-return <p>{$i}</p>
-//! [26]
-
-//! [27]
-declare default element namespace "http://cookbook/namespace";
-for $i in doc("cookbook.xml")/cookbook/@*
-return <p>{$i}</p>
-//! [27]
-
-//! [28]
-<p xml:id="MushroomSoup"/>
-<p xml:id="CheeseOnToast"/>
-<p xml:id="HardBoiledEggs"/>
-//! [28]
-
-//! [29]
-<p name="Fresh mushrooms"/>
-<p name="Garlic"/>
-<p name="Olive oil"/>
-<p name="Milk"/>
-<p name="Water"/>
-<p name="Cream"/>
-<p name="Vegetable soup cube"/>
-<p name="Ground black pepper"/>
-<p name="Dried parsley"/>
-<p name="Bread"/>
-<p name="Cheese"/>
-<p name="Eggs"/>
-//! [29]
-
-//! [30]
-<p xmlns="http://cookbook/namespace" count="3"/>
-//! [30]
-
-//! [31]
-<method xmlns="http://cookbook/namespace"/>
-//! [31]
-
-//! [32]
-declare default element namespace "http://cookbook/namespace";
-doc('cookbook.xml')//recipe[string-length(method) = 0]
-//! [32]
-
-//! [33]
-<recipe xmlns="http://cookbook/namespace" xml:id="HardBoiledEggs">
-    <title>Hard-Boiled Eggs</title>
-    <ingredient name="Eggs" quantity="3" unit="eggs"/>
-    <time quantity="3" unit="minutes"/>
-    <method/>
-</recipe>
-//! [33]
-
-//! [34]
-declare default element namespace "http://cookbook/namespace";
-doc('cookbook.xml')/cookbook/recipe[method[empty(step)]]
-//! [34]
-
-//! [35]
-declare default element namespace "http://cookbook/namespace";
-doc('cookbook.xml')/cookbook/recipe[not(normalize-space(method))]
-//! [35]
-
-//! [36]
-<e>{sum((1, 2, 3))}</e>
-//! [36]
-
-//! [37]
-<e>6</e>
-//! [37]
-
-//![38]
-declare variable $insertion := "example";
-<p class="important {$insertion} obsolete"/>
-//![38]
-
-//! [39]
-<p class="important example obsolete"/>
-//! [39]
-
-//! [40]
-declare default element namespace "http://cookbook/namespace";
-let $docURI := 'cookbook.xml'
-return if(doc-available($docURI))
-       then doc($docURI)//recipe/<resept>{./node()}</resept>
-       else <resept>Failed to load {$docURI}</resept>
-//! [40]
-
-//! [41]
-<span>1</span>
-<span>3</span>
-<span>5</span>
-<span>7</span>
-<span>9</span>
-<span>b</span>
-<span>d</span>
-<span>f</span>
-//! [41]
-
-//! [42]
-<span>1</span>
-//! [42]
-
-//! [43]
-let $doc := doc('doc.txt')
-return $doc/doc/p[1]/span[1]
-//! [43]
-
-//! [44]
-for $a in doc('doc.txt')/doc/p/span[1]
-return $a
-//! [44]
-
-//! [45]
-doc('doc.txt')/doc/p/span[1]
-//! [45]
-
-//! [46]
-doc('doc.txt')//p/<p>{span/node()}</p>
-//! [46]
-
-//! [47]
-<p>78</p>
-<p>9a</p>
-<p>12</p>
-<p>bc</p>
-<p>de</p>
-<p>34</p>
-<p>56</p>
-<p>f0</p>
-//! [47]
-
-//! [48]
-for $a in doc('doc.txt')//p
- return <p>{$a/span/node()}</p>
-//! [48]
-
-//! [49]
-<p>12</p>
-<p>34</p>
-<p>56</p>
-<p>78</p>
-<p>9a</p>
-<p>bc</p>
-<p>de</p>
-<p>f0</p>
-//! [49]
-
-//! [100]
-<?xml version="1.0" encoding="UTF-8"?>
-<cookbook>
-    <recipe xml:id="MushroomSoup">
-        <title>Quick and Easy Mushroom Soup</title>
-        <ingredient name="Fresh mushrooms"
-                    quantity="7"
-                    unit="pieces"/>
-        <ingredient name="Garlic"
-                    quantity="1"
-                    unit="cloves"/>
-        <ingredient name="Olive oil"
-                    quantity="2"
-                    unit="tablespoons"/>
-        <ingredient name="Milk"
-                    quantity="200"
-                    unit="milliliters"/>
-        <ingredient name="Water"
-                    quantity="200"
-                    unit="milliliters"/>
-        <ingredient name="Cream"
-                    quantity="100"
-                    unit="milliliters"/>
-        <ingredient name="Vegetable soup cube"
-                    quantity="1/2"
-                    unit="cubes"/>
-        <ingredient name="Ground black pepper"
-                    quantity="1/2"
-                    unit="teaspoons"/>
-        <ingredient name="Dried parsley"
-                    quantity="1"
-                    unit="teaspoons"/>
-        <time quantity="20"
-              unit="minutes"/>
-        <method>
-            <step>1. Slice mushrooms and garlic.</step>
-            <step>2. Fry mushroom slices and garlic with olive oil.</step>
-            <step>3. Once mushrooms are cooked, add milk, cream water. Stir.</step>
-            <step>4. Add vegetable soup cube.</step>
-            <step>5. Reduce heat, add pepper and parsley.</step>
-            <step>6. Turn off the stove before the mixture boils.</step>
-            <step>7. Blend the mixture.</step>
-        </method>
-    </recipe>
-    <recipe xml:id="CheeseOnToast">
-        <title>Cheese on Toast</title>
-        <ingredient name="Bread"
-                    quantity="2"
-                    unit="slices"/>
-        <ingredient name="Cheese"
-                    quantity="2"
-                    unit="slices"/>
-        <time quantity="3"
-              unit="minutes"/>
-        <method>
-            <step>1. Slice the bread and cheese.</step>
-            <step>2. Grill one side of each slice of bread.</step>
-            <step>3. Turn over the bread and place a slice of cheese on each piece.</step>
-            <step>4. Grill until the cheese has started to melt.</step>
-            <step>5. Serve and enjoy!</step>
-        </method>
-    </recipe>
-    <recipe xml:id="HardBoiledEggs">
-        <title>Hard-Boiled Eggs</title>
-        <ingredient name="Eggs"
-                    quantity="3"
-                    unit="eggs"/>
-        <time quantity="3"
-              unit="minutes"/>
-        <method/>
-    </recipe>
-</cookbook>
-//! [100]
-
-}
-
diff --git a/doc/codesnippets/doc/src/snippets/code/doc_src_qvarlengtharray.qdoc b/doc/codesnippets/doc/src/snippets/code/doc_src_qvarlengtharray.qdoc
deleted file mode 100644
index 95db9d3..0000000
--- a/doc/codesnippets/doc/src/snippets/code/doc_src_qvarlengtharray.qdoc
+++ /dev/null
@@ -1,38 +0,0 @@
-//! [0]
-int myfunc(int n)
-{
-    int table[n + 1];  // WRONG
-    ...
-    return table[n];
-}
-//! [0]
-
-
-//! [1]
-int myfunc(int n)
-{
-    int *table = new int[n + 1];
-    ...
-    int ret = table[n];
-    delete[] table;
-    return ret;
-}
-//! [1]
-
-
-//! [2]
-int myfunc(int n)
-{
-    QVarLengthArray<int, 1024> array(n + 1);
-    ...
-    return array[n];
-}
-//! [2]
-
-
-//! [3]
-QVarLengthArray<int> array(10);
-int *data = array.data();
-for (int i = 0; i < 10; ++i)
-    data[i] = 2 * i;
-//! [3]
diff --git a/doc/codesnippets/doc/src/snippets/code/doc_src_rcc.qdoc b/doc/codesnippets/doc/src/snippets/code/doc_src_rcc.qdoc
deleted file mode 100644
index 423f8e6..0000000
--- a/doc/codesnippets/doc/src/snippets/code/doc_src_rcc.qdoc
+++ /dev/null
@@ -1,3 +0,0 @@
-//! [0]
-rcc [options] <inputs>
-//! [0]
diff --git a/doc/codesnippets/doc/src/snippets/code/doc_src_resources.qdoc b/doc/codesnippets/doc/src/snippets/code/doc_src_resources.qdoc
deleted file mode 100644
index bc85341..0000000
--- a/doc/codesnippets/doc/src/snippets/code/doc_src_resources.qdoc
+++ /dev/null
@@ -1,41 +0,0 @@
-//! [0]
-<file alias="cut-img.png">images/cut.png</file>
-//! [0]
-
-
-//! [1]
-<qresource prefix="/myresources">
-    <file alias="cut-img.png">images/cut.png</file>
-</qresource>
-//! [1]
-
-
-//! [2]
-<qresource>
-    <file>cut.jpg</file>
-</qresource>
-<qresource lang="fr">
-    <file alias="cut.jpg">cut_fr.jpg</file>
-</qresource>
-//! [2]
-
-
-//! [3]
-rcc -binary myresource.qrc -o myresource.rcc
-//! [3]
-
-
-//! [4]
-QResource::registerResource("/path/to/myresource.rcc");
-//! [4]
-
-
-//! [5]
-int main(int argc, char *argv[])
-{
-    QApplication app(argc, argv);
-    Q_INIT_RESOURCE(graphlib);
-    ...
-    return app.exec();
-}
-//! [5]
diff --git a/doc/codesnippets/doc/src/snippets/code/doc_src_richtext.qdoc b/doc/codesnippets/doc/src/snippets/code/doc_src_richtext.qdoc
deleted file mode 100644
index d6f54c2..0000000
--- a/doc/codesnippets/doc/src/snippets/code/doc_src_richtext.qdoc
+++ /dev/null
@@ -1,50 +0,0 @@
-//! [0]
-QTextDocument *newDocument = new QTextDocument;
-//! [0]
-
-
-//! [1]
-QTextEdit *editor = new QTextEdit;
-QTextDocument *editorDocument = editor->document();
-//! [1]
-
-
-//! [2]
-QTextEdit *editor = new QTextEdit(parent);
-editor->setHtml(aStringContainingHTMLtext);
-editor->show();
-//! [2]
-
-
-//! [3]
-QTextDocument *document = editor->document();
-//! [3]
-
-
-//! [4]
-QTextCursor cursor = editor->textCursor();
-//! [4]
-
-
-//! [5]
-editor->setTextCursor(cursor);
-//! [5]
-
-
-//! [6]
-textEdit.show();
-
-textCursor.beginEditBlock();
-
-for (int i = 0; i < 1000; ++i) {
-    textCursor.insertBlock();
-    textCursor.insertText(paragraphText.at(i));
-}
-
-textCursor.endEditBlock(); 
-//! [6]
-
-
-//! [7]
-<meta http-equiv="Content-Type" content="text/html; charset=EUC-JP" />
-//! [7]
diff --git a/doc/codesnippets/doc/src/snippets/code/doc_src_session.qdoc b/doc/codesnippets/doc/src/snippets/code/doc_src_session.qdoc
deleted file mode 100644
index 6a32863..0000000
--- a/doc/codesnippets/doc/src/snippets/code/doc_src_session.qdoc
+++ /dev/null
@@ -1,3 +0,0 @@
-//! [0]
-xterm
-//! [0]
diff --git a/doc/codesnippets/doc/src/snippets/code/doc_src_sql-driver.qdoc b/doc/codesnippets/doc/src/snippets/code/doc_src_sql-driver.qdoc
deleted file mode 100644
index 74cd8dc..0000000
--- a/doc/codesnippets/doc/src/snippets/code/doc_src_sql-driver.qdoc
+++ /dev/null
@@ -1,239 +0,0 @@
-//! [0]
--no-sql-<driver> ... Disable SQL <driver> entirely.
--qt-sql-<driver> ... Enable a SQL <driver> in the Qt Library, by default
-                     none are turned on.
--plugin-sql-<driver> Enable SQL <driver> as a plugin to be linked to
-                     at run time.
-
-                     Possible values for <driver>:
-                     [ db2 ibase mysql oci odbc psql sqlite sqlite2 tds ]
-//! [0]
-
-
-//! [1]
-create procedure qtestproc (OUT param1 INT, OUT param2 INT)
-BEGIN
-    set param1 = 42;
-    set param2 = 43;
-END
-//! [1]
-
-
-//! [2]
-QSqlQuery q;
-q.exec("call qtestproc (@outval1, @outval2)");
-q.exec("select @outval1, @outval2");
-q.next();
-qDebug() << q.value(0) << q.value(1); // outputs "42" and "43"
-//! [2]
-
-
-//! [3]
-cd $QTDIR/src/plugins/sqldrivers/mysql
-qmake "INCLUDEPATH+=/usr/local/include" "LIBS+=-L/usr/local/lib -lmysqlclient_r" mysql.pro
-make
-//! [3]
-
-
-//! [4]
-cd $QTDIR/src/plugins/sqldrivers/mysql
-make install
-//! [4]
-
-
-//! [5]
-cd %QTDIR%\src\plugins\sqldrivers\mysql
-qmake "INCLUDEPATH+=C:\MySQL\include" "LIBS+=C:\MYSQL\MySQL Server <version>\lib\opt\libmysql.lib" mysql.pro
-nmake
-//! [5]
-
-
-//! [6]
-cd $QTDIR/src/plugins/sqldrivers/oci
-qmake "INCLUDEPATH+=$ORACLE_HOME/rdbms/public $ORACLE_HOME/rdbms/demo" "LIBS+=-L$ORACLE_HOME/lib -lclntsh -lwtc9" oci.pro
-make
-//! [6]
-
-
-//! [7]
-cd $QTDIR/src/plugins/sqldrivers/oci
-qmake "INCLUDEPATH+=/usr/include/oracle/10.1.0.3/client/" "LIBS+=-L/usr/lib/oracle/10.1.0.3/client/lib" oci.pro
-make
-//! [7]
-
-
-//! [8]
-set INCLUDE=%INCLUDE%;c:\oracle\oci\include
-set LIB=%LIB%;c:\oracle\oci\lib\msvc
-cd %QTDIR%\src\plugins\sqldrivers\oci
-qmake oci.pro
-nmake
-//! [8]
-
-
-//! [9]
-set PATH=%PATH%;c:\oracle\bin
-//! [9]
-
-
-//! [10]
-\\ STORED_PROC uses the return statement or returns multiple result sets
-QSqlQuery query;
-query.setForwardOnly(true);
-query.exec("{call STORED_PROC}");
-//! [10]
-
-
-//! [11]
-cd $QTDIR/src/plugins/sqldrivers/odbc
-qmake "INCLUDEPATH+=/usr/local/unixODBC/include" "LIBS+=-L/usr/local/unixODBC/lib -lodbc"
-make
-//! [11]
-
-
-//! [12]
-cd %QTDIR%\src\plugins\sqldrivers\odbc
-qmake odbc.pro
-nmake
-//! [12]
-
-
-//! [13]
-cd $QTDIR/src/plugins/sqldrivers/psql
-qmake "INCLUDEPATH+=/usr/include/pgsql" "LIBS+=-L/usr/lib -lpq" psql.pro
-make
-//! [13]
-
-
-//! [14]
-cd $QTDIR/src/plugins/sqldrivers/psql
-make install
-//! [14]
-
-
-//! [15]
-cd %QTDIR%\src\plugins\sqldrivers\psql
-qmake "INCLUDEPATH+=C:\psql\include" "LIBS+=C:\psql\lib\ms\libpq.lib" psql.pro
-nmake
-//! [15]
-
-
-//! [16]
-cd $QTDIR/src/plugins/sqldrivers/tds
-qmake "INCLUDEPATH=$SYBASE/include" "LIBS=-L$SYBASE/lib -lsybdb"
-make
-//! [16]
-
-
-//! [17]
-cd %QTDIR%\src\plugins\sqldrivers\tds
-qmake "LIBS+=NTWDBLIB.LIB" tds.pro
-nmake
-//! [17]
-
-
-//! [18]
-cd $QTDIR/src/plugins/sqldrivers/db2
-qmake "INCLUDEPATH+=$DB2DIR/include" "LIBS+=-L$DB2DIR/lib -ldb2"
-make
-//! [18]
-
-
-//! [19]
-cd $QTDIR/src/plugins/sqldrivers/db2
-make install
-//! [19]
-
-
-//! [20]
-cd %QTDIR%\src\plugins\sqldrivers\db2
-qmake "INCLUDEPATH+=<DB2 home>/sqllib/include" "LIBS+=<DB2 home>/sqllib/lib/db2cli.lib"
-nmake
-//! [20]
-
-
-//! [21]
-cd $QTDIR/src/plugins/sqldrivers/sqlite
-qmake "INCLUDEPATH+=$SQLITE/include" "LIBS+=-L$SQLITE/lib -lsqlite"
-make
-//! [21]
-
-
-//! [22]
-cd $QTDIR/src/plugins/sqldrivers/sqlite
-make install
-//! [22]
-
-
-//! [23]
-cd %QTDIR%\src\plugins\sqldrivers\sqlite
-qmake "INCLUDEPATH+=C:\SQLITE\INCLUDE" "LIBS+=C:\SQLITE\LIB\SQLITE3.LIB" sqlite.pro
-nmake
-//! [23]
-
-
-//! [24]
-db.setHostName("MyServer");
-db.setDatabaseName("C:\\test.gdb");
-//! [24]
-
-
-//! [25]
-// connect to database using the Latin-1 character set 
-db.setConnectOptions("ISC_DPB_LC_CTYPE=Latin1");
-db.open();
-//! [25]
-
-
-//! [26]
-QSqlQuery q;
-q.exec("execute procedure my_procedure");
-q.next();
-qDebug() << q.value(0); // outputs the first RETURN/OUT value
-//! [26]
-
-
-//! [27]
-cd $QTDIR/src/plugins/sqldrivers/ibase
-qmake "INCLUDEPATH+=/opt/interbase/include" "LIBS+=-L/opt/interbase/lib" ibase.pro
-make
-//! [27]
-
-
-//! [28]
-cd $QTDIR/src/plugins/sqldrivers/ibase
-qmake "INCLUDEPATH+=/opt/interbase/include" "LIBS+=-L/opt/interbase/lib -lfbclient" ibase.pro
-make
-//! [28]
-
-
-//! [29]
-cd %QTDIR%\src\plugins\sqldrivers\ibase
-qmake "INCLUDEPATH+=C:\interbase\include" ibase.pro
-nmake
-//! [29]
-
-
-//! [30]
-cd %QTDIR%\src\plugins\sqldrivers\ibase
-qmake "INCLUDEPATH+=C:\interbase\include" "LIBS+=-lfbclient" ibase.pro
-nmake
-//! [30]
-
-
-//! [31]
-QSqlDatabase: QMYSQL driver not loaded
-QSqlDatabase: available drivers: QMYSQL
-//! [31]
-
-//! [32]
-configure -I /usr/include/oracle/10.1.0.3/client -L /usr/lib/oracle/10.1.0.3/client/lib -R /usr/lib/oracle/10.1.0.3/client/lib -lclntsh -lnnz10
-make
-//! [32]
-
-//! [33]
-cd $QTDIR/src/plugins/sqldrivers/oci
-qmake "INCLUDEPATH+=/usr/include/oracle/10.1.0.3/client" "LIBS+=-L/usr/lib/oracle/10.1.0.3/client/lib -Wl,-rpath,/usr/lib/oracle/10.1.0.3/client/lib -lclntsh -lnnz10" oci.pro
-make
-//! [33]
-
diff --git a/doc/codesnippets/doc/src/snippets/code/doc_src_styles.qdoc b/doc/codesnippets/doc/src/snippets/code/doc_src_styles.qdoc
deleted file mode 100644
index e11dc05..0000000
--- a/doc/codesnippets/doc/src/snippets/code/doc_src_styles.qdoc
+++ /dev/null
@@ -1,94 +0,0 @@
-//! [0]
-    opt.init(q);
-        if (down)
-        opt.state |= QStyle::State_Sunken;
-    if (tristate && noChange)
-        opt.state |= QStyle::State_NoChange;
-    else
-        opt.state |= checked ? QStyle::State_On :
-        QStyle::State_Off;
-    if (q->testAttribute(Qt::WA_Hover) &&  q->underMouse()) {
-        if (hovering)
-        opt.state |= QStyle::State_MouseOver;
-        else
-        opt.state &= ~QStyle::State_MouseOver;
-    }
-    opt.text = text;
-    opt.icon = icon;
-    opt.iconSize = q->iconSize();
-//! [0]
-
-
-//! [1]
-    state = QStyle::State_None;
-    if (widget->isEnabled())
-        state |= QStyle::State_Enabled;
-    if (widget->hasFocus())
-        state |= QStyle::State_HasFocus;
-    if (widget->window()->testAttribute(Qt::WA_KeyboardFocusChange))
-        state |= QStyle::State_KeyboardFocusChange;
-    if (widget->underMouse())
-        state |= QStyle::State_MouseOver;
-    if (widget->window()->isActiveWindow())
-        state |= QStyle::State_Active;
-#ifdef Q_WS_MAC
-    extern bool qt_mac_can_clickThrough(const QWidget *w); //qwidget_mac.cpp
-    if (!(state & QStyle::State_Active) && !qt_mac_can_clickThrough(widget))
-        state &= ~QStyle::State_Enabled;
-#endif
-#ifdef QT_KEYPAD_NAVIGATION
-    if (widget->hasEditFocus())
-        state |= QStyle::State_HasEditFocus;
-#endif
-
-    direction = widget->layoutDirection();
-    rect = widget->rect();
-    palette = widget->palette();
-    fontMetrics = widget->fontMetrics();
-//! [1]
-
-
-//! [2]
-    QStylePainter p(this);
-    QStyleOptionButton opt = d->getStyleOption();
-    p.drawControl(QStyle::CE_CheckBox, opt);
-//! [2]
-
-
-//! [3]
-    QStyleOptionButton subopt = *btn;
-    subopt.rect = subElementRect(SE_CheckBoxIndicator, btn, widget);
-    drawPrimitive(PE_IndicatorCheckBox, &subopt, p, widget);
-    subopt.rect = subElementRect(SE_CheckBoxContents, btn, widget);
-    drawControl(CE_CheckBoxLabel, &subopt, p, widget);
-
-    if (btn->state & State_HasFocus) {
-        QStyleOptionFocusRect fropt;
-        fropt.QStyleOption::operator=(*btn);
-        fropt.rect = subElementRect(SE_CheckBoxFocusRect, btn, widget);
-        drawPrimitive(PE_FrameFocusRect, &fropt, p, widget);
-    }
-//! [3]
-
-
-//! [4]
-    const QStyleOptionButton *btn = qstyleoption_cast<const QStyleOptionButton *>(opt);
-    uint alignment = visualAlignment(btn->direction, Qt::AlignLeft | Qt::AlignVCenter);
-
-    if (!styleHint(SH_UnderlineShortcut, btn, widget))
-        alignment |= Qt::TextHideMnemonic;
-    QPixmap pix;
-    QRect textRect = btn->rect;
-    if (!btn->icon.isNull()) {
-        pix = btn->icon.pixmap(btn->iconSize, btn->state & State_Enabled ? QIcon::Normal : QIcon::Disabled);
-        drawItemPixmap(p, btn->rect, alignment, pix);
-        if (btn->direction == Qt::RightToLeft)
-            textRect.setRight(textRect.right() - btn->iconSize.width() - 4);
-        else
-            textRect.setLeft(textRect.left() + btn->iconSize.width() + 4);
-    }
-    if (!btn->text.isEmpty()){
-        drawItemText(p, textRect, alignment | Qt::TextShowMnemonic,
-            btn->palette, btn->state & State_Enabled, btn->text, QPalette::WindowText);
-    }
-//! [4]
diff --git a/doc/codesnippets/doc/src/snippets/code/doc_src_stylesheet.qdoc b/doc/codesnippets/doc/src/snippets/code/doc_src_stylesheet.qdoc
deleted file mode 100644
index 60622d3..0000000
--- a/doc/codesnippets/doc/src/snippets/code/doc_src_stylesheet.qdoc
+++ /dev/null
@@ -1,1911 +0,0 @@
-//! [0]
-QLineEdit { background: yellow }
-QCheckBox { color: red }
-//! [0]
-
-
-//! [1]
-QPushButton { color: red }
-//! [1]
-
-
-//! [2]
-QPushButton, QLineEdit, QComboBox { color: red }
-//! [2]
-
-
-//! [3]
-QPushButton { color: red }
-QLineEdit { color: red }
-QComboBox { color: red }
-//! [3]
-
-
-//! [4]
-QPushButton { color: red; background-color: white }
-//! [4]
-
-
-//! [5]
-QComboBox::drop-down { image: url(dropdown.png) }
-//! [5]
-
-
-//! [6]
-QComboBox {
-    margin-right: 20px;
-}
-QComboBox::drop-down {
-    subcontrol-origin: margin;
-}
-//! [6]
-
-
-//! [7]
-QComboBox::down-arrow {
-    image: url(down_arrow.png);
-}
-QComboBox::down-arrow:pressed {
-    position: relative;
-    top: 1px; left: 1px;
-}
-//! [7]
-
-
-//! [8]
-QPushButton:hover { color: white }
-//! [8]
-
-
-//! [9]
-QRadioButton:!hover { color: red }
-//! [9]
-
-
-//! [10]
-QCheckBox:hover:checked { color: white }
-//! [10]
-
-
-//! [11]
-QPushButton:hover:!pressed { color: blue; }
-//! [11]
-
-
-//! [12]
-QCheckBox:hover, QCheckBox:checked { color: white }
-//! [12]
-
-
-//! [13]
-QComboBox::drop-down:hover { image: url(dropdown_bright.png) }
-//! [13]
-
-
-//! [14]
-QPushButton#okButton { color: gray }
-QPushButton { color: red }
-//! [14]
-
-
-//! [15]
-QPushButton:hover { color: white }
-QPushButton { color: red }
-//! [15]
-
-
-//! [16]
-QPushButton:hover { color: white }
-QPushButton:enabled { color: red }
-//! [16]
-
-
-//! [17]
-QPushButton:enabled { color: red }
-QPushButton:hover { color: white }
-//! [17]
-
-
-//! [18]
-QPushButton:hover:enabled { color: white }
-QPushButton:enabled { color: red }
-//! [18]
-
-
-//! [19]
-QPushButton { color: red }
-QAbstractButton { color: gray }
-//! [19]
-
-
-//! [20]
-*             {}  /* a=0 b=0 c=0 -> specificity =   0 */
-LI            {}  /* a=0 b=0 c=1 -> specificity =   1 */
-UL LI         {}  /* a=0 b=0 c=2 -> specificity =   2 */
-UL OL+LI      {}  /* a=0 b=0 c=3 -> specificity =   3 */
-H1 + *[REL=up]{}  /* a=0 b=1 c=1 -> specificity =  11 */
-UL OL LI.red  {}  /* a=0 b=1 c=3 -> specificity =  13 */ 
-LI.red.level  {}  /* a=0 b=2 c=1 -> specificity =  21 */
-#x34y         {}  /* a=1 b=0 c=0 -> specificity = 100 */
-//! [20]
-
-
-//! [21]
-qApp->setStyleSheet("QPushButton { color: white }");
-//! [21]
-
-
-//! [22]
-myPushButton->setStyleSheet("* { color: blue }");
-//! [22]
-
-
-//! [23]
-myPushButton->setStyleSheet("color: blue");
-//! [23]
-
-
-//! [24]
-qApp->setStyleSheet("QGroupBox { color: red; } ");
-//! [24]
-
-
-//! [25]
-qApp->setStyleSheet("QGroupBox, QGroupBox * { color: red; }");
-//! [25]
-
-
-//! [26]
-class MyPushButton : public QPushButton {
-    // ...
-}
-
-// ...
-qApp->setStyleSheet("MyPushButton { background: yellow; }");
-//! [26]
-
-
-//! [27]
-namespace ns {
-    class MyPushButton : public QPushButton {
-        // ...
-    }
-}
-
-// ...
-qApp->setSytleSheet("ns--MyPushButton { background: yellow; }");
-//! [27]
-
-
-//! [28]
-MyLabel { qproperty-pixmap: url(pixmap.png); }
-MyGroupBox { qproperty-titleColor: rgb(100, 200, 100); }
-QPushButton { qproperty-iconSize: 20px 20px; }
-//! [28]
-
-
-//! [30]
-QPushButton { background-color: red; border: none; }
-//! [30]
-
-
-//! [31]
-QToolButton { background-color: red; border: none; }
-//! [31]
-
-
-//! [32]
-void CustomWidget::paintEvent(QPaintEvent *)
-{
-    QStyleOption opt;
-    opt.init(this);
-    QPainter p(this);
-    style()->drawPrimitive(QStyle::PE_Widget, &opt, &p, this);
-}
-//! [32]
-
-
-//! [33]
-QTreeView {
-    alternate-background-color: blue;
-    background: yellow;
-}
-//! [33]
-
-
-//! [34]
-QTextEdit { background: yellow }
-//! [34]
-
-
-//! [35]
-QLabel { 
-    background-image: url(dense6pattern.png);
-    background-repeat: repeat-xy;
-}
-//! [35]
-
-
-//! [36]
-QLabel { background-color: yellow }
-QLineEdit { background-color: rgb(255, 0, 0) }
-//! [36]
-
-
-//! [37]
-QFrame { background-image: url(:/images/hydro.png) }
-//! [37]
-
-
-//! [38]
-QFrame {
-    background: white url(:/images/ring.png);
-    background-repeat: repeat-y;
-    background-position: left;
-}
-//! [38]
-
-
-//! [39]
-QFrame {
-    background: url(:/images/footer.png);
-    background-position: bottom left;
-}
-//! [39]
-
-
-//! [40]
-QTextEdit {
-    background-image: url("leaves.png");
-    background-attachment: fixed;
-}
-//! [40]
-
-
-//! [41]
-QFrame {
-    background-image: url(:/images/header.png);
-    background-position: top left;
-    background-origin: content;
-    background-clip: padding;
-}
-//! [41]
-
-
-//! [42]
-QFrame {
-    background-image: url(:/images/header.png);
-    background-position: top left;
-    background-origin: content;
-}
-//! [42]
-
-
-//! [43]
-QLineEdit { border: 1px solid white }
-//! [43]
-
-
-//! [44]
-QLineEdit {
-    border-width: 1px;
-    border-style: solid;
-    border-color: white;
-}
-//! [44]
-
-
-//! [45]
-QLineEdit {
-    border-width: 1px;
-    border-style: solid;
-    border-radius: 4px;
-}
-//! [45]
-
-
-//! [46]
-QLineEdit {
-    border-width: 1px;
-    border-style: solid;
-    border-color: blue;
-}
-//! [46]
-
-
-//! [47]
-QLineEdit {
-    border-width: 2px;
-    border-style: solid;
-    border-color: darkblue;
-}
-//! [47]
-
-
-//! [48]
-QSpinBox::down-button { bottom: 2px }
-//! [48]
-
-
-//! [49]
-* { button-layout: 2 }
-//! [49]
-
-
-//! [50]
-QPushButton { color: red }
-//! [50]
-
-
-//! [51]
-QDialogButtonBox { dialogbuttonbox-buttons-have-icons: 1; }
-//! [51]
-
-
-//! [52]
-* { etch-disabled-text: 1 }
-//! [52]
-
-
-//! [53]
-QCheckBox { font: bold italic large "Times New Roman" }
-//! [53]
-
-
-//! [54]
-QCheckBox { font-family: "New Century Schoolbook" }
-//! [54]
-
-
-//! [55]
-QTextEdit { font-size: 12px }
-//! [55]
-
-
-//! [56]
-QTextEdit { font-style: italic }
-//! [56]
-
-
-//! [57]
-* { gridline-color: gray }
-//! [57]
-
-
-//! [58]
-QSpinBox::down-button { height: 10px }
-//! [58]
-
-
-//! [59]
-/* implicitly sets the size of down-button to the size of spindown.png */
-QSpinBox::down-button { image: url(:/images/spindown.png) }
-
-QTextEdit { image: url(x1.png) url(x2.png) }
-QTextEdit { image: url(pic1.svg) }
-//! [59]
-
-
-//! [60]
-QSpinBox::down-button { left: 2px }
-//! [60]
-
-
-//! [61]
-* { lineedit-password-character: 9679 }
-//! [61]
-
-
-//! [62]
-QLineEdit { margin: 2px }
-//! [62]
-
-
-//! [63]
-QSpinBox { max-height: 24px }
-//! [63]
-
-
-//! [64]
-QComboBox { max-width: 72px }
-//! [64]
-
-
-//! [65]
-QMessageBox { messagebox-text-interaction-flags: 5 }
-//! [65]
-
-
-//! [66]
-QComboBox { min-height: 24px }
-//! [66]
-
-
-//! [67]
-QComboBox { min-width: 72px }
-//! [67]
-
-
-//! [68]
-QToolTip { opacity: 223 }
-//! [68]
-
-
-//! [69]
-QLineEdit { padding: 3px }
-//! [69]
-
-
-//! [70]
-QSpinBox::down-button { right: 2px }
-//! [70]
-
-
-//! [71]
-QTextEdit { selection-background-color: darkblue }
-//! [71]
-
-
-//! [72]
-QTextEdit { selection-color: white }
-//! [72]
-
-
-//! [73]
-* { show-decoration-selected: 1 }
-//! [73]
-
-
-//! [74]
-QMenuBar { spacing: 10 }
-//! [74]
-
-
-//! [75]
-QSpinBox::up-button {
-    image: url(:/images/spinup.png);
-    subcontrol-origin: content;
-    subcontrol-position: right top;
-}
-//! [75]
-
-
-//! [76]
-QSpinBox::down-button {
-    image: url(:/images/spindown.png);
-    subcontrol-origin: padding;
-    subcontrol-position: right bottom;
-}
-//! [76]
-
-
-//! [77]
-QPushButton {
-    text-align: left;
-}
-//! [77]
-
-
-//! [78]
-QSpinBox::up-button { top: 2px }
-//! [78]
-
-
-//! [79]
-QSpinBox::up-button { width: 12px }
-//! [79]
-
-
-//! [80]
-QTextEdit { background-position: bottom center }
-//! [80]
-
-
-//! [81]
-QDialog { etch-disabled-text: 1 }
-//! [81]
-
-
-//! [82]
-QLabel { border-color: red }   /* red red red red */
-QLabel { border-color: red blue } /* red blue red blue */
-QLabel { border-color: red blue green } /* red blue green blue */
-QLabel { border-color: red blue green yellow }  /* red blue green yellow */
-//! [82]
-
-
-//! [83]
-QLabel { border-width: 1px }                    /* 1px 1px 1px 1px */
-QLabel { border-width: 1px 2px }                /* 1px 2px 1px 2px */
-QLabel { border-width: 1px 2px 3px }            /* 1px 2px 3px 2px */
-QLabel { border-width: 1px 2px 3px 4px }        /* 1px 2px 3px 4px */
-//! [83]
-
-
-//! [84]
-QLabel { border-color: red }                    /* opaque red */
-QLabel { border-color: #FF0000 }                /* opaque red */
-QLabel { border-color: rgba(255, 0, 0, 75%) }   /* 75% opaque red */
-QLabel { border-color: rgb(255, 0, 0) }         /* opaque red */
-QLabel { border-color: rgb(100%, 0%, 0%) }      /* opaque red */
-QLabel { border-color: hsv(60, 255, 255) }      /* opaque yellow */
-QLabel { border-color: hsva(240, 255, 255, 75%) }      /* 75% blue */
-//! [84]
-
-
-//! [85]
-/* linear gradient from white to green */
-QTextEdit {
-    background: qlineargradient(x1:0, y1:0, x2:1, y2:1,
-                stop:0 white, stop: 0.4 gray, stop:1 green)
-}
-
-/* linear gradient from white to green */
-QTextEdit {
-    background: qlineargradient(x1:0, y1:0, x2:1, y2:1,
-                stop:0 white, stop: 0.4 rgba(10, 20, 30, 40), stop:1 rgb(0, 200, 230, 200))
-}
-
-
-/* conical gradient from white to green */
-QTextEdit {
-    background: qconicalgradient(cx:0.5, cy:0.5, angle:30,
-                stop:0 white, stop:1 #00FF00)
-}
-
-/* radial gradient from white to green */
-QTextEdit {
-    background: qradialgradient(cx:0, cy:0, radius: 1, 
-                fx:0.5, fy:0.5, stop:0 white, stop:1 green)
-} 
-//! [85]
-
-
-//! [86]
-* {
-    file-icon: url(file.png),
-               url(file_selected.png) selected;
-  }
-
-QMessageBox {
-    dialogbuttonbox-buttons-have-icons: true;
-    dialog-ok-icon: url(ok.svg);
-    dialog-cancel-icon: url(cancel.png), url(grayed_cancel.png) disabled;
-}
-//! [86]
-
-
-//! [87]
-QPushButton { color: palette(dark); }
-//! [87]
-
-
-//! [88]
-qApp->setStyleSheet("QLineEdit { background-color: yellow }");
-//! [88]
-
-
-//! [89]
-myDialog->setStyleSheet("QLineEdit { background-color: yellow }");
-//! [89]
-
-
-//! [90]
-myDialog->setStyleSheet("QLineEdit#nameEdit { background-color: yellow }");
-//! [90]
-
-
-//! [91]
-nameEdit->setStyleSheet("background-color: yellow");
-//! [91]
-
-
-//! [92]
-nameEdit->setStyleSheet("color: blue; background-color: yellow");
-//! [92]
-
-
-//! [93]
-nameEdit->setStyleSheet("color: blue;"
-                        "background-color: yellow;"
-                        "selection-color: yellow;"
-                        "selection-background-color: blue;");
-//! [93]
-
-
-//! [94]
-*[mandatoryField="true"] { background-color: yellow }
-//! [94]
-
-
-//! [95]
-QLineEdit *nameEdit = new QLineEdit(this);
-nameEdit->setProperty("mandatoryField", true);
-
-QLineEdit *emailEdit = new QLineEdit(this);
-emailEdit->setProperty("mandatoryField", true);
-
-QSpinBox *ageSpinBox = new QSpinBox(this);
-ageSpinBox->setProperty("mandatoryField", true);
-//! [95]
-
-
-//! [96]
-QPushButton#evilButton { background-color: red }
-//! [96]
-
-
-//! [97]
-QPushButton#evilButton {
-    background-color: red;
-    border-style: outset;
-    border-width: 2px;
-    border-color: beige;
-}
-//! [97]
-
-
-//! [98]
-QPushButton#evilButton {
-    background-color: red;
-    border-style: outset;
-    border-width: 2px;
-    border-radius: 10px;
-    border-color: beige;
-    font: bold 14px;
-    min-width: 10em;
-    padding: 6px;
-}
-//! [98]
-
-
-//! [99]
-QPushButton#evilButton {
-    background-color: red;
-    border-style: outset;
-    border-width: 2px;
-    border-radius: 10px;
-    border-color: beige;
-    font: bold 14px;
-    min-width: 10em;
-    padding: 6px;
-}
-QPushButton#evilButton:pressed {
-    background-color: rgb(224, 0, 0);
-    border-style: inset;
-}
-//! [99]
-
-
-//! [100]
-QPushButton#evilButton::menu-indicator {
-    image: url(myindicator.png);
-}
-//! [100]
-
-
-//! [101]
-QPushButton::menu-indicator {
-    image: url(myindicator.png);
-    subcontrol-position: right center;
-    subcontrol-origin: padding;
-    left: -2px;
-}
-//! [101]
-
-
-//! [102]
-QLineEdit { color: red }
-//! [102]
-
-
-//! [103]
-QLineEdit { color: red }
-QLineEdit[readOnly="true"] { color: gray }
-//! [103]
-
-
-//! [104]
-QLineEdit { color: red }
-QLineEdit[readOnly="true"] { color: gray }
-#registrationDialog QLineEdit { color: brown }
-//! [104]
-
-
-//! [105]
-QLineEdit { color: red }
-QLineEdit[readOnly="true"] { color: gray }
-QDialog QLineEdit { color: brown }
-//! [105]
-
-
-//! [106]
-QTextEdit, QListView {
-    background-color: white;
-    background-image: url(draft.png);
-    background-attachment: scroll;
-}
-//! [106]
-
-
-//! [107]
-QTextEdit, QListView {
-    background-color: white;
-    background-image: url(draft.png);
-    background-attachment: fixed;
-}
-//! [107]
-
-
-//! [108]
-QCheckBox {
-    spacing: 5px;
-}
-
-QCheckBox::indicator {
-    width: 13px;
-    height: 13px;
-}
-
-QCheckBox::indicator:unchecked {
-    image: url(:/images/checkbox_unchecked.png);
-}
-
-QCheckBox::indicator:unchecked:hover {
-    image: url(:/images/checkbox_unchecked_hover.png);
-}
-
-QCheckBox::indicator:unchecked:pressed {
-    image: url(:/images/checkbox_unchecked_pressed.png);
-}
-
-QCheckBox::indicator:checked {
-    image: url(:/images/checkbox_checked.png);
-}
-
-QCheckBox::indicator:checked:hover {
-    image: url(:/images/checkbox_checked_hover.png);
-}
-
-QCheckBox::indicator:checked:pressed {
-    image: url(:/images/checkbox_checked_pressed.png);
-}
-
-QCheckBox::indicator:indeterminate:hover {
-    image: url(:/images/checkbox_indeterminate_hover.png);
-}
-
-QCheckBox::indicator:indeterminate:pressed {
-    image: url(:/images/checkbox_indeterminate_pressed.png);
-}
-//! [108]
-
-
-//! [109]
-QComboBox {
-    border: 1px solid gray;
-    border-radius: 3px;
-    padding: 1px 18px 1px 3px;
-    min-width: 6em;
-}
-
-QComboBox:editable {
-    background: white;
-}
-
-QComboBox:!editable, QComboBox::drop-down:editable {
-     background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
-                                 stop: 0 #E1E1E1, stop: 0.4 #DDDDDD,
-                                 stop: 0.5 #D8D8D8, stop: 1.0 #D3D3D3);
-}
-
-/* QComboBox gets the "on" state when the popup is open */
-QComboBox:!editable:on, QComboBox::drop-down:editable:on {
-    background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
-                                stop: 0 #D3D3D3, stop: 0.4 #D8D8D8,
-                                stop: 0.5 #DDDDDD, stop: 1.0 #E1E1E1);
-}
-
-QComboBox:on { /* shift the text when the popup opens */
-    padding-top: 3px;
-    padding-left: 4px;
-}
-
-QComboBox::drop-down {
-    subcontrol-origin: padding;
-    subcontrol-position: top right;
-    width: 15px;
-
-    border-left-width: 1px;
-    border-left-color: darkgray;
-    border-left-style: solid; /* just a single line */
-    border-top-right-radius: 3px; /* same radius as the QComboBox */
-    border-bottom-right-radius: 3px;
-}
-
-QComboBox::down-arrow {
-    image: url(/usr/share/icons/crystalsvg/16x16/actions/1downarrow.png);
-}
-
-QComboBox::down-arrow:on { /* shift the arrow when popup is open */
-    top: 1px;
-    left: 1px;
-} 
-//! [109]
-
-
-//! [110]
-QComboBox QAbstractItemView {
-    border: 2px solid darkgray;
-    selection-background-color: lightgray;
-}
-//! [110]
-
-
-//! [111]
-QDockWidget {
-    border: 1px solid lightgray;
-    titlebar-close-icon: url(close.png);
-    titlebar-normal-icon: url(undock.png);
-}
-
-QDockWidget::title {
-    text-align: left; /* align the text to the left */
-    background: lightgray;
-    padding-left: 5px;
-}
-
-QDockWidget::close-button, QDockWidget::float-button {
-    border: 1px solid transparent;
-    background: darkgray;
-    padding: 0px;
-}
-
-QDockWidget::close-button:hover, QDockWidget::float-button:hover {
-    background: gray;
-}
-
-QDockWidget::close-button:pressed, QDockWidget::float-button:pressed {
-    padding: 1px -1px -1px 1px;
-}
-//! [111]
-
-
-//! [112]
-QDockWidget {
-    border: 1px solid lightgray;
-    titlebar-close-icon: url(close.png);
-    titlebar-normal-icon: url(float.png);
-}
-
-QDockWidget::title {
-    text-align: left;
-    background: lightgray;
-    padding-left: 35px;
-}
-
-QDockWidget::close-button, QDockWidget::float-button {
-    background: darkgray;
-    padding: 0px;
-    icon-size: 14px; /* maximum icon size */
-}
-
-QDockWidget::close-button:hover, QDockWidget::float-button:hover {
-    background: gray;
-}
-
-QDockWidget::close-button:pressed, QDockWidget::float-button:pressed {
-    padding: 1px -1px -1px 1px;
-}
-
-QDockWidget::close-button {
-    subcontrol-position: top left;
-    subcontrol-origin: margin;
-    position: absolute;
-    top: 0px; left: 0px; bottom: 0px;
-    width: 14px;
-}
-
-QDockWidget::float-button {
-    subcontrol-position: top left;
-    subcontrol-origin: margin;
-    position: absolute;
-    top: 0px; left: 16px; bottom: 0px;
-    width: 14px;
-}
-//! [112]
-
-
-//! [113]
-QFrame, QLabel, QToolTip {
-    border: 2px solid green;
-    border-radius: 4px;
-    padding: 2px;
-    background-image: url(images/welcome.png);
-}
-//! [113]
-
-
-//! [114]
-QGroupBox {
-    background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
-                                      stop: 0 #E0E0E0, stop: 1 #FFFFFF);
-    border: 2px solid gray;
-    border-radius: 5px;
-    margin-top: 1ex; /* leave space at the top for the title */
-}
-
-QGroupBox::title {
-    subcontrol-origin: margin;
-    subcontrol-position: top center; /* position at the top center */
-    padding: 0 3px;
-    background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
-                                      stop: 0 #FFOECE, stop: 1 #FFFFFF);
-}
-//! [114]
-
-
-//! [115]
-QGroupBox::indicator {
-    width: 13px;
-    height: 13px;
-}
-
-QGroupBox::indicator:unchecked {
-    image: url(:/images/checkbox_unchecked.png);
-}
-
-/* proceed with styling just like QCheckBox */
-//! [115]
-
-
-//! [116]
-QHeaderView::section {
-    background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, 
-                                      stop:0 #616161, stop: 0.5 #505050, 
-                                      stop: 0.6 #434343, stop:1 #656565);
-    color: white;
-    padding-left: 4px;
-    border: 1px solid #6c6c6c;
-}
-
-/* style the sort indicator */
-QHeaderView::down-arrow {
-    image: url(down_arrow.png);
-}
-
-QHeaderView::up-arrow {
-    image: url(up_arrow.png);
-}
-//! [116]
-
-
-//! [117]
-QLineEdit {
-    border: 2px solid gray;
-    border-radius: 10px;
-    padding: 0 8px;
-    background: yellow;
-    selection-background-color: darkgray;
-}
-//! [117]
-
-
-//! [118]
-QLineEdit[echoMode="2"] {
-    lineedit-password-character: 9679;
-}
-//! [118]
-
-
-//! [119]
-QLineEdit:read-only {
-    background: lightblue;
-//! [119]
-
-
-//! [120]
-QListView {
-    alternate-background-color: yellow;
-}
-//! [120]
-
-
-//! [121]
-QListView {
-    show-decoration-selected: 1; /* make the selection span the entire width of the view */
-}
-
-QListView::item:alternate {
-    background: #EEEEEE;
-}
-
-QListView::item:selected {
-    border: 1px solid #6a6ea9;
-}
-
-QListView::item:selected:!active {
-    background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, 
-                                stop: 0 #ABAFE5, stop: 1 #8588B2);
-}
-
-QListView::item:selected:active {
-    background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, 
-                                stop: 0 #6a6ea9, stop: 1 #888dd9);
-}
-
-QListView::item:hover {
-    background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, 
-                                stop: 0 #FAFBFE, stop: 1 #DCDEF1);
-}
-//! [121]
-
-
-//! [122]
-QMainWindow::separator {
-    background: yellow;
-    width: 10px; /* when vertical */
-    height: 10px; /* when horizontal */
-}
-
-QMainWindow::separator:hover {
-    background: red;
-}
-//! [122]
-
-
-//! [123]
-QMenu {
-    background-color: #ABABAB; /* sets background of the menu */
-    border: 1px solid black; 
-}
-
-QMenu::item {
-    /* sets background of menu item. set this to something non-transparent 
-        if you want menu color and menu item color to be different */
-    background-color: transparent; 
-}
-
-QMenu::item:selected { /* when user selects item using mouse or keyboard */
-    background-color: #654321;
-}
-//! [123]
-
-
-//! [124]
-QMenu {
-    background-color: white;
-    margin: 2px; /* some spacing around the menu */
-}
-
-QMenu::item {
-    padding: 2px 25px 2px 20px;
-    border: 1px solid transparent; /* reserve space for selection border */
-}
-
-QMenu::item:selected {
-    border-color: darkblue;
-    background: rgba(100, 100, 100, 150);
-}
-
-QMenu::icon:checked { /* appearance of a 'checked' icon */
-    background: gray;
-    border: 1px inset gray;
-    position: absolute;
-    top: 1px; 
-    right: 1px; 
-    bottom: 1px; 
-    left: 1px;
-}
-
-QMenu::separator {
-    height: 2px;
-    background: lightblue;
-    margin-left: 10px; 
-    margin-right: 5px;
-}
-
-QMenu::indicator {
-    width: 13px;
-    height: 13px;
-}
-
-/* non-exclusive indicator = check box style indicator (see QActionGroup::setExclusive) */
-QMenu::indicator:non-exclusive:unchecked {
-    image: url(:/images/checkbox_unchecked.png);
-}
-
-QMenu::indicator:non-exclusive:unchecked:selected {
-    image: url(:/images/checkbox_unchecked_hover.png);
-}
-
-QMenu::indicator:non-exclusive:checked {
-    image: url(:/images/checkbox_checked.png);
-}
-
-QMenu::indicator:non-exclusive:checked:selected {
-    image: url(:/images/checkbox_checked_hover.png);
-}
-
-/* exclusive indicator = radio button style indicator (see QActionGroup::setExclusive) */
-QMenu::indicator:exclusive:unchecked {
-    image: url(:/images/radiobutton_unchecked.png);
-}
-
-QMenu::indicator:exclusive:unchecked:selected {
-    image: url(:/images/radiobutton_unchecked_hover.png);
-}
-
-QMenu::indicator:exclusive:checked {
-    image: url(:/images/radiobutton_checked.png);
-}
-
-QMenu::indicator:exclusive:checked:selected {
-    image: url(:/images/radiobutton_checked_hover.png);
-}
-
-//! [124]
-
-
-//! [125]
-QMenuBar {
-    background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1,
-                                      stop:0 lightgray, stop:1 darkgray);
-}
-
-QMenuBar::item {
-    spacing: 3px; /* spacing between menu bar items */
-    padding: 1px 4px;
-    background: transparent;
-    border-radius: 4px;
-}
-
-QMenuBar::item:selected { /* when selected using mouse or keyboard */
-    background: #a8a8a8;
-}
-
-QMenuBar::item:pressed {
-    background: #888888;
-}
-//! [125]
-
-
-//! [126]
-QProgressBar {
-    border: 2px solid grey;
-    border-radius: 5px;
-}
-
-QProgressBar::chunk {
-    background-color: #05B8CC;
-    width: 20px;
-}
-//! [126]
-
-
-//! [127]
-QProgressBar {
-    border: 2px solid grey;
-    border-radius: 5px;
-    text-align: center;
-}
-//! [127]
-
-
-//! [128]
-QProgressBar::chunk {
-    background-color: #CD96CD;
-    width: 10px;
-    margin: 0.5px;
-}
-//! [128]
-
-
-//! [129]
-QPushButton {
-    border: 2px solid #8f8f91;
-    border-radius: 6px;
-    background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, 
-                                      stop: 0 #f6f7fa, stop: 1 #dadbde);
-    min-width: 80px;
-}
-
-QPushButton:pressed {
-    background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, 
-                                      stop: 0 #dadbde, stop: 1 #f6f7fa);
-}
-
-QPushButton:flat {
-    border: none; /* no border for a flat push button */
-}
-
-QPushButton:default {
-    border-color: navy; /* make the default button prominent */
-}
-//! [129]
-
-
-//! [130]
-QPushButton:open { /* when the button has its menu open */
-    background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, 
-                                      stop: 0 #dadbde, stop: 1 #f6f7fa);
-}
-
-QPushButton::menu-indicator { 
-    image: url(menu_indicator.png);
-    subcontrol-origin: padding; 
-    subcontrol-position: bottom right;
-}
-
-QPushButton::menu-indicator:pressed, QPushButton::menu-indicator:open {
-    position: relative; 
-    top: 2px; left: 2px; /* shift the arrow by 2 px */
-}
-//! [130]
-
-
-//! [131]
-QRadioButton::indicator {
-    width: 13px;
-    height: 13px;
-}
-
-QRadioButton::indicator::unchecked {
-    image: url(:/images/radiobutton_unchecked.png);
-}
-
-QRadioButton::indicator:unchecked:hover {
-    image: url(:/images/radiobutton_unchecked_hover.png);
-}
-
-QRadioButton::indicator:unchecked:pressed {
-    image: url(:/images/radiobutton_unchecked_pressed.png);
-}
-
-QRadioButton::indicator::checked {
-    image: url(:/images/radiobutton_checked.png);
-}
-
-QRadioButton::indicator:checked:hover {
-    image: url(:/images/radiobutton_checked_hover.png);
-}
-
-QRadioButton::indicator:checked:pressed {
-    image: url(:/images/radiobutton_checked_pressed.png);
-}
-//! [131]
-
-
-//! [132]
-QScrollBar:horizontal {
-    border: 2px solid grey;
-    background: #32CC99;
-    height: 15px;
-    margin: 0px 20px 0 20px;
-}
-//! [132]
-
-
-//! [133]
-QScrollBar::handle:horizontal {
-    background: white;
-    min-width: 20px;
-}
-//! [133]
-
-
-//! [134]
-QScrollBar::add-line:horizontal {
-    border: 2px solid grey;
-    background: #32CC99;
-    width: 20px;
-    subcontrol-position: right;
-    subcontrol-origin: margin;
-}
-
-QScrollBar::sub-line:horizontal {
-    border: 2px solid grey;
-    background: #32CC99;
-    width: 20px;
-    subcontrol-position: left;
-    subcontrol-origin: margin;
-}
-//! [134]
-
-
-//! [135]
-QScrollBar:left-arrow:horizontal, QScrollBar::right-arrow:horizontal {
-    border: 2px solid grey;
-    width: 3px;
-    height: 3px;
-    background: white;
-}
-
-QScrollBar::add-page:horizontal, QScrollBar::sub-page:horizontal {
-    background: none;
-}
-//! [135]
-
-
-//! [136]
-QScrollBar:horizontal {
-    border: 2px solid green;
-    background: cyan;
-    height: 15px;
-    margin: 0px 40px 0 0px;
-}
-
-QScrollBar::handle:horizontal {
-    background: gray;
-    min-width: 20px;
-}
-
-QScrollBar::add-line:horizontal {
-    background: blue;
-    width: 16px;
-    subcontrol-position: right;
-    subcontrol-origin: margin;
-    border: 2px solid black;
-}
-
-QScrollBar::sub-line:horizontal {
-    background: magenta;
-    width: 16px;
-    subcontrol-position: top right;
-    subcontrol-origin: margin;
-    border: 2px solid black;
-    position: absolute;
-    right: 20px;
-}
-
-QScrollBar:left-arrow:horizontal, QScrollBar::right-arrow:horizontal {
-    width: 3px;
-    height: 3px;
-    background: pink;
-}
-
-QScrollBar::add-page:horizontal, QScrollBar::sub-page:horizontal {
-    background: none;
-}
-
-//! [136]
-
-
-//! [137]
- QScrollBar:vertical {
-     border: 2px solid grey;
-     background: #32CC99;
-     width: 15px;
-     margin: 22px 0 22px 0;
- }
- QScrollBar::handle:vertical {
-     background: white;
-     min-height: 20px;
- }
- QScrollBar::add-line:vertical {
-     border: 2px solid grey;
-     background: #32CC99;
-     height: 20px;
-     subcontrol-position: bottom;
-     subcontrol-origin: margin;
- }
-
- QScrollBar::sub-line:vertical {
-     border: 2px solid grey;
-     background: #32CC99;
-     height: 20px;
-     subcontrol-position: top;
-     subcontrol-origin: margin;
- }
- QScrollBar::up-arrow:vertical, QScrollBar::down-arrow:vertical {
-     border: 2px solid grey;
-     width: 3px;
-     height: 3px;
-     background: white;
- }
-
- QScrollBar::add-page:vertical, QScrollBar::sub-page:vertical {
-     background: none;
- }
-//! [137]
-
-
-//! [138]
-QSizeGrip {
-    image: url(:/images/sizegrip.png);
-    width: 16px;
-    height: 16px;
-}
-//! [138]
-
-
-//! [139]
-QSlider::groove:horizontal {
-    border: 1px solid #999999;
-    height: 8px; /* the groove expands to the size of the slider by default. by giving it a height, it has a fixed size */
-    background: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #B1B1B1, stop:1 #c4c4c4);
-    margin: 2px 0;
-}
-
-QSlider::handle:horizontal {
-    background: qlineargradient(x1:0, y1:0, x2:1, y2:1, stop:0 #b4b4b4, stop:1 #8f8f8f);
-    border: 1px solid #5c5c5c;
-    width: 18px;
-    margin: -2px 0; /* handle is placed by default on the contents rect of the groove. Expand outside the groove */
-    border-radius: 3px;
-}
-//! [139]
-
-
-//! [140]
-QSlider::groove:vertical {
-    background: red;
-    position: absolute; /* absolutely position 4px from the left and right of the widget. setting margins on the widget should work too... */
-    left: 4px; right: 4px;
-}
-
-QSlider::handle:vertical {
-    height: 10px;
-    background: green;
-    margin: 0 -4px; /* expand outside the groove */
-}
-
-QSlider::add-page:vertical {
-    background: white;
-}
-
-QSlider::sub-page:vertical {
-    background: pink;
-}
-//! [140]
-
-
-//! [141]
-QSpinBox {
-    padding-right: 15px; /* make room for the arrows */
-    border-image: url(:/images/frame.png) 4;
-    border-width: 3;
-}
-
-QSpinBox::up-button {
-    subcontrol-origin: border;
-    subcontrol-position: top right; /* position at the top right corner */
-
-    width: 16px; /* 16 + 2*1px border-width = 15px padding + 3px parent border */
-    border-image: url(:/images/spinup.png) 1;
-    border-width: 1px;
-}
-
-QSpinBox::up-button:hover {
-    border-image: url(:/images/spinup_hover.png) 1;
-}
-
-QSpinBox::up-button:pressed {
-    border-image: url(:/images/spinup_pressed.png) 1;
-}
-
-QSpinBox::up-arrow {
-    image: url(:/images/up_arrow.png);
-    width: 7px;
-    height: 7px;
-}
-
-QSpinBox::up-arrow:disabled, QSpinBox::up-arrow:off { /* off state when value is max */
-   image: url(:/images/up_arrow_disabled.png);
-}
-
-QSpinBox::down-button {
-    subcontrol-origin: border;
-    subcontrol-position: bottom right; /* position at bottom right corner */
-
-    width: 16px;
-    border-image: url(:/images/spindown.png) 1;
-    border-width: 1px;
-    border-top-width: 0;
-}
-
-QSpinBox::down-button:hover {
-    border-image: url(:/images/spindown_hover.png) 1;
-}
-
-QSpinBox::down-button:pressed {
-    border-image: url(:/images/spindown_pressed.png) 1;
-}
-
-QSpinBox::down-arrow {
-    image: url(:/images/down_arrow.png);
-    width: 7px;
-    height: 7px;
-}
-
-QSpinBox::down-arrow:disabled,
-QSpinBox::down-arrow:off { /* off state when value in min */
-   image: url(:/images/down_arrow_disabled.png);
-}
-
-//! [141]
-
-
-//! [142]
-QSplitter::handle {
-    image: url(images/splitter.png);
-}
-
-QSplitter::handle:horizontal {
-    width: 2px;
-}
-
-QSplitter::handle:vertical {
-    height: 2px;
-}
-//! [142]
-
-
-//! [143]
-QStatusBar {
-    background: brown;
-}
-
-QStatusBar::item {
-    border: 1px solid red;
-    border-radius: 3px;
-}
-//! [143]
-
-
-//! [144]
-QStatusBar QLabel {
-    border: 3px solid white;
-}
-//! [144]
-
-
-//! [145]
-QTabWidget::pane { /* The tab widget frame */
-    border-top: 2px solid #C2C7CB;
-}
-
-QTabWidget::tab-bar {
-    left: 5px; /* move to the right by 5px */
-}
-
-/* Style the tab using the tab sub-control. Note that 
-    it reads QTabBar _not_ QTabWidget */
-QTabBar::tab {
-    background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, 
-                                stop: 0 #E1E1E1, stop: 0.4 #DDDDDD, 
-                                stop: 0.5 #D8D8D8, stop: 1.0 #D3D3D3);
-    border: 2px solid #C4C4C3;
-    border-bottom-color: #C2C7CB; /* same as the pane color */
-    border-top-left-radius: 4px;
-    border-top-right-radius: 4px;
-    min-width: 8ex;
-    padding: 2px;
-}
-
-QTabBar::tab:selected, QTabBar::tab:hover {
-    background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, 
-                                stop: 0 #fafafa, stop: 0.4 #f4f4f4, 
-                                stop: 0.5 #e7e7e7, stop: 1.0 #fafafa);
-}
-
-QTabBar::tab:selected {
-    border-color: #9B9B9B;
-    border-bottom-color: #C2C7CB; /* same as pane color */
-}
-
-QTabBar::tab:!selected {
-    margin-top: 2px; /* make non-selected tabs look smaller */
-}
-//! [145]
-
-
-//! [146]
-QTabWidget::pane { /* The tab widget frame */
-    border-top: 2px solid #C2C7CB;
-}
-
-QTabWidget::tab-bar {
-    left: 5px; /* move to the right by 5px */
-}
-
-/* Style the tab using the tab sub-control. Note that 
-    it reads QTabBar _not_ QTabWidget */
-QTabBar::tab {
-    background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, 
-                                stop: 0 #E1E1E1, stop: 0.4 #DDDDDD, 
-                                stop: 0.5 #D8D8D8, stop: 1.0 #D3D3D3);
-    border: 2px solid #C4C4C3;
-    border-bottom-color: #C2C7CB; /* same as the pane color */
-    border-top-left-radius: 4px;
-    border-top-right-radius: 4px;
-    min-width: 8ex;
-    padding: 2px;
-}
-
-QTabBar::tab:selected, QTabBar::tab:hover {
-    background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, 
-                                stop: 0 #fafafa, stop: 0.4 #f4f4f4, 
-                                stop: 0.5 #e7e7e7, stop: 1.0 #fafafa);
-}
-
-QTabBar::tab:selected {
-    border-color: #9B9B9B;
-    border-bottom-color: #C2C7CB; /* same as pane color */
-}
-
-QTabBar::tab:!selected {
-    margin-top: 2px; /* make non-selected tabs look smaller */
-}
-
-/* make use of negative margins for overlapping tabs */
-QTabBar::tab:selected {
-    /* expand/overlap to the left and right by 4px */
-    margin-left: -4px;
-    margin-right: -4px;
-}
-
-QTabBar::tab:first:selected {
-    margin-left: 0; /* the first selected tab has nothing to overlap with on the left */
-}
-
-QTabBar::tab:last:selected {
-    margin-right: 0; /* the last selected tab has nothing to overlap with on the right */
-}
-
-QTabBar::tab:only-one {
-    margin: 0; /* if there is only one tab, we don't want overlapping margins */
-}
-//! [146]
-
-
-//! [147]
-QTabWidget::pane { /* The tab widget frame */
-    border-top: 2px solid #C2C7CB;
-    position: absolute; 
-    top: -0.5em; 
-}
-
-QTabWidget::tab-bar { 
-    alignment: center; 
-}
-
-/* Style the tab using the tab sub-control. Note that 
-    it reads QTabBar _not_ QTabWidget */
-QTabBar::tab {
-    background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, 
-                                stop: 0 #E1E1E1, stop: 0.4 #DDDDDD, 
-                                stop: 0.5 #D8D8D8, stop: 1.0 #D3D3D3);
-    border: 2px solid #C4C4C3;
-    border-bottom-color: #C2C7CB; /* same as the pane color */
-    border-top-left-radius: 4px;
-    border-top-right-radius: 4px;
-    min-width: 8ex;
-    padding: 2px;
-}
-
-QTabBar::tab:selected, QTabBar::tab:hover {
-    background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, 
-                                stop: 0 #fafafa, stop: 0.4 #f4f4f4, 
-                                stop: 0.5 #e7e7e7, stop: 1.0 #fafafa);
-}
-
-QTabBar::tab:selected {
-    border-color: #9B9B9B;
-    border-bottom-color: #C2C7CB; /* same as pane color */
-}
-//! [147]
-
-
-//! [148]
-QTabBar::tear {
-    image: url(tear_indicator.png);
-}
-
-QTabBar::scroller { /* the width of the scroll buttons */
-    width: 20px;
-}
-
-QTabBar QToolButton { /* the scroll buttons are tool buttons */
-    border-image: url(scrollbutton.png) 2;
-    border-width: 2px;
-}
-
-QTabBar QToolButton::right-arrow { /* the arrow mark in the tool buttons */
-    image: url(rightarrow.png);
-}
-
-QTabBar QToolButton::left-arrow {
-    image: url(leftarrow.png);
-}
-//! [148]
-
-
-//! [149]
-QTableView {
-    selection-background-color: qlineargradient(x1: 0, y1: 0, x2: 0.5, y2: 0.5,
-                                stop: 0 #FF92BB, stop: 1 white);
-}
-//! [149]
-
-
-//! [150]
-QTableView QTableCornerButton::section {
-    background: red;
-    border: 2px outset red;
-}
-//! [150]
-
-
-//! [151]
-QToolBar {
-    background: red;
-    spacing: 3px; /* spacing between items in the tool bar */
-}
-
-QToolBar::handle {
-    image: url(handle.png);
-}
-//! [151]
-
-
-//! [152]
-QToolBox::tab {
-    background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
-                                stop: 0 #E1E1E1, stop: 0.4 #DDDDDD,
-                                stop: 0.5 #D8D8D8, stop: 1.0 #D3D3D3);
-    border-radius: 5px;
-    color: darkgray;
-}
-
-QToolBox::tab:selected { /* italicize selected tabs */
-    font: italic;
-    color: white;
-}
-//! [152]
-
-
-//! [153]
-QToolButton { /* all types of tool button */
-    border: 2px solid #8f8f91;
-    border-radius: 6px;
-    background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
-                                      stop: 0 #f6f7fa, stop: 1 #dadbde);
-}
-
-QToolButton[popupMode="1"] { /* only for MenuButtonPopup */
-    padding-right: 20px; /* make way for the popup button */
-}
-
-QToolButton:pressed {
-    background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
-                                      stop: 0 #dadbde, stop: 1 #f6f7fa);
-}
-
-/* the subcontrols below are used only in the MenuButtonPopup mode */
-QToolButton::menu-button {
-    border: 2px solid gray;
-    border-top-right-radius: 6px;
-    border-bottom-right-radius: 6px;
-    /* 16px width + 4px for border = 20px allocated above */
-    width: 16px;
-}
-
-QToolButton::menu-arrow {
-    image: url(downarrow.png);
-}
-
-QToolButton::menu-arrow:open {
-    top: 1px; left: 1px; /* shift it a bit */
-}
-//! [153]
-
-
-//! [154]
-QToolTip {
-    border: 2px solid darkkhaki;
-    padding: 5px;
-    border-radius: 3px;
-    opacity: 200;
-}
-//! [154]
-
-
-//! [155]
-QTreeView {
-    alternate-background-color: yellow;
-}
-//! [155]
-
-
-//! [156]
-QTreeView {
-    show-decoration-selected: 1;
-}
-
-QTreeView::item {
-     border: 1px solid #d9d9d9;
-    border-top-color: transparent;
-    border-bottom-color: transparent;
-}
-
-QTreeView::item:hover {
-    background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #e7effd, stop: 1 #cbdaf1);
-    border: 1px solid #bfcde4;
-}
-
-QTreeView::item:selected {
-    border: 1px solid #567dbc;
-}
-
-QTreeView::item:selected:active{
-    background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #6ea1f1, stop: 1 #567dbc);
-}
-
-QTreeView::item:selected:!active {
-    background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #6b9be8, stop: 1 #577fbf);
-}
-//! [156]
-
-
-//! [157]
-QTreeView::branch {
-        background: palette(base);
-}
-
-QTreeView::branch:has-siblings:!adjoins-item {
-        background: cyan;
-}
-
-QTreeView::branch:has-siblings:adjoins-item {
-        background: red;
-}
-
-QTreeView::branch:!has-children:!has-siblings:adjoins-item {
-        background: blue;
-}
-
-QTreeView::branch:closed:has-children:has-siblings {
-        background: pink;
-}
-
-QTreeView::branch:has-children:!has-siblings:closed {
-        background: gray;
-}
-
-QTreeView::branch:open:has-children:has-siblings {
-        background: magenta;
-}
-
-QTreeView::branch:open:has-children:!has-siblings {
-        background: green;
-}
-
-//! [157]
-
-
-//! [158]
-QTreeView::branch:has-siblings:!adjoins-item {
-    border-image: url(vline.png) 0;
-}
-
-QTreeView::branch:has-siblings:adjoins-item {
-    border-image: url(branch-more.png) 0;
-}
-
-QTreeView::branch:!has-children:!has-siblings:adjoins-item {
-    border-image: url(branch-end.png) 0;
-}
-
-QTreeView::branch:has-children:!has-siblings:closed,
-QTreeView::branch:closed:has-children:has-siblings {
-        border-image: none;
-        image: url(branch-closed.png);
-}
-
-QTreeView::branch:open:has-children:!has-siblings,
-QTreeView::branch:open:has-children:has-siblings  {
-        border-image: none;
-        image: url(branch-open.png);
-}
-//! [158]
diff --git a/doc/codesnippets/doc/src/snippets/code/doc_src_uic.qdoc b/doc/codesnippets/doc/src/snippets/code/doc_src_uic.qdoc
deleted file mode 100644
index 310e839..0000000
--- a/doc/codesnippets/doc/src/snippets/code/doc_src_uic.qdoc
+++ /dev/null
@@ -1,15 +0,0 @@
-//! [0]
-uic [options] <uifile>
-//! [0]
-
-
-//! [1]
-ui_%.h: %.ui
-        uic $< -o $@
-//! [1]
-
-
-//! [2]
-ui_foo.h: foo.ui
-        uic $< -o $@
-//! [2]
diff --git a/doc/codesnippets/doc/src/snippets/code/doc_src_unicode.qdoc b/doc/codesnippets/doc/src/snippets/code/doc_src_unicode.qdoc
deleted file mode 100644
index 30a3710..0000000
--- a/doc/codesnippets/doc/src/snippets/code/doc_src_unicode.qdoc
+++ /dev/null
@@ -1,18 +0,0 @@
-//! [0]
-label->setText("Password:");
-//! [0]
-
-
-//! [1]
-label->setText(tr("Password:"));
-//! [1]
-
-
-//! [2]
-QFile file(QString::fromLatin1("appicon.png"));
-//! [2]
-
-
-//! [3]
-QFile file(QLatin1String("appicon.png"));
-//! [3]
diff --git a/doc/codesnippets/doc/src/snippets/code/doc_src_unix-signal-handlers.qdoc b/doc/codesnippets/doc/src/snippets/code/doc_src_unix-signal-handlers.qdoc
deleted file mode 100644
index 8abcba6..0000000
--- a/doc/codesnippets/doc/src/snippets/code/doc_src_unix-signal-handlers.qdoc
+++ /dev/null
@@ -1,110 +0,0 @@
-//! [0]
-class MyDaemon : public QObject
-{
-    Q_OBJECT
-
-  public:
-    MyDaemon(QObject *parent = 0, const char *name = 0);
-    ~MyDaemon();
-
-    // Unix signal handlers.
-    static void hupSignalHandler(int unused);
-    static void termSignalHandler(int unused);
-
-  public slots:
-    // Qt signal handlers.
-    void handleSigHup();
-    void handleSigTerm();
-
-  private:
-    static int sighupFd[2];
-    static int sigtermFd[2];
-
-    QSocketNotifier *snHup;
-    QSocketNotifier *snTerm;
-};
-//! [0]
-
-
-//! [1]
-MyDaemon::MyDaemon(QObject *parent, const char *name)
-    	 : QObject(parent,name)
-{
-    if (::socketpair(AF_UNIX, SOCK_STREAM, 0, sighupFd))
-       qFatal("Couldn't create HUP socketpair");
-
-    if (::socketpair(AF_UNIX, SOCK_STREAM, 0, sigtermFd))
-       qFatal("Couldn't create TERM socketpair");
-    snHup = new QSocketNotifier(sighupFd[1], QSocketNotifier::Read, this);
-    connect(snHup, SIGNAL(activated(int)), this, SLOT(handleSigHup()));
-    snTerm = new QSocketNotifier(sigtermFd[1], QSocketNotifier::Read, this);
-    connect(snTerm, SIGNAL(activated(int)), this, SLOT(handleSigTerm()));
-
-    ...
-}
-//! [1]
-
-
-//! [2]
-static int setup_unix_signal_handlers()
-{
-    struct sigaction hup, term;
-
-    hup.sa_handler = MyDaemon::hupSignalHandler;
-    sigemptyset(&hup.sa_mask);
-    hup.sa_flags = 0;
-    hup.sa_flags |= SA_RESTART;
-
-    if (sigaction(SIGHUP, &hup, 0) > 0)
-       return 1;
-
-    term.sa_handler = MyDaemon::termSignalHandler;
-    sigemptyset(&term.sa_mask);
-    term.sa_flags |= SA_RESTART;
-
-    if (sigaction(SIGTERM, &term, 0) > 0)
-       return 2;
-
-    return 0;
-}
-//! [2]
-
-
-//! [3]
-void MyDaemon::hupSignalHandler(int)
-{
-    char a = 1;
-    ::write(sighupFd[0], &a, sizeof(a));
-}
-
-void MyDaemon::termSignalHandler(int)
-{
-    char a = 1;
-    ::write(sigtermFd[0], &a, sizeof(a));
-}
-//! [3]
-
-
-//! [4]
-void MyDaemon::handleSigTerm()
-{
-    snTerm->setEnabled(false);
-    char tmp;
-    ::read(sigtermFd[1], &tmp, sizeof(tmp));
-
-    // do Qt stuff
-
-    snTerm->setEnabled(true);
-}
-
-void MyDaemon::handleSigHup()
-{
-    snHup->setEnabled(false);
-    char tmp;
-    ::read(sighupFd[1], &tmp, sizeof(tmp));
-
-    // do Qt stuff
-
-    snHup->setEnabled(true);
-}
-//! [4]
diff --git a/doc/codesnippets/doc/src/snippets/code/src_activeqt_container_qaxbase.cpp b/doc/codesnippets/doc/src/snippets/code/src_activeqt_container_qaxbase.cpp
deleted file mode 100644
index 94b0da8..0000000
--- a/doc/codesnippets/doc/src/snippets/code/src_activeqt_container_qaxbase.cpp
+++ /dev/null
@@ -1,159 +0,0 @@
-//! [0]
-connect(buttonBack, SIGNAL(clicked()), webBrowser, SLOT(GoBack()));
-//! [0]
-
-
-//! [1]
-activeX->setProperty("text", "some text");
-int value = activeX->property("value");
-//! [1]
-
-
-//! [2]
-webBrowser->dynamicCall("GoHome()");
-//! [2]
-
-
-//! [3]
-connect(webBrowser, SIGNAL(TitleChanged(QString)),
-	this, SLOT(setCaption(QString)));
-//! [3]
-
-
-//! [4]
-dispinterface IControl
-{
-properties:
-    [id(1)] BSTR text;
-    [id(2)] IFontDisp *font;
-
-methods:
-    [id(6)] void showColumn([in] int i);
-    [id(3)] bool addColumn([in] BSTR t);
-    [id(4)] int fillList([in, out] SAFEARRAY(VARIANT) *list);
-    [id(5)] IDispatch *item([in] int i);
-};
-//! [4]
-
-
-//! [5]
-QAxObject object("<CLSID>");
-
-QString text = object.property("text").toString();
-object.setProperty("font", QFont("Times New Roman", 12));
-
-connect(this, SIGNAL(clicked(int)), &object, SLOT(showColumn(int)));
-bool ok = object.dynamicCall("addColumn(const QString&)", "Column 1").toBool();
-
-QList<QVariant> varlist;
-QList<QVariant> parameters;
-parameters << QVariant(varlist);
-int n = object.dynamicCall("fillList(QList<QVariant>&)", parameters).toInt();
-
-QAxObject *item = object.querySubItem("item(int)", 5);
-//! [5]
-
-
-//! [6]
-IUnknown *iface = 0;
-activeX->queryInterface(IID_IUnknown, (void**)&iface);
-if (iface) {
-    // use the interface
-    iface->Release();
-}
-//! [6]
-
-
-//! [7]
-ctrl->setControl("{8E27C92B-1264-101C-8A2F-040224009C02}");
-//! [7]
-
-
-//! [8]
-ctrl->setControl("MSCal.Calendar");
-//! [8]
-
-
-//! [9]
-ctrl->setControl("Calendar Control 9.0");
-//! [9]
-
-
-//! [10]
-ctrl->setControl("c:/files/file.doc");
-//! [10]
-
-
-//! [11]
-<domain/username>:<password>@server/{8E27C92B-1264-101C-8A2F-040224009C02}
-//! [11]
-
-
-//! [12]
-{8E27C92B-1264-101C-8A2F-040224009C02}:<LicenseKey>
-//! [12]
-
-
-//! [13]
-{8E27C92B-1264-101C-8A2F-040224009C02}&
-//! [13]
-
-
-//! [14]
-ctrl->setControl("DOMAIN/user:password@server/{8E27C92B-1264-101C-8A2F-040224009C02}:LicenseKey");
-//! [14]
-
-
-//! [15]
-activeX->dynamicCall("Navigate(const QString&)", "qtsoftware.com");
-//! [15]
-
-
-//! [16]
-activeX->dynamicCall("Navigate(\"qtsoftware.com\")");
-//! [16]
-
-
-//! [17]
-activeX->dynamicCall("Value", 5);
-QString text = activeX->dynamicCall("Text").toString();
-//! [17]
-
-
-//! [18]
-IWebBrowser2 *webBrowser = 0;
-activeX->queryInterface(IID_IWebBrowser2, (void **)&webBrowser);
-if (webBrowser) {
-    webBrowser->Navigate2(pvarURL);
-    webBrowser->Release();
-}
-//! [18]
-
-
-//! [19]
-QAxWidget outlook("Outlook.Application");
-QAxObject *session = outlook.querySubObject("Session");
-if (session) {
-    QAxObject *defFolder = session->querySubObject(
-			    "GetDefaultFolder(OlDefaultFolders)",
-			    "olFolderContacts");
-    //...
-}
-//! [19]
-
-
-//! [20]
-void Receiver::slot(const QString &name, int argc, void *argv)
-{
-    VARIANTARG *params = (VARIANTARG*)argv;
-    if (name.startsWith("BeforeNavigate2(")) {
-	IDispatch *pDisp = params[argc-1].pdispVal;
-	VARIANTARG URL = *params[argc-2].pvarVal;
-	VARIANTARG Flags = *params[argc-3].pvarVal;
-	VARIANTARG TargetFrameName = *params[argc-4].pvarVal;
-	VARIANTARG PostData = *params[argc-5].pvarVal;
-	VARIANTARG Headers = *params[argc-6].pvarVal;
-	bool *Cancel = params[argc-7].pboolVal;
-    }
-}
-//! [20]
diff --git a/doc/codesnippets/doc/src/snippets/code/src_activeqt_container_qaxscript.cpp b/doc/codesnippets/doc/src/snippets/code/src_activeqt_container_qaxscript.cpp
deleted file mode 100644
index 07fca1e..0000000
--- a/doc/codesnippets/doc/src/snippets/code/src_activeqt_container_qaxscript.cpp
+++ /dev/null
@@ -1,18 +0,0 @@
-//! [0]
-function setNumber(number)
-{
-    n = number;
-}
-//! [0]
-
-
-//! [1]
-QValueList args;
-args << 5;
-script->call("setNumber(const QVariant&)", args);
-//! [1]
-
-
-//! [2]
-script->call("setNumber(5)");
-//! [2]
diff --git a/doc/codesnippets/doc/src/snippets/code/src_activeqt_control_qaxbindable.cpp b/doc/codesnippets/doc/src/snippets/code/src_activeqt_control_qaxbindable.cpp
deleted file mode 100644
index c296789..0000000
--- a/doc/codesnippets/doc/src/snippets/code/src_activeqt_control_qaxbindable.cpp
+++ /dev/null
@@ -1,60 +0,0 @@
-//! [0]
-class MyActiveX : public QWidget, public QAxBindable
-{
-    Q_OBJECT
-    Q_PROPERTY(int value READ value WRITE setValue)
-
-public:
-    MyActiveX(QWidget *parent = 0);
-    ...
-
-    int value() const;
-    void setValue(int);
-};
-//! [0]
-
-
-//! [1]
-void MyActiveQt::setText(const QString &text)
-{
-    if (!requestPropertyChange("text"))
-        return;
-
-    // update property
-
-    propertyChanged("text");
-}
-//! [1]
-
-
-//! [2]
-long AxImpl::queryInterface(const QUuid &iid, void **iface)
-{
-    *iface = 0;
-    if (iid == IID_ISomeCOMInterface)
-        *iface = (ISomeCOMInterface*)this;
-    else
-        return E_NOINTERFACE;
-
-    AddRef();
-    return S_OK;
-}
-//! [2]
-
-
-//! [3]
-HRESULT AxImpl::QueryInterface(REFIID iid, void **iface)
-{
-    return controllingUnknown()->QueryInterface(iid, iface);
-}
-
-ulong AxImpl::AddRef()
-{
-    return controllingUnknown()->AddRef();
-}
-
-ulong AxImpl::Release()
-{
-    return controllingUnknown()->Release();
-}
-//! [3]
diff --git a/doc/codesnippets/doc/src/snippets/code/src_activeqt_control_qaxfactory.cpp b/doc/codesnippets/doc/src/snippets/code/src_activeqt_control_qaxfactory.cpp
deleted file mode 100644
index 6eca434..0000000
--- a/doc/codesnippets/doc/src/snippets/code/src_activeqt_control_qaxfactory.cpp
+++ /dev/null
@@ -1,155 +0,0 @@
-//! [0]
-QStringList ActiveQtFactory::featureList() const
-{
-    QStringList list;
-    list << "ActiveX1";
-    list << "ActiveX2";
-    return list;
-}
-
-QObject *ActiveQtFactory::createObject(const QString &key)
-{
-    if (key == "ActiveX1")
-        return new ActiveX1(parent);
-    if (key == "ActiveX2")
-        return new ActiveX2(parent);
-    return 0;
-}
-
-const QMetaObject *ActiveQtFactory::metaObject(const QString &key) const
-{
-    if (key == "ActiveX1")
-        return &ActiveX1::staticMetaObject;
-    if (key == "ActiveX2")
-        return &ActiveX2::staticMetaObject;
-}
-
-QUuid ActiveQtFactory::classID(const QString &key) const
-{
-    if (key == "ActiveX1")
-        return "{01234567-89AB-CDEF-0123-456789ABCDEF}";
-    ...
-    return QUuid();
-}
-
-QUuid ActiveQtFactory::interfaceID(const QString &key) const
-{
-    if (key == "ActiveX1")
-        return "{01234567-89AB-CDEF-0123-456789ABCDEF}";
-    ...
-    return QUuid();
-}
-
-QUuid ActiveQtFactory::eventsID(const QString &key) const
-{
-    if (key == "ActiveX1")
-        return "{01234567-89AB-CDEF-0123-456789ABCDEF}";
-    ...
-    return QUuid();
-}
-
-QAXFACTORY_EXPORT(
-    ActiveQtFactory,			      // factory class
-    "{01234567-89AB-CDEF-0123-456789ABCDEF}", // type library ID
-    "{01234567-89AB-CDEF-0123-456789ABCDEF}"  // application ID
-)
-//! [0]
-
-
-//! [1]
-QAXFACTORY_BEGIN(
-    "{01234567-89AB-CDEF-0123-456789ABCDEF}", // type library ID
-    "{01234567-89AB-CDEF-0123-456789ABCDEF}"  // application ID
-)
-    QAXCLASS(Class1)
-    QAXCLASS(Class2)
-QAXFACTORY_END()
-//! [1]
-
-
-//! [2]
-#include <qapplication.h>
-#include <qaxfactory.h>
-
-#include "theactivex.h"
-
-QAXFACTORY_DEFAULT(
-    TheActiveX,				  // widget class
-    "{01234567-89AB-CDEF-0123-456789ABCDEF}", // class ID
-    "{01234567-89AB-CDEF-0123-456789ABCDEF}", // interface ID
-    "{01234567-89AB-CDEF-0123-456789ABCDEF}", // event interface ID
-    "{01234567-89AB-CDEF-0123-456789ABCDEF}", // type library ID
-    "{01234567-89AB-CDEF-0123-456789ABCDEF}"  // application ID
-)
-//! [2]
-
-
-//! [3]
-settings->setValue("/CLSID/" + classID(key)
-                   + "/Implemented Categories/"
-                   + "/{00000000-0000-0000-000000000000}/.",
-                   QString());
-//! [3]
-
-
-//! [4]
-settings->remove("/CLSID/" + classID(key)
-                 + "/Implemented Categories"
-                 + "/{00000000-0000-0000-000000000000}/.");
-//! [4]
-
-
-//! [5]
-int main(int argc, char *argv[])
-{
-    QApplication app(argc, argv);
-    if (!QAxFactory::isServer()) {
-        // initialize for stand-alone execution
-    }
-    return app.exec();
-}
-//! [5]
-
-
-//! [6]
-if (QAxFactory::isServer()) {
-    QAxFactory::stopServer();
-    QAxFactory::startServer(QAxFactory::SingleInstance);
-}
-//! [6]
-
-
-//! [7]
-#include <qaxfactory.h>
-
-#include "theactivex.h"
-
-QAXFACTORY_DEFAULT(
-    TheActiveX,				  // widget class
-    "{01234567-89AB-CDEF-0123-456789ABCDEF}", // class ID
-    "{01234567-89AB-CDEF-0123-456789ABCDEF}", // interface ID
-    "{01234567-89AB-CDEF-0123-456789ABCDEF}", // event interface ID
-    "{01234567-89AB-CDEF-0123-456789ABCDEF}", // type library ID
-    "{01234567-89AB-CDEF-0123-456789ABCDEF}"  // application ID
-)
-//! [7]
-
-
-//! [8]
-QAXFACTORY_EXPORT(
-    MyFactory,			              // factory class
-    "{01234567-89AB-CDEF-0123-456789ABCDEF}", // type library ID
-    "{01234567-89AB-CDEF-0123-456789ABCDEF}"  // application ID
-)
-//! [8]
-
-
-//! [9]
-QAXFACTORY_BEGIN(
-    "{01234567-89AB-CDEF-0123-456789ABCDEF}", // type library ID
-    "{01234567-89AB-CDEF-0123-456789ABCDEF}"  // application ID
-)
-    QAXCLASS(Class1)
-    QAXCLASS(Class2)
-QAXFACTORY_END()
-//! [9]
diff --git a/doc/codesnippets/doc/src/snippets/code/src_corelib_codecs_qtextcodec.cpp b/doc/codesnippets/doc/src/snippets/code/src_corelib_codecs_qtextcodec.cpp
index f1c839d..47a5c7a 100644
--- a/doc/codesnippets/doc/src/snippets/code/src_corelib_codecs_qtextcodec.cpp
+++ b/doc/codesnippets/doc/src/snippets/code/src_corelib_codecs_qtextcodec.cpp
@@ -1,25 +1,25 @@
 //! [0]
 encodedString = QByteArray("...")
-codec = QTextCodec::codecForName("KOI8-R")
-string = codec->toUnicode(encodedString)
+codec = QTextCodec.codecForName("KOI8-R")
+string = codec.toUnicode(encodedString)
 //! [0]
 
 
 //! [1]
-string = QString("...")
-codec = QTextCodec::codecForName("KOI8-R")
-encodedString = codec->fromUnicode(string)
+string = u"..."
+codec = QTextCodec.codecForName("KOI8-R")
+encodedString = codec.fromUnicode(string)
 //! [1]
 
 
 //! [2]
-codec = QTextCodec::codecForName("Shift-JIS")
-decoder = codec->makeDecoder()
+codec = QTextCodec.codecForName("Shift-JIS")
+decoder = codec.makeDecoder()
 
-string = QString()
+string = u''
 while new_data_available():
-    chunk = get_new_data();
-    string += decoder->toUnicode(chunk)
+    chunk = get_new_data()
+    string += decoder.toUnicode(chunk)
 
 //! [2]
 
@@ -27,6 +27,6 @@ while new_data_available():
 //! [3]
 def main():
     app = QApplication([])
-    QTextCodec::setCodecForTr(QTextCodec::codecForName("eucKR"))
+    QTextCodec.setCodecForTr(QTextCodec.codecForName("eucKR"))
     ...
 //! [3]
diff --git a/doc/codesnippets/doc/src/snippets/code/src_corelib_concurrent_qthreadpool.cpp b/doc/codesnippets/doc/src/snippets/code/src_corelib_concurrent_qthreadpool.cpp
index 174b878..ecbfe23 100644
--- a/doc/codesnippets/doc/src/snippets/code/src_corelib_concurrent_qthreadpool.cpp
+++ b/doc/codesnippets/doc/src/snippets/code/src_corelib_concurrent_qthreadpool.cpp
@@ -5,5 +5,5 @@ class HelloWorldTask(QRunnable):
 
 hello = HelloWorldTask()
 # QThreadPool takes ownership and deletes 'hello' automatically
-QThreadPool.globalInstance()->start(hello)
+QThreadPool.globalInstance().start(hello)
 //! [0]
diff --git a/doc/codesnippets/doc/src/snippets/code/src_corelib_global_qglobal.cpp b/doc/codesnippets/doc/src/snippets/code/src_corelib_global_qglobal.cpp
index 287181a..4c12049 100644
--- a/doc/codesnippets/doc/src/snippets/code/src_corelib_global_qglobal.cpp
+++ b/doc/codesnippets/doc/src/snippets/code/src_corelib_global_qglobal.cpp
@@ -1,5 +1,5 @@
 //! [0]
-label->setAlignment(Qt::AlignLeft | Qt::AlignTop);
+label.setAlignment(Qt.AlignLeft | Qt.AlignTop)
 //! [0]
 
 
@@ -73,60 +73,58 @@ quint64 value = Q_UINT64_C(932838457459459);
 
 
 //! [10]
-int absoluteValue;
-int myValue = -4;
-
-absoluteValue = qAbs(myValue);
+myValue = -4
+absoluteValue = qAbs(myValue)
 // absoluteValue == 4
 //! [10]
 
 
 //! [11]
-qreal valueA = 2.3;
-qreal valueB = 2.7;
+valueA = 2.3
+valueB = 2.7
 
-int roundedValueA = qRound(valueA);
+roundedValueA = qRound(valueA)
 // roundedValueA = 2
-int roundedValueB = qRound(valueB);
+roundedValueB = qRound(valueB)
 // roundedValueB = 3
 //! [11]
 
 
 //! [12]
-qreal valueA = 42949672960.3;
-qreal valueB = 42949672960.7;
+valueA = 42949672960.3
+valueB = 42949672960.7
 
-int roundedValueA = qRound(valueA);
+roundedValueA = qRound(valueA)
 // roundedValueA = 42949672960
-int roundedValueB = qRound(valueB);
+roundedValueB = qRound(valueB)
 // roundedValueB = 42949672961
 //! [12]
 
 
 //! [13]
-int myValue = 6;
-int yourValue = 4;
+myValue = 6
+yourValue = 4
 
-int minValue = qMin(myValue, yourValue);
+minValue = qMin(myValue, yourValue)
 // minValue == yourValue
 //! [13]
 
 
 //! [14]
-int myValue = 6;
-int yourValue = 4;
+myValue = 6
+yourValue = 4
 
-int maxValue = qMax(myValue, yourValue);
+maxValue = qMax(myValue, yourValue)
 // maxValue == myValue
 //! [14]
 
 
 //! [15]
-int myValue = 10;
-int minValue = 2;
-int maxValue = 6;
+myValue = 10
+minValue = 2
+maxValue = 6
 
-int boundedValue = qBound(minValue, myValue, maxValue);
+boundedValue = qBound(minValue, myValue, maxValue)
 // boundedValue == 6
 //! [15]
 
@@ -436,7 +434,7 @@ namespace QT_NAMESPACE {
 //! [43]
 class MyClass : public QObject
 {
-    
+
   private:
     Q_DISABLE_COPY(MyClass)
 };
@@ -446,7 +444,7 @@ class MyClass : public QObject
 //! [44]
 class MyClass : public QObject
 {
-    
+
   private:
      MyClass(const MyClass &);
      MyClass &operator=(const MyClass &);
@@ -454,7 +452,7 @@ class MyClass : public QObject
 //! [44]
 
 //! [45]
-  QWidget w = QWidget();
+  w = QWidget()
 //! [45]
 
 //! [46]
diff --git a/doc/codesnippets/doc/src/snippets/code/src_corelib_io_qabstractfileengine.cpp b/doc/codesnippets/doc/src/snippets/code/src_corelib_io_qabstractfileengine.cpp
index 5984b62..98c9303 100644
--- a/doc/codesnippets/doc/src/snippets/code/src_corelib_io_qabstractfileengine.cpp
+++ b/doc/codesnippets/doc/src/snippets/code/src_corelib_io_qabstractfileengine.cpp
@@ -1,6 +1,6 @@
 //! [0]
-class ZipEngineHandler(QAbstractFileEngineHandler)
-    def create(fileName):
+class ZipEngineHandler(QAbstractFileEngineHandler):
+    def create(self, fileName):
         # ZipEngineHandler returns a ZipEngine for all .zip files
         if fileName.toLower().endsWith(".zip"):
             return ZipEngine(fileName)
@@ -22,7 +22,7 @@ def main():
 //! [1]
 def create(fileName):
     # ZipEngineHandler returns a ZipEngine for all .zip files
-    if fileName.toLower().endsWith(".zip"):
+    if fileName.lower().endswith(".zip"):
         return ZipEngine(fileName)
     else
         return None
@@ -31,7 +31,7 @@ def create(fileName):
 
 //! [2]
 # @arg filters QDir.Filters
-# @arg filterNames QStringList
+# @arg filterNames [str, ...]
 # @return QAbstractFileEngineIterator
 def beginEntryList(filters, filterNames):
     return CustomFileEngineIterator(filters, filterNames)
@@ -52,9 +52,9 @@ class CustomIterator(QAbstractFileEngineIterator):
         return self.index < self.entries.size() - 1
 
     def next(self):
-       if !self.hasNext():
-           return QString()
-       index++
+       if not self.hasNext():
+           return None
+       index += 1
        return currentFilePath()
 
     def currentFileName(self):
diff --git a/doc/codesnippets/doc/src/snippets/code/src_corelib_io_qdatastream.cpp b/doc/codesnippets/doc/src/snippets/code/src_corelib_io_qdatastream.cpp
index 6b66276..033a54c 100644
--- a/doc/codesnippets/doc/src/snippets/code/src_corelib_io_qdatastream.cpp
+++ b/doc/codesnippets/doc/src/snippets/code/src_corelib_io_qdatastream.cpp
@@ -2,27 +2,27 @@ void wrapInFunction()
 {
 
 //! [0]
-file = QFile("file.dat")
-file.open(QIODevice.WriteOnly)
+file_ = QFile("file.dat")
+file_.open(QIODevice.WriteOnly)
 # we will serialize the data into the file
-out = QDataStream(file)
+out = QDataStream(file_)
 # serialize a string
-out << "the answer is"    
+out.writeQString("the answer is")
 # serialize an integer
 out.writeInt32(42)
 //! [0]
 
 
 //! [1]
-file = QFile("file.dat")
-file.open(QIODevice.ReadOnly)
+file_ = QFile("file.dat")
+file_.open(QIODevice.ReadOnly)
 # read the data serialized from the file
-i = QDataStream(file)
-str = QString()
+i = QDataStream(file_)
+string = ''
 a = 0
 # extract "the answer is" and 42
-i >> str
-a = i.readInt32()                  
+string = i.readQString()
+a = i.readInt32()
 //! [1]
 
 
@@ -32,15 +32,15 @@ stream.setVersion(QDataStream.Qt_4_0)
 
 
 //! [3]
-file = QFile("file.xxx")
-file.open(QIODevice.WriteOnly)
-out = QDataStream(file)
+file_ = QFile("file.xxx")
+file_.open(QIODevice.WriteOnly)
+out = QDataStream(file_)
 
 # Write a header with a "magic number" and a version
 out.writeInt32(0xA0B0C0D0)
 out.writeInt32(123)
 
-out.setVersion(QDataStream.Qt_4_0);
+out.setVersion(QDataStream.Qt_4_0)
 
 // Write the data
 out << lots_of_interesting_data
@@ -48,9 +48,9 @@ out << lots_of_interesting_data
 
 
 //! [4]
-file = QFile("file.xxx")
-file.open(QIODevice.ReadOnly)
-i = QDataStream(file)
+file_ = QFile("file.xxx")
+file_.open(QIODevice.ReadOnly)
+i = QDataStream(file_)
 
 // Read and check the header
 magic = i.readInt32()
@@ -65,20 +65,20 @@ if version > 123:
     return XXX_BAD_FILE_TOO_NEW
 
 if version <= 110:
-    in.setVersion(QDataStream.Qt_3_2)
+    in_.setVersion(QDataStream.Qt_3_2)
 else:
-    in.setVersion(QDataStream.Qt_4_0)
+    in_.setVersion(QDataStream.Qt_4_0)
 
 // Read the data
-in >> lots_of_interesting_data
+in_ >> lots_of_interesting_data
 if version >= 120:
-    in >> data_new_in_XXX_version_1_2
-in >> other_interesting_data
+    in_ >> data_new_in_XXX_version_1_2
+in_ >> other_interesting_data
 //! [4]
 
 
 //! [5]
-out = QDataStream(file)
+out = QDataStream(file_)
 out.setVersion(QDataStream.Qt_4_0)
 //! [5]
 
diff --git a/doc/codesnippets/doc/src/snippets/code/src_corelib_io_qdir.cpp b/doc/codesnippets/doc/src/snippets/code/src_corelib_io_qdir.cpp
index 5bb0b07..1de2168 100644
--- a/doc/codesnippets/doc/src/snippets/code/src_corelib_io_qdir.cpp
+++ b/doc/codesnippets/doc/src/snippets/code/src_corelib_io_qdir.cpp
@@ -28,14 +28,14 @@ absolutePath = directory.absoluteFilePath("contents.txt")
 
 //! [4]
 dir = QDir("example")
-if !dir.exists():
+if not dir.exists():
     print "Cannot find the example directory"
 //! [4]
 
 
 //! [5]
 dir = QDir.root()                 # "/"
-if !dir.cd("tmp"):                # "/tmp"
+if not dir.cd("tmp"):             # "/tmp"
     print "Cannot find the \"/tmp\" directory"
 else:
     file = QFile(dir.filePath("ex1.txt"))   # "/tmp/ex1.txt"
@@ -66,8 +66,8 @@ s = dir.relativeFilePath("/home/mary/file.txt")     # s is "../mary/file.txt"
 
 
 //! [8]
-QDir.setSearchPaths("icons", QStringList(QDir.homePath() + "/images"))
-QDir.setSearchPaths("docs", QStringList(":/embeddedDocuments"))
+QDir.setSearchPaths("icons", [QDir.homePath() + "/images"])
+QDir.setSearchPaths("docs", [":/embeddedDocuments"])
 ...
 pixmap = QPixmap("icons:undo.png")  # will look for undo.png in QDir::homePath() + "/images"
 file = QFile("docs:design.odf")     # will look in the :/embeddedDocuments resource path
@@ -83,7 +83,7 @@ if dir.isRoot():
 
 
 //! [10]
-// The current directory is "/usr/local"
+# The current directory is "/usr/local"
 d1 = QDir("/usr/local/bin")
 d2 = QDir("bin")
 if d1 == d2:
@@ -112,7 +112,7 @@ Q_INIT_RESOURCE(myapp);
 
 
 //! [14]
-def initMyResource(): 
+def initMyResource():
     Q_INIT_RESOURCE(myapp)
 
 class MyNamespace
diff --git a/doc/codesnippets/doc/src/snippets/code/src_corelib_io_qfileinfo.cpp b/doc/codesnippets/doc/src/snippets/code/src_corelib_io_qfileinfo.cpp
index fb0e1c8..c021c3b 100644
--- a/doc/codesnippets/doc/src/snippets/code/src_corelib_io_qfileinfo.cpp
+++ b/doc/codesnippets/doc/src/snippets/code/src_corelib_io_qfileinfo.cpp
@@ -11,7 +11,7 @@ info1.size()                # returns 56201
 info1.symLinkTarget()       # returns "/opt/pretty++/bin/untabify"
 
 info2 = QFileInfo(info1.symLinkTarget())
-info1.isSymLink()           # returns false
+info1.isSymLink()           # returns False
 info1.absoluteFilePath()    # returns "/opt/pretty++/bin/untabify"
 info1.size()                # returns 56201
 
@@ -20,25 +20,25 @@ info1.size()                # returns 56201
 
 //! [1]
 info1 = QFileInfo("C:\\Documents and Settings\\Bob\\untabify.lnk")
-info1.isSymLink()           # returns true
+info1.isSymLink()           # returns True
 info1.absoluteFilePath()    # returns "C:/Documents and Settings/Bob/untabify.lnk"
 info1.size()                # returns 743
 info1.symLinkTarget()       # returns "C:/Pretty++/untabify"
 
 info2 = QFileInfo(info1.symLinkTarget())
-info1.isSymLink()           # returns false
+info1.isSymLink()           # returns False
 info1.absoluteFilePath()    # returns "C:/Pretty++/untabify"
 info1.size()                # returns 63942
 //! [1]
 
 
 //! [2]
-absolute = QString("/local/bin")
-relative = QString("local/bin")
+absolute = "/local/bin"
+relative = "local/bin"
 absFile = QFileInfo(absolute)
 relFile = QFileInfo(relative)
 
-QDir.setCurrent(QDir::rootPath())
+QDir.setCurrent(QDir.rootPath())
 # absFile and relFile now point to the same file
 
 QDir.setCurrent("/tmp")
diff --git a/doc/codesnippets/doc/src/snippets/code/src_corelib_io_qiodevice.cpp b/doc/codesnippets/doc/src/snippets/code/src_corelib_io_qiodevice.cpp
index 44bd197..6b791bf 100644
--- a/doc/codesnippets/doc/src/snippets/code/src_corelib_io_qiodevice.cpp
+++ b/doc/codesnippets/doc/src/snippets/code/src_corelib_io_qiodevice.cpp
@@ -1,10 +1,10 @@
 //! [0]
 gzip = QProcess()
-gzip.start("gzip", QStringList() << "-c")
-if !gzip.waitForStarted():
-    return false
+gzip.start("gzip", ["-c"])
+if not gzip.waitForStarted():
+    return False
 
-gzip.write("uncompressed data");
+gzip.write("uncompressed data")
 
 compressed = QByteArray()
 while gzip.waitForReadyRead():
@@ -21,7 +21,7 @@ def bytesAvailable(self):
 //! [2]
 file = QFile("box.txt")
 if file.open(QFile.ReadOnly):
-    buf = file.readLine(1024);
+    buf = file.readLine(1024)
     if buf.size():
         # the line is available in buf
 //! [2]
@@ -29,20 +29,20 @@ if file.open(QFile.ReadOnly):
 
 //! [3]
 def canReadLine(self):
-    return buffer.contains('\n') || QIODevice.canReadLine()
+    return buffer.contains('\n') or QIODevice.canReadLine()
 //! [3]
 
 
 //! [4]
-def isExeFile(file):
-    buf = file->peek(2);
+def isExeFile(file_):
+    buf = file_.peek(2)
     if buf.size() == 2:
-        return (buf[0] == 'M' && buf[1] == 'Z')
-    return false
+        return buf[0] == 'M' and buf[1] == 'Z'
+    return False
 //! [4]
 
 
 //! [5]
-def isExeFile(file):
-    return file->peek(2) == "MZ"
+def isExeFile(file_):
+    return file_.peek(2) == "MZ"
 //! [5]
diff --git a/doc/codesnippets/doc/src/snippets/code/src_corelib_io_qprocess.cpp b/doc/codesnippets/doc/src/snippets/code/src_corelib_io_qprocess.cpp
index 7f4bd7a..6b97e37 100644
--- a/doc/codesnippets/doc/src/snippets/code/src_corelib_io_qprocess.cpp
+++ b/doc/codesnippets/doc/src/snippets/code/src_corelib_io_qprocess.cpp
@@ -4,12 +4,13 @@ def wrapInFunction():
 //! [0]
 builder = QProcess()
 builder.setProcessChannelMode(QProcess.MergedChannels)
-builder.start("make", QStringList() << "-j2")
+builder.start("make", ["-j2"])
 
-if !builder.waitForFinished():
-    qDebug() << "Make failed:" << builder.errorString()
+import sys
+if not builder.waitForFinished():
+    sys.stderr.write("Make failed:" + builder.errorString())
 else
-    qDebug() << "Make output:" << builder.readAll()
+    sys.stderr.write("Make output:" + builder.readAll())
 //! [0]
 
 
@@ -56,7 +57,7 @@ class SandboxProcess(QProcess):
 //! [5]
 process = QProcess()
 process.start("del /s *.txt")
-# same as process.start("del", QStringList() << "/s" << "*.txt")
+# same as process.start("del", ["/s", "*.txt"])
 ...
 //! [5]
 
@@ -75,8 +76,8 @@ process.start("dir \"\"\"My Documents\"\"\"")
 
 //! [8]
 environment = QProcess.systemEnvironment()
-# environment = {"PATH=/usr/bin:/usr/local/bin",
-#                "USER=greg", "HOME=/home/greg"}
+# environment = [PATH=/usr/bin:/usr/local/bin",
+#                "USER=greg", "HOME=/home/greg"]
 //! [8]
 
 
diff --git a/doc/codesnippets/doc/src/snippets/code/src_corelib_io_qsettings.cpp b/doc/codesnippets/doc/src/snippets/code/src_corelib_io_qsettings.cpp
index 71745fa..213d257 100644
--- a/doc/codesnippets/doc/src/snippets/code/src_corelib_io_qsettings.cpp
+++ b/doc/codesnippets/doc/src/snippets/code/src_corelib_io_qsettings.cpp
@@ -106,8 +106,8 @@ settings.endGroup()
 
 //! [15]
 class Login:
-    userName = QString()
-    password = QString()
+    userName = ''
+    password = ''
 
     logins = []
     ...
@@ -117,8 +117,8 @@ class Login:
     for i in range(size):
         settings.setArrayIndex(i)
         login = Login()
-        login.userName = settings.value("userName").toString()
-        login.password = settings.value("password").toString()
+        login.userName = settings.value("userName")
+        login.password = settings.value("password")
         logins.append(login)
 
     settings.endArray()
@@ -127,8 +127,8 @@ class Login:
 
 //! [16]
 class Login:
-    userName = QString()
-    password = QString()
+    userName = ''
+    password = ''
 
     logins = []
     ...
@@ -148,8 +148,8 @@ class Login:
 settings = QSettings()
 settings.setValue("fridge/color", Qt.white)
 settings.setValue("fridge/size", QSize(32, 96))
-settings.setValue("sofa", true)
-settings.setValue("tv", false)
+settings.setValue("sofa", True)
+settings.setValue("tv", False)
 
 keys = settings.allKeys();
 # keys: ["fridge/color", "fridge/size", "sofa", "tv"]
@@ -167,8 +167,8 @@ keys = settings.allKeys()
 settings = QSettings()
 settings.setValue("fridge/color", Qt.white)
 settings.setValue("fridge/size", QSize(32, 96))
-settings.setValue("sofa", true)
-settings.setValue("tv", false)
+settings.setValue("sofa", True)
+settings.setValue("tv", False)
 
 keys = settings.childKeys()
 # keys: ["sofa", "tv"]
@@ -186,8 +186,8 @@ keys = settings.childKeys()
 settings = QSettings()
 settings.setValue("fridge/color", Qt.white)
 settings.setValue("fridge/size", QSize(32, 96));
-settings.setValue("sofa", true)
-settings.setValue("tv", false)
+settings.setValue("sofa", True)
+settings.setValue("tv", False)
 
 groups = settings.childGroups()
 # group: ["fridge"]
@@ -204,10 +204,10 @@ groups = settings.childGroups()
 //! [23]
 settings = QSettings()
 settings.setValue("interval", 30)
-settings.value("interval").toInt()      # returns 30
+settings.value("interval")      # returns 30
 
 settings.setValue("interval", 6.55)
-settings.value("interval").toDouble()  # returns 6.55
+settings.value("interval")  # returns 6.55
 //! [23]
 
 
@@ -243,9 +243,9 @@ keys = settings.allKeys()
 //! [26]
 settings = QSettings()
 settings.setValue("animal/snake", 58)
-settings.value("animal/snake", 1024).toInt()   # returns 58
-settings.value("animal/zebra", 1024).toInt()   # returns 1024
-settings.value("animal/zebra").toInt()         # returns 0
+settings.value("animal/snake", 1024)   # returns 58
+settings.value("animal/zebra", 1024)   # returns 1024
+settings.value("animal/zebra")         # returns 0
 //! [26]
 
 
diff --git a/doc/codesnippets/doc/src/snippets/code/src_corelib_io_qtemporaryfile.cpp b/doc/codesnippets/doc/src/snippets/code/src_corelib_io_qtemporaryfile.cpp
index 8ebbd9e..77d394e 100644
--- a/doc/codesnippets/doc/src/snippets/code/src_corelib_io_qtemporaryfile.cpp
+++ b/doc/codesnippets/doc/src/snippets/code/src_corelib_io_qtemporaryfile.cpp
@@ -2,9 +2,9 @@
 //! [0]
     # Within a function/method...
 
-    file = QTemporaryFile()
-    if file.open():
-        # file.fileName() returns the unique file name
+    file_ = QTemporaryFile()
+    if file_.open():
+        # file_.fileName() returns the unique file name
 
     # The QTemporaryFile destructor removes the temporary file
     # as it goes out of scope.
diff --git a/doc/codesnippets/doc/src/snippets/code/src_corelib_io_qtextstream.cpp b/doc/codesnippets/doc/src/snippets/code/src_corelib_io_qtextstream.cpp
index 6988af4..18e1f69 100644
--- a/doc/codesnippets/doc/src/snippets/code/src_corelib_io_qtextstream.cpp
+++ b/doc/codesnippets/doc/src/snippets/code/src_corelib_io_qtextstream.cpp
@@ -1,6 +1,6 @@
 //! [0]
 data = QFile("output.txt")
-if data.open(QFile.WriteOnly | QFile::Truncate):
+if data.open(QFile.WriteOnly | QFile.Truncate):
     out = QTextStream(&data)
     out << "Result: " << qSetFieldWidth(10) << left << 3.14 << 2.7
     # writes "Result: 3.14      2.7       "
@@ -19,15 +19,15 @@ while(True):
 
 
 //! [2]
-in = QTextStream("0x50 0x20")
+in_ = QTextStream("0x50 0x20")
 firstNumber = 0
 secondNumber = 0
 
-in >> firstNumber             # firstNumber == 80
-in >> dec >> secondNumber     # secondNumber == 0
+in_ >> firstNumber             # firstNumber == 80
+in_ >> dec >> secondNumber     # secondNumber == 0
 
 ch = None
-in >> ch                      # ch == 'x'
+in_ >> ch                      # ch == 'x'
 //! [2]
 
 
@@ -36,16 +36,16 @@ def main():
     # read numeric arguments (123, 0x20, 4.5...)
     for i in sys.argv():
           number = None
-          QTextStream in(i)
-          in >> number
+          QTextStream in_(i)
+          in_ >> number
           ...
 //! [3]
 
 
 //! [4]
 str = QString()
-in = QTextStream(sys.stdin.fileno())
-in >> str
+in_ = QTextStream(sys.stdin.fileno())
+in_ >> str
 //! [4]
 
 
@@ -65,11 +65,11 @@ out << "Qt" << "rocks!"
 
 
 //! [7]
-in = QTextStream(file)
+in_ = QTextStream(file)
 ch1 = QChar()
 ch2 = QChar()
 ch3 = QChar()
-in >> ch1 >> ch2 >> ch3;
+in_ >> ch1 >> ch2 >> ch3;
 //! [7]
 
 
diff --git a/doc/codesnippets/doc/src/snippets/code/src_corelib_io_qurl.cpp b/doc/codesnippets/doc/src/snippets/code/src_corelib_io_qurl.cpp
index a568438..c0a4fca 100644
--- a/doc/codesnippets/doc/src/snippets/code/src_corelib_io_qurl.cpp
+++ b/doc/codesnippets/doc/src/snippets/code/src_corelib_io_qurl.cpp
@@ -12,10 +12,10 @@ url = QUrl.fromEncoded("http://qtsoftware.com/List%20of%20holidays.xml")
 //! [2]
 def checkUrl(url):
     if !url.isValid():
-        print QString("Invalid URL: %1").arg(url.toString())
-        return false
+        print "Invalid URL: %s" % url.toString()
+        return False
 
-    return true
+    return True
 
 //! [2]
 
@@ -41,6 +41,6 @@ print baseUrl.resolved(relativeUrl).toString()
 
 //! [6]
 ba = QUrl.toPercentEncoding("{a fishy string?}", "{}", "s")
-print ba.constData()
+print ba
 # prints "{a fi%73hy %73tring%3F}"
 //! [6]
diff --git a/doc/codesnippets/doc/src/snippets/code/src_corelib_kernel_qabstractitemmodel.cpp b/doc/codesnippets/doc/src/snippets/code/src_corelib_kernel_qabstractitemmodel.cpp
index 61ea362..1f20c3b 100644
--- a/doc/codesnippets/doc/src/snippets/code/src_corelib_kernel_qabstractitemmodel.cpp
+++ b/doc/codesnippets/doc/src/snippets/code/src_corelib_kernel_qabstractitemmodel.cpp
@@ -26,3 +26,23 @@ beginInsertColumns(parent, 6, 8)
 //! [5]
 beginRemoveColumns(parent, 4, 6)
 //! [5]
+
+
+//! [6]
+beginMoveRows(sourceParent, 2, 4, destinationParent, 2)
+//! [6]
+
+
+//! [7]
+beginMoveRows(sourceParent, 2, 4, destinationParent, 6)
+//! [7]
+
+
+//! [8]
+beginMoveRows(parent, 2, 2, parent, 0)
+//! [8]
+
+
+//! [9]
+beginMoveRows(parent, 2, 2, parent, 4)
+//! [9]
diff --git a/doc/codesnippets/doc/src/snippets/code/src_corelib_kernel_qcoreapplication.cpp b/doc/codesnippets/doc/src/snippets/code/src_corelib_kernel_qcoreapplication.cpp
index f9cc001..48d3a24 100644
--- a/doc/codesnippets/doc/src/snippets/code/src_corelib_kernel_qcoreapplication.cpp
+++ b/doc/codesnippets/doc/src/snippets/code/src_corelib_kernel_qcoreapplication.cpp
@@ -6,7 +6,7 @@ QApplication.sendEvent(mainWindow, event)
 
 //! [1]
 quitButton = QPushButton("Quit")
-QObject.connect(quitButton, SIGNAL("clicked()"), app, SLOT("quit()"))
+quitButton.clicked.connect(app.quit)
 //! [1]
 
 
@@ -22,19 +22,11 @@ myEventFilter(message, result)
 
 
 //! [4]
-static int *global_ptr = 0;
+def cleanup_stuff():
+    # do the cleanup stuff
 
-static void cleanup_ptr()
-{
-    delete [] global_ptr;
-    global_ptr = 0;
-}
-
-void init_ptr()
-{
-    global_ptr = new int[100];      // allocate data
-    qAddPostRoutine(cleanup_ptr);   // delete later
-}
+def init_stuff():
+    qAddPostRoutine(cleanup_stuff)
 //! [4]
 
 
diff --git a/doc/codesnippets/doc/src/snippets/code/src_corelib_kernel_qmetaobject.cpp b/doc/codesnippets/doc/src/snippets/code/src_corelib_kernel_qmetaobject.cpp
index 5676f13..046b40c 100644
--- a/doc/codesnippets/doc/src/snippets/code/src_corelib_kernel_qmetaobject.cpp
+++ b/doc/codesnippets/doc/src/snippets/code/src_corelib_kernel_qmetaobject.cpp
@@ -48,17 +48,13 @@ class MyClass:
 
 //! [propertyCount]
 metaObject = obj.metaObject()
-properties = QStringList()
-for i in range(metaObject.propertyOffset(), metaObject.propertyCount()):
-    properties << QString.fromLatin1(metaObject.property(i).name())
+properties = [metaObject.property(i).name() for i in range(metaObject.propertyOffset(), metaObject.propertyCount())]
 //! [propertyCount]
 
 
 //! [methodCount]
 metaObject = obj.metaObject()
-methods = QStringList()
-for i in rang(metaObject.methodOffset(), metaObject->methodCount()):
-    methods << QString.fromLatin1(metaObject.method(i).signature())
+methods = [metaObject.method(i).signature() for i in range(metaObject.methodOffset(), metaObject.methodCount())]
 //! [methodCount]
 
 //! [6]
diff --git a/doc/codesnippets/doc/src/snippets/code/src_corelib_kernel_qtimer.cpp b/doc/codesnippets/doc/src/snippets/code/src_corelib_kernel_qtimer.cpp
index 1b7ea4e..bb646a1 100644
--- a/doc/codesnippets/doc/src/snippets/code/src_corelib_kernel_qtimer.cpp
+++ b/doc/codesnippets/doc/src/snippets/code/src_corelib_kernel_qtimer.cpp
@@ -6,5 +6,5 @@ def main():
     app = QApplication([])
     QTimer.singleShot(600000, app, SLOT('quit()'))
     ...
-    return app.exec()
+    return app.exec_()
 //! [0]
diff --git a/doc/codesnippets/doc/src/snippets/code/src_corelib_kernel_qvariant.cpp b/doc/codesnippets/doc/src/snippets/code/src_corelib_kernel_qvariant.cpp
deleted file mode 100644
index d03b83e..0000000
--- a/doc/codesnippets/doc/src/snippets/code/src_corelib_kernel_qvariant.cpp
+++ /dev/null
@@ -1,99 +0,0 @@
-//! [0]
-out = QDataStream(...)
-v = QVariant(123)                // The variant now contains an int
-x = v.toInt()              // x = 123
-out << v                       // Writes a type tag and an int to out
-v = QVariant("hello")          // The variant now contains a QByteArray
-v = QVariant(tr("hello"))      // The variant now contains a QString
-y = v.toInt()              // y = 0 since v cannot be converted to an int
-s = v.toString()       // s = tr("hello")  (see QObject::tr())
-out << v                       // Writes a type tag and a QString to out
-...
-in = QDataStream(...)            // (opening the previously written stream)
-in >> v                        // Reads an Int variant
-z = v.toInt()              // z = 123
-print ("Type is %s", a v.typeName())   // prints "Type is int"
-v = v.toInt() + 100            // The variant now hold the value 223
-v = QVariant(QStringList())
-//! [0]
-
-
-//! [1]
-x = QVariant()
-y = QVariant(QString())
-z = QVariant(QString(""))
-x.convert(QVariant.Int)
-// x.isNull() == true
-// y.isNull() == true, z.isNull() == false
-// y.isEmpty() == true, z.isEmpty() == true
-//! [1]
-
-
-//! [2]
-variant = QVariant(some_qcolor)
-...
-color = QColor(variant)
-//! [2]
-
-
-//! [3]
-color = palette().background().color()
-variant = QVariant(color)
-//! [3]
-
-
-//! [4]
-v = QVariant()
-
-v.setValue(5) // Not supported by PySide
-int i = v.toInt()         // i is now 5
-QString s = v.toString()   // s is now "5"
-
-MyCustomStruct c
-v.setValue(c)
-
-...
-
-MyCustomStruct c2 = v.value<MyCustomStruct>()
-//! [4]
-
-
-//! [5]
-QVariant v
-
-MyCustomStruct c // canConvert not supported by PySide
-if (v.canConvert<MyCustomStruct>())
-    c = v.value<MyCustomStruct>(v)
-
-v = 7
-int i = v.value<int>()                        // same as v.toInt()
-QString s = v.value<QString>()                // same as v.toString(), s is now "7"
-MyCustomStruct c2 = v.value<MyCustomStruct>() // conversion failed, c2 is empty
-//! [5]
-
-
-//! [6]
-QVariant v = 42
-
-// canConvert not supported by PySide
-v.canConvert<int>()              // returns true
-v.canConvert<QString>()          // returns true
-
-MyCustomStruct s
-v.setValue(s)
-
-v.canConvert<int>()              // returns false
-v.canConvert<MyCustomStruct>()   // returns true
-//! [6]
-
-
-//! [7]
-MyCustomStruct s // fromValue not supported by PySide
-return QVariant::fromValue(s)
-//! [7]
-
-
-//! [8]
-QObject *object = getObjectFromSomewhere()
-QVariant data = qVariantFromValue(object) // not supported by PySide.
-//! [8]
diff --git a/doc/codesnippets/doc/src/snippets/code/src_corelib_statemachine_qstatemachine.cpp b/doc/codesnippets/doc/src/snippets/code/src_corelib_statemachine_qstatemachine.cpp
new file mode 100644
index 0000000..e768081
--- /dev/null
+++ b/doc/codesnippets/doc/src/snippets/code/src_corelib_statemachine_qstatemachine.cpp
@@ -0,0 +1,55 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the documentation of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+//! [simple state machine]
+button = QPushButton()
+
+machine = QStateMachine()
+s1 = QState()
+s1.assignProperty(button, "text", "Click me")
+
+s2 = QFinalState()
+s1.addTransition(button, SIGNAL('clicked()'), s2)
+
+machine.addState(s1)
+machine.addState(s2)
+machine.setInitialState(s1)
+machine.start()
+//! [simple state machine]
diff --git a/doc/codesnippets/doc/src/snippets/code/src_corelib_thread_qthread.cpp b/doc/codesnippets/doc/src/snippets/code/src_corelib_thread_qthread.cpp
index a100127..768f96f 100644
--- a/doc/codesnippets/doc/src/snippets/code/src_corelib_thread_qthread.cpp
+++ b/doc/codesnippets/doc/src/snippets/code/src_corelib_thread_qthread.cpp
@@ -5,5 +5,5 @@ class MyThread (QThread):
         # connect QTcpSocket's signals somewhere meaningful
         # ...
         socket.connectToHost(hostName, portNumber)
-        exec_()
+        self.exec_()
 //! [0]
diff --git a/doc/codesnippets/doc/src/snippets/code/src_corelib_tools_qbitarray.cpp b/doc/codesnippets/doc/src/snippets/code/src_corelib_tools_qbitarray.cpp
index 19be88f..d794676 100644
--- a/doc/codesnippets/doc/src/snippets/code/src_corelib_tools_qbitarray.cpp
+++ b/doc/codesnippets/doc/src/snippets/code/src_corelib_tools_qbitarray.cpp
@@ -173,7 +173,7 @@ c = a | b
 
 //! [14]
 a = QBitArray(3)
-QBitArray b(2)
+b = QBitArray(2)
 c = QBitArray()
 a[0] = 1
 a[1] = 0
diff --git a/doc/codesnippets/doc/src/snippets/code/src_corelib_tools_qbytearray.cpp b/doc/codesnippets/doc/src/snippets/code/src_corelib_tools_qbytearray.cpp
index c097a26..c563df4 100644
--- a/doc/codesnippets/doc/src/snippets/code/src_corelib_tools_qbytearray.cpp
+++ b/doc/codesnippets/doc/src/snippets/code/src_corelib_tools_qbytearray.cpp
@@ -327,15 +327,13 @@ ba = QByteArray.number(12.3456, 'E', 3)
 
 
 //! [43]
- static const char mydata[] = {
-    0x00, 0x00, 0x03, 0x84, 0x78, 0x9c, 0x3b, 0x76,
-    0xec, 0x18, 0xc3, 0x31, 0x0a, 0xf1, 0xcc, 0x99,
-    ...
-    0x6d, 0x5b
-};
+mydata = '\x00\x00\x03\x84\x78\x9c\x3b\x76'\
+         '\xec\x18\xc3\x31\x0a\xf1\xcc\x99'\
+         ...
+         '\x6d\x5b'
 
-QByteArray data = QByteArray::fromRawData(mydata, sizeof(mydata));
-QDataStream in(&data, QIODevice::ReadOnly);
+data = QByteArray.fromRawData(mydata)
+in_ = QDataStream(data, QIODevice.ReadOnly)
 ...
 //! [43]
 
diff --git a/doc/codesnippets/doc/src/snippets/code/src_corelib_tools_qdatetime.cpp b/doc/codesnippets/doc/src/snippets/code/src_corelib_tools_qdatetime.cpp
index b935e34..ccd4380 100644
--- a/doc/codesnippets/doc/src/snippets/code/src_corelib_tools_qdatetime.cpp
+++ b/doc/codesnippets/doc/src/snippets/code/src_corelib_tools_qdatetime.cpp
@@ -36,7 +36,7 @@ QDate.isValid(1202, 6, 6)   # True (even though 1202 is pre-Gregorian)
 
 
 //! [5]
-n = QTime(14, 0, 0)                # n == 14:00:00
+n = QTime(14, 0, 0)              # n == 14:00:00
 t = QTime()
 t = n.addSecs(70)                # t == 14:01:10
 t = n.addSecs(-70)               # t == 13:58:50
diff --git a/doc/codesnippets/doc/src/snippets/code/src_corelib_tools_qlocale.cpp b/doc/codesnippets/doc/src/snippets/code/src_corelib_tools_qlocale.cpp
index 6fedb1f..c1b8468 100644
--- a/doc/codesnippets/doc/src/snippets/code/src_corelib_tools_qlocale.cpp
+++ b/doc/codesnippets/doc/src/snippets/code/src_corelib_tools_qlocale.cpp
@@ -14,15 +14,18 @@ hebrew = QLocale() # Constructs a default QLocale
 s1 = hebrew.toString(15714.3, 'e')
 
 QLocale.setDefault(QLocale(QLocale.C))
-(d, ok) = QString("1234,56").toDouble()   # ok == false
-(d, ok) = QString("1234.56").toDouble()   # ok == true, d == 1234.56
+c = QLocale()
+(d, ok) = c.toDouble("1234,56")   # ok == false
+(d, ok) = c.toDouble("1234.56")   # ok == true, d == 1234.56
 
 QLocale.setDefault(QLocale(QLocale.German))
-(d, ok) = QString("1234,56").toDouble()   # ok == true, d == 1234.56
-(d, ok) = QString("1234.56").toDouble()   # ok == true, d == 1234.56
+german = QLocale()
+(d, ok) = german.toDouble("1234,56")   # ok == true, d == 1234.56
+(d, ok) = german.toDouble("1234.56")   # ok == true, d == 1234.56
 
 QLocale.setDefault(QLocale(QLocale.English, QLocale.UnitedStates))
-string = QString("%1 %L2 %L3").arg(12345).arg(12345).arg(12345, 0, 16)
+english = QLocale()
+string = '%s %s %10x' % (12345, english.toString(12345), 12345)
 # string == "12345 12,345 3039"
 //! [1]
 
diff --git a/doc/codesnippets/doc/src/snippets/code/src_corelib_tools_qtimeline.cpp b/doc/codesnippets/doc/src/snippets/code/src_corelib_tools_qtimeline.cpp
index 5f2e978..5b0d16e 100644
--- a/doc/codesnippets/doc/src/snippets/code/src_corelib_tools_qtimeline.cpp
+++ b/doc/codesnippets/doc/src/snippets/code/src_corelib_tools_qtimeline.cpp
@@ -6,10 +6,10 @@ progressBar.setRange(0, 100)
 # Construct a 1-second timeline with a frame range of 0 - 100
 timeLine = QTimeLine(1000, self)
 timeLine.setFrameRange(0, 100)
-QObject.connect(timeLine, SIGNAL("frameChanged(int)"), progressBar, SLOT("setValue(int)"))
+timeLine.frameChanged[int].connect(progressBar.setValue)
 
 # Clicking the push button will start the progress bar animation
 pushButton = QPushButton(QObject.tr("Start animation"), self)
-QObject.connect(pushButton, SIGNAL("clicked()"), timeLine, SLOT("start()"))
+pushButton.clicked.connect(timeLine.start)
 ...
 //! [0]
diff --git a/doc/codesnippets/doc/src/snippets/code/src_gui_effects_qgraphicseffect.cpp b/doc/codesnippets/doc/src/snippets/code/src_gui_effects_qgraphicseffect.cpp
new file mode 100644
index 0000000..c5d4809
--- /dev/null
+++ b/doc/codesnippets/doc/src/snippets/code/src_gui_effects_qgraphicseffect.cpp
@@ -0,0 +1,37 @@
+//! [0]
+def draw(self, painter):
+    # Fully opaque draw directly without going through a pixmap.
+    if qFuzzyCompare(self.opacity, 1):
+        drawSource(painter)
+        return
+    # ...
+//! [0]
+
+//! [1]
+def draw(self, painter):
+    # ...
+    offset = QPoint()
+    if self.sourceIsPixmap():
+        # No point in drawing in device coordinates (pixmap will be scaled anyways).
+        pixmap = sourcePixmap(Qt.LogicalCoordinates, offset)
+        ...
+        painter.drawPixmap(offset, pixmap)
+    else:
+        # Draw pixmap in device coordinates to avoid pixmap scaling
+        pixmap = sourcePixmap(Qt.DeviceCoordinates, offset)
+        painter.setWorldTransform(QTransform())
+        # ...
+        painter.drawPixmap(offset, pixmap)
+    # ...
+//! [1]
+
+//! [2]
+# ...
+alphaGradient = QLinearGradient(rect.topLeft(), rect.bottomLeft())
+alphaGradient.setColorAt(0.0, Qt.transparent)
+alphaGradient.setColorAt(0.5, Qt.black)
+alphaGradient.setColorAt(1.0, Qt.transparent)
+effect = QGraphicsOpacityEffect()
+effect.setOpacityMask(alphaGradient)
+# ...
+//! [2]
diff --git a/doc/codesnippets/doc/src/snippets/code/src_gui_graphicsview_qgraphicsitem.cpp b/doc/codesnippets/doc/src/snippets/code/src_gui_graphicsview_qgraphicsitem.cpp
index 1f1ff39..c2c1647 100644
--- a/doc/codesnippets/doc/src/snippets/code/src_gui_graphicsview_qgraphicsitem.cpp
+++ b/doc/codesnippets/doc/src/snippets/code/src_gui_graphicsview_qgraphicsitem.cpp
@@ -102,7 +102,7 @@ def paint(self, painter, option, widget):
 ObjectName = 0;
 
 item = scene.itemAt(100, 50)
-if item.data(ObjectName).toString().isEmpty():
+if len(item.data(ObjectName)) == 0:
     if isinstance(ButtonItem, item):
         item.setData(ObjectName, "Button")
 //! [11]
@@ -145,13 +145,12 @@ def dragEnterEvent(self, event):
 def itemChange(self, change, value):
     if change == ItemPositionChange && scene():
         # value is the new position.
-        newPos = value.toPointF()
-        rect = scene()->sceneRect()
-        if !rect.contains(newPos):
+        rect = scene().sceneRect()
+        if !rect.contains(value):
             # Keep the item inside the scene rect.
-            newPos.setX(qMin(rect.right(), qMax(newPos.x(), rect.left())))
-            newPos.setY(qMin(rect.bottom(), qMax(newPos.y(), rect.top())))
-            return newPos
+            value.setX(qMin(rect.right(), qMax(value.x(), rect.left())))
+            value.setY(qMin(rect.bottom(), qMax(value.y(), rect.top())))
+            return value
     return QGraphicsItem.itemChange(self, change, value)
 //! [15]
 
@@ -183,3 +182,18 @@ class CustomItem(QGraphicsItem):
        return self.Type
     ...
 //! [QGraphicsItem type]
+
+//! [18]
+class QGraphicsPathItem (QAbstractGraphicsShapeItem):
+    Type = 2
+
+    def type(self):
+        return QGraphicsPathItem.Type
+# ...
+//! [18]
+
+//! [19]
+xform = item.deviceTransform(view.viewportTransform())
+deviceRect = xform.mapRect(rect).toAlignedRect()
+view.viewport().scroll(dx, dy, deviceRect)
+//! [19]
diff --git a/doc/codesnippets/doc/src/snippets/code/src_gui_image_qicon.cpp b/doc/codesnippets/doc/src/snippets/code/src_gui_image_qicon.cpp
index 5e8f1da..efe7be4 100644
--- a/doc/codesnippets/doc/src/snippets/code/src_gui_image_qicon.cpp
+++ b/doc/codesnippets/doc/src/snippets/code/src_gui_image_qicon.cpp
@@ -12,15 +12,21 @@ button.setIcon(QIcon())
 //! [2]
 def drawIcon(self, painter, pos):
     enabledStatus = QIcon.Normal
-    if !isEnabled():
+    if not isEnabled():
         enabledStatus = QIcon::Disabled
 
     onOff = QIcon.On
-    if !isOn():
+    if not isOn():
         onOff = QIcon.Off
 
-    pixmap = icon.pixmap(QSize(22, 22),
-                        enabledStatus,
-                        onOff)
+    pixmap = self.icon.pixmap(QSize(22, 22), enabledStatus, onOff)
     painter.drawPixmap(pos, pixmap)
 //! [2]
+
+//! [3]
+    undoicon = QIcon.fromTheme("edit-undo")
+//! [3]
+
+//! [4]
+    undoicon = QIcon.fromTheme("edit-undo", QIcon(":/undo.png"))
+//! [4]
diff --git a/doc/codesnippets/doc/src/snippets/code/src_gui_image_qpixmap.cpp b/doc/codesnippets/doc/src/snippets/code/src_gui_image_qpixmap.cpp
index baa5337..b76c7d3 100644
--- a/doc/codesnippets/doc/src/snippets/code/src_gui_image_qpixmap.cpp
+++ b/doc/codesnippets/doc/src/snippets/code/src_gui_image_qpixmap.cpp
@@ -10,3 +10,9 @@ static const char * const start_xpm[]={
 myPixmap = QPixmap()
 myPixmap.setMask(myPixmap.createHeuristicMask())
 //! [1]
+
+//! [2]
+pixmap = QPixmap("background.png")
+exposed = QRegion()
+pixmap.scroll(10, 10, pixmap.rect(), exposed)
+//! [2]
diff --git a/doc/codesnippets/doc/src/snippets/code/src_gui_image_qpixmapcache.cpp b/doc/codesnippets/doc/src/snippets/code/src_gui_image_qpixmapcache.cpp
index fd9f42a..3c54d28 100644
--- a/doc/codesnippets/doc/src/snippets/code/src_gui_image_qpixmapcache.cpp
+++ b/doc/codesnippets/doc/src/snippets/code/src_gui_image_qpixmapcache.cpp
@@ -1,6 +1,6 @@
 //! [0]
-pm = QPixmapCache.find("my_big_image")
-if not pm.isNull():
+pm = QPixmap()
+if not QPixmapCache.find("my_big_image", pm):
     pm.load("bigimage.png")
     QPixmapCache.insert("my_big_image", pm)
 painter.drawPixmap(0, 0, pm)
@@ -8,8 +8,8 @@ painter.drawPixmap(0, 0, pm)
 
 
 //! [1]
-pm = QPixmapCache.find("my_big_image")
-if not pm.isNull():
+pm = QPixmap()
+if not QPixmapCache.find("my_big_image", pm):
     pm.load("bigimage.png")
     QPixmapCache.insert("my_big_image", pm)
 painter.drawPixmap(0, 0, pm)
diff --git a/doc/codesnippets/doc/src/snippets/code/src_gui_itemviews_qstandarditemmodel.cpp b/doc/codesnippets/doc/src/snippets/code/src_gui_itemviews_qstandarditemmodel.cpp
index 8086919..b7f91e0 100644
--- a/doc/codesnippets/doc/src/snippets/code/src_gui_itemviews_qstandarditemmodel.cpp
+++ b/doc/codesnippets/doc/src/snippets/code/src_gui_itemviews_qstandarditemmodel.cpp
@@ -2,7 +2,7 @@
 model = QStandardItemModel (4, 4)
 for row in range(4):
     for column in range(4):
-        item = QStandardItem(QString("row %0, column %1").arg(row).arg(column))
+        item = QStandardItem("row %d, column %d" % (row, column))
         model.setItem(row, column, item)
 //! [0]
 
@@ -11,7 +11,7 @@ for row in range(4):
 model = QStandardItemModel()
 parentItem = model.invisibleRootItem()
 for i in range(4):
-    item = QStandardItem(QString("item %0").arg(i))
+    item = QStandardItem("item %d" % i)
     parentItem.appendRow(item)
     parentItem = item
 //! [1]
@@ -20,8 +20,7 @@ for i in range(4):
 //! [2]
 treeView = QTreeView(self)
 treeView.setModel(myStandardItemModel)
-connect(treeView, SIGNAL('clicked(QModelIndex)')
-        this, SLOT('clicked(QModelIndex)'))
+treeView.clicked[QModelIndex].connect(self.clicked)
 //! [2]
 
 
diff --git a/doc/codesnippets/doc/src/snippets/code/src_gui_painting_qpainter.cpp b/doc/codesnippets/doc/src/snippets/code/src_gui_painting_qpainter.cpp
index dca1292..c9b7d91 100644
--- a/doc/codesnippets/doc/src/snippets/code/src_gui_painting_qpainter.cpp
+++ b/doc/codesnippets/doc/src/snippets/code/src_gui_painting_qpainter.cpp
@@ -193,3 +193,19 @@ image = QImage(":/images/myImage.png")
 painter = QPainter(self)
 painter.drawImage(target, image, source)
 //! [20]
+
+//! [21]
+painter = QPainter(self)
+painter.fillRect(0, 0, 128, 128, Qt.green)
+painter.beginNativePainting()
+
+glEnable(GL_SCISSOR_TEST)
+glScissor(0, 0, 64, 64)
+
+glClearColor(1, 0, 0, 1)
+glClear(GL_COLOR_BUFFER_BIT)
+
+glDisable(GL_SCISSOR_TEST)
+
+painter.endNativePainting()
+//! [21]
diff --git a/doc/codesnippets/doc/src/snippets/code/src_gui_widgets_qmainwindow.cpp b/doc/codesnippets/doc/src/snippets/code/src_gui_widgets_qmainwindow.cpp
new file mode 100644
index 0000000..465fff1
--- /dev/null
+++ b/doc/codesnippets/doc/src/snippets/code/src_gui_widgets_qmainwindow.cpp
@@ -0,0 +1,15 @@
+//! [0]
+def closeEvent(self, event):
+    settings = QSettings("MyCompany", "MyApp")
+    settings.setValue("geometry", self.saveGeometry())
+    settings.setValue("windowState", self.saveState())
+    QMainWindow.closeEvent(self, event)
+//! [0]
+
+
+//! [1]
+def readSettings(self):
+    settings = QSettings("MyCompany", "MyApp")
+    restoreGeometry(settings.value("myWidget/geometry"))
+    restoreState(settings.value("myWidget/windowState"))
+//! [1]
diff --git a/doc/codesnippets/doc/src/snippets/code/src_network_access_qnetworkaccessmanager.cpp b/doc/codesnippets/doc/src/snippets/code/src_network_access_qnetworkaccessmanager.cpp
index 73b58c1..9d0ed1c 100644
--- a/doc/codesnippets/doc/src/snippets/code/src_network_access_qnetworkaccessmanager.cpp
+++ b/doc/codesnippets/doc/src/snippets/code/src_network_access_qnetworkaccessmanager.cpp
@@ -1,21 +1,36 @@
 //! [0]
 manager = QNetworkAccessManager(self)
-connect(manager, SIGNAL(finished("QNetworkReply*")),
-        self, SLOT(replyFinished("QNetworkReply*")))
+manager.finished[QNetworkReply].connect(self.replyFinished)
 
-manager.get(QNetworkRequest(QUrl("http://qtsoftware.com")))
+manager.get(QNetworkRequest(QUrl("http://qt.nokia.com")))
 //! [0]
 
 
 //! [1]
-QNetworkRequest request
-request.setUrl(QUrl("http://qtsoftware.com"))
+request = QNetworkRequest()
+request.setUrl(QUrl("http://qt.nokia.com"))
 request.setRawHeader("User-Agent", "MyOwnBrowser 1.0")
 
 reply = manager.get(request)
-connect(reply, SIGNAL("readyRead()"), self, SLOT("slotReadyRead()"))
-connect(reply, SIGNAL(error("QNetworkReply.NetworkError")),
-        self, SLOT(slotError("QNetworkReply.NetworkError")))
-connect(reply, SIGNAL(sslErrors("QList<QSslError>")),
-        self, SLOT(slotSslErrors("QList<QSslError>")))
+reply.readyRead.connect(self.slotReadyRead)
+reply.error[QNetworkReply.NetworkError].connect(self..slotError)
+reply.sslErrors.connect(self.slotSslErrors)
 //! [1]
+
+//! [2]
+manager = QNetworkConfigurationManager()
+networkAccessManager.setConfiguration(manager.defaultConfiguration())
+//! [2]
+
+//! [3]
+networkAccessManager.setConfiguration(QNetworkConfiguration())
+//! [3]
+
+//! [4]
+networkAccessManager.setNetworkAccessible(QNetworkAccessManager.NotAccessible)
+//! [4]
+
+//! [5]
+networkAccessManager.setNetworkAccessible(QNetworkAccessManager.Accessible)
+//! [5]
+
diff --git a/doc/codesnippets/doc/src/snippets/code/src_network_access_qnetworkdiskcache.cpp b/doc/codesnippets/doc/src/snippets/code/src_network_access_qnetworkdiskcache.cpp
new file mode 100644
index 0000000..8d18510
--- /dev/null
+++ b/doc/codesnippets/doc/src/snippets/code/src_network_access_qnetworkdiskcache.cpp
@@ -0,0 +1,24 @@
+//! [0]
+manager = QNetworkAccessManager(self)
+diskCache = QNetworkDiskCache(self)
+diskCache.setCacheDirectory("cacheDir")
+manager.setCache(diskCache)
+//! [0]
+
+//! [1]
+# do a normal request (preferred from network, as this is the default)
+request = QNetworkRequest(QUrl("http://qt.nokia.com"))
+manager.get(request)
+
+# do a request preferred from cache
+request2 = QNetworkRequest(QUrl("http://qt.nokia.com"))
+request2.setAttribute(QNetworkRequest.CacheLoadControlAttribute, QNetworkRequest.PreferCache)
+manager.get(request2)
+//! [1]
+
+//! [2]
+@Slot(QNetworkReply)
+def replyFinished(reply):
+    fromCache = reply.attribute(QNetworkRequest.SourceIsFromCacheAttribute)
+    print("page from cache? %d" % fromCache)
+//! [2]
diff --git a/doc/codesnippets/doc/src/snippets/code/src_network_bearer_qnetworkconfigmanager.cpp b/doc/codesnippets/doc/src/snippets/code/src_network_bearer_qnetworkconfigmanager.cpp
new file mode 100644
index 0000000..837ea03
--- /dev/null
+++ b/doc/codesnippets/doc/src/snippets/code/src_network_bearer_qnetworkconfigmanager.cpp
@@ -0,0 +1,8 @@
+//! [0]
+mgr = QNetworkConfigurationManager()
+activeConfigs = mgr.allConfigurations(QNetworkConfiguration.Active)
+if activeConfigs:
+    assert(mgr.isOnline())
+else:
+    assert(not mgr.isOnline())
+//! [0]
diff --git a/doc/codesnippets/doc/src/snippets/code/src_opengl_qglshaderprogram.cpp b/doc/codesnippets/doc/src/snippets/code/src_opengl_qglshaderprogram.cpp
new file mode 100644
index 0000000..9c8f35a
--- /dev/null
+++ b/doc/codesnippets/doc/src/snippets/code/src_opengl_qglshaderprogram.cpp
@@ -0,0 +1,53 @@
+//! [0]
+shader = QGLShader(QGLShader.Vertex)
+shader.compileSourceCode(code)
+
+program = QGLShaderProgram(context)
+program.addShader(shader)
+program.link()
+
+program.bind()
+//! [0]
+
+//! [1]
+program.addShaderFromSourceCode(QGLShader.Vertex,
+    "attribute highp vec4 vertex\n" \
+    "attribute mediump mat4 matrix\n" \
+    "void main(void)\n" \
+    "{\n" \
+    "   gl_Position = matrix * vertex\n" \
+    "}")
+program.addShaderFromSourceCode(QGLShader.Fragment,
+    "uniform mediump vec4 color\n" \
+    "void main(void)\n" \
+    "{\n" \
+    "   gl_FragColor = color\n" \
+    "}")
+program.link()
+program.bind()
+
+vertexLocation = program.attributeLocation("vertex")
+matrixLocation = program.attributeLocation("matrix")
+colorLocation = program.uniformLocation("color")
+//! [1]
+
+//! [2]
+triangleVertices = (
+    60.0f,  10.0f,  0.0f,
+    110.0f, 110.0f, 0.0f,
+    10.0f,  110.0f, 0.0f)
+
+color = QColor(0, 255, 0, 255)
+
+pmvMatrix = QMatrix4x4()
+pmvMatrix.ortho(self.rect())
+
+program.enableAttributeArray(vertexLocation)
+program.setAttributeArray(vertexLocation, triangleVertices, 3)
+program.setUniformValue(matrixLocation, pmvMatrix)
+program.setUniformValue(colorLocation, color)
+
+glDrawArrays(GL_TRIANGLES, 0, 3)
+
+program.disableAttributeArray(vertexLocation)
+//! [2]
diff --git a/doc/codesnippets/doc/src/snippets/code/src_qdbus_qdbusabstractinterface.cpp b/doc/codesnippets/doc/src/snippets/code/src_qdbus_qdbusabstractinterface.cpp
deleted file mode 100644
index cc5b86d..0000000
--- a/doc/codesnippets/doc/src/snippets/code/src_qdbus_qdbusabstractinterface.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//! [0]
-QString value = retrieveValue();
-QDBusMessage reply;
-
-QDBusReply<int> api = interface->call(QLatin1String("GetAPIVersion"));
-if (api >= 14)
-  reply = interface->call(QLatin1String("ProcessWorkUnicode"), value);
-else
-  reply = interface->call(QLatin1String("ProcessWork"), QLatin1String("UTF-8"), value.toUtf8());
-//! [0]
-
-//! [1]
-QString value = retrieveValue();
-QDBusPendingCall pcall = interface->asyncCall(QLatin1String("Process"), value);
-
-QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(pcall, this);
-
-QObject::connect(watcher, SIGNAL(finished(QDBusPendingCallWatcher*)),
-                 this, SLOT(callFinishedSlot(QDBusPendingCallWatcher*)));
-//! [1]
diff --git a/doc/codesnippets/doc/src/snippets/code/src_qdbus_qdbusargument.cpp b/doc/codesnippets/doc/src/snippets/code/src_qdbus_qdbusargument.cpp
deleted file mode 100644
index efd54ac..0000000
--- a/doc/codesnippets/doc/src/snippets/code/src_qdbus_qdbusargument.cpp
+++ /dev/null
@@ -1,151 +0,0 @@
-//! [0]
-struct MyStructure
-{
-    int count;
-    QString name;
-};
-Q_DECLARE_METATYPE(MyStructure)
-
-// Marshall the MyStructure data into a D-Bus argument
-QDBusArgument &operator<<(QDBusArgument &argument, const MyStructure &mystruct)
-{
-    argument.beginStructure();
-    argument << mystruct.count << mystruct.name;
-    argument.endStructure();
-    return argument;
-}
-
-// Retrieve the MyStructure data from the D-Bus argument
-const QDBusArgument &operator>>(const QDBusArgument &argument, MyStructure &mystruct)
-{
-    argument.beginStructure();
-    argument >> mystruct.count >> mystruct.name;
-    argument.endStructure();
-    return argument;
-}
-//! [0]
-
-
-//! [1]
-qDBusRegisterMetaType<MyStructure>();
-//! [1]
-
-
-//! [2]
-MyType item = qdbus_cast<Type>(argument);
-//! [2]
-
-
-//! [3]
-MyType item;
-argument >> item;
-//! [3]
-
-
-//! [4]
-QDBusArgument &operator<<(QDBusArgument &argument, const MyStructure &mystruct)
-{
-    argument.beginStructure();
-    argument << mystruct.member1 << mystruct.member2 << ... ;
-    argument.endStructure();
-    return argument;
-}
-//! [4]
-
-
-//! [5]
-QDBusArgument &operator<<(QDBusArgument &argument, const MyStructure &mystruct)
-{
-    argument.beginStructure();
-    argument << mystruct.member1 << mystruct.member2;
-
-    argument.beginStructure();
-    argument << mystruct.member3.subMember1 << mystruct.member3.subMember2;
-    argument.endStructure();
-
-    argument << mystruct.member4;
-    argument.endStructure();
-    return argument;
-}
-//! [5]
-
-
-//! [6]
-// append an array of MyElement types
-QDBusArgument &operator<<(QDBusArgument &argument, const MyArray &myarray)
-{
-    argument.beginArray( qMetaTypeId<MyElement>() );
-    for ( int i = 0; i < myarray.length; ++i )
-        argument << myarray.elements[i];
-    argument.endArray();
-    return argument;
-}
-//! [6]
-
-
-//! [7]
-// append a dictionary that associates ints to MyValue types
-QDBusArgument &operator<<(QDBusArgument &argument, const MyDictionary &mydict)
-{
-    argument.beginMap( QVariant::Int, qMetaTypeId<MyValue>() );
-    for ( int i = 0; i < mydict.length; ++i ) {
-        argument.beginMapEntry();
-        argument << mydict.data[i].key << mydict.data[i].value;
-        argument.endMapEntry();
-    }
-    argument.endMap();
-    return argument;
-}
-//! [7]
-
-
-//! [8]
-const QDBusArgument &operator>>(const QDBusArgument &argument, MyStructure &mystruct)
-{
-    argument.beginStructure()
-    argument >> mystruct.member1 >> mystruct.member2 >> mystruct.member3 >> ...;
-    argument.endStructure();
-    return argument;
-}
-//! [8]
-
-
-//! [9]
-// extract a MyArray array of MyElement elements
-const QDBusArgument &operator>>(const QDBusArgument &argument, MyArray &myarray)
-{
-    argument.beginArray();
-    myarray.clear();
-
-    while ( !argument.atEnd() ) {
-        MyElement element;
-        argument >> element;
-        myarray.append( element );
-    }
-
-    argument.endArray();
-    return argument;
-}
-//! [9]
-
-
-//! [10]
-// extract a MyDictionary map that associates ints to MyValue elements
-const QDBusArgument &operator>>(const QDBusArgument &argument, MyDictionary &mydict)
-{
-    argument.beginMap();
-    mydict.clear();
-
-    while ( !argMap.atEnd() ) {
-        int key;
-        MyValue value;
-        argument.beginMapEntry();
-        argument >> key >> value;
-        argument.endMapEntry();
-        mydict.append( key, value );
-    }
-
-    argument.endMap();
-    return argument;
-}
-//! [10]
diff --git a/doc/codesnippets/doc/src/snippets/code/src_qdbus_qdbuscontext.cpp b/doc/codesnippets/doc/src/snippets/code/src_qdbus_qdbuscontext.cpp
deleted file mode 100644
index 2a8c868..0000000
--- a/doc/codesnippets/doc/src/snippets/code/src_qdbus_qdbuscontext.cpp
+++ /dev/null
@@ -1,32 +0,0 @@
-//! [0]
-class MyObject: public QObject,
-                protected QDBusContext
-{
-    Q_OBJECT
-    QDBusConnection conn;
-    QDBusMessage msg;
-
-...
-
-protected slots:
-    void process();
-public slots:
-    void methodWithError();
-    QString methodWithDelayedReply();
-};
-
-void MyObject::methodWithError()
-{
-    sendErrorReply(QDBusError::NotSupported,
-                   "The method call 'methodWithError()' is not supported");
-}
-
-QString MyObject::methodWithDelayedReply()
-{
-    conn = connection();
-    msg = message();
-    setDelayedReply(true);
-    QMetaObject::invokeMethod(this, "process", Qt::QueuedConnection);
-    return QString();
-}
-//! [0]
diff --git a/doc/codesnippets/doc/src/snippets/code/src_qdbus_qdbusinterface.cpp b/doc/codesnippets/doc/src/snippets/code/src_qdbus_qdbusinterface.cpp
deleted file mode 100644
index df883e7..0000000
--- a/doc/codesnippets/doc/src/snippets/code/src_qdbus_qdbusinterface.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
-//! [0]
-QDBusInterface remoteApp( "com.example.Calculator", "/Calculator/Operations",
-                          "org.mathematics.RPNCalculator" );
-remoteApp.call( "PushOperand", 2 );
-remoteApp.call( "PushOperand", 2 );
-remoteApp.call( "ExecuteOperation", "+" );
-QDBusReply<int> reply = remoteApp.call( "PopOperand" );
-
-if ( reply.isValid() )
-    printf( "%d", reply.value() );          // prints 4
-//! [0]
diff --git a/doc/codesnippets/doc/src/snippets/code/src_qdbus_qdbusmetatype.cpp b/doc/codesnippets/doc/src/snippets/code/src_qdbus_qdbusmetatype.cpp
deleted file mode 100644
index 99fd6e4..0000000
--- a/doc/codesnippets/doc/src/snippets/code/src_qdbus_qdbusmetatype.cpp
+++ /dev/null
@@ -1,3 +0,0 @@
-//! [0]
-qDBusRegisterMetaType<MyClass>();
-//! [0]
diff --git a/doc/codesnippets/doc/src/snippets/code/src_qdbus_qdbusreply.cpp b/doc/codesnippets/doc/src/snippets/code/src_qdbus_qdbusreply.cpp
deleted file mode 100644
index 4dc896f..0000000
--- a/doc/codesnippets/doc/src/snippets/code/src_qdbus_qdbusreply.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-//! [0]
-QDBusReply<QString> reply = interface->call("RemoteMethod");
-if (reply.isValid())
-    // use the returned value
-    useValue(reply.value());
-else
-    // call failed. Show an error condition.
-    showError(reply.error());
-//! [0]
-
-
-//! [1]
-QString reply = interface->call("RemoteMethod");
-//! [1]
diff --git a/doc/codesnippets/doc/src/snippets/code/src_qt3support_canvas_q3canvas.cpp b/doc/codesnippets/doc/src/snippets/code/src_qt3support_canvas_q3canvas.cpp
deleted file mode 100644
index bca056c..0000000
--- a/doc/codesnippets/doc/src/snippets/code/src_qt3support_canvas_q3canvas.cpp
+++ /dev/null
@@ -1,51 +0,0 @@
-//! [0]
-QPrinter pr;
-if (pr.setup()) {
-    QPainter p(&pr);
-    canvas.drawArea(canvas.rect(), &p);
-}
-//! [0]
-
-
-//! [1]
-void MyCanvasView::contentsMousePressEvent(QMouseEvent* e)
-{
-    Q3CanvasItemList l = canvas()->collisions(e->pos());
-    for (Q3CanvasItemList::Iterator it=l.begin(); it!=l.end(); ++it) {
-        if ((*it)->rtti() == Q3CanvasRectangle::RTTI)
-            qDebug("A Q3CanvasRectangle lies somewhere at this point");
-    }
-}
-//! [1]
-
-
-//! [2]
-QMatrix wm;
-wm.scale(2, 2);   // Zooms in by 2 times
-wm.rotate(90);    // Rotates 90 degrees counter clockwise
-                  // around the origin.
-wm.translate(0, -canvas->height());
-                  // moves the canvas down so what was visible
-                  // before is still visible.
-myCanvasView->setWorldMatrix(wm);
-//! [2]
-
-
-//! [3]
-QRect rc = QRect(myCanvasView->contentsX(), myCanvasView->contentsY(),
-                 myCanvasView->visibleWidth(), myCanvasView->visibleHeight());
-QRect canvasRect = myCanvasView->inverseWorldMatrix().mapRect(rc);
-//! [3]
-
-
-//! [4]
-Q3CanvasItem* item;
-// Find an item, e.g. with Q3CanvasItem::collisions().
-...
-if (item->rtti() == MySprite::RTTI) {
-    MySprite* s = (MySprite*)item;
-    if (s->isDamagable()) s->loseHitPoints(1000);
-    if (s->isHot()) myself->loseHitPoints(1000);
-    ...
-}
-//! [4]
diff --git a/doc/codesnippets/doc/src/snippets/code/src_qt3support_dialogs_q3filedialog.cpp b/doc/codesnippets/doc/src/snippets/code/src_qt3support_dialogs_q3filedialog.cpp
deleted file mode 100644
index ea66985..0000000
--- a/doc/codesnippets/doc/src/snippets/code/src_qt3support_dialogs_q3filedialog.cpp
+++ /dev/null
@@ -1,229 +0,0 @@
-//! [0]
-QString s = Q3FileDialog::getOpenFileName(
-                "/home",
-                "Images (*.png *.xpm *.jpg)",
-                this,
-                "open file dialog",
-                "Choose a file");
-//! [0]
-
-
-//! [1]
-"Images (*.png *.xpm *.jpg);;Text files (*.txt);;XML files (*.xml)"
-//! [1]
-
-
-//! [2]
-Q3FileDialog* fd = new Q3FileDialog(this, "file dialog", true);
-fd->setMode(Q3FileDialog::AnyFile);
-//! [2]
-
-
-//! [3]
-fd->setFilter("Images (*.png *.xpm *.jpg)");
-//! [3]
-
-
-//! [4]
-fd->setViewMode(Q3FileDialog::Detail);
-//! [4]
-
-
-//! [5]
-QString fileName;
-if (fd->exec() == QDialog::Accepted)
-    fileName = fd->selectedFile();
-//! [5]
-
-
-//! [6]
-class Preview : public QLabel, public Q3FilePreview
-{
-public:
-    Preview(QWidget *parent=0) : QLabel(parent) {}
-
-    void previewUrl(const Q3Url &u)
-    {
-        QString path = u.path();
-        QPixmap pix(path);
-        if (pix.isNull())
-            setText("This is not a pixmap");
-        else
-            setPixmap(pix);
-    }
-};
-//! [6]
-
-
-//! [7]
-Preview* p = new Preview;
-
-Q3FileDialog* fd = new Q3FileDialog(this);
-fd->setContentsPreviewEnabled(true);
-fd->setContentsPreview(p, p);
-fd->setPreviewMode(Q3FileDialog::Contents);
-fd->show();
-//! [7]
-
-
-//! [8]
-QStringList list = myFileDialog.selectedFiles();
-QStringList::Iterator it = list.begin();
-while(it != list.end()) {
-    myProcessing(*it);
-    ++it;
-}
-//! [8]
-
-
-//! [9]
-fd->setFilter("All C++ files (*.cpp *.cc *.C *.cxx *.c++)");
-fd->setFilter("*.cpp *.cc *.C *.cxx *.c++");
-fd->setFilter("All C++ files (*.cpp;*.cc;*.C;*.cxx;*.c++)");
-fd->setFilter("*.cpp;*.cc;*.C;*.cxx;*.c++");
-//! [9]
-
-
-//! [10]
-QString s = Q3FileDialog::getOpenFileName(
-                "/home",
-                "Images (*.png *.xpm *.jpg)",
-                this,
-                "open file dialog",
-                "Choose a file to open");
-//! [10]
-
-
-//! [11]
-QString s = Q3FileDialog::getSaveFileName(
-                "/home",
-                "Images (*.png *.xpm *.jpg)",
-                this,
-                "save file dialog",
-                "Choose a filename to save under");
-//! [11]
-
-
-//! [12]
-QString s = Q3FileDialog::getExistingDirectory(
-                "/home",
-                this,
-                "get existing directory",
-                "Choose a directory",
-                true);
-//! [12]
-
-
-//! [13]
-MyFileDialog::MyFileDialog(QWidget* parent, const char* name) :
-    Q3FileDialog(parent, name)
-{
-    QLabel* label = new QLabel("Added widgets", this);
-    QLineEdit* lineedit = new QLineEdit(this);
-    QPushButton* pushbutton = new QPushButton(this);
-
-    addWidgets(label, lineedit, pushbutton);
-}
-//! [13]
-
-
-//! [14]
-QString types("Image files (*.png *.xpm *.jpg);;"
-              "Text files (*.txt);;"
-              "Any files (*)");
-Q3FileDialog fd = new Q3FileDialog(this);
-fd->setFilters(types);
-fd->show();
-//! [14]
-
-
-//! [15]
-Q3FileDialog* fd = new Q3FileDialog(this);
-fd->addFilter("Images (*.png *.jpg *.xpm)");
-fd->show();
-//! [15]
-
-
-//! [16]
-QStringList files = Q3FileDialog::getOpenFileNames(
-                        "Images (*.png *.xpm *.jpg)",
-                        "/home",
-                        this,
-                        "open files dialog",
-                        "Select one or more files to open");
-//! [16]
-
-
-//! [17]
-QStringList list = files;
-QStringList::Iterator it = list.begin();
-while(it != list.end()) {
-    myProcessing(*it);
-    ++it;
-}
-//! [17]
-
-
-//! [18]
-class Preview : public QLabel, public Q3FilePreview
-{
-public:
-    Preview(QWidget *parent=0) : QLabel(parent) {}
-
-    void previewUrl(const Q3Url &u)
-    {
-        QString path = u.path();
-        QPixmap pix(path);
-        if (pix.isNull())
-            setText("This is not a pixmap");
-        else
-            setText("This is a pixmap");
-    }
-};
-
-//...
-
-int main(int argc, char** argv)
-{
-    Preview* p = new Preview;
-
-    Q3FileDialog* fd = new Q3FileDialog(this);
-    fd->setInfoPreviewEnabled(true);
-    fd->setInfoPreview(p, p);
-    fd->setPreviewMode(Q3FileDialog::Info);
-    fd->show();
-}
-
-//! [18]
-
-
-//! [19]
-class Preview : public QLabel, public Q3FilePreview
-{
-public:
-    Preview(QWidget *parent=0) : QLabel(parent) {}
-
-    void previewUrl(const Q3Url &u)
-    {
-        QString path = u.path();
-        QPixmap pix(path);
-        if (pix.isNull())
-            setText("This is not a pixmap");
-        else
-            setPixmap(pix);
-    }
-};
-
-//...
-
-int main(int argc, char** argv)
-{
-    Preview* p = new Preview;
-
-    Q3FileDialog* fd = new Q3FileDialog(this);
-    fd->setContentsPreviewEnabled(true);
-    fd->setContentsPreview(p, p);
-    fd->setPreviewMode(Q3FileDialog::Contents);
-    fd->show();
-}
-//! [19]
diff --git a/doc/codesnippets/doc/src/snippets/code/src_qt3support_dialogs_q3progressdialog.cpp b/doc/codesnippets/doc/src/snippets/code/src_qt3support_dialogs_q3progressdialog.cpp
deleted file mode 100644
index 8aeafe8..0000000
--- a/doc/codesnippets/doc/src/snippets/code/src_qt3support_dialogs_q3progressdialog.cpp
+++ /dev/null
@@ -1,41 +0,0 @@
-//! [0]
-Q3ProgressDialog progress("Copying files...", "Abort Copy", numFiles,
-                          this, "progress", true);
-for (int i = 0; i < numFiles; i++) {
-    progress.setProgress(i);
-    qApp->processEvents();
-
-    if (progress.wasCanceled())
-        break;
-    //... copy one file
-}
-progress.setProgress(numFiles);
-//! [0]
-
-
-//! [1]
-Operation::Operation(QObject *parent = 0)
-    : QObject(parent), steps(0)
-{
-    pd = new Q3ProgressDialog("Operation in progress.", "Cancel", 100);
-    connect(pd, SIGNAL(canceled()), this, SLOT(cancel()));
-    t = new QTimer(this);
-    connect(t, SIGNAL(timeout()), this, SLOT(perform()));
-    t->start(0);
-}
-
-void Operation::perform()
-{
-    pd->setProgress(steps);
-    //... perform one percent of the operation
-    steps++;
-    if (steps > pd->totalSteps())
-        t->stop();
-}
-
-void Operation::cancel()
-{
-    t->stop();
-    //... cleanup
-}
-//! [1]
diff --git a/doc/codesnippets/doc/src/snippets/code/src_qt3support_itemviews_q3iconview.cpp b/doc/codesnippets/doc/src/snippets/code/src_qt3support_itemviews_q3iconview.cpp
deleted file mode 100644
index 8c30389..0000000
--- a/doc/codesnippets/doc/src/snippets/code/src_qt3support_itemviews_q3iconview.cpp
+++ /dev/null
@@ -1,75 +0,0 @@
-//! [0]
-(void) new Q3IconViewItem(
-                iconView,        // A pointer to a Q3IconView
-                "This is the text of the item",
-                aPixmap);
-//! [0]
-
-
-//! [1]
-Q3IconViewItem *item;
-for (item = iconView->firstItem(); item; item = item->nextItem())
-    do_something_with(item);
-//! [1]
-
-
-//! [2]
-Q3IconViewItem *item;
-for (item = iconView->firstItem(); item; item = item->nextItem())
-    do_something_with(item);
-//! [2]
-
-
-//! [3]
-int MyIconViewItem::compare(Q3IconViewItem *i) const
-{
-    return key().compare(i->key());
-}
-//! [3]
-
-
-//! [4]
-Q3IconView *iv = new Q3IconView(this);
-QDir dir(path, "*.xpm");
-for (uint i = 0; i < dir.count(); i++) {
-    (void) new Q3IconViewItem(iv, dir[i], QPixmap(path + dir[i]));
-}
-iv->resize(600, 400);
-iv->show();
-//! [4]
-
-
-//! [5]
-for (Q3IconViewItem *item = iv->firstItem(); item; item = item->nextItem())
-    do_something(item);
-//! [5]
-
-
-//! [6]
-Q3DragObject *MyIconView::dragObject()
-{
-    return new Q3TextDrag(currentItem()->text(), this);
-}
-//! [6]
-
-
-//! [7]
-bool MyIconViewItem::acceptDrop(const QMimeSource *mime) const
-{
-    if (mime->provides("text/plain"))
-        return true;
-    return false;
-}
-
-void MyIconViewItem::dropped(QDropEvent *evt, const Q3ValueList<Q3IconDragItem>&)
-{
-    QString label;
-    if (Q3TextDrag::decode(evt, label))
-        setText(label);
-}
-//! [7]
-
-
-//! [8]
-(void) new Q3IconViewItem(myIconview, "The text of the item", aPixmap);
-//! [8]
diff --git a/doc/codesnippets/doc/src/snippets/code/src_qt3support_itemviews_q3listview.cpp b/doc/codesnippets/doc/src/snippets/code/src_qt3support_itemviews_q3listview.cpp
deleted file mode 100644
index 615f124..0000000
--- a/doc/codesnippets/doc/src/snippets/code/src_qt3support_itemviews_q3listview.cpp
+++ /dev/null
@@ -1,73 +0,0 @@
-//! [0]
-(void) new Q3ListViewItem(listView, "Column 1", "Column 2");
-(void) new Q3ListViewItem(listView->firstChild(), "A", "B", "C");
-//! [0]
-
-
-//! [1]
-Q3ListViewItem * myChild = myItem->firstChild();
-while(myChild) {
-    doSomething(myChild);
-    myChild = myChild->nextSibling();
-}
-//! [1]
-
-
-//! [2]
-Q3ListViewItemIterator it(listview);
-while (it.current()) {
-    Q3ListViewItem *item = it.current();
-    doSomething(item);
-    ++it;
-}
-//! [2]
-
-
-//! [3]
-int MyListViewItem::compare(Q3ListViewItem *i, int col,
-                             bool ascending) const
-{
-    return key(col, ascending).compare(i->key(col, ascending));
-}
-//! [3]
-
-
-//! [4]
-Q3ListViewItem *i = itemAt(p);
-if (i) {
-    if (p.x() > header()->sectionPos(header()->mapToIndex(0)) +
-            treeStepSize() * (i->depth() + (rootIsDecorated() ? 1 : 0)) + itemMargin() ||
-            p.x() < header()->sectionPos(header()->mapToIndex(0))) {
-        ; // p is not on root decoration
-    else
-        ; // p is on the root decoration
-}
-//! [4]
-
-
-//! [5]
-QRect r(listView->itemRect(item));
-r.setHeight(qMin(item->totalHeight(),
-                 listView->viewport->height() - r.y()))
-//! [5]
-
-
-//! [6]
-QList<Q3ListViewItem *> lst;
-Q3ListViewItemIterator it(myListView);
-while (it.current()) {
-    if (it.current()->isSelected())
-        lst.append(it.current());
-    ++it;
-}
-//! [6]
-
-
-//! [7]
-QList<Q3ListViewItem *> lst;
-Q3ListViewItemIterator it(myListView, Selected);
-while (it.current()) {
-    lst.append(it.current());
-    ++it;
-}
-//! [7]
diff --git a/doc/codesnippets/doc/src/snippets/code/src_qt3support_itemviews_q3table.cpp b/doc/codesnippets/doc/src/snippets/code/src_qt3support_itemviews_q3table.cpp
deleted file mode 100644
index 47f9c4e..0000000
--- a/doc/codesnippets/doc/src/snippets/code/src_qt3support_itemviews_q3table.cpp
+++ /dev/null
@@ -1,57 +0,0 @@
-
-void wrapInFunction()
-{
-
-//! [0]
-for (int row = 0; row < table->numRows(); row++) {
-    for (int col = 0; col < table->numCols(); col++) {
-        table->setItem(row, col,
-            new Q3TableItem(table, Q3TableItem::WhenCurrent, QString::number(row * col)));
-    }
-}
-//! [0]
-
-
-//! [1]
-QWidget* MyTableItem::createEditor() const
-{
-    QHBox* hbox = new QHBox(table()->viewport());
-    hbox->setFocusProxy(new QLineEdit(hbox));
-    new QLineEdit(hbox);
-    return hbox;
-}
-//! [1]
-
-
-//! [2]
-p->setClipRect(table()->cellRect(row, col), QPainter::ClipPainter);
-//... your drawing code
-p->setClipping(false);
-//! [2]
-
-
-//! [3]
-Q3Table *table = new Q3Table(100, 250, this);
-table->setPixmap(3, 2, pix);
-table->setText(3, 2, "A pixmap");
-//! [3]
-
-
-//! [4]
-p->setClipRect(cellRect(row, col), QPainter::CoordPainter);
-//... your drawing code
-p->setClipping(false);
-//! [4]
-
-
-//! [5]
-Q3TableItem *i = item(row, col);
-if (initFromCell || (i && !i->isReplaceable()))
-    // If we had a Q3TableItem ask the base class to create the editor
-    return Q3Table::createEditor(row, col, initFromCell);
-else
-    return ...(create your own editor)
-//! [5]
-
-}
-
diff --git a/doc/codesnippets/doc/src/snippets/code/src_qt3support_network_q3dns.cpp b/doc/codesnippets/doc/src/snippets/code/src_qt3support_network_q3dns.cpp
deleted file mode 100644
index 9638ff1..0000000
--- a/doc/codesnippets/doc/src/snippets/code/src_qt3support_network_q3dns.cpp
+++ /dev/null
@@ -1,58 +0,0 @@
-//! [0]
-QStringList list = myDns.qualifiedNames();
-QStringList::Iterator it = list.begin();
-while( it != list.end() ) {
-    myProcessing( *it );
-    ++it;
-}
-//! [0]
-
-
-//! [1]
-Q3ValueList<QHostAddress> list = myDns.addresses();
-Q3ValueList<QHostAddress>::Iterator it = list.begin();
-while( it != list.end() ) {
-    myProcessing( *it );
-    ++it;
-}
-//! [1]
-
-
-//! [2]
-Q3ValueList<Q3Dns::MailServer> list = myDns.mailServers();
-Q3ValueList<Q3Dns::MailServer>::Iterator it = list.begin();
-while( it != list.end() ) {
-    myProcessing( *it );
-    ++it;
-}
-//! [2]
-
-
-//! [3]
-Q3ValueList<Q3Dns::Server> list = myDns.servers();
-Q3ValueList<Q3Dns::Server>::Iterator it = list.begin();
-while( it != list.end() ) {
-    myProcessing( *it );
-    ++it;
-}
-//! [3]
-
-
-//! [4]
-QStringList list = myDns.hostNames();
-QStringList::Iterator it = list.begin();
-while( it != list.end() ) {
-    myProcessing( *it );
-    ++it;
-}
-//! [4]
-
-
-//! [5]
-QStringList list = myDns.texts();
-QStringList::Iterator it = list.begin();
-while( it != list.end() ) {
-    myProcessing( *it );
-    ++it;
-}
-//! [5]
diff --git a/doc/codesnippets/doc/src/snippets/code/src_qt3support_network_q3ftp.cpp b/doc/codesnippets/doc/src/snippets/code/src_qt3support_network_q3ftp.cpp
deleted file mode 100644
index 37e17d4..0000000
--- a/doc/codesnippets/doc/src/snippets/code/src_qt3support_network_q3ftp.cpp
+++ /dev/null
@@ -1,65 +0,0 @@
-//! [0]
-QUrlOperator op( "ftp://ftp.trolltech.com" );
-op.listChildren(); // Asks the server to provide a directory listing
-//! [0]
-
-
-//! [1]
-Q3Ftp *ftp = new Q3Ftp( this ); // this is an optional QObject parent
-ftp->connectToHost( "ftp.trolltech.com" );
-ftp->login();
-//! [1]
-
-
-//! [2]
-ftp->connectToHost( "ftp.trolltech.com" );  // id == 1
-ftp->login();                               // id == 2
-ftp->cd( "qt" );                            // id == 3
-ftp->get( "INSTALL" );                      // id == 4
-ftp->close();                               // id == 5
-//! [2]
-
-
-//! [3]
-start( 1 )
-stateChanged( HostLookup )
-stateChanged( Connecting )
-stateChanged( Connected )
-finished( 1, false )
-
-start( 2 )
-stateChanged( LoggedIn )
-finished( 2, false )
-
-start( 3 )
-finished( 3, false )
-
-start( 4 )
-dataTransferProgress( 0, 3798 )
-dataTransferProgress( 2896, 3798 )
-readyRead()
-dataTransferProgress( 3798, 3798 )
-readyRead()
-finished( 4, false )
-
-start( 5 )
-stateChanged( Closing )
-stateChanged( Unconnected )
-finished( 5, false )
-
-done( false )
-//! [3]
-
-
-//! [4]
-start( 1 )
-stateChanged( HostLookup )
-stateChanged( Connecting )
-stateChanged( Connected )
-finished( 1, false )
-
-start( 2 )
-finished( 2, true )
-
-done( true )
-//! [4]
diff --git a/doc/codesnippets/doc/src/snippets/code/src_qt3support_network_q3http.cpp b/doc/codesnippets/doc/src/snippets/code/src_qt3support_network_q3http.cpp
deleted file mode 100644
index 6729c5f..0000000
--- a/doc/codesnippets/doc/src/snippets/code/src_qt3support_network_q3http.cpp
+++ /dev/null
@@ -1,74 +0,0 @@
-//! [0]
-content-type: text/html
-//! [0]
-
-
-//! [1]
-header.setValue( "content-type", "text/html" );
-QString contentType = header.value( "content-type" );
-//! [1]
-
-
-//! [2]
-QUrlOperator op( "http://qtsoftware.com" );
-op.get( "index.html" );
-//! [2]
-
-
-//! [3]
-Q3HttpRequestHeader header( "GET", "/index.html" );
-header.setValue( "Host", "qtsoftware.com" );
-http->setHost( "qtsoftware.com" );
-http->request( header );
-//! [3]
-
-
-//! [4]
-http->setHost( "qtsoftware.com" ); // id == 1
-http->get( "/index.html" );           // id == 2
-//! [4]
-
-
-//! [5]
-requestStarted( 1 )
-requestFinished( 1, false )
-
-requestStarted( 2 )
-stateChanged( Connecting )
-stateChanged( Sending )
-dataSendProgress( 77, 77 )
-stateChanged( Reading )
-responseHeaderReceived( responseheader )
-dataReadProgress( 5388, 0 )
-readyRead( responseheader )
-dataReadProgress( 18300, 0 )
-readyRead( responseheader )
-stateChanged( Connected )
-requestFinished( 2, false )
-
-done( false )
-
-stateChanged( Closing )
-stateChanged( Unconnected )
-//! [5]
-
-
-//! [6]
-http->setHost( "www.foo.bar" );       // id == 1
-http->get( "/index.html" );           // id == 2
-http->post( "register.html", data );  // id == 3
-//! [6]
-
-
-//! [7]
-requestStarted( 1 )
-requestFinished( 1, false )
-
-requestStarted( 2 )
-stateChanged( HostLookup )
-requestFinished( 2, true )
-
-done( true )
-
-stateChanged( Unconnected )
-//! [7]
diff --git a/doc/codesnippets/doc/src/snippets/code/src_qt3support_network_q3localfs.cpp b/doc/codesnippets/doc/src/snippets/code/src_qt3support_network_q3localfs.cpp
deleted file mode 100644
index 243be9e..0000000
--- a/doc/codesnippets/doc/src/snippets/code/src_qt3support_network_q3localfs.cpp
+++ /dev/null
@@ -1,4 +0,0 @@
-//! [0]
-Q3UrlOperator op( "file:///tmp" );
-op.listChildren(); // Asks the server to provide a directory listing
-//! [0]
diff --git a/doc/codesnippets/doc/src/snippets/code/src_qt3support_network_q3networkprotocol.cpp b/doc/codesnippets/doc/src/snippets/code/src_qt3support_network_q3networkprotocol.cpp
deleted file mode 100644
index 51d1059..0000000
--- a/doc/codesnippets/doc/src/snippets/code/src_qt3support_network_q3networkprotocol.cpp
+++ /dev/null
@@ -1,8 +0,0 @@
-//! [0]
-Q3NetworkProtocol::registerNetworkProtocol( "nntp", new Q3NetworkProtocolFactory<Nntp> );
-//! [0]
-
-
-//! [1]
-Q3Ftp *ftp = Q3NetworkProtocol::getNetworkProtocol( "ftp" );
-//! [1]
diff --git a/doc/codesnippets/doc/src/snippets/code/src_qt3support_network_q3socket.cpp b/doc/codesnippets/doc/src/snippets/code/src_qt3support_network_q3socket.cpp
deleted file mode 100644
index 34474fb..0000000
--- a/doc/codesnippets/doc/src/snippets/code/src_qt3support_network_q3socket.cpp
+++ /dev/null
@@ -1,4 +0,0 @@
-//! [0]
-while( !socket->canReadLine() ) // WRONG
-    ;
-//! [0]
diff --git a/doc/codesnippets/doc/src/snippets/code/src_qt3support_network_q3socketdevice.cpp b/doc/codesnippets/doc/src/snippets/code/src_qt3support_network_q3socketdevice.cpp
deleted file mode 100644
index cd50fd2..0000000
--- a/doc/codesnippets/doc/src/snippets/code/src_qt3support_network_q3socketdevice.cpp
+++ /dev/null
@@ -1,4 +0,0 @@
-//! [0]
-::close( sd->socket() );
-sd->writeBlock( someData, 42 );
-//! [0]
diff --git a/doc/codesnippets/doc/src/snippets/code/src_qt3support_network_q3url.cpp b/doc/codesnippets/doc/src/snippets/code/src_qt3support_network_q3url.cpp
deleted file mode 100644
index 3b78a57..0000000
--- a/doc/codesnippets/doc/src/snippets/code/src_qt3support_network_q3url.cpp
+++ /dev/null
@@ -1,43 +0,0 @@
-//! [0]
-Q3Url url( "http://qtsoftware.com" );
-// or
-Q3Url url( "file:///home/myself/Mail", "Inbox" );
-//! [0]
-
-
-//! [1]
-Q3Url url( "http://qtsoftware.com" );
-QString s = url;
-// or
-QString s( "http://qtsoftware.com" );
-Q3Url url( s );
-//! [1]
-
-
-//! [2]
-Q3Url url( "ftp://ftp.trolltech.com/qt/source", "qt-2.1.0.tar.gz" );
-//! [2]
-
-
-//! [3]
-Q3Url url( "ftp://ftp.trolltech.com/qt/source", "/usr/local" );
-//! [3]
-
-
-//! [4]
-Q3Url url( "ftp://ftp.trolltech.com/qt/source", "file:///usr/local" );
-//! [4]
-
-
-//! [5]
-QString url = http://qtsoftware.com
-Q3Url::encode( url );
-// url is now "http%3A//www%20trolltech%20com"
-//! [5]
-
-
-//! [6]
-QString url = "http%3A//www%20trolltech%20com"
-Q3Url::decode( url );
-// url is now "http://qtsoftware.com"
-//! [6]
diff --git a/doc/codesnippets/doc/src/snippets/code/src_qt3support_network_q3urloperator.cpp b/doc/codesnippets/doc/src/snippets/code/src_qt3support_network_q3urloperator.cpp
deleted file mode 100644
index 03b8f7b..0000000
--- a/doc/codesnippets/doc/src/snippets/code/src_qt3support_network_q3urloperator.cpp
+++ /dev/null
@@ -1,37 +0,0 @@
-//! [0]
-Q3UrlOperator *op = new Q3UrlOperator();
-op->copy( QString("ftp://ftp.trolltech.com/qt/source/qt-2.1.0.tar.gz"),
-	 "file:///tmp" );
-//! [0]
-
-
-//! [1]
-Q3UrlOperator op( "http://www.whatever.org/cgi-bin/search.pl?cmd=Hello" );
-op.get();
-//! [1]
-
-
-//! [2]
-Q3UrlOperator op( "ftp://ftp.whatever.org/pub" );
-// do some other stuff like op.listChildren() or op.mkdir( "new_dir" )
-op.get( "a_file.txt" );
-//! [2]
-
-
-//! [3]
-Q3UrlOperator op( "http://www.whatever.org/cgi-bin" );
-op.get( "search.pl?cmd=Hello" ); // WRONG!
-//! [3]
-
-
-//! [4]
-Q3UrlOperator op( "ftp://ftp.whatever.com/home/me/filename.dat" );
-op.put( data );
-//! [4]
-
-
-//! [5]
-Q3UrlOperator op( "ftp://ftp.whatever.com/home/me" );
-// do some other stuff like op.listChildren() or op.mkdir( "new_dir" )
-op.put( data, "filename.dat" );
-//! [5]
diff --git a/doc/codesnippets/doc/src/snippets/code/src_qt3support_other_q3accel.cpp b/doc/codesnippets/doc/src/snippets/code/src_qt3support_other_q3accel.cpp
deleted file mode 100644
index ba315c0..0000000
--- a/doc/codesnippets/doc/src/snippets/code/src_qt3support_other_q3accel.cpp
+++ /dev/null
@@ -1,40 +0,0 @@
-//! [0]
-QPushButton p("&Exit", parent); // automatic shortcut Alt+E
-Q3PopupMenu *fileMenu = new fileMenu(parent);
-fileMenu->insertItem("Undo", parent, SLOT(undo()),
-                     Qt::CTRL + Qt::Key_Z);
-//! [0]
-
-
-//! [1]
-accelerator->insertItem(QKeySequence("M"));
-//! [1]
-
-
-//! [2]
-Q3Accel *a = new Q3Accel(myWindow);
-a->connectItem(a->insertItem(Qt::CTRL + Qt::Key_P),
-               myWindow, SLOT(printDoc()));
-//! [2]
-
-
-//! [3]
-Q3Accel *a = new Q3Accel(myWindow);	   // create accels for myWindow
-a->insertItem(CTRL + Key_P, 200);	   // Ctrl+P, e.g. to print document
-a->insertItem(ALT + Key_X, 201);	   // Alt+X, e.g. to quit
-a->insertItem(UNICODE_ACCEL + 'q', 202);   // Unicode 'q', e.g. to quit
-a->insertItem(Key_D);			   // gets a unique negative id < -1
-a->insertItem(CTRL + SHIFT + Key_P);	   // gets a unique negative id < -1
-//! [3]
-
-
-//! [4]
-a->connectItem(201, mainView, SLOT(quit()));
-//! [4]
-
-
-//! [5]
-Q3PopupMenu *file = new Q3PopupMenu(this);
-file->insertItem(p1, tr("&Open..."), this, SLOT(open()),
-                  Q3Accel::stringToKey(tr("Ctrl+O", "File|Open")));
-//! [5]
diff --git a/doc/codesnippets/doc/src/snippets/code/src_qt3support_other_q3mimefactory.cpp b/doc/codesnippets/doc/src/snippets/code/src_qt3support_other_q3mimefactory.cpp
deleted file mode 100644
index f00ad73..0000000
--- a/doc/codesnippets/doc/src/snippets/code/src_qt3support_other_q3mimefactory.cpp
+++ /dev/null
@@ -1,32 +0,0 @@
-//! [0]
-static const char* myimage_data[]={
-"...",
-...
-"..."};
-//! [0]
-
-
-//! [1]
-Q3MimeSourceFactory::defaultFactory()->setImage("myimage", QImage(myimage_data));
-//! [1]
-
-
-//! [2]
-QLabel* label = new QLabel(
-    "Rich text with embedded image:<img source=\"myimage\">"
-    "Isn't that <em>cute</em>?");
-//! [2]
-
-
-//! [3]
-delete label;
-Q3MimeSourceFactory::defaultFactory()->setData("myimage", 0);
-//! [3]
-
-
-//! [4]
-setExtensionType("html", "text/html;charset=iso8859-1");
-setExtensionType("htm", "text/html;charset=iso8859-1");
-setExtensionType("txt", "text/plain");
-setExtensionType("xml", "text/xml;charset=UTF-8");
-//! [4]
diff --git a/doc/codesnippets/doc/src/snippets/code/src_qt3support_other_q3process.cpp b/doc/codesnippets/doc/src/snippets/code/src_qt3support_other_q3process.cpp
deleted file mode 100644
index 2ce94bb..0000000
--- a/doc/codesnippets/doc/src/snippets/code/src_qt3support_other_q3process.cpp
+++ /dev/null
@@ -1,8 +0,0 @@
-//! [0]
-QStringList list = myProcess.arguments();
-QStringList::Iterator it = list.begin();
-while( it != list.end() ) {
-    myProcessing( *it );
-    ++it;
-}
-//! [0]
diff --git a/doc/codesnippets/doc/src/snippets/code/src_qt3support_other_q3process_unix.cpp b/doc/codesnippets/doc/src/snippets/code/src_qt3support_other_q3process_unix.cpp
deleted file mode 100644
index c443c2e..0000000
--- a/doc/codesnippets/doc/src/snippets/code/src_qt3support_other_q3process_unix.cpp
+++ /dev/null
@@ -1,4 +0,0 @@
-//! [0]
-process->tryTerminate();
-QTimer::singleShot( 5000, process, SLOT(kill()) );
-//! [0]
diff --git a/doc/codesnippets/doc/src/snippets/code/src_qt3support_painting_q3paintdevicemetrics.cpp b/doc/codesnippets/doc/src/snippets/code/src_qt3support_painting_q3paintdevicemetrics.cpp
deleted file mode 100644
index 1e807d5..0000000
--- a/doc/codesnippets/doc/src/snippets/code/src_qt3support_painting_q3paintdevicemetrics.cpp
+++ /dev/null
@@ -1,4 +0,0 @@
-//! [0]
-Q3PaintDeviceMetrics pdm(myWidget);
-double aspect = (double)pdm.widthMM() / (double)pdm.heightMM();
-//! [0]
diff --git a/doc/codesnippets/doc/src/snippets/code/src_qt3support_painting_q3painter.cpp b/doc/codesnippets/doc/src/snippets/code/src_qt3support_painting_q3painter.cpp
deleted file mode 100644
index e932250..0000000
--- a/doc/codesnippets/doc/src/snippets/code/src_qt3support_painting_q3painter.cpp
+++ /dev/null
@@ -1,4 +0,0 @@
-//! [0]
-QPainter p(myWidget);
-p.drawArc(QRect(10,10, 70,100), 100*16, 160*16); // draws a "(" arc
-//! [0]
diff --git a/doc/codesnippets/doc/src/snippets/code/src_qt3support_painting_q3picture.cpp b/doc/codesnippets/doc/src/snippets/code/src_qt3support_painting_q3picture.cpp
deleted file mode 100644
index 709b386..0000000
--- a/doc/codesnippets/doc/src/snippets/code/src_qt3support_painting_q3picture.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-//! [0]
-Q3Picture picture;
-picture.load("drawing.svg", SVG);
-//! [0]
-
-
-//! [1]
-Q3Picture picture;
-QPainter painter;
-painter.begin(&picture);           // paint in picture
-...
-painter.end();                     // painting done
-picture.save("drawing.svg", SVG);  // save picture
-//! [1]
diff --git a/doc/codesnippets/doc/src/snippets/code/src_qt3support_sql_q3databrowser.cpp b/doc/codesnippets/doc/src/snippets/code/src_qt3support_sql_q3databrowser.cpp
deleted file mode 100644
index cb86b32..0000000
--- a/doc/codesnippets/doc/src/snippets/code/src_qt3support_sql_q3databrowser.cpp
+++ /dev/null
@@ -1,8 +0,0 @@
-//! [0]
-QStringList list = myDataBrowser.sort();
-QStringList::Iterator it = list.begin();
-while(it != list.end()) {
-    myProcessing(*it);
-    ++it;
-}
-//! [0]
diff --git a/doc/codesnippets/doc/src/snippets/code/src_qt3support_sql_q3datatable.cpp b/doc/codesnippets/doc/src/snippets/code/src_qt3support_sql_q3datatable.cpp
deleted file mode 100644
index aa72f44..0000000
--- a/doc/codesnippets/doc/src/snippets/code/src_qt3support_sql_q3datatable.cpp
+++ /dev/null
@@ -1,8 +0,0 @@
-//! [0]
-QStringList list = myDataTable.sort();
-QStringList::Iterator it = list.begin();
-while( it != list.end() ) {
-    myProcessing( *it );
-    ++it;
-}
-//! [0]
diff --git a/doc/codesnippets/doc/src/snippets/code/src_qt3support_sql_q3dataview.cpp b/doc/codesnippets/doc/src/snippets/code/src_qt3support_sql_q3dataview.cpp
deleted file mode 100644
index b0b9a59..0000000
--- a/doc/codesnippets/doc/src/snippets/code/src_qt3support_sql_q3dataview.cpp
+++ /dev/null
@@ -1,4 +0,0 @@
-//! [0]
-myView.setRecord(record);
-myView.readFields();
-//! [0]
diff --git a/doc/codesnippets/doc/src/snippets/code/src_qt3support_sql_q3sqlcursor.cpp b/doc/codesnippets/doc/src/snippets/code/src_qt3support_sql_q3sqlcursor.cpp
deleted file mode 100644
index b3b643d..0000000
--- a/doc/codesnippets/doc/src/snippets/code/src_qt3support_sql_q3sqlcursor.cpp
+++ /dev/null
@@ -1,100 +0,0 @@
-//! [0]
-Q3SqlCursor cur( "staff" ); // Specify the table/view name
-cur.select(); // We'll retrieve every record
-while ( cur.next() ) {
-    qDebug( cur.value( "id" ).toString() + ": " +
-    cur.value( "surname" ).toString() + ' ' +
-    cur.value( "salary" ).toString() );
-}
-//! [0]
-
-
-//! [1]
-Q3SqlCursor cur( "prices" );
-cur.select( "id=202" );
-if ( cur.next() ) {
-    QSqlRecord *buffer = cur.primeUpdate();
-    double price = buffer->value( "price" ).toDouble();
-    double newprice = price * 1.05;
-    buffer->setValue( "price", newprice );
-    cur.update();
-}
-//! [1]
-
-
-//! [2]
-Q3SqlCursor cur("Employee"); // Use the Employee table or view
-cur.select("deptno=10"); // select all records in department 10
-while(cur.next()) {
-    ... // process data
-}
-...
-// select records in other departments, ordered by department number
-cur.select("deptno>10", cur.index("deptno"));
-...
-//! [2]
-
-
-//! [3]
-Q3SqlCursor cur("Employee");
-cur.select("deptno=10"); // select all records in department 10
-while(cur.next()) {
-    ... // process data
-}
-...
-cur.select(); // re-selects all records in department 10
-...
-//! [3]
-
-
-//! [4]
-Q3SqlCursor cur("Employee");
-QSqlIndex pk = cur.primaryIndex();
-cur.setValue("id", 10);
-cur.select(pk, pk); // generates "SELECT ... FROM Employee WHERE id=10 ORDER BY id"
-...
-//! [4]
-
-
-//! [5]
-Q3SqlCursor cur("Employee");
-cur.setMode(Q3SqlCursor::Writable); // allow insert/update/delete
-...
-cur.setMode(Q3SqlCursor::Insert | Q3SqlCursor::Update); // allow inserts and updates only
-...
-cur.setMode(Q3SqlCursor::ReadOnly); // no inserts/updates/deletes allowed
-
-//! [5]
-
-
-//! [6]
-Q3SqlCursor cur("prices");
-QSqlRecord *buffer = cur.primeInsert();
-buffer->setValue("id",    53981);
-buffer->setValue("name",  "Thingy");
-buffer->setValue("price", 105.75);
-cur.insert();
-//! [6]
-
-
-//! [7]
-Q3SqlCursor cur("prices");
-cur.select("id=202");
-if (cur.next()) {
-    QSqlRecord *buffer = cur.primeUpdate();
-    double price = buffer->value("price").toDouble();
-    double newprice = price * 1.05;
-    buffer->setValue("price", newprice);
-    cur.update();
-}
-//! [7]
-
-
-//! [8]
-Q3SqlCursor cur("prices");
-cur.select("id=999");
-if (cur.next()) {
-    cur.primeDelete();
-    cur.del();
-}
-//! [8]
diff --git a/doc/codesnippets/doc/src/snippets/code/src_qt3support_sql_q3sqlform.cpp b/doc/codesnippets/doc/src/snippets/code/src_qt3support_sql_q3sqlform.cpp
deleted file mode 100644
index e91b7ed..0000000
--- a/doc/codesnippets/doc/src/snippets/code/src_qt3support_sql_q3sqlform.cpp
+++ /dev/null
@@ -1,26 +0,0 @@
-//! [0]
-QLineEdit  myEditor(this);
-Q3SqlForm   myForm(this);
-Q3SqlCursor myCursor("mytable");
-
-// Execute a query to make the cursor valid
-myCursor.select();
-// Move the cursor to a valid record (the first record)
-myCursor.next();
-// Set the form's record pointer to the cursor's edit buffer (which
-// contains the current record's values)
-myForm.setRecord(myCursor.primeUpdate());
-
-// Insert a field into the form that uses myEditor to edit the
-// field 'somefield' in 'mytable'
-myForm.insert(&myEditor, "somefield");
-
-// Update myEditor with the value from the mapped database field
-myForm.readFields();
-...
-// Let the user edit the form
-...
-// Update the database
-myForm.writeFields();  // Update the cursor's edit buffer from the form
-myCursor.update();        // Update the database from the cursor's buffer
-//! [0]
diff --git a/doc/codesnippets/doc/src/snippets/code/src_qt3support_sql_q3sqlmanager_p.cpp b/doc/codesnippets/doc/src/snippets/code/src_qt3support_sql_q3sqlmanager_p.cpp
deleted file mode 100644
index 9d5b2c1..0000000
--- a/doc/codesnippets/doc/src/snippets/code/src_qt3support_sql_q3sqlmanager_p.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
-//! [0]
-Q3SqlCursor* myCursor = myManager.cursor();
-...
-QSqlRecord* buf = myCursor->primeUpdate();
-buf->setValue("name", "Ola");
-buf->setValue("city", "Oslo");
-...
-myCursor->update();  // update current record
-myCursor->select();  // refresh the cursor
-myManager.findBuffer(myCursor->primaryIndex()); // go to the updated record
-//! [0]
diff --git a/doc/codesnippets/doc/src/snippets/code/src_qt3support_sql_q3sqlpropertymap.cpp b/doc/codesnippets/doc/src/snippets/code/src_qt3support_sql_q3sqlpropertymap.cpp
deleted file mode 100644
index 55146de..0000000
--- a/doc/codesnippets/doc/src/snippets/code/src_qt3support_sql_q3sqlpropertymap.cpp
+++ /dev/null
@@ -1,35 +0,0 @@
-//! [0]
-Q3SqlPropertyMap *myMap  = new Q3SqlPropertyMap();
-Q3SqlForm        *myForm = new Q3SqlForm(this);
-MyEditor myEditor(this);
-
-// Set the Q3SqlForm's record buffer to the update buffer of
-// a pre-existing Q3SqlCursor called 'cur'.
-myForm->setRecord(cur->primeUpdate());
-
-// Install the customized map
-myMap->insert("MyEditor", "content");
-myForm->installPropertyMap(myMap); // myForm now owns myMap
-...
-// Insert a field into the form that uses a myEditor to edit the
-// field 'somefield'
-myForm->insert(&myEditor, "somefield");
-
-// Update myEditor with the value from the mapped database field
-myForm->readFields();
-...
-// Let the user edit the form
-...
-// Update the database fields with the values in the form
-myForm->writeFields();
-...
-//! [0]
-
-
-//! [1]
-Q3SqlPropertyMap *myMap = new Q3SqlPropertyMap;
-
-myMap->insert("MyEditor", "content");
-Q3SqlPropertyMap::installDefaultMap(myMap);
-...
-//! [1]
diff --git a/doc/codesnippets/doc/src/snippets/code/src_qt3support_sql_q3sqlselectcursor.cpp b/doc/codesnippets/doc/src/snippets/code/src_qt3support_sql_q3sqlselectcursor.cpp
deleted file mode 100644
index bfb7b04..0000000
--- a/doc/codesnippets/doc/src/snippets/code/src_qt3support_sql_q3sqlselectcursor.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
-//! [0]
-...
-Q3SqlSelectCursor* cur = new Q3SqlSelectCursor("SELECT id, firstname, lastname FROM author");
-Q3DataTable* table = new Q3DataTable(this);
-table->setSqlCursor(cur, true, true);
-table->refresh();
-...
-cur->exec("SELECT * FROM books");
-table->refresh();
-...
-//! [0]
diff --git a/doc/codesnippets/doc/src/snippets/code/src_qt3support_text_q3simplerichtext.cpp b/doc/codesnippets/doc/src/snippets/code/src_qt3support_text_q3simplerichtext.cpp
deleted file mode 100644
index 073d716..0000000
--- a/doc/codesnippets/doc/src/snippets/code/src_qt3support_text_q3simplerichtext.cpp
+++ /dev/null
@@ -1,3 +0,0 @@
-//! [0]
-Q3SimpleRichText myrichtext(contents, mywidget->font());
-//! [0]
diff --git a/doc/codesnippets/doc/src/snippets/code/src_qt3support_text_q3textbrowser.cpp b/doc/codesnippets/doc/src/snippets/code/src_qt3support_text_q3textbrowser.cpp
deleted file mode 100644
index b042efb..0000000
--- a/doc/codesnippets/doc/src/snippets/code/src_qt3support_text_q3textbrowser.cpp
+++ /dev/null
@@ -1,3 +0,0 @@
-//! [0]
-mimeSourceFactory()->setExtensionType("qml", "text/utf8");
-//! [0]
diff --git a/doc/codesnippets/doc/src/snippets/code/src_qt3support_text_q3textedit.cpp b/doc/codesnippets/doc/src/snippets/code/src_qt3support_text_q3textedit.cpp
deleted file mode 100644
index e8d5784..0000000
--- a/doc/codesnippets/doc/src/snippets/code/src_qt3support_text_q3textedit.cpp
+++ /dev/null
@@ -1,31 +0,0 @@
-//! [0]
-QFile file(fileName); // Read the text from a file
-if (file.open(IO_ReadOnly)) {
-    QTextStream stream(&file);
-    textEdit->setText(stream.read());
-}
-
-QFile file(fileName); // Write the text to a file
-if (file.open(IO_WriteOnly)) {
-    QTextStream stream(&file);
-    stream << textEdit->text();
-    textEdit->setModified(false);
-}
-//! [0]
-
-
-//! [1]
-This is <font color=red>red</font> while <b>this</b> is <font color=blue>blue</font>.
-<font color=green><font color=yellow>Yellow,</font> and <u>green</u>.
-//! [1]
-
-
-//! [2]
-Q3TextEdit * log = new Q3TextEdit(this);
-log->setTextFormat(Qt::LogText);
-Q3StyleSheetItem * item = new Q3StyleSheetItem(log->styleSheet(), "mytag");
-item->setColor("red");
-item->setFontWeight(QFont::Bold);
-item->setFontUnderline(true);
-log->append("This is a <mytag>custom tag</mytag>!");
-//! [2]
diff --git a/doc/codesnippets/doc/src/snippets/code/src_qt3support_text_q3textstream.cpp b/doc/codesnippets/doc/src/snippets/code/src_qt3support_text_q3textstream.cpp
deleted file mode 100644
index 664a690..0000000
--- a/doc/codesnippets/doc/src/snippets/code/src_qt3support_text_q3textstream.cpp
+++ /dev/null
@@ -1,29 +0,0 @@
-//! [0]
-QString str;
-Q3TextStream ts( &str, IO_WriteOnly );
-ts << "pi = " << 3.14; // str == "pi = 3.14"
-//! [0]
-
-
-//! [1]
-QString str = "pi = 3.14";
-Q3TextStream ts( &str, IO_WriteOnly );
-ts <<  "2+2 = " << 2+2; // str == "2+2 = 414"
-//! [1]
-
-
-//! [2]
-QByteArray array;
-Q3TextStream ts( array, IO_WriteOnly );
-ts << "pi = " << 3.14 << '\0'; // array == "pi = 3.14"
-//! [2]
-
-
-//! [3]
-QByteArray array;
-QBuffer buf( array );
-buf.open( IO_WriteOnly );
-Q3TextStream ts( &buf );
-ts << "pi = " << 3.14 << '\0'; // array == "pi = 3.14"
-buf.close();
-//! [3]
diff --git a/doc/codesnippets/doc/src/snippets/code/src_qt3support_tools_q3cstring.cpp b/doc/codesnippets/doc/src/snippets/code/src_qt3support_tools_q3cstring.cpp
deleted file mode 100644
index 9985e9d..0000000
--- a/doc/codesnippets/doc/src/snippets/code/src_qt3support_tools_q3cstring.cpp
+++ /dev/null
@@ -1,40 +0,0 @@
-//! [0]
-Q3CString str("helloworld", 6); // assigns "hello" to str
-//! [0]
-
-
-//! [1]
-Q3CString a;                // a.data() == 0,  a.size() == 0, a.length() == 0
-Q3CString b == "";        // b.data() == "", b.size() == 1, b.length() == 0
-a.isNull();                // true  because a.data() == 0
-a.isEmpty();        // true  because a.length() == 0
-b.isNull();                // false because b.data() == ""
-b.isEmpty();        // true  because b.length() == 0
-//! [1]
-
-
-//! [2]
-Q3CString s = "truncate this string";
-s.truncate(5);                      // s == "trunc"
-//! [2]
-
-
-//! [3]
-Q3CString s;
-s.sprintf("%d - %s", 1, "first");                // result < 256 chars
-
-Q3CString big(25000);                        // very long string
-big.sprintf("%d - %s", 2, longString);        // result < 25000 chars
-//! [3]
-
-
-//! [4]
-Q3CString s("apple");
-Q3CString t = s.leftJustify(8, '.');  // t == "apple..."
-//! [4]
-
-
-//! [5]
-Q3CString s("pie");
-Q3CString t = s.rightJustify(8, '.');  // t == ".....pie"
-//! [5]
diff --git a/doc/codesnippets/doc/src/snippets/code/src_qt3support_tools_q3deepcopy.cpp b/doc/codesnippets/doc/src/snippets/code/src_qt3support_tools_q3deepcopy.cpp
deleted file mode 100644
index 36f7491..0000000
--- a/doc/codesnippets/doc/src/snippets/code/src_qt3support_tools_q3deepcopy.cpp
+++ /dev/null
@@ -1,58 +0,0 @@
-//! [0]
-// all 5 strings share the same data
-QString s1 = "abcd";
-QString s2 = s1;
-QString s3 = s2;
-QString s4 = s3;
-QString s5 = s2;
-//! [0]
-
-
-//! [1]
-// s1, s2 and s5 share the same data, neither s3 nor s4 are shared
-QString s1 = "abcd";
-QString s2 = s1;
-Q3DeepCopy<QString> s3 = s2;  // s3 is a deep copy of s2
-QString s4 = s3;             // s4 is a deep copy of s3
-QString s5 = s2;
-//! [1]
-
-
-//! [2]
-// s1, s2 and s5 share the same data, s3 and s4 share the same data
-QString s1 = "abcd";
-QString s2 = s1;
-QString s3 = Q3DeepCopy<QString>( s2 );  // s3 is a deep copy of s2
-QString s4 = s3;                        // s4 is a shallow copy of s3
-QString s5 = s2;
-//! [2]
-
-
-//! [3]
-Q3DeepCopy<QString> global_string;  // global string data
-QMutex global_mutex;               // mutex to protext global_string
-
-...
-
-void setGlobalString( const QString &str )
-{
-    global_mutex.lock();
-    global_string = str;           // global_string is a deep copy of str
-    global_mutex.unlock();
-}
-
-...
-
-void MyThread::run()
-{
-    global_mutex.lock();
-    QString str = global_string;          // str is a deep copy of global_string
-    global_mutex.unlock();
-
-    // process the string data
-    ...
-
-    // update global_string
-    setGlobalString( str );
-}
-//! [3]
diff --git a/doc/codesnippets/doc/src/snippets/code/src_qt3support_tools_q3garray.cpp b/doc/codesnippets/doc/src/snippets/code/src_qt3support_tools_q3garray.cpp
deleted file mode 100644
index 7108262..0000000
--- a/doc/codesnippets/doc/src/snippets/code/src_qt3support_tools_q3garray.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//! [0]
-static uchar bindata[] = { 231, 1, 44, ... };
-QByteArray	a;
-a.setRawData(bindata, sizeof(bindata));	// a points to bindata
-QDataStream s(a, IO_ReadOnly);		// open on a's data
-s >> <something>;				// read raw bindata
-s.close();
-a.resetRawData(bindata, sizeof(bindata)); // finished
-//! [0]
-
-
-//! [1]
-static uchar bindata[] = { 231, 1, 44, ... };
-QByteArray	a, b;
-a.setRawData(bindata, sizeof(bindata));	// a points to bindata
-a.resize(8);				// will crash
-b = a;					// will crash
-a[2] = 123;					// might crash
-  // forget to resetRawData - will crash
-//! [1]
diff --git a/doc/codesnippets/doc/src/snippets/code/src_qt3support_tools_q3signal.cpp b/doc/codesnippets/doc/src/snippets/code/src_qt3support_tools_q3signal.cpp
deleted file mode 100644
index 7793ba2..0000000
--- a/doc/codesnippets/doc/src/snippets/code/src_qt3support_tools_q3signal.cpp
+++ /dev/null
@@ -1,38 +0,0 @@
-//! [0]
-#include <q3signal.h>
-
-class MyClass
-{
-public:
-    MyClass();
-    ~MyClass();
-
-    void doSomething();
-
-    void connect(QObject *receiver, const char *member);
-
-private:
-    Q3Signal *sig;
-};
-
-MyClass::MyClass()
-{
-    sig = new Q3Signal;
-}
-
-MyClass::~MyClass()
-{
-    delete sig;
-}
-
-void MyClass::doSomething()
-{
-    // ... does something
-    sig->activate(); // emits the signal
-}
-
-void MyClass::connect(QObject *receiver, const char *member)
-{
-    sig->connect(receiver, member);
-}
-//! [0]
diff --git a/doc/codesnippets/doc/src/snippets/code/src_qt3support_widgets_q3combobox.cpp b/doc/codesnippets/doc/src/snippets/code/src_qt3support_widgets_q3combobox.cpp
deleted file mode 100644
index 90d7b14..0000000
--- a/doc/codesnippets/doc/src/snippets/code/src_qt3support_widgets_q3combobox.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
-//! [0]
-Q3ComboBox *c = new Q3ComboBox(this, tr("read-only combobox"));
-//! [0]
-
-
-//! [1]
-Q3ComboBox *c1 = new Q3ComboBox(false, this, tr("read-only combobox"));
-Q3ComboBox *c2 = new Q3ComboBox(true, this, tr("editable combobox"));
-//! [1]
-
-
-//! [2]
-static const char* items[] = { "red", "green", "blue", 0 };
-combo->insertStrList( items );
-//! [2]
diff --git a/doc/codesnippets/doc/src/snippets/code/src_qt3support_widgets_q3datetimeedit.cpp b/doc/codesnippets/doc/src/snippets/code/src_qt3support_widgets_q3datetimeedit.cpp
deleted file mode 100644
index 74070ec..0000000
--- a/doc/codesnippets/doc/src/snippets/code/src_qt3support_widgets_q3datetimeedit.cpp
+++ /dev/null
@@ -1,28 +0,0 @@
-
-void wrapInFunction()
-{
-
-//! [0]
-Q3DateEdit *dateEdit = new Q3DateEdit(QDate::currentDate(), this);
-dateEdit->setRange(QDate::currentDate().addDays(-365),
-                    QDate::currentDate().addDays( 365));
-dateEdit->setOrder(Q3DateEdit::MDY);
-dateEdit->setAutoAdvance(true);
-//! [0]
-
-
-//! [1]
-QTime timeNow = QTime::currentTime();
-Q3TimeEdit *timeEdit = new Q3TimeEdit(timeNow, this);
-timeEdit->setRange(timeNow, timeNow.addSecs(60 * 60));
-//! [1]
-
-
-//! [2]
-Q3DateTimeEdit *dateTimeEdit = new Q3DateTimeEdit(QDateTime::currentDateTime(), this);
-dateTimeEdit->dateEdit()->setRange(QDateTime::currentDate(),
-                                    QDateTime::currentDate().addDays(7));
-//! [2]
-
-}
-
diff --git a/doc/codesnippets/doc/src/snippets/code/src_qt3support_widgets_q3dockarea.cpp b/doc/codesnippets/doc/src/snippets/code/src_qt3support_widgets_q3dockarea.cpp
deleted file mode 100644
index bde7d84..0000000
--- a/doc/codesnippets/doc/src/snippets/code/src_qt3support_widgets_q3dockarea.cpp
+++ /dev/null
@@ -1,8 +0,0 @@
-//! [0]
-ts << *myDockArea;
-//! [0]
-
-
-//! [1]
-ts >> *myDockArea;
-//! [1]
diff --git a/doc/codesnippets/doc/src/snippets/code/src_qt3support_widgets_q3dockwindow.cpp b/doc/codesnippets/doc/src/snippets/code/src_qt3support_widgets_q3dockwindow.cpp
deleted file mode 100644
index 1476dcb..0000000
--- a/doc/codesnippets/doc/src/snippets/code/src_qt3support_widgets_q3dockwindow.cpp
+++ /dev/null
@@ -1,4 +0,0 @@
-//! [0]
-Q3ToolBar *fileTools = new Q3ToolBar(this, "File Actions");
-moveDockWindow(fileTools, Left);
-//! [0]
diff --git a/doc/codesnippets/doc/src/snippets/code/src_qt3support_widgets_q3gridview.cpp b/doc/codesnippets/doc/src/snippets/code/src_qt3support_widgets_q3gridview.cpp
deleted file mode 100644
index 43dca3e..0000000
--- a/doc/codesnippets/doc/src/snippets/code/src_qt3support_widgets_q3gridview.cpp
+++ /dev/null
@@ -1,6 +0,0 @@
-//! [0]
-p->setClipRect(cellRect(), QPainter::CoordPainter);
-//... your drawing code
-p->setClipping(false);
-
-//! [0]
diff --git a/doc/codesnippets/doc/src/snippets/code/src_qt3support_widgets_q3header.cpp b/doc/codesnippets/doc/src/snippets/code/src_qt3support_widgets_q3header.cpp
deleted file mode 100644
index 684d182..0000000
--- a/doc/codesnippets/doc/src/snippets/code/src_qt3support_widgets_q3header.cpp
+++ /dev/null
@@ -1,6 +0,0 @@
-//! [0]
-// Allow resizing of all current and future sections
-header->setResizeEnabled(true);
-// Disable resizing of section 3, (the fourth section added)
-header->setResizeEnabled(false, 3);
-//! [0]
diff --git a/doc/codesnippets/doc/src/snippets/code/src_qt3support_widgets_q3mainwindow.cpp b/doc/codesnippets/doc/src/snippets/code/src_qt3support_widgets_q3mainwindow.cpp
deleted file mode 100644
index c63b481..0000000
--- a/doc/codesnippets/doc/src/snippets/code/src_qt3support_widgets_q3mainwindow.cpp
+++ /dev/null
@@ -1,45 +0,0 @@
-//! [0]
-Q3MainWindow *mw = new Q3MainWindow;
-QTextEdit *edit = new QTextEdit(mw, "editor");
-edit->setFocus();
-mw->setWindowTitle("Main Window");
-mw->setCentralWidget(edit);
-mw->show();
-//! [0]
-
-
-//! [1]
-Q3ToolBar *tb = new Q3ToolBar(this);
-addDockWindow(tb, tr("Menubar"), Top, false);
-QMenuBar *mb = new QMenuBar(tb);
-mb->setFrameStyle(QFrame::NoFrame);
-tb->setStretchableWidget(mb);
-setDockEnabled(tb, Left, false);
-setDockEnabled(tb, Right, false);
-//! [1]
-
-
-//! [2]
-QFile file(filename);
-if (file.open(IO_WriteOnly)) {
-    QTextStream stream(&file);
-    stream << *mainWindow;
-    file.close();
-}
-//! [2]
-
-
-//! [3]
-QFile file(filename);
-if (file.open(IO_ReadOnly)) {
-    QTextStream stream(&file);
-    stream >> *mainWindow;
-    file.close();
-}
-//! [3]
-
-
-//! [4]
-Q3PopupMenu * help = new Q3PopupMenu(this);
-help->insertItem("What's &This", this , SLOT(enterWhatsThis()), Qt::SHIFT+Qt::Key_F1);
-//! [4]
diff --git a/doc/codesnippets/doc/src/snippets/code/src_qt3support_widgets_q3scrollview.cpp b/doc/codesnippets/doc/src/snippets/code/src_qt3support_widgets_q3scrollview.cpp
deleted file mode 100644
index 58d5acf..0000000
--- a/doc/codesnippets/doc/src/snippets/code/src_qt3support_widgets_q3scrollview.cpp
+++ /dev/null
@@ -1,61 +0,0 @@
-//! [0]
-Q3ScrollView* sv = new Q3ScrollView(...);
-QWidget *widget = new QWidget(sv->viewport());
-QVBoxLayout *layout = new QVBoxLayout(widget);
-addChild(widget);
-//! [0]
-
-
-//! [1]
-QLabel* child1 = new QLabel("CHILD", widget);
-QLabel* child2 = new QLabel("CHILD", widget);
-QLabel* child3 = new QLabel("CHILD", widget);
-layout->addWidget(child1);
-layout->addWidget(child2);
-layout->addWidget(child3);
-...
-//! [1]
-
-
-//! [2]
-Q3ScrollView* sv = new Q3ScrollView(...);
-QLabel* child1 = new QLabel("CHILD", sv->viewport());
-sv->addChild(child1);
-QLabel* child2 = new QLabel("CHILD", sv->viewport());
-sv->addChild(child2);
-QLabel* child3 = new QLabel("CHILD", sv->viewport());
-sv->addChild(child3);
-//! [2]
-
-
-//! [3]
-Q3ScrollView* sv = new Q3ScrollView(...);
-sv->enableClipper(true);
-QLabel* child1 = new QLabel("CHILD", sv->viewport());
-sv->addChild(child1);
-QLabel* child2 = new QLabel("CHILD", sv->viewport());
-sv->addChild(child2);
-QLabel* child3 = new QLabel("CHILD", sv->viewport());
-sv->addChild(child3);
-//! [3]
-
-
-//! [4]
-{
-    // Fill a 40000 by 50000 rectangle at (100000,150000)
-
-    // Calculate the coordinates...
-    int x1 = 100000, y1 = 150000;
-    int x2 = x1+40000-1, y2 = y1+50000-1;
-
-    // Clip the coordinates so X/Windows will not have problems...
-    if (x1 < clipx) x1=clipx;
-    if (y1 < clipy) y1=clipy;
-    if (x2 > clipx+clipw-1) x2=clipx+clipw-1;
-    if (y2 > clipy+cliph-1) y2=clipy+cliph-1;
-
-    // Paint using the small coordinates...
-    if (x2 >= x1 && y2 >= y1)
-        p->fillRect(x1, y1, x2-x1+1, y2-y1+1, red);
-}
-//! [4]
diff --git a/doc/codesnippets/doc/src/snippets/code/src_qt3support_widgets_q3whatsthis.cpp b/doc/codesnippets/doc/src/snippets/code/src_qt3support_widgets_q3whatsthis.cpp
deleted file mode 100644
index f7b48ba..0000000
--- a/doc/codesnippets/doc/src/snippets/code/src_qt3support_widgets_q3whatsthis.cpp
+++ /dev/null
@@ -1,3 +0,0 @@
-//! [0]
-(void)Q3WhatsThis::whatsThisButton( my_help_tool_bar );
-//! [0]
diff --git a/doc/codesnippets/doc/src/snippets/code/src_qtestlib_qtestcase.cpp b/doc/codesnippets/doc/src/snippets/code/src_qtestlib_qtestcase.cpp
index c143e33..aed6526 100644
--- a/doc/codesnippets/doc/src/snippets/code/src_qtestlib_qtestcase.cpp
+++ b/doc/codesnippets/doc/src/snippets/code/src_qtestlib_qtestcase.cpp
@@ -1,84 +1,81 @@
 
-void wrapInFunction()
-{
-
 //! [0]
-QVERIFY(1 + 1 == 2);
+QVERIFY(1 + 1 == 2)
 //! [0]
 
 
 //! [1]
-QVERIFY2(1 + 1 == 2, "A breach in basic arithmetic occured.");
+QVERIFY2(1 + 1 == 2, "A breach in basic arithmetic occured.")
 //! [1]
 
 
 //! [2]
-QCOMPARE(QString("hello").toUpper(), QString("HELLO"));
+QCOMPARE(QString("hello").toUpper(), QString("HELLO"))
 //! [2]
 
 
 //! [3]
-void TestQString::toInt_data()
+void TestQString.toInt_data()
 {
-    QTest::addColumn<QString>("aString");
-    QTest::addColumn<int>("expected");
+    QTest.addColumn<QString>("aString")
+    QTest.addColumn<int>("expected")
 
-    QTest::newRow("positive value") << "42" << 42;
-    QTest::newRow("negative value") << "-42" << -42;
-    QTest::newRow("zero") << "0" << 0;
+    QTest.newRow("positive value") << "42" << 42
+    QTest.newRow("negative value") << "-42" << -42
+    QTest.newRow("zero") << "0" << 0
 }
 //! [3]
 
 
 //! [4]
-void TestQString::toInt()
+void TestQString.toInt()
 {
-     QFETCH(QString, aString);
-     QFETCH(int, expected);
+     QFETCH(QString, aString)
+     QFETCH(int, expected)
 
-     QCOMPARE(aString.toInt(), expected);
+     QCOMPARE(aString.toInt(), expected)
 }
 //! [4]
 
 
 //! [5]
 if (sizeof(int) != 4)
-    QFAIL("This test has not been ported to this platform yet.");
+    QFAIL("This test has not been ported to this platform yet.")
 //! [5]
 
 
 //! [6]
-QFETCH(QString, myString);
-QCOMPARE(QString("hello").toUpper(), myString);
+QFETCH(QString, myString)
+QCOMPARE(QString("hello").toUpper(), myString)
 //! [6]
 
 
 //! [7]
-QTEST(QString("hello").toUpper(), "myString");
+QTEST(QString("hello").toUpper(), "myString")
 //! [7]
 
 
 //! [8]
-if (!QSqlDatabase::drivers().contains("SQLITE"))
-    QSKIP("This test requires the SQLITE database driver", SkipAll);
+if (!QSqlDatabase.drivers().contains("SQLITE"))
+    QSKIP("This test requires the SQLITE database driver", SkipAll)
 //! [8]
 
 
 //! [9]
-QEXPECT_FAIL("", "Will fix in the next release", Continue);
-QCOMPARE(i, 42);
-QCOMPARE(j, 43);
+QEXPECT_FAIL("", "Will fix in the next release", Continue)
+QCOMPARE(i, 42)
+QCOMPARE(j, 43)
 //! [9]
 
 
 //! [10]
-QEXPECT_FAIL("data27", "Oh my, this is soooo broken", Abort);
-QCOMPARE(i, 42);
+QEXPECT_FAIL("data27", "Oh my, this is soooo broken", Abort)
+QCOMPARE(i, 42)
 //! [10]
 
 
 //! [11]
-class TestQString: public QObject { ... };
+class TestQString: public QObject { ... }
 QTEST_MAIN(TestQString)
 //! [11]
 
@@ -94,19 +91,19 @@ QTEST_MAIN(TestQString)
 
 
 //! [13]
-QTest::keyClick(myWidget, 'a');
+QTest.keyClick(myWidget, 'a')
 //! [13]
 
 
 //! [14]
-QTest::keyClick(myWidget, Qt::Key_Escape);
+QTest.keyClick(myWidget, Qt.Key_Escape)
 
-QTest::keyClick(myWidget, Qt::Key_Escape, Qt::ShiftModifier, 200);
+QTest.keyClick(myWidget, Qt.Key_Escape, Qt.ShiftModifier, 200)
 //! [14]
 
 
 //! [15]
-QTest::keyClicks(myWidget, "hello world");
+QTest.keyClicks(myWidget, "hello world")
 //! [15]
 
 
@@ -115,74 +112,77 @@ namespace QTest {
     template<>
     char *toString(const MyPoint &point)
     {
-        QByteArray ba = "MyPoint(";
-        ba += QByteArray::number(point.x()) + ", " + QByteArray::number(point.y());
-        ba += ")";
-        return qstrdup(ba.data());
+        QByteArray ba = "MyPoint("
+        ba += QByteArray.number(point.x()) + ", " + QByteArray.number(point.y())
+        ba += ")"
+        return qstrdup(ba.data())
     }
 }
 //! [16]
 
 
 //! [17]
-int i = 0;
+int i = 0
 while (myNetworkServerNotResponding() && i++ < 50)
-    QTest::qWait(250);
+    QTest.qWait(250)
 //! [17]
 
 
 //! [18]
-MyFirstTestObject test1;
-QTest::qExec(&test1);
+MyFirstTestObject test1
+QTest.qExec(&test1)
 
-MySecondTestObject test2;
-QTest::qExec(&test2);
+MySecondTestObject test2
+QTest.qExec(&test2)
 //! [18]
 
 
 //! [19]
-QDir dir;
+QDir dir
 
-QTest::ignoreMessage(QtWarningMsg, "QDir::mkdir: Empty or null file name(s)");
-dir.mkdir("");
+QTest.ignoreMessage(QtWarningMsg, "QDir.mkdir: Empty or null file name(s)")
+dir.mkdir("")
 //! [19]
 
 
 //! [20]
 void myTestFunction_data()
 {
-    QTest::addColumn<QString>("aString");
-    QTest::newRow("just hello") << QString("hello");
-    QTest::newRow("a null string") << QString();
+    QTest.addColumn<QString>("aString")
+    QTest.newRow("just hello") << QString("hello")
+    QTest.newRow("a null string") << QString()
 }
 //! [20]
 
 
 //! [21]
 void myTestFunction_data() {
-    QTest::addColumn<int>("intval");
-    QTest::addColumn<QString>("str");
-    QTest::addColumn<double>("dbl");
+    QTest.addColumn<int>("intval")
+    QTest.addColumn<QString>("str")
+    QTest.addColumn<double>("dbl")
 
-    QTest::newRow("row1") << 1 << "hello" << 1.5;
+    QTest.newRow("row1") << 1 << "hello" << 1.5
 }
 //! [21]
 
 
 //! [22]
-void MyTestClass::cleanup()
+void MyTestClass.cleanup()
 {
     if (qstrcmp(currentTestFunction(), "myDatabaseTest") == 0) {
         // clean up all database connections
-        closeAllDatabases();
+        closeAllDatabases()
     }
 }
 //! [22]
 
 
 //! [23]
-QTest::qSleep(250);
+QTest.qSleep(250)
 //! [23]
 
-}
-
+//! [24]
+widget = QWidget()
+widget.show()
+QTest.qWaitForWindowShown(widget)
+//! [24]
diff --git a/doc/codesnippets/doc/src/snippets/code/src_sql_kernel_qsqlquery.cpp b/doc/codesnippets/doc/src/snippets/code/src_sql_kernel_qsqlquery.cpp
index 769f0be..8ad4c2e 100644
--- a/doc/codesnippets/doc/src/snippets/code/src_sql_kernel_qsqlquery.cpp
+++ b/doc/codesnippets/doc/src/snippets/code/src_sql_kernel_qsqlquery.cpp
@@ -11,7 +11,7 @@ print "Number of columns: %d" % rec.count()
 
 nameCol = rec.indexOf("name") # index of the field "name"
 while q.next():
-    print q.value(nameCol).toString() # output all names
+    print q.value(nameCol) # output all names
 //! [1]
 
 
@@ -19,12 +19,10 @@ while q.next():
 q = QSqlQuery()
 q.prepare("insert into myTable values (?, ?)")
 
-QVariantList ints
-ints << 1 << 2 << 3 << 4
+ints = [1, 2, 3, 4]
 q.addBindValue(ints)
 
-QVariantList names
-names << "Harald" << "Boris" << "Trond" << QVariant(QVariant.String)
+names = ["Harald", "Boris", "Trond", ""]
 q.addBindValue(names)
 
 if not q.execBatch():
diff --git a/doc/codesnippets/doc/src/snippets/code/src_sql_kernel_qsqlresult.cpp b/doc/codesnippets/doc/src/snippets/code/src_sql_kernel_qsqlresult.cpp
index 81d6656..2223242 100644
--- a/doc/codesnippets/doc/src/snippets/code/src_sql_kernel_qsqlresult.cpp
+++ b/doc/codesnippets/doc/src/snippets/code/src_sql_kernel_qsqlresult.cpp
@@ -2,9 +2,9 @@
 q = QSqlQuery()
 q.prepare("insert into test (i1, i2, s) values (?, ?, ?)")
 
-col1 = QVariant([1, 3])
-col2 = QVariant([2, 4])
-col3 = QVariant(["hello", "world"])
+col1 = [1, 3]
+col2 = [2, 4]
+col3 = ["hello", "world"]
 
 q.bindValue(0, col1)
 q.bindValue(1, col2)
diff --git a/doc/codesnippets/doc/src/snippets/complexpingpong-example.qdoc b/doc/codesnippets/doc/src/snippets/complexpingpong-example.qdoc
deleted file mode 100644
index 257f702..0000000
--- a/doc/codesnippets/doc/src/snippets/complexpingpong-example.qdoc
+++ /dev/null
@@ -1,4 +0,0 @@
-Ask your question: When is the next Qt release?
-Reply was: Sorry, I don't know the answer
-Ask your question: What is the answer to life, the universe and everything?
-Reply was: 42
diff --git a/doc/codesnippets/doc/src/snippets/coordsys/coordsys.pro b/doc/codesnippets/doc/src/snippets/coordsys/coordsys.pro
deleted file mode 100644
index b6aac7c..0000000
--- a/doc/codesnippets/doc/src/snippets/coordsys/coordsys.pro
+++ /dev/null
@@ -1 +0,0 @@
-SOURCES += coordsys.cpp
diff --git a/doc/codesnippets/doc/src/snippets/customstyle/customstyle.pro b/doc/codesnippets/doc/src/snippets/customstyle/customstyle.pro
deleted file mode 100644
index af0ee4e..0000000
--- a/doc/codesnippets/doc/src/snippets/customstyle/customstyle.pro
+++ /dev/null
@@ -1,2 +0,0 @@
-HEADERS += customstyle.h
-SOURCES += customstyle.cpp main.cpp
diff --git a/doc/codesnippets/doc/src/snippets/dbus-pingpong-example.qdoc b/doc/codesnippets/doc/src/snippets/dbus-pingpong-example.qdoc
deleted file mode 100644
index 13a34a8..0000000
--- a/doc/codesnippets/doc/src/snippets/dbus-pingpong-example.qdoc
+++ /dev/null
@@ -1,3 +0,0 @@
-$ ./pong &
-$ ./ping Hello
-Reply was: ping("Hello") got called
diff --git a/doc/codesnippets/doc/src/snippets/designer/autoconnection/autoconnection.pro b/doc/codesnippets/doc/src/snippets/designer/autoconnection/autoconnection.pro
deleted file mode 100644
index fba94de..0000000
--- a/doc/codesnippets/doc/src/snippets/designer/autoconnection/autoconnection.pro
+++ /dev/null
@@ -1,5 +0,0 @@
-TEMPLATE    = app
-FORMS       = imagedialog.ui
-HEADERS     = imagedialog.h
-SOURCES     = imagedialog.cpp \
-              main.cpp
diff --git a/doc/codesnippets/doc/src/snippets/designer/designer.pro b/doc/codesnippets/doc/src/snippets/designer/designer.pro
deleted file mode 100644
index 1445ca5..0000000
--- a/doc/codesnippets/doc/src/snippets/designer/designer.pro
+++ /dev/null
@@ -1,6 +0,0 @@
-TEMPLATE        = subdirs
-SUBDIRS         = autoconnection \
-                  imagedialog \
-                  multipleinheritance \
-                  noautoconnection \
-                  singleinheritance
diff --git a/doc/codesnippets/doc/src/snippets/designer/imagedialog/imagedialog.pro b/doc/codesnippets/doc/src/snippets/designer/imagedialog/imagedialog.pro
deleted file mode 100644
index 164a7b2..0000000
--- a/doc/codesnippets/doc/src/snippets/designer/imagedialog/imagedialog.pro
+++ /dev/null
@@ -1,3 +0,0 @@
-TEMPLATE    = app
-FORMS       = imagedialog.ui
-SOURCES     = main.cpp
diff --git a/doc/codesnippets/doc/src/snippets/designer/multipleinheritance/multipleinheritance.pro b/doc/codesnippets/doc/src/snippets/designer/multipleinheritance/multipleinheritance.pro
deleted file mode 100644
index fba94de..0000000
--- a/doc/codesnippets/doc/src/snippets/designer/multipleinheritance/multipleinheritance.pro
+++ /dev/null
@@ -1,5 +0,0 @@
-TEMPLATE    = app
-FORMS       = imagedialog.ui
-HEADERS     = imagedialog.h
-SOURCES     = imagedialog.cpp \
-              main.cpp
diff --git a/doc/codesnippets/doc/src/snippets/designer/noautoconnection/noautoconnection.pro b/doc/codesnippets/doc/src/snippets/designer/noautoconnection/noautoconnection.pro
deleted file mode 100644
index fba94de..0000000
--- a/doc/codesnippets/doc/src/snippets/designer/noautoconnection/noautoconnection.pro
+++ /dev/null
@@ -1,5 +0,0 @@
-TEMPLATE    = app
-FORMS       = imagedialog.ui
-HEADERS     = imagedialog.h
-SOURCES     = imagedialog.cpp \
-              main.cpp
diff --git a/doc/codesnippets/doc/src/snippets/designer/singleinheritance/singleinheritance.pro b/doc/codesnippets/doc/src/snippets/designer/singleinheritance/singleinheritance.pro
deleted file mode 100644
index fba94de..0000000
--- a/doc/codesnippets/doc/src/snippets/designer/singleinheritance/singleinheritance.pro
+++ /dev/null
@@ -1,5 +0,0 @@
-TEMPLATE    = app
-FORMS       = imagedialog.ui
-HEADERS     = imagedialog.h
-SOURCES     = imagedialog.cpp \
-              main.cpp
diff --git a/doc/codesnippets/doc/src/snippets/dialogs/dialogs.pro b/doc/codesnippets/doc/src/snippets/dialogs/dialogs.pro
deleted file mode 100644
index fd5d363..0000000
--- a/doc/codesnippets/doc/src/snippets/dialogs/dialogs.pro
+++ /dev/null
@@ -1 +0,0 @@
-SOURCES += dialogs.cpp
diff --git a/doc/codesnippets/doc/src/snippets/dockwidgets/dockwidgets.pro b/doc/codesnippets/doc/src/snippets/dockwidgets/dockwidgets.pro
deleted file mode 100644
index 11d80f3..0000000
--- a/doc/codesnippets/doc/src/snippets/dockwidgets/dockwidgets.pro
+++ /dev/null
@@ -1,4 +0,0 @@
-HEADERS     = mainwindow.h
-RESOURCES   = dockwidgets.qrc
-SOURCES     = main.cpp \
-              mainwindow.cpp
diff --git a/doc/codesnippets/doc/src/snippets/dockwidgets/mainwindow.cpp b/doc/codesnippets/doc/src/snippets/dockwidgets/mainwindow.cpp
index ffbf327..7bd0426 100644
--- a/doc/codesnippets/doc/src/snippets/dockwidgets/mainwindow.cpp
+++ b/doc/codesnippets/doc/src/snippets/dockwidgets/mainwindow.cpp
@@ -95,13 +95,12 @@ void MainWindow::setupContents()
 void MainWindow::setupDockWindow()
 {
 //! [0]
-    contentsWindow = new QDockWidget(tr("Table of Contents"), this);
-    contentsWindow->setAllowedAreas(Qt::LeftDockWidgetArea
-                                  | Qt::RightDockWidgetArea);
-    addDockWidget(Qt::LeftDockWidgetArea, contentsWindow);
+    contentsWindow = QDockWidget(tr("Table of Contents"), self)
+    contentsWindow.setAllowedAreas(Qt.LeftDockWidgetArea | Qt.RightDockWidgetArea)
+    addDockWidget(Qt.LeftDockWidgetArea, contentsWindow)
 
-    headingList = new QListWidget(contentsWindow);
-    contentsWindow->setWidget(headingList);
+    headingList = QListWidget(contentsWindow)
+    contentsWindow.setWidget(headingList)
 //! [0]
 }
 
diff --git a/doc/codesnippets/doc/src/snippets/draganddrop/draganddrop.pro b/doc/codesnippets/doc/src/snippets/draganddrop/draganddrop.pro
deleted file mode 100644
index 67bc32b..0000000
--- a/doc/codesnippets/doc/src/snippets/draganddrop/draganddrop.pro
+++ /dev/null
@@ -1,5 +0,0 @@
-HEADERS     = dragwidget.h \
-              mainwindow.h
-SOURCES     = dragwidget.cpp \
-              main.cpp \
-              mainwindow.cpp
diff --git a/doc/codesnippets/doc/src/snippets/dragging/dragging.pro b/doc/codesnippets/doc/src/snippets/dragging/dragging.pro
deleted file mode 100644
index bedfc76..0000000
--- a/doc/codesnippets/doc/src/snippets/dragging/dragging.pro
+++ /dev/null
@@ -1,4 +0,0 @@
-HEADERS     = mainwindow.h
-RESOURCES   = images.qrc
-SOURCES     = main.cpp \
-              mainwindow.cpp
diff --git a/doc/codesnippets/doc/src/snippets/dropactions/dropactions.pro b/doc/codesnippets/doc/src/snippets/dropactions/dropactions.pro
deleted file mode 100644
index 6283406..0000000
--- a/doc/codesnippets/doc/src/snippets/dropactions/dropactions.pro
+++ /dev/null
@@ -1,3 +0,0 @@
-HEADERS     = window.h
-SOURCES     = main.cpp \
-              window.cpp
diff --git a/doc/codesnippets/doc/src/snippets/dropevents/dropevents.pro b/doc/codesnippets/doc/src/snippets/dropevents/dropevents.pro
deleted file mode 100644
index 6283406..0000000
--- a/doc/codesnippets/doc/src/snippets/dropevents/dropevents.pro
+++ /dev/null
@@ -1,3 +0,0 @@
-HEADERS     = window.h
-SOURCES     = main.cpp \
-              window.cpp
diff --git a/doc/codesnippets/doc/src/snippets/droprectangle/droprectangle.pro b/doc/codesnippets/doc/src/snippets/droprectangle/droprectangle.pro
deleted file mode 100644
index 6283406..0000000
--- a/doc/codesnippets/doc/src/snippets/droprectangle/droprectangle.pro
+++ /dev/null
@@ -1,3 +0,0 @@
-HEADERS     = window.h
-SOURCES     = main.cpp \
-              window.cpp
diff --git a/doc/codesnippets/doc/src/snippets/eventfilters/eventfilters.pro b/doc/codesnippets/doc/src/snippets/eventfilters/eventfilters.pro
deleted file mode 100644
index b569a33..0000000
--- a/doc/codesnippets/doc/src/snippets/eventfilters/eventfilters.pro
+++ /dev/null
@@ -1,3 +0,0 @@
-HEADERS   = filterobject.h
-SOURCES   = filterobject.cpp \
-            main.cpp
diff --git a/doc/codesnippets/doc/src/snippets/events/events.pro b/doc/codesnippets/doc/src/snippets/events/events.pro
deleted file mode 100644
index 9c40874..0000000
--- a/doc/codesnippets/doc/src/snippets/events/events.pro
+++ /dev/null
@@ -1 +0,0 @@
-SOURCES += events.cpp
diff --git a/doc/codesnippets/doc/src/snippets/explicitlysharedemployee/explicitlysharedemployee.pro b/doc/codesnippets/doc/src/snippets/explicitlysharedemployee/explicitlysharedemployee.pro
deleted file mode 100644
index 536a77d..0000000
--- a/doc/codesnippets/doc/src/snippets/explicitlysharedemployee/explicitlysharedemployee.pro
+++ /dev/null
@@ -1,3 +0,0 @@
-HEADERS = employee.h
-SOURCES = employee.cpp \
-          main.cpp
diff --git a/doc/codesnippets/doc/src/snippets/file/file.pro b/doc/codesnippets/doc/src/snippets/file/file.pro
deleted file mode 100644
index bda6a94..0000000
--- a/doc/codesnippets/doc/src/snippets/file/file.pro
+++ /dev/null
@@ -1,14 +0,0 @@
-######################################################################
-# Automatically generated by qmake (1.08a) Tue Jan 4 17:11:37 2005
-######################################################################
-
-TEMPLATE = app
-CONFIG -= moc
-DEPENDPATH += .
-INCLUDEPATH += .
-
-# Input
-SOURCES += file.cpp
-CONFIG += qt warn_on debug  create_prl link_prl
-OBJECTS_DIR=.obj/debug-shared
-MOC_DIR=.moc/debug-shared
diff --git a/doc/codesnippets/doc/src/snippets/fileinfo/fileinfo.pro b/doc/codesnippets/doc/src/snippets/fileinfo/fileinfo.pro
deleted file mode 100644
index 2705d1f..0000000
--- a/doc/codesnippets/doc/src/snippets/fileinfo/fileinfo.pro
+++ /dev/null
@@ -1,11 +0,0 @@
-######################################################################
-# Automatically generated by qmake (2.01a) Thu Apr 3 11:48:36 2008
-######################################################################
-
-TEMPLATE = app
-TARGET = 
-DEPENDPATH += .
-INCLUDEPATH += .
-
-# Input
-SOURCES += main.cpp
diff --git a/doc/codesnippets/doc/src/snippets/i18n-non-qt-class/i18n-non-qt-class.pro b/doc/codesnippets/doc/src/snippets/i18n-non-qt-class/i18n-non-qt-class.pro
deleted file mode 100644
index 9abd1e8..0000000
--- a/doc/codesnippets/doc/src/snippets/i18n-non-qt-class/i18n-non-qt-class.pro
+++ /dev/null
@@ -1,7 +0,0 @@
-HEADERS       = myclass.h
-RESOURCES     = resources.qrc
-SOURCES       = main.cpp \
-                myclass.cpp
-TRANSLATIONS  = translations/i18n-non-qt-class_en.ts \
-                translations/i18n-non-qt-class_fr.ts
-QT -= gui
diff --git a/doc/codesnippets/doc/src/snippets/image/image.pro b/doc/codesnippets/doc/src/snippets/image/image.pro
deleted file mode 100644
index 0df436a..0000000
--- a/doc/codesnippets/doc/src/snippets/image/image.pro
+++ /dev/null
@@ -1 +0,0 @@
-SOURCES += image.cpp
diff --git a/doc/codesnippets/doc/src/snippets/inherited-slot/inherited-slot.pro b/doc/codesnippets/doc/src/snippets/inherited-slot/inherited-slot.pro
deleted file mode 100644
index 702e9cc..0000000
--- a/doc/codesnippets/doc/src/snippets/inherited-slot/inherited-slot.pro
+++ /dev/null
@@ -1,3 +0,0 @@
-HEADERS   = button.h
-SOURCES   = main.cpp \
-            button.cpp
diff --git a/doc/codesnippets/doc/src/snippets/itemselection/itemselection.pro b/doc/codesnippets/doc/src/snippets/itemselection/itemselection.pro
deleted file mode 100644
index b1126bf..0000000
--- a/doc/codesnippets/doc/src/snippets/itemselection/itemselection.pro
+++ /dev/null
@@ -1,3 +0,0 @@
-HEADERS     = model.h
-SOURCES     = main.cpp \
-              model.cpp
diff --git a/doc/codesnippets/doc/src/snippets/itemselection/model.cpp b/doc/codesnippets/doc/src/snippets/itemselection/model.cpp
deleted file mode 100644
index e759c5a..0000000
--- a/doc/codesnippets/doc/src/snippets/itemselection/model.cpp
+++ /dev/null
@@ -1,239 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the documentation of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial Usage
-** Licensees holding valid Qt Commercial licenses may use this file in
-** accordance with the Qt Commercial License Agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Nokia.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain
-** additional rights. These rights are described in the Nokia Qt LGPL
-** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://www.qtsoftware.com/contact.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-/*
-    model.cpp
-
-    Provides a table model for use in various examples.
-*/
-
-#include <QtGui>
-
-#include "model.h"
-
-/*!
-    Constructs a table model with at least one row and one column.
-*/
-
-TableModel::TableModel(int rows, int columns, QObject *parent)
-    : QAbstractTableModel(parent)
-{
-    QStringList newList;
-
-    for (int column = 0; column < qMax(1, columns); ++column) {
-        newList.append("");
-    }
-
-    for (int row = 0; row < qMax(1, rows); ++row) {
-        rowList.append(newList);
-    }
-}
-
-
-/*!
-    Returns the number of items in the row list as the number of rows
-    in the model.
-*/
-
-int TableModel::rowCount(const QModelIndex &/*parent*/) const
-{
-    return rowList.size();
-}
-
-/*!
-    Returns the number of items in the first list item as the number of
-    columns in the model. All rows should have the same number of columns.
-*/
-
-int TableModel::columnCount(const QModelIndex &/*parent*/) const
-{
-    return rowList[0].size();
-}
-
-/*!
-    Returns an appropriate value for the requested data.
-    If the view requests an invalid index, an invalid variant is returned.
-    Any valid index that corresponds to a string in the list causes that
-    string to be returned for the display role; otherwise an invalid variant
-    is returned.
-*/
-
-QVariant TableModel::data(const QModelIndex &index, int role) const
-{
-    if (!index.isValid())
-        return QVariant();
-
-    if (role == Qt::DisplayRole)
-        return rowList[index.row()][index.column()];
-    else
-        return QVariant();
-}
-
-/*!
-    Returns the appropriate header string depending on the orientation of
-    the header and the section. If anything other than the display role is
-    requested, we return an invalid variant.
-*/
-
-QVariant TableModel::headerData(int section, Qt::Orientation orientation,
-                                int role) const
-{
-    if (role != Qt::DisplayRole)
-        return QVariant();
-
-    if (orientation == Qt::Horizontal)
-        return QString("Column %1").arg(section);
-    else
-        return QString("Row %1").arg(section);
-}
-
-/*!
-    Returns an appropriate value for the item's flags. Valid items are
-    enabled, selectable, and editable.
-*/
-
-Qt::ItemFlags TableModel::flags(const QModelIndex &index) const
-{
-    if (!index.isValid())
-        return Qt::ItemIsEnabled;
-
-    return Qt::ItemIsEnabled | Qt::ItemIsSelectable | Qt::ItemIsEditable;
-}
-
-/*!
-    Changes an item in the model, but only if the following conditions
-    are met:
-
-    * The index supplied is valid.
-    * The role associated with editing text is specified.
-
-    The dataChanged() signal is emitted if the item is changed.
-*/
-
-bool TableModel::setData(const QModelIndex &index,
-                         const QVariant &value, int role)
-{
-    if (!index.isValid() || role != Qt::EditRole)
-        return false;
-
-    rowList[index.row()][index.column()] = value.toString();
-    emit dataChanged(index, index);
-    return true;
-}
-
-/*!
-    Inserts a number of rows into the model at the specified position.
-*/
-
-bool TableModel::insertRows(int position, int rows, const QModelIndex &parent)
-{
-    int columns = columnCount();
-    beginInsertRows(parent, position, position + rows - 1);
-
-    for (int row = 0; row < rows; ++row) {
-        QStringList items;
-        for (int column = 0; column < columns; ++column)
-            items.append("");
-        rowList.insert(position, items);
-    }
-
-    endInsertRows();
-    return true;
-}
-
-/*!
-    Inserts a number of columns into the model at the specified position.
-    Each entry in the list is extended in turn with the required number of
-    empty strings.
-*/
-
-bool TableModel::insertColumns(int position, int columns,
-                               const QModelIndex &parent)
-{
-    int rows = rowCount();
-    beginInsertColumns(parent, position, position + columns - 1);
-
-    for (int row = 0; row < rows; ++row) {
-        for (int column = position; column < columns; ++column) {
-            rowList[row].insert(position, "");
-        }
-    }
-
-    endInsertColumns();
-    return true;
-}
-
-/*!
-    Removes a number of rows from the model at the specified position.
-*/
-
-bool TableModel::removeRows(int position, int rows, const QModelIndex &parent)
-{
-    beginRemoveRows(parent, position, position + rows - 1);
-
-    for (int row = 0; row < rows; ++row) {
-        rowList.removeAt(position);
-    }
-
-    endRemoveRows();
-    return true;
-}
-
-/*!
-    Removes a number of columns from the model at the specified position.
-    Each row is shortened by the number of columns specified.
-*/
-
-bool TableModel::removeColumns(int position, int columns,
-                               const QModelIndex &parent)
-{
-    int rows = rowCount();
-    beginRemoveColumns(parent, position, position + columns - 1);
-
-    for (int row = 0; row < rows; ++row) {
-        for (int column = 0; column < columns; ++column) {
-            rowList[row].removeAt(position);
-        }
-    }
-
-    endRemoveColumns();
-    return true;
-}
diff --git a/doc/codesnippets/doc/src/snippets/layouts/layouts.pro b/doc/codesnippets/doc/src/snippets/layouts/layouts.pro
deleted file mode 100644
index 79dd54c..0000000
--- a/doc/codesnippets/doc/src/snippets/layouts/layouts.pro
+++ /dev/null
@@ -1,12 +0,0 @@
-######################################################################
-# Automatically generated by qmake (2.00a) Wed May 4 15:30:40 2005
-######################################################################
-
-TEMPLATE = app
-INCLUDEPATH += .
-
-# Input
-SOURCES += layouts.cpp
-CONFIG += qt warn_on debug  create_prl link_prl
-OBJECTS_DIR=.obj/debug-shared
-MOC_DIR=.moc/debug-shared
diff --git a/doc/codesnippets/doc/src/snippets/matrix/matrix.pro b/doc/codesnippets/doc/src/snippets/matrix/matrix.pro
deleted file mode 100644
index 91c307d..0000000
--- a/doc/codesnippets/doc/src/snippets/matrix/matrix.pro
+++ /dev/null
@@ -1,11 +0,0 @@
-######################################################################
-# Automatically generated by qmake (2.00a) Fri Jan 6 16:44:56 2006
-######################################################################
-
-TEMPLATE = app
-TARGET += 
-DEPENDPATH += .
-INCLUDEPATH += .
-
-# Input
-SOURCES += matrix.cpp
diff --git a/doc/codesnippets/doc/src/snippets/moc/moc.pro b/doc/codesnippets/doc/src/snippets/moc/moc.pro
deleted file mode 100644
index f199abe..0000000
--- a/doc/codesnippets/doc/src/snippets/moc/moc.pro
+++ /dev/null
@@ -1,2 +0,0 @@
-HEADERS += myclass1.h myclass2.h myclass3.h
-SOURCES += main.cpp
diff --git a/doc/codesnippets/doc/src/snippets/network/tcpwait.cpp b/doc/codesnippets/doc/src/snippets/network/tcpwait.cpp
index 7ebdc69..0712b3e 100644
--- a/doc/codesnippets/doc/src/snippets/network/tcpwait.cpp
+++ b/doc/codesnippets/doc/src/snippets/network/tcpwait.cpp
@@ -51,13 +51,12 @@ def main():
 //! [0]
     numRead = 0
     numReadTotal = 0
-    buffer = ""
 
     while(True):
-        numRead  = socket.read(buffer, 50)
+        buffer  = socket.read(50)
         # do whatever with array
-        numReadTotal += numRead
-        if (numRead == 0 && !socket.waitForReadyRead()):
+        numReadTotal += buffer.size()
+        if (buffer.size() == 0 && !socket.waitForReadyRead()):
             break
 //! [0]
     return app.exec_()
diff --git a/doc/codesnippets/doc/src/snippets/painterpath/painterpath.pro b/doc/codesnippets/doc/src/snippets/painterpath/painterpath.pro
deleted file mode 100644
index 0a6ad46..0000000
--- a/doc/codesnippets/doc/src/snippets/painterpath/painterpath.pro
+++ /dev/null
@@ -1 +0,0 @@
-SOURCES += painterpath.cpp
diff --git a/doc/codesnippets/doc/src/snippets/persistentindexes/model.cpp b/doc/codesnippets/doc/src/snippets/persistentindexes/model.cpp
deleted file mode 100644
index a60c095..0000000
--- a/doc/codesnippets/doc/src/snippets/persistentindexes/model.cpp
+++ /dev/null
@@ -1,169 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the documentation of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial Usage
-** Licensees holding valid Qt Commercial licenses may use this file in
-** accordance with the Qt Commercial License Agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Nokia.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain
-** additional rights. These rights are described in the Nokia Qt LGPL
-** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://www.qtsoftware.com/contact.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-/*
-  model.cpp
-
-  A simple model that uses a QStringList as its data source.
-*/
-
-#include <qdebug.h>
-
-#include "model.h"
-
-/*!
-    Returns the number of items in the string list as the number of rows
-    in the model.
-*/
-
-int StringListModel::rowCount(const QModelIndex &parent) const
-{
-    return stringList.count();
-}
-
-/*!
-    Returns an appropriate value for the requested data.
-    If the view requests an invalid index, an invalid variant is returned.
-    If a header is requested then we just return the column or row number,
-    depending on the orientation of the header.
-    Any valid index that corresponds to a string in the list causes that
-    string to be returned.
-*/
-
-QVariant StringListModel::data(const QModelIndex &index, int role) const
-{
-    if (!index.isValid())
-        return QVariant();
-
-    if (index.row() < 0 || index.row() >= stringList.size())
-        return QVariant();
-
-    if (role == Qt::DisplayRole)
-        return stringList.at(index.row());
-    else
-        return QVariant();
-}
-
-/*!
-    Returns the appropriate header string depending on the orientation of
-    the header and the section. If anything other than the display role is
-    requested, we return an invalid variant.
-*/
-
-QVariant StringListModel::headerData(int section, Qt::Orientation orientation,
-                                     int role) const
-{
-    if (role != Qt::DisplayRole)
-        return QVariant();
-
-    if (orientation == Qt::Horizontal)
-        return QString("Column %1").arg(section);
-    else
-        return QString("Row %1").arg(section);
-}
-
-/*!
-    Returns an appropriate value for the item's flags. Valid items are
-    enabled, selectable, and editable.
-*/
-
-Qt::ItemFlags StringListModel::flags(const QModelIndex &index) const
-{
-    if (!index.isValid())
-        return Qt::ItemIsEnabled;
-
-    return QAbstractItemModel::flags(index) | Qt::ItemIsEditable;
-}
-
-/*!
-    Changes an item in the string list, but only if the following conditions
-    are met:
-
-    * The index supplied is valid.
-    * The index corresponds to an item to be shown in a view.
-    * The role associated with editing text is specified.
-
-    The dataChanged() signal is emitted if the item is changed.
-*/
-
-bool StringListModel::setData(const QModelIndex &index,
-                              const QVariant &value, int role)
-{
-    if (index.isValid() && role == Qt::EditRole) {
-
-        stringList.replace(index.row(), value.toString());
-        emit dataChanged(index, index);
-        return true;
-    }
-    return false;
-}
-
-/*!
-    Inserts a number of rows into the model at the specified position.
-*/
-
-bool StringListModel::insertRows(int position, int rows, const QModelIndex &parent)
-{
-    beginInsertRows(parent, position, position + rows - 1);
-
-    for (int row = 0; row < rows; ++row) {
-        stringList.insert(position, "");
-    }
-
-    endInsertRows();
-    return true;
-}
-
-/*!
-    Removes a number of rows from the model at the specified position.
-*/
-
-bool StringListModel::removeRows(int position, int rows, const QModelIndex &parent)
-{
-    beginRemoveRows(parent, position, position + rows - 1);
-
-    for (int row = 0; row < rows; ++row) {
-        stringList.removeAt(position);
-    }
-
-    endRemoveRows();
-    return true;
-}
diff --git a/doc/codesnippets/doc/src/snippets/persistentindexes/persistentindexes.pro b/doc/codesnippets/doc/src/snippets/persistentindexes/persistentindexes.pro
deleted file mode 100644
index aaf41bd..0000000
--- a/doc/codesnippets/doc/src/snippets/persistentindexes/persistentindexes.pro
+++ /dev/null
@@ -1,5 +0,0 @@
-HEADERS     = mainwindow.h \
-              model.h
-SOURCES     = main.cpp \
-              mainwindow.cpp \
-              model.cpp
diff --git a/doc/codesnippets/doc/src/snippets/picture/picture.pro b/doc/codesnippets/doc/src/snippets/picture/picture.pro
deleted file mode 100644
index b46019f..0000000
--- a/doc/codesnippets/doc/src/snippets/picture/picture.pro
+++ /dev/null
@@ -1,12 +0,0 @@
-######################################################################
-# Automatically generated by qmake (2.00a) Sun Jun 26 15:25:59 2005
-######################################################################
-
-TEMPLATE = app
-INCLUDEPATH += .
-
-# Input
-SOURCES += picture.cpp
-OBJECTS_DIR=.obj/debug-shared
-MOC_DIR=.moc/debug-shared
-CONFIG += qt warn_on debug  create_prl link_prl
diff --git a/doc/codesnippets/doc/src/snippets/plaintextlayout/plaintextlayout.pro b/doc/codesnippets/doc/src/snippets/plaintextlayout/plaintextlayout.pro
deleted file mode 100644
index 6283406..0000000
--- a/doc/codesnippets/doc/src/snippets/plaintextlayout/plaintextlayout.pro
+++ /dev/null
@@ -1,3 +0,0 @@
-HEADERS     = window.h
-SOURCES     = main.cpp \
-              window.cpp
diff --git a/doc/codesnippets/doc/src/snippets/polygon/polygon.pro b/doc/codesnippets/doc/src/snippets/polygon/polygon.pro
deleted file mode 100644
index 39841a5..0000000
--- a/doc/codesnippets/doc/src/snippets/polygon/polygon.pro
+++ /dev/null
@@ -1 +0,0 @@
-SOURCES += polygon.cpp
diff --git a/doc/codesnippets/doc/src/snippets/porting4-dropevents/porting4-dropevents.pro b/doc/codesnippets/doc/src/snippets/porting4-dropevents/porting4-dropevents.pro
deleted file mode 100644
index 6283406..0000000
--- a/doc/codesnippets/doc/src/snippets/porting4-dropevents/porting4-dropevents.pro
+++ /dev/null
@@ -1,3 +0,0 @@
-HEADERS     = window.h
-SOURCES     = main.cpp \
-              window.cpp
diff --git a/doc/codesnippets/doc/src/snippets/printing-qprinter/printing-qprinter.pro b/doc/codesnippets/doc/src/snippets/printing-qprinter/printing-qprinter.pro
deleted file mode 100644
index c50fc19..0000000
--- a/doc/codesnippets/doc/src/snippets/printing-qprinter/printing-qprinter.pro
+++ /dev/null
@@ -1,3 +0,0 @@
-SOURCES   = main.cpp \
-            object.cpp
-HEADERS   = object.h
diff --git a/doc/codesnippets/doc/src/snippets/process/process.cpp b/doc/codesnippets/doc/src/snippets/process/process.cpp
index 3baeb58..7201bdb 100644
--- a/doc/codesnippets/doc/src/snippets/process/process.cpp
+++ b/doc/codesnippets/doc/src/snippets/process/process.cpp
@@ -45,7 +45,7 @@ bool zip()
 {
 //! [0]
     gzip = QProcess()
-    gzip.start("gzip", QStringList() << "-c")
+    gzip.start("gzip", ["-c"])
     if not gzip.waitForStarted():
         return False
 
diff --git a/doc/codesnippets/doc/src/snippets/process/process.pro b/doc/codesnippets/doc/src/snippets/process/process.pro
deleted file mode 100644
index f96847d..0000000
--- a/doc/codesnippets/doc/src/snippets/process/process.pro
+++ /dev/null
@@ -1 +0,0 @@
-SOURCES += process.cpp
diff --git a/doc/codesnippets/doc/src/snippets/qcalendarwidget/qcalendarwidget.pro b/doc/codesnippets/doc/src/snippets/qcalendarwidget/qcalendarwidget.pro
deleted file mode 100644
index 88c5e24..0000000
--- a/doc/codesnippets/doc/src/snippets/qcalendarwidget/qcalendarwidget.pro
+++ /dev/null
@@ -1 +0,0 @@
-SOURCES   = main.cpp
diff --git a/doc/codesnippets/doc/src/snippets/qcolumnview/qcolumnview.pro b/doc/codesnippets/doc/src/snippets/qcolumnview/qcolumnview.pro
deleted file mode 100644
index 5254077..0000000
--- a/doc/codesnippets/doc/src/snippets/qcolumnview/qcolumnview.pro
+++ /dev/null
@@ -1 +0,0 @@
-SOURCES = main.cpp
\ No newline at end of file
diff --git a/doc/codesnippets/doc/src/snippets/qdbusextratypes/qdbusextratypes.cpp b/doc/codesnippets/doc/src/snippets/qdbusextratypes/qdbusextratypes.cpp
deleted file mode 100644
index 6f13707..0000000
--- a/doc/codesnippets/doc/src/snippets/qdbusextratypes/qdbusextratypes.cpp
+++ /dev/null
@@ -1,67 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the documentation of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial Usage
-** Licensees holding valid Qt Commercial licenses may use this file in
-** accordance with the Qt Commercial License Agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Nokia.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain
-** additional rights. These rights are described in the Nokia Qt LGPL
-** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://www.qtsoftware.com/contact.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include <QtCore>
-#include <QtDBus>
-
-static QVariant callMyDBusFunction() { return QVariant(); }
-
-int main()
-{
-    QDBusMessage myDBusMessage;
-
-//! [0]
-    QList<QVariant> arguments;
-    arguments << QVariant(42) << QVariant::fromValue(QDBusVariant(43)) << QVariant("hello");
-    myDBusMessage.setArguments(arguments);
-//! [0]
-
-//! [1]
-    // call a D-Bus function that returns a D-Bus variant
-    QVariant v = callMyDBusFunction();
-    // retrieve the D-Bus variant
-    QDBusVariant dbusVariant = qvariant_cast<QDBusVariant>(v);
-    // retrieve the actual value stored in the D-Bus variant
-    QVariant result = dbusVariant.variant();
-//! [1]
-
-    return 0;
-}
diff --git a/doc/codesnippets/doc/src/snippets/qdbusextratypes/qdbusextratypes.pro b/doc/codesnippets/doc/src/snippets/qdbusextratypes/qdbusextratypes.pro
deleted file mode 100644
index e31e8d9..0000000
--- a/doc/codesnippets/doc/src/snippets/qdbusextratypes/qdbusextratypes.pro
+++ /dev/null
@@ -1,2 +0,0 @@
-SOURCES += qdbusextratypes.cpp
-QT = core dbus
diff --git a/doc/codesnippets/doc/src/snippets/qdebug/qdebug.pro b/doc/codesnippets/doc/src/snippets/qdebug/qdebug.pro
deleted file mode 100644
index e62a71c..0000000
--- a/doc/codesnippets/doc/src/snippets/qdebug/qdebug.pro
+++ /dev/null
@@ -1 +0,0 @@
-SOURCES   = qdebugsnippet.cpp
diff --git a/doc/codesnippets/doc/src/snippets/qdir-filepaths/qdir-filepaths.pro b/doc/codesnippets/doc/src/snippets/qdir-filepaths/qdir-filepaths.pro
deleted file mode 100644
index bba41b9..0000000
--- a/doc/codesnippets/doc/src/snippets/qdir-filepaths/qdir-filepaths.pro
+++ /dev/null
@@ -1 +0,0 @@
-SOURCES = main.cpp
diff --git a/doc/codesnippets/doc/src/snippets/qdir-listfiles/qdir-listfiles.pro b/doc/codesnippets/doc/src/snippets/qdir-listfiles/qdir-listfiles.pro
deleted file mode 100644
index bba41b9..0000000
--- a/doc/codesnippets/doc/src/snippets/qdir-listfiles/qdir-listfiles.pro
+++ /dev/null
@@ -1 +0,0 @@
-SOURCES = main.cpp
diff --git a/doc/codesnippets/doc/src/snippets/qdir-namefilters/main.cpp b/doc/codesnippets/doc/src/snippets/qdir-namefilters/main.cpp
index d34fdf3..259821f 100644
--- a/doc/codesnippets/doc/src/snippets/qdir-namefilters/main.cpp
+++ b/doc/codesnippets/doc/src/snippets/qdir-namefilters/main.cpp
@@ -39,28 +39,21 @@
 **
 ****************************************************************************/
 
-#include <QDir>
-#include <iostream>
+from PySide.QtCore import *
 
-int main(int argc, char *argv[])
-{
-    QDir dir;
-    dir.setFilter(QDir::Files | QDir::Hidden | QDir::NoSymLinks);
-    dir.setSorting(QDir::Size | QDir::Reversed);
+def main():
+    dir_ = QDir()
+    dir_.setFilter(QDir.Files | QDir.Hidden | QDir.NoSymLinks)
+    dir_.setSorting(QDir.Size | QDir.Reversed)
 
 //! [0]
-    filters = QStringList()
-    filters << "*.cpp" << "*.cxx" << "*.cc"
-    dir.setNameFilters(filters)
+    filters = ["*.cpp", "*.cxx", "*.cc"]
+    dir_.setNameFilters(filters)
 //! [0]
+//
+    lst = d.entryInfoList()
+
+    print "     Bytes Filename"
+    for fileInfo in lst:
+        print '%d %s' % (fileInfo.size(), fileInfo.fileName())
 
-    QFileInfoList list = dir.entryInfoList();
-    std::cout << "     Bytes Filename" << std::endl;
-    for (int i = 0; i < list.size(); ++i) {
-        QFileInfo fileInfo = list.at(i);
-        std::cout << qPrintable(QString("%1 %2").arg(fileInfo.size(), 10)
-                                                .arg(fileInfo.fileName()));
-        std::cout << std::endl;
-    }
-    return 0;
-}
diff --git a/doc/codesnippets/doc/src/snippets/qdir-namefilters/qdir-namefilters.pro b/doc/codesnippets/doc/src/snippets/qdir-namefilters/qdir-namefilters.pro
deleted file mode 100644
index bba41b9..0000000
--- a/doc/codesnippets/doc/src/snippets/qdir-namefilters/qdir-namefilters.pro
+++ /dev/null
@@ -1 +0,0 @@
-SOURCES = main.cpp
diff --git a/doc/codesnippets/doc/src/snippets/qelapsedtimer/main.cpp b/doc/codesnippets/doc/src/snippets/qelapsedtimer/main.cpp
new file mode 100644
index 0000000..cae84e7
--- /dev/null
+++ b/doc/codesnippets/doc/src/snippets/qelapsedtimer/main.cpp
@@ -0,0 +1,109 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtNetwork module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+#include <QtCore>
+
+void slowOperation1()
+{
+    static char buf[256];
+    for (int i = 0; i < (1<<20); ++i)
+        buf[i % sizeof buf] = i;
+}
+
+void slowOperation2(int) { slowOperation1(); }
+
+void startExample()
+{
+//![0]
+    timer = QElapsedTimer()
+    timer.start()
+
+    slowOperation1()
+
+    sys.stderr.write("The slow operation took" + timer.elapsed() + "milliseconds")
+//![0]
+}
+
+//![1]
+def executeSlowOperations(timeout):
+    timer = QElapsedTimer()
+    timer.start()
+    slowOperation1()
+
+    remainingTime = timeout - timer.elapsed()
+    if remainingTime > 0:
+        slowOperation2(remainingTime)
+//![1]
+
+//![2]
+def executeOperationsForTime(ms):
+    timer = QElapsedTimer()
+    timer.start()
+
+    while not timer.hasExpired(ms):
+        slowOperation1()
+//![2]
+
+int restartExample()
+{
+//![3]
+    timer = QElapsedTimer()
+
+    count = 1
+    timer.start()
+
+    while True:
+        count *= 2
+        slowOperation2(count)
+        if timer.restart() < 250:
+            break
+
+    return count
+//![3]
+}
+
+int main(int argc, char **argv)
+{
+    QCoreApplication app(argc, argv);
+
+    startExample();
+    restartExample();
+    executeSlowOperations(5);
+    executeOperationsForTime(5);
+}
diff --git a/doc/codesnippets/doc/src/snippets/qfontdatabase/qfontdatabase.pro b/doc/codesnippets/doc/src/snippets/qfontdatabase/qfontdatabase.pro
deleted file mode 100644
index ce12e3b..0000000
--- a/doc/codesnippets/doc/src/snippets/qfontdatabase/qfontdatabase.pro
+++ /dev/null
@@ -1 +0,0 @@
-SOURCES    = main.cpp
diff --git a/doc/codesnippets/doc/src/snippets/qgl-namespace/qgl-namespace.pro b/doc/codesnippets/doc/src/snippets/qgl-namespace/qgl-namespace.pro
deleted file mode 100644
index 9be6edc..0000000
--- a/doc/codesnippets/doc/src/snippets/qgl-namespace/qgl-namespace.pro
+++ /dev/null
@@ -1,2 +0,0 @@
-SOURCES = main.cpp
-QT += opengl
diff --git a/doc/codesnippets/doc/src/snippets/qlabel/qlabel.pro b/doc/codesnippets/doc/src/snippets/qlabel/qlabel.pro
deleted file mode 100644
index bba41b9..0000000
--- a/doc/codesnippets/doc/src/snippets/qlabel/qlabel.pro
+++ /dev/null
@@ -1 +0,0 @@
-SOURCES = main.cpp
diff --git a/doc/codesnippets/doc/src/snippets/qlineargradient/qlineargradient.pro b/doc/codesnippets/doc/src/snippets/qlineargradient/qlineargradient.pro
deleted file mode 100644
index 48c7d9e..0000000
--- a/doc/codesnippets/doc/src/snippets/qlineargradient/qlineargradient.pro
+++ /dev/null
@@ -1,3 +0,0 @@
-HEADERS     = paintwidget.h
-SOURCES     = main.cpp \
-              paintwidget.cpp
diff --git a/doc/codesnippets/doc/src/snippets/qlistview-dnd/model.cpp b/doc/codesnippets/doc/src/snippets/qlistview-dnd/model.cpp
index 1b91309..6deea9f 100644
--- a/doc/codesnippets/doc/src/snippets/qlistview-dnd/model.cpp
+++ b/doc/codesnippets/doc/src/snippets/qlistview-dnd/model.cpp
@@ -132,23 +132,17 @@ Qt::ItemFlags DragDropListModel::flags(const QModelIndex &index) const
 //! [7]
 
 //! [8]
-QMimeData *DragDropListModel::mimeData(const QModelIndexList &indexes) const
-{
-    QMimeData *mimeData = new QMimeData();
-    QByteArray encodedData;
+def mimeData(self, indexes):
+    mimeData = QMimeData()
+    encodedData = QByteArray()
+    stream = QDataStream(encodedData, QIODevice.WriteOnly)
 
-    QDataStream stream(&encodedData, QIODevice::WriteOnly);
+    for index in indexes:
+        if index.isValid():
+            stream << data(index, Qt.DisplayRole)
 
-    foreach (QModelIndex index, indexes) {
-        if (index.isValid()) {
-            QString text = data(index, Qt::DisplayRole).toString();
-            stream << text;
-        }
-    }
-
-    mimeData->setData("application/vnd.text.list", encodedData);
+    mimeData.setData("application/vnd.text.list", encodedData)
     return mimeData;
-}
 //! [8]
 
 //! [9]
diff --git a/doc/codesnippets/doc/src/snippets/qlistview-dnd/qlistview-dnd.pro b/doc/codesnippets/doc/src/snippets/qlistview-dnd/qlistview-dnd.pro
deleted file mode 100644
index 71fa273..0000000
--- a/doc/codesnippets/doc/src/snippets/qlistview-dnd/qlistview-dnd.pro
+++ /dev/null
@@ -1,5 +0,0 @@
-SOURCES     = main.cpp \
-              mainwindow.cpp \
-              model.cpp
-HEADERS     = mainwindow.h \
-              model.h
diff --git a/doc/codesnippets/doc/src/snippets/qlistview-using/model.cpp b/doc/codesnippets/doc/src/snippets/qlistview-using/model.cpp
deleted file mode 100644
index 7344b51..0000000
--- a/doc/codesnippets/doc/src/snippets/qlistview-using/model.cpp
+++ /dev/null
@@ -1,175 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the documentation of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial Usage
-** Licensees holding valid Qt Commercial licenses may use this file in
-** accordance with the Qt Commercial License Agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Nokia.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain
-** additional rights. These rights are described in the Nokia Qt LGPL
-** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://www.qtsoftware.com/contact.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of an example program for Qt.
-** EDITIONS: NOLIMITS
-**
-****************************************************************************/
-
-/*
-  model.cpp
-
-  A simple model that uses a QStringList as its data source.
-*/
-
-#include "model.h"
-
-/*!
-    Returns the number of items in the string list as the number of rows
-    in the model.
-*/
-
-int StringListModel::rowCount(const QModelIndex &parent) const
-{
-    return stringList.count();
-}
-
-/*!
-    Returns an appropriate value for the requested data.
-    If the view requests an invalid index, an invalid variant is returned.
-    Any valid index that corresponds to a string in the list causes that
-    string to be returned.
-*/
-
-QVariant StringListModel::data(const QModelIndex &index, int role) const
-{
-    if (!index.isValid())
-        return QVariant();
-
-    if (index.row() >= stringList.size())
-        return QVariant();
-
-    if (role == Qt::DisplayRole)
-        return stringList.at(index.row());
-    else
-        return QVariant();
-}
-
-/*!
-    Returns the appropriate header string depending on the orientation of
-    the header and the section. If anything other than the display role is
-    requested, we return an invalid variant.
-*/
-
-QVariant StringListModel::headerData(int section, Qt::Orientation orientation,
-                                     int role) const
-{
-    if (role != Qt::DisplayRole)
-        return QVariant();
-
-    if (orientation == Qt::Horizontal)
-        return QString("Column %1").arg(section);
-    else
-        return QString("Row %1").arg(section);
-}
-
-/*!
-    Returns an appropriate value for the item's flags. Valid items are
-    enabled, selectable, and editable.
-*/
-
-Qt::ItemFlags StringListModel::flags(const QModelIndex &index) const
-{
-    if (!index.isValid())
-        return Qt::ItemIsEnabled;
-
-    return QAbstractItemModel::flags(index) | Qt::ItemIsEditable;
-}
-
-/*!
-    Changes an item in the string list, but only if the following conditions
-    are met:
-
-    * The index supplied is valid.
-    * The index corresponds to an item to be shown in a view.
-    * The role associated with editing text is specified.
-
-    The dataChanged() signal is emitted if the item is changed.
-*/
-
-bool StringListModel::setData(const QModelIndex &index,
-                              const QVariant &value, int role)
-{
-    if (index.isValid() && role == Qt::EditRole) {
-
-        stringList.replace(index.row(), value.toString());
-        emit dataChanged(index, index);
-        return true;
-    }
-    return false;
-}
-
-/*!
-    Inserts a number of rows into the model at the specified position.
-*/
-
-bool StringListModel::insertRows(int position, int rows, const QModelIndex &parent)
-{
-    beginInsertRows(QModelIndex(), position, position+rows-1);
-
-    for (int row = 0; row < rows; ++row) {
-        stringList.insert(position, "");
-    }
-
-    endInsertRows();
-    return true;
-}
-
-/*!
-    Removes a number of rows from the model at the specified position.
-*/
-
-bool StringListModel::removeRows(int position, int rows, const QModelIndex &parent)
-{
-    beginRemoveRows(QModelIndex(), position, position+rows-1);
-
-    for (int row = 0; row < rows; ++row) {
-        stringList.removeAt(position);
-    }
-
-    endRemoveRows();
-    return true;
-}
diff --git a/doc/codesnippets/doc/src/snippets/qlistview-using/qlistview-using.pro b/doc/codesnippets/doc/src/snippets/qlistview-using/qlistview-using.pro
deleted file mode 100644
index 71fa273..0000000
--- a/doc/codesnippets/doc/src/snippets/qlistview-using/qlistview-using.pro
+++ /dev/null
@@ -1,5 +0,0 @@
-SOURCES     = main.cpp \
-              mainwindow.cpp \
-              model.cpp
-HEADERS     = mainwindow.h \
-              model.h
diff --git a/doc/codesnippets/doc/src/snippets/qlistwidget-dnd/qlistwidget-dnd.pro b/doc/codesnippets/doc/src/snippets/qlistwidget-dnd/qlistwidget-dnd.pro
deleted file mode 100644
index 12a900a..0000000
--- a/doc/codesnippets/doc/src/snippets/qlistwidget-dnd/qlistwidget-dnd.pro
+++ /dev/null
@@ -1,3 +0,0 @@
-SOURCES     = main.cpp \
-              mainwindow.cpp
-HEADERS     = mainwindow.h
diff --git a/doc/codesnippets/doc/src/snippets/qlistwidget-using/qlistwidget-using.pro b/doc/codesnippets/doc/src/snippets/qlistwidget-using/qlistwidget-using.pro
deleted file mode 100644
index 12a900a..0000000
--- a/doc/codesnippets/doc/src/snippets/qlistwidget-using/qlistwidget-using.pro
+++ /dev/null
@@ -1,3 +0,0 @@
-SOURCES     = main.cpp \
-              mainwindow.cpp
-HEADERS     = mainwindow.h
diff --git a/doc/codesnippets/doc/src/snippets/qmacnativewidget/qmacnativewidget.pro b/doc/codesnippets/doc/src/snippets/qmacnativewidget/qmacnativewidget.pro
deleted file mode 100644
index 15176e1..0000000
--- a/doc/codesnippets/doc/src/snippets/qmacnativewidget/qmacnativewidget.pro
+++ /dev/null
@@ -1,8 +0,0 @@
-######################################################################
-# Automatically generated by qmake (2.01a) Thu Sep 4 15:50:09 2008
-######################################################################
-
-CONFIG+=x86_64
-
-OBJECTIVE_SOURCES += main.mm
-LIBS += -framework Cocoa -framework Carbon
diff --git a/doc/codesnippets/doc/src/snippets/qmake/comments.pro b/doc/codesnippets/doc/src/snippets/qmake/comments.pro
deleted file mode 100644
index 189d271..0000000
--- a/doc/codesnippets/doc/src/snippets/qmake/comments.pro
+++ /dev/null
@@ -1,10 +0,0 @@
-#! [0]
-# Comments usually start at the beginning of a line, but they
-# can also follow other content on the same line.
-#! [0]
-
-#! [1]
-# To include a literal hash character, use the $$LITERAL_HASH variable:
-urlPieces = http://doc.trolltech.com/4.0/qtextdocument.html pageCount
-message($$join(urlPieces, $$LITERAL_HASH))
-#! [1]
diff --git a/doc/codesnippets/doc/src/snippets/qmake/configscopes.pro b/doc/codesnippets/doc/src/snippets/qmake/configscopes.pro
deleted file mode 100644
index 6ab7f7c..0000000
--- a/doc/codesnippets/doc/src/snippets/qmake/configscopes.pro
+++ /dev/null
@@ -1,23 +0,0 @@
-SOURCES = main.cpp
-#! [0]
-CONFIG += opengl
-#! [0]
-
-#! [1]
-opengl {
-    TARGET = application-gl
-} else {
-#! [1] #! [2]
-    TARGET = application
-#! [2] #! [3]
-}
-#! [3]
-
-#! [4]
-CONFIG(opengl) {
-    message(Building with OpenGL support.)
-} else {
-#! [4] #! [5]
-    message(OpenGL support is not available.)
-}
-#! [5]
diff --git a/doc/codesnippets/doc/src/snippets/qmake/debug_and_release.pro b/doc/codesnippets/doc/src/snippets/qmake/debug_and_release.pro
deleted file mode 100644
index 92e8dbf..0000000
--- a/doc/codesnippets/doc/src/snippets/qmake/debug_and_release.pro
+++ /dev/null
@@ -1,14 +0,0 @@
-#! [0]
-CONFIG += debug_and_release
-
-CONFIG(debug, debug|release) {
-    TARGET = debug_binary
-} else {
-#! [0] #! [1]
-    TARGET = release_binary
-}
-#! [1]
-
-#! [2]
-CONFIG += build_all
-#! [2]
diff --git a/doc/codesnippets/doc/src/snippets/qmake/dereferencing.pro b/doc/codesnippets/doc/src/snippets/qmake/dereferencing.pro
deleted file mode 100644
index ff0c979..0000000
--- a/doc/codesnippets/doc/src/snippets/qmake/dereferencing.pro
+++ /dev/null
@@ -1,5 +0,0 @@
-#! [0]
-TEMP_SOURCES = $$SOURCES
-#! [0]
-# Do something with the SOURCES variable then restore its old value.
-SOURCES = $$TEMP_SOURCES
diff --git a/doc/codesnippets/doc/src/snippets/qmake/destdir.pro b/doc/codesnippets/doc/src/snippets/qmake/destdir.pro
deleted file mode 100644
index b2f9439..0000000
--- a/doc/codesnippets/doc/src/snippets/qmake/destdir.pro
+++ /dev/null
@@ -1,2 +0,0 @@
-SOURCES = main.cpp
-DESTDIR = output
diff --git a/doc/codesnippets/doc/src/snippets/qmake/dirname.pro b/doc/codesnippets/doc/src/snippets/qmake/dirname.pro
deleted file mode 100644
index 59e1f20..0000000
--- a/doc/codesnippets/doc/src/snippets/qmake/dirname.pro
+++ /dev/null
@@ -1,6 +0,0 @@
-#! [0]
-FILE = /etc/X11R6/XF86Config
-DIRNAME = $$dirname(FILE) #/etc/X11R6
-#! [0]
-message($$FILE)
-message($$DIRNAME)
diff --git a/doc/codesnippets/doc/src/snippets/qmake/environment.pro b/doc/codesnippets/doc/src/snippets/qmake/environment.pro
deleted file mode 100644
index 808bdeb..0000000
--- a/doc/codesnippets/doc/src/snippets/qmake/environment.pro
+++ /dev/null
@@ -1,9 +0,0 @@
-#! [0] #! [1]
-DESTDIR = $$(PWD)
-message(The project will be installed in $$DESTDIR)
-#! [0]
-
-DESTDIR = $(PWD)
-message(The project will be installed in the value of PWD)
-message(when the Makefile is processed.)
-#! [1]
diff --git a/doc/codesnippets/doc/src/snippets/qmake/functions.pro b/doc/codesnippets/doc/src/snippets/qmake/functions.pro
deleted file mode 100644
index 2766120..0000000
--- a/doc/codesnippets/doc/src/snippets/qmake/functions.pro
+++ /dev/null
@@ -1,34 +0,0 @@
-#! [0]
-EXTRAS = handlers tests docs
-for(dir, EXTRAS) {
-    exists($$dir) {
-        SUBDIRS += $$dir
-    }
-}
-#! [0]
-
-SOURCES = paintwidget_mac.cpp paintwidget_unix.cpp paintwidget_win.cpp
-macx {
-    SOURCES = $$find(SOURCES, "_mac")
-}
-
-#! [1]
-HEADERS = model.h
-HEADERS += $$OTHER_HEADERS
-HEADERS = $$unique(HEADERS)
-#! [1]
-
-CONFIG += debug
-#! [2]
-options = $$find(CONFIG, "debug") $$find(CONFIG, "release")
-#! [3]
-count(options, 2) {
-    message(Both release and debug specified.)
-}
-#! [2] #! [3]
-
-#! [4]
-eval(TARGET = myapp) {
-    message($$TARGET)
-}
-#! [4]
diff --git a/doc/codesnippets/doc/src/snippets/qmake/include.pro b/doc/codesnippets/doc/src/snippets/qmake/include.pro
deleted file mode 100644
index 37e7156..0000000
--- a/doc/codesnippets/doc/src/snippets/qmake/include.pro
+++ /dev/null
@@ -1,3 +0,0 @@
-#! [0]
-include(other.pro)
-#! [0]
diff --git a/doc/codesnippets/doc/src/snippets/qmake/other.pro b/doc/codesnippets/doc/src/snippets/qmake/other.pro
deleted file mode 100644
index e69de29..0000000
diff --git a/doc/codesnippets/doc/src/snippets/qmake/project_location.pro b/doc/codesnippets/doc/src/snippets/qmake/project_location.pro
deleted file mode 100644
index 09d9b3d..0000000
--- a/doc/codesnippets/doc/src/snippets/qmake/project_location.pro
+++ /dev/null
@@ -1,6 +0,0 @@
-#! [project file]
-message($$_PRO_FILE_)
-#! [project file]
-#! [project file directory]
-message($$_PRO_FILE_PWD_)
-#! [project file directory]
diff --git a/doc/codesnippets/doc/src/snippets/qmake/qtconfiguration.pro b/doc/codesnippets/doc/src/snippets/qmake/qtconfiguration.pro
deleted file mode 100644
index 0c854d9..0000000
--- a/doc/codesnippets/doc/src/snippets/qmake/qtconfiguration.pro
+++ /dev/null
@@ -1,19 +0,0 @@
-# Show information about the Qt installation.
-#! [0]
-message(Qt version: $$[QT_VERSION])
-message(Qt is installed in $$[QT_INSTALL_PREFIX])
-message(Qt resources can be found in the following locations:)
-message(Documentation: $$[QT_INSTALL_DOCS])
-message(Header files: $$[QT_INSTALL_HEADERS])
-message(Libraries: $$[QT_INSTALL_LIBS])
-message(Binary files (executables): $$[QT_INSTALL_BINS])
-message(Plugins: $$[QT_INSTALL_PLUGINS])
-message(Data files: $$[QT_INSTALL_DATA])
-message(Translation files: $$[QT_INSTALL_TRANSLATIONS])
-message(Settings: $$[QT_INSTALL_SETTINGS])
-message(Examples: $$[QT_INSTALL_EXAMPLES])
-message(Demonstrations: $$[QT_INSTALL_DEMOS])
-#! [0]
-
-# Show configuration information.
-message(CONFIG = $$CONFIG)
diff --git a/doc/codesnippets/doc/src/snippets/qmake/quoting.pro b/doc/codesnippets/doc/src/snippets/qmake/quoting.pro
deleted file mode 100644
index 62efb20..0000000
--- a/doc/codesnippets/doc/src/snippets/qmake/quoting.pro
+++ /dev/null
@@ -1,8 +0,0 @@
-#! [0]
-DEST = "Program Files"
-#! [0]
-count(DEST, 1) {
-    message(Only one item found in DEST.)
-} else {
-    message(More than one item found in DEST.)
-}
diff --git a/doc/codesnippets/doc/src/snippets/qmake/replace.pro b/doc/codesnippets/doc/src/snippets/qmake/replace.pro
deleted file mode 100644
index 504e01a..0000000
--- a/doc/codesnippets/doc/src/snippets/qmake/replace.pro
+++ /dev/null
@@ -1,4 +0,0 @@
-#! [0]
-MESSAGE = This is a tent.
-message($$replace(MESSAGE, tent, test))
-#! [0]
diff --git a/doc/codesnippets/doc/src/snippets/qmake/replacefunction.pro b/doc/codesnippets/doc/src/snippets/qmake/replacefunction.pro
deleted file mode 100644
index 98013ba..0000000
--- a/doc/codesnippets/doc/src/snippets/qmake/replacefunction.pro
+++ /dev/null
@@ -1,46 +0,0 @@
-#! [0]
-defineReplace(headersAndSources) {
-    variable = $$1
-    names = $$eval($$variable)
-    headers =
-    sources =
-
-    for(name, names) {
-        header = $${name}.h
-        exists($$header) {
-            headers += $$header
-        }
-        source = $${name}.cpp
-        exists($$source) {
-            sources += $$source
-        }
-    }
-    return($$headers $$sources)
-}
-#! [0]
-
-defineReplace(matchingFiles) {
-    names = $$ARGS
-    files =
-
-    for(name, names) {
-        header = $${name}.h
-        source = $${name}.cpp
-        exists($$header):exists($$source) {
-            files += $$header
-            files += $$source
-        }
-    }
-    return($$files)
-}
-
-names = delegate model view main
-message(Finding all headers and sources from the following list of names:)
-message($$names)
-allFiles = $$headersAndSources(names)
-message(Found: $$allFiles)
-
-message(Finding only matching headers and sources from the following list of names:)
-message($$names)
-matching = $$matchingFiles($$names)
-message(Found: $$matching)
diff --git a/doc/codesnippets/doc/src/snippets/qmake/scopes.pro b/doc/codesnippets/doc/src/snippets/qmake/scopes.pro
deleted file mode 100644
index 4e59afb..0000000
--- a/doc/codesnippets/doc/src/snippets/qmake/scopes.pro
+++ /dev/null
@@ -1,42 +0,0 @@
-#! [syntax]
-<condition> {
-    <command or definition>
-    ...
-}
-#! [syntax]
-
-#! [0]
-win32 {
-    SOURCES += paintwidget_win.cpp
-}
-#! [0]
-
-#! [1]
-!win32 {
-    SOURCES -= paintwidget_win.cpp
-}
-#! [1]
-
-unix {
-    SOURCES += paintwidget_unix.cpp
-}
-
-#! [2]
-macx {
-    debug {
-        HEADERS += debugging.h
-    }
-}
-#! [2]
-
-#! [3]
-macx:debug {
-    HEADERS += debugging.h
-}
-#! [3]
-
-#! [4]
-win32|macx {
-    HEADERS += debugging.h
-}
-#! [4]
diff --git a/doc/codesnippets/doc/src/snippets/qmake/shared_or_static.pro b/doc/codesnippets/doc/src/snippets/qmake/shared_or_static.pro
deleted file mode 100644
index 31c25ea..0000000
--- a/doc/codesnippets/doc/src/snippets/qmake/shared_or_static.pro
+++ /dev/null
@@ -1,8 +0,0 @@
-TEMPLIBS = $$[QT_INSTALL_LIBS] libQtGui.prl
-include($$join(TEMPLIBS, "/"))
-
-contains(QMAKE_PRL_CONFIG, shared) {
-    message(Shared Qt)
-} else {
-    message(Static Qt)
-}
diff --git a/doc/codesnippets/doc/src/snippets/qmake/specifications.pro b/doc/codesnippets/doc/src/snippets/qmake/specifications.pro
deleted file mode 100644
index f9a0d0a..0000000
--- a/doc/codesnippets/doc/src/snippets/qmake/specifications.pro
+++ /dev/null
@@ -1,7 +0,0 @@
-#! [0]
-message($$QMAKESPEC)
-
-linux-g++ {
-    message(Linux)
-}
-#! [0]
diff --git a/doc/codesnippets/doc/src/snippets/qmake/testfunction.pro b/doc/codesnippets/doc/src/snippets/qmake/testfunction.pro
deleted file mode 100644
index 785ffed..0000000
--- a/doc/codesnippets/doc/src/snippets/qmake/testfunction.pro
+++ /dev/null
@@ -1,20 +0,0 @@
-#! [0]
-defineTest(allFiles) {
-    files = $$ARGS
-
-    for(file, files) {
-        !exists($$file) {
-            return(false)
-        }
-    }
-    return(true)
-}
-#! [0]
-
-files = delegate.h model.h view.h
-
-allFiles($$files) {
-    message(All files are present: $$files)
-} else {
-    message(Not all files are present: $$files)
-}
diff --git a/doc/codesnippets/doc/src/snippets/qmake/variables.pro b/doc/codesnippets/doc/src/snippets/qmake/variables.pro
deleted file mode 100644
index bba5d9f..0000000
--- a/doc/codesnippets/doc/src/snippets/qmake/variables.pro
+++ /dev/null
@@ -1,7 +0,0 @@
-#! [0]
-HEADERS = mainwindow.h paintwidget.h
-#! [0] #! [1]
-SOURCES = main.cpp mainwindow.cpp \
-          paintwidget.cpp
-CONFIG += qt
-#! [1]
diff --git a/doc/codesnippets/doc/src/snippets/qmetaobject-invokable/qmetaobject-invokable.pro b/doc/codesnippets/doc/src/snippets/qmetaobject-invokable/qmetaobject-invokable.pro
deleted file mode 100644
index 4df1921..0000000
--- a/doc/codesnippets/doc/src/snippets/qmetaobject-invokable/qmetaobject-invokable.pro
+++ /dev/null
@@ -1,3 +0,0 @@
-HEADERS   = window.h
-SOURCES   = main.cpp \
-            window.cpp
diff --git a/doc/codesnippets/doc/src/snippets/qprocess-environment/main.cpp b/doc/codesnippets/doc/src/snippets/qprocess-environment/main.cpp
index ed49da3..9168197 100644
--- a/doc/codesnippets/doc/src/snippets/qprocess-environment/main.cpp
+++ b/doc/codesnippets/doc/src/snippets/qprocess-environment/main.cpp
@@ -1,40 +1,39 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the documentation of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial Usage
-** Licensees holding valid Qt Commercial licenses may use this file in
-** accordance with the Qt Commercial License Agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Nokia.
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
 **
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
 **
-** In addition, as a special exception, Nokia gives you certain
-** additional rights. These rights are described in the Nokia Qt LGPL
-** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://www.qtsoftware.com/contact.
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
@@ -43,14 +42,32 @@
 
 void startProcess()
 {
+    {
 //! [0]
+import re
+from PySide.QtCore import QProcess
+
 process = QProcess()
+
 env = QProcess.systemEnvironment()
-env << "TMPDIR=C:\\MyApp\\temp" # Add an environment variable
-env.replaceInStrings(QRegExp("^PATH=(.*)", Qt.CaseInsensitive), "PATH=\\1;C:\\Bin")
+env.append("TMPDIR=C:\\MyApp\\temp") # Add an environment variable
+regex = re.compile(r'^PATH=(.*)', re.IGNORECASE)
+env = [regex.sub(r'PATH=\1;C:\\Bin', var) for var in env]
 process.setEnvironment(env)
 process.start("myapp")
 //! [0]
+    }
+
+    {
+//! [1]
+process = QProcess()
+env = QProcessEnvironment.systemEnvironment()
+env.insert("TMPDIR", "C:\\MyApp\\temp") # Add an environment variable
+env.insert("PATH", env.value("Path") + ";C:\\Bin")
+process.setProcessEnvironment(env)
+process.start("myapp")
+//! [1]
+    }
 }
 
 int main(int argc, char *argv[])
diff --git a/doc/codesnippets/doc/src/snippets/qprocess-environment/qprocess-environment.pro b/doc/codesnippets/doc/src/snippets/qprocess-environment/qprocess-environment.pro
deleted file mode 100644
index bba41b9..0000000
--- a/doc/codesnippets/doc/src/snippets/qprocess-environment/qprocess-environment.pro
+++ /dev/null
@@ -1 +0,0 @@
-SOURCES = main.cpp
diff --git a/doc/codesnippets/doc/src/snippets/qprocess/qprocess-simpleexecution.cpp b/doc/codesnippets/doc/src/snippets/qprocess/qprocess-simpleexecution.cpp
index 09bb7ca..779c909 100644
--- a/doc/codesnippets/doc/src/snippets/qprocess/qprocess-simpleexecution.cpp
+++ b/doc/codesnippets/doc/src/snippets/qprocess/qprocess-simpleexecution.cpp
@@ -51,13 +51,12 @@ int main(int argc, char *argv[])
     parent = &app;
 
 //! [1]
-    program = QString("./path/to/Qt/examples/widgets/analogclock")
+    program = "./path/to/Qt/examples/widgets/analogclock"
 //! [1]
     program = "./../../../../examples/widgets/analogclock/analogclock";
 
 //! [2]
-    arguments = QStringList()
-    arguments << "-style" << "motif"
+    arguments = ["-style", "motif"]
 
     myProcess = QProcess(parent)
     myProcess.start(program, arguments)
diff --git a/doc/codesnippets/doc/src/snippets/qprocess/qprocess.pro b/doc/codesnippets/doc/src/snippets/qprocess/qprocess.pro
deleted file mode 100644
index 4dbc429..0000000
--- a/doc/codesnippets/doc/src/snippets/qprocess/qprocess.pro
+++ /dev/null
@@ -1,11 +0,0 @@
-######################################################################
-# Automatically generated by qmake (2.00a) Mon Mar 20 17:17:02 2006
-######################################################################
-
-TEMPLATE = app
-TARGET += 
-DEPENDPATH += .
-INCLUDEPATH += .
-
-# Input
-SOURCES += qprocess-simpleexecution.cpp
diff --git a/doc/codesnippets/doc/src/snippets/qsignalmapper/qsignalmapper.pro b/doc/codesnippets/doc/src/snippets/qsignalmapper/qsignalmapper.pro
deleted file mode 100644
index 7c31402..0000000
--- a/doc/codesnippets/doc/src/snippets/qsignalmapper/qsignalmapper.pro
+++ /dev/null
@@ -1,10 +0,0 @@
-######################################################################
-# Automatically generated by qmake (1.08a) Wed Mar 10 15:35:05 2004
-######################################################################
-
-TEMPLATE = app
-INCLUDEPATH += .
-
-# Input
-HEADERS += buttonwidget.h mainwindow.h
-SOURCES += buttonwidget.cpp main.cpp
diff --git a/doc/codesnippets/doc/src/snippets/qsortfilterproxymodel-details/qsortfilterproxymodel-details.pro b/doc/codesnippets/doc/src/snippets/qsortfilterproxymodel-details/qsortfilterproxymodel-details.pro
deleted file mode 100644
index bba41b9..0000000
--- a/doc/codesnippets/doc/src/snippets/qsortfilterproxymodel-details/qsortfilterproxymodel-details.pro
+++ /dev/null
@@ -1 +0,0 @@
-SOURCES = main.cpp
diff --git a/doc/codesnippets/doc/src/snippets/qsortfilterproxymodel/qsortfilterproxymodel.pro b/doc/codesnippets/doc/src/snippets/qsortfilterproxymodel/qsortfilterproxymodel.pro
deleted file mode 100644
index 16181f2..0000000
--- a/doc/codesnippets/doc/src/snippets/qsortfilterproxymodel/qsortfilterproxymodel.pro
+++ /dev/null
@@ -1 +0,0 @@
-SOURCES     = main.cpp
diff --git a/doc/codesnippets/doc/src/snippets/qsplashscreen/qsplashscreen.pro b/doc/codesnippets/doc/src/snippets/qsplashscreen/qsplashscreen.pro
deleted file mode 100644
index c798079..0000000
--- a/doc/codesnippets/doc/src/snippets/qsplashscreen/qsplashscreen.pro
+++ /dev/null
@@ -1,4 +0,0 @@
-HEADERS = mainwindow.h
-RESOURCES = qsplashscreen.qrc
-SOURCES = main.cpp \
-          mainwindow.cpp
diff --git a/doc/codesnippets/doc/src/snippets/qsql-namespace/qsql-namespace.pro b/doc/codesnippets/doc/src/snippets/qsql-namespace/qsql-namespace.pro
deleted file mode 100644
index e8183d3..0000000
--- a/doc/codesnippets/doc/src/snippets/qsql-namespace/qsql-namespace.pro
+++ /dev/null
@@ -1,2 +0,0 @@
-SOURCES = main.cpp
-QT += sql
diff --git a/doc/codesnippets/doc/src/snippets/qstack/qstack.pro b/doc/codesnippets/doc/src/snippets/qstack/qstack.pro
deleted file mode 100644
index 721ae4b..0000000
--- a/doc/codesnippets/doc/src/snippets/qstack/qstack.pro
+++ /dev/null
@@ -1,11 +0,0 @@
-######################################################################
-# Automatically generated by qmake (2.00a) Wed Apr 5 15:41:54 2006
-######################################################################
-
-TEMPLATE = app
-TARGET += 
-DEPENDPATH += .
-INCLUDEPATH += .
-
-# Input
-SOURCES += main.cpp
diff --git a/doc/codesnippets/doc/src/snippets/qstackedlayout/qstackedlayout.pro b/doc/codesnippets/doc/src/snippets/qstackedlayout/qstackedlayout.pro
deleted file mode 100644
index 89c757c..0000000
--- a/doc/codesnippets/doc/src/snippets/qstackedlayout/qstackedlayout.pro
+++ /dev/null
@@ -1,11 +0,0 @@
-######################################################################
-# Automatically generated by qmake (2.00a) Thu Apr 6 10:47:18 2006
-######################################################################
-
-TEMPLATE = app
-TARGET += 
-DEPENDPATH += .
-INCLUDEPATH += .
-
-# Input
-SOURCES += main.cpp
diff --git a/doc/codesnippets/doc/src/snippets/qstackedwidget/qstackedwidget.pro b/doc/codesnippets/doc/src/snippets/qstackedwidget/qstackedwidget.pro
deleted file mode 100644
index 227dd36..0000000
--- a/doc/codesnippets/doc/src/snippets/qstackedwidget/qstackedwidget.pro
+++ /dev/null
@@ -1,11 +0,0 @@
-######################################################################
-# Automatically generated by qmake (2.00a) Thu Apr 6 10:33:16 2006
-######################################################################
-
-TEMPLATE = app
-TARGET += 
-DEPENDPATH += .
-INCLUDEPATH += .
-
-# Input
-SOURCES += main.cpp
diff --git a/doc/codesnippets/doc/src/snippets/qstandarditemmodel/qstandarditemmodel.pro b/doc/codesnippets/doc/src/snippets/qstandarditemmodel/qstandarditemmodel.pro
deleted file mode 100644
index 421ee59..0000000
--- a/doc/codesnippets/doc/src/snippets/qstandarditemmodel/qstandarditemmodel.pro
+++ /dev/null
@@ -1,11 +0,0 @@
-######################################################################
-# Automatically generated by qmake (2.00a) Mon Apr 10 11:16:20 2006
-######################################################################
-
-TEMPLATE = app
-TARGET += 
-DEPENDPATH += .
-INCLUDEPATH += .
-
-# Input
-SOURCES += main.cpp
diff --git a/doc/codesnippets/doc/src/snippets/qstatustipevent/qstatustipevent.pro b/doc/codesnippets/doc/src/snippets/qstatustipevent/qstatustipevent.pro
deleted file mode 100644
index f4fe6ba..0000000
--- a/doc/codesnippets/doc/src/snippets/qstatustipevent/qstatustipevent.pro
+++ /dev/null
@@ -1,11 +0,0 @@
-######################################################################
-# Automatically generated by qmake (2.00a) Tue Apr 11 12:09:28 2006
-######################################################################
-
-TEMPLATE = app
-TARGET += 
-DEPENDPATH += .
-INCLUDEPATH += .
-
-# Input
-SOURCES += main.cpp
diff --git a/doc/codesnippets/doc/src/snippets/qstring/main.cpp b/doc/codesnippets/doc/src/snippets/qstring/main.cpp
deleted file mode 100644
index e41cf3e..0000000
--- a/doc/codesnippets/doc/src/snippets/qstring/main.cpp
+++ /dev/null
@@ -1,917 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the documentation of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial Usage
-** Licensees holding valid Qt Commercial licenses may use this file in
-** accordance with the Qt Commercial License Agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Nokia.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain
-** additional rights. These rights are described in the Nokia Qt LGPL
-** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://www.qtsoftware.com/contact.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include <QtGui>
-#include <QApplication>
-#include <stdio.h>
-
-class Widget : public QWidget
-{
-public:
-    Widget(QWidget *parent = 0)
-
-    void constCharPointer()
-    void constCharArray()
-    void characterReference()
-    void atFunction()
-    void stringLiteral()
-    void modify()
-    void index()
-    QString boolToString(bool b)
-    void nullVsEmpty()
-
-    void appendFunction()
-    void argFunction()
-    void chopFunction()
-    void compareFunction()
-    void compareSensitiveFunction()
-    void containsFunction()
-    void countFunction()
-    void dataFunction()
-    void endsWithFunction()
-    void fillFunction()
-    void fromRawDataFunction()
-
-    void indexOfFunction()
-    void firstIndexOfFunction()
-    void insertFunction()
-    void isNullFunction()
-    void isEmptyFunction()
-    void lastIndexOfFunction()
-    void leftFunction()
-    void leftJustifiedFunction()
-    void leftRefFunction()
-    void midFunction()
-    void midRefFunction()
-    void numberFunction()
-
-    void prependFunction()
-    void removeFunction()
-    void replaceFunction()
-    void reserveFunction()
-    void resizeFunction()
-    void rightFunction()
-    void rightJustifiedFunction()
-    void rightRefFunction()
-    void sectionFunction()
-    void setNumFunction()
-    void simplifiedFunction()
-
-    void sizeFunction()
-    void splitFunction()
-    void splitCaseSensitiveFunction()
-    void sprintfFunction()
-    void startsWithFunction()
-    void toDoubleFunction()
-    void toFloatFunction()
-    void toIntFunction()
-    void toLongFunction()
-    void toLongLongFunction()
-
-    void toLowerFunction()
-    void toShortFunction()
-    void toUIntFunction()
-    void toULongFunction()
-    void toULongLongFunction()
-    void toUShortFunction()
-    void toUpperFunction()
-    void trimmedFunction()
-    void truncateFunction()
-
-    void plusEqualOperator()
-    void arrayOperator()
-}
-
-Widget.Widget(QWidget *parent)
-    : QWidget(parent)
-{
-}
-
-void Widget.constCharPointer()
-{
-//! [0]
-    str = QString("Hello")
-//! [0]
-}
-
-void Widget.constCharArray()
-{
-//! [1]
-    # NOT USED IN PYSIDE
-    static const QChar data[4] = { 0x0055, 0x006e, 0x10e3, 0x03a3 }
-    QString str(data, 4)
-//! [1]
-}
-
-void Widget.characterReference()
-{
-//! [2]
-    str = QString()
-    str.resize(2)
-
-    str[0] = 'U')
-    str[1] = 'n')
-//! [2]
-}
-
-void Widget.atFunction()
-{
-//! [3]
-    str = QString()
-
-    for i in range(str.size()):
-        print str.at(i)
-//! [3]
-}
-
-void Widget.stringLiteral()
-{
-//! [4]
-    str = QString()
-    ...
-    if str == "auto" or str == "extern" \
-            or str == "static" or str == "register":
-        # ...
-//! [4]
-}
-
-void Widget.modify()
-{
-//! [5]
-    str = QString("and")
-    str.prepend("rock ")     # str == "rock and"
-    str.append(" roll")        # str == "rock and roll"
-    str.replace(5, 3, "&")   # str == "rock & roll"
-//! [5]
-}
-
-void Widget.index()
-{
-//! [6]
-    str = QString("We must be <b>bold</b>, very <b>bold</b>")
-    j = str.indexOf("<b>", 0)
-    while j != -1:
-        print "Found <b> tag at index position", j
-        j = str.indexOf("<b>", j+1)
-//! [6]
-}
-
-//! [7]
-    # Not needed in pyside
-    QString Widget.boolToString(bool b)
-    {
-        QString result
-        if (b)
-            result = "True"
-        else
-            result = "False"
-        return result
-    }
-//! [7]
-
-
-void Widget.nullVsEmpty()
-{
-//! [8]
-    QString().isNull()               # returns true
-    QString().isEmpty()              # returns true
-
-    QString("").isNull()             # returns false
-    QString("").isEmpty()            # returns true
-
-    QString("abc").isNull()          # returns false
-    QString("abc").isEmpty()         # returns false
-//! [8]
-}
-
-void Widget.appendFunction()
-{
-//! [9]
-    x = QString("free")
-    y = QString("dom")
-
-    x.append(y)
-    # x == "freedom"
-//! [9]
-
-//! [10]
-    x.insert(x.size(), y)
-//! [10]
-}
-
-void Widget.argFunction()
-{
-//! [11]
-    i = QString(...)          # current file's number
-    total = QString(...)      # number of files to process
-    fileName = QString(...)   # current file's name
-
-    status = QString("Processing file %1 of %2: %3")
-                    .arg(i).arg(total).arg(fileName)
-//! [11]
-
-//! [12] //! [13]
-    str QString()
-//! [12]
-    str = QString("%1 %2")
-
-    str.arg("%1f", "Hello")        # returns "%1f Hello"
-    str.arg("%1f").arg("Hello")    # returns "Hellof %2"
-//! [13]
-
-//! [14]
-    str = QString("Decimal 63 is %1 in hexadecimal")
-            .arg(63, 0, 16)
-    # str == "Decimal 63 is 3f in hexadecimal"
-
-    QLocale.setDefault(QLocale(QLocale.English, QLocale.UnitedStates))
-    str = QString("%1 %L2 %L3")
-            .arg(12345)
-            .arg(12345)
-            .arg(12345, 0, 16)
-    # str == "12345 12,345 3039"
-//! [14]
-}
-
-void Widget.chopFunction()
-{
-//! [15]
-    str = QString("LOGOUT\r\n")
-    str.chop(2)
-    # str == "LOGOUT"
-//! [15]
-}
-
-void Widget.compareFunction()
-{
-    x = QString.compare("auto", "auto")   # x == 0
-    y = QString.compare("auto", "car")    # y < 0
-    z = QString.compare("car", "auto")    # z > 0
-}
-
-void Widget.compareSensitiveFunction()
-{
-//! [16]
-    x = QString.compare("aUtO", "AuTo", Qt.CaseInsensitive);  # x == 0
-    y = QString.compare("auto", "Car", Qt.CaseSensitive);     # y > 0
-    z = QString.compare("auto", "Car", Qt.CaseInsensitive);   # z < 0
-//! [16]
-}
-
-void Widget.containsFunction()
-{
-//! [17]
-    str = QString("Peter Pan")
-    str.contains("peter", Qt.CaseInsensitive)    # returns true
-//! [17]
-}
-
-void Widget.countFunction()
-{
-//! [18]
-    str = QString("banana and panama")
-    str.count(QRegExp("a[nm]a"))    # returns 4
-//! [18]
-}
-
-void Widget.dataFunction()
-{
-//! [19]
-//  Not Needed
-    str = QString"Hello world"
-    QChar *data = str.data()
-    while (!data->isNull()) {
-        qDebug() << data->unicode()
-        ++data
-    }
-//! [19]
-}
-
-void Widget.endsWithFunction()
-{
-//! [20]
-    str = QString("Bananas")
-    str.endsWith("anas")         # returns true
-    str.endsWith("pple")         # returns false
-//! [20]
-}
-
-void Widget.fillFunction()
-{
-//! [21]
-    str = QString("Berlin")
-    str.fill('z')
-    # str == "zzzzzz"
-
-    str.fill('A', 2)
-    # str == "AA"
-//! [21]
-}
-
-void Widget.fromRawDataFunction()
-{
-//! [22]
-     QRegExp pattern
-     static const QChar unicode[] = {
-             0x005A, 0x007F, 0x00A4, 0x0060,
-             0x1009, 0x0020, 0x0020}
-     int size = sizeof(unicode) / sizeof(QChar)
-
-     QString str = QString.fromRawData(unicode, size)
-     if (str.contains(QRegExp(pattern))) {
-         # ...
-//! [22] //! [23]
-     }
-//! [23]
-}
-
-void Widget.indexOfFunction()
-{
-//! [24]
-    QString x = "sticky question"
-    QString y = "sti"
-    x.indexOf(y);               # returns 0
-    x.indexOf(y, 1);            # returns 10
-    x.indexOf(y, 10);           # returns 10
-    x.indexOf(y, 11);           # returns -1
-//! [24]
-}
-
-void Widget.firstIndexOfFunction()
-{
-//! [25]
-    str = QString("the minimum")
-    str.indexOf(QRegExp("m[aeiou]"), 0)       # returns 4
-//! [25]
-}
-
-void Widget.insertFunction()
-{
-//! [26]
-    str = QString("Meal")
-    str.insert(1, QString("ontr"))
-    # str == "Montreal"
-//! [26]
-}
-
-void Widget.isEmptyFunction()
-{
-//! [27]
-    QString().isEmpty()            # returns true
-    QString("").isEmpty()          # returns true
-    QString("x").isEmpty()         # returns false
-    QString("abc").isEmpty()       # returns false
-//! [27]
-}
-
-void Widget.isNullFunction()
-{
-//! [28]
-    QString().isNull()             # returns true
-    QString("").isNull()           # returns false
-    QString("abc").isNull()        # returns false
-//! [28]
-}
-
-void Widget.lastIndexOfFunction()
-{
-//! [29]
-    QString x = "crazy azimuths"
-    QString y = "az"
-    x.lastIndexOf(y);           # returns 6
-    x.lastIndexOf(y, 6);        # returns 6
-    x.lastIndexOf(y, 5);        # returns 2
-    x.lastIndexOf(y, 1);        # returns -1
-//! [29]
-
-//! [30]
-    str = QString("the minimum")
-    str.lastIndexOf(QRegExp("m[aeiou]"))      # returns 8
-//! [30]
-}
-
-void Widget.leftFunction()
-{
-//! [31]
-    x = QString("Pineapple")
-    y = QString(x.left(4))      # y == "Pine"
-//! [31]
-}
-
-void Widget.leftJustifiedFunction()
-{
-//! [32]
-    s = QString("apple")
-    t = QString(s.leftJustified(8, '.'))    # t == "apple..."
-//! [32]
-
-//! [33]
-    str = QString("Pineapple")
-    str = str.leftJustified(5, '.', True)    # str == "Pinea"
-//! [33]
-}
-
-void Widget.midFunction()
-{
-//! [34]
-    x = QString("Nine pineapples")
-    y = QString(x.mid(5, 4))            # y == "pine"
-    z = QString(x.mid(5))               # z == "pineapples"
-//! [34]
-}
-
-void Widget.numberFunction()
-{
-//! [35]
-    a = 63
-    s = QString.number(a, 16)             # s == "3f"
-    t = QString.number(a, 16).toUpper()     # t == "3F"
-//! [35]
-}
-
-void Widget.prependFunction()
-{
-//! [36]
-    x = QString("ship")
-    y = QString("air")
-    x.prepend(y)
-    # x == "airship"
-//! [36]
-}
-
-void Widget.removeFunction()
-{
-//! [37]
-    s = QString("Montreal")
-    s.remove(1, 4)
-    # s == "Meal"
-//! [37]
-
-//! [38]
-    QString t = "Ali Baba"
-    t.remove(QChar('a'), Qt.CaseInsensitive)
-    # t == "li Bb"
-//! [38]
-
-//! [39]
-    r = QString("Telephone")
-    r.remove(QRegExp("[aeiou]."))
-    # r == "The"
-//! [39]
-}
-
-void Widget.replaceFunction()
-{
-//! [40]
-    x = QString("Say yes!")
-    y = QString("no")
-    x.replace(4, 3, y)
-    # x == "Say no!"
-//! [40]
-
-//! [41]
-    QString str = "colour behaviour flavour neighbour"
-    str.replace(QString("ou"), QString("o"))
-    # str == "color behavior flavor neighbor"
-//! [41]
-
-//! [42]
-    s = QString("Banana")
-    s.replace(QRegExp("a[mn]"), "ox")
-    # s == "Boxoxa"
-//! [42]
-
-//! [43]
-    t = QString("A <i>bon mot</i>.")
-    t.replace(QRegExp("<i>([^<]*)</i>"), "\\emph{\\1}")
-    # t == "A \\emph{bon mot}."
-//! [43]
-
-//! [86]
-    QString equis = "xxxxxx"
-    equis.replace("xx", "x")
-    # equis == "xxx"    
-//! [86]
-}
-
-void Widget.reserveFunction()
-{
-//! [44]
-    result = QString()
-    maxSize = 44
-
-    result.reserve(maxSize)
-    while condition:
-        result.append(nextChar)
-
-    result.squeeze()
-//! [44]
-}
-
-void Widget.resizeFunction()
-{
-//! [45]
-    s = QString("Hello world")
-    s.resize(5)
-    # s == "Hello"
-
-    s.resize(8)
-    # s == "Hello???" (where ? stands for any character)
-//! [45]
-
-//! [46]
-    t = QString("Hello")
-    t += QString(10, 'X')
-    # t == "HelloXXXXXXXXXX"
-//! [46]
-
-//! [47]
-    r = QString("Hello")
-    r = r.leftJustified(10, ' ')
-    # r == "Hello     "
-//! [47]
-}
-
-void Widget.rightFunction()
-{
-//! [48]
-    x = QString("Pineapple")
-    y = x.right(5)      # y == "apple"
-//! [48]
-}
-
-void Widget.rightJustifiedFunction()
-{
-//! [49]
-    s = QString("apple")
-    t = s.rightJustified(8, '.')    # t == "...apple"
-//! [49]
-
-//! [50]
-    str = QString("Pineapple")
-    str = str.rightJustified(5, '.', True)    # str == "Pinea"
-//! [50]
-}
-
-void Widget.sectionFunction()
-{ // NOT NEEDED
-//! [51] //! [52]
-    QString str
-//! [51]
-    QString csv = "forename,middlename,surname,phone"
-    QString path = "/usr/local/bin/myapp"; # First field is empty
-    QString.SectionFlag flag = QString.SectionSkipEmpty
-
-
-    str = csv.section(',', 2, 2);   # str == "surname"
-    str = path.section('/', 3, 4);  # str == "bin/myapp"
-    str = path.section('/', 3, 3, flag); # str == "myapp"
-//! [52]
-
-//! [53]
-    str = csv.section(',', -3, -2);  # str == "middlename,surname"
-    str = path.section('/', -1); # str == "myapp"
-//! [53]
-
-//! [54]
-    QString data = "forename**middlename**surname**phone"
-
-    str = data.section("**", 2, 2); # str == "surname"
-    str = data.section("**", -3, -2); # str == "middlename**surname"
-//! [54]
-
-//! [55]
-    QString line = "forename\tmiddlename  surname \t \t phone"
-    QRegExp sep("\\s+")
-    str = line.section(sep, 2, 2); # s == "surname"
-    str = line.section(sep, -3, -2); # s == "middlename  surname"
-//! [55]
-}
-
-void Widget.setNumFunction()
-{
-//! [56]
-    str = QString()
-    str.setNum(1234)       # str == "1234"
-//! [56]
-}
-
-void Widget.simplifiedFunction()
-{
-//! [57]
-    str = QString("  lots\t of\nwhitespace\r\n ")
-    str = str.simplified()
-    # str == "lots of whitespace"
-//! [57]
-}
-
-void Widget.sizeFunction()
-{
-//! [58]
-    str = QString("World")
-    n = str.size()         # n == 5
-//! [58]
-}
-
-void Widget.splitFunction()
-{
-//! [59]
-    str = QString("Some  text\n\twith  strange whitespace.")
-    list = str.split(QRegExp("\\s+")) # A QStringList
-    # list: [ "Some", "text", "with", "strange", "whitespace." ]
-//! [59]
-
-//! [60]
-    str = QString("This time, a normal English sentence.")
-    list = str.split(QRegExp("\\W+"), QString.SkipEmptyParts)
-    # list: [ "This", "time", "a", "normal", "English", "sentence" ]
-//! [60]
-
-//! [61]
-    str = QString("Now: this sentence fragment.")
-    list = str.split(QRegExp("\\b"))
-    # list: [ "", "Now", ": ", "this", " ", "sentence", " ", "fragment", "." ]
-//! [61]
-}
-
-void Widget.splitCaseSensitiveFunction()
-{
-//! [62]
-    str = QString("a,,b,c")
-
-    list1 = str.split(",")
-    # list1: [ "a", "", "b", "c" ]
-
-    list2 = str.split(",", QString.SkipEmptyParts)
-    # list2: [ "a", "b", "c" ]
-//! [62]
-}
-
-void Widget.sprintfFunction()
-{
-//! [63]
-    size_t BufSize
-    char buf[BufSize]
-
-    .snprintf(buf, BufSize, "%lld", 123456789LL)
-    QString str = QString.fromAscii(buf)
-//! [63]
-
-//! [64]
-    QString result
-    QTextStream(&result) << "pi = " << 3.14
-    # result == "pi = 3.14"
-//! [64]
-}
-
-void Widget.startsWithFunction()
-{
-//! [65]
-    QString str = "Bananas"
-    str.startsWith("Ban")     # returns true
-    str.startsWith("Car")     # returns false
-//! [65]
-}
-
-void Widget.toDoubleFunction()
-{
-//! [66]
-    str = QString("1234.56")
-    val = str.toDouble()[0]   # val == 1234.56
-//! [66]
-
-//! [67]
-    d, ok = QString( "1234.56e-02" ).toDouble() # ok == true, d == 12.3456
-//! [67]
-
-//! [68] //! [69]
-    QLocale.setDefault(QLocale.C)
-    d, ok = QString( "1234,56" ).toDouble() # ok == false
-//! [68]
-    d, ok = QString( "1234.56" ).toDouble() # ok == true, d == 1234.56
-
-//! [69] //! [70]
-    QLocale.setDefault(QLocale.German)
-    d, ok = QString( "1234,56" ).toDouble() # ok == true, d == 1234.56
-    d, ok = QString( "1234.56" ).toDouble() # ok == true, d == 1234.56
-
-//! [70]
-    QLocale.setDefault(QLocale.C)
-    d, ok = QString( "1,234,567.89" ).toDouble() # ok == false
-}
-
-void Widget.toFloatFunction()
-{
-//! [71]
-    str1 = QString("1234.56")
-    str1.toFloat()             # returns (1234.56, True)
-
-    str2 = QString("R2D2")
-    str2.toFloat()          # returns (0.0, False)
-//! [71]
-}
-
-void Widget.toIntFunction()
-{
-//! [72]
-    str = QString("FF")
-    hex, ok = str.toInt(16)       # hex == 255, ok == true
-    dec, ok = str.toInt(10)       # dec == 0, ok == false
-//! [72]
-}
-
-void Widget.toLongFunction()
-{
-//! [73]
-    str = QString("FF")
-
-    hex, ok = str.toLong(16)     # hex == 255, ok == true
-    dec, ok = str.toLong(10)     # dec == 0, ok == false
-//! [73]
-}
-
-void Widget.toLongLongFunction()
-{
-//! [74]
-    str = QString("FF")
-
-    hex, ok = str.toLongLong(16)      # hex == 255, ok == true
-    dec, ok = str.toLongLong(10)      # dec == 0, ok == false
-//! [74]
-}
-
-void Widget.toLowerFunction()
-{
-//! [75]
-    str = QString("TROlltECH")
-    str = str.toLower()        # str == "trolltech"
-//! [75]
-}
-
-void Widget.toShortFunction()
-{
-//! [76]
-    str = QString("FF")
-
-    hex, ok = str.toShort(16)   # hex == 255, ok == true
-    dec, ok = str.toShort(10)   # dec == 0, ok == false
-//! [76]
-}
-
-void Widget.toUIntFunction()
-{
-//! [77]
-    str = QString("FF")
-
-    hex, ok = str.toUInt(16)     # hex == 255, ok == true
-    dec, ok = str.toUInt(10)     # dec == 0, ok == false
-//! [77]
-}
-
-void Widget.toULongFunction()
-{
-//! [78]
-    str = QString("FF")
-
-    hex, ok = str.toULong(16)   # hex == 255, ok == true
-    dec, ok = str.toULong(10)   # dec == 0, ok == false
-//! [78]
-}
-
-void Widget.toULongLongFunction()
-{
-//! [79]
-    QString str = "FF"
-
-    hex, ok = str.toULongLong(16)    # hex == 255, ok == true
-    dec, ok = str.toULongLong(10)    # dec == 0, ok == false
-//! [79]
-}
-
-void Widget.toUShortFunction()
-{
-//! [80]
-    str = QString("FF")
-
-    hex, ok = str.toUShort(16)     # hex == 255, ok == true
-    dec, ok = str.toUShort(10)     # dec == 0, ok == false
-//! [80]
-}
-
-void Widget.toUpperFunction()
-{
-//! [81]
-    str = QString("TeXt")
-    str = str.toUpper()        # str == "TEXT"
-//! [81]
-}
-
-void Widget.trimmedFunction()
-{
-//! [82]
-    str = QString("  lots\t of\nwhitespace\r\n ")
-    str = str.trimmed()
-    # str == "lots\t of\nwhitespace"
-//! [82]
-}
-
-void Widget.truncateFunction()
-{
-//! [83]
-    str = QString("Vladivostok")
-    str.truncate(4)
-    # str == "Vlad"
-//! [83]
-}
-
-void Widget.plusEqualOperator()
-{
-//! [84]
-    x = QString("free")
-    y = QString("dom")
-    x += y
-    # x == "freedom"
-//! [84]
-}
-
-void Widget.arrayOperator()
-{
-//! [85]
-    str = QString(...)
-
-    if (str[0] == QChar('?'))
-        str[0] = QChar('_')
-//! [85]
-}
-
-void Widget.midRefFunction()
-{
-//! [midRef]
-    x = QString("Nine pineapples")
-    y = x.midRef(5, 4)      # y == "pine"
-    z = x.midRef(5)         # z == "pineapples"
-//! [midRef]
-}
-
-void Widget.leftRefFunction()
-{
-//! [leftRef]
-    x = QString("Pineapple")
-    y = x.leftRef(4)       # y == "Pine"
-//! [leftRef]
-}
-
-void Widget.rightRefFunction()
-{
-//! [rightRef]
-    x = QString("Pineapple")
-    y = x.rightRef(5)       # y == "apple"
-//! [rightRef]
-}
-
-
-int main(int argc, char *argv[])
-{
-    QApplication app(argc, argv)
-    Widget widget
-    widget.show()
-    return app.exec()
-}
diff --git a/doc/codesnippets/doc/src/snippets/qstring/qstring.pro b/doc/codesnippets/doc/src/snippets/qstring/qstring.pro
deleted file mode 100644
index 71039d1..0000000
--- a/doc/codesnippets/doc/src/snippets/qstring/qstring.pro
+++ /dev/null
@@ -1,11 +0,0 @@
-######################################################################
-# Automatically generated by qmake (2.00a) Wed Apr 12 11:28:45 2006
-######################################################################
-
-TEMPLATE = app
-TARGET += 
-DEPENDPATH += .
-INCLUDEPATH += .
-
-# Input
-SOURCES += main.cpp
diff --git a/doc/codesnippets/doc/src/snippets/qstringlist/main.cpp b/doc/codesnippets/doc/src/snippets/qstringlist/main.cpp
deleted file mode 100644
index c80b50e..0000000
--- a/doc/codesnippets/doc/src/snippets/qstringlist/main.cpp
+++ /dev/null
@@ -1,155 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the documentation of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial Usage
-** Licensees holding valid Qt Commercial licenses may use this file in
-** accordance with the Qt Commercial License Agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Nokia.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain
-** additional rights. These rights are described in the Nokia Qt LGPL
-** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://www.qtsoftware.com/contact.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include <QtGui>
-#include <iostream>
-using namespace std
-
-class Widget : public QWidget
-{
-public:
-    Widget(QWidget *parent = 0)
-}
-
-Widget::Widget(QWidget *parent)
-    : QWidget(parent)
-{
-//! [0]
-    fonts = QStringList()
-    fonts << "Arial" << "Helvetica" << "Times" << "Courier"
-//! [0]
-
-//! [1]
-    for i in range(fonts.size()):
-         print fonts.at(i)
-//! [1]
-
-//! [2]
-    QStringListIterator javaStyleIterator(fonts)
-    while (javaStyleIterator.hasNext())
-         cout << javaStyleIterator.next().toLocal8Bit().constData() << endl
-//! [2]
-
-//! [3]
-    QStringList::const_iterator constIterator
-    for (constIterator = fonts.constBegin(); constIterator != fonts.constEnd()
-           ++constIterator)
-        cout << (*constIterator).toLocal8Bit().constData() << endl
-//! [3]
-
-//! [4]
-    str = fonts.join(",")
-     # str == "Arial,Helvetica,Times,Courier"
-//! [4]
-
-//! [5] //! [6]
-    list = QStringList()
-//! [5]
-    list = str.split(",")
-     # list: ["Arial", "Helvetica", "Times", "Courier"]
-//! [6]
-
-//! [7]
-    monospacedFonts = fonts.filter(QRegExp("Courier|Fixed"))
-//! [7]
-
-//! [8]
-    files = QStringList()
-    files << "$QTDIR/src/moc/moc.y" \
-          << "$QTDIR/src/moc/moc.l" \
-          << "$QTDIR/include/qconfig.h" \
-
-    files.replaceInStrings("$QTDIR", "/usr/lib/qt")
-    # files: [ "/usr/lib/qt/src/moc/moc.y", ...]
-//! [8]
-
-    QString str1, str2, str3
-//! [9]
-    longerList = (QStringList() << str1 << str2 << str3)
-//! [9]
-
-    list.clear()
-//! [10]
-    list << "Bill Murray" << "John Doe" << "Bill Clinton"
-
-//! [11]
-    result = QStringList()
-//! [11]
-    result = list.filter("Bill")
-    # result: ["Bill Murray", "Bill Clinton"]
-//! [10]
-
-    result.clear()
-//! [12]
-    for string in list:
-        if string.contains("Bill")
-            result += string
-//! [12]
-
-    list.clear()
-//! [13]
-    list << "alpha" << "beta" << "gamma" << "epsilon"
-    list.replaceInStrings("a", "o")
-    # list == ["olpho", "beto", "gommo", "epsilon"]
-//! [13]
-
-    list.clear()
-//! [14]
-    list << "alpha" << "beta" << "gamma" << "epsilon"
-    list.replaceInStrings(QRegExp("^a"), "o")
-    # list == ["olpha", "beta", "gamma", "epsilon"]
-//! [14]
-
-    list.clear()
-//! [15]
-    list << "Bill Clinton" << "Murray, Bill"
-    list.replaceInStrings(QRegExp("^(.*), (.*)$"), "\\2 \\1")
-    # list == ["Bill Clinton", "Bill Murray"]
-//! [15]
-}
-
-int main(int argc, char *argv[])
-{
-    QApplication app(argc, argv)
-    Widget widget
-    widget.show()
-    return app.exec()
-}
diff --git a/doc/codesnippets/doc/src/snippets/qstringlist/qstringlist.pro b/doc/codesnippets/doc/src/snippets/qstringlist/qstringlist.pro
deleted file mode 100644
index adb2f9e..0000000
--- a/doc/codesnippets/doc/src/snippets/qstringlist/qstringlist.pro
+++ /dev/null
@@ -1,11 +0,0 @@
-######################################################################
-# Automatically generated by qmake (2.00a) Wed May 3 11:08:01 2006
-######################################################################
-
-TEMPLATE = app
-TARGET += 
-DEPENDPATH += .
-INCLUDEPATH += .
-
-# Input
-SOURCES += main.cpp
diff --git a/doc/codesnippets/doc/src/snippets/qstringlistmodel/qstringlistmodel.pro b/doc/codesnippets/doc/src/snippets/qstringlistmodel/qstringlistmodel.pro
deleted file mode 100644
index aaa359c..0000000
--- a/doc/codesnippets/doc/src/snippets/qstringlistmodel/qstringlistmodel.pro
+++ /dev/null
@@ -1,11 +0,0 @@
-######################################################################
-# Automatically generated by qmake (2.00a) Wed May 3 15:25:22 2006
-######################################################################
-
-TEMPLATE = app
-TARGET += 
-DEPENDPATH += .
-INCLUDEPATH += .
-
-# Input
-SOURCES += main.cpp
diff --git a/doc/codesnippets/doc/src/snippets/qstyleoption/qstyleoption.pro b/doc/codesnippets/doc/src/snippets/qstyleoption/qstyleoption.pro
deleted file mode 100644
index 2f17f03..0000000
--- a/doc/codesnippets/doc/src/snippets/qstyleoption/qstyleoption.pro
+++ /dev/null
@@ -1,11 +0,0 @@
-######################################################################
-# Automatically generated by qmake (2.00a) Thu Apr 20 16:22:46 2006
-######################################################################
-
-TEMPLATE = app
-TARGET += 
-DEPENDPATH += .
-INCLUDEPATH += .
-
-# Input
-SOURCES += main.cpp
diff --git a/doc/codesnippets/doc/src/snippets/qstyleplugin/qstyleplugin.pro b/doc/codesnippets/doc/src/snippets/qstyleplugin/qstyleplugin.pro
deleted file mode 100644
index d17c20f..0000000
--- a/doc/codesnippets/doc/src/snippets/qstyleplugin/qstyleplugin.pro
+++ /dev/null
@@ -1,11 +0,0 @@
-######################################################################
-# Automatically generated by qmake (2.00a) Tue May 2 15:31:16 2006
-######################################################################
-
-TEMPLATE = app
-TARGET += 
-DEPENDPATH += .
-INCLUDEPATH += .
-
-# Input
-SOURCES += main.cpp
diff --git a/doc/codesnippets/doc/src/snippets/qsvgwidget/qsvgwidget.pro b/doc/codesnippets/doc/src/snippets/qsvgwidget/qsvgwidget.pro
deleted file mode 100644
index d7e3698..0000000
--- a/doc/codesnippets/doc/src/snippets/qsvgwidget/qsvgwidget.pro
+++ /dev/null
@@ -1,3 +0,0 @@
-QT              += svg
-RESOURCES       = qsvgwidget.qrc
-SOURCES         = main.cpp
diff --git a/doc/codesnippets/doc/src/snippets/qt-namespace/qt-namespace.pro b/doc/codesnippets/doc/src/snippets/qt-namespace/qt-namespace.pro
deleted file mode 100644
index bba41b9..0000000
--- a/doc/codesnippets/doc/src/snippets/qt-namespace/qt-namespace.pro
+++ /dev/null
@@ -1 +0,0 @@
-SOURCES = main.cpp
diff --git a/doc/codesnippets/doc/src/snippets/qtablewidget-dnd/qtablewidget-dnd.pro b/doc/codesnippets/doc/src/snippets/qtablewidget-dnd/qtablewidget-dnd.pro
deleted file mode 100644
index ffe134c..0000000
--- a/doc/codesnippets/doc/src/snippets/qtablewidget-dnd/qtablewidget-dnd.pro
+++ /dev/null
@@ -1,4 +0,0 @@
-SOURCES     = main.cpp \
-              mainwindow.cpp
-HEADERS     = mainwindow.h
-RESOURCES   += images.qrc
diff --git a/doc/codesnippets/doc/src/snippets/qtablewidget-resizing/qtablewidget-resizing.pro b/doc/codesnippets/doc/src/snippets/qtablewidget-resizing/qtablewidget-resizing.pro
deleted file mode 100644
index 12a900a..0000000
--- a/doc/codesnippets/doc/src/snippets/qtablewidget-resizing/qtablewidget-resizing.pro
+++ /dev/null
@@ -1,3 +0,0 @@
-SOURCES     = main.cpp \
-              mainwindow.cpp
-HEADERS     = mainwindow.h
diff --git a/doc/codesnippets/doc/src/snippets/qtablewidget-using/qtablewidget-using.pro b/doc/codesnippets/doc/src/snippets/qtablewidget-using/qtablewidget-using.pro
deleted file mode 100644
index ffe134c..0000000
--- a/doc/codesnippets/doc/src/snippets/qtablewidget-using/qtablewidget-using.pro
+++ /dev/null
@@ -1,4 +0,0 @@
-SOURCES     = main.cpp \
-              mainwindow.cpp
-HEADERS     = mainwindow.h
-RESOURCES   += images.qrc
diff --git a/doc/codesnippets/doc/src/snippets/qtcast/qtcast.pro b/doc/codesnippets/doc/src/snippets/qtcast/qtcast.pro
deleted file mode 100644
index 6476162..0000000
--- a/doc/codesnippets/doc/src/snippets/qtcast/qtcast.pro
+++ /dev/null
@@ -1,2 +0,0 @@
-HEADERS     = qtcast.h
-SOURCES     = qtcast.cpp
diff --git a/doc/codesnippets/doc/src/snippets/qtest-namespace/qtest-namespace.pro b/doc/codesnippets/doc/src/snippets/qtest-namespace/qtest-namespace.pro
deleted file mode 100644
index 0dfaf99..0000000
--- a/doc/codesnippets/doc/src/snippets/qtest-namespace/qtest-namespace.pro
+++ /dev/null
@@ -1,2 +0,0 @@
-SOURCES = main.cpp
-CONFIG += qtestlib
diff --git a/doc/codesnippets/doc/src/snippets/qtreeview-dnd/dragdropmodel.cpp b/doc/codesnippets/doc/src/snippets/qtreeview-dnd/dragdropmodel.cpp
deleted file mode 100644
index 9ae2f38..0000000
--- a/doc/codesnippets/doc/src/snippets/qtreeview-dnd/dragdropmodel.cpp
+++ /dev/null
@@ -1,147 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the documentation of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial Usage
-** Licensees holding valid Qt Commercial licenses may use this file in
-** accordance with the Qt Commercial License Agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Nokia.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain
-** additional rights. These rights are described in the Nokia Qt LGPL
-** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://www.qtsoftware.com/contact.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of an example program for Qt.
-** EDITIONS: NOLIMITS
-**
-****************************************************************************/
-
-#include <QtGui>
-
-#include "dragdropmodel.h"
-
-DragDropModel::DragDropModel(const QStringList &strings, QObject *parent)
-    : TreeModel(strings, parent)
-{
-}
-
-bool DragDropModel::dropMimeData(const QMimeData *data,
-    Qt::DropAction action, int row, int column, const QModelIndex &parent)
-{
-    if (action == Qt::IgnoreAction)
-        return true;
-
-    if (!data->hasFormat("text/plain"))
-        return false;
-
-    int beginRow;
-
-    if (row != -1)
-        beginRow = row;
-    else if (parent.isValid())
-        beginRow = 0;
-    else
-        beginRow = rowCount(QModelIndex());
-
-    QByteArray encodedData = data->data("text/plain");
-    QDataStream stream(&encodedData, QIODevice::ReadOnly);
-    QHash<qint64, QMap<int,QHash<int,QString> > > newItems;
-
-    while (!stream.atEnd()) {
-        qint64 id;
-        int row;
-        int column;
-        QString text;
-        stream >> id >> row >> column >> text;
-        newItems[id][row][column] = text;
-    }
-    int rows = newItems.count();
-
-    insertRows(beginRow, rows, parent);
-    QMap<int,QHash<int,QString> > childItems;
-    foreach (childItems, newItems.values()) {
-        QHash<int,QString> rowItems;
-        foreach (rowItems, childItems.values()) {
-            foreach (int column, rowItems.keys()) {
-                QModelIndex idx = index(beginRow, column, parent);
-                setData(idx, rowItems[column]);
-            }
-            ++beginRow;
-        }
-    }
-
-    return true;
-}
-
-Qt::ItemFlags DragDropModel::flags(const QModelIndex &index) const
-{
-    Qt::ItemFlags defaultFlags = TreeModel::flags(index);
-
-    if (index.isValid())
-        return Qt::ItemIsDragEnabled | Qt::ItemIsDropEnabled | defaultFlags;
-    else
-        return Qt::ItemIsDropEnabled | defaultFlags;
-}
-
-QMimeData *DragDropModel::mimeData(const QModelIndexList &indexes) const
-{
-    QMimeData *mimeData = new QMimeData();
-    QByteArray encodedData;
-
-    QDataStream stream(&encodedData, QIODevice::WriteOnly);
-
-    foreach (QModelIndex index, indexes) {
-        if (index.isValid()) {
-            QString text = data(index, Qt::DisplayRole).toString();
-            stream << index.internalId() << index.row() << index.column() << text;
-        }
-    }
-
-    mimeData->setData("text/plain", encodedData);
-    return mimeData;
-}
-
-QStringList DragDropModel::mimeTypes() const
-{
-    QStringList types;
-    types << "text/plain";
-    return types;
-}
-
-Qt::DropActions DragDropModel::supportedDropActions() const
-{
-    return Qt::CopyAction | Qt::MoveAction;
-}
diff --git a/doc/codesnippets/doc/src/snippets/qtreeview-dnd/qtreeview-dnd.pro b/doc/codesnippets/doc/src/snippets/qtreeview-dnd/qtreeview-dnd.pro
deleted file mode 100644
index 5dfabfc..0000000
--- a/doc/codesnippets/doc/src/snippets/qtreeview-dnd/qtreeview-dnd.pro
+++ /dev/null
@@ -1,9 +0,0 @@
-SOURCES     = dragdropmodel.cpp \
-              main.cpp \
-              mainwindow.cpp \
-              treeitem.cpp \
-              treemodel.cpp
-HEADERS     = dragdropmodel.h \
-              mainwindow.h \
-              treeitem.h \
-              treemodel.h
diff --git a/doc/codesnippets/doc/src/snippets/qtreewidget-using/qtreewidget-using.pro b/doc/codesnippets/doc/src/snippets/qtreewidget-using/qtreewidget-using.pro
deleted file mode 100644
index 12a900a..0000000
--- a/doc/codesnippets/doc/src/snippets/qtreewidget-using/qtreewidget-using.pro
+++ /dev/null
@@ -1,3 +0,0 @@
-SOURCES     = main.cpp \
-              mainwindow.cpp
-HEADERS     = mainwindow.h
diff --git a/doc/codesnippets/doc/src/snippets/qtreewidgetitemiterator-using/qtreewidgetitemiterator-using.pro b/doc/codesnippets/doc/src/snippets/qtreewidgetitemiterator-using/qtreewidgetitemiterator-using.pro
deleted file mode 100644
index 12a900a..0000000
--- a/doc/codesnippets/doc/src/snippets/qtreewidgetitemiterator-using/qtreewidgetitemiterator-using.pro
+++ /dev/null
@@ -1,3 +0,0 @@
-SOURCES     = main.cpp \
-              mainwindow.cpp
-HEADERS     = mainwindow.h
diff --git a/doc/codesnippets/doc/src/snippets/qtscript/evaluation/evaluation.pro b/doc/codesnippets/doc/src/snippets/qtscript/evaluation/evaluation.pro
deleted file mode 100644
index a495c02..0000000
--- a/doc/codesnippets/doc/src/snippets/qtscript/evaluation/evaluation.pro
+++ /dev/null
@@ -1,2 +0,0 @@
-SOURCES   = main.cpp
-QT       += script
diff --git a/doc/codesnippets/doc/src/snippets/qtscript/registeringobjects/registeringobjects.pro b/doc/codesnippets/doc/src/snippets/qtscript/registeringobjects/registeringobjects.pro
deleted file mode 100644
index 0a755e2..0000000
--- a/doc/codesnippets/doc/src/snippets/qtscript/registeringobjects/registeringobjects.pro
+++ /dev/null
@@ -1,4 +0,0 @@
-SOURCES   = main.cpp \
-            myobject.cpp
-HEADERS   = myobject.h
-QT       += script
diff --git a/doc/codesnippets/doc/src/snippets/qtscript/registeringvalues/registeringvalues.pro b/doc/codesnippets/doc/src/snippets/qtscript/registeringvalues/registeringvalues.pro
deleted file mode 100644
index a495c02..0000000
--- a/doc/codesnippets/doc/src/snippets/qtscript/registeringvalues/registeringvalues.pro
+++ /dev/null
@@ -1,2 +0,0 @@
-SOURCES   = main.cpp
-QT       += script
diff --git a/doc/codesnippets/doc/src/snippets/qtscript/scriptedslot/scriptedslot.pro b/doc/codesnippets/doc/src/snippets/qtscript/scriptedslot/scriptedslot.pro
deleted file mode 100644
index a10f06e..0000000
--- a/doc/codesnippets/doc/src/snippets/qtscript/scriptedslot/scriptedslot.pro
+++ /dev/null
@@ -1,3 +0,0 @@
-RESOURCES = scriptedslot.qrc
-SOURCES   = main.cpp
-QT       += script
diff --git a/doc/codesnippets/doc/src/snippets/quiloader/main.cpp b/doc/codesnippets/doc/src/snippets/quiloader/main.cpp
index 2365942..10cdddb 100644
--- a/doc/codesnippets/doc/src/snippets/quiloader/main.cpp
+++ b/doc/codesnippets/doc/src/snippets/quiloader/main.cpp
@@ -50,7 +50,7 @@ def loadCustomWidget(parent):
 
     availableWidgets = loader.availableWidgets()
 
-    if (availableWidgets.contains("AnalogClock")):
+    if availableWidgets.contains("AnalogClock"):
         myWidget = loader.createWidget("AnalogClock", parent)
 
     return myWidget
diff --git a/doc/codesnippets/doc/src/snippets/quiloader/mywidget.cpp b/doc/codesnippets/doc/src/snippets/quiloader/mywidget.cpp
index 26a3343..103c2d3 100644
--- a/doc/codesnippets/doc/src/snippets/quiloader/mywidget.cpp
+++ b/doc/codesnippets/doc/src/snippets/quiloader/mywidget.cpp
@@ -47,6 +47,7 @@
 //! [0]
 class MyWidget(QWidget):
     def __init__(self, parent):
+        super(QWidget, self).__init__(parent)
         loader = QUiLoader()
         file = QFile(":/forms/myform.ui")
         file.open(QFile.ReadOnly)
diff --git a/doc/codesnippets/doc/src/snippets/quiloader/quiloader.pro b/doc/codesnippets/doc/src/snippets/quiloader/quiloader.pro
deleted file mode 100644
index c82d0e5..0000000
--- a/doc/codesnippets/doc/src/snippets/quiloader/quiloader.pro
+++ /dev/null
@@ -1,4 +0,0 @@
-HEADERS     = mywidget.h
-SOURCES     = main.cpp mywidget.cpp
-RESOURCES   = mywidget.qrc
-CONFIG     += uitools
diff --git a/doc/codesnippets/doc/src/snippets/qx11embedcontainer/qx11embedcontainer.pro b/doc/codesnippets/doc/src/snippets/qx11embedcontainer/qx11embedcontainer.pro
deleted file mode 100644
index bba41b9..0000000
--- a/doc/codesnippets/doc/src/snippets/qx11embedcontainer/qx11embedcontainer.pro
+++ /dev/null
@@ -1 +0,0 @@
-SOURCES = main.cpp
diff --git a/doc/codesnippets/doc/src/snippets/qx11embedwidget/qx11embedwidget.pro b/doc/codesnippets/doc/src/snippets/qx11embedwidget/qx11embedwidget.pro
deleted file mode 100644
index b72e0ad..0000000
--- a/doc/codesnippets/doc/src/snippets/qx11embedwidget/qx11embedwidget.pro
+++ /dev/null
@@ -1,3 +0,0 @@
-HEADERS = embedwidget.h
-SOURCES = embedwidget.cpp \
-          main.cpp
diff --git a/doc/codesnippets/doc/src/snippets/qxmlschema/main.cpp b/doc/codesnippets/doc/src/snippets/qxmlschema/main.cpp
new file mode 100644
index 0000000..16e8336
--- /dev/null
+++ b/doc/codesnippets/doc/src/snippets/qxmlschema/main.cpp
@@ -0,0 +1,114 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the documentation of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtCore>
+#include <QtXmlPatterns>
+
+class Schema
+{
+    public:
+        void loadFromUrl() const;
+        void loadFromFile() const;
+        void loadFromData() const;
+};
+
+void Schema::loadFromUrl() const
+{
+//! [0]
+    url = QUrl("http://www.schema-example.org/myschema.xsd")
+
+    schema = QXmlSchema()
+    if schema.load(url):
+        qDebug("schema is valid")
+    else:
+        qDebug("schema is invalid")
+//! [0]
+}
+
+void Schema::loadFromFile() const
+{
+//! [1]
+    file = QFile("myschema.xsd")
+    file.open(QIODevice.ReadOnly)
+
+    schema = QXmlSchema()
+    schema.load(file, QUrl.fromLocalFile(file.fileName()))
+
+    if schema.isValid():
+        qDebug("schema is valid")
+    else:
+        qDebug("schema is invalid")
+//! [1]
+}
+
+void Schema::loadFromData() const
+{
+//! [2]
+    data = QByteArray("<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
+                      + "<xsd:schema"
+                      + "        xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\""
+                      + "        xmlns=\"http://qt.nokia.com/xmlschematest\""
+                      + "        targetNamespace=\"http://qt.nokia.com/xmlschematest\""
+                      + "        version=\"1.0\""
+                      + "        elementFormDefault=\"qualified\">"
+                      + "</xsd:schema>" )
+
+    schema = QXmlSchema()
+    schema.load(data)
+
+    if schema.isValid():
+        qDebug("schema is valid")
+    else:
+        qDebug("schema is invalid")
+//! [2]
+}
+
+int main(int argc, char **argv)
+{
+    QCoreApplication app(argc, argv);
+
+    Schema schema;
+
+    schema.loadFromUrl();
+    schema.loadFromFile();
+    schema.loadFromData();
+
+    return 0;
+}
diff --git a/doc/codesnippets/doc/src/snippets/qxmlschemavalidator/main.cpp b/doc/codesnippets/doc/src/snippets/qxmlschemavalidator/main.cpp
new file mode 100644
index 0000000..5c15482
--- /dev/null
+++ b/doc/codesnippets/doc/src/snippets/qxmlschemavalidator/main.cpp
@@ -0,0 +1,63 @@
+
+def validateFromUrl():
+//! [0]
+    schema = getSchema()
+
+    url = QUrl("http://www.schema-example.org/test.xml")
+
+    validator = QXmlSchemaValidator(schema)
+    if validator.validate(url):
+        print "instance document is valid"
+    else:
+        print "instance document is invalid"
+//! [0]
+
+def validateFromFile():
+//! [1]
+    schema = getSchema()
+
+    file = QFile("test.xml")
+    file.open(QIODevice.ReadOnly)
+
+    validator = QXmlSchemaValidator(schema)
+    if validator.validate(file, QUrl.fromLocalFile(file.fileName())):
+        print "instance document is valid"
+    else:
+        print "instance document is invalid"
+//! [1]
+}
+
+def validateFromData():
+//! [2]
+    schema = getSchema()
+
+    data = QByteArray("<?xml version=\"1.0\" encoding=\"UTF-8\"?><test></test>")
+
+    buffer = QBuffer(data)
+    buffer.open(QIODevice.ReadOnly)
+
+    QXmlSchemaValidator validator(schema)
+    if validator.validate(buffer):
+        print "instance document is valid"
+    else:
+        print "instance document is invalid"
+//! [2]
+
+def validateComplete():
+//! [3]
+    schemaUrl = QUrl("file:///home/user/schema.xsd")
+
+    schema = QXmlSchema()
+    schema.load(schemaUrl)
+
+    if schema.isValid():
+        file = QFile("test.xml")
+        file.open(QIODevice.ReadOnly)
+
+        validator = QXmlSchemaValidator(schema)
+        if validator.validate(file, QUrl.fromLocalFile(file.fileName())):
+            print "instance document is valid"
+        else:
+            print "instance document is invalid"
+    }
+//! [3]
diff --git a/doc/codesnippets/doc/src/snippets/qxmlstreamwriter/qxmlstreamwriter.pro b/doc/codesnippets/doc/src/snippets/qxmlstreamwriter/qxmlstreamwriter.pro
deleted file mode 100644
index 8f74a5d..0000000
--- a/doc/codesnippets/doc/src/snippets/qxmlstreamwriter/qxmlstreamwriter.pro
+++ /dev/null
@@ -1,2 +0,0 @@
-SOURCES   = main.cpp
-QT += xml
diff --git a/doc/codesnippets/doc/src/snippets/reading-selections/model.cpp b/doc/codesnippets/doc/src/snippets/reading-selections/model.cpp
deleted file mode 100644
index 2c5c81a..0000000
--- a/doc/codesnippets/doc/src/snippets/reading-selections/model.cpp
+++ /dev/null
@@ -1,239 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the documentation of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial Usage
-** Licensees holding valid Qt Commercial licenses may use this file in
-** accordance with the Qt Commercial License Agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Nokia.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain
-** additional rights. These rights are described in the Nokia Qt LGPL
-** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://www.qtsoftware.com/contact.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-/*
-    model.cpp
-
-    Provides a table model for use in various examples.
-*/
-
-#include <QtGui>
-
-#include "model.h"
-
-/*!
-    Constructs a table model with at least one row and one column.
-*/
-
-TableModel::TableModel(int rows, int columns, QObject *parent)
-    : QAbstractTableModel(parent)
-{
-    QStringList newList;
-
-    for (int column = 0; column < qMax(1, columns); ++column) {
-        newList.append("");
-    }
-
-    for (int row = 0; row < qMax(1, rows); ++row) {
-        rowList.append(newList);
-    }
-}
-
-
-/*!
-    Returns the number of items in the row list as the number of rows
-    in the model.
-*/
-
-int TableModel::rowCount(const QModelIndex &/*parent*/) const
-{
-    return rowList.size();
-}
-
-/*!
-    Returns the number of items in the first list item as the number of
-    columns in the model. All rows should have the same number of columns.
-*/
-
-int TableModel::columnCount(const QModelIndex &/*parent*/) const
-{
-    return rowList[0].size();
-}
-
-/*!
-    Returns an appropriate value for the requested data.
-    If the view requests an invalid index, an invalid variant is returned.
-    Any valid index that corresponds to a string in the list causes that
-    string to be returned for the display role; otherwise an invalid variant
-    is returned.
-*/
-
-QVariant TableModel::data(const QModelIndex &index, int role) const
-{
-    if (!index.isValid())
-        return QVariant();
-
-    if (role == Qt::DisplayRole)
-        return rowList[index.row()][index.column()];
-    else
-        return QVariant();
-}
-
-/*!
-    Returns the appropriate header string depending on the orientation of
-    the header and the section. If anything other than the display role is
-    requested, we return an invalid variant.
-*/
-
-QVariant TableModel::headerData(int section, Qt::Orientation orientation,
-                                int role) const
-{
-    if (role != Qt::DisplayRole)
-        return QVariant();
-
-    if (orientation == Qt::Horizontal)
-        return QString("Column %1").arg(section);
-    else
-        return QString("Row %1").arg(section);
-}
-
-/*!
-    Returns an appropriate value for the item's flags. Valid items are
-    enabled, selectable, and editable.
-*/
-
-Qt::ItemFlags TableModel::flags(const QModelIndex &index) const
-{
-    if (!index.isValid())
-        return Qt::ItemIsEnabled;
-
-    return Qt::ItemIsEnabled | Qt::ItemIsSelectable;
-}
-
-/*!
-    Changes an item in the model, but only if the following conditions
-    are met:
-
-    * The index supplied is valid.
-    * The role associated with editing text is specified.
-
-    The dataChanged() signal is emitted if the item is changed.
-*/
-
-bool TableModel::setData(const QModelIndex &index,
-                         const QVariant &value, int role)
-{
-    if (!index.isValid() || role != Qt::EditRole)
-        return false;
-
-    rowList[index.row()][index.column()] = value.toString();
-    emit dataChanged(index, index);
-    return true;
-}
-
-/*!
-    Inserts a number of rows into the model at the specified position.
-*/
-
-bool TableModel::insertRows(int position, int rows, const QModelIndex &parent)
-{
-    int columns = columnCount();
-    beginInsertRows(parent, position, position + rows - 1);
-
-    for (int row = 0; row < rows; ++row) {
-        QStringList items;
-        for (int column = 0; column < columns; ++column)
-            items.append("");
-        rowList.insert(position, items);
-    }
-
-    endInsertRows();
-    return true;
-}
-
-/*!
-    Inserts a number of columns into the model at the specified position.
-    Each entry in the list is extended in turn with the required number of
-    empty strings.
-*/
-
-bool TableModel::insertColumns(int position, int columns,
-                               const QModelIndex &parent)
-{
-    int rows = rowCount();
-    beginInsertColumns(parent, position, position + columns - 1);
-
-    for (int row = 0; row < rows; ++row) {
-        for (int column = position; column < columns; ++column) {
-            rowList[row].insert(position, "");
-        }
-    }
-
-    endInsertColumns();
-    return true;
-}
-
-/*!
-    Removes a number of rows from the model at the specified position.
-*/
-
-bool TableModel::removeRows(int position, int rows, const QModelIndex &parent)
-{
-    beginRemoveRows(parent, position, position + rows - 1);
-
-    for (int row = 0; row < rows; ++row) {
-        rowList.removeAt(position);
-    }
-
-    endRemoveRows();
-    return true;
-}
-
-/*!
-    Removes a number of columns from the model at the specified position.
-    Each row is shortened by the number of columns specified.
-*/
-
-bool TableModel::removeColumns(int position, int columns,
-                               const QModelIndex &parent)
-{
-    int rows = rowCount();
-    beginRemoveColumns(parent, position, position + columns - 1);
-
-    for (int row = 0; row < rows; ++row) {
-        for (int column = 0; column < columns; ++column) {
-            rowList[row].removeAt(position);
-        }
-    }
-
-    endRemoveColumns();
-    return true;
-}
diff --git a/doc/codesnippets/doc/src/snippets/reading-selections/reading-selections.pro b/doc/codesnippets/doc/src/snippets/reading-selections/reading-selections.pro
deleted file mode 100644
index 91ebd3e..0000000
--- a/doc/codesnippets/doc/src/snippets/reading-selections/reading-selections.pro
+++ /dev/null
@@ -1,2 +0,0 @@
-HEADERS += model.h window.h
-SOURCES += main.cpp model.cpp window.cpp
diff --git a/doc/codesnippets/doc/src/snippets/scribe-overview/scribe-overview.pro b/doc/codesnippets/doc/src/snippets/scribe-overview/scribe-overview.pro
deleted file mode 100644
index 16181f2..0000000
--- a/doc/codesnippets/doc/src/snippets/scribe-overview/scribe-overview.pro
+++ /dev/null
@@ -1 +0,0 @@
-SOURCES     = main.cpp
diff --git a/doc/codesnippets/doc/src/snippets/separations/separations.pro b/doc/codesnippets/doc/src/snippets/separations/separations.pro
deleted file mode 100644
index 48af2c8..0000000
--- a/doc/codesnippets/doc/src/snippets/separations/separations.pro
+++ /dev/null
@@ -1,7 +0,0 @@
-HEADERS     = finalwidget.h \
-              screenwidget.h \
-              viewer.h
-SOURCES     = finalwidget.cpp \
-              main.cpp \
-              screenwidget.cpp \
-              viewer.cpp
diff --git a/doc/codesnippets/doc/src/snippets/separations/separations.qdoc b/doc/codesnippets/doc/src/snippets/separations/separations.qdoc
deleted file mode 100644
index fd143c4..0000000
--- a/doc/codesnippets/doc/src/snippets/separations/separations.qdoc
+++ /dev/null
@@ -1,55 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the documentation of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial Usage
-** Licensees holding valid Qt Commercial licenses may use this file in
-** accordance with the Qt Commercial License Agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Nokia.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain
-** additional rights. These rights are described in the Nokia Qt LGPL
-** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://www.qtsoftware.com/contact.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-/*
-    \example painting/separations
-    \title Color Separations Example
-
-    This example enables simple color manipulation of images and demonstrates a
-    number of image-related features of Qt, from per-pixel image manipulation to
-    drag and drop handling of images.
-
-    \image separations-example.png
-
-    The application allows the user to load an image, shown in the top-left
-    part of the main window, and to adjust its color balance by replacing its
-    initial cyan, magenta, and yellow components with different colors.
-*/
diff --git a/doc/codesnippets/doc/src/snippets/settings/settings.cpp b/doc/codesnippets/doc/src/snippets/settings/settings.cpp
index 549beb6..a908e05 100644
--- a/doc/codesnippets/doc/src/snippets/settings/settings.cpp
+++ b/doc/codesnippets/doc/src/snippets/settings/settings.cpp
@@ -68,11 +68,11 @@ void snippet_ctor2()
 //! [5]
     settings.setValue("editor/wrapMargin", 68)
 //! [5] //! [6]
-    margin = settings.value("editor/wrapMargin").toInt()
+    margin = int(settings.value("editor/wrapMargin"))
 //! [6]
     {
 //! [7]
-    margin = settings.value("editor/wrapMargin", 80).toInt()
+    margin = int(settings.value("editor/wrapMargin", 80))
 //! [7]
     }
 
diff --git a/doc/codesnippets/doc/src/snippets/shareddirmodel/main.cpp b/doc/codesnippets/doc/src/snippets/shareddirmodel/main.cpp
index afb2b06..91d0e17 100644
--- a/doc/codesnippets/doc/src/snippets/shareddirmodel/main.cpp
+++ b/doc/codesnippets/doc/src/snippets/shareddirmodel/main.cpp
@@ -55,9 +55,10 @@ def main():
     splitter = QSplitter()
 
 //! [2] //! [3]
-    model =  QDirModel()
+    model = QFileSystemModel()
+    model.setRootPath(QDir.currentPath())
 //! [0] //! [2] //! [4] //! [5]
-    tree =  QTreeView(splitter)
+    tree =  QTreeView()
 //! [3] //! [6]
     tree.setModel(model)
 //! [4] //! [6] //! [7]
diff --git a/doc/codesnippets/doc/src/snippets/shareddirmodel/shareddirmodel.pro b/doc/codesnippets/doc/src/snippets/shareddirmodel/shareddirmodel.pro
deleted file mode 100644
index 28dcadc..0000000
--- a/doc/codesnippets/doc/src/snippets/shareddirmodel/shareddirmodel.pro
+++ /dev/null
@@ -1 +0,0 @@
-SOURCES += main.cpp
diff --git a/doc/codesnippets/doc/src/snippets/sharedemployee/sharedemployee.pro b/doc/codesnippets/doc/src/snippets/sharedemployee/sharedemployee.pro
deleted file mode 100644
index 536a77d..0000000
--- a/doc/codesnippets/doc/src/snippets/sharedemployee/sharedemployee.pro
+++ /dev/null
@@ -1,3 +0,0 @@
-HEADERS = employee.h
-SOURCES = employee.cpp \
-          main.cpp
diff --git a/doc/codesnippets/doc/src/snippets/sharedtablemodel/model.cpp b/doc/codesnippets/doc/src/snippets/sharedtablemodel/model.cpp
deleted file mode 100644
index 0fe0249..0000000
--- a/doc/codesnippets/doc/src/snippets/sharedtablemodel/model.cpp
+++ /dev/null
@@ -1,237 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the documentation of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial Usage
-** Licensees holding valid Qt Commercial licenses may use this file in
-** accordance with the Qt Commercial License Agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Nokia.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain
-** additional rights. These rights are described in the Nokia Qt LGPL
-** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://www.qtsoftware.com/contact.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-/*
-    model.cpp
-
-    Provides a table model for use in various examples.
-*/
-
-#include <QtGui>
-
-#include "model.h"
-
-/*!
-    Constructs a table model with at least one row and one column.
-*/
-
-TableModel::TableModel(int rows, int columns, QObject *parent)
-    : QAbstractTableModel(parent)
-{
-    QStringList newList;
-
-    for (int column = 0; column < qMax(1, columns); ++column) {
-        newList.append("");
-    }
-
-    for (int row = 0; row < qMax(1, rows); ++row) {
-        rowList.append(newList);
-    }
-}
-
-
-/*!
-    Returns the number of items in the row list as the number of rows
-    in the model.
-*/
-
-int TableModel::rowCount(const QModelIndex &/*parent*/) const
-{
-    return rowList.size();
-}
-
-/*!
-    Returns the number of items in the first list item as the number of
-    columns in the model. All rows should have the same number of columns.
-*/
-
-int TableModel::columnCount(const QModelIndex &/*parent*/) const
-{
-    return rowList[0].size();
-}
-
-/*!
-    Returns an appropriate value for the requested data.
-    If the view requests an invalid index, an invalid variant is returned.
-    Any valid index that corresponds to a string in the list causes that
-    string to be returned for the display role; otherwise an invalid variant
-    is returned.
-*/
-
-QVariant TableModel::data(const QModelIndex &index, int role) const
-{
-    if (!index.isValid())
-        return QVariant();
-
-    if (role == Qt::DisplayRole)
-        return rowList[index.row()][index.column()];
-    else
-        return QVariant();
-}
-
-/*!
-    Returns the appropriate header string depending on the orientation of
-    the header and the section. If anything other than the display role is
-    requested, we return an invalid variant.
-*/
-
-QVariant TableModel::headerData(int section, Qt::Orientation orientation,
-                                int role) const
-{
-    if (role != Qt::DisplayRole)
-        return QVariant();
-
-    if (orientation == Qt::Horizontal)
-        return QString("Column %1").arg(section);
-    else
-        return QString("Row %1").arg(section);
-}
-
-/*!
-    Returns an appropriate value for the item's flags. Valid items are
-    enabled, selectable, and editable.
-*/
-
-Qt::ItemFlags TableModel::flags(const QModelIndex &index) const
-{
-    if (!index.isValid())
-        return Qt::ItemIsEnabled;
-
-    return Qt::ItemIsEnabled | Qt::ItemIsSelectable | Qt::ItemIsEditable;
-}
-
-/*!
-    Changes an item in the model, but only if the following conditions
-    are met:
-
-    * The index supplied is valid.
-    * The role associated with editing text is specified.
-
-    The dataChanged() signal is emitted if the item is changed.
-*/
-
-bool TableModel::setData(const QModelIndex &index,
-                         const QVariant &value, int role)
-{
-    if (!index.isValid() || role != Qt::EditRole)
-        return false;
-
-    rowList[index.row()][index.column()] = value.toString();
-    emit dataChanged(index, index);
-    return true;
-}
-
-/*!
-    Inserts a number of rows into the model at the specified position.
-*/
-
-bool TableModel::insertRows(int position, int rows, const QModelIndex &parent)
-{
-    int columns = columnCount();
-    beginInsertRows(parent, position, position + rows - 1);
-
-    for (int row = 0; row < rows; ++row) {
-        QStringList items;
-        for (int column = 0; column < columns; ++column)
-            items.append("");
-        rowList.insert(position, items);
-    }
-
-    endInsertRows();
-    return true;
-}
-
-/*!
-    Inserts a number of columns into the model at the specified position.
-    Each entry in the list is extended in turn with the required number of
-    empty strings.
-*/
-
-bool TableModel::insertColumns(int position, int columns, const QModelIndex &parent)
-{
-    int rows = rowCount();
-    beginInsertColumns(parent, position, position + columns - 1);
-
-    for (int row = 0; row < rows; ++row) {
-        for (int column = position; column < columns; ++column) {
-            rowList[row].insert(position, "");
-        }
-    }
-
-    endInsertColumns();
-    return true;
-}
-
-/*!
-    Removes a number of rows from the model at the specified position.
-*/
-
-bool TableModel::removeRows(int position, int rows, const QModelIndex &parent)
-{
-    beginRemoveRows(parent, position, position + rows - 1);
-
-    for (int row = 0; row < rows; ++row) {
-        rowList.removeAt(position);
-    }
-
-    endRemoveRows();
-    return true;
-}
-
-/*!
-    Removes a number of columns from the model at the specified position.
-    Each row is shortened by the number of columns specified.
-*/
-
-bool TableModel::removeColumns(int position, int columns, const QModelIndex &parent)
-{
-    int rows = rowCount();
-    beginRemoveColumns(parent, position, position + columns - 1);
-
-    for (int row = 0; row < rows; ++row) {
-        for (int column = 0; column < columns; ++column) {
-            rowList[row].removeAt(position);
-        }
-    }
-
-    endRemoveColumns();
-    return true;
-}
diff --git a/doc/codesnippets/doc/src/snippets/sharedtablemodel/sharedtablemodel.pro b/doc/codesnippets/doc/src/snippets/sharedtablemodel/sharedtablemodel.pro
deleted file mode 100644
index 10671e6..0000000
--- a/doc/codesnippets/doc/src/snippets/sharedtablemodel/sharedtablemodel.pro
+++ /dev/null
@@ -1,2 +0,0 @@
-HEADERS += model.h
-SOURCES += main.cpp model.cpp
diff --git a/doc/codesnippets/doc/src/snippets/signalmapper/signalmapper.pro b/doc/codesnippets/doc/src/snippets/signalmapper/signalmapper.pro
deleted file mode 100644
index 9a9d669..0000000
--- a/doc/codesnippets/doc/src/snippets/signalmapper/signalmapper.pro
+++ /dev/null
@@ -1,12 +0,0 @@
-######################################################################
-# Automatically generated by qmake (2.01a) Wed Jul 2 14:50:56 2008
-######################################################################
-
-TEMPLATE = app
-TARGET = 
-DEPENDPATH += .
-INCLUDEPATH += .
-
-# Input
-HEADERS += filereader.h
-SOURCES += filereader.cpp main.cpp
diff --git a/doc/codesnippets/doc/src/snippets/simplemodel-use/main.cpp b/doc/codesnippets/doc/src/snippets/simplemodel-use/main.cpp
index ebaee4a..5588735 100644
--- a/doc/codesnippets/doc/src/snippets/simplemodel-use/main.cpp
+++ b/doc/codesnippets/doc/src/snippets/simplemodel-use/main.cpp
@@ -57,40 +57,38 @@
     order to indicate that we want top-level items.
 */
 
-int main(int argc, char *argv[])
-{
-    QApplication app(argc, argv);
+def main():
+    app = QApplication(sys.argc, sys.argv)
+
+    window = QWidget()
+    layout = QVBoxLayout(window)
+    title = QLabel("Some items from the directory model", window)
+    title.setBackgroundRole(QPalette.Base)
+    title.setMargin(8)
+    layout.addWidget(title)
 
-    QWidget *window = new QWidget;
-    QVBoxLayout *layout = new QVBoxLayout(window);
-    QLabel *title = new QLabel("Some items from the directory model", window);
-    title->setBackgroundRole(QPalette::Base);
-    title->setMargin(8);
-    layout->addWidget(title);
-    
 //! [0]
-    QDirModel *model = new QDirModel;
-    QModelIndex parentIndex = model->index(QDir::currentPath());
-    int numRows = model->rowCount(parentIndex);
+    model = QFileSystemModel()
+    parentIndex = model.index(QDir.currentPath())
+    numRows = model.rowCount(parentIndex)
 //! [0]
 
 //! [1]
-    for (int row = 0; row < numRows; ++row) {
-        QModelIndex index = model->index(row, 0, parentIndex);
+    for row in range(numRows):
+        index = model.index(row, 0, parentIndex)
 //! [1]
 
 //! [2]
-        QString text = model->data(index, Qt::DisplayRole).toString();
+        text = model.data(index, Qt.DisplayRole)
         // Display the text in a widget.
 //! [2]
 
-        QLabel *label = new QLabel(text, window);
-        layout->addWidget(label);
+        label = QLabel(text, window)
+        layout.addWidget(label)
 //! [3]
-    }
 //! [3]
 
-    window->setWindowTitle("A simple model example");
-    window->show();
-    return app.exec();
+    window.setWindowTitle("A simple model example")
+    window.show()
+    return app.exec_()
 }
diff --git a/doc/codesnippets/doc/src/snippets/simplemodel-use/simplemodel-use.pro b/doc/codesnippets/doc/src/snippets/simplemodel-use/simplemodel-use.pro
deleted file mode 100644
index 28dcadc..0000000
--- a/doc/codesnippets/doc/src/snippets/simplemodel-use/simplemodel-use.pro
+++ /dev/null
@@ -1 +0,0 @@
-SOURCES += main.cpp
diff --git a/doc/codesnippets/doc/src/snippets/snippets.pro b/doc/codesnippets/doc/src/snippets/snippets.pro
deleted file mode 100644
index 50e33b3..0000000
--- a/doc/codesnippets/doc/src/snippets/snippets.pro
+++ /dev/null
@@ -1,109 +0,0 @@
-### A qmake file for the snippets. *** This is not for distribution. ***
-#
-# Snippets that don't work are commented out and marked with "broken";
-# other commented out snippets were probably not designed to be built.
-
-TEMPLATE        = subdirs
-SUBDIRS         = brush \
-                  buffer \
-#                  clipboard \      # broken
-                  coordsys \
-#                  customstyle \
-                  designer \
-                  dialogs \
-                  dockwidgets \
-                  draganddrop \
-                  dragging \
-                  dropactions \
-                  dropevents \
-                  droprectangle \
-                  events \
-#                  file \
-                  image \
-                  inherited-slot \
-                  itemselection \
-                  layouts \
-                  matrix \
-                  moc \
-#                  modelview-subclasses \   # broken
-                  painterpath \
-                  persistentindexes \
-                  picture \
-                  plaintextlayout \
-#                  pointer \
-                  polygon \
-                  process \
-                  qdbusextratypes \
-                  qcalendarwidget \
-                  qdir-filepaths \
-                  qdir-listfiles \
-                  qdir-namefilters \
-                  qfontdatabase \
-                  qlabel \
-                  qlineargradient \
-                  qlistview-dnd \
-                  qlistview-using \
-                  qlistwidget-dnd \
-                  qlistwidget-using \
-#                  qmake \                  # not designed to be built
-                  qmetaobject-invokable \
-                  qprocess \
-                  qprocess-environment \
-#                  qsignalmapper \
-                  qsortfilterproxymodel-details \
-                  qsplashscreen \
-                  qstack \
-                  qstackedlayout \
-                  qstackedwidget \
-                  qstandarditemmodel \
-                  qstatustipevent \
-                  qstring \
-                  qstringlist \
-                  qstringlistmodel \
-                  qstyleoption \
-                  qstyleplugin \
-                  qsvgwidget \
-                  qtablewidget-dnd \
-                  qtablewidget-resizing \
-                  qtablewidget-using \
-                  qtcast \
-                  qtreeview-dnd \
-                  qtreewidgetitemiterator-using \
-                  qtreewidget-using \
-                  quiloader \
-                  qx11embedcontainer \
-                  qx11embedwidget \
-                  reading-selections \
-                  scribe-overview \
-                  separations \
-#                  settings \               # not designed to be built
-                  shareddirmodel \
-                  sharedemployee \
-                  sharedtablemodel \
-#                  signalsandslots \
-                  simplemodel-use \
-#                  splitter \
-                  sqldatabase \
-                  stringlistmodel \
-#                  styles \
-                  textblock-formats \
-                  textblock-fragments \
-                  textdocument-blocks \
-                  textdocument-charformats \
-                  textdocument-cursors \
-                  textdocument-find \
-                  textdocument-frames \
-                  textdocument-imageformat \
-                  textdocument-images \
-                  textdocument-listitems \
-                  textdocument-lists \
-                  textdocument-printing \
-#                  textdocument-resources \
-                  textdocument-selections \
-                  textdocument-tables \
-#                  threads \
-                  timers \
-                  updating-selections \
-#                  whatsthis \
-                  widget-mask \
-                  xml
diff --git a/doc/codesnippets/doc/src/snippets/splitter/splitter.pro b/doc/codesnippets/doc/src/snippets/splitter/splitter.pro
deleted file mode 100644
index 2414a91..0000000
--- a/doc/codesnippets/doc/src/snippets/splitter/splitter.pro
+++ /dev/null
@@ -1 +0,0 @@
-SOURCES += splitter.cpp
diff --git a/doc/codesnippets/doc/src/snippets/splitterhandle/splitterhandle.pro b/doc/codesnippets/doc/src/snippets/splitterhandle/splitterhandle.pro
deleted file mode 100644
index 0c2a999..0000000
--- a/doc/codesnippets/doc/src/snippets/splitterhandle/splitterhandle.pro
+++ /dev/null
@@ -1,3 +0,0 @@
-HEADERS   = splitter.h
-SOURCES   = main.cpp \
-            splitter.cpp
diff --git a/doc/codesnippets/doc/src/snippets/sqldatabase/sqldatabase.cpp b/doc/codesnippets/doc/src/snippets/sqldatabase/sqldatabase.cpp
index e21cb9c..4014cc8 100644
--- a/doc/codesnippets/doc/src/snippets/sqldatabase/sqldatabase.cpp
+++ b/doc/codesnippets/doc/src/snippets/sqldatabase/sqldatabase.cpp
@@ -87,7 +87,7 @@ def QSqlQuery_snippets():
 //! [7]
     query = QSqlQuery("SELECT country FROM artist")
     while query.next():
-        country = query.value(0).toString()
+        country = query.value(0)
         doSomething(country)
 //! [7]
 
@@ -97,7 +97,7 @@ def QSqlQuery_snippets():
     query = QSqlQuery("SELECT * FROM artist")
     fieldNo = query.record().indexOf("country")
     while query.next():
-        country = query.value(fieldNo).toString()
+        country = query.value(fieldNo)
         doSomething(country)
 //! [8]
 
@@ -152,7 +152,7 @@ def QSqlQuery_snippets():
     query.bindValue(0, "A")
     query.bindValue(1, 0, QSql.Out)
     query.exec_()
-    i = query.boundValue(1).toInt() # i is 65
+    i = query.boundValue(1) # i is 65
 //! [13]
 
     query = QSqlQuery()
@@ -162,7 +162,7 @@ def QSqlQuery_snippets():
     i = query.boundValues()
     while i.hasNext():
         i.next()
-        print i.key().toAscii().data(), ": ", i.value().toString().toAscii().data()
+        print i.key(), ": ", i.value()
 //! [14]
 
     # examine with positional binding
@@ -193,11 +193,11 @@ def QSqlQueryModel_snippets():
 //! [21]
     model = QSqlQueryModel()
     model.setQuery("SELECT * FROM employee")
-    salary = model.record(4).value("salary").toInt()
+    salary = model.record(4).value("salary")
 //! [21]
 
 //! [22]
-    salary = model.data(model.index(4, 2)).toInt()
+    salary = model.data(model.index(4, 2))
 //! [22]
 
     for row in range(model.rowCount()):
@@ -238,7 +238,7 @@ def QSqlTableModel_snippets():
 //! [25]
     model = QSqlTableModel()
     model.setTable("employee")
-    QString name = model.record(4).value("name").toString()
+    QString name = model.record(4).value("name")
 //! [25]
 
 def sql_intro_snippets():
@@ -273,8 +273,8 @@ def sql_intro_snippets():
 
 //! [32]
     while query.next():
-        name = query.value(0).toString()
-        salary = query.value(1).toInt()
+        name = query.value(0)
+        salary = query.value(1)
         print name, salary
 //! [32]
 
@@ -339,7 +339,7 @@ def sql_intro_snippets():
     query = QSqlQuery()
     query.exec_("SELECT id FROM employee WHERE name = 'Torild Halvorsen'")
     if query.next():
-        employeeId = query.value(0).toInt()
+        employeeId = query.value(0)
         query.exec_("INSERT INTO project (id, name, ownerid) "
                     "VALUES (201, 'Manhattan Project', "
                     + QString.number(employeeId) + ')')
@@ -353,8 +353,8 @@ def sql_intro_snippets():
     model.setQuery("SELECT * FROM employee")
 
     for i in range(model.rowCount()):
-        _id = model.record(i).value("id").toInt()
-        name = model.record(i).value("name").toString()
+        _id = model.record(i).value("id")
+        name = model.record(i).value("name")
         print _id, name
 
 //! [40]
@@ -370,8 +370,8 @@ def sql_intro_snippets():
     model.select()
 
     for i in range(model.rowCount()):
-        name = model.record(i).value("name").toString()
-        salary = model.record(i).value("salary").toInt()
+        name = model.record(i).value("name")
+        salary = model.record(i).value("salary")
         print "%s: %d" % (name, salary)
 
 //! [41]
@@ -383,7 +383,7 @@ def sql_intro_snippets():
 //! [42]
     for i in range(model.rowCount()):
         record = model.record(i)
-        salary = record.value("salary").toInt()
+        salary = record.value("salary")
         salary *= 1.1
         record.setValue("salary", salary)
         model.setRecord(i, record)
diff --git a/doc/codesnippets/doc/src/snippets/sqldatabase/sqldatabase.pro b/doc/codesnippets/doc/src/snippets/sqldatabase/sqldatabase.pro
deleted file mode 100644
index 4399695..0000000
--- a/doc/codesnippets/doc/src/snippets/sqldatabase/sqldatabase.pro
+++ /dev/null
@@ -1,2 +0,0 @@
-SOURCES += sqldatabase.cpp
-QT += sql
diff --git a/doc/codesnippets/doc/src/snippets/streaming/streaming.pro b/doc/codesnippets/doc/src/snippets/streaming/streaming.pro
deleted file mode 100644
index 8c5eb91..0000000
--- a/doc/codesnippets/doc/src/snippets/streaming/streaming.pro
+++ /dev/null
@@ -1,2 +0,0 @@
-SOURCES = main.cpp
-CONFIG += CONSOLE
\ No newline at end of file
diff --git a/doc/codesnippets/doc/src/snippets/stringlistmodel/main.cpp b/doc/codesnippets/doc/src/snippets/stringlistmodel/main.cpp
index 17d6be8..d285eb8 100644
--- a/doc/codesnippets/doc/src/snippets/stringlistmodel/main.cpp
+++ b/doc/codesnippets/doc/src/snippets/stringlistmodel/main.cpp
@@ -52,33 +52,29 @@
 #include "model.h"
 
 //! [0]
-int main(int argc, char *argv[])
-{
-    QApplication app(argc, argv);
+
+app = QApplication(sys.argv)
 
 // Unindented for quoting purposes:
 //! [1]
-QStringList numbers;
-numbers << "One" << "Two" << "Three" << "Four" << "Five";
+numbers = ["One", "Two", "Three", "Four", "Five"]
 
-QAbstractItemModel *model = new StringListModel(numbers);
+model = StringListModel(numbers)
 //! [0] //! [1] //! [2] //! [3]
-QListView *view = new QListView;
+view = QListView()
 //! [2]
-view->setWindowTitle("View onto a string list model");
+view.setWindowTitle("View onto a string list model")
 //! [4]
-view->setModel(model);
+view.setModel(model)
 //! [3] //! [4]
 
-    model->insertRows(5, 7, QModelIndex());
+    model.insertRows(5, 7, QModelIndex())
 
-    for (int row = 5; row < 12; ++row) {
-        QModelIndex index = model->index(row, 0, QModelIndex());
-        model->setData(index, QString::number(row+1));
-    }
+    for row in range(5, 12):
+        index = model.index(row, 0, QModelIndex())
+        model.setData(index, str(row+1))
 
 //! [5]
-    view->show();
-    return app.exec();
-}
+    view.show()
+    sys.exit(app.exec_())
 //! [5]
diff --git a/doc/codesnippets/doc/src/snippets/stringlistmodel/model.cpp b/doc/codesnippets/doc/src/snippets/stringlistmodel/model.cpp
index 124c328..659f02d 100644
--- a/doc/codesnippets/doc/src/snippets/stringlistmodel/model.cpp
+++ b/doc/codesnippets/doc/src/snippets/stringlistmodel/model.cpp
@@ -45,18 +45,14 @@
   A simple model that uses a QStringList as its data source.
 */
 
-#include "model.h"
-
 /*!
     Returns the number of items in the string list as the number of rows
     in the model.
 */
 
 //! [0]
-int StringListModel::rowCount(const QModelIndex &parent) const
-{
-    return stringList.count();
-}
+def rowCount(self, parent):
+    return len(self.stringList)
 //! [0]
 
 /*!
@@ -67,19 +63,17 @@ int StringListModel::rowCount(const QModelIndex &parent) const
 */
 
 //! [1]
-QVariant StringListModel::data(const QModelIndex &index, int role) const
-{
-    if (!index.isValid())
-        return QVariant();
+def data(self, index, role):
+    if not index.isValid():
+        return None
 
-    if (index.row() >= stringList.size())
-        return QVariant();
+    if index.row() >= stringList.size():
+        return None
 
-    if (role == Qt::DisplayRole)
-        return stringList.at(index.row());
+    if role == Qt.DisplayRole:
+        return stringList[index.row()]
     else
-        return QVariant();
-}
+        return None
 //! [1]
 
 /*!
@@ -89,17 +83,14 @@ QVariant StringListModel::data(const QModelIndex &index, int role) const
 */
 
 //! [2]
-QVariant StringListModel::headerData(int section, Qt::Orientation orientation,
-                                     int role) const
-{
-    if (role != Qt::DisplayRole)
-        return QVariant();
+def headerData(self, section, orientation, role):
+    if role != Qt::DisplayRole:
+        return None
 
-    if (orientation == Qt::Horizontal)
-        return QString("Column %1").arg(section);
-    else
-        return QString("Row %1").arg(section);
-}
+    if orientation == Qt::Horizontal:
+        return "Column %s" % section
+    else:
+        return "Row %s" % section
 //! [2]
 
 /*!
@@ -108,13 +99,11 @@ QVariant StringListModel::headerData(int section, Qt::Orientation orientation,
 */
 
 //! [3]
-Qt::ItemFlags StringListModel::flags(const QModelIndex &index) const
-{
-    if (!index.isValid())
-        return Qt::ItemIsEnabled;
+def flags(self, index):
+    if not index.isValid()
+        return Qt.ItemIsEnabled
 
-    return QAbstractItemModel::flags(index) | Qt::ItemIsEditable;
-}
+    return QAbstractItemModel.flags(index) | Qt.ItemIsEditable
 //! [3]
 
 /*!
@@ -129,17 +118,13 @@ Qt::ItemFlags StringListModel::flags(const QModelIndex &index) const
 */
 
 //! [4]
-bool StringListModel::setData(const QModelIndex &index,
-                              const QVariant &value, int role)
-{
-    if (index.isValid() && role == Qt::EditRole) {
-
-        stringList.replace(index.row(), value.toString());
-        emit dataChanged(index, index);
-        return true;
-    }
+def setData(self, index, value, role):
+    if index.isValid() and role == Qt.EditRole:
+        self.stringList[index.row()] = value
+        self.dataChanged.emit(index, index)
+        return True;
 //! [4] //! [5]
-    return false;
+    return False;
 }
 //! [5]
 
@@ -148,18 +133,15 @@ bool StringListModel::setData(const QModelIndex &index,
 */
 
 //! [6]
-bool StringListModel::insertRows(int position, int rows, const QModelIndex &parent)
-{
-    beginInsertRows(QModelIndex(), position, position+rows-1);
+def insertRows(self, position, rows, parent):
+    self.beginInsertRows(QModelIndex(), position, position+rows-1)
 
-    for (int row = 0; row < rows; ++row) {
-        stringList.insert(position, "");
-    }
+    for row in range(0, rows):
+        self.stringList.insert(position, "")
 
-    endInsertRows();
-    return true;
+    self.endInsertRows()
+    return True;
 //! [6] //! [7]
-}
 //! [7]
 
 /*!
@@ -167,16 +149,13 @@ bool StringListModel::insertRows(int position, int rows, const QModelIndex &pare
 */
 
 //! [8]
-bool StringListModel::removeRows(int position, int rows, const QModelIndex &parent)
-{
-    beginRemoveRows(QModelIndex(), position, position+rows-1);
+def removeRows(self, position, rows, parent):
+    self.beginRemoveRows(QModelIndex(), position, position+rows-1)
 
-    for (int row = 0; row < rows; ++row) {
-        stringList.removeAt(position);
-    }
+    for row in range(0, rows):
+        del self.stringList[position]
 
-    endRemoveRows();
-    return true;
+    self.endRemoveRows()
+    return True;
 //! [8] //! [9]
-}
 //! [9]
diff --git a/doc/codesnippets/doc/src/snippets/stringlistmodel/model.h b/doc/codesnippets/doc/src/snippets/stringlistmodel/model.h
index 30f7611..0a0b0c3 100644
--- a/doc/codesnippets/doc/src/snippets/stringlistmodel/model.h
+++ b/doc/codesnippets/doc/src/snippets/stringlistmodel/model.h
@@ -39,45 +39,35 @@
 **
 ****************************************************************************/
 
-#ifndef MODEL_H
-#define MODEL_H
-
-#include <QAbstractListModel>
-#include <QObject>
-#include <QStringList>
-
 //! [0]
-class StringListModel : public QAbstractListModel
-{
-    Q_OBJECT
+class StringListModel (QAbstractListModel):
+    def __init__(strings, parent = None):
+        QAbstractListModel.__init__(self, parent)
+//! [5]
+        self.stringList = strings
+//! [5]
 
-public:
-    StringListModel(const QStringList &strings, QObject *parent = 0)
-        : QAbstractListModel(parent), stringList(strings) {}
-
-    int rowCount(const QModelIndex &parent = QModelIndex()) const;
-    QVariant data(const QModelIndex &index, int role) const;
-    QVariant headerData(int section, Qt::Orientation orientation,
+    def rowCount(self, parent = QModelIndex()):
+        # ...
+    def data(self, index, role):
+        # ...
+    def headerData(self, section, orientation,
 //! [0] //! [1]
-                        int role = Qt::DisplayRole) const;
+                        role = Qt.DisplayRole):
 //! [1]
 
 //! [2]
-    Qt::ItemFlags flags(const QModelIndex &index) const;
-    bool setData(const QModelIndex &index, const QVariant &value,
+    def flags(self, index):
+        # ...
+    def setData(self, index, value,
 //! [2] //! [3]
-                 int role = Qt::EditRole);
+                 role = Qt.EditRole)
 //! [3]
 
 //! [4]
-    bool insertRows(int position, int rows, const QModelIndex &index = QModelIndex());
-    bool removeRows(int position, int rows, const QModelIndex &index = QModelIndex());
+    def insertRows(self, position, rows, index = QModelIndex()):
+        # ...
+    def removeRows(self, position, rows, index = QModelIndex()):
+        # ...
 //! [4]
 
-//! [5]
-private:
-    QStringList stringList;
-};
-//! [5]
-
-#endif
diff --git a/doc/codesnippets/doc/src/snippets/stringlistmodel/stringlistmodel.pro b/doc/codesnippets/doc/src/snippets/stringlistmodel/stringlistmodel.pro
deleted file mode 100644
index b1126bf..0000000
--- a/doc/codesnippets/doc/src/snippets/stringlistmodel/stringlistmodel.pro
+++ /dev/null
@@ -1,3 +0,0 @@
-HEADERS     = model.h
-SOURCES     = main.cpp \
-              model.cpp
diff --git a/doc/codesnippets/doc/src/snippets/textblock-formats/textblock-formats.pro b/doc/codesnippets/doc/src/snippets/textblock-formats/textblock-formats.pro
deleted file mode 100644
index d664835..0000000
--- a/doc/codesnippets/doc/src/snippets/textblock-formats/textblock-formats.pro
+++ /dev/null
@@ -1,2 +0,0 @@
-QT          += xml
-SOURCES     = main.cpp
diff --git a/doc/codesnippets/doc/src/snippets/textblock-fragments/textblock-fragments.pro b/doc/codesnippets/doc/src/snippets/textblock-fragments/textblock-fragments.pro
deleted file mode 100644
index 83ed78e..0000000
--- a/doc/codesnippets/doc/src/snippets/textblock-fragments/textblock-fragments.pro
+++ /dev/null
@@ -1,6 +0,0 @@
-QT          += xml
-HEADERS     = mainwindow.h \
-              xmlwriter.h
-SOURCES     = main.cpp \
-              mainwindow.cpp \
-              xmlwriter.cpp
diff --git a/doc/codesnippets/doc/src/snippets/textdocument-blocks/textdocument-blocks.pro b/doc/codesnippets/doc/src/snippets/textdocument-blocks/textdocument-blocks.pro
deleted file mode 100644
index 83ed78e..0000000
--- a/doc/codesnippets/doc/src/snippets/textdocument-blocks/textdocument-blocks.pro
+++ /dev/null
@@ -1,6 +0,0 @@
-QT          += xml
-HEADERS     = mainwindow.h \
-              xmlwriter.h
-SOURCES     = main.cpp \
-              mainwindow.cpp \
-              xmlwriter.cpp
diff --git a/doc/codesnippets/doc/src/snippets/textdocument-charformats/textdocument-charformats.pro b/doc/codesnippets/doc/src/snippets/textdocument-charformats/textdocument-charformats.pro
deleted file mode 100644
index 16181f2..0000000
--- a/doc/codesnippets/doc/src/snippets/textdocument-charformats/textdocument-charformats.pro
+++ /dev/null
@@ -1 +0,0 @@
-SOURCES     = main.cpp
diff --git a/doc/codesnippets/doc/src/snippets/textdocument-css/textdocument-css.pro b/doc/codesnippets/doc/src/snippets/textdocument-css/textdocument-css.pro
deleted file mode 100644
index 28dcadc..0000000
--- a/doc/codesnippets/doc/src/snippets/textdocument-css/textdocument-css.pro
+++ /dev/null
@@ -1 +0,0 @@
-SOURCES += main.cpp
diff --git a/doc/codesnippets/doc/src/snippets/textdocument-cursors/textdocument-cursors.pro b/doc/codesnippets/doc/src/snippets/textdocument-cursors/textdocument-cursors.pro
deleted file mode 100644
index 16181f2..0000000
--- a/doc/codesnippets/doc/src/snippets/textdocument-cursors/textdocument-cursors.pro
+++ /dev/null
@@ -1 +0,0 @@
-SOURCES     = main.cpp
diff --git a/doc/codesnippets/doc/src/snippets/textdocument-find/textdocument-find.pro b/doc/codesnippets/doc/src/snippets/textdocument-find/textdocument-find.pro
deleted file mode 100644
index 16181f2..0000000
--- a/doc/codesnippets/doc/src/snippets/textdocument-find/textdocument-find.pro
+++ /dev/null
@@ -1 +0,0 @@
-SOURCES     = main.cpp
diff --git a/doc/codesnippets/doc/src/snippets/textdocument-frames/textdocument-frames.pro b/doc/codesnippets/doc/src/snippets/textdocument-frames/textdocument-frames.pro
deleted file mode 100644
index 91ae50f..0000000
--- a/doc/codesnippets/doc/src/snippets/textdocument-frames/textdocument-frames.pro
+++ /dev/null
@@ -1,6 +0,0 @@
-SOURCES     = main.cpp \
-              mainwindow.cpp \
-              xmlwriter.cpp
-HEADERS     = mainwindow.h \
-              xmlwriter.h
-QT          += xml
diff --git a/doc/codesnippets/doc/src/snippets/textdocument-imagedrop/textdocument-imagedrop.pro b/doc/codesnippets/doc/src/snippets/textdocument-imagedrop/textdocument-imagedrop.pro
deleted file mode 100644
index 96d3038..0000000
--- a/doc/codesnippets/doc/src/snippets/textdocument-imagedrop/textdocument-imagedrop.pro
+++ /dev/null
@@ -1,2 +0,0 @@
-SOURCES = textedit.cpp main.cpp
-HEADERS = textedit.h
\ No newline at end of file
diff --git a/doc/codesnippets/doc/src/snippets/textdocument-imageformat/textdocument-imageformat.pro b/doc/codesnippets/doc/src/snippets/textdocument-imageformat/textdocument-imageformat.pro
deleted file mode 100644
index 1c64370..0000000
--- a/doc/codesnippets/doc/src/snippets/textdocument-imageformat/textdocument-imageformat.pro
+++ /dev/null
@@ -1,2 +0,0 @@
-SOURCES     = main.cpp
-RESOURCES   += images.qrc
diff --git a/doc/codesnippets/doc/src/snippets/textdocument-images/textdocument-images.pro b/doc/codesnippets/doc/src/snippets/textdocument-images/textdocument-images.pro
deleted file mode 100644
index 1c64370..0000000
--- a/doc/codesnippets/doc/src/snippets/textdocument-images/textdocument-images.pro
+++ /dev/null
@@ -1,2 +0,0 @@
-SOURCES     = main.cpp
-RESOURCES   += images.qrc
diff --git a/doc/codesnippets/doc/src/snippets/textdocument-listitems/textdocument-listitems.pro b/doc/codesnippets/doc/src/snippets/textdocument-listitems/textdocument-listitems.pro
deleted file mode 100644
index 5da8d6e..0000000
--- a/doc/codesnippets/doc/src/snippets/textdocument-listitems/textdocument-listitems.pro
+++ /dev/null
@@ -1,3 +0,0 @@
-HEADERS     = mainwindow.h
-SOURCES     = main.cpp \
-              mainwindow.cpp
diff --git a/doc/codesnippets/doc/src/snippets/textdocument-lists/textdocument-lists.pro b/doc/codesnippets/doc/src/snippets/textdocument-lists/textdocument-lists.pro
deleted file mode 100644
index 5da8d6e..0000000
--- a/doc/codesnippets/doc/src/snippets/textdocument-lists/textdocument-lists.pro
+++ /dev/null
@@ -1,3 +0,0 @@
-HEADERS     = mainwindow.h
-SOURCES     = main.cpp \
-              mainwindow.cpp
diff --git a/doc/codesnippets/doc/src/snippets/textdocument-printing/textdocument-printing.pro b/doc/codesnippets/doc/src/snippets/textdocument-printing/textdocument-printing.pro
deleted file mode 100644
index 5da8d6e..0000000
--- a/doc/codesnippets/doc/src/snippets/textdocument-printing/textdocument-printing.pro
+++ /dev/null
@@ -1,3 +0,0 @@
-HEADERS     = mainwindow.h
-SOURCES     = main.cpp \
-              mainwindow.cpp
diff --git a/doc/codesnippets/doc/src/snippets/textdocument-selections/textdocument-selections.pro b/doc/codesnippets/doc/src/snippets/textdocument-selections/textdocument-selections.pro
deleted file mode 100644
index 253c452..0000000
--- a/doc/codesnippets/doc/src/snippets/textdocument-selections/textdocument-selections.pro
+++ /dev/null
@@ -1,4 +0,0 @@
-QT          += xml
-HEADERS     = mainwindow.h
-SOURCES     = main.cpp \
-              mainwindow.cpp
diff --git a/doc/codesnippets/doc/src/snippets/textdocument-tables/textdocument-tables.pro b/doc/codesnippets/doc/src/snippets/textdocument-tables/textdocument-tables.pro
deleted file mode 100644
index 91ae50f..0000000
--- a/doc/codesnippets/doc/src/snippets/textdocument-tables/textdocument-tables.pro
+++ /dev/null
@@ -1,6 +0,0 @@
-SOURCES     = main.cpp \
-              mainwindow.cpp \
-              xmlwriter.cpp
-HEADERS     = mainwindow.h \
-              xmlwriter.h
-QT          += xml
diff --git a/doc/codesnippets/doc/src/snippets/timeline/timeline.pro b/doc/codesnippets/doc/src/snippets/timeline/timeline.pro
deleted file mode 100644
index bba41b9..0000000
--- a/doc/codesnippets/doc/src/snippets/timeline/timeline.pro
+++ /dev/null
@@ -1 +0,0 @@
-SOURCES = main.cpp
diff --git a/doc/codesnippets/doc/src/snippets/timers/timers.cpp b/doc/codesnippets/doc/src/snippets/timers/timers.cpp
index 3e5e1ac..9a05870 100644
--- a/doc/codesnippets/doc/src/snippets/timers/timers.cpp
+++ b/doc/codesnippets/doc/src/snippets/timers/timers.cpp
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include <QTimer>
+from PySide.QtCore import QTimer
 
 class Foo : public QObject
 {
@@ -52,7 +52,7 @@ Foo::Foo()
 //! [0]
     timer = QTimer(self)
 //! [0] //! [1]
-    self.connect(timer, SIGNAL("timeout()"), self.updateCaption)
+    timer.timeout.connect(self.updateCaption)
 //! [1] //! [2]
     timer.start(1000)
 //! [2]
@@ -66,7 +66,7 @@ Foo::Foo()
 //! [4]
     timer = QTimer(self)
 //! [4] //! [5]
-    self.connect(timer, SIGNAL("timeout()"), self.processOneThing)
+    timer.timeout.connect(self.processOneThing)
 //! [5] //! [6]
     timer.start()
 //! [6]
@@ -75,5 +75,5 @@ Foo::Foo()
 
 int main()
 {
-    
+
 }
diff --git a/doc/codesnippets/doc/src/snippets/timers/timers.pro b/doc/codesnippets/doc/src/snippets/timers/timers.pro
deleted file mode 100644
index 8cb4eec..0000000
--- a/doc/codesnippets/doc/src/snippets/timers/timers.pro
+++ /dev/null
@@ -1 +0,0 @@
-SOURCES += timers.cpp
diff --git a/doc/codesnippets/doc/src/snippets/transform/transform.pro b/doc/codesnippets/doc/src/snippets/transform/transform.pro
deleted file mode 100644
index 5254077..0000000
--- a/doc/codesnippets/doc/src/snippets/transform/transform.pro
+++ /dev/null
@@ -1 +0,0 @@
-SOURCES = main.cpp
\ No newline at end of file
diff --git a/doc/codesnippets/doc/src/snippets/uitools/calculatorform/calculatorform.pro b/doc/codesnippets/doc/src/snippets/uitools/calculatorform/calculatorform.pro
deleted file mode 100644
index 1a18378..0000000
--- a/doc/codesnippets/doc/src/snippets/uitools/calculatorform/calculatorform.pro
+++ /dev/null
@@ -1,5 +0,0 @@
-#! [0]
-TEMPLATE    = app
-FORMS       = calculatorform.ui
-SOURCES     = main.cpp
-#! [0]
diff --git a/doc/codesnippets/doc/src/snippets/updating-selections/model.cpp b/doc/codesnippets/doc/src/snippets/updating-selections/model.cpp
deleted file mode 100644
index 0fe0249..0000000
--- a/doc/codesnippets/doc/src/snippets/updating-selections/model.cpp
+++ /dev/null
@@ -1,237 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the documentation of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial Usage
-** Licensees holding valid Qt Commercial licenses may use this file in
-** accordance with the Qt Commercial License Agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Nokia.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain
-** additional rights. These rights are described in the Nokia Qt LGPL
-** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://www.qtsoftware.com/contact.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-/*
-    model.cpp
-
-    Provides a table model for use in various examples.
-*/
-
-#include <QtGui>
-
-#include "model.h"
-
-/*!
-    Constructs a table model with at least one row and one column.
-*/
-
-TableModel::TableModel(int rows, int columns, QObject *parent)
-    : QAbstractTableModel(parent)
-{
-    QStringList newList;
-
-    for (int column = 0; column < qMax(1, columns); ++column) {
-        newList.append("");
-    }
-
-    for (int row = 0; row < qMax(1, rows); ++row) {
-        rowList.append(newList);
-    }
-}
-
-
-/*!
-    Returns the number of items in the row list as the number of rows
-    in the model.
-*/
-
-int TableModel::rowCount(const QModelIndex &/*parent*/) const
-{
-    return rowList.size();
-}
-
-/*!
-    Returns the number of items in the first list item as the number of
-    columns in the model. All rows should have the same number of columns.
-*/
-
-int TableModel::columnCount(const QModelIndex &/*parent*/) const
-{
-    return rowList[0].size();
-}
-
-/*!
-    Returns an appropriate value for the requested data.
-    If the view requests an invalid index, an invalid variant is returned.
-    Any valid index that corresponds to a string in the list causes that
-    string to be returned for the display role; otherwise an invalid variant
-    is returned.
-*/
-
-QVariant TableModel::data(const QModelIndex &index, int role) const
-{
-    if (!index.isValid())
-        return QVariant();
-
-    if (role == Qt::DisplayRole)
-        return rowList[index.row()][index.column()];
-    else
-        return QVariant();
-}
-
-/*!
-    Returns the appropriate header string depending on the orientation of
-    the header and the section. If anything other than the display role is
-    requested, we return an invalid variant.
-*/
-
-QVariant TableModel::headerData(int section, Qt::Orientation orientation,
-                                int role) const
-{
-    if (role != Qt::DisplayRole)
-        return QVariant();
-
-    if (orientation == Qt::Horizontal)
-        return QString("Column %1").arg(section);
-    else
-        return QString("Row %1").arg(section);
-}
-
-/*!
-    Returns an appropriate value for the item's flags. Valid items are
-    enabled, selectable, and editable.
-*/
-
-Qt::ItemFlags TableModel::flags(const QModelIndex &index) const
-{
-    if (!index.isValid())
-        return Qt::ItemIsEnabled;
-
-    return Qt::ItemIsEnabled | Qt::ItemIsSelectable | Qt::ItemIsEditable;
-}
-
-/*!
-    Changes an item in the model, but only if the following conditions
-    are met:
-
-    * The index supplied is valid.
-    * The role associated with editing text is specified.
-
-    The dataChanged() signal is emitted if the item is changed.
-*/
-
-bool TableModel::setData(const QModelIndex &index,
-                         const QVariant &value, int role)
-{
-    if (!index.isValid() || role != Qt::EditRole)
-        return false;
-
-    rowList[index.row()][index.column()] = value.toString();
-    emit dataChanged(index, index);
-    return true;
-}
-
-/*!
-    Inserts a number of rows into the model at the specified position.
-*/
-
-bool TableModel::insertRows(int position, int rows, const QModelIndex &parent)
-{
-    int columns = columnCount();
-    beginInsertRows(parent, position, position + rows - 1);
-
-    for (int row = 0; row < rows; ++row) {
-        QStringList items;
-        for (int column = 0; column < columns; ++column)
-            items.append("");
-        rowList.insert(position, items);
-    }
-
-    endInsertRows();
-    return true;
-}
-
-/*!
-    Inserts a number of columns into the model at the specified position.
-    Each entry in the list is extended in turn with the required number of
-    empty strings.
-*/
-
-bool TableModel::insertColumns(int position, int columns, const QModelIndex &parent)
-{
-    int rows = rowCount();
-    beginInsertColumns(parent, position, position + columns - 1);
-
-    for (int row = 0; row < rows; ++row) {
-        for (int column = position; column < columns; ++column) {
-            rowList[row].insert(position, "");
-        }
-    }
-
-    endInsertColumns();
-    return true;
-}
-
-/*!
-    Removes a number of rows from the model at the specified position.
-*/
-
-bool TableModel::removeRows(int position, int rows, const QModelIndex &parent)
-{
-    beginRemoveRows(parent, position, position + rows - 1);
-
-    for (int row = 0; row < rows; ++row) {
-        rowList.removeAt(position);
-    }
-
-    endRemoveRows();
-    return true;
-}
-
-/*!
-    Removes a number of columns from the model at the specified position.
-    Each row is shortened by the number of columns specified.
-*/
-
-bool TableModel::removeColumns(int position, int columns, const QModelIndex &parent)
-{
-    int rows = rowCount();
-    beginRemoveColumns(parent, position, position + columns - 1);
-
-    for (int row = 0; row < rows; ++row) {
-        for (int column = 0; column < columns; ++column) {
-            rowList[row].removeAt(position);
-        }
-    }
-
-    endRemoveColumns();
-    return true;
-}
diff --git a/doc/codesnippets/doc/src/snippets/updating-selections/updating-selections.pro b/doc/codesnippets/doc/src/snippets/updating-selections/updating-selections.pro
deleted file mode 100644
index 91ebd3e..0000000
--- a/doc/codesnippets/doc/src/snippets/updating-selections/updating-selections.pro
+++ /dev/null
@@ -1,2 +0,0 @@
-HEADERS += model.h window.h
-SOURCES += main.cpp model.cpp window.cpp
diff --git a/doc/codesnippets/doc/src/snippets/whatsthis/whatsthis.cpp b/doc/codesnippets/doc/src/snippets/whatsthis/whatsthis.cpp
index 4bd1961..871254b 100644
--- a/doc/codesnippets/doc/src/snippets/whatsthis/whatsthis.cpp
+++ b/doc/codesnippets/doc/src/snippets/whatsthis/whatsthis.cpp
@@ -42,7 +42,7 @@
 //! [0]
     Act = QAction(tr("&New"), self)
     Act.setShortcut(tr("Ctrl+N"))
-    Act.setStatusTip(tr("Create a new file"))
-    Act.setWhatsThis(tr("Click self option to create a new file."))
+    Act.setStatusTip(QObject.tr("Create a new file"))
+    Act.setWhatsThis(QObject.tr("Click self option to create a new file."))
 //! [0]
 
diff --git a/doc/codesnippets/doc/src/snippets/whatsthis/whatsthis.pro b/doc/codesnippets/doc/src/snippets/whatsthis/whatsthis.pro
deleted file mode 100644
index 1310a4f..0000000
--- a/doc/codesnippets/doc/src/snippets/whatsthis/whatsthis.pro
+++ /dev/null
@@ -1 +0,0 @@
-SOURCES += whatsthis.cpp
diff --git a/doc/codesnippets/doc/src/snippets/widget-mask/widget-mask.pro b/doc/codesnippets/doc/src/snippets/widget-mask/widget-mask.pro
deleted file mode 100644
index f0807a5..0000000
--- a/doc/codesnippets/doc/src/snippets/widget-mask/widget-mask.pro
+++ /dev/null
@@ -1,3 +0,0 @@
-SOURCES     = main.cpp
-RESOURCES   = mask.qrc
-CONFIG      += qt
diff --git a/doc/codesnippets/doc/src/snippets/widgets-tutorial/childwidget/childwidget.pro b/doc/codesnippets/doc/src/snippets/widgets-tutorial/childwidget/childwidget.pro
deleted file mode 100644
index bba41b9..0000000
--- a/doc/codesnippets/doc/src/snippets/widgets-tutorial/childwidget/childwidget.pro
+++ /dev/null
@@ -1 +0,0 @@
-SOURCES = main.cpp
diff --git a/doc/codesnippets/doc/src/snippets/widgets-tutorial/nestedlayouts/nestedlayouts.pro b/doc/codesnippets/doc/src/snippets/widgets-tutorial/nestedlayouts/nestedlayouts.pro
deleted file mode 100644
index bba41b9..0000000
--- a/doc/codesnippets/doc/src/snippets/widgets-tutorial/nestedlayouts/nestedlayouts.pro
+++ /dev/null
@@ -1 +0,0 @@
-SOURCES = main.cpp
diff --git a/doc/codesnippets/doc/src/snippets/widgets-tutorial/toplevel/toplevel.pro b/doc/codesnippets/doc/src/snippets/widgets-tutorial/toplevel/toplevel.pro
deleted file mode 100644
index bba41b9..0000000
--- a/doc/codesnippets/doc/src/snippets/widgets-tutorial/toplevel/toplevel.pro
+++ /dev/null
@@ -1 +0,0 @@
-SOURCES = main.cpp
diff --git a/doc/codesnippets/doc/src/snippets/widgets-tutorial/windowlayout/windowlayout.pro b/doc/codesnippets/doc/src/snippets/widgets-tutorial/windowlayout/windowlayout.pro
deleted file mode 100644
index bba41b9..0000000
--- a/doc/codesnippets/doc/src/snippets/widgets-tutorial/windowlayout/windowlayout.pro
+++ /dev/null
@@ -1 +0,0 @@
-SOURCES = main.cpp
diff --git a/doc/codesnippets/doc/src/snippets/xml/prettyprint/main.cpp b/doc/codesnippets/doc/src/snippets/xml/prettyprint/main.cpp
deleted file mode 100644
index 33875ae..0000000
--- a/doc/codesnippets/doc/src/snippets/xml/prettyprint/main.cpp
+++ /dev/null
@@ -1,144 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the documentation of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial Usage
-** Licensees holding valid Qt Commercial licenses may use this file in
-** accordance with the Qt Commercial License Agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Nokia.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain
-** additional rights. These rights are described in the Nokia Qt LGPL
-** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://www.qtsoftware.com/contact.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include <QCoreApplication>
-#include <QFile>
-#include <QHash>
-#include <QPair>
-#include <QStringList>
-#include <QTextStream>
-#include <QXmlStreamReader>
-
-/*
-    This class exists for the sole purpose of creating a translation context.
- */
-class PrettyPrint
-{
-    Q_DECLARE_TR_FUNCTIONS(PrettyPrint)
-};
-
-int main(int argc, char *argv[])
-{
-    enum ExitCode
-    {
-        Success,
-        ParseFailure,
-        ArgumentError,
-        WriteError,
-        FileFailure
-    };
-
-    QCoreApplication app(argc, argv);
-
-    QTextStream errorStream(stderr);
-
-    if (argc != 2)
-    {
-        errorStream << PrettyPrint::tr(
-                       "Usage: prettyprint <path to XML file>\n");
-        return ArgumentError;
-    }
-
-    QString inputFilePath(QCoreApplication::arguments().at(1));
-    QFile inputFile(inputFilePath);
-
-    if (!QFile::exists(inputFilePath))
-    {
-        errorStream << PrettyPrint::tr(
-                       "File %1 does not exist.\n").arg(inputFilePath);
-        return FileFailure;
-
-    } else if (!inputFile.open(QIODevice::ReadOnly)) {
-        errorStream << PrettyPrint::tr(
-                       "Failed to open file %1.\n").arg(inputFilePath);
-        return FileFailure;
-    }
-
-    QFile outputFile;
-    if (!outputFile.open(stdout, QIODevice::WriteOnly))
-    {
-        QTextStream(stderr) << PrettyPrint::tr("Failed to open stdout.");
-        return WriteError;
-    }
-
-    QXmlStreamReader reader(&inputFile);
-    int indentation = 0;
-    QHash<int,QPair<int, int> > indentationStack;
-
-    while (!reader.atEnd())
-    {
-        reader.readNext();
-        if (reader.isStartElement()) {
-            indentationStack[indentation] = QPair<int,int>(
-                reader.lineNumber(), reader.columnNumber());
-            indentation += 1;
-        } else if (reader.isEndElement()) {
-            indentationStack.remove(indentation);
-            indentation -= 1;
-        }
-
-        if (reader.error())
-        {
-            errorStream << PrettyPrint::tr(
-                           "Error: %1 in file %2 at line %3, column %4.\n").arg(
-                               reader.errorString(), inputFilePath,
-                               QString::number(reader.lineNumber()),
-                               QString::number(reader.columnNumber()));
-            if (indentationStack.contains(indentation-1)) {
-                int line = indentationStack[indentation-1].first;
-                int column = indentationStack[indentation-1].second;
-                errorStream << PrettyPrint::tr(
-                               "Opened at line %1, column %2.\n").arg(
-                                   QString::number(line),
-                                   QString::number(column));
-            }
-            return ParseFailure;
-
-        } else if (reader.isStartElement() && !reader.name().isEmpty()) {
-            outputFile.write(QByteArray().fill(' ', indentation));
-            outputFile.write(reader.name().toString().toLocal8Bit());
-            outputFile.write(QString(" line %1, column %2\n").arg(
-                reader.lineNumber()).arg(reader.columnNumber()).toLocal8Bit());
-        }
-    }
-
-    return Success;
-}
diff --git a/doc/codesnippets/doc/src/snippets/xml/prettyprint/prettyprint.pro b/doc/codesnippets/doc/src/snippets/xml/prettyprint/prettyprint.pro
deleted file mode 100644
index 61945e0..0000000
--- a/doc/codesnippets/doc/src/snippets/xml/prettyprint/prettyprint.pro
+++ /dev/null
@@ -1,4 +0,0 @@
-CONFIG   += console
-QT       -= gui
-QT       += xml
-SOURCES  += main.cpp
diff --git a/doc/codesnippets/doc/src/snippets/xml/simpleparse/simpleparse.pro b/doc/codesnippets/doc/src/snippets/xml/simpleparse/simpleparse.pro
deleted file mode 100644
index fbea770..0000000
--- a/doc/codesnippets/doc/src/snippets/xml/simpleparse/simpleparse.pro
+++ /dev/null
@@ -1,4 +0,0 @@
-HEADERS     = handler.h
-SOURCES     = handler.cpp \
-              main.cpp
-QT         += xml
diff --git a/doc/codesnippets/doc/src/snippets/xml/xml.pro b/doc/codesnippets/doc/src/snippets/xml/xml.pro
deleted file mode 100644
index a321bad..0000000
--- a/doc/codesnippets/doc/src/snippets/xml/xml.pro
+++ /dev/null
@@ -1,8 +0,0 @@
-### A qmake file for the snippets. *** This is not for distribution. ***
-#
-# The snippets that don't work are commented out.
-
-TEMPLATE        = subdirs
-SUBDIRS         = prettyprint
-#                  rsslisting
-#                  simpleparse
diff --git a/doc/codesnippets/examples/declarative/cppextensions/imageprovider/imageprovider-example.qml b/doc/codesnippets/examples/declarative/cppextensions/imageprovider/imageprovider-example.qml
new file mode 100644
index 0000000..5f4c99b
--- /dev/null
+++ b/doc/codesnippets/examples/declarative/cppextensions/imageprovider/imageprovider-example.qml
@@ -0,0 +1,9 @@
+import QtQuick 1.0
+import "ImageProviderCore" // import the plugin that registers the color image provider
+
+//![0]
+Column {
+    Image { source: "image://colors/yellow" }
+    Image { source: "image://colors/red" }
+}
+//![0]
diff --git a/doc/codesnippets/examples/declarative/cppextensions/imageprovider/imageprovider.cpp b/doc/codesnippets/examples/declarative/cppextensions/imageprovider/imageprovider.cpp
new file mode 100644
index 0000000..7be620b
--- /dev/null
+++ b/doc/codesnippets/examples/declarative/cppextensions/imageprovider/imageprovider.cpp
@@ -0,0 +1,33 @@
+//![0]
+class ColorImageProvider (QDeclarativeImageProvider):
+    def __init__(self):
+        QDeclarativeImageProvider.__init__(self, QDeclarativeImageProvider.Pixmap)
+
+    def requestPixmap(id, size, requestedSize):
+        width = 100
+        height = 50
+
+        if size:
+            size.setWidth(width)
+            size.setHeight(height)
+
+        if requestedSize.width() > 0:
+            width = requestedSize.width()
+        if requestedSize.height() > 0:
+            height = requestedSize.height()
+
+        pixmap = QPixmap(width, height)
+        pixmap.fill(QColor(id).rgba())
+//![0]
+        # write the color name
+        painter = QPainter(pixmap)
+        f = painter.font()
+        f.setPixelSize(20)
+        painter.setFont(f)
+        painter.setPen(Qt.black)
+        if requestedSize.isValid():
+            painter.scale(requestedSize.width() / width, requestedSize.height() / height)
+        painter.drawText(QRectF(0, 0, width, height), Qt.AlignCenter, id)
+//![1]
+        return pixmap
+//![1]
diff --git a/doc/codesnippets/examples/declarative/cppextensions/plugins/plugin.cpp b/doc/codesnippets/examples/declarative/cppextensions/plugins/plugin.cpp
new file mode 100644
index 0000000..eef2ad7
--- /dev/null
+++ b/doc/codesnippets/examples/declarative/cppextensions/plugins/plugin.cpp
@@ -0,0 +1,19 @@
+
+//![0]
+class TimeModel (QObject):
+    hour = Property(int, getHour, notify = timeChanged)
+    minute = Property(int, getMinute, notify = timeChanged)
+//![0]
+
+//![plugin]
+class QExampleQmlPlugin (QDeclarativeExtensionPlugin):
+
+    def registerTypes(self, uri):
+        assert(uri == "com.nokia.TimeExample")
+        qmlRegisterType(TimeModel, uri, 1, 0, "Time")
+//![plugin]
+
+//![export]
+# This isn't supported by PySide yet.
+# Q_EXPORT_PLUGIN2(qmlqtimeexampleplugin, QExampleQmlPlugin);
+//![export]
diff --git a/doc/codesnippets/examples/declarative/cppextensions/plugins/plugins.qml b/doc/codesnippets/examples/declarative/cppextensions/plugins/plugins.qml
new file mode 100644
index 0000000..3aa0995
--- /dev/null
+++ b/doc/codesnippets/examples/declarative/cppextensions/plugins/plugins.qml
@@ -0,0 +1,52 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the examples of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+//![0]
+import com.nokia.TimeExample 1.0 // import types from the plugin
+
+Clock { // this class is defined in QML (com/nokia/TimeExample/Clock.qml)
+
+    Time { // this class is defined in C++ (plugin.cpp)
+        id: time
+    }
+
+    hours: time.hour
+    minutes: time.minute
+}
+//![0]
diff --git a/doc/codesnippets/examples/dialogs/classwizard/classwizard.cpp b/doc/codesnippets/examples/dialogs/classwizard/classwizard.cpp
index 5814d5f..bf88928 100644
--- a/doc/codesnippets/examples/dialogs/classwizard/classwizard.cpp
+++ b/doc/codesnippets/examples/dialogs/classwizard/classwizard.cpp
@@ -60,14 +60,14 @@ def __init__(self, parent):
 //! [3]
 def accept(self):
 //! [3] //! [4]
-    className = self.field("className").toByteArray()
-    baseClass = self.field("baseClass").toByteArray()
-    macroName = self.field("macroName").toByteArray()
-    baseInclude = self.field("baseInclude").toByteArray()
+    className = self.field("className")
+    baseClass = self.field("baseClass")
+    macroName = self.field("macroName")
+    baseInclude = self.field("baseInclude")
 
-    outputDir = self.field("outputDir").toString()
-    header = self.field("header").toString()
-    implementation = self.field("implementation").toString()
+    outputDir = self.field("outputDir")
+    header = self.field("header")
+    implementation = self.field("implementation")
 //! [4]
 
 ...
@@ -223,28 +223,28 @@ class CodeStylePage(QWizardPage):
 
 //! [16]
     def initializePage(self):
-        className = self.field("className").toString()
-        self.macroNameLineEdit.setText(className.toUpper() + "_H")
+        className = self.field("className")
+        self.macroNameLineEdit.setText(className.upper() + "_H")
 
-        baseClass = self.field("baseClass").toString()
+        baseClass = self.field("baseClass")
 
-        self.includeBaseCheckBox.setChecked(not baseClass.isEmpty())
-        self.includeBaseCheckBox.setEnabled(not baseClass.isEmpty())
-        self.baseIncludeLabel.setEnabled(not baseClass.isEmpty())
-        self.baseIncludeLineEdit.setEnabled(not baseClass.isEmpty())
+        self.includeBaseCheckBox.setChecked(len(baseClass))
+        self.includeBaseCheckBox.setEnabled(len(baseClass))
+        self.baseIncludeLabel.setEnabled(len(baseClass))
+        self.baseIncludeLineEdit.setEnabled(len(baseClass))
 
-        if baseClass.isEmpty():
+        if not baseClass:
             self.baseIncludeLineEdit.clear()
         elsif QRegExp("Q[A-Z].*").exactMatch(baseClass):
             baseIncludeLineEdit.setText("<" + baseClass + ">")
         else:
-            baseIncludeLineEdit.setText("\"" + baseClass.toLower() + ".h\"")
+            baseIncludeLineEdit.setText("\"" + baseClass.lower() + ".h\"")
 //! [16]
 
 //! [17]
     def initializePage(self):
-        className = field("className").toString()
-        self.headerLineEdit.setText(className.toLower() + ".h")
-        self.implementationLineEdit.setText(className.toLower() + ".cpp")
+        className = field("className")
+        self.headerLineEdit.setText(className.lower() + ".h")
+        self.implementationLineEdit.setText(className.lower() + ".cpp")
         self.outputDirLineEdit.setText(QDir.convertSeparators(QDir.tempPath()))
 //! [17]
diff --git a/doc/codesnippets/examples/dialogs/extension/finddialog.cpp b/doc/codesnippets/examples/dialogs/extension/finddialog.cpp
index 3ccf847..d557b06 100644
--- a/doc/codesnippets/examples/dialogs/extension/finddialog.cpp
+++ b/doc/codesnippets/examples/dialogs/extension/finddialog.cpp
@@ -78,7 +78,7 @@ def __init__(self, parent):
 //! [3]
     connect(moreButton, SIGNAL("toggled(bool)"), extension, SLOT("setVisible(bool)"))
 
-    QVBoxLayout *extensionLayout =  QVBoxLayout
+    extensionLayout =  QVBoxLayout()
     extensionLayout.setMargin(0)
     extensionLayout.addWidget(wholeWordsCheckBox)
     extensionLayout.addWidget(backwardCheckBox)
@@ -87,17 +87,17 @@ def __init__(self, parent):
 //! [3]
 
 //! [4]
-    topLeftLayout = QHBoxLayout
+    topLeftLayout = QHBoxLayout()
     topLeftLayout.addWidget(label)
     topLeftLayout.addWidget(lineEdit)
 
-    leftLayout = QVBoxLayout
+    leftLayout = QVBoxLayout()
     leftLayout.addLayout(topLeftLayout)
     leftLayout.addWidget(caseCheckBox)
     leftLayout.addWidget(fromStartCheckBox)
     leftLayout.addSself.tretch(1)
 
-    mainLayout = QGridLayout
+    mainLayout = QGridLayout()
     mainLayout.setSizeConsself.traint(QLayout.SetFixedSize)
     mainLayout.addLayout(leftLayout, 0, 0)
     mainLayout.addWidget(buttonBox, 0, 1)
diff --git a/doc/codesnippets/examples/dialogs/licensewizard/licensewizard.cpp b/doc/codesnippets/examples/dialogs/licensewizard/licensewizard.cpp
index 5229acd..731bdd1 100644
--- a/doc/codesnippets/examples/dialogs/licensewizard/licensewizard.cpp
+++ b/doc/codesnippets/examples/dialogs/licensewizard/licensewizard.cpp
@@ -83,7 +83,7 @@ void LicenseWizard::showHelp()
 {
     static QString lastHelpMessage;
 
-    QString message;
+    message = ""
 
     switch (currentId()) {
     case Page_Intro:
diff --git a/doc/codesnippets/examples/dialogs/licensewizard/licensewizard.pro b/doc/codesnippets/examples/dialogs/licensewizard/licensewizard.pro
deleted file mode 100644
index fd5e37c..0000000
--- a/doc/codesnippets/examples/dialogs/licensewizard/licensewizard.pro
+++ /dev/null
@@ -1,10 +0,0 @@
-HEADERS       = licensewizard.h
-SOURCES       = licensewizard.cpp \
-                main.cpp
-RESOURCES     = licensewizard.qrc
-
-# install
-target.path = $$[QT_INSTALL_EXAMPLES]/dialogs/licensewizard
-sources.files = $$SOURCES $$HEADERS $$FORMS $$RESOURCES *.pro images
-sources.path = $$[QT_INSTALL_EXAMPLES]/dialogs/licensewizard
-INSTALLS += target sources
diff --git a/doc/codesnippets/examples/dialogs/standarddialogs/dialog.cpp b/doc/codesnippets/examples/dialogs/standarddialogs/dialog.cpp
index bf196ed..be048d6 100644
--- a/doc/codesnippets/examples/dialogs/standarddialogs/dialog.cpp
+++ b/doc/codesnippets/examples/dialogs/standarddialogs/dialog.cpp
@@ -63,9 +63,9 @@
 //! [2]
 
 //! [3]
-    QString text = QInputDialog::getText(self, self.tr("QInputDialog().getText()"),
+    text = QInputDialog::getText(self, self.tr("QInputDialog().getText()"),
                                          self.tr("User name:"), QLineEdit.Normal,
                                          QDir().home().dirName(), ok)
-    if ok and not text.isEmpty():
+    if ok and text:
         textLabel.setText(text)
 //! [3]
diff --git a/doc/codesnippets/examples/dialogs/tabdialog/tabdialog.cpp b/doc/codesnippets/examples/dialogs/tabdialog/tabdialog.cpp
new file mode 100644
index 0000000..7d7dc9f
--- /dev/null
+++ b/doc/codesnippets/examples/dialogs/tabdialog/tabdialog.cpp
@@ -0,0 +1,144 @@
+
+//! [0]
+class TabDialog (QDialog):
+    def __init__(self, fileName, parent = None):
+        QDialog.__init__(self, parent)
+        fileInfo = QFileInfo(fileName)
+
+        self.tabWidget = QTabWidget()
+        self.tabWidget.addTab(GeneralTab(fileInfo), "General")
+        self.tabWidget.addTab(PermissionsTab(fileInfo), "Permissions")
+        self.tabWidget.addTab(ApplicationsTab(fileInfo), "Applications")
+//! [0]
+
+//! [1] //! [2]
+        self.buttonBox = QDialogButtonBox(QDialogButtonBox.Ok
+//! [1] //! [3]
+                                     | QDialogButtonBox.Cancel)
+
+        self.buttonBox.accepted.connect(self.accept)
+        self.buttonBox.rejected.connect(self.reject)
+//! [2] //! [3]
+
+//! [4]
+        mainLayout = QVBoxLayout()
+        mainLayout.addWidget(tabWidget)
+        mainLayout.addWidget(buttonBox)
+        self.setLayout(mainLayout)
+//! [4]
+
+//! [5]
+        self.setWindowTitle("Tab Dialog")
+//! [5]
+
+//! [6]
+class GeneralTab (QWidget):
+    def __init__(self, fileInfo, parent = None):
+        QWidget.__init__(self, parent)
+        fileNameLabel = QLabel("File Name:")
+        fileNameEdit = QLineEdit(fileInfo.fileName())
+
+        pathLabel = QLabel("Path:")
+        pathValueLabel = QLabel(fileInfo.absoluteFilePath())
+        pathValueLabel.setFrameStyle(QFrame.Panel | QFrame.Sunken)
+
+        sizeLabel = QLabel("Size:")
+        size = fileInfo.size()/1024
+        sizeValueLabel = QLabel("%d K" % size)
+        sizeValueLabel.setFrameStyle(QFrame.Panel | QFrame.Sunken)
+
+        lastReadLabel = QLabel("Last Read:")
+        lastReadValueLabel = QLabel(fileInfo.lastRead().toString())
+        lastReadValueLabel.setFrameStyle(QFrame.Panel | QFrame.Sunken)
+
+        lastModLabel = QLabel("Last Modified:")
+        lastModValueLabel = QLabel(fileInfo.lastModified().toString())
+        lastModValueLabel.setFrameStyle(QFrame.Panel | QFrame.Sunken)
+
+        mainLayout = QVBoxLayout()
+        mainLayout.addWidget(fileNameLabel)
+        mainLayout.addWidget(fileNameEdit)
+        mainLayout.addWidget(pathLabel)
+        mainLayout.addWidget(pathValueLabel)
+        mainLayout.addWidget(sizeLabel)
+        mainLayout.addWidget(sizeValueLabel)
+        mainLayout.addWidget(lastReadLabel)
+        mainLayout.addWidget(lastReadValueLabel)
+        mainLayout.addWidget(lastModLabel)
+        mainLayout.addWidget(lastModValueLabel)
+        mainLayout.addStretch(1)
+        self.setLayout(mainLayout)
+//! [6]
+
+//! [7]
+class PermissionsTab (QWidget):
+    def __init__(self, fileInfo, parent = None):
+        QWidget.__init__(self, parent)
+        permissionsGroup = QGroupBox("Permissions")
+
+        readable = QCheckBox("Readable")
+        if fileInfo.isReadable():
+            readable.setChecked(True)
+
+        writable = QCheckBox("Writable")
+        if fileInfo.isWritable():
+            writable.setChecked(True)
+
+        executable = QCheckBox("Executable")
+        if fileInfo.isExecutable():
+            executable.setChecked(True)
+
+        ownerGroup = QGroupBox("Ownership")
+
+        ownerLabel = QLabel("Owner")
+        ownerValueLabel = QLabel(fileInfo.owner())
+        ownerValueLabel.setFrameStyle(QFrame.Panel | QFrame.Sunken)
+
+        groupLabel = QLabel("Group")
+        groupValueLabel = QLabel(fileInfo.group())
+        groupValueLabel.setFrameStyle(QFrame.Panel | QFrame.Sunken)
+
+        permissionsLayout = QVBoxLayout()
+        permissionsLayout.addWidget(readable)
+        permissionsLayout.addWidget(writable)
+        permissionsLayout.addWidget(executable)
+        permissionsGroup.setLayout(permissionsLayout)
+
+        ownerLayout = QVBoxLayout()
+        ownerLayout.addWidget(ownerLabel)
+        ownerLayout.addWidget(ownerValueLabel)
+        ownerLayout.addWidget(groupLabel)
+        ownerLayout.addWidget(groupValueLabel)
+        ownerGroup.setLayout(ownerLayout)
+
+        mainLayout = QVBoxLayout()
+        mainLayout.addWidget(permissionsGroup)
+        mainLayout.addWidget(ownerGroup)
+        mainLayout.addStretch(1)
+        self.setLayout(mainLayout)
+//! [7]
+
+//! [8]
+class ApplicationsTab (QWidget):
+    def __init__(self, fileInfo, parent = None):
+        QWidget.__init__(self, parent)
+        topLabel = QLabel("Open with:")
+
+        applicationsListBox = QListWidget()
+        applications = []
+
+        for i in range(30):
+            applications.append("Application %d" %s i)
+        applicationsListBox.insertItems(0, applications)
+
+        if fileInfo.suffix().isEmpty():
+            alwaysCheckBox = QCheckBox("Always use this application to open this type of file")
+        else:
+            alwaysCheckBox = QCheckBox("Always use this application to open files with the extension '%s'" % fileInfo.suffix())
+
+        layout = QVBoxLayout()
+        layout.addWidget(topLabel)
+        layout.addWidget(applicationsListBox)
+        layout.addWidget(alwaysCheckBox)
+        self.setLayout(layout)
+//! [8]
diff --git a/doc/codesnippets/examples/dialogs/trivialwizard/trivialwizard.cpp b/doc/codesnippets/examples/dialogs/trivialwizard/trivialwizard.cpp
index bcae8c8..cc59b36 100644
--- a/doc/codesnippets/examples/dialogs/trivialwizard/trivialwizard.cpp
+++ b/doc/codesnippets/examples/dialogs/trivialwizard/trivialwizard.cpp
@@ -113,7 +113,7 @@ def createConclusionPage(self):
 def main():
     app = QApplication(sys.argv)
 
-    translatorFileName = QLatin1String("qt_")
+    translatorFileName = "qt_"
     translatorFileName += QLocale.system().name()
     translator = QTranslator(app)
     if translator.load(translatorFileName, QLibraryInfo.location(QLibraryInfo.TranslationsPath)):
diff --git a/doc/codesnippets/examples/dialogs/trivialwizard/trivialwizard.pro b/doc/codesnippets/examples/dialogs/trivialwizard/trivialwizard.pro
deleted file mode 100644
index 970e12f..0000000
--- a/doc/codesnippets/examples/dialogs/trivialwizard/trivialwizard.pro
+++ /dev/null
@@ -1,7 +0,0 @@
-SOURCES       = trivialwizard.cpp
-
-# install
-target.path = $$[QT_INSTALL_EXAMPLES]/dialogs/trivialwizard
-sources.files = $$SOURCES $$HEADERS *.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/dialogs/trivialwizard
-INSTALLS += target sources
diff --git a/doc/codesnippets/examples/graphicsview/simpleanchorlayout/main.cpp b/doc/codesnippets/examples/graphicsview/simpleanchorlayout/main.cpp
new file mode 100644
index 0000000..b35f279
--- /dev/null
+++ b/doc/codesnippets/examples/graphicsview/simpleanchorlayout/main.cpp
@@ -0,0 +1,23 @@
+
+//! [adding a corner anchor in two steps]
+layout.addAnchor(a, Qt.AnchorTop, layout, Qt.AnchorTop)
+layout.addAnchor(a, Qt.AnchorLeft, layout, Qt.AnchorLeft)
+//! [adding a corner anchor in two steps]
+
+//! [adding a corner anchor]
+layout.addCornerAnchors(a, Qt.TopLeftCorner, layout, Qt.TopLeftCorner)
+//! [adding a corner anchor]
+
+//! [adding anchors]
+layout.addAnchor(b, Qt.AnchorLeft, a, Qt.AnchorRight)
+layout.addAnchor(b, Qt.AnchorTop, a, Qt.AnchorBottom)
+//! [adding anchors]
+
+//! [adding anchors to match sizes in two steps]
+layout.addAnchor(b, Qt.AnchorLeft, c, Qt.AnchorLeft)
+layout.addAnchor(b, Qt.AnchorRight, c, Qt.AnchorRight)
+//! [adding anchors to match sizes in two steps]
+
+//! [adding anchors to match sizes]
+layout.addAnchors(b, c, Qt.Horizontal)
+//! [adding anchors to match sizes]
diff --git a/doc/codesnippets/examples/itemviews/customsortfiltermodel/mysortfilterproxymodel.cpp b/doc/codesnippets/examples/itemviews/customsortfiltermodel/mysortfilterproxymodel.cpp
index da1c2dd..028a5e7 100644
--- a/doc/codesnippets/examples/itemviews/customsortfiltermodel/mysortfilterproxymodel.cpp
+++ b/doc/codesnippets/examples/itemviews/customsortfiltermodel/mysortfilterproxymodel.cpp
@@ -64,10 +64,10 @@ def filterAcceptsRow(self, sourceRow, sourceParent):
     index1 = sourceModel().index(sourceRow, 1, sourceParent)
     index2 = sourceModel().index(sourceRow, 2, sourceParent)
 
-    return (sourceModel().data(index0).toString().contains(filterRegExp())
-            || sourceModel().data(index1).toString().contains(filterRegExp()))
-           && dateInRange(sourceModel().data(index2).toDate())
-
+    regex = filterRegExp()
+    return (regex.indexIn(sourceModel().data(index0)) != -1
+            or regex.indexIn(sourceModel().data(index1)) != -1
+           and dateInRange(sourceModel().data(index2))
 //! [3]
 
 //! [4] //! [5]
@@ -77,20 +77,18 @@ def lessThan(self, left, right):
 //! [4]
 
 //! [6]
-    if leftData.type() == QVariant.DateTime:
-        return leftData.toDateTime() < rightData.toDateTime()
+    if isinstance(leftData, QDateTime):
+        return leftData < rightData
     else:
         emailPattern = QRegExp("([\\w\\.]*@[\\w\\.]*)")
 
-        leftString = leftData.toString()
-        if left.column() == 1 && emailPattern.indexIn(leftString) != -1:
-            leftString = emailPattern.cap(1)
+        if left.column() == 1 && emailPattern.indexIn(leftData) != -1:
+            leftData = emailPattern.cap(1)
 
-        rightString = rightData.toString()
-        if right.column() == 1 && emailPattern.indexIn(rightString) != -1:
-            rightString = emailPattern.cap(1)
+        if right.column() == 1 && emailPattern.indexIn(rightData) != -1:
+            rightData = emailPattern.cap(1)
 
-        return QString.localeAwareCompare(leftString, rightString) < 0
+        return leftString < rightString
 
 //! [5] //! [6]
 
diff --git a/doc/codesnippets/examples/mainwindows/sdi/mainwindow.cpp b/doc/codesnippets/examples/mainwindows/sdi/mainwindow.cpp
new file mode 100644
index 0000000..6e1236e
--- /dev/null
+++ b/doc/codesnippets/examples/mainwindows/sdi/mainwindow.cpp
@@ -0,0 +1,11 @@
+
+//! [implicit tr context]
+def createMenus(self):
+    fileMenu = menuBar().addMenu("&File")
+//! [implicit tr context]
+
+//! [0]
+    fileToolBar = addToolBar("File")
+    fileToolBar.addAction(newAct)
+    fileToolBar.addAction(openAct)
+//! [0]
diff --git a/doc/codesnippets/examples/sql/querymodel/editablesqlmodel.cpp b/doc/codesnippets/examples/sql/querymodel/editablesqlmodel.cpp
index b1d14de..743df78 100644
--- a/doc/codesnippets/examples/sql/querymodel/editablesqlmodel.cpp
+++ b/doc/codesnippets/examples/sql/querymodel/editablesqlmodel.cpp
@@ -68,9 +68,9 @@ def setData(self, index, value, role):
 
     ok = False
     if index.column() == 1:
-        ok = self.setFirstName(id, value.toString())
+        ok = self.setFirstName(id, value)
     else:
-        ok = self.setLastName(id, value.toString())
+        ok = self.setLastName(id, value)
     self.refresh()
     return ok
 }
diff --git a/doc/codesnippets/examples/sql/relationaltablemodel/relationaltablemodel.cpp b/doc/codesnippets/examples/sql/relationaltablemodel/relationaltablemodel.cpp
index 93c5209..b59646d 100644
--- a/doc/codesnippets/examples/sql/relationaltablemodel/relationaltablemodel.cpp
+++ b/doc/codesnippets/examples/sql/relationaltablemodel/relationaltablemodel.cpp
@@ -100,11 +100,11 @@ def main():
 
     createRelationalTables()
 
-    QSqlRelationalTableModel model
+    model = QSqlRelationalTableModel()
 
-    initializeModel(&model)
+    initializeModel(model)
 
-    view = createView(QObject.tr("Relational Table Model"), &model)
+    view = createView(QObject.tr("Relational Table Model"), model)
     view.show()
 
     return app.exec_()
diff --git a/doc/codesnippets/examples/uitools/textfinder/textfinder.cpp b/doc/codesnippets/examples/uitools/textfinder/textfinder.cpp
new file mode 100644
index 0000000..edbe222
--- /dev/null
+++ b/doc/codesnippets/examples/uitools/textfinder/textfinder.cpp
@@ -0,0 +1,131 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the examples of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtUiTools>
+#include <QtGui>
+#include "textfinder.h"
+
+//! [0]
+def __init__(self, parent = None):
+    QWidget.__init__(self. parent)
+    formWidget = self.loadUiFile()
+
+//! [1]
+    self.ui_findButton = qFindChild(QPushButton, self, "findButton")
+    self.ui_textEdit = qFindChild(QTextEdit, self, "textEdit")
+    self.ui_lineEdit = qFindChild(QLineEdit, self, "lineEdit")
+//! [0] //! [1]
+
+//! [2]
+    QMetaObject.connectSlotsByName(self)
+//! [2]
+
+//! [3a]
+    self.loadTextFile()
+//! [3a]
+
+//! [3b]
+    layout = QVBoxLayout()
+    layout.addWidget(formWidget)
+    self.setLayout(layout)
+//! [3b]
+
+//! [3c]
+    self.setWindowTitle("Text Finder")
+    self.isFirstTime = True
+//! [3c]
+
+//! [4]
+def loadUiFile(self):
+    loader = QUiLoader()
+    return loader.load(":/forms/textfinder.ui", self)
+//! [4]
+
+//! [5]
+def loadTextFile(self):
+    inputFile = QFile(":/forms/input.txt")
+    inputFile.open(QIODevice.ReadOnly)
+    in = QTextStream(inputFile)
+    line = in.readAll()
+    inputFile.close()
+
+    self.ui_textEdit.append(line)
+    self.ui_textEdit.setUndoRedoEnabled(False)
+    self.ui_textEdit.setUndoRedoEnabled(True)
+//! [5]
+
+//! [6] //! [7]
+@Slot()
+def on_findButton_clicked(self):
+    searchString = self.ui_lineEdit.text()
+    document = self.ui_textEdit.document()
+
+    found = False
+
+    if not self.isFirstTime:
+        document.undo()
+
+    if not searchString:
+        QMessageBox.information(self, "Empty Search Field",
+                "The search field is empty. Please enter a word and click Find.")
+    else:
+        highlightCursor = QTextCursor(document)
+        cursor = QTextCursor(document)
+        cursor.beginEditBlock()
+//! [6]
+        plainFormat = QTextCharFormat(highlightCursor.charFormat())
+        colorFormat = QTextCharFormat(plainFormat)
+        colorFormat.setForeground(Qt.red)
+
+        while not highlightCursor.isNull() and not highlightCursor.atEnd():
+            highlightCursor = document.find(searchString, highlightCursor, QTextDocument.FindWholeWords)
+
+            if not highlightCursor.isNull():
+                found = True
+                highlightCursor.movePosition(QTextCursor.WordRight, QTextCursor.KeepAnchor)
+                highlightCursor.mergeCharFormat(colorFormat)
+//! [8]
+        cursor.endEditBlock()
+//! [7] //! [9]
+        self.isFirstTime = False
+
+        if not found:
+            QMessageBox.information(self, "Word Not Found", "Sorry, the word cannot be found.");
+//! [8] //! [9]
diff --git a/doc/codesnippets/examples/widgets/groupbox/window.cpp b/doc/codesnippets/examples/widgets/groupbox/window.cpp
new file mode 100644
index 0000000..688f02a
--- /dev/null
+++ b/doc/codesnippets/examples/widgets/groupbox/window.cpp
@@ -0,0 +1,138 @@
+
+//! [0]
+def __init__(self, parent = None):
+    QWidget.__init__(self, parent)
+
+    grid = QGridLayout()
+    grid.addWidget(createFirstExclusiveGroup(), 0, 0)
+    grid.addWidget(createSecondExclusiveGroup(), 1, 0)
+    grid.addWidget(createNonExclusiveGroup(), 0, 1)
+    grid.addWidget(createPushButtonGroup(), 1, 1)
+    setLayout(grid)
+
+    setWindowTitle("Group Boxes")
+    resize(480, 320)
+
+//! [0]
+
+//! [1]
+def createFirstExclusiveGroup(self):
+//! [2]
+    groupBox = QGroupBox("Exclusive Radio Buttons")
+
+    radio1 = QRadioButton("&Radio button 1")
+    radio2 = QRadioButton("R&adio button 2")
+    radio3 = QRadioButton("Ra&dio button 3")
+
+    radio1.setChecked(True)
+//! [1] //! [3]
+
+    vbox = QVBoxLayout()
+    vbox.addWidget(radio1)
+    vbox.addWidget(radio2)
+    vbox.addWidget(radio3)
+    vbox.addStretch(1)
+    groupBox.setLayout(vbox)
+//! [2]
+    return groupBox
+//! [3]
+
+//! [4]
+def createSecondExclusiveGroup(self):
+    groupBox = QGroupBox("E&xclusive Radio Buttons")
+    groupBox.setCheckable(True)
+    groupBox.setChecked(False)
+//! [4]
+
+//! [5]
+    radio1 = QRadioButton("Rad&io button 1")
+    radio2 = QRadioButton("Radi&o button 2")
+    radio3 = QRadioButton("Radio &button 3")
+    radio1.setChecked(True)
+    checkBox = QCheckBox("Ind&ependent checkbox")
+    checkBox.setChecked(True)
+//! [5]
+
+//! [6]
+    vbox = QVBoxLayout()
+    vbox.addWidget(radio1)
+    vbox.addWidget(radio2)
+    vbox.addWidget(radio3)
+    vbox.addWidget(checkBox)
+    vbox.addStretch(1)
+    groupBox.setLayout(vbox)
+
+    return groupBox
+//! [6]
+
+//! [7]
+def createNonExclusiveGroup(self):
+    groupBox = QGroupBox("Non-Exclusive Checkboxes")
+    groupBox.setFlat(True)
+//! [7]
+
+//! [8]
+    checkBox1 = QCheckBox("&Checkbox 1")
+    checkBox2 = QCheckBox("C&heckbox 2")
+    checkBox2.setChecked(True)
+    tristateBox = QCheckBox("Tri-&state button")
+    tristateBox.setTristate(True)
+//! [8]
+    tristateBox.setCheckState(Qt.PartiallyChecked)
+
+//! [9]
+    vbox = QVBoxLayout()
+    vbox.addWidget(checkBox1)
+    vbox.addWidget(checkBox2)
+    vbox.addWidget(tristateBox)
+    vbox.addStretch(1)
+    groupBox.setLayout(vbox)
+
+    return groupBox
+//! [9]
+
+//! [10]
+def createPushButtonGroup(self):
+    groupBox = QGroupBox("&Push Buttons")
+    groupBox.setCheckable(True)
+    groupBox.setChecked(True)
+//! [10]
+
+//! [11]
+    pushButton = QPushButton("&Normal Button")
+    toggleButton = QPushButton("&Toggle Button")
+    toggleButton.setCheckable(True)
+    toggleButton.setChecked(True)
+    flatButton = QPushButton("&Flat Button")
+    flatButton.setFlat(True)
+//! [11]
+
+//! [12]
+    popupButton = QPushButton("Pop&up Button")
+    menu = QMenu(self)
+    menu.addAction("&First Item")
+    menu.addAction("&Second Item")
+    menu.addAction("&Third Item")
+    menu.addAction("F&ourth Item")
+    popupButton.setMenu(menu)
+//! [12]
+
+    newAction = menu.addAction("Submenu")
+    QMenu *subMenu = QMenu("Popup Submenu")
+    subMenu.addAction("Item 1")
+    subMenu.addAction("Item 2")
+    subMenu.addAction("Item 3")
+    newAction.setMenu(subMenu)
+
+//! [13]
+    vbox = QVBoxLayout()
+    vbox.addWidget(pushButton)
+    vbox.addWidget(toggleButton)
+    vbox.addWidget(flatButton)
+    vbox.addWidget(popupButton)
+    vbox.addStretch(1)
+    groupBox.setLayout(vbox)
+
+    return groupBox
+}
+//! [13]
diff --git a/doc/codesnippets/snippets/customstyle/main.cpp b/doc/codesnippets/snippets/customstyle/main.cpp
new file mode 100644
index 0000000..a1ac4ac
--- /dev/null
+++ b/doc/codesnippets/snippets/customstyle/main.cpp
@@ -0,0 +1,12 @@
+
+//! [using a custom style]
+import sys
+from PySide.QtGui import *
+
+QApplication.setStyle(CustomStyle())
+app = QApplication(sys.argv)
+spinBox = QSpinBox()
+spinBox.show()
+sys.exit(app.exec_())
+
+//! [using a custom style]
diff --git a/doc/codesnippets/snippets/phonon.cpp b/doc/codesnippets/snippets/phonon.cpp
new file mode 100644
index 0000000..950fe24
--- /dev/null
+++ b/doc/codesnippets/snippets/phonon.cpp
@@ -0,0 +1,39 @@
+
+//![0]
+music = Phonon.createPlayer(Phonon.MusicCategory, Phonon.MediaSource("/path/mysong.wav"))
+music.play()
+//![0]
+
+parentWidget = QWidget()
+url = QUrl("Myfancymusic")
+
+//![1]
+player = Phonon.VideoPlayer(Phonon.VideoCategory, parentWidget)
+player.play(url)
+//![1]
+
+//![2]
+mediaObject = Phonon.MediaObject(self)
+mediaObject.setCurrentSource(Phonon.MediaSource("/mymusic/barbiegirl.wav"))
+audioOutput = Phonon.AudioOutput(Phonon.MusicCategory, self)
+path = Phonon.createPath(mediaObject, audioOutput)
+//![2]
+
+//![3]
+effect = Phonon.Effect(Phonon.BackendCapabilities.availableAudioEffects()[0], self)
+path.insertEffect(effect)
+//![3]
+
+//![4]
+mediaObject = Phonon.MediaObject(self)
+
+videoWidget = Phonon.VideoWidget(self)
+Phonon.createPath(mediaObject, videoWidget)
+
+audioOutput = Phonon.AudioOutput(Phonon.VideoCategory, self)
+Phonon.createPath(mediaObject, audioOutput)
+//![4]
+
+//![5]
+mediaObject.play()
+//![5]
diff --git a/doc/codesnippets/snippets/phonon/samplebackend/main.cpp b/doc/codesnippets/snippets/phonon/samplebackend/main.cpp
new file mode 100644
index 0000000..555f93b
--- /dev/null
+++ b/doc/codesnippets/snippets/phonon/samplebackend/main.cpp
@@ -0,0 +1,66 @@
+
+//! [snippet]
+def createObject(self, c, parent, args):
+    if c == BackendInterface.MediaObjectClass:
+        return MediaObject(parent)
+    elif c == BackendInterface.VolumeFaderEffectClass:
+        return VolumeFaderEffect(parent)
+    elif c == BackendInterface.AudioOutputClass:
+        return AudioOutput(parent)
+    elif c == BackendInterface.AudioDataOutputClass:
+        return AudioDataOutput(parent)
+    elif c == BackendInterface.VisualizationClass:
+        return Visualization(parent)
+    elif c == BackendInterface.VideoDataOutputClass:
+        return VideoDataOutput(parent)
+    elif c == BackendInterface.EffectClass:
+        return Effect(args[0].toInt(), parent)
+    elif c == BackendInterface.VideoWidgetClass:
+        return VideoWidget(parent)
+    return None
+
+def objectDescriptionIndexes(self, type_):
+    retval = set()
+
+    if type_ == Phonon.AudioOutputDeviceType:
+        # use AudioDeviceEnumerator to list ALSA and OSS devices
+        retval.add(10000)
+        retval.add(10001)
+    elif type_ == Phonon.AudioCaptureDeviceType:
+        retval.add(20000)
+        retval.add(20001)
+    elif type_ == Phonon.VideoCaptureDeviceType:
+        retval.add(30000)
+        retval.add(30001)
+    elif type_ == Phonon.EffectType:
+        retval.add(0x7F000001)
+    return retval
+
+def objectDescriptionProperties(self, type_, index):
+    ret = {}
+    if type_ == Phonon.AudioOutputDeviceType:
+        if index == 10000:
+            ret["name"] = "internal Soundcard"
+        elif index == 10001:
+            ret["name"] = "USB Headset"
+            ret["available"] = False
+    elif type_ == Phonon.AudioCaptureDeviceType:
+        if index == 20000:
+            ret["name"] = "Soundcard"
+            ret["description"] = "first description"
+        elif index == 20001:
+            ret["name"] = "DV"
+            ret["description"] = "second description"
+    elif type_ == Phonon.VideoCaptureDeviceType:
+        elif index == 30000:
+            ret["name"] = "USB Webcam"
+            ret["description"] = "first description"
+        elif index == 30001:
+            ret["name"] = "DV"))
+            ret["description"] = "second description"
+    elif type_ == Phonon.EffectType:
+        if index == 0x7F000001:
+            ret["name"] = "Delay"
+            ret["description"] = "Simple delay effect with time, feedback and level controls."
+    return ret
+//! [snippet]
diff --git a/doc/codesnippets/snippets/textdocument-resources/main.cpp b/doc/codesnippets/snippets/textdocument-resources/main.cpp
index e8f010a..86da5e2 100644
--- a/doc/codesnippets/snippets/textdocument-resources/main.cpp
+++ b/doc/codesnippets/snippets/textdocument-resources/main.cpp
@@ -59,7 +59,7 @@ int main(int argc, char *argv[])
 
 //! [Adding a resource]
     document.addResource(QTextDocument.ImageResource,
-        QUrl("mydata://image.png"), QVariant(image))
+        QUrl("mydata://image.png"), image)
 //! [Adding a resource]
 
 //! [Inserting an image with a cursor]
diff --git a/doc/codesnippets/snippets/textdocument-resources/textdocument-resources.pro b/doc/codesnippets/snippets/textdocument-resources/textdocument-resources.pro
deleted file mode 100644
index 16181f2..0000000
--- a/doc/codesnippets/snippets/textdocument-resources/textdocument-resources.pro
+++ /dev/null
@@ -1 +0,0 @@
-SOURCES     = main.cpp
diff --git a/doc/codesnippets/webkitsnippets/qtwebkit_qwebinspector_snippet.cpp b/doc/codesnippets/webkitsnippets/qtwebkit_qwebinspector_snippet.cpp
new file mode 100644
index 0000000..c8245b6
--- /dev/null
+++ b/doc/codesnippets/webkitsnippets/qtwebkit_qwebinspector_snippet.cpp
@@ -0,0 +1,11 @@
+
+def wrapInFunction():
+//! [0]
+    # ...
+    page = QWebPage()
+    # ...
+
+    inspector = QWebInspector()
+    inspector.setPage(page)
+//! [0]
+
diff --git a/doc/codesnippets/webkitsnippets/qtwebkit_qwebview_snippet.cpp b/doc/codesnippets/webkitsnippets/qtwebkit_qwebview_snippet.cpp
new file mode 100644
index 0000000..19a6835
--- /dev/null
+++ b/doc/codesnippets/webkitsnippets/qtwebkit_qwebview_snippet.cpp
@@ -0,0 +1,31 @@
+
+def wrapInFunction():
+//! [0]
+    view.page().history()
+//! [0]
+
+
+//! [1]
+    view.page().settings()
+//! [1]
+
+
+//! [2]
+    view.triggerAction(QWebPage.Copy)
+//! [2]
+
+
+//! [3]
+    view.page().triggerPageAction(QWebPage.Stop)
+//! [3]
+
+
+//! [4]
+    view.page().triggerPageAction(QWebPage.GoBack)
+//! [4]
+
+
+//! [5]
+    view.page().triggerPageAction(QWebPage.GoForward)
+//! [5]
+
diff --git a/doc/codesnippets/webkitsnippets/simple/main.cpp b/doc/codesnippets/webkitsnippets/simple/main.cpp
new file mode 100644
index 0000000..3a90db9
--- /dev/null
+++ b/doc/codesnippets/webkitsnippets/simple/main.cpp
@@ -0,0 +1,14 @@
+
+from PySide.QtCore import *
+from PySide.QtGui import *
+from PySide.QtWebKit import *
+import sys
+
+app = QApplication(sys.argv)
+parent = None
+//! [Using QWebView]
+view = QWebView(parent)
+view.load(QUrl("http://qt.nokia.com/"))
+view.show()
+//! [Using QWebView]
+sys.exit(app.exec_())
diff --git a/doc/codesnippets/webkitsnippets/webelement/main.cpp b/doc/codesnippets/webkitsnippets/webelement/main.cpp
new file mode 100644
index 0000000..3be8a69
--- /dev/null
+++ b/doc/codesnippets/webkitsnippets/webelement/main.cpp
@@ -0,0 +1,65 @@
+
+def traverse():
+//! [Traversing with QWebElement]
+    frame.setHtml("<html><body><p>First Paragraph</p><p>Second Paragraph</p></body></html>")
+    doc = frame.documentElement()
+    body = doc.firstChild()
+    firstParagraph = body.firstChild()
+    secondParagraph = firstParagraph.nextSibling()
+//! [Traversing with QWebElement]
+
+def findButtonAndClick():
+    frame.setHtml("<form name=\"myform\" action=\"submit_form.asp\" method=\"get\">" \
+                   "<input type=\"text\" name=\"myfield\">" \
+                   "<input type=\"submit\" value=\"Submit\">" \
+                   "</form>")
+
+//! [Calling a DOM element method]
+
+    document = frame.documentElement()
+    # Assume that the document has the following structure:
+    #
+    #    <form name="myform" action="submit_form.asp" method="get">
+    #        <input type="text" name="myfield">
+    #        <input type="submit" value="Submit">
+    #    </form>
+
+    button = document.findFirst("input[type=submit]")
+    button.evaluateJavaScript("click()")
+
+//! [Calling a DOM element method]
+
+def autocomplete1():
+    document = frame.documentElement()
+//! [autocomplete1]
+    firstTextInput = document.findFirst("input[type=text]")
+    storedText = firstTextInput.attribute("value")
+//! [autocomplete1]
+
+def autocomplete2():
+    document = frame.documentElement()
+    storedText = "text"
+
+//! [autocomplete2]
+    firstTextInput = document.findFirst("input[type=text]")
+    textInput.setAttribute("value", storedText)
+//! [autocomplete2]
+
+def findAll():
+//! [FindAll]
+    document = frame.documentElement()
+    # Assume the document has the following structure:
+    #
+    #   <p class=intro>
+    #     <span>Intro</span>
+    #     <span>Snippets</span>
+    #   </p>
+    #   <p>
+    #     <span>Content</span>
+    #     <span>Here</span>
+    #   </p>
+
+//! [FindAll intro]
+    allSpans = document.findAll("span")
+    introSpans = document.findAll("p.intro span")
+//! [FindAll intro] //! [FindAll]
diff --git a/doc/codesnippets/webkitsnippets/webpage/main.cpp b/doc/codesnippets/webkitsnippets/webpage/main.cpp
new file mode 100644
index 0000000..4fa1949
--- /dev/null
+++ b/doc/codesnippets/webkitsnippets/webpage/main.cpp
@@ -0,0 +1,33 @@
+//! [0]
+class Thumbnailer (QObject):
+    def __init__(self, url):
+//! [1]
+        QObject.__init__(self)
+        self.page = QWebPage()
+        self.page.mainFrame().load(url)
+        page.loadFinished[bool].connect(self.render)
+//! [1]
+
+    finished = Signal()
+
+//! [2]
+    def render(self):
+        self.page.setViewportSize(self.page.mainFrame().contentsSize())
+        image = QImage(self.page.viewportSize(), QImage.Format_ARGB32)
+        painter = QPainter(image)
+
+        self.page.mainFrame().render(painter)
+        painter.end()
+
+        thumbnail = image.scaled(400, 400)
+        thumbnail.save("thumbnail.png")
+
+        self.finished.emit()
+//! [2]
+//! [0]
+
+app = QApplication(sys.argv)
+
+thumbnail = Thumbnailer(QUrl("http://qt.nokia.com"))
+thumbnail.finished.connect(app.quit)
+sys.exit(app.exec_())
diff --git a/doc/conf.py.in b/doc/conf.py.in
index 52f3a01..3fd1781 100644
--- a/doc/conf.py.in
+++ b/doc/conf.py.in
@@ -17,12 +17,13 @@ import sys, os
 # add these directories to sys.path here. If the directory is relative to the
 # documentation root, use os.path.abspath to make it absolute, like shown here.
 sys.path.append('@CMAKE_CURRENT_SOURCE_DIR@')
+sys.path.append('@pyside_BINARY_DIR@')
 
 # -- General configuration -----------------------------------------------------
 
 # Add any Sphinx extension module names here, as strings. They can be extensions
 # coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
-extensions = ['sphinx.ext.todo', 'sphinx.ext.graphviz', 'inheritance_diagram']
+extensions = ['sphinx.ext.todo', 'sphinx.ext.graphviz', 'inheritance_diagram', 'pysideinclude']
 
 rst_epilog = """
 .. |project| replace:: PySide
@@ -42,7 +43,7 @@ master_doc = 'contents'
 
 # General information about the project.
 project = u'PySide'
-copyright = u'2009-2010, Nokia Corporation'
+copyright = u'2009-2011, Nokia Corporation'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
@@ -51,7 +52,7 @@ copyright = u'2009-2010, Nokia Corporation'
 # The short X.Y version.
 version = '@BINDING_API_VERSION@'
 # The full version, including alpha/beta/rc tags.
-release = '@BINDING_API_VERSION@'
+release = '@BINDING_API_VERSION_FULL@'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
@@ -68,7 +69,7 @@ release = '@BINDING_API_VERSION@'
 
 # List of directories, relative to source directory, that shouldn't be searched
 # for source files.
-exclude_trees = ['_build']
+exclude_trees = ['_build', 'extras']
 
 # The reST default role (used for this markup: `text`) to use for all documents.
 #default_role = None
@@ -125,7 +126,7 @@ html_theme_path = ['@CMAKE_CURRENT_SOURCE_DIR@/_themes']
 # Add any paths that contain custom static files (such as style sheets) here,
 # relative to this directory. They are copied after the builtin static files,
 # so a file named "default.css" will overwrite the builtin "default.css".
-html_static_path = ['@CMAKE_CURRENT_SOURCE_DIR@/_static']
+#html_static_path = ['@CMAKE_CURRENT_SOURCE_DIR@/_static']
 
 # If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
 # using the given strftime format.
@@ -154,6 +155,8 @@ html_split_index = False
 # If true, links to the reST sources are added to the pages.
 html_show_sourcelink = False
 
+html_add_permalinks = True
+
 # If true, an OpenSearch description file will be output, and all pages will
 # contain a <link> tag referring to it.  The value of this option must be the
 # base URL from which the finished HTML is served.
diff --git a/doc/contents.rst b/doc/contents.rst
index aa2b645..c2ea806 100644
--- a/doc/contents.rst
+++ b/doc/contents.rst
@@ -4,17 +4,27 @@ PySide Documentation contents
 .. toctree::
     :maxdepth: 2
 
-    howto-build/index.rst
-    generatingdocs.rst
-    issuesdiff.rst
-    dbus.rst
-
     modules.rst
 
-Indices and tables
-==================
+Tutorials
+=========
+
+.. toctree::
+    :maxdepth: 2
+
+    tutorials/index.rst
+
+Other stuff
+===========
+
+.. toctree::
+    :maxdepth: 1
+
+    pysideapi2.rst
+    pysideversion.rst
+
+Module Index
+============
 
-* :ref:`genindex`
 * :ref:`modindex`
-* :ref:`search`
 
diff --git a/doc/dbus.rst b/doc/dbus.rst
deleted file mode 100644
index 0e57d0b..0000000
--- a/doc/dbus.rst
+++ /dev/null
@@ -1,30 +0,0 @@
-DBUS integration
-****************
-
-To get PySide and DBus working toghether you can use the glib mainloop integration already done in pydbus.
-
-The example above show how to export Qt objects to python and emit an DBus signal when a Qt signal is emited.  The code comments explains what you need to know about PySide and dbus, any doubts, see the python-dbus help.
-
-DBUS Client
------------
-
-.. literalinclude:: codesnippets/examples/dbus/example-client.py
-
-
-DBUS Server
------------
-
-.. literalinclude:: codesnippets/examples/dbus/example-server.py
-
-
-Running the example
--------------------
-
-Copy the client code to a file called ``example-client.py`` and the server to a file called ``example-server.py`` and type:
-
-::
-
-    $ python example-server.py &
-    $ python example-client.py
-
-A litle window should appear on screen. Click on the button to emit a Qt signal, this signal will be converted to a DBus signal that will be caught by our dbus client. That's all.
diff --git a/doc/extras/PySide.QtCore.ClassInfo.rst b/doc/extras/PySide.QtCore.ClassInfo.rst
new file mode 100644
index 0000000..39edf3f
--- /dev/null
+++ b/doc/extras/PySide.QtCore.ClassInfo.rst
@@ -0,0 +1,23 @@
+.. module:: PySide.QtCore
+.. _ClassInfo:
+
+ClassInfo
+*********
+
+This class is used to associates extra information to the class, which is available
+using QObject.metaObject(). Qt and PySide doesn't use this information.
+
+The extra information takes the form of a dictionary with key and value in a literal string.
+
+.. note:: This Class is a implementation of Q_CLASSINFO macro.
+   
+
+Example
+-------
+
+::
+
+    @ClassInfo(Author='PySide Team', URL='http://www.pyside.org')
+    class MyObject(QObject):
+        ...
+
diff --git a/doc/extras/PySide.QtCore.Signal.rst b/doc/extras/PySide.QtCore.Signal.rst
new file mode 100644
index 0000000..b4c4e36
--- /dev/null
+++ b/doc/extras/PySide.QtCore.Signal.rst
@@ -0,0 +1,39 @@
+.. module:: PySide.QtCore
+.. _Signal:
+
+Signal
+******
+
+Synopsis
+--------
+
+Functions
+^^^^^^^^^
+
++---------------------------------------------------------------------------------------------+
+|def :meth:`connect<Signal.connect>` (receiver)                                               |
++---------------------------------------------------------------------------------------------+
+|def :meth:`disconnect<Signal.disconnect>` (receiver)                                         |
++---------------------------------------------------------------------------------------------+
+|def :meth:`emit<Signal.disconnect>` (\*args)                                                 |
++---------------------------------------------------------------------------------------------+
+
+Detailed Description
+--------------------
+
+    The :class:`~.Signal` class provides a way to declare and connect Qt signals in a pythonic way.
+
+    PySide adopt PyQt's new signal and slot syntax as-is. The PySide implementation is functionally compatible with the PyQt 4.5 one, with the exceptions listed bellow.
+
+.. method:: Signal.connect(receiver[, type=Qt.AutoConnection])
+
+    Create a connection between this signal and a `receiver`, the `receiver` can be a Python callable, a :class:`Slot` or a :class:`Signal`.
+
+.. method:: Signal.disconnect(receiver)
+
+    Disconnect this signal from a `receiver`, the `receiver` can be a Python callable, a :class:`Slot` or a :class:`Signal`.
+
+.. method:: Signal.emit(*args)
+
+    `args` is the arguments to pass to any connected slots, if any.
+
diff --git a/doc/extras/PySide.QtCore.Slot.rst b/doc/extras/PySide.QtCore.Slot.rst
new file mode 100644
index 0000000..307c229
--- /dev/null
+++ b/doc/extras/PySide.QtCore.Slot.rst
@@ -0,0 +1,39 @@
+.. module:: PySide.QtCore
+.. _Slot:
+
+Slot
+****
+
+Detailed Description
+--------------------
+
+    PySide adopt PyQt's new signal and slot syntax as-is. The PySide
+    implementation is functionally compatible with the PyQt 4.5 one, with the
+    exceptions listed bellow.
+
+    PyQt's new signal and slot style utilizes method and decorator names
+    specific to their implementation. These will be generalized according to
+    the table below:
+
+    =======  ======================  =============
+    Module   PyQt factory function   PySide class
+    =======  ======================  =============
+    QtCore   pyqtSignal              Signal
+    QtCore   pyqtSlot                Slot
+    =======  ======================  =============
+
+Q_INVOKABLE
+-----------
+
+    PySide doesn't offer something identical to Q_INVOKABLE macro of Qt, the
+    reason is simple, PySide slots can have return values, so if you need to
+    create a invokable method that returns some value, declare it as a slot,
+    e.g.:
+
+    ::
+
+        class Foo(QObject):
+
+            @Slot(result=int, float)
+            def getFloatReturnInt(self, f):
+                return int(f)
diff --git a/doc/extras/PySide.QtCore.rst b/doc/extras/PySide.QtCore.rst
new file mode 100644
index 0000000..f9e05d2
--- /dev/null
+++ b/doc/extras/PySide.QtCore.rst
@@ -0,0 +1,5 @@
+All other Qt modules rely on this module. To include the definitions of the module's classes, use the following directive:
+
+::
+
+    import PySide.QtCore
diff --git a/doc/extras/PySide.QtDeclarative.ListProperty.rst b/doc/extras/PySide.QtDeclarative.ListProperty.rst
new file mode 100644
index 0000000..dcbd57f
--- /dev/null
+++ b/doc/extras/PySide.QtDeclarative.ListProperty.rst
@@ -0,0 +1,46 @@
+.. module:: PySide.QtDeclarative
+.. _ListProperty:
+
+ListProperty
+************
+
+Synopsis
+--------
+
+    The The :class:`~.ListProperty` class allows applications to expose list-like properties to QML.
+
+Detailed Description
+--------------------
+
+    The :class:`~.ListProperty` class provides a replacement to QDeclarativeListProperty.
+
+    :class:`~.ListProperty` is a subclass of :class:`QtCore.Property`, that support the following keywords.
+
+    `type`      the type used in the list
+    `append`    Function used to append itens
+    `at`        Function used to retrieve item from the list
+    `clear`     Function used to clear the list
+    `count`     Function used to retrieve the list size
+
+
+    QML has many list properties, where more than one object value can be assigned. The use of a list property from QML looks like this:
+
+    ::
+        FruitBasket {
+             fruit: [
+                 Apple {},
+                 Orange{},
+                 Banana{}
+             ]
+        }
+
+    The :class:`~.ListProperty` encapsulates a group of callbacks that represent the set of actions QML can perform on the list - adding items, retrieving items and clearing the list. In the future, additional operations may be supported. All list properties must implement the append operation, but the rest are optional.
+    To provide a list property, a class must implement the operation callbacks, and then return an appropriate value from the property getter. List properties should have no setter. In the example above, the  ListProperty declarative will look like this:
+
+    ::
+        slices = ListProperty(PieSlice, append=appendSlice)
+
+
+    Note: :class:`~.ListProperty` can only be used for lists of QObject-derived object pointers.
+
+
diff --git a/doc/extras/PySide.QtDeclarative.rst b/doc/extras/PySide.QtDeclarative.rst
new file mode 100644
index 0000000..4b94adc
--- /dev/null
+++ b/doc/extras/PySide.QtDeclarative.rst
@@ -0,0 +1,5 @@
+To include the definitions of the module's classes, use the following directive:
+
+::
+
+    import PySide.QtDeclarative
diff --git a/doc/extras/PySide.QtGui.rst b/doc/extras/PySide.QtGui.rst
new file mode 100644
index 0000000..f575c2f
--- /dev/null
+++ b/doc/extras/PySide.QtGui.rst
@@ -0,0 +1,7 @@
+To include the definitions of modules classes, use the following directive:
+
+::
+
+    import PySide.QtGui
+
+.. seealso:: :mod:`PySide.QtCore`
diff --git a/doc/extras/PySide.QtHelp.rst b/doc/extras/PySide.QtHelp.rst
new file mode 100644
index 0000000..9fa7442
--- /dev/null
+++ b/doc/extras/PySide.QtHelp.rst
@@ -0,0 +1,24 @@
+To include the definitions of the module's classes, use the following directive:
+
+::
+
+    import PySide.QtHelp
+
+License Information
+-------------------
+
+The QtHelp module uses the CLucene indexing library to provide full-text searching capabilities for Qt Assistant and applications that use the features of QtHelp.
+
+Qt Commercial Edition licensees that wish to distribute applications that use these features of the QtHelp module need to be aware of their obligations under the GNU Lesser General Public License (LGPL).
+
+Developers using the Open Source Edition can choose to redistribute the module under the appropriate version of the GNU LGPL; version 2.1 for applications and libraries licensed under the GNU GPL version 2, or version 3 for applications and libraries licensed under the GNU GPL version 3.
+
+Copyright (C) 2003-2006 Ben van Klinken and the CLucene Team
+
+Changes are Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+
+This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version.
+
+This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
diff --git a/doc/extras/PySide.QtMultimedia.rst b/doc/extras/PySide.QtMultimedia.rst
new file mode 100644
index 0000000..540a706
--- /dev/null
+++ b/doc/extras/PySide.QtMultimedia.rst
@@ -0,0 +1,7 @@
+To include the definitions of the module's classes, use the following directive:
+
+::
+
+    import PySide.QtMultimedia
+
+
diff --git a/doc/extras/PySide.QtNetwork.rst b/doc/extras/PySide.QtNetwork.rst
new file mode 100644
index 0000000..44249d3
--- /dev/null
+++ b/doc/extras/PySide.QtNetwork.rst
@@ -0,0 +1,5 @@
+To include the definitions of the module's classes, use the following directive:
+
+::
+
+    import PySide.QtNetwork
diff --git a/doc/extras/PySide.QtOpenGL.rst b/doc/extras/PySide.QtOpenGL.rst
new file mode 100644
index 0000000..1758ee0
--- /dev/null
+++ b/doc/extras/PySide.QtOpenGL.rst
@@ -0,0 +1,14 @@
+OpenGL is a standard API for rendering 3D graphics. OpenGL only deals with 3D rendering and provides little or no support for GUI programming issues. The user interface for an OpenGL application must be created with another toolkit, such as Motif on the X platform, Microsoft Foundation Classes (MFC) under Windows, or Qt on both platforms.
+
+.. note:: OpenGL is a trademark of Silicon Graphics, Inc. in the United States and other countries.
+
+The Qt OpenGL module makes it easy to use OpenGL in Qt applications. It provides an OpenGL widget class that can be used just like any other Qt widget, except that it opens an OpenGL display buffer where you can use the OpenGL API to render the contents.
+To include the definitions of the module's classes, use the following directive:
+
+::
+
+    import PySide.QtOpenGL
+
+The Qt OpenGL module is implemented as a platform-independent wrapper around the platform-dependent GLX (version 1.3 or later), WGL, or AGL C APIs. Although the basic functionality provided is very similar to Mark Kilgard's GLUT library, applications using the Qt OpenGL module can take advantage of the whole Qt API for non-OpenGL-specific GUI functionality.
+
+The QtOpenGL module is available on Windows, X11 and Mac OS X. Qt for Embedded Linux and OpenGL supports OpenGL ES (OpenGL for Embedded Systems).
\ No newline at end of file
diff --git a/doc/extras/PySide.QtScript.rst b/doc/extras/PySide.QtScript.rst
new file mode 100644
index 0000000..00488cb
--- /dev/null
+++ b/doc/extras/PySide.QtScript.rst
@@ -0,0 +1,21 @@
+The QtScript module only provides core scripting facilities; the QtScriptTools module provides additional Qt Script-related components that application developers may find useful.
+
+To include the definitions of the module's classes, use the following directive:
+
+::
+
+    import PySide.QtScript
+
+License Information
+-------------------
+
+Qt Commercial Edition licensees that wish to distribute applications that use the QtScript module need to be aware of their obligations under the GNU Library General Public License (LGPL).
+
+Developers using the Open Source Edition can choose to redistribute the module under the appropriate version of the GNU LGPL.
+QtScript is licensed under the GNU Library General Public License. Individual contributor names and copyright dates can be found inline in the code.
+
+This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.
+
+This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public License for more details.
+
+You should have received a copy of the GNU Library General Public License along with this library; see the file COPYING.LIB. If not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/doc/extras/PySide.QtScriptTools.rst b/doc/extras/PySide.QtScriptTools.rst
new file mode 100644
index 0000000..c3f6907
--- /dev/null
+++ b/doc/extras/PySide.QtScriptTools.rst
@@ -0,0 +1,5 @@
+Applications that use the Qt Script Tools classes need to be configured to be built against the QtScriptTools module. To include the definitions of the module's classes, use the following directive:
+
+::
+
+    import PySide.QtScriptTools
diff --git a/doc/extras/PySide.QtSql.rst b/doc/extras/PySide.QtSql.rst
new file mode 100644
index 0000000..41c1794
--- /dev/null
+++ b/doc/extras/PySide.QtSql.rst
@@ -0,0 +1,5 @@
+To include the definitions of the module's classes, use the following directive:
+
+::
+
+    import PySide.QtSql
diff --git a/doc/extras/PySide.QtSvg.rst b/doc/extras/PySide.QtSvg.rst
new file mode 100644
index 0000000..b106452
--- /dev/null
+++ b/doc/extras/PySide.QtSvg.rst
@@ -0,0 +1,16 @@
+To include the definitions of the module's classes, use the following directive:
+
+::
+
+    import PySide.QtSvg
+
+License Information
+-------------------
+
+Some code for arc handling in this module is derived from code with the following license:
+
+Copyright 2002 USC/Information Sciences Institute
+
+Permission to use, copy, modify, distribute, and sell this software and its documentation for any purpose is hereby granted without fee, provided that the above copyright notice appear in all copies and that both that copyright notice and this permission notice appear in supporting documentation, and that the name of Information Sciences Institute not be used in advertising or publicity pertaining to distribution of the software without specific, written prior permission. Information Sciences Institute makes no representations about the suitability of this software for any purpose. It is provided "as is" without express or implied warranty.
+
+INFORMATION SCIENCES INSTITUTE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL INFORMATION SCIENCES INSTITUTE BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
diff --git a/doc/extras/PySide.QtTest.rst b/doc/extras/PySide.QtTest.rst
new file mode 100644
index 0000000..d5963cb
--- /dev/null
+++ b/doc/extras/PySide.QtTest.rst
@@ -0,0 +1,7 @@
+To include the definitions of the module's classes, use the following directive:
+
+::
+
+    import PySide.QtTest
+
+.. note:: All macros in the C++ version of QtTest were not binded in PySide, this module is useful only for GUI testing and benchmarking, for ordinary unit testing you should use the ``unittest`` Python module.
diff --git a/doc/extras/PySide.QtUiTools.rst b/doc/extras/PySide.QtUiTools.rst
new file mode 100644
index 0000000..c8558f2
--- /dev/null
+++ b/doc/extras/PySide.QtUiTools.rst
@@ -0,0 +1,9 @@
+These forms are processed at run-time to produce dynamically-generated user interfaces. In order to generate a form at run-time, a resource file containing a UI file is needed.
+
+A form loader object, provided by the QUiLoader class, is used to construct the user interface. This user interface can be retrieved from any QIODevice; for example, a QFile object can be used to obtain a form stored in a project's resources. The :meth:`PySide.QtUiTools.QUiLoader.load` function takes the user interface description contained in the file and constructs the form widget.
+
+To include the definitions of the module's classes, use the following directive:
+
+::
+
+    import PySide..QtUiTools
diff --git a/doc/extras/PySide.QtWebKit.rst b/doc/extras/PySide.QtWebKit.rst
new file mode 100644
index 0000000..7a165be
--- /dev/null
+++ b/doc/extras/PySide.QtWebKit.rst
@@ -0,0 +1,94 @@
+QtWebKit provides a Web browser engine that makes it easy to embed content from the World Wide Web into your Qt application. At the same time Web content can be enhanced with native controls.
+
+QtWebKit provides facilities for rendering of HyperText Markup Language (HTML), Extensible HyperText Markup Language (XHTML) and Scalable Vector Graphics (SVG) documents, styled using Cascading Style Sheets (CSS) and scripted with JavaScript.
+
+A bridge between the JavaScript execution environment and the Qt object model makes it possible for custom QObjects to be scripted. Integration with the Qt networking module enables Web pages to be transparently loaded from Web servers, the local file system or even the Qt resource system.
+
+In addition to providing pure rendering features, HTML documents can be made fully editable to the user through the use of the contenteditable attribute on HTML elements.
+
+QtWebKit is based on the Open Source WebKit engine. More information about WebKit itself can be found on the _`WebKit Open Source Project <http://webkit.org/>` Web site.
+
+Including In Your Project
+-------------------------
+
+To include the definitions of the module's classes, use the following directive:
+
+::
+
+    import PySide.QtWebKit
+
+
+.. note:: Web site icons, also known as "FavIcons", are currently not supported on Windows. We plan to address this in a future release.
+
+Architecture
+------------
+
+The easiest way to render content is through the QWebView class. As a widget it can be embedded into your forms or a graphics view, and it provides convenience functions for downloading and rendering web sites.
+
+::
+
+    view = QWebView(parent)
+    view.load(QUrl("http://qt.nokia.com/"))
+    view.show()
+
+QWebView is used to view Web pages. An instance of QWebView has one QWebPage. QWebPage provides access to the document structure in a page, describing features such as frames, the navigation history, and the undo/redo stack for editable content.
+
+HTML documents can be nested using frames in a frameset. An individual frame in HTML is represented using the QWebFrame class. This class includes the bridge to the JavaScript window object and can be painted using QPainter. Each QWebPage has one QWebFrame object as its main frame, and the main frame may contain many child frames.
+
+Individual elements of an HTML document can be accessed via DOM JavaScript interfaces from within a web page. The equivalent of this API in QtWebKit is represented by QWebElement. QWebElement objects are obtained using QWebFrame's findAllElements() and findFirstElement() functions with CSS selector queries.
+
+Common web browser features, defaults and other settings can be configured through the QWebSettings class. It is possible to provide defaults for all QWebPage instances through the default settings. Individual attributes can be overidden by the page specific settings object.
+
+Netscape Plugin Support
+-----------------------
+
+.. note:: Netscape plugin support is only available on desktop platforms.
+
+Since WebKit supports the Netscape Plugin API, Qt applications can display Web pages that embed common plugins on platforms for which those plugins are available. To enable plugin support, the user must have the appropriate binary files for those plugins installed and the ``QWebSettings.PluginsEnabled`` attribute must be enabled for the application.
+
+The following locations are searched for plugins:
+
+* Linux/Unix (X11)
+    * .mozilla/plugins in the user's home directory
+    * .netscape/plugins in the user's home directory
+    * System locations, such as
+        * /usr/lib/browser/plugins
+        * /usr/local/lib/mozilla/plugins
+        * /usr/lib/firefox/plugins
+        * /usr/lib64/browser-plugins
+        * /usr/lib/browser-plugins
+        * /usr/lib/mozilla/plugins
+        * /usr/local/netscape/plugins
+        * /opt/mozilla/plugins
+        * /opt/mozilla/lib/plugins
+        * /opt/netscape/plugins
+        * /opt/netscape/communicator/plugins
+        * /usr/lib/netscape/plugins
+        * /usr/lib/netscape/plugins-libc5
+        * /usr/lib/netscape/plugins-libc6
+        * /usr/lib64/netscape/plugins
+        * /usr/lib64/mozilla/plugins
+    * Locations specified by environment variables:
+        * $MOZILLA_HOME/plugins
+        * $MOZ_PLUGIN_PATH
+        * $QTWEBKIT_PLUGIN_PATH
+* Windows
+    * The user's Application Data\Mozilla\plugins directory
+    * Standard system locations of plugins for Quicktime, Flash, etc.
+* Mac OS X
+    * Library/Internet Plug-Ins in the user's home directory
+    * The system /Library/Internet Plug-Ins directory
+
+License Information
+-------------------
+
+Qt Commercial Edition licensees that wish to distribute applications that use the QtWebKit module need to be aware of their obligations under the GNU Library General Public License (LGPL).
+
+Developers using the Open Source Edition can choose to redistribute the module under the appropriate version of the GNU LGPL.
+WebKit is licensed under the GNU Library General Public License. Individual contributor names and copyright dates can be found inline in the code.
+
+This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.
+
+This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public License for more details.
+
+You should have received a copy of the GNU Library General Public License along with this library; see the file COPYING.LIB. If not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
\ No newline at end of file
diff --git a/doc/extras/PySide.QtXml.rst b/doc/extras/PySide.QtXml.rst
new file mode 100644
index 0000000..ba69e50
--- /dev/null
+++ b/doc/extras/PySide.QtXml.rst
@@ -0,0 +1,5 @@
+To include the definitions of the module's classes, use the following directive:
+
+::
+
+    import PySide.QtXml
diff --git a/doc/extras/PySide.QtXmlPatterns.rst b/doc/extras/PySide.QtXmlPatterns.rst
new file mode 100644
index 0000000..0431aaf
--- /dev/null
+++ b/doc/extras/PySide.QtXmlPatterns.rst
@@ -0,0 +1,35 @@
+To include the definitions of the module's classes, use the following directive:
+
+::
+
+    import PySide.QtXmlPatterns
+
+Further Reading
+---------------
+
+General overviews of XQuery and XSchema can be found in the XQuery document.
+
+An introduction to the XQuery language can be found in A Short Path to XQuery.
+
+License Information
+-------------------
+
+The XML Schema implementation provided by this module contains the xml.xsd file (located in src/xmlpatterns/schema/schemas) which is licensed under the terms given below. This module is always built with XML Schema support enabled.
+
+W3C© SOFTWARE NOTICE AND LICENSE
+
+This license came from: http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231
+
+This work (and included software, documentation such as READMEs, or other related items) is being provided by the copyright holders under the following license. By obtaining, using and/or copying this work, you (the licensee) agree that you have read, understood, and will comply with the following terms and conditions.
+
+Permission to copy, modify, and distribute this software and its documentation, with or without modification, for any purpose and without fee or royalty is hereby granted, provided that you include the following on ALL copies of the software and documentation or portions thereof, including modifications:
+
+* The full text of this NOTICE in a location viewable to users of the redistributed or derivative work.
+* Any pre-existing intellectual property disclaimers, notices, or terms and conditions. If none exist, the W3C Software Short Notice should be included (hypertext is preferred, text is permitted) within the body of any redistributed or derivative code.
+* Notice of any changes or modifications to the files, including the date changes were made. (We recommend you provide URIs to the location from which the code is derived.)
+
+THIS SOFTWARE AND DOCUMENTATION IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE SOFTWARE OR DOCUMENTATION WILL NOT INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS.
+
+COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR DOCUMENTATION.
+
+The name and trademarks of copyright holders may NOT be used in advertising or publicity pertaining to the software without specific, written prior permission. Title to copyright in this software and any associated documentation will at all times remain with copyright holders.
diff --git a/doc/extras/PySide.phonon.rst b/doc/extras/PySide.phonon.rst
new file mode 100644
index 0000000..0a9c21c
--- /dev/null
+++ b/doc/extras/PySide.phonon.rst
@@ -0,0 +1,34 @@
+Phonon is a cross-platform multimedia framework that enables the use of audio and video content in Qt applications. The Phonon Overview document provides an introduction to the architecture and features included in Phonon. The Phonon namespace contains a list of all classes, functions and namespaces provided by the module.
+
+To include the definitions of modules classes, use the following directive:
+
+::
+
+    import PySide.phonon
+
+Qt Backends
+-----------
+
+Qt Backends are currently developed for Phonon version 4.1. The Phonon project has moved on and introduced new features that the Qt Backends do not implement. We have chosen not to document the part of Phonon that we do not support. Any class or function not appearing in our documentation can be considered unsupported.
+
+License Information
+-------------------
+
+Qt Commercial Edition licensees that wish to distribute applications that use the Phonon module need to be aware of their obligations under the GNU Lesser General Public License (LGPL).
+
+Developers using the Open Source Edition can choose to redistribute the module under the appropriate version of the GNU LGPL; version 2.1 for applications and libraries licensed under the GNU GPL version 2, or version 3 for applications and libraries licensed under the GNU GPL version 3.
+
+This file is part of the KDE project
+
+* Copyright (C) 2004-2009 Matthias Kretz <kretz@kde.org>
+* Copyright (C) 2008 Ian Monroe <ian@monroe.nu>
+* Copyright (C) 2007-2008 Trolltech ASA
+* Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+
+Contact: Nokia Corporation (qt-info@nokia.com)
+
+This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public License version 2 as published by the Free Software Foundation.
+
+This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public License for more details.
+
+You should have received a copy of the GNU Library General Public License along with this library; see the file COPYING.LIB. If not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/doc/generatingdocs.rst b/doc/generatingdocs.rst
deleted file mode 100644
index 666df81..0000000
--- a/doc/generatingdocs.rst
+++ /dev/null
@@ -1,42 +0,0 @@
-How to generate this documentation
-**********************************
-
-Pre-requisites
---------------
-
-You will need:
-
-1. Qt4 source code (for API documentation).
-2. Generator runner with shiboken plugin
-3. PySide source code
-4. cmake
-5. sphinx
-6. graphviz
-
-Extracting documentation from Qt4
----------------------------------
-
-The API documentation is generated from source code comments (for now, just
-``qdoc3`` tool is supported, ``doxygen`` support will be added soon).
-
-``qdoc3`` is the tool used to generate the oficial Qt4 documentation, you will
-use it to generate a bunch of XML files that will be used by the generator
-to create the documentation.
-
-You need to tell PySide where it can find the Qt source code, to do this, when running cmake add the following parameters:
-
-::
-
-    $ mkdir build
-    $ cmake -DQT_SRC_DIR=PATH_TO_QT_SOURCE_DIR ..
-    $ make apidoc
-    $ make apidocinstall
-
-Where:
-    * *PATH_TO_QT_SOURCE_DIR* is the path to the Qt sources.
-
-The documentation will be installed at ``<INSTALL_PREFIX>/share/doc/pyside/index.html``, change
-the *CMAKE_INSTALL_PREFIX* value if you want to install the documentation in another
-directory.
-
-If you want to have inheritance graphs on the generated documentation, make sure you have the bindings installed before generate the documentation.
diff --git a/doc/howto-build/cmake-primer.rst b/doc/howto-build/cmake-primer.rst
deleted file mode 100644
index 6d9224c..0000000
--- a/doc/howto-build/cmake-primer.rst
+++ /dev/null
@@ -1,72 +0,0 @@
-
-.. _cmake-primer:
-
-************
-CMake primer
-************
-
-This chapter is a basic introduction to CMake, the build system used by PySide
-and the bindings generator.
-
-The practical steps will focus on how to use CMake on a Unix-like (GNU/Linux)
-environment.
-
-
-Configuring
-===========
-
-Project file - CMakeLists.txt
------------------------------
-
-CMake parses the file CMakeLists.txt for information about the project,
-like project name, dependencies, what should be compiled, what should be
-shipped, and so on.
-
-
-CMake variables
----------------
-
-CMake can have its default behavior modified by providing some options in the command line:
-
-* ``CMAKE_INSTALL_PREFIX=<some path here>`` sets the install prefix to
-  the specified path.
-* ``CMAKE_MODULE_PATH=<some path here>`` sets the extra directories
-  where CMake will try to find its modules.
-* ``CMAKE_TOOLCHAIN_FILE=<file path>`` sets the path to the file that
-  describes the toolchain used to compile this project. It is very useful
-  when using CMake with `Icecream <http://en.opensuse.org/Icecream>`_ to speed up compilation.
-
-You can define a variable using the ``-D<VARIABLE>`` switch like the example
-below.
-
-* ``-DCMAKE_BUILD_TYPE=Release|Debug`` sets the building behavior. Default
-  value is Release.
-
-Invoking CMake
---------------
-
-After writing the CMakeLists.txt and deciding which flags will be used,
-you can invoke CMake using::
-
-  cmake <CMake flags> <path to toplevel CMakeLists.txt file>
-
-For example, if you use the ``build/`` folder to build the project and
-want it to be installed into ``/opt/sandbox/``, use the following lines::
-
-  cd build/
-  cmake -DCMAKE_INSTALL_PREFIX=/opt/sandbox ..
-
-CMake will process the project file and write the output files in the
-current directory.
-
-Building
-========
-
-After the configuration process, the Makefiles are written and you can build
-the project using :program:`make`.
-
-Installing
-==========
-
-As in the building process, :program:`make install` will install the files into
-the target directory.
diff --git a/doc/howto-build/index.rst b/doc/howto-build/index.rst
deleted file mode 100644
index e8d1cd1..0000000
--- a/doc/howto-build/index.rst
+++ /dev/null
@@ -1,19 +0,0 @@
-.. PySide documentation master file, created by sphinx-quickstart on Fri Mar  6 11:45:08 2009.
-   You can adapt this file completely to your liking, but it should at least
-   contain the root `toctree` directive.
-
-Getting started with PySide
-===========================
-
-Contents:
-
-.. toctree::
-   :maxdepth: 2
-
-   cmake-primer
-   setup-apiextractor
-   setup-generator
-   shiboken
-   setup-bindings
-
-
diff --git a/doc/howto-build/setup-apiextractor.rst b/doc/howto-build/setup-apiextractor.rst
deleted file mode 100644
index 18f5d4d..0000000
--- a/doc/howto-build/setup-apiextractor.rst
+++ /dev/null
@@ -1,52 +0,0 @@
-
-.. _api-extractor:
-
-**************
-API Extractor
-**************
-
-Overview
-========
-
-The **API Extractor** library is used by the bindings generator to
-parse the header and typesystem files to create an internal
-representation of the API. It is based on the
-`QtScriptGenerator <http://labs.trolltech.com/page/Projects/QtScript/Generator>`_
-codebase.
-
-Getting the sources
-===================
-
-* Download URL: http://www.pyside.org/downloads/
-
-Build requirements
-==================
-
-+ CMake >= 2.6.0
-+ Qt4.5 libraries and development headers >= 4.5
-+ libxml2 libraries and development headers >= 2.6.32
-+ libxslt libraries and development headers >= 1.1.19
-
-Building and installing
-=======================
-
-To build and install just follow the generic CMake instructions in section
-:ref:`cmake-primer`.
-
-Debian packaging
-================
-
-In order to compile this package in a Debian environment, make sure the
-following packages are installed:
-
-* debhelper (>= 7)
-* cmake (>= 2.6.0)
-* libqt4-dev (>= 4.5)
-* libxml2-dev
-* libxslt1-dev
-* pkg-config
-* python-sphinx
-
-And then you can build the package using::
-
-  $ dpkg-buildpackage -rfakeroot
diff --git a/doc/howto-build/setup-bindings.rst b/doc/howto-build/setup-bindings.rst
deleted file mode 100644
index 87feec9..0000000
--- a/doc/howto-build/setup-bindings.rst
+++ /dev/null
@@ -1,82 +0,0 @@
-***************
-Qt 4.6 Bindings
-***************
-
-Overview
-========
-
-These bindings allow access of Qt 4.6 libraries as Python modules,
-making them available just using the ``import`` command.
-
-The build process is comprised of two stages: in a first moment the
-bindings source code are created from the Qt 4.6 headers by calling
-the :ref:`generator-runner` with apropriate parameters; the
-generated files are then compiled and linked together to form the
-bindings libraries.
-
-The bindings available at the moment are listed below:
-
-   + QtCore
-   + QtGui
-   + QtHelp
-   + QtMultimedia
-   + QtNetwork
-   + QtOpenGL
-   + QtScript
-   + QtScriptTools
-   + QtSql
-   + QtSvg
-   + QtUiTools
-   + QtWebKit
-   + QtXml
-   + QtXmlPatterns
-   + Phonon
-
-Getting the sources
-===================
-
-* Download URL: http://www.pyside.org/downloads/
-
-Build requirements
-==================
-
-   + CMake (>= 2.6.0)
-   + Qt4.6 libraries and development headers
-   + Python dev libraries
-   + Shiboken libraries
-   + :ref:`generator-runner`
-
-
-Building and installing
-=======================
-
-To build and install just follow the generic cmake instructions in
-section :ref:`cmake-primer`.
-
-Be advised that the build process can be rather lenghty because of the
-number of source files that will be compiled.
-
-Debian packaging
-================
-
-.. note:: Qt 4.6 is available for Debian in the testing branch (squeeze), Ubuntu 10.04 (Lucid Lynx), and in Maemo 5 (Fremantle) in the upcoming PR 1.2 update. 
-
-In order to compile this package in a Debian environment, make sure the
-following packages are installed:
-
-* debhelper (>= 7)
-* cmake (>= 2.6.0)
-* python-all-dev
-* python-all-dbg
-* python-support (>= 0.3.9)
-* libqt4-dev
-* libphonon-dev
-* libqt4-opengl-dev
-* shiboken (>= 0.3.0)
-* generatorrunner (>= 0.4.1)
-* libshiboken-dev (>= 0.3.0)
-
-
-And then you can build the package using::
-
-  $ dpkg-buildpackage -rfakeroot
diff --git a/doc/howto-build/setup-boostpython.rst b/doc/howto-build/setup-boostpython.rst
deleted file mode 100644
index a70840a..0000000
--- a/doc/howto-build/setup-boostpython.rst
+++ /dev/null
@@ -1,51 +0,0 @@
-
-.. _boost-python-generator:
-
-**********************
-Boost.Python Generator
-**********************
-
-Overview
-=========================================
-
-The **Boost::Python Generator** (A.K.A. :program:`boostpythongenerator`) is
-the program that creates the Boost.Python bindings source files from Qt headers
-and auxiliary files  (typesystems, ``global.h`` and glue files). It depends on
-:ref:`generator-runner` and :ref:`api-extractor` library.
-
-
-Getting the sources
-===================
-
-* Download URL: http://www.pyside.org/downloads/
-
-Build requirements
-==================
-
-+ CMake >= 2.6.0
-+ Qt4.5 libraries and development headers >= 4.5.0
-+ :ref:`api-extractor` + development headers
-+ :ref:`generator-runner` + development headers
-
-Building and installing
-=======================
-
-To build and install just follow the generic cmake instructions in
-section :ref:`cmake-primer`.
-
-Debian packaging
-================
-
-In order to compile this package in a debian environment, make sure the
-following packages are installed:
-
-* debhelper (>= 5)
-* cdbs
-* cmake (>= 2.6.0)
-* libqt4-dev (>= 4.5)
-* libapiextractor-dev (>= 0.3.2)
-* libgenrunner-dev (>= 0.3.2a1)
-
-And then you can build the package using::
-
-  $ dpkg-buildpackage -rfakeroot
diff --git a/doc/howto-build/setup-generator.rst b/doc/howto-build/setup-generator.rst
deleted file mode 100644
index 6c231cc..0000000
--- a/doc/howto-build/setup-generator.rst
+++ /dev/null
@@ -1,50 +0,0 @@
-
-.. _generator-runner:
-
-****************
-Generator Runner
-****************
-
-Overview
-=========================================
-
-The **Generator Runner** (A.K.A. :program:`generatorrunner`) is the
-program that controls the bindings generation process according to the
-rules given by the user through headers, typesystem files and generator
-front-ends (such as :ref:`shiboken-generator`). It depends on
-:ref:`api-extractor` library.
-
-
-Getting the sources
-===================
-
-* Download URL: http://www.pyside.org/downloads/
-
-Build requirements
-==================
-
-+ CMake >= 2.6.0
-+ Qt4.5 libraries and development headers >= 4.5.0
-+ :ref:`api-extractor` + development headers
-
-Building and installing
-=======================
-
-To build and install just follow the generic CMake instructions in
-section :ref:`cmake-primer`.
-
-Debian packaging
-================
-
-In order to compile this package in a Debian environment, make sure the
-following packages are installed:
-
-* debhelper (>= 7)
-* cmake (>= 2.6.0)
-* libqt4-dev (>= 4.5)
-* libapiextractor-dev (>= 0.5.0)
-* libxlst-dev
-
-And then you can build the package using::
-
-  $ dpkg-buildpackage -rfakeroot
diff --git a/doc/howto-build/shiboken.rst b/doc/howto-build/shiboken.rst
deleted file mode 100644
index d5c19de..0000000
--- a/doc/howto-build/shiboken.rst
+++ /dev/null
@@ -1,54 +0,0 @@
-
-.. _shiboken-generator:
-
-******************
-Shiboken Generator
-******************
-
-Overview
-=========================================
-
-The **Shiboken Generator** (A.K.A. :program:`shiboken`) is
-the plugin that creates the PySide bindings source files from Qt headers
-and auxiliary files  (typesystems, ``global.h`` and glue files). It depends on
-:ref:`generator-runner` and :ref:`api-extractor` library.
-
-
-Getting the sources
-===================
-
-* Download URL: http://www.pyside.org/downloads/
-
-Build requirements
-==================
-
-+ CMake >= 2.6.0
-+ Qt libraries and development headers >= 4.5.0
-+ Python development headers >= 2.5
-+ :ref:`api-extractor` + development headers
-+ :ref:`generator-runner` + development headers
-
-Building and installing
-=======================
-
-To build and install just follow the generic CMake instructions in
-section :ref:`cmake-primer`.
-
-Debian packaging
-================
-
-In order to compile this package in a debian environment, make sure the
-following packages are installed:
-
-* debhelper (>= 7)
-* cmake (>= 2.6.0)
-* libqt4-dev (>= 4.5)
-* libapiextractor-dev (>= 0.5.0)
-* libgenrunner-dev (>= 0.4.1)
-* generatorrunner (>= 0.4.1)
-* python-all-dev
-* python-all-dbg
-
-And then you can build the package using::
-
-  $ dpkg-buildpackage -rfakeroot
diff --git a/doc/inheritance_diagram.py b/doc/inheritance_diagram.py
index 0f9be08..616b470 100644
--- a/doc/inheritance_diagram.py
+++ b/doc/inheritance_diagram.py
@@ -1,4 +1,5 @@
-"""
+# -*- coding: utf-8 -*-
+r"""
     sphinx.ext.inheritance_diagram
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -31,7 +32,8 @@
     The graph is inserted as a PNG+image map into HTML and a PDF in
     LaTeX.
 
-    :copyright: Copyright 2007-2009 by the Sphinx team, see AUTHORS.
+    :copyright: Copyright 2007-2011 by the Sphinx team, see AUTHORS.
+    :copyright: Copyright 2010-2011 by the PySide team.
     :license: BSD, see LICENSE for details.
 """
 
@@ -39,7 +41,6 @@ import os
 import re
 import sys
 import inspect
-import subprocess
 try:
     from hashlib import md5
 except ImportError:
@@ -48,7 +49,6 @@ except ImportError:
 from docutils import nodes
 from docutils.parsers.rst import directives
 
-from sphinx.roles import xfileref_role
 from sphinx.ext.graphviz import render_dot_html, render_dot_latex
 from sphinx.util.compat import Directive
 
@@ -68,7 +68,7 @@ class InheritanceGraph(object):
     from all the way to the root "object", and then is able to generate a
     graphviz dot graph from them.
     """
-    def __init__(self, class_names, currmodule, show_builtins=False):
+    def __init__(self, class_names, currmodule, show_builtins=False, parts=0):
         """
         *class_names* is a list of child classes to show bases from.
 
@@ -76,12 +76,11 @@ class InheritanceGraph(object):
         in the graph.
         """
         self.class_names = class_names
-        self.classes = self._import_classes(class_names, currmodule)
-        self.all_classes = self._all_classes(self.classes)
-        if len(self.all_classes) == 0:
+        classes = self._import_classes(class_names, currmodule)
+        self.class_info = self._class_info(classes, show_builtins, parts)
+        if not self.class_info:
             raise InheritanceException('No classes found for '
                                        'inheritance diagram')
-        self.show_builtins = show_builtins
 
     def _import_class_or_module(self, name, currmodule):
         """
@@ -89,7 +88,7 @@ class InheritanceGraph(object):
         """
         try:
             path, base = class_sig_re.match(name).groups()
-        except ValueError:
+        except (AttributeError, ValueError):
             raise InheritanceException('Invalid class or module %r specified '
                                        'for inheritance diagram' % name)
 
@@ -98,7 +97,7 @@ class InheritanceGraph(object):
 
         # two possibilities: either it is a module, then import it
         try:
-            module = __import__(fullname)
+            __import__(fullname)
             todoc = sys.modules[fullname]
         except ImportError:
             # else it is a class, then import the module
@@ -111,7 +110,7 @@ class InheritanceGraph(object):
                         'Could not import class %r specified for '
                         'inheritance diagram' % base)
             try:
-                module = __import__(path)
+                __import__(path)
                 todoc = getattr(sys.modules[path], base)
             except (ImportError, AttributeError):
                 raise InheritanceException(
@@ -131,36 +130,50 @@ class InheritanceGraph(object):
                                    'not a class or module' % name)
 
     def _import_classes(self, class_names, currmodule):
-        """
-        Import a list of classes.
-        """
+        """Import a list of classes."""
         classes = []
         for name in class_names:
             classes.extend(self._import_class_or_module(name, currmodule))
         return classes
 
-    def _all_classes(self, classes):
-        """
-        Return a list of all classes that are ancestors of *classes*.
+    def _class_info(self, classes, show_builtins, parts):
+        """Return name and bases for all classes that are ancestors of
+        *classes*.
+
+        *parts* gives the number of dotted name parts that is removed from the
+        displayed node names.
         """
         all_classes = {}
+        builtins = __builtins__.values()
 
         def recurse(cls):
-            all_classes[cls] = None
-            for c in cls.__bases__:
-                if c not in all_classes and c.__name__ != "BaseWrapper":
-                    recurse(c)
+            if not show_builtins and cls in builtins:
+                return
+
+            nodename = self.class_name(cls, parts)
+            fullname = self.class_name(cls, 0)
+
+            baselist = []
+            all_classes[cls] = (nodename, fullname, baselist)
+            for base in cls.__bases__:
+                if not show_builtins and base in builtins:
+                    continue
+                if  base.__name__ == "Object" and base.__module__ == "Shiboken":
+                    continue
+                baselist.append(self.class_name(base, parts))
+                if base not in all_classes:
+                    recurse(base)
 
         for cls in classes:
             recurse(cls)
 
-        return all_classes.keys()
+        return all_classes.values()
 
     def class_name(self, cls, parts=0):
-        """
-        Given a class object, return a fully-qualified name.  This
-        works for things I've tested in matplotlib so far, but may not
-        be completely general.
+        """Given a class object, return a fully-qualified name.
+
+        This works for things I've tested in matplotlib so far, but may not be
+        completely general.
         """
         module = cls.__module__
         if module == '__builtin__':
@@ -176,7 +189,7 @@ class InheritanceGraph(object):
         """
         Get all of the class names involved in the graph.
         """
-        return [self.class_name(x) for x in self.all_classes]
+        return [fullname for (_, fullname, _) in self.class_info]
 
     # These are the default attrs for graphviz
     default_graph_attrs = {
@@ -202,7 +215,7 @@ class InheritanceGraph(object):
     def _format_graph_attrs(self, attrs):
         return ''.join(['%s=%s;\n' % x for x in attrs.items()])
 
-    def generate_dot(self, name, parts=0, urls={}, env=None,
+    def generate_dot(self, name, urls={}, env=None,
                      graph_attrs={}, node_attrs={}, edge_attrs={}):
         """
         Generate a graphviz dot graph from the classes that
@@ -230,28 +243,17 @@ class InheritanceGraph(object):
         res.append('digraph %s {\n' % name)
         res.append(self._format_graph_attrs(g_attrs))
 
-        for cls in self.all_classes:
-            if not self.show_builtins and cls in __builtins__.values():
-                continue
-
-            name = self.class_name(cls, parts)
-
+        for name, fullname, bases in self.class_info:
             # Write the node
             this_node_attrs = n_attrs.copy()
-            url = urls.get(self.class_name(cls))
+            url = urls.get(fullname)
             if url is not None:
                 this_node_attrs['URL'] = '"%s"' % url
             res.append('  "%s" [%s];\n' %
                        (name, self._format_node_attrs(this_node_attrs)))
 
             # Write the edges
-            for base in cls.__bases__:
-                if base.__name__ == "BaseWrapper":
-                    continue
-                if not self.show_builtins and base in __builtins__.values():
-                    continue
-
-                base_name = self.class_name(base, parts)
+            for base_name in bases:
                 res.append('  "%s" -> "%s" [%s];\n' %
                            (base_name, name,
                             self._format_node_attrs(e_attrs)))
@@ -283,10 +285,16 @@ class InheritanceDiagram(Directive):
         node.document = self.state.document
         env = self.state.document.settings.env
         class_names = self.arguments[0].split()
+        class_role = env.get_domain('py').role('class')
+        # Store the original content for use as a hash
+        node['parts'] = self.options.get('parts', 0)
+        node['content'] = ', '.join(class_names)
 
         # Create a graph starting with the list of classes
         try:
-            graph = InheritanceGraph(class_names, env.currmodule)
+            graph = InheritanceGraph(
+                class_names, env.temp_data.get('py:module'),
+                parts=node['parts'])
         except InheritanceException, err:
             return [node.document.reporter.warning(err.args[0],
                                                    line=self.lineno)]
@@ -296,15 +304,12 @@ class InheritanceDiagram(Directive):
         # references to real URLs later.  These nodes will eventually be
         # removed from the doctree after we're done with them.
         for name in graph.get_all_class_names():
-            refnodes, x = xfileref_role(
+            refnodes, x = class_role(
                 'class', ':class:`%s`' % name, name, 0, self.state)
             node.extend(refnodes)
         # Store the graph object so we can use it to generate the
         # dot file later
         node['graph'] = graph
-        # Store the original content for use as a hash
-        node['parts'] = self.options.get('parts', 0)
-        node['content'] = ', '.join(class_names)
         return [node]
 
 
@@ -318,7 +323,6 @@ def html_visit_inheritance_diagram(self, node):
     image map.
     """
     graph = node['graph']
-    parts = node['parts']
 
     graph_hash = get_graph_hash(node)
     name = 'inheritance%s' % graph_hash
@@ -331,7 +335,7 @@ def html_visit_inheritance_diagram(self, node):
         elif child.get('refid') is not None:
             urls[child['reftitle']] = '#' + child.get('refid')
 
-    dotcode = graph.generate_dot(name, parts, urls, env=self.builder.env)
+    dotcode = graph.generate_dot(name, urls, env=self.builder.env)
     render_dot_html(self, node, dotcode, [], 'inheritance', 'inheritance',
                     alt='Inheritance diagram of ' + node['content'])
     raise nodes.SkipNode
@@ -342,12 +346,11 @@ def latex_visit_inheritance_diagram(self, node):
     Output the graph for LaTeX.  This will insert a PDF.
     """
     graph = node['graph']
-    parts = node['parts']
 
     graph_hash = get_graph_hash(node)
     name = 'inheritance%s' % graph_hash
 
-    dotcode = graph.generate_dot(name, parts, env=self.builder.env,
+    dotcode = graph.generate_dot(name, env=self.builder.env,
                                  graph_attrs={'size': '"6.0,6.0"'})
     render_dot_latex(self, node, dotcode, [], 'inheritance')
     raise nodes.SkipNode
@@ -363,7 +366,8 @@ def setup(app):
         inheritance_diagram,
         latex=(latex_visit_inheritance_diagram, None),
         html=(html_visit_inheritance_diagram, None),
-        text=(skip, None))
+        text=(skip, None),
+        man=(skip, None))
     app.add_directive('inheritance-diagram', InheritanceDiagram)
     app.add_config_value('inheritance_graph_attrs', {}, False),
     app.add_config_value('inheritance_node_attrs', {}, False),
diff --git a/doc/issuesdiff.rst b/doc/issuesdiff.rst
deleted file mode 100644
index 4c472ae..0000000
--- a/doc/issuesdiff.rst
+++ /dev/null
@@ -1,14 +0,0 @@
-PySide issues and specificities
-*******************************
-
-This document shows some points not supported by PySide.
-
-Deprecated Methods
-------------------
-
-The deprecated methods before Qt 4.4 is not supported by PySide,
-e.g.: `QColor.dark()` and `QColor.light()`.
-
-**How to solve:** update the methods with new ones like `QColor.darker()`
-and `QColor.lighter()`.
-
diff --git a/doc/modules.rst b/doc/modules.rst
index 919aa3d..38ec1f0 100644
--- a/doc/modules.rst
+++ b/doc/modules.rst
@@ -1,9 +1,13 @@
 PySide modules
 **************
 
+Qt is splitted in several modules.
+
 .. toctree::
+    :maxdepth: 1
 
     PySide/QtCore/index.rst
+    PySide/QtDeclarative/index.rst
     PySide/QtGui/index.rst
     PySide/QtHelp/index.rst
     PySide/QtMaemo5/index.rst
diff --git a/doc/newsigslot.rst b/doc/newsigslot.rst
deleted file mode 100644
index b73a6b9..0000000
--- a/doc/newsigslot.rst
+++ /dev/null
@@ -1,191 +0,0 @@
-New-style signal/slot
-*********************
-The new-style signal/slot was introduced by Riverbank on its PyQt v4.5. The main goal of this new-style is to provide a more pythonic syntax to the Python programmers. PySide uses `PSEP100 <http://www.pyside.org/docs/pseps/psep-0100.html>`_ as its implementation guideline.
-
-Old way: SIGNAL() and SLOT()
-----------------------------
-Both QtCore.SIGNAL(...) and QtCore.SLOT(...) macros allow Python to interface with Qt mechanisms. This is the old way of using signals/slots.
-
-The example below uses the well known *clicked* signal from a *QPushButton*. The *connect* method has a non python-friendly syntax. It is necessary to inform the object, its signal (via macro) and a slot to be connected to.
-
-::
-
-    ...
-
-    def someFunc():
-        print "someFunc has been called!"
-
-    ...
-
-    button = QtGui.QPushButton("Call someFunc")
-    QtCore.QObject.connect(button, QtCore.SIGNAL('clicked()'), someFunc)
-
-    ...
-
-
-Next section shows how everything has changed to become more pythonic.
-
-New way: Signal() and Slot()
-----------------------------
-The new-style uses a different syntax to create and to connect signals/slots. The previous example could be rewritten as:
-
-::
-    
-    ...
-
-    def someFunc():
-        print "someFunc has been called!"
-
-    ...
-
-    clicked = QtCore.Signal()
-
-    button = QtGui.QPushButton("Call someFunc")
-    button.clicked.connect(someFunc)
-
-    ...
-
-
-Using QtCore.Signal()
----------------------
-Signals can be defined using the *QtCore.Signal()* class. Python types and C types can be passed as parameters to it. If you need to overload it just pass the types as tuples or lists.
-
-Besides that it can receive also a named argument *name* that defines the signal name. If nothing is passed as *name* then the new signal will have the same name as the variable that it is being assigned to.
-
-The section `Putting everything together`_ has a collection of examples that shows a bunch of situation using the *Signal()* class.
-
-**Note**: Signals should be defined only inside classes inheriting from QObject. This way the signal information is added to the class QMetaObject structure.
-
-
-Using QtCore.Slot()
--------------------
-Slots are assigned and overloaded using the decorator *QtCore.Slot()*. Again, to define a signature just pass the types like the *QtCore.Signal()* class. Unlike the *Signal()* class, to overload a function you don't pass every variation as tuple or list. Instead of that you have to define a new decorator for every different signature. The examples section below will make it clearer.
-
-Another difference is about its keywords. *Slot()* accepts a *name* and a *result*. The *result* keyword defines the type that will be returned and can be a C or Python type. The *name* behaves the same way as in *Signal()*. If nothing is passed as *name* then the new slot will have the same name as the function that is being decorated.
-
-Putting everything together
----------------------------
-Nothing better than examples to show how to use the new-style. Here you can find some code covering a good range of cases, from basic connections to more complex situations.
-
-- **Hello World example**: the basic example, showing how to connect a signal to a slot without any parameters.
-
-::
-
-    import sys
-    from PySide import QtCore, QtGui
-
-    # define a function that will be used as a slot
-    def sayHello():
-        print 'Hello world!'
-
-    app = QtGui.QApplication(sys.argv)
-
-    button = QtGui.QPushButton('Say hello!')
-
-    # connect the clicked signal to the sayHello slot
-    button.clicked.connect(sayHello)
-    button.show()
-
-    sys.exit(app.exec_())
-
-- **Lets add some arguments**: this is a modified *Hello World* version. It adds some arguments to the slot and creates a new signal.
-
-::
-
-    import sys
-    from PySide import QtCore
-
-    # define a new slot that receives a QString and has
-    # 'saySomeWords' as its name
-    @QtCore.Slot(QtCore.QString)
-    def saySomeWords(words):
-        print words
-
-    class Communicate(QtCore.QObject):
-        # create a new signal on the fly and name it 'speak'
-        speak = QtCore.Signal(QtCore.QString)
-
-    someone = Communicate()
-    # connect signal and slot
-    someone.speak.connect(saySomeWords)
-    # emit 'speak' signal
-    someone.speak.emit("Hello everybody!")
-
-- **Lets add some overloads**: a little more modification on the previous example now including overloads.
-
-::
-
-    import sys
-    from PySide import QtCore
-
-    # define a new slot that receives a C 'int' or a 'QString'
-    # and has 'saySomething' as its name
-    @QtCore.Slot(int)
-    @QtCore.Slot(QtCore.QString)
-    def saySomething(stuff):
-        print stuff
-
-    class Communicate(QtCore.QObject):
-        # create two new signals on the fly: one will handle
-        # int type, the other will handle QStrings
-        speakNumber = QtCore.Signal(int)
-        speakWord = QtCore.Signal(QtCore.QString)
-
-    someone = Communicate()
-    # connect signal and slot properly
-    someone.speakNumber.connect(saySomething)
-    someone.speakWord.connect(saySomething)
-    # emit each 'speak' signal
-    someone.speakNumber.emit(10)
-    someone.speakWord.emit("Hello everybody!")
-
-
-- **Lets complicate even more**: now with overloads and complicated connections and emissions.
-
-::
-
-    import sys
-    from PySide import QtCore
-
-    # define a new slot that receives an C 'int' or a 'QString'
-    # and has 'saySomething' as its name
-    @QtCore.Slot(int)
-    @QtCore.Slot(QtCore.QString)
-    def saySomething(stuff):
-        print stuff
-
-    class Communicate(QtCore.QObject):
-        # create two new signals on the fly: one will handle
-        # int type, the other will handle QStrings
-        speak = QtCore.Signal((int,), (QtCore.QString,))
-
-    someone = Communicate()
-    # connect signal and slot. As 'int' is the default
-    # we have to inform the QString when connecting the
-    # second signal
-    someone.speak.connect(saySomething)
-    someone.speak[QtCore.QString].connect(saySomething)
-
-    # emit 'speak' signal with different arguments.
-    # we have to inform the QString as int is the default
-    someone.speak.emit(10)
-    someone.speak[QtCore.QString].emit("Hello everybody!")
-
-
-PyQt compatibility
-------------------
-PyQt uses a different naming convention to its new signal/slot functions. In order to convert any PyQt script that uses this new-style to run with PySide just use one the proposed modifications below:
-
-::
-
-    from PySide.QtCore import Signal as pyqtSignal
-    from PySide.QtCore import Slot as pyqtSlot
-
-or
-
-::
-
-    QtCore.pyqtSignal = QtCore.Signal
-    QtCore.pyqtSlot = QtCore.Slot
-
-This way any call to *pyqtSignal* or *pyqtSlot* will be translated to a *Signal* or *Slot* call.
diff --git a/doc/pyhtml2devhelp.py b/doc/pyhtml2devhelp.py
index 895c7e7..60df329 100644
--- a/doc/pyhtml2devhelp.py
+++ b/doc/pyhtml2devhelp.py
@@ -10,15 +10,6 @@
   Public License version 2.1 requirements will be met:
   http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 
-  As a special exception to the GNU Lesser General Public License
-  version 2.1, the object code form of a "work that uses the Library"
-  may incorporate material from a header file that is part of the
-  Library.  You may distribute such object code under terms of your
-  choice, provided that the incorporated material (i) does not exceed
-  more than 5% of the total size of the Library; and (ii) is limited to
-  numerical parameters, data structure layouts, accessors, macros,
-  inline functions and templates.
-
   This program is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
diff --git a/doc/pyside.qdocconf b/doc/pyside.qdocconf
deleted file mode 100644
index 1e940fa..0000000
--- a/doc/pyside.qdocconf
+++ /dev/null
@@ -1,20 +0,0 @@
-include(qt.qdocconf)
-
-quotinginformation      = true
-exampledirs             = $QTDIR/doc/src \
-                          $QTDIR/examples \
-                          $QTDIR/examples/tutorials \
-                          $QTDIR \
-                          $QTDIR/qmake/examples \
-                          $QTDIR/src/3rdparty/webkit/WebKit/qt/docs
-
-imagedirs               = $QTDIR/doc/src/images \
-                          $QTDIR/examples \
-                          $QTDIR/doc/src/declarative/pics \
-                          $QTDIR/doc/src/template/image
-
-outputdir               = @CMAKE_CURRENT_BINARY_DIR@/qt4xmldoc
-outputformats           = WebXML
-
-generateindex           = false
-url                     = .
diff --git a/doc/pyside.qdocconf.in b/doc/pyside.qdocconf.in
new file mode 100644
index 0000000..1c8d0e3
--- /dev/null
+++ b/doc/pyside.qdocconf.in
@@ -0,0 +1,277 @@
+######################## compat.qdocconf
+alias.i                         = e
+alias.include                   = input
+
+macro.0                         = "\\\\0"
+macro.b                         = "\\\\b"
+macro.n                         = "\\\\n"
+macro.r                         = "\\\\r"
+macro.i                         = "\\o"
+macro.i11                       = "\\o{1,1}"
+macro.i12                       = "\\o{1,2}"
+macro.i13                       = "\\o{1,3}"
+macro.i14                       = "\\o{1,4}"
+macro.i15                       = "\\o{1,5}"
+macro.i16                       = "\\o{1,6}"
+macro.i17                       = "\\o{1,7}"
+macro.i18                       = "\\o{1,8}"
+macro.i19                       = "\\o{1,9}"
+macro.i21                       = "\\o{2,1}"
+macro.i31                       = "\\o{3,1}"
+macro.i41                       = "\\o{4,1}"
+macro.i51                       = "\\o{5,1}"
+macro.i61                       = "\\o{6,1}"
+macro.i71                       = "\\o{7,1}"
+macro.i81                       = "\\o{8,1}"
+macro.i91                       = "\\o{9,1}"
+macro.img                       = "\\image"
+macro.endquote                  = "\\endquotation"
+macro.relatesto                 = "\\relates"
+
+spurious                        = "Missing comma in .*" \
+                                  "Missing pattern .*"
+
+######################## macros.qdocconf
+macro.aacute.HTML       = "&aacute;"
+macro.Aring.HTML        = "&Aring;"
+macro.aring.HTML        = "&aring;"
+macro.Auml.HTML         = "&Auml;"
+macro.author            = "\\bold{Author:}"
+macro.br.HTML           = "<br />"
+macro.BR.HTML           = "<br />"
+macro.copyright.HTML    = "&copy;"
+macro.eacute.HTML       = "&eacute;"
+macro.gui               = "\\bold"
+macro.hr.HTML           = "<hr />"
+macro.iacute.HTML       = "&iacute;"
+macro.key               = "\\bold"
+macro.menu              = "\\bold"
+macro.note              = "\\bold{Note:}"
+macro.oslash.HTML       = "&oslash;"
+macro.ouml.HTML         = "&ouml;"
+macro.QA                = "\\e{Qt Assistant}"
+macro.QD                = "\\e{Qt Designer}"
+macro.QL                = "\\e{Qt Linguist}"
+macro.QQV               = "\\e{Qt QML Viewer}"
+macro.qmlbasictype      = "\\e"
+macro.param             = "\\e"
+macro.raisedaster.HTML  = "<sup>*</sup>"
+macro.rarrow.HTML       = "&rarr;"
+macro.reg.HTML          = "<sup>&reg;</sup>"
+macro.return            = "Returns"
+macro.starslash         = "\\c{*/}"
+macro.begincomment      = "\\c{/*}"
+macro.endcomment        = "\\c{*/}"
+macro.uuml.HTML         = "&uuml;"
+macro.mdash.HTML        = "&mdash;"
+
+macro.beginfloatleft.HTML   = "<div style=\"float: left; margin-right: 2em\">"
+macro.beginfloatright.HTML  = "<div style=\"float: right; margin-left: 2em\">"
+macro.endfloat.HTML         = "</div>"
+macro.clearfloat.HTML       = "<br style=\"clear: both\" />"
+
+######################## qt-cpp-ignore.qdocconf
+Cpp.ignoretokens        = QAXFACTORY_EXPORT \
+                          QDESIGNER_COMPONENTS_LIBRARY \
+                          QDESIGNER_EXTENSION_LIBRARY \
+                          QDESIGNER_SDK_LIBRARY \
+                          QDESIGNER_SHARED_LIBRARY \
+                          QDESIGNER_UILIB_LIBRARY \
+                          QM_EXPORT_CANVAS \
+                          QM_EXPORT_DNS \
+                          QM_EXPORT_DOM \
+                          QM_EXPORT_FTP \
+                          QM_EXPORT_HTTP \
+                          QM_EXPORT_ICONVIEW \
+                          QM_EXPORT_NETWORK \
+                          QM_EXPORT_OPENGL \
+                          QM_EXPORT_OPENVG \
+                          QM_EXPORT_SQL \
+                          QM_EXPORT_TABLE \
+                          QM_EXPORT_WORKSPACE \
+                          QM_EXPORT_XML \
+                          QT_ASCII_CAST_WARN \
+                          QT_ASCII_CAST_WARN_CONSTRUCTOR \
+                          QT_BEGIN_HEADER \
+                          QT_DESIGNER_STATIC \
+                          QT_END_HEADER \
+                          QT_FASTCALL \
+                          QT_WIDGET_PLUGIN_EXPORT \
+                          Q_COMPAT_EXPORT \
+                          Q_CORE_EXPORT \
+                          Q_CORE_EXPORT_INLINE \
+                          Q_EXPLICIT \
+                          Q_EXPORT \
+                          Q_EXPORT_CODECS_CN \
+                          Q_EXPORT_CODECS_JP \
+                          Q_EXPORT_CODECS_KR \
+                          Q_EXPORT_PLUGIN \
+                          Q_GFX_INLINE \
+                          Q_AUTOTEST_EXPORT \
+                          Q_GUI_EXPORT \
+                          Q_GUI_EXPORT_INLINE \
+                          Q_GUI_EXPORT_STYLE_CDE \
+                          Q_GUI_EXPORT_STYLE_COMPACT \
+                          Q_GUI_EXPORT_STYLE_MAC \
+                          Q_GUI_EXPORT_STYLE_MOTIF \
+                          Q_GUI_EXPORT_STYLE_MOTIFPLUS \
+                          Q_GUI_EXPORT_STYLE_PLATINUM \
+                          Q_GUI_EXPORT_STYLE_POCKETPC \
+                          Q_GUI_EXPORT_STYLE_SGI \
+                          Q_GUI_EXPORT_STYLE_WINDOWS \
+                          Q_GUI_EXPORT_STYLE_WINDOWSXP \
+                          QHELP_EXPORT \
+                          Q_INLINE_TEMPLATE \
+                          Q_INTERNAL_WIN_NO_THROW \
+                          Q_NETWORK_EXPORT \
+                          Q_OPENGL_EXPORT \
+                          Q_OPENVG_EXPORT \
+                          Q_OUTOFLINE_TEMPLATE \
+                          Q_SQL_EXPORT \
+                          Q_SVG_EXPORT \
+                          Q_SCRIPT_EXPORT \
+                          Q_SCRIPTTOOLS_EXPORT \
+                          Q_TESTLIB_EXPORT \
+                          Q_TYPENAME \
+                          Q_XML_EXPORT \
+                          Q_XMLSTREAM_EXPORT \
+                          Q_XMLPATTERNS_EXPORT \
+                          QDBUS_EXPORT \
+                          QT_BEGIN_NAMESPACE \
+                          QT_BEGIN_INCLUDE_NAMESPACE \
+                          QT_END_NAMESPACE \
+                          QT_END_INCLUDE_NAMESPACE \
+                          PHONON_EXPORT \
+                          Q_DECLARATIVE_EXPORT \
+                          Q_GADGET \
+                          QWEBKIT_EXPORT
+Cpp.ignoredirectives    = Q_DECLARE_HANDLE \
+                          Q_DECLARE_INTERFACE \
+                          Q_DECLARE_METATYPE \
+                          Q_DECLARE_OPERATORS_FOR_FLAGS \
+                          Q_DECLARE_PRIVATE \
+                          Q_DECLARE_PUBLIC \
+                          Q_DECLARE_SHARED \
+                          Q_DECLARE_TR_FUNCTIONS \
+                          Q_DECLARE_TYPEINFO \
+                          Q_DISABLE_COPY \
+                          QT_FORWARD_DECLARE_CLASS \
+                          Q_DUMMY_COMPARISON_OPERATOR \
+                          Q_ENUMS \
+                          Q_FLAGS \
+                          Q_INTERFACES \
+                          __attribute__ \
+                          K_DECLARE_PRIVATE \
+                          PHONON_OBJECT \
+                          PHONON_HEIR \
+                          Q_PRIVATE_PROPERTY \
+                          Q_DECLARE_PRIVATE_D \
+                          Q_CLASSINFO
+
+######################## qt-defines.qdocconf
+defines                 = Q_QDOC \
+                          QT_.*_SUPPORT \
+                          QT_.*_LIB \
+                          QT_COMPAT \
+                          QT_KEYPAD_NAVIGATION \
+                          QT3_SUPPORT \
+                          Q_WS_.* \
+                          Q_OS_.* \
+                          Q_BYTE_ORDER \
+                          QT_DEPRECATED \
+                          Q_NO_USING_KEYWORD \
+                          __cplusplus
+
+versionsym              = QT_VERSION_STR
+
+codeindent              = 1
+
+######################## qt.qdocconf
+
+project                 = Qt
+versionsym              =
+version                 = @PYSIDE_QT_VERSION@
+description             = Qt Reference Documentation
+url                     = http://www.pyside.org/docs/pyside-@PYSIDE_QT_VERSION@
+
+language                = Cpp
+
+headerdirs              = @QT_SRC_DIR@/src \
+                          @QT_SRC_DIR@/extensions/activeqt \
+                          @QT_SRC_DIR@/tools/assistant/lib \
+                          @QT_SRC_DIR@/tools/assistant/compat/lib \
+                          @QT_SRC_DIR@/tools/designer/src/uitools \
+                          @QT_SRC_DIR@/tools/designer/src/lib/extension \
+                          @QT_SRC_DIR@/tools/designer/src/lib/sdk \
+                          @QT_SRC_DIR@/tools/designer/src/lib/uilib \
+                          @QT_SRC_DIR@/tools/qtestlib/src \
+                          @QT_SRC_DIR@/tools/qdbus/src \
+                          @pyside_SOURCE_DIR@
+sourcedirs              = @QT_SRC_DIR@/src \
+                          @QT_SRC_DIR@/doc/src \
+                          @QT_SRC_DIR@/extensions/activeqt \
+                          @QT_SRC_DIR@/tools/assistant/lib \
+                          @QT_SRC_DIR@/tools/assistant/compat/lib \
+                          @QT_SRC_DIR@/tools/designer/src/uitools \
+                          @QT_SRC_DIR@/tools/designer/src/lib/extension \
+                          @QT_SRC_DIR@/tools/designer/src/lib/sdk \
+                          @QT_SRC_DIR@/tools/designer/src/lib/uilib \
+                          @QT_SRC_DIR@/tools/qtestlib/src \
+                          @QT_SRC_DIR@/tools/qdbus \
+                          @pyside_SOURCE_DIR@
+
+excludedirs             = @QT_SRC_DIR@/src/3rdparty/clucene \
+                          @QT_SRC_DIR@/src/3rdparty/des \
+                          @QT_SRC_DIR@/src/3rdparty/freetype \
+                          @QT_SRC_DIR@/src/3rdparty/harfbuzz \
+                          @QT_SRC_DIR@/src/3rdparty/kdebase \
+                          @QT_SRC_DIR@/src/3rdparty/libjpeg \
+                          @QT_SRC_DIR@/src/3rdparty/libmng \
+                          @QT_SRC_DIR@/src/3rdparty/libpng \
+                          @QT_SRC_DIR@/src/3rdparty/libtiff \
+                          @QT_SRC_DIR@/src/3rdparty/md4 \
+                          @QT_SRC_DIR@/src/3rdparty/md5 \
+                          @QT_SRC_DIR@/src/3rdparty/patches \
+                          @QT_SRC_DIR@/src/3rdparty/sha1 \
+                          @QT_SRC_DIR@/src/3rdparty/sqlite \
+                          @QT_SRC_DIR@/src/3rdparty/webkit/JavaScriptCore \
+                          @QT_SRC_DIR@/src/3rdparty/webkit/WebCore \
+                          @QT_SRC_DIR@/src/3rdparty/wintab \
+                          @QT_SRC_DIR@/src/3rdparty/zlib \
+                          @QT_SRC_DIR@/src/3rdparty/phonon/gstreamer \
+                          @QT_SRC_DIR@/src/3rdparty/phonon/ds9 \
+                          @QT_SRC_DIR@/src/3rdparty/phonon/qt7 \
+                          @QT_SRC_DIR@/src/3rdparty/phonon/mmf \
+                          @QT_SRC_DIR@/src/3rdparty/phonon/waveout \
+                          @QT_SRC_DIR@/doc/src/snippets \
+                          @QT_SRC_DIR@/doc/src/ja_JP \
+                          @QT_SRC_DIR@/doc/src/zh_CN
+
+sources.fileextensions  = "*.cpp *.qdoc *.mm"
+examples.fileextensions = "*.cpp *.h *.js *.xq *.svg *.xml *.ui *.qhp *.qhcp"
+examples.imageextensions = "*.png"
+
+tagfile                 = @QT_SRC_DIR@/doc/html/qt.tags
+base                    = file:@QT_SRC_DIR@/doc/html
+
+HTML.generatemacrefs    = "true"
+
+######################## pyside.qdocconf
+quotinginformation      = true
+exampledirs             = @QT_SRC_DIR@/doc/src \
+                          @QT_SRC_DIR@/examples \
+                          @QT_SRC_DIR@/examples/tutorials \
+                          @QT_SRC_DIR@ \
+                          @QT_SRC_DIR@/qmake/examples \
+                          @QT_SRC_DIR@/src/3rdparty/webkit/WebKit/qt/docs
+
+imagedirs               = @QT_SRC_DIR@/doc/src/images \
+                          @QT_SRC_DIR@/examples \
+                          @QT_SRC_DIR@/doc/src/declarative/pics \
+                          @QT_SRC_DIR@/doc/src/template/image
+
+outputdir               = @DOC_DATA_DIR@
+outputformats           = WebXML
+
+generateindex           = false
+url                     = .
diff --git a/doc/pysideapi2.rst b/doc/pysideapi2.rst
new file mode 100644
index 0000000..48f87c3
--- /dev/null
+++ b/doc/pysideapi2.rst
@@ -0,0 +1,91 @@
+
+.. _pysideapi2:
+
+PySide API 2
+************
+
+Since the beginning one of the PySide goals was to be API compatible with PyQt4,
+but with some (documented) exceptions. For example, PySide will not export to
+Python components marked as deprecated on C++ Qt. All the modifications follow
+the `PSEP101 <http://www.pyside.org/docs/pseps/psep-0101.html>`_ as its guideline.
+
+The release 4.7 of PyQt4 came with improvements on the pythonic front, being
+the extinction of QString a good example. PySide followed this change, except in
+one point: while PyQt4 has conserved the old behavior as optional, PySide
+bindings fully adopted the new API - completely removing QString. No turning
+back. Thus remember to update your source code to the new API, this will ensure
+your code will run on both bindings.
+
+
+__hash__() function return value
+================================
+
+The hash value returned for the classes :class:`PySide.QtCore.QDate`, :class:`PySide.QtCore.QDateTime`, :class:`PySide.QtCore.QTime`, :class:`PySide.QtCore.QUrl` will be
+based on their string representations, thus objects with the same value will
+produce the same hash.
+
+
+QString
+=======
+
+Methods that change QString arguments
+-------------------------------------
+
+Methods and functions that change the contents of a QString argument were
+modified to receive an immutable Python unicode (or str) and return another
+Python unicode/str as the modified string.
+
+The following methods had their return types modified this way:
+
+**Classes:** QAbstractSpinBox, QDateTimeEdit, QDoubleSpinBox, QSpinBox, QValidator
+
+- *fixup(string)*: string
+- *validate(string, int)*: [QValidator.State, string, int]
+
+
+**Classes:** QDoubleValidator, QIntValidator, QRegExpValidator
+
+- *validate(string, int)*: [QValidator.State, string, int]
+
+**Class:** QClipboard
+
+- *text(string, QClipboard.Mode mode=QClipboard.Clipboard)*: [string, string]
+
+
+**Class:** QFileDialog
+
+Instead of *getOpenFileNameAndFilter()*, *getOpenFileNamesAndFilter()* and *getSaveFileNameAndFilter()* like PyQt4 does,
+PySide has modified the original methods to return a tuple.
+
+- *getOpenFileName(QWidget parent=None, str caption=None, str dir=None, str filter=None, QFileDialog.Options options=0)*: [string, filter]
+- *getOpenFileNames(QWidget parent=None, str caption=None, str dir=None, str filter=None, QFileDialog.Options options=0)*: [list(string), filter]
+- *getSaveFileName(QWidget parent=None, str caption=None, str dir=None, str filter=None, QFileDialog.Options options=0)*: [string, filter]
+
+**Class:** QWebPage
+
+- *javaScriptPrompt(QWebFrame, string, string)*: [bool, string]
+
+Other QString related changes
+-----------------------------
+
+**Classes:** QFontMetrics and QFontMetricsF
+
+They had two new methods added. Both take a string of one character and convert to a QChar (to call the C++ counterpart):
+
+- widthChar(string)
+- boundingRectChar(string)
+
+
+QTextStream
+===========
+
+Inside this class some renames were applied to avoid clashes with native Python functions. They are: *bin_()*, *hex_()* and *oct_()*.
+The only modification was the addition of '_' character.
+
+
+QVariant
+========
+
+As QVariant was removed, any function expecting it can receive any Python object (None is an invalid QVariant). The same rule is valid when returning something: the returned QVariant will be converted to the its original Python object type.
+
+When a method expects a *QVariant::Type* the programmer can use a string (the type name) or the type itself.
diff --git a/doc/pysideinclude.py b/doc/pysideinclude.py
new file mode 100644
index 0000000..89024f0
--- /dev/null
+++ b/doc/pysideinclude.py
@@ -0,0 +1,147 @@
+#
+# This code is a modified version of the code found in sphinx distribution
+# the same license of sphinx distribution applies to this file as well.
+#
+
+import os
+import sys
+import codecs
+from os import path
+
+from docutils import nodes
+from docutils.parsers.rst import Directive, directives
+
+from sphinx import addnodes
+from sphinx.util import parselinenos
+
+class PySideInclude(Directive):
+    """
+    Like ``.. include:: :literal:``, but only warns if the include file is
+    not found, and does not raise errors.  Also has several options for
+    selecting what to include.
+    """
+
+    has_content = False
+    required_arguments = 1
+    optional_arguments = 0
+    final_argument_whitespace = False
+    option_spec = {
+        'linenos': directives.flag,
+        'tab-width': int,
+        'language': directives.unchanged_required,
+        'encoding': directives.encoding,
+        'pyobject': directives.unchanged_required,
+        'lines': directives.unchanged_required,
+        'start-after': directives.unchanged_required,
+        'end-before': directives.unchanged_required,
+        'prepend': directives.unchanged_required,
+        'append': directives.unchanged_required,
+        'snippet': directives.unchanged_required,
+    }
+
+    def run(self):
+        document = self.state.document
+        filename = self.arguments[0]
+        if not document.settings.file_insertion_enabled:
+            return [document.reporter.warning('File insertion disabled',
+                                              line=self.lineno)]
+        env = document.settings.env
+        if filename.startswith('/') or filename.startswith(os.sep):
+            rel_fn = filename[1:]
+        else:
+            docdir = path.dirname(env.doc2path(env.docname, base=None))
+            rel_fn = path.join(docdir, filename)
+        try:
+            fn = path.join(env.srcdir, rel_fn)
+        except UnicodeDecodeError:
+            # the source directory is a bytestring with non-ASCII characters;
+            # let's try to encode the rel_fn in the file system encoding
+            rel_fn = rel_fn.encode(sys.getfilesystemencoding())
+            fn = path.join(env.srcdir, rel_fn)
+
+        if 'pyobject' in self.options and 'lines' in self.options:
+            return [document.reporter.warning(
+                'Cannot use both "pyobject" and "lines" options',
+                line=self.lineno)]
+
+        encoding = self.options.get('encoding', env.config.source_encoding)
+        codec_info = codecs.lookup(encoding)
+        try:
+            f = codecs.StreamReaderWriter(open(fn, 'U'),
+                    codec_info[2], codec_info[3], 'strict')
+            lines = f.readlines()
+            f.close()
+        except (IOError, OSError):
+            return [document.reporter.warning(
+                'Include file %r not found or reading it failed' % filename,
+                line=self.lineno)]
+        except UnicodeError:
+            return [document.reporter.warning(
+                'Encoding %r used for reading included file %r seems to '
+                'be wrong, try giving an :encoding: option' %
+                (encoding, filename))]
+
+        objectname = self.options.get('pyobject')
+        if objectname is not None:
+            from sphinx.pycode import ModuleAnalyzer
+            analyzer = ModuleAnalyzer.for_file(fn, '')
+            tags = analyzer.find_tags()
+            if objectname not in tags:
+                return [document.reporter.warning(
+                    'Object named %r not found in include file %r' %
+                    (objectname, filename), line=self.lineno)]
+            else:
+                lines = lines[tags[objectname][1]-1 : tags[objectname][2]-1]
+
+        linespec = self.options.get('lines')
+        if linespec is not None:
+            try:
+                linelist = parselinenos(linespec, len(lines))
+            except ValueError, err:
+                return [document.reporter.warning(str(err), line=self.lineno)]
+            lines = [lines[i] for i in linelist]
+
+        startafter = self.options.get('start-after')
+        endbefore  = self.options.get('end-before')
+        prepend    = self.options.get('prepend')
+        append     = self.options.get('append')
+        snippet    = self.options.get('snippet')
+
+        if snippet:
+            startafter = "//![%s]" % snippet
+            endbefore = "//![%s]" % snippet
+
+        if startafter is not None or endbefore is not None:
+            use = not startafter
+            res = []
+            for line in lines:
+                if not use and startafter and startafter in line:
+                    use = True
+                elif use and endbefore and endbefore in line:
+                    use = False
+                    break
+                elif use:
+                    if not line.startswith("//!"):
+                        res.append(line)
+            lines = res
+
+        if prepend:
+           lines.insert(0, prepend + '\n')
+        if append:
+           lines.append(append + '\n')
+
+        text = ''.join(lines)
+        if self.options.get('tab-width'):
+            text = text.expandtabs(self.options['tab-width'])
+        retnode = nodes.literal_block(text, text, source=fn)
+        retnode.line = 1
+        retnode.attributes['line_number'] = self.lineno
+        if self.options.get('language', ''):
+            retnode['language'] = self.options['language']
+        if 'linenos' in self.options:
+            retnode['linenos'] = True
+        document.settings.env.note_dependency(rel_fn)
+        return [retnode]
+
+def setup(app):
+    app.add_directive('pysideinclude', PySideInclude)
diff --git a/doc/pysideversion.rst b/doc/pysideversion.rst
new file mode 100644
index 0000000..23666b8
--- /dev/null
+++ b/doc/pysideversion.rst
@@ -0,0 +1,31 @@
+Getting PySide and Qt version
+*****************************
+
+PySide exports their version numbers among the version of Qt used to compile PySide in a pythonnic way, you can check it using the variables:
+
+::
+
+    import PySide
+
+    # Prints PySide version
+    # e.g. 1.0.2
+    print PySide.__version__
+
+    # Gets a tuple with each version component
+    # e.g. (1, 0, 2, 'final', 1)
+    print PySide.__version_info__
+
+    # Prints the Qt version used to compile PySide
+    # e.g. "4.7.2"
+    print PySide.QtCore.__version__
+
+    # Gets a tuple with each version components of Qt used to compile PySide
+    # e.g. (4, 7, 2)
+    print PySide.QtCore.__version_info__
+
+
+Note that the Qt version used to compile PySide may differ from the version used to run PySide, to get the current running Qt version you can do:
+
+::
+
+    print PySide.QtCore.qVersion()
diff --git a/doc/tutorials/index.rst b/doc/tutorials/index.rst
new file mode 100644
index 0000000..2e97612
--- /dev/null
+++ b/doc/tutorials/index.rst
@@ -0,0 +1,10 @@
+PySide tutorials
+****************
+
+A collection of tutorials and "walkthrough" guides are provided with PySide to help new users get started with PySide development. These documents were ported from C++ to Python and cover a range of topics, from basic use of widgets to step-by-step tutorials that show how an application is put together.
+
+.. toctree::
+    :maxdepth: 2
+
+    qmltutorial/index.rst
+    qmladvancedtutorial/index.rst
diff --git a/doc/tutorials/qmladvancedtutorial/declarative-adv-tutorial1.png b/doc/tutorials/qmladvancedtutorial/declarative-adv-tutorial1.png
new file mode 100644
index 0000000..1699ab0
Binary files /dev/null and b/doc/tutorials/qmladvancedtutorial/declarative-adv-tutorial1.png differ
diff --git a/doc/tutorials/qmladvancedtutorial/declarative-adv-tutorial2.png b/doc/tutorials/qmladvancedtutorial/declarative-adv-tutorial2.png
new file mode 100644
index 0000000..ba27c44
Binary files /dev/null and b/doc/tutorials/qmladvancedtutorial/declarative-adv-tutorial2.png differ
diff --git a/doc/tutorials/qmladvancedtutorial/declarative-adv-tutorial3.png b/doc/tutorials/qmladvancedtutorial/declarative-adv-tutorial3.png
new file mode 100644
index 0000000..d500434
Binary files /dev/null and b/doc/tutorials/qmladvancedtutorial/declarative-adv-tutorial3.png differ
diff --git a/doc/tutorials/qmladvancedtutorial/declarative-adv-tutorial4.gif b/doc/tutorials/qmladvancedtutorial/declarative-adv-tutorial4.gif
new file mode 100644
index 0000000..827458d
Binary files /dev/null and b/doc/tutorials/qmladvancedtutorial/declarative-adv-tutorial4.gif differ
diff --git a/doc/tutorials/qmladvancedtutorial/declarative-samegame.png b/doc/tutorials/qmladvancedtutorial/declarative-samegame.png
new file mode 100644
index 0000000..2232df2
Binary files /dev/null and b/doc/tutorials/qmladvancedtutorial/declarative-samegame.png differ
diff --git a/doc/tutorials/qmladvancedtutorial/index.rst b/doc/tutorials/qmladvancedtutorial/index.rst
new file mode 100644
index 0000000..5b5a367
--- /dev/null
+++ b/doc/tutorials/qmladvancedtutorial/index.rst
@@ -0,0 +1,34 @@
+.. _qmladvancedtutorial:
+
+QML Advanced Tutorial
+*********************
+
+This tutorial walks step-by-step through the creation of a full application using QML.
+It assumes that you already know the basics of QML (for example, from reading the
+:ref:`qmltutorial`.
+
+In this tutorial we write a game, *Same Game*, based on the Same Game application
+included in the declarative demos directory, which looks like this:
+
+.. figure:: declarative-samegame.png
+    :align: center
+
+We will cover concepts for producing a fully functioning application, including
+JavaScript integration, using QML  States and Behaviors to
+manage components and enhance your interface, and storing persistent application data.
+
+An understanding of JavaScript is helpful to understand parts of this tutorial, but if you don't
+know JavaScript you can still get a feel for how you can integrate backend logic to create and
+control QML elements.
+
+Tutorial chapters:
+
+.. toctree::
+    :maxdepth: 1
+
+    samegame1.rst
+    samegame2.rst
+    samegame3.rst
+    samegame4.rst
+
+All the code in this tutorial can be found :download:`here <samegame.tar.bz2>`.
diff --git a/doc/tutorials/qmladvancedtutorial/samegame.tar.bz2 b/doc/tutorials/qmladvancedtutorial/samegame.tar.bz2
new file mode 100644
index 0000000..f33983d
Binary files /dev/null and b/doc/tutorials/qmladvancedtutorial/samegame.tar.bz2 differ
diff --git a/doc/tutorials/qmladvancedtutorial/samegame/samegame1/Block.qml b/doc/tutorials/qmladvancedtutorial/samegame/samegame1/Block.qml
new file mode 100644
index 0000000..b4c4399
--- /dev/null
+++ b/doc/tutorials/qmladvancedtutorial/samegame/samegame1/Block.qml
@@ -0,0 +1,53 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the examples of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+//![0]
+import QtQuick 1.0
+
+Item {
+    id: block
+
+    Image {
+        id: img
+        anchors.fill: parent
+        source: "../shared/pics/redStone.png"
+    }
+}
+//![0]
diff --git a/doc/tutorials/qmladvancedtutorial/samegame/samegame1/Button.qml b/doc/tutorials/qmladvancedtutorial/samegame/samegame1/Button.qml
new file mode 100644
index 0000000..a3df028
--- /dev/null
+++ b/doc/tutorials/qmladvancedtutorial/samegame/samegame1/Button.qml
@@ -0,0 +1,83 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the examples of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+//![0]
+import QtQuick 1.0
+
+Rectangle {
+    id: container
+
+    property string text: "Button"
+
+    signal clicked
+
+    width: buttonLabel.width + 20; height: buttonLabel.height + 5
+    border { width: 1; color: Qt.darker(activePalette.button) }
+    smooth: true
+    radius: 8
+
+    // color the button with a gradient
+    gradient: Gradient {
+        GradientStop {
+            position: 0.0
+            color: {
+                if (mouseArea.pressed)
+                    return activePalette.dark
+                else
+                    return activePalette.light
+            }
+        }
+        GradientStop { position: 1.0; color: activePalette.button }
+    }
+
+    MouseArea {
+        id: mouseArea
+        anchors.fill: parent
+        onClicked: container.clicked();
+    }
+
+    Text {
+        id: buttonLabel
+        anchors.centerIn: container
+        color: activePalette.buttonText
+        text: container.text
+    }
+}
+//![0]
diff --git a/doc/tutorials/qmladvancedtutorial/samegame/samegame1/samegame.qml b/doc/tutorials/qmladvancedtutorial/samegame/samegame1/samegame.qml
new file mode 100644
index 0000000..5cc13fd
--- /dev/null
+++ b/doc/tutorials/qmladvancedtutorial/samegame/samegame1/samegame.qml
@@ -0,0 +1,82 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the examples of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+//![0]
+import QtQuick 1.0
+
+Rectangle {
+    id: screen
+
+    width: 490; height: 720
+
+    SystemPalette { id: activePalette }
+
+    Item {
+        width: parent.width
+        anchors { top: parent.top; bottom: toolBar.top }
+
+        Image {
+            id: background
+            anchors.fill: parent
+            source: "../shared/pics/background.jpg"
+            fillMode: Image.PreserveAspectCrop
+        }
+    }
+
+    Rectangle {
+        id: toolBar
+        width: parent.width; height: 30
+        color: activePalette.window
+        anchors.bottom: screen.bottom
+
+        Button {
+            anchors { left: parent.left; verticalCenter: parent.verticalCenter }
+            text: "New Game" 
+            onClicked: console.log("This doesn't do anything yet...")
+        }
+
+        Text {
+            id: score
+            anchors { right: parent.right; verticalCenter: parent.verticalCenter }
+            text: "Score: Who knows?"
+        }
+    }
+}
+//![0]
diff --git a/doc/tutorials/qmladvancedtutorial/samegame/samegame1/samegame1.qmlproject b/doc/tutorials/qmladvancedtutorial/samegame/samegame1/samegame1.qmlproject
new file mode 100644
index 0000000..d4909f8
--- /dev/null
+++ b/doc/tutorials/qmladvancedtutorial/samegame/samegame1/samegame1.qmlproject
@@ -0,0 +1,16 @@
+import QmlProject 1.0
+
+Project {
+    /* Include .qml, .js, and image files from current directory and subdirectories */
+    QmlFiles {
+        directory: "."
+    }
+    JavaScriptFiles {
+        directory: "."
+    }
+    ImageFiles {
+        directory: "."
+    }
+    /* List of plugin directories passed to QML runtime */
+    // importPaths: [ " ../exampleplugin " ]
+}
diff --git a/tests/qtdeclarative/network.qml b/doc/tutorials/qmladvancedtutorial/samegame/samegame2/Block.qml
similarity index 90%
rename from tests/qtdeclarative/network.qml
rename to doc/tutorials/qmladvancedtutorial/samegame/samegame2/Block.qml
index 4b849e0..804c30f 100644
--- a/tests/qtdeclarative/network.qml
+++ b/doc/tutorials/qmladvancedtutorial/samegame/samegame2/Block.qml
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the examples of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:BSD$
 ** You may use this file under the terms of the BSD license as follows:
@@ -38,10 +38,14 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
-Image {
-    width: 100
-    height: 100
-    source: "http://qt.nokia.com/logo.png"
+Item {
+    id: block
+
+    Image {
+        id: img
+        anchors.fill: parent
+        source: "../shared/pics/redStone.png"
+    }
 }
diff --git a/doc/tutorials/qmladvancedtutorial/samegame/samegame2/Button.qml b/doc/tutorials/qmladvancedtutorial/samegame/samegame2/Button.qml
new file mode 100644
index 0000000..cbf1b54
--- /dev/null
+++ b/doc/tutorials/qmladvancedtutorial/samegame/samegame2/Button.qml
@@ -0,0 +1,81 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the examples of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 1.0
+
+Rectangle {
+    id: container
+
+    property string text: "Button"
+
+    signal clicked
+
+    width: buttonLabel.width + 20; height: buttonLabel.height + 5
+    border { width: 1; color: Qt.darker(activePalette.button) }
+    smooth: true
+    radius: 8
+
+    // color the button with a gradient
+    gradient: Gradient {
+        GradientStop {
+            position: 0.0
+            color: {
+                if (mouseArea.pressed)
+                    return activePalette.dark
+                else
+                    return activePalette.light
+            }
+        }
+        GradientStop { position: 1.0; color: activePalette.button }
+    }
+
+    MouseArea {
+        id: mouseArea
+        anchors.fill: parent
+        onClicked: container.clicked();
+    }
+
+    Text {
+        id: buttonLabel
+        anchors.centerIn: container
+        color: activePalette.buttonText
+        text: container.text
+    }
+}
diff --git a/doc/tutorials/qmladvancedtutorial/samegame/samegame2/samegame.js b/doc/tutorials/qmladvancedtutorial/samegame/samegame2/samegame.js
new file mode 100644
index 0000000..c749dc1
--- /dev/null
+++ b/doc/tutorials/qmladvancedtutorial/samegame/samegame2/samegame.js
@@ -0,0 +1,63 @@
+//![0]
+var blockSize = 40;
+var maxColumn = 10;
+var maxRow = 15;
+var maxIndex = maxColumn * maxRow;
+var board = new Array(maxIndex);
+var component;
+
+//Index function used instead of a 2D array
+function index(column, row) {
+    return column + (row * maxColumn);
+}
+
+function startNewGame() {
+    //Delete blocks from previous game
+    for (var i = 0; i < maxIndex; i++) {
+        if (board[i] != null)
+            board[i].destroy();
+    }
+
+    //Calculate board size
+    maxColumn = Math.floor(background.width / blockSize);
+    maxRow = Math.floor(background.height / blockSize);
+    maxIndex = maxRow * maxColumn;
+
+    //Initialize Board
+    board = new Array(maxIndex);
+    for (var column = 0; column < maxColumn; column++) {
+        for (var row = 0; row < maxRow; row++) {
+            board[index(column, row)] = null;
+            createBlock(column, row);
+        }
+    }
+}
+
+function createBlock(column, row) {
+    if (component == null)
+        component = Qt.createComponent("Block.qml");
+
+    // Note that if Block.qml was not a local file, component.status would be
+    // Loading and we should wait for the component's statusChanged() signal to
+    // know when the file is downloaded and ready before calling createObject().
+    if (component.status == Component.Ready) {
+        var dynamicObject = component.createObject(background);
+        if (dynamicObject == null) {
+            console.log("error creating block");
+            console.log(component.errorString());
+            return false;
+        }
+        dynamicObject.x = column * blockSize;
+        dynamicObject.y = row * blockSize;
+        dynamicObject.width = blockSize;
+        dynamicObject.height = blockSize;
+        board[index(column, row)] = dynamicObject;
+    } else {
+        console.log("error loading block component");
+        console.log(component.errorString());
+        return false;
+    }
+    return true;
+}
+//![0]
+
diff --git a/doc/tutorials/qmladvancedtutorial/samegame/samegame2/samegame.qml b/doc/tutorials/qmladvancedtutorial/samegame/samegame2/samegame.qml
new file mode 100644
index 0000000..11f6229
--- /dev/null
+++ b/doc/tutorials/qmladvancedtutorial/samegame/samegame2/samegame.qml
@@ -0,0 +1,85 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the examples of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 1.0
+//![2]
+import "samegame.js" as SameGame
+//![2]
+
+Rectangle {
+    id: screen
+
+    width: 490; height: 720
+
+    SystemPalette { id: activePalette }
+
+    Item {
+        width: parent.width
+        anchors { top: parent.top; bottom: toolBar.top }
+
+        Image {
+            id: background
+            anchors.fill: parent
+            source: "../shared/pics/background.jpg"
+            fillMode: Image.PreserveAspectCrop
+        }
+    }
+
+    Rectangle {
+        id: toolBar
+        width: parent.width; height: 32
+        color: activePalette.window
+        anchors.bottom: screen.bottom
+
+//![1]
+        Button {
+            anchors { left: parent.left; verticalCenter: parent.verticalCenter }
+            text: "New Game"
+            onClicked: SameGame.startNewGame()
+        }
+//![1]
+
+        Text {
+            id: score
+            anchors { right: parent.right; verticalCenter: parent.verticalCenter }
+            text: "Score: Who knows?"
+        }
+    }
+}
diff --git a/doc/tutorials/qmladvancedtutorial/samegame/samegame2/samegame2.qmlproject b/doc/tutorials/qmladvancedtutorial/samegame/samegame2/samegame2.qmlproject
new file mode 100644
index 0000000..d4909f8
--- /dev/null
+++ b/doc/tutorials/qmladvancedtutorial/samegame/samegame2/samegame2.qmlproject
@@ -0,0 +1,16 @@
+import QmlProject 1.0
+
+Project {
+    /* Include .qml, .js, and image files from current directory and subdirectories */
+    QmlFiles {
+        directory: "."
+    }
+    JavaScriptFiles {
+        directory: "."
+    }
+    ImageFiles {
+        directory: "."
+    }
+    /* List of plugin directories passed to QML runtime */
+    // importPaths: [ " ../exampleplugin " ]
+}
diff --git a/doc/tutorials/qmladvancedtutorial/samegame/samegame3/Block.qml b/doc/tutorials/qmladvancedtutorial/samegame/samegame3/Block.qml
new file mode 100644
index 0000000..784a6f4
--- /dev/null
+++ b/doc/tutorials/qmladvancedtutorial/samegame/samegame3/Block.qml
@@ -0,0 +1,63 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the examples of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+//![0]
+import QtQuick 1.0
+
+Item {
+    id: block
+
+    property int type: 0
+
+    Image {
+        id: img
+
+        anchors.fill: parent
+        source: {
+            if (type == 0)
+                return "../shared/pics/redStone.png";
+            else if (type == 1) 
+                return "../shared/pics/blueStone.png";
+            else
+                return "../shared/pics/greenStone.png";
+        }
+    }
+}
+//![0]
diff --git a/doc/tutorials/qmladvancedtutorial/samegame/samegame3/Button.qml b/doc/tutorials/qmladvancedtutorial/samegame/samegame3/Button.qml
new file mode 100644
index 0000000..cbf1b54
--- /dev/null
+++ b/doc/tutorials/qmladvancedtutorial/samegame/samegame3/Button.qml
@@ -0,0 +1,81 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the examples of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 1.0
+
+Rectangle {
+    id: container
+
+    property string text: "Button"
+
+    signal clicked
+
+    width: buttonLabel.width + 20; height: buttonLabel.height + 5
+    border { width: 1; color: Qt.darker(activePalette.button) }
+    smooth: true
+    radius: 8
+
+    // color the button with a gradient
+    gradient: Gradient {
+        GradientStop {
+            position: 0.0
+            color: {
+                if (mouseArea.pressed)
+                    return activePalette.dark
+                else
+                    return activePalette.light
+            }
+        }
+        GradientStop { position: 1.0; color: activePalette.button }
+    }
+
+    MouseArea {
+        id: mouseArea
+        anchors.fill: parent
+        onClicked: container.clicked();
+    }
+
+    Text {
+        id: buttonLabel
+        anchors.centerIn: container
+        color: activePalette.buttonText
+        text: container.text
+    }
+}
diff --git a/doc/tutorials/qmladvancedtutorial/samegame/samegame3/Dialog.qml b/doc/tutorials/qmladvancedtutorial/samegame/samegame3/Dialog.qml
new file mode 100644
index 0000000..8554d86
--- /dev/null
+++ b/doc/tutorials/qmladvancedtutorial/samegame/samegame3/Dialog.qml
@@ -0,0 +1,71 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the examples of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+//![0]
+import QtQuick 1.0
+
+Rectangle {
+    id: container
+
+    function show(text) {
+        dialogText.text = text;
+        container.opacity = 1;
+    }
+
+    function hide() {
+        container.opacity = 0;
+    }
+
+    width: dialogText.width + 20
+    height: dialogText.height + 20
+    opacity: 0
+
+    Text {
+        id: dialogText
+        anchors.centerIn: parent
+        text: ""
+    }
+
+    MouseArea {
+        anchors.fill: parent
+        onClicked: hide();
+    }
+}
+//![0]
diff --git a/doc/tutorials/qmladvancedtutorial/samegame/samegame3/samegame.js b/doc/tutorials/qmladvancedtutorial/samegame/samegame3/samegame.js
new file mode 100644
index 0000000..df5bdfb
--- /dev/null
+++ b/doc/tutorials/qmladvancedtutorial/samegame/samegame3/samegame.js
@@ -0,0 +1,174 @@
+/* This script file handles the game logic */
+var maxColumn = 10;
+var maxRow = 15;
+var maxIndex = maxColumn * maxRow;
+var board = new Array(maxIndex);
+var component;
+
+//Index function used instead of a 2D array
+function index(column, row) {
+    return column + (row * maxColumn);
+}
+
+function startNewGame() {
+    //Calculate board size
+    maxColumn = Math.floor(gameCanvas.width / gameCanvas.blockSize);
+    maxRow = Math.floor(gameCanvas.height / gameCanvas.blockSize);
+    maxIndex = maxRow * maxColumn;
+
+    //Close dialogs
+    dialog.hide();
+
+    //Initialize Board
+    board = new Array(maxIndex);
+    gameCanvas.score = 0;
+    for (var column = 0; column < maxColumn; column++) {
+        for (var row = 0; row < maxRow; row++) {
+            board[index(column, row)] = null;
+            createBlock(column, row);
+        }
+    }
+}
+
+function createBlock(column, row) {
+    if (component == null)
+        component = Qt.createComponent("Block.qml");
+
+    // Note that if Block.qml was not a local file, component.status would be
+    // Loading and we should wait for the component's statusChanged() signal to
+    // know when the file is downloaded and ready before calling createObject().
+    if (component.status == Component.Ready) {
+        var dynamicObject = component.createObject(gameCanvas);
+        if (dynamicObject == null) {
+            console.log("error creating block");
+            console.log(component.errorString());
+            return false;
+        }
+        dynamicObject.type = Math.floor(Math.random() * 3);
+        dynamicObject.x = column * gameCanvas.blockSize;
+        dynamicObject.y = row * gameCanvas.blockSize;
+        dynamicObject.width = gameCanvas.blockSize;
+        dynamicObject.height = gameCanvas.blockSize;
+        board[index(column, row)] = dynamicObject;
+    } else {
+        console.log("error loading block component");
+        console.log(component.errorString());
+        return false;
+    }
+    return true;
+}
+
+var fillFound; //Set after a floodFill call to the number of blocks found
+var floodBoard; //Set to 1 if the floodFill reaches off that node
+
+//![1]
+function handleClick(xPos, yPos) {
+    var column = Math.floor(xPos / gameCanvas.blockSize);
+    var row = Math.floor(yPos / gameCanvas.blockSize);
+    if (column >= maxColumn || column < 0 || row >= maxRow || row < 0)
+        return;
+    if (board[index(column, row)] == null)
+        return;
+    //If it's a valid block, remove it and all connected (does nothing if it's not connected)
+    floodFill(column, row, -1);
+    if (fillFound <= 0)
+        return;
+    gameCanvas.score += (fillFound - 1) * (fillFound - 1);
+    shuffleDown();
+    victoryCheck();
+}
+//![1]
+
+function floodFill(column, row, type) {
+    if (board[index(column, row)] == null)
+        return;
+    var first = false;
+    if (type == -1) {
+        first = true;
+        type = board[index(column, row)].type;
+
+        //Flood fill initialization
+        fillFound = 0;
+        floodBoard = new Array(maxIndex);
+    }
+    if (column >= maxColumn || column < 0 || row >= maxRow || row < 0)
+        return;
+    if (floodBoard[index(column, row)] == 1 || (!first && type != board[index(column, row)].type))
+        return;
+    floodBoard[index(column, row)] = 1;
+    floodFill(column + 1, row, type);
+    floodFill(column - 1, row, type);
+    floodFill(column, row + 1, type);
+    floodFill(column, row - 1, type);
+    if (first == true && fillFound == 0)
+        return;     //Can't remove single blocks
+    board[index(column, row)].opacity = 0;
+    board[index(column, row)] = null;
+    fillFound += 1;
+}
+
+function shuffleDown() {
+    //Fall down
+    for (var column = 0; column < maxColumn; column++) {
+        var fallDist = 0;
+        for (var row = maxRow - 1; row >= 0; row--) {
+            if (board[index(column, row)] == null) {
+                fallDist += 1;
+            } else {
+                if (fallDist > 0) {
+                    var obj = board[index(column, row)];
+                    obj.y += fallDist * gameCanvas.blockSize;
+                    board[index(column, row + fallDist)] = obj;
+                    board[index(column, row)] = null;
+                }
+            }
+        }
+    }
+    //Fall to the left
+    var fallDist = 0;
+    for (var column = 0; column < maxColumn; column++) {
+        if (board[index(column, maxRow - 1)] == null) {
+            fallDist += 1;
+        } else {
+            if (fallDist > 0) {
+                for (var row = 0; row < maxRow; row++) {
+                    var obj = board[index(column, row)];
+                    if (obj == null)
+                        continue;
+                    obj.x -= fallDist * gameCanvas.blockSize;
+                    board[index(column - fallDist, row)] = obj;
+                    board[index(column, row)] = null;
+                }
+            }
+        }
+    }
+}
+
+//![2]
+function victoryCheck() {
+    //Award bonus points if no blocks left
+    var deservesBonus = true;
+    for (var column = maxColumn - 1; column >= 0; column--)
+        if (board[index(column, maxRow - 1)] != null)
+        deservesBonus = false;
+    if (deservesBonus)
+        gameCanvas.score += 500;
+
+    //Check whether game has finished
+    if (deservesBonus || !(floodMoveCheck(0, maxRow - 1, -1)))
+        dialog.show("Game Over. Your score is " + gameCanvas.score);
+}
+//![2]
+
+//only floods up and right, to see if it can find adjacent same-typed blocks 
+function floodMoveCheck(column, row, type) {
+    if (column >= maxColumn || column < 0 || row >= maxRow || row < 0)
+        return false;
+    if (board[index(column, row)] == null)
+        return false;
+    var myType = board[index(column, row)].type;
+    if (type == myType)
+        return true;
+    return floodMoveCheck(column + 1, row, myType) || floodMoveCheck(column, row - 1, board[index(column, row)].type);
+}
+
diff --git a/doc/tutorials/qmladvancedtutorial/samegame/samegame3/samegame.qml b/doc/tutorials/qmladvancedtutorial/samegame/samegame3/samegame.qml
new file mode 100644
index 0000000..972b778
--- /dev/null
+++ b/doc/tutorials/qmladvancedtutorial/samegame/samegame3/samegame.qml
@@ -0,0 +1,109 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the examples of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+//![0]
+import QtQuick 1.0
+import "samegame.js" as SameGame
+
+Rectangle {
+    id: screen
+
+    width: 490; height: 720
+
+    SystemPalette { id: activePalette }
+
+    Item {
+        width: parent.width
+        anchors { top: parent.top; bottom: toolBar.top }
+
+        Image {
+            id: background
+            anchors.fill: parent
+            source: "../shared/pics/background.jpg"
+            fillMode: Image.PreserveAspectCrop
+        }
+
+//![1]
+        Item {
+            id: gameCanvas
+
+            property int score: 0
+            property int blockSize: 40
+
+            width: parent.width - (parent.width % blockSize)
+            height: parent.height - (parent.height % blockSize)
+            anchors.centerIn: parent
+
+            MouseArea {
+                anchors.fill: parent
+                onClicked: SameGame.handleClick(mouse.x, mouse.y)
+            }
+        }
+//![1]
+    }
+
+//![2]
+    Dialog {
+        id: dialog
+        anchors.centerIn: parent
+        z: 100
+    }
+//![2]
+
+    Rectangle {
+        id: toolBar
+        width: parent.width; height: 30
+        color: activePalette.window
+        anchors.bottom: screen.bottom
+
+        Button {
+            anchors { left: parent.left; verticalCenter: parent.verticalCenter }
+            text: "New Game"
+            onClicked: SameGame.startNewGame()
+        }
+
+        Text {
+            id: score
+            anchors { right: parent.right; verticalCenter: parent.verticalCenter }
+            text: "Score: Who knows?"
+        }
+    }
+}
+//![0]
diff --git a/doc/tutorials/qmladvancedtutorial/samegame/samegame3/samegame3.qmlproject b/doc/tutorials/qmladvancedtutorial/samegame/samegame3/samegame3.qmlproject
new file mode 100644
index 0000000..d4909f8
--- /dev/null
+++ b/doc/tutorials/qmladvancedtutorial/samegame/samegame3/samegame3.qmlproject
@@ -0,0 +1,16 @@
+import QmlProject 1.0
+
+Project {
+    /* Include .qml, .js, and image files from current directory and subdirectories */
+    QmlFiles {
+        directory: "."
+    }
+    JavaScriptFiles {
+        directory: "."
+    }
+    ImageFiles {
+        directory: "."
+    }
+    /* List of plugin directories passed to QML runtime */
+    // importPaths: [ " ../exampleplugin " ]
+}
diff --git a/doc/tutorials/qmladvancedtutorial/samegame/samegame4/content/BoomBlock.qml b/doc/tutorials/qmladvancedtutorial/samegame/samegame4/content/BoomBlock.qml
new file mode 100644
index 0000000..326b1b8
--- /dev/null
+++ b/doc/tutorials/qmladvancedtutorial/samegame/samegame4/content/BoomBlock.qml
@@ -0,0 +1,122 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the examples of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 1.0
+import Qt.labs.particles 1.0
+
+Item {
+    id: block
+
+    property int type: 0
+    property bool dying: false
+
+    //![1]
+    property bool spawned: false
+
+    Behavior on x {
+        enabled: spawned;
+        SpringAnimation{ spring: 2; damping: 0.2 }
+    }
+    Behavior on y {
+        SpringAnimation{ spring: 2; damping: 0.2 }
+    }
+    //![1]
+
+    //![2]
+    Image {
+        id: img
+
+        anchors.fill: parent
+        source: {
+            if (type == 0)
+                return "../../shared/pics/redStone.png";
+            else if (type == 1)
+                return "../../shared/pics/blueStone.png";
+            else
+                return "../../shared/pics/greenStone.png";
+        }
+        opacity: 0
+
+        Behavior on opacity {
+            NumberAnimation { properties:"opacity"; duration: 200 }
+        }
+    }
+    //![2]
+
+    //![3]
+    Particles {
+        id: particles
+
+        width: 1; height: 1
+        anchors.centerIn: parent
+
+        emissionRate: 0
+        lifeSpan: 700; lifeSpanDeviation: 600
+        angle: 0; angleDeviation: 360;
+        velocity: 100; velocityDeviation: 30
+        source: {
+            if (type == 0)
+                return "../../shared/pics/redStar.png";
+            else if (type == 1) 
+                return "../../shared/pics/blueStar.png";
+            else
+                return "../../shared/pics/greenStar.png";
+        }
+    }
+    //![3]
+
+    //![4]
+    states: [
+        State {
+            name: "AliveState"
+            when: spawned == true && dying == false
+            PropertyChanges { target: img; opacity: 1 }
+        },
+
+        State {
+            name: "DeathState"
+            when: dying == true
+            StateChangeScript { script: particles.burst(50); }
+            PropertyChanges { target: img; opacity: 0 }
+            StateChangeScript { script: block.destroy(1000); }
+        }
+    ]
+    //![4]
+}
diff --git a/doc/tutorials/qmladvancedtutorial/samegame/samegame4/content/Button.qml b/doc/tutorials/qmladvancedtutorial/samegame/samegame4/content/Button.qml
new file mode 100644
index 0000000..cbf1b54
--- /dev/null
+++ b/doc/tutorials/qmladvancedtutorial/samegame/samegame4/content/Button.qml
@@ -0,0 +1,81 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the examples of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 1.0
+
+Rectangle {
+    id: container
+
+    property string text: "Button"
+
+    signal clicked
+
+    width: buttonLabel.width + 20; height: buttonLabel.height + 5
+    border { width: 1; color: Qt.darker(activePalette.button) }
+    smooth: true
+    radius: 8
+
+    // color the button with a gradient
+    gradient: Gradient {
+        GradientStop {
+            position: 0.0
+            color: {
+                if (mouseArea.pressed)
+                    return activePalette.dark
+                else
+                    return activePalette.light
+            }
+        }
+        GradientStop { position: 1.0; color: activePalette.button }
+    }
+
+    MouseArea {
+        id: mouseArea
+        anchors.fill: parent
+        onClicked: container.clicked();
+    }
+
+    Text {
+        id: buttonLabel
+        anchors.centerIn: container
+        color: activePalette.buttonText
+        text: container.text
+    }
+}
diff --git a/doc/tutorials/qmladvancedtutorial/samegame/samegame4/content/Dialog.qml b/doc/tutorials/qmladvancedtutorial/samegame/samegame4/content/Dialog.qml
new file mode 100644
index 0000000..c390202
--- /dev/null
+++ b/doc/tutorials/qmladvancedtutorial/samegame/samegame4/content/Dialog.qml
@@ -0,0 +1,107 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the examples of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 1.0
+
+//![0]
+Rectangle {
+    id: container
+//![0]
+
+//![1]
+    property string inputText: textInput.text
+    signal closed
+
+    function show(text) {
+        dialogText.text = text;
+        container.opacity = 1;
+        textInput.opacity = 0;
+    }
+
+    function showWithInput(text) {
+        show(text);
+        textInput.opacity = 1;
+        textInput.focus = true;
+        textInput.text = ""
+    }
+
+    function hide() {
+        textInput.focus = false;
+        container.opacity = 0;
+        container.closed();
+    }
+//![1]
+
+    width: dialogText.width + textInput.width + 20
+    height: dialogText.height + 20
+    opacity: 0
+    visible: opacity > 0
+
+    Text {
+        id: dialogText
+        anchors { verticalCenter: parent.verticalCenter; left: parent.left; leftMargin: 10 }
+        text: ""
+    }
+
+//![2]
+    TextInput {
+        id: textInput
+        anchors { verticalCenter: parent.verticalCenter; left: dialogText.right }
+        width: 80
+        text: ""
+
+        onAccepted: container.hide()    // close dialog when Enter is pressed
+    }
+//![2]
+
+    MouseArea {
+        anchors.fill: parent
+
+        onClicked:  {
+            if (textInput.text == "" && textInput.opacity > 0)
+                textInput.openSoftwareInputPanel();
+            else
+                hide();
+        }
+    }
+
+//![3]
+}
+//![3]
diff --git a/doc/tutorials/qmladvancedtutorial/samegame/samegame4/content/samegame.js b/doc/tutorials/qmladvancedtutorial/samegame/samegame4/content/samegame.js
new file mode 100755
index 0000000..79ff0c1
--- /dev/null
+++ b/doc/tutorials/qmladvancedtutorial/samegame/samegame4/content/samegame.js
@@ -0,0 +1,225 @@
+/* This script file handles the game logic */
+var maxColumn = 10;
+var maxRow = 15;
+var maxIndex = maxColumn * maxRow;
+var board = new Array(maxIndex);
+var component;
+var scoresURL = "";
+var gameDuration;
+
+//Index function used instead of a 2D array
+function index(column, row) {
+    return column + (row * maxColumn);
+}
+
+function startNewGame() {
+    //Delete blocks from previous game
+    for (var i = 0; i < maxIndex; i++) {
+        if (board[i] != null)
+            board[i].destroy();
+    }
+
+    //Calculate board size
+    maxColumn = Math.floor(gameCanvas.width / gameCanvas.blockSize);
+    maxRow = Math.floor(gameCanvas.height / gameCanvas.blockSize);
+    maxIndex = maxRow * maxColumn;
+
+    //Close dialogs
+    nameInputDialog.hide();
+    dialog.hide();
+
+    //Initialize Board
+    board = new Array(maxIndex);
+    gameCanvas.score = 0;
+    for (var column = 0; column < maxColumn; column++) {
+        for (var row = 0; row < maxRow; row++) {
+            board[index(column, row)] = null;
+            createBlock(column, row);
+        }
+    }
+
+    gameDuration = new Date();
+}
+
+function createBlock(column, row) {
+    if (component == null)
+        component = Qt.createComponent("content/BoomBlock.qml");
+
+    // Note that if Block.qml was not a local file, component.status would be
+    // Loading and we should wait for the component's statusChanged() signal to
+    // know when the file is downloaded and ready before calling createObject().
+    if (component.status == Component.Ready) {
+        var dynamicObject = component.createObject(gameCanvas);
+        if (dynamicObject == null) {
+            console.log("error creating block");
+            console.log(component.errorString());
+            return false;
+        }
+        dynamicObject.type = Math.floor(Math.random() * 3);
+        dynamicObject.x = column * gameCanvas.blockSize;
+        dynamicObject.y = row * gameCanvas.blockSize;
+        dynamicObject.width = gameCanvas.blockSize;
+        dynamicObject.height = gameCanvas.blockSize;
+        dynamicObject.spawned = true;
+        board[index(column, row)] = dynamicObject;
+    } else {
+        console.log("error loading block component");
+        console.log(component.errorString());
+        return false;
+    }
+    return true;
+}
+
+var fillFound; //Set after a floodFill call to the number of blocks found
+var floodBoard; //Set to 1 if the floodFill reaches off that node
+
+function handleClick(xPos, yPos) {
+    var column = Math.floor(xPos / gameCanvas.blockSize);
+    var row = Math.floor(yPos / gameCanvas.blockSize);
+    if (column >= maxColumn || column < 0 || row >= maxRow || row < 0)
+        return;
+    if (board[index(column, row)] == null)
+        return;
+    //If it's a valid block, remove it and all connected (does nothing if it's not connected)
+    floodFill(column, row, -1);
+    if (fillFound <= 0)
+        return;
+    gameCanvas.score += (fillFound - 1) * (fillFound - 1);
+    shuffleDown();
+    victoryCheck();
+}
+
+function floodFill(column, row, type) {
+    if (board[index(column, row)] == null)
+        return;
+    var first = false;
+    if (type == -1) {
+        first = true;
+        type = board[index(column, row)].type;
+
+        //Flood fill initialization
+        fillFound = 0;
+        floodBoard = new Array(maxIndex);
+    }
+    if (column >= maxColumn || column < 0 || row >= maxRow || row < 0)
+        return;
+    if (floodBoard[index(column, row)] == 1 || (!first && type != board[index(column, row)].type))
+        return;
+    floodBoard[index(column, row)] = 1;
+    floodFill(column + 1, row, type);
+    floodFill(column - 1, row, type);
+    floodFill(column, row + 1, type);
+    floodFill(column, row - 1, type);
+    if (first == true && fillFound == 0)
+        return;     //Can't remove single blocks
+    board[index(column, row)].dying = true;
+    board[index(column, row)] = null;
+    fillFound += 1;
+}
+
+function shuffleDown() {
+    //Fall down
+    for (var column = 0; column < maxColumn; column++) {
+        var fallDist = 0;
+        for (var row = maxRow - 1; row >= 0; row--) {
+            if (board[index(column, row)] == null) {
+                fallDist += 1;
+            } else {
+                if (fallDist > 0) {
+                    var obj = board[index(column, row)];
+                    obj.y = (row + fallDist) * gameCanvas.blockSize;
+                    board[index(column, row + fallDist)] = obj;
+                    board[index(column, row)] = null;
+                }
+            }
+        }
+    }
+    //Fall to the left
+    fallDist = 0;
+    for (column = 0; column < maxColumn; column++) {
+        if (board[index(column, maxRow - 1)] == null) {
+            fallDist += 1;
+        } else {
+            if (fallDist > 0) {
+                for (row = 0; row < maxRow; row++) {
+                    obj = board[index(column, row)];
+                    if (obj == null)
+                        continue;
+                    obj.x = (fallDist - column) * gameCanvas.blockSize;
+                    board[index(column - fallDist, row)] = obj;
+                    board[index(column, row)] = null;
+                }
+            }
+        }
+    }
+}
+
+//![3]
+function victoryCheck() {
+//![3]
+    //Award bonus points if no blocks left
+    var deservesBonus = true;
+    for (var column = maxColumn - 1; column >= 0; column--)
+        if (board[index(column, maxRow - 1)] != null)
+        deservesBonus = false;
+    if (deservesBonus)
+        gameCanvas.score += 500;
+
+//![4]
+    //Check whether game has finished
+    if (deservesBonus || !(floodMoveCheck(0, maxRow - 1, -1))) {
+        gameDuration = new Date() - gameDuration;
+        nameInputDialog.showWithInput("You won! Please enter your name: ");
+    }
+}
+//![4]
+
+//only floods up and right, to see if it can find adjacent same-typed blocks 
+function floodMoveCheck(column, row, type) {
+    if (column >= maxColumn || column < 0 || row >= maxRow || row < 0)
+        return false;
+    if (board[index(column, row)] == null)
+        return false;
+    var myType = board[index(column, row)].type;
+    if (type == myType)
+        return true;
+    return floodMoveCheck(column + 1, row, myType) || floodMoveCheck(column, row - 1, board[index(column, row)].type);
+}
+
+//![2]
+function saveHighScore(name) {
+    if (scoresURL != "")
+        sendHighScore(name);
+
+    var db = openDatabaseSync("SameGameScores", "1.0", "Local SameGame High Scores", 100);
+    var dataStr = "INSERT INTO Scores VALUES(?, ?, ?, ?)";
+    var data = [name, gameCanvas.score, maxColumn + "x" + maxRow, Math.floor(gameDuration / 1000)];
+    db.transaction(function(tx) {
+        tx.executeSql('CREATE TABLE IF NOT EXISTS Scores(name TEXT, score NUMBER, gridSize TEXT, time NUMBER)');
+        tx.executeSql(dataStr, data);
+
+        var rs = tx.executeSql('SELECT * FROM Scores WHERE gridSize = "12x17" ORDER BY score desc LIMIT 10');
+        var r = "\nHIGH SCORES for a standard sized grid\n\n"
+        for (var i = 0; i < rs.rows.length; i++) {
+            r += (i + 1) + ". " + rs.rows.item(i).name + ' got ' + rs.rows.item(i).score + ' points in ' + rs.rows.item(i).time + ' seconds.\n';
+        }
+        dialog.show(r);
+    });
+}
+//![2]
+
+//![1]
+function sendHighScore(name) {
+    var postman = new XMLHttpRequest()
+        var postData = "name=" + name + "&score=" + gameCanvas.score + "&gridSize=" + maxColumn + "x" + maxRow + "&time=" + Math.floor(gameDuration / 1000);
+    postman.open("POST", scoresURL, true);
+    postman.setRequestHeader("Content-Type", "application/x-www-form-urlencoded");
+    postman.onreadystatechange = function() {
+        if (postman.readyState == postman.DONE) {
+            dialog.show("Your score has been uploaded.");
+        }
+    }
+    postman.send(postData);
+}
+//![1]
+
diff --git a/doc/tutorials/qmladvancedtutorial/samegame/samegame4/highscores/README b/doc/tutorials/qmladvancedtutorial/samegame/samegame4/highscores/README
new file mode 100644
index 0000000..eaa00fa
--- /dev/null
+++ b/doc/tutorials/qmladvancedtutorial/samegame/samegame4/highscores/README
@@ -0,0 +1 @@
+The SameGame example can interface with a simple PHP script to store XML high score data on a remote server. We do not have a publically accessible server available for this use, but if you have access to a PHP capable webserver you can copy the files (score_data.xml, score.php, score_style.xsl) to it and alter the highscore_server variable at the top of the samegame.js file to point to it.
diff --git a/doc/tutorials/qmladvancedtutorial/samegame/samegame4/highscores/score_data.xml b/doc/tutorials/qmladvancedtutorial/samegame/samegame4/highscores/score_data.xml
new file mode 100755
index 0000000..c3fd90d
--- /dev/null
+++ b/doc/tutorials/qmladvancedtutorial/samegame/samegame4/highscores/score_data.xml
@@ -0,0 +1,2 @@
+<record><score>1000000</score><name>Alan the Tester</name><gridSize>0x0</gridSize><seconds>0</seconds></record>
+<record><score>6213</score><name>Alan</name><gridSize>12x17</gridSize><seconds>51</seconds></record>
diff --git a/doc/tutorials/qmladvancedtutorial/samegame/samegame4/highscores/score_style.xsl b/doc/tutorials/qmladvancedtutorial/samegame/samegame4/highscores/score_style.xsl
new file mode 100755
index 0000000..670354c
--- /dev/null
+++ b/doc/tutorials/qmladvancedtutorial/samegame/samegame4/highscores/score_style.xsl
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+<xsl:template match="/">
+  <html>
+  <head><title>SameGame High Scores</title></head>
+  <body>
+  <h2>SameGame High Scores</h2>
+    <table border="1">
+      <tr bgcolor="lightsteelblue">
+        <th>Name</th>
+        <th>Score</th>
+        <th>Grid Size</th>
+        <th>Time, s</th>
+      </tr>
+      <xsl:for-each select="records/record">
+      <xsl:sort select="score" data-type="number" order="descending"/>
+      <tr>
+        <td><xsl:value-of select="name"/></td>
+        <td><xsl:value-of select="score"/></td>
+        <td><xsl:value-of select="gridSize"/></td>
+        <td><xsl:value-of select="seconds"/></td>
+      </tr>
+      </xsl:for-each>
+    </table>
+  </body>
+  </html>
+</xsl:template>
+</xsl:stylesheet>
diff --git a/doc/tutorials/qmladvancedtutorial/samegame/samegame4/highscores/scores.php b/doc/tutorials/qmladvancedtutorial/samegame/samegame4/highscores/scores.php
new file mode 100755
index 0000000..daf480e
--- /dev/null
+++ b/doc/tutorials/qmladvancedtutorial/samegame/samegame4/highscores/scores.php
@@ -0,0 +1,31 @@
+<?php
+    $score = $_POST["score"];
+    echo "<html>";
+    echo "<head><title>SameGame High Scores</title></head><body>";
+    if($score > 0){#Sending in a new high score
+        $name = $_POST["name"];
+        $grid = $_POST["gridSize"];
+        $time = $_POST["time"];
+        if($name == "")
+            $name = "Anonymous";
+	$file = fopen("score_data.xml", "a");
+        $ret = fwrite($file, "<record><score>". $score . "</score><name>" 
+            . $name . "</name><gridSize>" . $grid . "</gridSize><seconds>"
+            . $time . "</seconds></record>\n");
+        echo "Your score has been recorded. Thanks for playing!";
+        if($ret == False)
+            echo "<br/> There was an error though, so don't expect to see that score again.";
+    }else{#Read high score list
+        #Now uses XSLT to display. So just print the file. With XML cruft added.
+        #Note that firefox at least won't apply the XSLT on a php file. So redirecting
+	$file = fopen("scores.xml", "w");
+        $ret = fwrite($file, '<?xml version="1.0" encoding="ISO-8859-1"?>' . "\n"
+            . '<?xml-stylesheet type="text/xsl" href="score_style.xsl"?>' . "\n"
+            . "<records>\n" . file_get_contents("score_data.xml") . "</records>\n");
+        if($ret == False)
+            echo "There was an internal error. Sorry.";
+        else
+            echo '<script type="text/javascript">window.location.replace("scores.xml")</script>';
+    }
+    echo "</body></html>";
+?>
diff --git a/doc/tutorials/qmladvancedtutorial/samegame/samegame4/samegame.qml b/doc/tutorials/qmladvancedtutorial/samegame/samegame4/samegame.qml
new file mode 100644
index 0000000..e830635
--- /dev/null
+++ b/doc/tutorials/qmladvancedtutorial/samegame/samegame4/samegame.qml
@@ -0,0 +1,115 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the examples of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 1.0
+import "content"
+import "content/samegame.js" as SameGame
+
+Rectangle {
+    id: screen
+
+    width: 490; height: 720
+
+    SystemPalette { id: activePalette }
+
+    Item {
+        width: parent.width
+        anchors { top: parent.top; bottom: toolBar.top }
+
+        Image {
+            id: background
+            anchors.fill: parent
+            source: "../shared/pics/background.jpg"
+            fillMode: Image.PreserveAspectCrop
+        }
+
+        Item {
+            id: gameCanvas
+            property int score: 0
+            property int blockSize: 40
+
+            anchors.centerIn: parent
+            width: parent.width - (parent.width % blockSize);
+            height: parent.height - (parent.height % blockSize);
+
+            MouseArea {
+                anchors.fill: parent; onClicked: SameGame.handleClick(mouse.x,mouse.y);
+            }
+        }
+    }
+
+    Dialog {
+        id: dialog
+        anchors.centerIn: parent
+        z: 100
+    }
+
+    //![0]
+    Dialog {
+        id: nameInputDialog
+        anchors.centerIn: parent
+        z: 100
+
+        onClosed: {
+            if (nameInputDialog.inputText != "")
+                SameGame.saveHighScore(nameInputDialog.inputText);
+        }
+    }
+    //![0]
+
+    Rectangle {
+        id: toolBar
+        width: parent.width; height: 30
+        color: activePalette.window
+        anchors.bottom: screen.bottom
+
+        Button {
+            anchors { left: parent.left; verticalCenter: parent.verticalCenter }
+            text: "New Game"
+            onClicked: SameGame.startNewGame()
+        }
+
+        Text {
+            id: score
+            anchors { right: parent.right; verticalCenter: parent.verticalCenter }
+            text: "Score: " + gameCanvas.score
+        }
+    }
+}
diff --git a/doc/tutorials/qmladvancedtutorial/samegame/samegame4/samegame4.qmlproject b/doc/tutorials/qmladvancedtutorial/samegame/samegame4/samegame4.qmlproject
new file mode 100644
index 0000000..d4909f8
--- /dev/null
+++ b/doc/tutorials/qmladvancedtutorial/samegame/samegame4/samegame4.qmlproject
@@ -0,0 +1,16 @@
+import QmlProject 1.0
+
+Project {
+    /* Include .qml, .js, and image files from current directory and subdirectories */
+    QmlFiles {
+        directory: "."
+    }
+    JavaScriptFiles {
+        directory: "."
+    }
+    ImageFiles {
+        directory: "."
+    }
+    /* List of plugin directories passed to QML runtime */
+    // importPaths: [ " ../exampleplugin " ]
+}
diff --git a/doc/tutorials/qmladvancedtutorial/samegame/shared/pics/background.jpg b/doc/tutorials/qmladvancedtutorial/samegame/shared/pics/background.jpg
new file mode 100644
index 0000000..903d395
Binary files /dev/null and b/doc/tutorials/qmladvancedtutorial/samegame/shared/pics/background.jpg differ
diff --git a/doc/tutorials/qmladvancedtutorial/samegame/shared/pics/blueStar.png b/doc/tutorials/qmladvancedtutorial/samegame/shared/pics/blueStar.png
new file mode 100644
index 0000000..ff9588f
Binary files /dev/null and b/doc/tutorials/qmladvancedtutorial/samegame/shared/pics/blueStar.png differ
diff --git a/doc/tutorials/qmladvancedtutorial/samegame/shared/pics/blueStone.png b/doc/tutorials/qmladvancedtutorial/samegame/shared/pics/blueStone.png
new file mode 100644
index 0000000..20e43c7
Binary files /dev/null and b/doc/tutorials/qmladvancedtutorial/samegame/shared/pics/blueStone.png differ
diff --git a/doc/tutorials/qmladvancedtutorial/samegame/shared/pics/greenStar.png b/doc/tutorials/qmladvancedtutorial/samegame/shared/pics/greenStar.png
new file mode 100644
index 0000000..cd06854
Binary files /dev/null and b/doc/tutorials/qmladvancedtutorial/samegame/shared/pics/greenStar.png differ
diff --git a/doc/tutorials/qmladvancedtutorial/samegame/shared/pics/greenStone.png b/doc/tutorials/qmladvancedtutorial/samegame/shared/pics/greenStone.png
new file mode 100644
index 0000000..b568a19
Binary files /dev/null and b/doc/tutorials/qmladvancedtutorial/samegame/shared/pics/greenStone.png differ
diff --git a/doc/tutorials/qmladvancedtutorial/samegame/shared/pics/redStar.png b/doc/tutorials/qmladvancedtutorial/samegame/shared/pics/redStar.png
new file mode 100644
index 0000000..0a4dffe
Binary files /dev/null and b/doc/tutorials/qmladvancedtutorial/samegame/shared/pics/redStar.png differ
diff --git a/doc/tutorials/qmladvancedtutorial/samegame/shared/pics/redStone.png b/doc/tutorials/qmladvancedtutorial/samegame/shared/pics/redStone.png
new file mode 100644
index 0000000..36b09a2
Binary files /dev/null and b/doc/tutorials/qmladvancedtutorial/samegame/shared/pics/redStone.png differ
diff --git a/doc/tutorials/qmladvancedtutorial/samegame/shared/pics/star.png b/doc/tutorials/qmladvancedtutorial/samegame/shared/pics/star.png
new file mode 100644
index 0000000..defbde5
Binary files /dev/null and b/doc/tutorials/qmladvancedtutorial/samegame/shared/pics/star.png differ
diff --git a/doc/tutorials/qmladvancedtutorial/samegame/shared/pics/yellowStone.png b/doc/tutorials/qmladvancedtutorial/samegame/shared/pics/yellowStone.png
new file mode 100644
index 0000000..b1ce762
Binary files /dev/null and b/doc/tutorials/qmladvancedtutorial/samegame/shared/pics/yellowStone.png differ
diff --git a/doc/tutorials/qmladvancedtutorial/samegame1.rst b/doc/tutorials/qmladvancedtutorial/samegame1.rst
new file mode 100644
index 0000000..c8638ce
--- /dev/null
+++ b/doc/tutorials/qmladvancedtutorial/samegame1.rst
@@ -0,0 +1,70 @@
+.. _samegame1:
+
+QML Advanced Tutorial 1 - Creating the Game Canvas and Blocks
+*************************************************************
+
+Creating the application screen
+===============================
+
+The first step is to create the basic QML items in your application.
+
+To begin with, we create our Same Game application with a main screen like this:
+
+.. figure:: declarative-adv-tutorial1.png
+    :align: center
+
+This is defined by the main application file, ``samegame.qml``, which looks like this:
+
+.. pysideinclude:: samegame/samegame1/samegame.qml
+    :snippet: 0
+
+This gives you a basic game window that includes the main canvas for the
+blocks, a "New Game" button and a score display.
+
+One item you may not recognize here
+is the SystemPalette item. This provides access to the Qt system palette
+and is used to give the button a more native look-and-feel.
+
+Notice the anchors for the ``Item``, ``Button`` and ``Text`` elements are set using
+group notation for readability.
+
+Adding Button and Block components
+==================================
+
+The ``Button`` item in the code above is defined in a separate component file named ``Button.qml``.
+To create a functional button, we use the QML elements Text and MouseArea inside a Rectangle.
+Here is the ``Button.qml`` code:
+
+.. pysideinclude:: samegame/samegame1/Button.qml
+    :snippet: 0
+
+This essentially defines a rectangle that contains text and can be clicked. The MouseArea
+has an ``onClicked()`` handler that is implemented to emit the ``clicked()`` signal of the
+``container`` when the area is clicked.
+
+In Same Game, the screen is filled with small blocks when the game begins.
+Each block is just an item that contains an image. The block
+code is defined in a separate ``Block.qml`` file:
+
+.. pysideinclude:: samegame/samegame1/Block.qml
+    :snippet: 0
+
+At the moment, the block doesn't do anything; it is just an image. As the
+tutorial progresses we will animate and give behaviors to the blocks.
+We have not added any code yet to create the blocks; we will do this
+in the next chapter.
+
+We have set the image to be the size of its parent Item using ``anchors.fill: parent``.
+This means that when we dynamically create and resize the block items
+later on in the tutorial, the image will be scaled automatically to the
+correct size.
+
+Notice the relative path for the Image element's ``source`` property.
+This path is relative to the location of the file that contains the Image element.
+Alternatively, you could set the Image source to an absolute file path or a URL
+that contains an image.
+
+You should be familiar with the code so far. We have just created some basic
+elements to get started. Next, we will populate the game canvas with some blocks.
+
+[Previous :ref:`qmladvancedtutorial`] [Next :ref:`samegame2`]
\ No newline at end of file
diff --git a/doc/tutorials/qmladvancedtutorial/samegame2.rst b/doc/tutorials/qmladvancedtutorial/samegame2.rst
new file mode 100644
index 0000000..6cc12d5
--- /dev/null
+++ b/doc/tutorials/qmladvancedtutorial/samegame2.rst
@@ -0,0 +1,71 @@
+.. _samegame2:
+
+QML Advanced Tutorial 2 - Populating the Game Canvas
+****************************************************
+
+Generating the blocks in JavaScript
+===================================
+
+Now that we've written some basic elements, let's start writing the game.
+
+The first task is to generate the game blocks. Each time the New Game button
+is clicked, the game canvas is populated with a new, random set of
+blocks. Since we need to dynamically generate new blocks for each new game,
+we cannot use Repeater to define the blocks. Instead, we will
+create the blocks in JavaScript.
+
+Here is the JavaScript code for generating the blocks, contained in a new
+file, ``samegame.js``. The code is explained below.
+
+.. pysideinclude:: samegame/samegame2/samegame.js
+    :snippet: 0
+
+The ``startNewGame()`` function deletes the blocks created in the previous game and
+calculates the number of rows and columns of blocks required to fill the game window for the new game.
+Then, it creates an array to store all the game
+blocks, and calls ``createBlock()`` to create enough blocks to fill the game window.
+
+The ``createBlock()`` function creates a block from the ``Block.qml`` file
+and moves the new block to its position on the game canvas. This involves several steps:
+
+*  ``Qt.createComponent()`` is called to
+   generate an element from ``Block.qml``.  If the component is ready,
+   we can call ``createObject()`` to create an instance of the ``Block``
+   item.
+
+*  If ``createObject()`` returned null (i.e. if there was an error
+   while loading the object), print the error information.
+
+*  Place the block in its position on the board and set its width and
+   height.  Also, store it in the blocks array for future reference.
+
+*  Finally, print error information to the console if the component
+   could not be loaded for some reason (for example, if the file is
+   missing).
+
+Connecting JavaScript components to QML
+=======================================
+
+Now we need to call the JavaScript code in ``samegame.js`` from our QML files.
+To do this, we add this line to ``samegame.qml`` which imports
+the JavaScript file as a module:
+
+.. pysideinclude:: samegame/samegame2/samegame.qml
+    :snippet: 2
+
+This allows us to refer to any functions within ``samegame.js`` using "SameGame"
+as a prefix: for example, ``SameGame.startNewGame()`` or ``SameGame.createBlock()``.
+This means we can now connect the New Game button's ``onClicked`` handler to the ``startNewGame()``
+function, like this:
+
+.. pysideinclude:: samegame/samegame2/samegame.qml
+    :snippet: 1
+
+So, when you click the New Game button, ``startNewGame()`` is called and generates a field of blocks, like this:
+
+.. figure:: declarative-adv-tutorial2.png
+    :align: center
+
+Now, we have a screen of blocks, and we can begin to add the game mechanics.
+
+[Previous :ref:`samegame1`] [Next :ref:`samegame3`]
\ No newline at end of file
diff --git a/doc/tutorials/qmladvancedtutorial/samegame3.rst b/doc/tutorials/qmladvancedtutorial/samegame3.rst
new file mode 100644
index 0000000..a1fe44e
--- /dev/null
+++ b/doc/tutorials/qmladvancedtutorial/samegame3.rst
@@ -0,0 +1,95 @@
+.. _samegame3:
+
+QML Advanced Tutorial 3 - Implementing the Game Logic
+*****************************************************
+
+Making a playable game
+======================
+
+Now that we have all the game components, we can add the game logic that
+dictates how a player interacts with the blocks and plays the game
+until it is won or lost.
+
+To do this, we have added the following functions to ``samegame.js``:
+
+
+* ``handleClick(x,y)``
+* ``floodFill(xIdx,yIdx,type)``
+* ``shuffleDown()``
+* ``victoryCheck()``
+* ``floodMoveCheck(xIdx, yIdx, type)``
+
+As this is a tutorial about QML, not game design, we will only discuss ``handleClick()`` and ``victoryCheck()`` below since they interface directly with the QML elements. Note that although the game logic here is written in JavaScript, it could have been written in Python and then exposed to QML.
+
+Enabling mouse click interaction
+================================
+
+To make it easier for the JavaScript code to interface with the QML elements, we have added an Item called ``gameCanvas`` to ``samegame.qml``. It replaces the background as the item which contains the blocks. It also accepts mouse input from the user.  Here is the item code:
+
+.. pysideinclude:: samegame/samegame3/samegame.qml
+    :snippet: 1
+
+The ``gameCanvas`` item is the exact size of the board, and has a ``score`` property and a MouseArea to handle mouse clicks.
+The blocks are now created as its children, and its dimensions are used to determine the board size so that
+the application scales to the available screen size.
+Since its size is bound to a multiple of ``blockSize``, ``blockSize`` was moved out of ``samegame.js`` and into ``samegame.qml`` as a QML property.
+Note that it can still be accessed from the script.
+
+When clicked, the MouseArea calls ``handleClick()`` in ``samegame.js``, which determines whether the player's click should cause any blocks to be removed, and updates ``gameCanvas.score`` with the current score if necessary. Here is the ``handleClick()`` function:
+
+.. pysideinclude:: samegame/samegame3/samegame.js
+    :snippet: 1
+
+Note that if ``score`` was a global variable in the ``samegame.js`` file you would not be able to bind to it. You can only bind to QML properties.
+
+Updating the score
+==================
+
+When the player clicks a block and triggers \c handleClick(), \c handleClick() also calls \c victoryCheck() to update the score and to check whether the player has completed the game. Here is the \c victoryCheck() code:
+
+.. pysideinclude:: samegame/samegame3/samegame.js
+    :snippet: 2
+
+This updates the ``gameCanvas.score`` value and displays a "Game Over" dialog if the game is finished.
+
+The Game Over dialog is created using a ``Dialog`` element that is defined in ``Dialog.qml``. Here is the ``Dialog.qml`` code. Notice how it is designed to be usable imperatively from the script file, via the functions and signals:
+
+.. pysideinclude:: samegame/samegame3/Dialog.qml
+    :snippet: 0
+
+And this is how it is used in the main ``samegame.qml`` file:
+
+.. pysideinclude:: samegame/samegame3/samegame.qml
+    :snippet: 2
+
+We give the dialog a ``z`` value of 100 to ensure it is displayed on top of our other components. The default ``z`` value for an item is 0.
+
+
+A dash of color
+---------------
+
+It's not much fun to play Same Game if all the blocks are the same color, so we've modified the ``createBlock()`` function in ``samegame.js`` to randomly create a different type of block (for either red, green or blue) each time it is called. ``Block.qml`` has also changed so that each block contains a different image depending on its type:
+
+.. pysideinclude:: samegame/samegame3/Block.qml
+    :snippet: 0
+
+
+A working game
+==============
+
+Now we now have a working game! The blocks can be clicked, the player can score, and the game can end (and then you can start a new one).
+Here is a screenshot of what has been accomplished so far:
+
+.. figure:: declarative-adv-tutorial3.png
+    :align: center
+
+This is what ``samegame.qml`` looks like now:
+
+.. pysideinclude:: samegame/samegame3/samegame.qml
+    :snippet: 0
+
+The game works, but it's a little boring right now. Where are the smooth animated transitions? Where are the high scores?
+If you were a QML expert you could have written these in the first iteration, but in this tutorial they've been saved
+until the next chapter - where your application becomes alive!
+
+[Previous :ref:`samegame2`] [Next :ref:`samegame4`]
diff --git a/doc/tutorials/qmladvancedtutorial/samegame4.rst b/doc/tutorials/qmladvancedtutorial/samegame4.rst
new file mode 100644
index 0000000..50aaff1
--- /dev/null
+++ b/doc/tutorials/qmladvancedtutorial/samegame4.rst
@@ -0,0 +1,187 @@
+.. _samegame4:
+
+QML Advanced Tutorial 4 - Finishing Touches
+*******************************************
+
+Adding some flair
+=================
+
+Now we're going to do two things to liven up the game: animate the blocks and add a High Score system.
+
+We've also cleaned up the directory structure for our application files. We now have a lot of files, so all the
+JavaScript and QML files outside of ``samegame.qml`` have been moved into a new sub-directory named "content".
+
+In anticipation of the new block animations, ``Block.qml`` file is now renamed to ``BoomBlock.qml``.
+
+Animating block movement
+------------------------
+
+First we will animate the blocks so that they move in a fluid manner. QML has a number of methods for adding fluid
+movement, and in this case we're going to use the Behavior element to add a SpringAnimation.
+In ``BoomBlock.qml``, we apply a SpringAnimation behavior to the ``x`` and ``y`` properties so that the
+block will follow and animate its movement in a spring-like fashion towards the specified position (whose
+values will be set by ``samegame.js``).Here is the code added to ``BoomBlock.qml``:
+
+.. pysideinclude:: samegame/samegame4/content/BoomBlock.qml
+    :snippet: 1
+
+The ``spring`` and ``damping`` values can be changed to modify the spring-like effect of the animation.
+
+The ``enabled: spawned`` setting refers to the ``spawned`` value that is set from ``createBlock()`` in ``samegame.js``.
+This ensures the SpringAnimation on the ``x`` is only enabled after ``createBlock()`` has set the block to
+the correct position. Otherwise, the blocks will slide out of the corner (0,0) when a game begins, instead of falling
+from the top in rows. (Try commenting out ``enabled: spawned`` and see for yourself.)
+
+Animating block opacity changes
+-------------------------------
+
+Next, we will add a smooth exit animation. For this, we'll use a Behavior element, which allows us to specify
+a default animation when a property change occurs. In this case, when the ``opacity`` of a Block changes, we will
+animate the opacity value so that it gradually fades in and out, instead of abruptly changing between fully
+visible and invisible. To do this, we'll apply a Behavior on the ``opacity`` property of the ``Image``
+element in ``BoomBlock.qml``:
+
+.. pysideinclude:: samegame/samegame4/content/BoomBlock.qml
+    :snippet: 2
+
+Note the ``opacity: 0`` which means the block is transparent when it is first created. We could set the opacity
+in ``samegame.js`` when we create and destroy the blocks,
+but instead we'll use states, since this is useful for the next animation we're going to add.
+Initially, we add these States to the root element of ``BoomBlock.qml``:
+
+::
+
+    property bool dying: false
+    states: [
+        State{ name: "AliveState"; when: spawned == true && dying == false
+            PropertyChanges { target: img; opacity: 1 }
+        },
+        State{ name: "DeathState"; when: dying == true
+            PropertyChanges { target: img; opacity: 0 }
+        }
+    ]
+
+Now blocks will automatically fade in, as we already set ``spawned`` to true when we implemented the block animations.
+To fade out, we set ``dying`` to true instead of setting opacity to 0 when a block is destroyed (in the ``floodFill()`` function).
+
+Adding particle effects
+-----------------------
+
+Finally, we'll add a cool-looking particle effect to the blocks when they are destroyed. To do this, we first add a Particles element in
+``BoomBlock.qml``, like so:
+
+.. pysideinclude:: samegame/samegame4/content/BoomBlock.qml
+    :snippet: 3
+
+To fully understand this you should read the Particles documentation, but it's important to note that ``emissionRate`` is set
+to zero so that particles are not emitted normally.
+Also, we extend the ``dying`` State, which creates a burst of particles by calling the ``burst()`` method on the particles element. The code for the states now look
+like this:
+
+.. pysideinclude:: samegame/samegame4/content/BoomBlock.qml
+    :snippet: 4
+
+Now the game is beautifully animated, with subtle (or not-so-subtle) animations added for all of the
+player's actions. The end result is shown below, with a different set of images to demonstrate basic theming:
+
+.. figure:: declarative-adv-tutorial4.gif
+    :align: center
+
+The theme change here is produced simply by replacing the block images. This can be done at runtime by changing the \l Image \c source property, so for a further challenge, you could add a button that toggles between themes with different images.
+
+Keeping a High Scores table
+===========================
+
+Another feature we might want to add to the game is a method of storing and retrieving high scores.
+
+To do this, we will show a dialog when the game is over to request the player's name and add it to a High Scores table.
+This requires a few changes to ``Dialog.qml``. In addition to a ``Text`` element, it now has a
+``TextInput`` child item for receiving keyboard text input:
+
+.. pysideinclude:: samegame/samegame4/content/Dialog.qml
+    :snippet: 2
+    :prepend: Rectangle {
+              ...
+    :append: ...
+             }
+
+
+We'll also add a ``showWithInput()`` function. The text input will only be visible if this function
+is called instead of ``show()``. When the dialog is closed, it emits a ``closed()`` signal, and
+other elements can retrieve the text entered by the user through an ``inputText`` property:
+
+.. pysideinclude:: samegame/samegame4/content/Dialog.qml
+    :snippet: 1
+    :prepend: Rectangle {
+              ...
+    :append: ...
+             }
+
+Now the dialog can be used in ``samegame.qml``:
+
+.. pysideinclude:: samegame/samegame4/samegame.qml
+    :snippet: 0
+
+When the dialog emits the ``closed`` signal, we call the new ``saveHighScore()`` function in ``samegame.js``, which stores the high score locally in an SQL database and also send the score to an online database if possible.
+
+The ``nameInputDialog`` is activated in the ``victoryCheck()`` function in ``samegame.js``:
+
+.. pysideinclude:: samegame/samegame4/content/samegame.js
+    :snippet: 4
+    :prepend: function vitoryCheck() {
+              ...
+
+Storing high scores offline
+---------------------------
+
+Now we need to implement the functionality to actually save the High Scores table.
+
+Here is the ``saveHighScore()`` function in ``samegame.js``:
+
+.. pysideinclude:: samegame/samegame4/content/samegame.js
+    :snippet: 2
+
+First we call ``sendHighScore()`` (explained in the section below) if it is possible to send the high scores to an online database.
+
+Then, we use the Offline Storage API to maintain a persistant SQL database unique to this application. We create an offline storage database for the high scores using ``openDatabase()`` and prepare the data and SQL query that we want to use to save it. The offline storage API uses SQL queries for data manipulation and retrival, and in the ``db.transaction()`` call we use three SQL queries to initialize the database (if necessary), and then add to and retrieve high scores. To use the returned data, we turn it into a string with one line per row returned, and show a dialog containing that string.
+
+This is one way of storing and displaying high scores locally, but certainly not the only way. A more complex alternative would be to create a high score dialog component, and pass it the results for processing and display (instead of reusing the ``Dialog``). This would allow a more themeable dialog that could beter present the high scores. If your QML is the UI for a Python application, you could also have passed the score to a Python function to store it locally in a variety of ways, including a simple format without SQL or in another SQL database.
+
+Storing high scores online
+--------------------------
+
+You've seen how you can store high scores locally, but it is also easy to integrate a web-enabled high score storage into your QML application. The implementation we've done here is very
+simple: the high score data is posted to a php script running on a server somewhere, and that server then stores it and
+displays it to visitors. You could also request an XML or QML file from that same server, which contains and displays the scores,
+but that's beyond the scope of this tutorial. The php script we use here is available in the ``examples`` directory.
+
+If the player entered their name we can send the data to the web service us
+
+If the player enters a name, we send the data to the service using this code in ``samegame.js``:
+
+.. pysideinclude:: samegame/samegame4/content/samegame.js
+    :snippet: 1
+
+The XMLHttpRequest in this code is the same as the ``XMLHttpRequest()`` as you'll find in standard browser JavaScript, and can be used in the same way to dynamically get XML
+or QML from the web service to display the high scores. We don't worry about the response in this case - we just post the high
+score data to the web server. If it had returned a QML file (or a URL to a QML file) you could instantiate it in much the same
+way as you did with the blocks.
+
+An alternate way to access and submit web-based data would be to use QML elements designed for this purpose. XmlListModel
+makes it very easy to fetch and display XML based data such as RSS in a QML application (see the Flickr demo for an example).
+
+
+That's it!
+==========
+
+By following this tutorial you've seen how you can write a fully functional application in QML:
+
+* Build your application with QML elements.
+* Add application logic with JavaScript code.
+* Add animations with Behaviors and states.
+* Store persistent application data using, for example, the Offline Storage API or XMLHttpRequest.
+
+There is so much more to learn about QML that we haven't been able to cover in this tutorial. Check out all the
+demos and examples and the documentation to see all the things you can do with QML!
+
+[Previous :ref:`samegame3`]
\ No newline at end of file
diff --git a/doc/tutorials/qmltutorial/declarative-tutorial1.png b/doc/tutorials/qmltutorial/declarative-tutorial1.png
new file mode 100644
index 0000000..c9d3844
Binary files /dev/null and b/doc/tutorials/qmltutorial/declarative-tutorial1.png differ
diff --git a/doc/tutorials/qmltutorial/declarative-tutorial2.png b/doc/tutorials/qmltutorial/declarative-tutorial2.png
new file mode 100644
index 0000000..835484a
Binary files /dev/null and b/doc/tutorials/qmltutorial/declarative-tutorial2.png differ
diff --git a/doc/tutorials/qmltutorial/declarative-tutorial3_animation.gif b/doc/tutorials/qmltutorial/declarative-tutorial3_animation.gif
new file mode 100644
index 0000000..80b78de
Binary files /dev/null and b/doc/tutorials/qmltutorial/declarative-tutorial3_animation.gif differ
diff --git a/doc/tutorials/qmltutorial/helloworld.tar.bz2 b/doc/tutorials/qmltutorial/helloworld.tar.bz2
new file mode 100644
index 0000000..001a525
Binary files /dev/null and b/doc/tutorials/qmltutorial/helloworld.tar.bz2 differ
diff --git a/doc/tutorials/qmltutorial/helloworld/Cell.qml b/doc/tutorials/qmltutorial/helloworld/Cell.qml
new file mode 100644
index 0000000..76055ab
--- /dev/null
+++ b/doc/tutorials/qmltutorial/helloworld/Cell.qml
@@ -0,0 +1,72 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the examples of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+//![0]
+import QtQuick 1.0
+
+//![1]
+Item {
+    id: container
+//![4]
+    property alias cellColor: rectangle.color
+//![4]
+//![5]
+    signal clicked(color cellColor)
+//![5]
+
+    width: 40; height: 25
+//![1]
+
+//![2]
+    Rectangle {
+        id: rectangle
+        border.color: "white"
+        anchors.fill: parent
+    }
+//![2]
+
+//![3]
+    MouseArea {
+        anchors.fill: parent
+        onClicked: container.clicked(container.cellColor)
+    }
+//![3]
+}
+//![0]
diff --git a/doc/tutorials/qmltutorial/helloworld/tutorial1.qml b/doc/tutorials/qmltutorial/helloworld/tutorial1.qml
new file mode 100644
index 0000000..83b57b8
--- /dev/null
+++ b/doc/tutorials/qmltutorial/helloworld/tutorial1.qml
@@ -0,0 +1,63 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the examples of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+//![0]
+//![3]
+import QtQuick 1.0
+//![3]
+
+//![1]
+Rectangle {
+    id: page
+    width: 500; height: 200
+    color: "lightgray"
+//![1]
+
+//![2]
+    Text {
+        id: helloText
+        text: "Hello world!"
+        y: 30
+        anchors.horizontalCenter: page.horizontalCenter
+        font.pointSize: 24; font.bold: true
+    }
+//![2]
+}
+//![0]
diff --git a/doc/tutorials/qmltutorial/helloworld/tutorial2.qml b/doc/tutorials/qmltutorial/helloworld/tutorial2.qml
new file mode 100644
index 0000000..1bfab92
--- /dev/null
+++ b/doc/tutorials/qmltutorial/helloworld/tutorial2.qml
@@ -0,0 +1,72 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the examples of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+//![0]
+import QtQuick 1.0
+
+Rectangle {
+    id: page
+    width: 500; height: 200
+    color: "lightgray"
+
+    Text {
+        id: helloText
+        text: "Hello world!"
+        y: 30
+        anchors.horizontalCenter: page.horizontalCenter
+        font.pointSize: 24; font.bold: true
+    }
+
+    Grid {
+        id: colorPicker
+        x: 4; anchors.bottom: page.bottom; anchors.bottomMargin: 4
+        rows: 2; columns: 3; spacing: 3
+
+//![1]
+        Cell { cellColor: "red"; onClicked: helloText.color = cellColor }
+//![1]
+        Cell { cellColor: "green"; onClicked: helloText.color = cellColor }
+        Cell { cellColor: "blue"; onClicked: helloText.color = cellColor }
+        Cell { cellColor: "yellow"; onClicked: helloText.color = cellColor }
+        Cell { cellColor: "steelblue"; onClicked: helloText.color = cellColor }
+        Cell { cellColor: "black"; onClicked: helloText.color = cellColor }
+    }
+}
+//![0]
diff --git a/doc/tutorials/qmltutorial/helloworld/tutorial3.qml b/doc/tutorials/qmltutorial/helloworld/tutorial3.qml
new file mode 100644
index 0000000..cc06865
--- /dev/null
+++ b/doc/tutorials/qmltutorial/helloworld/tutorial3.qml
@@ -0,0 +1,91 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the examples of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+//![0]
+import QtQuick 1.0
+
+Rectangle {
+    id: page
+    width: 500; height: 200
+    color: "lightgray"
+
+    Text {
+        id: helloText
+        text: "Hello world!"
+        y: 30
+        anchors.horizontalCenter: page.horizontalCenter
+        font.pointSize: 24; font.bold: true
+
+//![1]
+        MouseArea { id: mouseArea; anchors.fill: parent }
+//![1]
+
+//![2]
+        states: State {
+            name: "down"; when: mouseArea.pressed == true
+            PropertyChanges { target: helloText; y: 160; rotation: 180; color: "red" }
+        }
+//![2]
+
+//![3]
+        transitions: Transition {
+            from: ""; to: "down"; reversible: true
+            ParallelAnimation {
+                NumberAnimation { properties: "y,rotation"; duration: 500; easing.type: Easing.InOutQuad }
+                ColorAnimation { duration: 500 }
+            }
+        }
+//![3]
+    }
+
+    Grid {
+        id: colorPicker
+        x: 4; anchors.bottom: page.bottom; anchors.bottomMargin: 4
+        rows: 2; columns: 3; spacing: 3
+
+        Cell { cellColor: "red"; onClicked: helloText.color = cellColor }
+        Cell { cellColor: "green"; onClicked: helloText.color = cellColor }
+        Cell { cellColor: "blue"; onClicked: helloText.color = cellColor }
+        Cell { cellColor: "yellow"; onClicked: helloText.color = cellColor }
+        Cell { cellColor: "steelblue"; onClicked: helloText.color = cellColor }
+        Cell { cellColor: "black"; onClicked: helloText.color = cellColor }
+    }
+}
+//![0]
diff --git a/doc/tutorials/qmltutorial/index.rst b/doc/tutorials/qmltutorial/index.rst
new file mode 100644
index 0000000..35cda31
--- /dev/null
+++ b/doc/tutorials/qmltutorial/index.rst
@@ -0,0 +1,25 @@
+
+.. _qmltutorial:
+
+QML Tutorial
+************
+
+This tutorial gives an introduction to QML, the mark up language for Qt Quick. It doesn't cover everything;
+the emphasis is on teaching the key principles, and features are introduced as needed.
+
+Through the different steps of this tutorial we will learn about QML basic types, we will create our own QML component
+with properties and signals, and we will create a simple animation with the help of states and transitions.
+
+Chapter one starts with a minimal "Hello world" program and the following chapters introduce new concepts.
+
+The tutorial's source code can be downloaded :download:`here<helloworld.tar.bz2>`.
+
+Tutorial chapters:
+
+.. toctree::
+    :maxdepth: 1
+
+    step1.rst
+    step2.rst
+    step3.rst
+
diff --git a/doc/tutorials/qmltutorial/step1.rst b/doc/tutorials/qmltutorial/step1.rst
new file mode 100644
index 0000000..02a1095
--- /dev/null
+++ b/doc/tutorials/qmltutorial/step1.rst
@@ -0,0 +1,66 @@
+.. _qmlbasictypes:
+
+QML Tutorial 1 - Basic Types
+****************************
+
+This first program is a very simple "Hello world" example that introduces some basic QML concepts.
+The picture below is a screenshot of this program.
+
+.. figure:: declarative-tutorial1.png
+    :align: center
+
+Here is the QML code for the application:
+
+.. pysideinclude:: helloworld/tutorial1.qml
+    :snippet: 0
+
+Walkthrough
+===========
+
+Import
+------
+
+First, we need to import the types that we need for this example. Most QML files will import the built-in QML
+types (like Rectangle, Image, ...) that come with Qt, using:
+
+.. pysideinclude:: helloworld/tutorial1.qml
+    :snippet: 3
+
+Rectangle element
+-----------------
+
+.. pysideinclude:: helloworld/tutorial1.qml
+    :snippet: 1
+
+We declare a root element of type Rectangle. It is one of the basic building blocks you can use to create an application in QML.
+We give it an ``id`` to be able to refer to it later. In this case, we call it "page".
+We also set the ``width``, ``height`` and ``color`` properties.
+The Rectangle element contains many other properties (such as ``x`` and ``y``), but these are left at their default values.
+
+Text element
+------------
+
+.. pysideinclude code/tutorial1.qml
+    :snippet: 2
+
+We add a Text element as a child of the root Rectangle element that displays the text 'Hello world!'.
+
+The ``y`` property is used to position the text vertically at 30 pixels from the top of its parent.
+
+The ``anchors.horizontalCenter`` property refers to the horizontal center of an element.
+In this case, we specify that our text element should be horizontally centered in the *page* element.
+
+The ``font.pointSize`` and ``font.bold properties`` are related to fonts and use the dot notation.
+
+
+Viewing the example
+-------------------
+
+To view what you have created, run the QML Viewer tool (located in the ``bin directory`` of your Qt installation) with your filename as the first argument.
+For example, to run the provided completed Tutorial 1 example from the install location, you would type:
+
+::
+
+    bin/qmlviewer tutorial1.qml
+
+[Previous :ref:`qmltutorial`][Next :ref:`qmlcomponents`]
diff --git a/doc/tutorials/qmltutorial/step2.rst b/doc/tutorials/qmltutorial/step2.rst
new file mode 100644
index 0000000..4dacd00
--- /dev/null
+++ b/doc/tutorials/qmltutorial/step2.rst
@@ -0,0 +1,81 @@
+.. _qmlcomponents:
+
+QML Tutorial 2 - QML Components
+*******************************
+
+This chapter adds a color picker to change the color of the text.
+
+.. figure:: declarative-tutorial2.png
+    :align: center
+
+Our color picker is made of six cells with different colors.
+To avoid writing the same code multiple times for each cell, we create a new ``Cell`` component.
+A component provides a way of defining a new type that we can re-use in other QML files.
+A QML component is like a black-box and interacts with the outside world through properties, signals and functions and is generally
+defined in its own QML file.
+The component's filename must always start with a capital letter.
+
+Here is the QML code for ``Cell.qml``:
+
+.. pysideinclude:: helloworld/Cell.qml
+    :snippet: 0
+
+Walkthrough
+===========
+
+The Cell Component
+------------------
+
+.. pysideinclude:: helloworld/Cell.qml
+    :snippet: 1
+
+The root element of our component is an Item with the ``id`` *container*.
+An Item is the most basic visual element in QML and is often used as a container for other elements.
+
+.. pysideinclude:: helloworld/Cell.qml
+    :snippet: 4
+
+We declare a ``cellColor`` property. This property is accessible from  *outside* our component, this allows us
+to instantiate the cells with different colors.
+This property is just an alias to an existing property - the color of the rectangle that compose the cell.
+
+.. pysideinclude:: helloworld/Cell.qml
+    :snippet: 5
+
+We want our component to also have a signal that we call *clicked* with a *cellColor* parameter of type *color*.
+We will use this signal to change the color of the text in the main QML file later.
+
+.. pysideinclude:: helloworld/Cell.qml
+    :snippet: 2
+
+Our cell component is basically a colored rectangle with the ``id`` *rectangle*.
+
+The ``anchors.fill`` property is a convenient way to set the size of an element.
+In this case the rectangle will have the same size as its parent.
+
+.. pysideinclude:: helloworld/Cell.qml
+    :snippet: 3
+
+In order to change the color of the text when clicking on a cell, we create a MouseArea element with
+the same size as its parent.
+
+A MouseArea defines a signal called *clicked*.
+When this signal is triggered we want to emit our own *clicked* signal with the color as parameter.
+
+The main QML file
+-----------------
+
+In our main QML file, we use our ``Cell`` component to create the color picker:
+
+.. pysideinclude:: helloworld/tutorial2.qml
+    :snippet: 0
+
+We create the color picker by putting 6 cells with different colors in a grid.
+
+.. pysideinclude:: helloworld/tutorial2.qml
+    :snippet: 1
+
+When the *clicked* signal of our cell is triggered, we want to set the color of the text to the *cellColor* passed as a parameter.
+We can react to any signal of our component through a property of the name *'onSignalName'*.
+
+[Previous :ref:`qmlbasictypes`][Next :ref:`qmlstatesandtransitions`]
diff --git a/doc/tutorials/qmltutorial/step3.rst b/doc/tutorials/qmltutorial/step3.rst
new file mode 100644
index 0000000..a72d1ea
--- /dev/null
+++ b/doc/tutorials/qmltutorial/step3.rst
@@ -0,0 +1,47 @@
+.. _qmlstatesandtransitions:
+
+QML Tutorial 3 - States and Transitions
+***************************************
+
+In this chapter, we make this example a little bit more dynamic by introducing states and transitions.
+
+We want our text to move to the bottom of the screen, rotate and become red when clicked.
+
+.. figure:: declarative-tutorial3_animation.gif
+    :align: center
+
+Here is the QML code:
+
+.. pysideinclude:: helloworld/tutorial3.qml
+    :snippet: 0
+
+Walkthrough
+===========
+
+.. pysideinclude:: helloworld/tutorial3.qml
+    :snippet: 2
+
+First, we create a new *down* state for our text element.
+This state will be activated when the MouseArea is pressed, and deactivated when it is released.
+
+The *down* state includes a set of property changes from our implicit *default state*
+(the items as they were initially defined in the QML).
+Specifically, we set the ``y`` property of the text to ``160``, the rotation to ``180`` and the ``color`` to red.
+
+.. pysideinclude:: helloworld/tutorial3.qml
+    :snippet: 3
+
+Because we don't want the text to appear at the bottom instantly but rather move smoothly,
+we add a transition between our two states.
+
+``from`` and ``to`` define the states between which the transition will run.
+In this case, we want a transition from the default state to our *down* state.
+
+Because we want the same transition to be run in reverse when changing back from the *down* state to the default state,
+we set ``reversible`` to ``true``.
+This is equivalent to writing the two transitions separately.
+
+The ParallelAnimation element makes sure that the two types of animations (number and color) start at the same time.
+We could also run them one after the other by using SequentialAnimation instead.
+
+[Previous :ref:`qmlcomponents`]
diff --git a/doc/typesystem_doc.xml.in b/doc/typesystem_doc.xml.in
new file mode 100644
index 0000000..a3d6924
--- /dev/null
+++ b/doc/typesystem_doc.xml.in
@@ -0,0 +1,114 @@
+<?xml version="1.0" ?>
+<!--
+    This file is part of PySide project.
+    Copyright (C) 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
+    Contact: PySide team <contact@pyside.org>
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+-->
+<typesystem package="PySide">
+    <suppress-warning text="File containing conversion code for *" />
+    <suppress-warning text="File for inject code not exist: *" />
+
+    <load-typesystem name="typesystem_core.xml" generate="yes"/>
+
+    @if_QtNetwork@
+    <load-typesystem name="typesystem_network.xml" generate="yes" />
+    @end_QtNetwork@
+
+    @if_QtXml@
+    <load-typesystem name="typesystem_xml.xml" generate="yes" />
+    @end_QtXml@
+
+    @if_QtScript@
+    <load-typesystem name="typesystem_script.xml" generate="yes" />
+    @end_QtScript@
+
+    @if_QtGui@
+    <load-typesystem name="typesystem_gui.xml" generate="yes"/>
+    @end_QtGui@
+
+    @if_QtHelp@
+    <load-typesystem name="typesystem_help.xml" generate="yes" />
+    @end_QtHelp@
+
+    @if_Maemo5@
+    <load-typesystem name="typesystem_maemo5.xml" generate="yes" />
+    @end_Maemo5@
+
+    @if_QtMultimedia@
+    <load-typesystem name="typesystem_multimedia.xml" generate="yes" />
+    @end_QtMultimedia@
+
+    @if_QtDeclarative@
+    <load-typesystem name="typesystem_declarative.xml" generate="yes"/>
+    @end_QtDeclarative@
+
+    @if_QtOpenGL@
+    <load-typesystem name="typesystem_opengl.xml" generate="yes" />
+    @end_QtOpenGL@
+
+    @if_QtScriptTools@
+    <load-typesystem name="typesystem_scripttools.xml" generate="yes" />
+    @end_QtScriptTools@
+
+    @if_QtSql@
+    <load-typesystem name="typesystem_sql.xml" generate="yes" />
+    @end_QtSql@
+
+    @if_QtSvg@
+    <load-typesystem name="typesystem_svg.xml" generate="yes" />
+    @end_QtSvg@
+
+    @if_QtTest@
+    <load-typesystem name="typesystem_test.xml" generate="yes" />
+    @end_QtTest@
+
+    @if_QtUiTools@
+    <load-typesystem name="typesystem_uitools.xml" generate="yes" />
+    @end_QtUiTools@
+
+    @if_QtWebKit@
+    <load-typesystem name="typesystem_webkit.xml" generate="yes" />
+    @end_QtWebKit@
+
+
+    @if_QtXmlPatterns@
+    <load-typesystem name="typesystem_xmlpatterns.xml" generate="yes" />
+    @end_QtXmlPatterns@
+
+    @if_phonon@
+    <load-typesystem name="typesystem_phonon.xml" generate="yes" />
+    @end_phonon@
+
+    <suppress-warning text="Can't find qdoc3 file for class QMatrix4x3, tried: /home/hugo/src/pyside/build/doc/qdoc3-output/qmatrix4x3.xml" />
+    <suppress-warning text="Can't find qdoc3 file for class QMatrix3x4, tried: /home/hugo/src/pyside/build/doc/qdoc3-output/qmatrix3x4.xml" />
+    <suppress-warning text="Can't find qdoc3 file for class QMatrix2x3, tried: /home/hugo/src/pyside/build/doc/qdoc3-output/qmatrix2x3.xml" />
+    <suppress-warning text="Can't find qdoc3 file for class QMatrix4x2, tried: /home/hugo/src/pyside/build/doc/qdoc3-output/qmatrix4x2.xml" />
+    <suppress-warning text="Can't find qdoc3 file for class QMatrix3x3, tried: /home/hugo/src/pyside/build/doc/qdoc3-output/qmatrix3x3.xml" />
+    <suppress-warning text="Can't find qdoc3 file for class QMatrix2x2, tried: /home/hugo/src/pyside/build/doc/qdoc3-output/qmatrix2x2.xml" />
+    <suppress-warning text="Can't find qdoc3 file for class QMatrix3x2, tried: /home/hugo/src/pyside/build/doc/qdoc3-output/qmatrix3x2.xml" />
+    <suppress-warning text="Can't find qdoc3 file for class QMatrix2x4, tried: /home/hugo/src/pyside/build/doc/qdoc3-output/qmatrix2x4.xml" />
+
+    <!-- These classes are documented in ObjectDescription<T> or other base template class -->
+    <suppress-warning text="Can't find qdoc3 file for class AudioCaptureDevice, tried: /home/hugo/src/pyside/build/doc/qdoc3-output/phonon-audiocapturedevice.xml" />
+    <suppress-warning text="Can't find qdoc3 file for class VideoCaptureDevice, tried: /home/hugo/src/pyside/build/doc/qdoc3-output/phonon-videocapturedevice.xml" />
+    <suppress-warning text="Can't find qdoc3 file for class AudioOutputDevice, tried: /home/hugo/src/pyside/build/doc/qdoc3-output/phonon-audiooutputdevice.xml" />
+    <suppress-warning text="Can't find qdoc3 file for class AudioChannelDescription, tried: /home/hugo/src/pyside/build/doc/qdoc3-output/phonon-audiochanneldescription.xml" />
+    <suppress-warning text="Can't find qdoc3 file for class EffectDescription, tried: /home/hugo/src/pyside/build/doc/qdoc3-output/phonon-effectdescription.xml" />
+    <suppress-warning text="Can't find qdoc3 file for class SubtitleDescription, tried: /home/hugo/src/pyside/build/doc/qdoc3-output/phonon-subtitledescription.xml" />
+    <suppress-warning text="Can't find qdoc3 file for class EffectDescriptionModel, tried: /home/hugo/src/pyside/build/doc/qdoc3-output/phonon-effectdescriptionmodel.xml" />
+    <suppress-warning text="Can't find qdoc3 file for class AudioOutputDeviceModel, tried: /home/hugo/src/pyside/build/doc/qdoc3-output/phonon-audiooutputdevicemodel.xml" />
+</typesystem>
diff --git a/libpyside/CMakeLists.txt b/libpyside/CMakeLists.txt
index 0597f16..4fa878f 100644
--- a/libpyside/CMakeLists.txt
+++ b/libpyside/CMakeLists.txt
@@ -1,54 +1,85 @@
 project(libpyside)
 
+
+qt4_wrap_cpp(DESTROYLISTENER_MOC "destroylistener.h")
+
 set(libpyside_SRC
-dynamicqmetaobject.cpp
-signalmanager.cpp
-globalreceiver.cpp
-qsignal.cpp
-qslot.cpp
-pyside.cpp
+    dynamicqmetaobject.cpp
+    destroylistener.cpp
+    signalmanager.cpp
+    globalreceiver.cpp
+    globalreceiverv2.cpp
+    pysideclassinfo.cpp
+    pysidemetafunction.cpp
+    pysidesignal.cpp
+    pysideslot.cpp
+    pysideproperty.cpp
+    pysideqflags.cpp
+    pysideweakref.cpp
+    pyside.cpp
+    ${DESTROYLISTENER_MOC}
 )
 
 include_directories(${CMAKE_CURRENT_SOURCE_DIR}
                     ${SHIBOKEN_INCLUDE_DIR}
-                    ${PYTHON_INCLUDE_PATH}
+                    ${SHIBOKEN_PYTHON_INCLUDE_DIR}
                     ${QT_QTCORE_INCLUDE_DIR})
-
 add_library(pyside SHARED ${libpyside_SRC})
 target_link_libraries(pyside
-                      ${PYTHON_LIBRARIES}
+                      ${SHIBOKEN_PYTHON_LIBRARIES}
                       ${SHIBOKEN_LIBRARY}
                       ${QT_QTCORE_LIBRARY})
 
 set_target_properties(pyside PROPERTIES
                       VERSION ${BINDING_API_VERSION}
-                      SOVERSION "${BINDING_API_MAJOR_VERSION}.${BINDING_API_MINOR_VERSION}")
+                      SOVERSION "${BINDING_API_MAJOR_VERSION}.${BINDING_API_MINOR_VERSION}"
+                      OUTPUT_NAME "pyside${pyside_SUFFIX}${SHIBOKEN_PYTHON_SUFFIX}"
+                      DEFINE_SYMBOL PYSIDE_EXPORTS)
 
 #
 # install stuff
 #
 
 set(libpyside_HEADERS
+    destroylistener.h
     dynamicqmetaobject.h
     globalreceiver.h
+    pysideclassinfo.h
     pysideconversions.h
     pysidemacros.h
     signalmanager.h
     pyside.h
+    pysidemetafunction.h
+    pysidesignal.h
+    pysideproperty.h
+    pysideqflags.h
+    pysideweakref.h
 )
 
+if (CMAKE_BUILD_TYPE STREQUAL "Debug")
+    set(LIBRARY_OUTPUT_SUFFIX ${CMAKE_DEBUG_POSTFIX})
+else()
+    set(LIBRARY_OUTPUT_SUFFIX ${CMAKE_RELEASE_POSTFIX})
+endif()
+
 # create pkg-config file
 configure_file("${CMAKE_CURRENT_SOURCE_DIR}/pyside.pc.in"
-               "${CMAKE_CURRENT_BINARY_DIR}/pyside.pc" @ONLY)
+               "${CMAKE_CURRENT_BINARY_DIR}/pyside${pyside_SUFFIX}.pc" @ONLY)
 # create cmake-config files
 configure_file("${CMAKE_CURRENT_SOURCE_DIR}/PySideConfig.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/PySideConfig.cmake" @ONLY)
-configure_file("${CMAKE_CURRENT_SOURCE_DIR}/PySideVersion.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/PySideVersion.cmake" @ONLY)
+configure_file("${CMAKE_CURRENT_SOURCE_DIR}/PySideConfig-spec.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/PySideConfig${SHIBOKEN_PYTHON_SUFFIX}.cmake" @ONLY)
+configure_file("${CMAKE_CURRENT_SOURCE_DIR}/PySideConfigVersion.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/PySideConfigVersion.cmake" @ONLY)
 
 install(FILES ${libpyside_HEADERS}
-        DESTINATION include/${BINDING_NAME})
-install(TARGETS pyside LIBRARY DESTINATION ${LIB_INSTALL_DIR})
-install(FILES "${CMAKE_CURRENT_BINARY_DIR}/pyside.pc" DESTINATION "${LIB_INSTALL_DIR}/pkgconfig")
+        DESTINATION include/${BINDING_NAME}${pyside_SUFFIX})
+install(TARGETS pyside EXPORT pyside
+                       LIBRARY DESTINATION "${LIB_INSTALL_DIR}"
+                       ARCHIVE DESTINATION "${LIB_INSTALL_DIR}"
+                       RUNTIME DESTINATION bin)
+install(FILES "${CMAKE_CURRENT_BINARY_DIR}/pyside${pyside_SUFFIX}.pc" DESTINATION "${LIB_INSTALL_DIR}/pkgconfig")
 install(FILES "${CMAKE_CURRENT_BINARY_DIR}/PySideConfig.cmake"
         DESTINATION "${LIB_INSTALL_DIR}/cmake/PySide-${BINDING_API_VERSION}")
-install(FILES "${CMAKE_CURRENT_BINARY_DIR}/PySideVersion.cmake"
+install(FILES "${CMAKE_CURRENT_BINARY_DIR}/PySideConfig${SHIBOKEN_PYTHON_SUFFIX}.cmake"
+        DESTINATION "${LIB_INSTALL_DIR}/cmake/PySide-${BINDING_API_VERSION}")
+install(FILES "${CMAKE_CURRENT_BINARY_DIR}/PySideConfigVersion.cmake"
         DESTINATION "${LIB_INSTALL_DIR}/cmake/PySide-${BINDING_API_VERSION}")
diff --git a/libpyside/PySideConfig-spec.cmake.in b/libpyside/PySideConfig-spec.cmake.in
new file mode 100644
index 0000000..9a92546
--- /dev/null
+++ b/libpyside/PySideConfig-spec.cmake.in
@@ -0,0 +1,18 @@
+#  PYSIDE_INCLUDE_DIR   - Directories to include to use PySide
+#  PYSIDE_LIBRARY       - Files to link against to use PySide
+#  PYSIDE_PYTHONPATH    - Path to where the PySide Python module files could be found
+#  PYSIDE_TYPESYSTEMS   - Type system files that should be used by other bindings extending PySide
+
+SET(PYSIDE_INCLUDE_DIR "@CMAKE_INSTALL_PREFIX@/include/PySide@pyside_SUFFIX@")
+# Platform specific library names
+if(MSVC)
+    SET(PYSIDE_LIBRARY "@LIB_INSTALL_DIR@/@CMAKE_SHARED_LIBRARY_PREFIX@pyside@pyside_SUFFIX@@LIBRARY_OUTPUT_SUFFIX@@SHIBOKEN_PYTHON_SUFFIX@.lib")
+elseif(CYGWIN)
+    SET(PYSIDE_LIBRARY "@LIB_INSTALL_DIR@/@CMAKE_SHARED_LIBRARY_PREFIX@pyside@pyside_SUFFIX@@LIBRARY_OUTPUT_SUFFIX@@SHIBOKEN_PYTHON_SUFFIX@@CMAKE_IMPORT_LIBRARY_SUFFIX@")
+elseif(WIN32)
+    SET(PYSIDE_LIBRARY "@CMAKE_INSTALL_PREFIX@/bin/@CMAKE_SHARED_LIBRARY_PREFIX@pyside@pyside_SUFFIX@@LIBRARY_OUTPUT_SUFFIX@@SHIBOKEN_PYTHON_SUFFIX@@CMAKE_SHARED_LIBRARY_SUFFIX@")
+else()
+    SET(PYSIDE_LIBRARY "@LIB_INSTALL_DIR@/@CMAKE_SHARED_LIBRARY_PREFIX@pyside@pyside_SUFFIX@@LIBRARY_OUTPUT_SUFFIX@@SHIBOKEN_PYTHON_SUFFIX@@CMAKE_SHARED_LIBRARY_SUFFIX@")
+endif()
+SET(PYSIDE_PYTHONPATH "@SITE_PACKAGE@")
+SET(PYSIDE_TYPESYSTEMS "@CMAKE_INSTALL_PREFIX@/share/PySide@pyside_SUFFIX@/typesystems")
diff --git a/libpyside/PySideConfig.cmake.in b/libpyside/PySideConfig.cmake.in
index f302364..b7f45e8 100644
--- a/libpyside/PySideConfig.cmake.in
+++ b/libpyside/PySideConfig.cmake.in
@@ -1,5 +1,5 @@
-#  PYSIDE_INCLUDE_DIR   - Directories to include to use PySide
-#  PYSIDE_LIBRARIES     - Files to link against to use PySide
-
-SET(PYSIDE_INCLUDE_DIR "@CMAKE_INSTALL_PREFIX@/include/PySide")
-SET(PYSIDE_LIBRARY "@LIB_INSTALL_DIR@/@CMAKE_SHARED_LIBRARY_PREFIX@pyside@CMAKE_SHARED_LIBRARY_SUFFIX@")
+if (NOT PYTHON_BASENAME)
+    message(STATUS "Using default python: @SHIBOKEN_PYTHON_SUFFIX@")
+    SET(PYTHON_BASENAME @SHIBOKEN_PYTHON_SUFFIX@)
+endif()
+include(@LIB_INSTALL_DIR@/cmake/PySide-@BINDING_API_VERSION@/PySideConfig${PYTHON_BASENAME}.cmake)
diff --git a/libpyside/PySideConfigVersion.cmake.in b/libpyside/PySideConfigVersion.cmake.in
new file mode 100644
index 0000000..f5073ce
--- /dev/null
+++ b/libpyside/PySideConfigVersion.cmake.in
@@ -0,0 +1,10 @@
+set(PACKAGE_VERSION @BINDING_API_VERSION@)
+
+if("${PACKAGE_VERSION}" VERSION_LESS "${PACKAGE_FIND_VERSION}" )
+   set(PACKAGE_VERSION_COMPATIBLE FALSE)
+else("${PACKAGE_VERSION}" VERSION_LESS "${PACKAGE_FIND_VERSION}" )
+   set(PACKAGE_VERSION_COMPATIBLE TRUE)
+   if( "${PACKAGE_FIND_VERSION}" STREQUAL "${PACKAGE_VERSION}")
+      set(PACKAGE_VERSION_EXACT TRUE)
+   endif( "${PACKAGE_FIND_VERSION}" STREQUAL "${PACKAGE_VERSION}")
+endif("${PACKAGE_VERSION}" VERSION_LESS "${PACKAGE_FIND_VERSION}" )
diff --git a/libpyside/PySideVersion.cmake.in b/libpyside/PySideVersion.cmake.in
deleted file mode 100644
index c644686..0000000
--- a/libpyside/PySideVersion.cmake.in
+++ /dev/null
@@ -1,9 +0,0 @@
-set(PACKAGE_VERSION @BINDING_API_VERSION@)
-if("${PACKAGE_FIND_VERSION_MAJOR}" EQUAL @BINDING_API_MAJOR_VERSION@)
-    if("${PACKAGE_FIND_VERSION_MINOR}" EQUAL @BINDING_API_MINOR_VERSION@)
-        set(PACKAGE_VERSION_COMPATIBLE 1)
-        if("${PACKAGE_FIND_VERSION_PATCH}" EQUAL @BINDING_API_MICRO_VERSION@)
-            set(PACKAGE_VERSION_EXACT 1)
-        endif()
-    endif()
-endif()
diff --git a/libpyside/destroylistener.cpp b/libpyside/destroylistener.cpp
new file mode 100644
index 0000000..b0f191d
--- /dev/null
+++ b/libpyside/destroylistener.cpp
@@ -0,0 +1,67 @@
+#include <sbkpython.h>
+#include "destroylistener.h"
+
+#include <QObject>
+#include <shiboken.h>
+#include <QDebug>
+#include <QMutex>
+
+PySide::DestroyListener* PySide::DestroyListener::m_instance = 0;
+
+namespace PySide
+{
+
+struct DestroyListenerPrivate
+{
+    static bool m_destroyed;
+};
+
+
+DestroyListener* DestroyListener::instance()
+{
+    if (!m_instance)
+        m_instance = new DestroyListener(0);
+    return m_instance;
+}
+
+void DestroyListener::destroy()
+{
+    if (m_instance) {
+        m_instance->disconnect();
+        delete m_instance;
+        m_instance = 0;
+    }
+}
+
+void DestroyListener::listen(QObject *obj)
+{
+    SbkObject* wrapper = Shiboken::BindingManager::instance().retrieveWrapper(obj);
+    if (!wrapper) // avoid problem with multiple inheritance
+        return;
+
+    if (Py_IsInitialized() == 0)
+        onObjectDestroyed(obj);
+    else
+        QObject::connect(obj, SIGNAL(destroyed(QObject*)), this, SLOT(onObjectDestroyed(QObject*)), Qt::DirectConnection);
+}
+
+void DestroyListener::onObjectDestroyed(QObject* obj)
+{
+    SbkObject* wrapper = Shiboken::BindingManager::instance().retrieveWrapper(obj);
+    if (wrapper) //make sure the object exists before destroy
+        Shiboken::Object::destroy(wrapper, obj);
+}
+
+DestroyListener::DestroyListener(QObject *parent)
+    : QObject(parent)
+{
+    m_d = new DestroyListenerPrivate();
+}
+
+DestroyListener::~DestroyListener()
+{
+    delete m_d;
+}
+
+}//namespace
+
diff --git a/libpyside/destroylistener.h b/libpyside/destroylistener.h
new file mode 100644
index 0000000..0ba1039
--- /dev/null
+++ b/libpyside/destroylistener.h
@@ -0,0 +1,33 @@
+#ifndef PYSIDE_DESTROY_LISTENER
+#define PYSIDE_DESTROY_LISTENER
+
+
+#include <QObject>
+#include "pysidemacros.h"
+
+namespace PySide
+{
+class DestroyListenerPrivate;
+/// \deprecated This class is deprecated and isn't used by libpyside anymore.
+class PYSIDE_API DestroyListener : public QObject
+{
+    Q_OBJECT
+    public:
+        PYSIDE_DEPRECATED(static DestroyListener* instance());
+        static void destroy();
+        void listen(QObject* obj);
+
+    public slots:
+        void onObjectDestroyed(QObject* obj);
+
+    private:
+        static DestroyListener* m_instance;
+        DestroyListenerPrivate* m_d;
+        DestroyListener(QObject *parent);
+        ~DestroyListener();
+};
+
+}//namespace
+
+#endif
+
diff --git a/libpyside/dynamicqmetaobject.cpp b/libpyside/dynamicqmetaobject.cpp
index 562f2d4..4dfd80f 100644
--- a/libpyside/dynamicqmetaobject.cpp
+++ b/libpyside/dynamicqmetaobject.cpp
@@ -1,321 +1,669 @@
 /*
-* This file is part of the Shiboken Python Bindings Generator project.
+* This file is part of the PySide project.
 *
-* Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (C) 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
 *
 * Contact: PySide team <contact@pyside.org>
 *
-* This program is free software; you can redistribute it and/or
-* modify it under the terms of the GNU Lesser General Public License
-* version 2.1 as published by the Free Software Foundation. Please
-* review the following information to ensure the GNU Lesser General
-* Public License version 2.1 requirements will be met:
-* http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+* This library is free software; you can redistribute it and/or
+* modify it under the terms of the GNU Lesser General Public
+* License as published by the Free Software Foundation; either
+* version 2.1 of the License, or (at your option) any later version.
 *
-* As a special exception to the GNU Lesser General Public License
-* version 2.1, the object code form of a "work that uses the Library"
-* may incorporate material from a header file that is part of the
-* Library.  You may distribute such object code under terms of your
-* choice, provided that the incorporated material (i) does not exceed
-* more than 5% of the total size of the Library; and (ii) is limited to
-* numerical parameters, data structure layouts, accessors, macros,
-* inline functions and templates.
-*
-* This program is distributed in the hope that it will be useful, but
-* WITHOUT ANY WARRANTY; without even the implied warranty of
+* This library is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 * Lesser General Public License for more details.
 *
 * You should have received a copy of the GNU Lesser General Public
-* License along with this program; if not, write to the Free Software
-* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA
+* License along with this library; if not, write to the Free Software
+* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
 #include "dynamicqmetaobject.h"
+#include "dynamicqmetaobject_p.h"
+#include "pysidesignal.h"
+#include "pysidesignal_p.h"
+#include "pysideproperty.h"
+#include "pysideproperty_p.h"
+#include "pysideslot_p.h"
+
 #include <QByteArray>
 #include <QString>
 #include <QStringList>
 #include <QList>
+#include <QLinkedList>
 #include <QObject>
 #include <cstring>
 #include <QDebug>
 #include <QMetaMethod>
+#include <shiboken.h>
 
-#include "qsignal.h"
-
-#define MAX_SIGNALS_COUNT 50
+#define EMPTY_META_METHOD "0()"
 
 using namespace PySide;
 
-static int registerString(const QByteArray& s, QList<QByteArray>* strings)
+enum PropertyFlags  {
+    Invalid = 0x00000000,
+    Readable = 0x00000001,
+    Writable = 0x00000002,
+    Resettable = 0x00000004,
+    EnumOrFlag = 0x00000008,
+    StdCppSet = 0x00000100,
+//     Override = 0x00000200,
+    Constant = 0x00000400,
+    Final = 0x00000800,
+    Designable = 0x00001000,
+    ResolveDesignable = 0x00002000,
+    Scriptable = 0x00004000,
+    ResolveScriptable = 0x00008000,
+    Stored = 0x00010000,
+    ResolveStored = 0x00020000,
+    Editable = 0x00040000,
+    ResolveEditable = 0x00080000,
+    User = 0x00100000,
+    ResolveUser = 0x00200000,
+    Notify = 0x00400000
+};
+
+// these values are from moc source code, generator.cpp:66
+enum MethodFlags {
+    AccessPrivate = 0x00,
+    AccessProtected = 0x01,
+    AccessPublic = 0x02,
+    MethodMethod = 0x00,
+    MethodSignal = 0x04,
+    MethodSlot = 0x08,
+    MethodConstructor = 0x0c,
+    MethodCompatibility = 0x10,
+    MethodCloned = 0x20,
+    MethodScriptable = 0x40
+};
+
+class DynamicQMetaObject::DynamicQMetaObjectPrivate
+{
+public:
+    QList<MethodData> m_methods;
+    QList<PropertyData> m_properties;
+
+    // methods added/remove not writed on metadata yet
+    int m_lastMethod;
+    int m_lastProperty;
+    int m_lastInfo;
+
+    QMap<QByteArray, QByteArray> m_info;
+    QByteArray m_className;
+    bool m_updated; // when the meta data is not update
+    bool m_invalid; // when the object need to be reconstructed
+    int m_methodOffset;
+    int m_propertyOffset;
+    int m_count;
+    int m_dataSize;
+    int m_stringDataSize;
+    int m_emptyMethod;
+    int m_nullIndex;
+
+    DynamicQMetaObjectPrivate()
+        : m_lastMethod(0), m_lastProperty(0), m_lastInfo(0),
+          m_updated(false), m_invalid(true), m_methodOffset(0), m_propertyOffset(0),
+          m_count(0), m_dataSize(0), m_stringDataSize(0), m_emptyMethod(-1), m_nullIndex(0) {}
+
+    int createMetaData(QMetaObject* metaObj, QLinkedList<QByteArray> &strings);
+    void updateMetaObject(QMetaObject* metaObj);
+    void writeMethodsData(const QList<MethodData>& methods, unsigned int** data, QLinkedList<QByteArray>& strings, int* prtIndex, int nullIndex, int flags);
+};
+
+static int registerString(const QByteArray& s, QLinkedList<QByteArray>& strings)
 {
     int idx = 0;
-    for (int i = 0; i < strings->count(); ++i) {
-        const QString &str = strings->at(i);
-        if (str == s)
+    QLinkedList<QByteArray>::const_iterator it = strings.begin();
+    QLinkedList<QByteArray>::const_iterator itEnd = strings.end();
+    while (it != itEnd) {
+        if (strcmp(*it, s) == 0)
             return idx;
-        idx += str.length() + 1;
+        idx += it->size() + 1;
+        ++it;
     }
-    strings->append(s);
+    strings.append(s);
     return idx;
 }
 
-MethodData::MethodData(const char* signature, const char* type)
+static int qvariant_nameToType(const char* name)
 {
-    m_signature = QSharedPointer<QByteArray>(new QByteArray(signature));
-    m_type = QSharedPointer<QByteArray>(new QByteArray(type));
+    if (!name)
+        return 0;
+
+    if (strcmp(name, "QVariant") == 0)
+        return 0xffffffff;
+    if (strcmp(name, "QCString") == 0)
+        return QMetaType::QByteArray;
+    if (strcmp(name, "Q_LLONG") == 0)
+        return QMetaType::LongLong;
+    if (strcmp(name, "Q_ULLONG") == 0)
+        return QMetaType::ULongLong;
+    if (strcmp(name, "QIconSet") == 0)
+        return QMetaType::QIcon;
+
+    uint tp = QMetaType::type(name);
+    return tp < QMetaType::User ? tp : 0;
+}
+
+/*
+  Returns true if the type is a QVariant types.
+*/
+static bool isVariantType(const char* type)
+{
+    return qvariant_nameToType(type) != 0;
+}
+
+/*!
+  Returns true if the type is qreal.
+*/
+static bool isQRealType(const char *type)
+{
+    return strcmp(type, "qreal") == 0;
+}
+
+uint PropertyData::flags() const
+{
+    const char* typeName = type().data();
+    uint flags = Invalid;
+    if (!isVariantType(typeName))
+         flags |= EnumOrFlag;
+    else if (!isQRealType(typeName))
+        flags |= qvariant_nameToType(typeName) << 24;
+
+    if (PySide::Property::isReadable(m_data))
+        flags |= Readable;
+
+    if (PySide::Property::isWritable(m_data))
+        flags |= Writable;
+
+    if (PySide::Property::hasReset(m_data))
+        flags |= Resettable;
+
+    if (PySide::Property::isDesignable(m_data))
+        flags |= Designable;
+    else
+        flags |= ResolveDesignable;
+
+    if (PySide::Property::isScriptable(m_data))
+        flags |= Scriptable;
+    else
+        flags |= ResolveScriptable;
+
+    if (PySide::Property::isStored(m_data))
+        flags |= Stored;
+    else
+        flags |= ResolveStored;
+
+    //EDITABLE
+    flags |= ResolveEditable;
+
+    if (PySide::Property::isUser(m_data))
+        flags |= User;
+    else
+        flags |= ResolveUser;
+
+    if (m_notifyId != -1)
+        flags |= Notify;
+
+    if (PySide::Property::isConstant(m_data))
+        flags |= Constant;
+
+    if (PySide::Property::isFinal(m_data))
+        flags |= Final;
+
+    return flags;
+}
+
+// const QByteArray with EMPTY_META_METHOD, used to save some memory
+const QByteArray MethodData::m_emptySig(EMPTY_META_METHOD);
+
+MethodData::MethodData()
+    : m_signature(m_emptySig)
+{
+}
+
+MethodData::MethodData(QMetaMethod::MethodType mtype, const char* signature, const char* type)
+    : m_signature(signature), m_mtype(mtype)
+{
+    if (qstrcmp(type, "void"))
+        m_type = type;
 }
 
 void MethodData::clear()
 {
-    m_signature->clear();
-    m_type->clear();
-}
-
-bool MethodData::operator==(const MethodData& other) const
-{
-    return *m_signature == other.signature();
-}
-
-bool MethodData::operator==(const char* other) const
-{
-    return *m_signature == other;
-}
-
-QByteArray MethodData::signature() const
-{
-    if (!m_signature.isNull())
-        return *m_signature;
-    else
-        return QByteArray();
-}
-
-QByteArray MethodData::type() const
-{
-    if (!m_type.isNull()) {
-        if (*m_type == "void")
-            return QByteArray();
-        return *m_type;
-    } else {
-        return QByteArray();
-    }
+    m_signature = m_emptySig;
+    m_type.clear();
 }
 
 bool MethodData::isValid() const
 {
-    return m_signature->size();
+    return m_signature != m_emptySig;
+}
+
+QMetaMethod::MethodType MethodData::methodType() const
+{
+    return m_mtype;
+}
+
+PropertyData::PropertyData()
+    : m_notifyId(0), m_data(0)
+{
+}
+
+PropertyData::PropertyData(const char* name, int notifyId, PySideProperty* data)
+    : m_name(name), m_notifyId(notifyId), m_data(data)
+{
+}
+
+QByteArray PropertyData::type() const
+{
+    return QByteArray(PySide::Property::getTypeName(m_data));
+}
+
+
+bool PropertyData::isValid() const
+{
+    return !m_name.isEmpty();
+}
+
+int PropertyData::notifyId() const
+{
+    return m_notifyId;
+}
+
+bool PropertyData::operator==(const PropertyData& other) const
+{
+    return m_data == other.m_data;
+}
+
+bool PropertyData::operator==(const char* name) const
+{
+    return m_name == QString(name);
+}
+
+
+DynamicQMetaObject::DynamicQMetaObject(PyTypeObject* type, const QMetaObject* base)
+    : m_d(new DynamicQMetaObjectPrivate)
+{
+    d.superdata = base;
+    d.stringdata = NULL;
+    d.data = NULL;
+    d.extradata = NULL;
+
+    m_d->m_className = QByteArray(type->tp_name).split('.').last();
+    m_d->m_methodOffset = base->methodCount() - 1;
+    m_d->m_propertyOffset = base->propertyCount() - 1;
+    parsePythonType(type);
 }
 
 DynamicQMetaObject::DynamicQMetaObject(const char* className, const QMetaObject* metaObject)
+    : m_d(new DynamicQMetaObjectPrivate)
 {
     d.superdata = metaObject;
     d.stringdata = 0;
     d.data = 0;
     d.extradata = 0;
-    m_className = QByteArray(className);
-    updateMetaObject();
+    m_d->m_className = className;
+    m_d->m_methodOffset = metaObject->methodCount() - 1;
+    m_d->m_propertyOffset = metaObject->propertyCount() - 1;
 }
 
 DynamicQMetaObject::~DynamicQMetaObject()
 {
-    delete[] d.stringdata;
-    delete[] d.data;
+    free(const_cast<char*>(d.stringdata));
+    free(const_cast<uint*>(d.data));
+    delete m_d;
 }
 
-void DynamicQMetaObject::addSignal(const char* signal, const char* type)
+int DynamicQMetaObject::addMethod(QMetaMethod::MethodType mtype, const char* signature, const char* type)
 {
-    QLinkedList<MethodData>::iterator i = qFind(m_signals.begin(), m_signals.end(), signal);
-    if (i != m_signals.end())
-        return;
+    int index = -1;
+    int counter = 0;
 
-    //search for a empty space
-    MethodData blank;
-    i = qFind(m_signals.begin(), m_signals.end(), blank);
-    if (i != m_signals.end()) {
-        *i = MethodData(signal, type);
-        updateMetaObject();
-        return;
+    QList<MethodData>::iterator it = m_d->m_methods.begin();
+    for (; it != m_d->m_methods.end(); ++it) {
+        if ((it->signature() == signature) && (it->methodType() == mtype))
+            return m_d->m_methodOffset + counter;
+        else if (!it->isValid()) {
+            index = counter;
+            m_d->m_invalid = true; // need rewrite all methods again
+        }
+        counter++;
     }
 
-    if (m_signals.size() >= MAX_SIGNALS_COUNT) {
-        qWarning() << "Fail to add dynamic signal to QObject. PySide support at most" << MAX_SIGNALS_COUNT << "dynamic signals.";
-        return;
-    }
-
-    m_signals << MethodData(signal, type);
-    updateMetaObject();
-}
-
-void DynamicQMetaObject::addSlot(const char* slot, const char* type)
-{
-    QLinkedList<MethodData>::iterator i = qFind(m_slots.begin(), m_slots.end(), slot);
-    if (i != m_slots.end())
-        return;
-
-
-    //search for a empty space
-    MethodData blank;
-    i = qFind(m_slots.begin(), m_slots.end(), blank);
-    if (i != m_slots.end()) {
-        *i = MethodData(slot, type);
+    //has blank method
+    if (index != -1) {
+        m_d->m_methods[index] = MethodData(mtype, signature, type);
+        index++;
     } else {
-        m_slots << MethodData(slot, type);
+        m_d->m_methods << MethodData(mtype, signature, type);
+        index = m_d->m_methods.size();
     }
-    updateMetaObject();
+
+    m_d->m_updated = false;
+    return m_d->m_methodOffset + index;
+}
+
+void DynamicQMetaObject::removeMethod(QMetaMethod::MethodType mtype, uint index)
+{
+    const char* methodSig = method(index).signature();
+    QList<MethodData>::iterator it = m_d->m_methods.begin();
+    for (; it != m_d->m_methods.end(); ++it) {
+        if ((it->signature() == methodSig) && (it->methodType() == mtype)){
+            it->clear();
+            m_d->m_invalid = true;
+            break;
+        }
+    }
+}
+
+int DynamicQMetaObject::addSignal(const char* signal, const char* type)
+{
+    return addMethod(QMetaMethod::Signal, signal, type);
+}
+
+int DynamicQMetaObject::addSlot(const char* slot, const char* type)
+{
+    return addMethod(QMetaMethod::Slot, slot, type);
 }
 
 void DynamicQMetaObject::removeSlot(uint index)
 {
-    QMetaMethod m = method(index);
-    foreach(MethodData md, m_slots) {
-        if (md.signature() == m.signature()) {
-            md.clear();
-            updateMetaObject();
-            break;
-        }
-    }
-}
-
-DynamicQMetaObject* DynamicQMetaObject::createBasedOn(PyObject* pyObj, PyTypeObject* type, const QMetaObject* base)
-{
-    PyObject* key;
-    PyObject* value;
-    Py_ssize_t pos = 0;
-
-    QString className(type->tp_name);
-    className = className.mid(className.lastIndexOf('.')+1);
-    DynamicQMetaObject *mo = new PySide::DynamicQMetaObject(className.toAscii(), base);
-
-    while (PyDict_Next(type->tp_dict, &pos, &key, &value)) {
-
-        //Register signals
-        if (value->ob_type == &Signal_Type) {
-            PyObject *attr = PyObject_GetAttr(pyObj, key);
-            SignalInstanceData *data = reinterpret_cast<SignalInstanceData*>(attr);
-            while(data) {
-                int index = base->indexOfSignal(data->signature);
-                if (index == -1)
-                    mo->addSignal(data->signature);
-                data = reinterpret_cast<SignalInstanceData*>(data->next);
-            }
-        }
-
-        if (!PyFunction_Check(value))
-            continue;
-
-        //Register Slots
-        if (PyObject_HasAttrString(value, PYSIDE_SLOT_LIST_ATTR)) {
-            PyObject *signature_list = PyObject_GetAttrString(value, PYSIDE_SLOT_LIST_ATTR);
-            for(Py_ssize_t i = 0, i_max = PyList_Size(signature_list); i < i_max; i++) {
-                PyObject *signature = PyList_GET_ITEM(signature_list, i);
-                QString sig(PyString_AsString(signature));
-                //slot the slot type and signature
-                QStringList slotInfo = sig.split(" ", QString::SkipEmptyParts);
-                int index = base->indexOfSlot(slotInfo[0].toAscii());
-                if (index == -1)
-                    mo->addSlot(slotInfo[1].toAscii(), slotInfo[0].toAscii());
-            }
-        }
-    }
-    return mo;
+    removeMethod(QMetaMethod::Slot, index);
 }
 
 void DynamicQMetaObject::removeSignal(uint index)
 {
-    //Current Qt implementation does not support runtime remove signal
-    QMetaMethod m = method(index);
-    foreach(MethodData md, m_signals) {
-        if (md.signature() == m.signature()) {
-            md.clear();
-            updateMetaObject();
-            break;
-        }
-    }
+    removeMethod(QMetaMethod::Signal, index);
 }
 
-void DynamicQMetaObject::updateMetaObject()
+int DynamicQMetaObject::addProperty(const char* propertyName, PyObject* data)
 {
-    // these values are from moc source code, generator.cpp:66
-    enum MethodFlags {
-        AccessPrivate = 0x00,
-        AccessProtected = 0x01,
-        AccessPublic = 0x02,
-        MethodMethod = 0x00,
-        MethodSignal = 0x04,
-        MethodSlot = 0x08,
-        MethodConstructor = 0x0c,
-        MethodCompatibility = 0x10,
-        MethodCloned = 0x20,
-        MethodScriptable = 0x40
-    };
+    int index = m_d->m_properties.indexOf(propertyName);
+    if (index != -1)
+        return m_d->m_propertyOffset + index;
 
-    uint n_signals = MAX_SIGNALS_COUNT;
-    uint n_methods = n_signals + m_slots.count();
-    int header[] = {5,            // revision
-                    0,            // class name index in m_metadata
-                    0, 0,         // classinfo and classinfo index, not used by us
-                    n_methods, 0, // method count and method list index
-                    0, 0,         // prop count and prop indexes
-                    0, 0,         // enum count and enum index
-                    0, 0,         // constructors
-                    MAX_SIGNALS_COUNT};
+    // retrieve notifyId
+    int notifyId = -1;
+    PySideProperty* property = reinterpret_cast<PySideProperty*>(data);
+    if (property->d->notify) {
+        const char* signalNotify = PySide::Property::getNotifyName(property);
+        if (signalNotify) {
+            MethodData signalObject(QMetaMethod::Signal, signalNotify, "");
+            notifyId = m_d->m_methods.indexOf(signalObject);
+        }
+    }
+
+    //search for a empty space
+    PropertyData blank;
+    index = m_d->m_properties.indexOf(blank);
+    if (index != -1) {
+        m_d->m_properties[index] = PropertyData(propertyName, notifyId, property);
+        m_d->m_invalid = true;
+    } else {
+        m_d->m_properties << PropertyData(propertyName, notifyId, property);
+        index = m_d->m_properties.size();
+    }
+    m_d->m_updated = false;
+    return  m_d->m_propertyOffset + index;
+}
+
+void DynamicQMetaObject::addInfo(const char* key, const char* value)
+{
+    m_d->m_info[key] = value;
+}
+
+void DynamicQMetaObject::addInfo(QMap<QByteArray, QByteArray> info)
+{
+    QMap<QByteArray, QByteArray>::const_iterator i = info.constBegin();
+    while (i != info.constEnd()) {
+        m_d->m_info[i.key()] = i.value();
+        ++i;
+    }
+    m_d->m_updated = false;
+}
+
+const QMetaObject* DynamicQMetaObject::update() const
+{
+    if (!m_d->m_updated || m_d->m_invalid) {
+        m_d->updateMetaObject(const_cast<DynamicQMetaObject*>(this));
+        m_d->m_updated = true;
+    }
+    return this;
+}
+
+void DynamicQMetaObject::DynamicQMetaObjectPrivate::writeMethodsData(const QList<MethodData>& methods,
+                                                                     unsigned int** data,
+                                                                     QLinkedList<QByteArray>& strings,
+                                                                     int* prtIndex,
+                                                                     int nullIndex,
+                                                                     int flags)
+{
+    int index = *prtIndex;
+    //skip to last registered method
+    QList<MethodData>::const_iterator it = methods.begin() + m_lastMethod;
+
+    if (m_emptyMethod == -1)
+        m_emptyMethod = registerString(EMPTY_META_METHOD, strings) + m_stringDataSize;
+
+    for (; it != methods.end(); ++it) {
+        if (it->signature() != EMPTY_META_METHOD)
+            (*data)[index++] = registerString(it->signature(), strings) + m_stringDataSize; // func name
+        else
+            (*data)[index++] = m_emptyMethod; // func name
+
+        (*data)[index++] = nullIndex; // arguments
+        (*data)[index++] = !it->type().isEmpty() ? registerString(it->type(), strings) : nullIndex; // normalized type
+        (*data)[index++] = nullIndex; // tags
+        (*data)[index++] = flags  |  (it->methodType() == QMetaMethod::Signal ? MethodSignal : MethodSlot);
+    }
+    *prtIndex = index;
+
+    //update last registered method
+    m_lastMethod = methods.size();
+}
+
+void DynamicQMetaObject::parsePythonType(PyTypeObject* type)
+{
+    PyObject* attrs = type->tp_dict;
+    PyObject* key = 0;
+    PyObject* value = 0;
+    Py_ssize_t pos = 0;
+
+    typedef std::pair<const char*, PyObject*> PropPair;
+    QLinkedList<PropPair> properties;
+
+    Shiboken::AutoDecRef slotAttrName(Shiboken::String::fromCString(PYSIDE_SLOT_LIST_ATTR));
+
+    while (PyDict_Next(attrs, &pos, &key, &value)) {
+        if (Property::checkType(value)) {
+            // Leave the properties to be register after signals because they may depend on notify signals
+            int index = d.superdata->indexOfProperty(Shiboken::String::toCString(key));
+            if (index == -1)
+                properties << PropPair(Shiboken::String::toCString(key), value);
+        } else if (Signal::checkType(value)) { // Register signals
+            PySideSignal* data = reinterpret_cast<PySideSignal*>(value);
+            const char* signalName = Shiboken::String::toCString(key);
+            data->signalName = strdup(signalName);
+            QByteArray sig;
+            sig.reserve(128);
+            for (int i = 0; i < data->signaturesSize; ++i) {
+                sig = signalName;
+                sig += '(';
+                if (data->signatures[i])
+                    sig += data->signatures[i];
+                sig += ')';
+                if (d.superdata->indexOfSignal(sig) == -1)
+                    addSignal(sig);
+            }
+        } else if (PyFunction_Check(value)) { // Register slots
+            if (PyObject_HasAttr(value, slotAttrName)) {
+                PyObject* signatureList = PyObject_GetAttr(value, slotAttrName);
+                for(Py_ssize_t i = 0, i_max = PyList_Size(signatureList); i < i_max; ++i) {
+                    PyObject* signature = PyList_GET_ITEM(signatureList, i);
+                    QByteArray sig(Shiboken::String::toCString(signature));
+                    //slot the slot type and signature
+                    QList<QByteArray> slotInfo = sig.split(' ');
+                    int index = d.superdata->indexOfSlot(slotInfo[1]);
+                    if (index == -1)
+                        addSlot(slotInfo[1], slotInfo[0]);
+                }
+            }
+        }
+    }
+
+    // Register properties
+    foreach (PropPair propPair, properties)
+        addProperty(propPair.first, propPair.second);
+
+}
+
+int DynamicQMetaObject::DynamicQMetaObjectPrivate::createMetaData(QMetaObject* metaObj, QLinkedList<QByteArray> &strings)
+{
+    uint n_methods = m_methods.size();
+    uint n_properties = m_properties.size();
+    uint n_info = m_info.size();
+    int header[] = {3,                  // revision
+                    0,                  // class name index in m_metadata
+                    n_info, 0,          // classinfo and classinfo index
+                    n_methods, 0,       // method count and method list index
+                    n_properties, 0,    // prop count and prop indexes
+                    0, 0,               // enum count and enum index
+                    0, 0,               // constructors
+                    0};                 // flags
 
     const int HEADER_LENGHT = sizeof(header)/sizeof(int);
-    header[5] = HEADER_LENGHT;
-    // header size + 5 indexes per method + an ending zero
-    delete[] d.data;
-    unsigned int* data;
-    data = new unsigned int[HEADER_LENGHT + n_methods*5 + 1];
+
+    m_dataSize = HEADER_LENGHT + n_methods*5 + n_properties*4 + n_info*2 + 1;
+    uint* data = reinterpret_cast<uint*>(realloc(const_cast<uint*>(metaObj->d.data), m_dataSize * sizeof(uint)));
+    Q_ASSERT(data);
     std::memcpy(data, header, sizeof(header));
 
-    QList<QByteArray> strings;
-    registerString(m_className, &strings); // register class string
-    const int NULL_INDEX = registerString("", &strings); // register a null string
-    int index = HEADER_LENGHT;
+    registerString(m_className, strings); // register class string
+    m_nullIndex = registerString("", strings); // register a null string
 
-    //write signals
-    QLinkedList<MethodData>::iterator iSignal = m_signals.begin();
-    for(int i=0; i < MAX_SIGNALS_COUNT; i++) {
-        QByteArray sigType;
-        if (iSignal != m_signals.end() && ((*iSignal).signature().size() > 0) ) {
-            data[index++] = registerString((*iSignal).signature(), &strings); // func name
-            sigType = (*iSignal).type();
-            iSignal++;
-        } else {
-            data[index++] = NULL_INDEX; // func name
+    metaObj->d.data = data;
+
+    return HEADER_LENGHT;
+}
+
+
+void DynamicQMetaObject::DynamicQMetaObjectPrivate::updateMetaObject(QMetaObject* metaObj)
+{
+    uint *data = const_cast<uint*>(metaObj->d.data);
+    int index = m_dataSize - 1; // remove the last 0
+    QLinkedList<QByteArray> strings;
+
+    if (!data || m_invalid) {
+        if (m_invalid) {
+            strings.clear();
+            m_dataSize = m_stringDataSize = 0;
+            m_lastMethod = m_lastInfo = m_lastProperty = 0;
+            m_invalid = false;
+        }
+
+        index = createMetaData(metaObj, strings);
+        data = const_cast<uint*>(metaObj->d.data);
+    } else {
+        int n_methods = m_methods.size() - m_lastMethod;
+        int n_info = m_info.size() - m_lastInfo;
+        uint n_properties = m_properties.size() - m_lastProperty;
+
+        int extraSize = n_methods*5 + n_properties*4 + n_info*2;
+        if (extraSize > 0) {
+            m_dataSize += extraSize;
+            //realloc data
+            data = reinterpret_cast<uint*>(realloc(const_cast<uint*>(metaObj->d.data), m_dataSize * sizeof(uint)));
+            Q_ASSERT(data);
+
+
+            data[2] = m_info.size(); //update info size
+            data[4] = m_methods.size(); //update number of methods
+            data[6] = m_properties.size(); // update property size
+            metaObj->d.data = data;
+        } else {
+            data = const_cast<uint*>(metaObj->d.data);
         }
-        data[index++] = NULL_INDEX; // arguments
-        data[index++] = (sigType.size() > 0 ? registerString(sigType, &strings) : NULL_INDEX); // normalized type
-        data[index++] = NULL_INDEX; // tags
-        data[index++] = AccessPublic | MethodSignal; // flags
     }
 
+    //write class info
+    if (m_info.size()) {
+        if (data[3] == 0)
+            data[3] = index;
 
-    //write slots
-    foreach(MethodData slot, m_slots) {
-        if (slot.isValid())
-            data[index++] = registerString(slot.signature(), &strings); // func name
-        else
-            data[index++] = NULL_INDEX;
+        QMap<QByteArray, QByteArray>::const_iterator i = m_info.constBegin() + m_lastInfo; //TODO: info is a hash this can fail
+        while (i != m_info.constEnd()) {
+            int valueIndex = registerString(i.value(), strings);
+            int keyIndex = registerString(i.key(), strings);
+            data[index++] = keyIndex + m_stringDataSize;
+            data[index++] = valueIndex + m_stringDataSize;
+            i++;
+        }
 
-        data[index++] = NULL_INDEX; // arguments
-        data[index++] = (slot.isValid() ? registerString(slot.type(), &strings) :  NULL_INDEX); // normalized type
-        data[index++] = NULL_INDEX; // tags
-        data[index++] = AccessPublic | MethodSlot; // flags
+        m_lastInfo = m_info.size();
     }
+
+    //write properties
+    if (m_properties.size()) {
+        if (data[7] == 0)
+            data[7] = index;
+
+        QList<PropertyData>::const_iterator i = m_properties.constBegin() + m_lastProperty;
+        while(i != m_properties.constEnd()) {
+            if (i->isValid()) {
+                data[index++] = registerString(i->name(), strings) + m_stringDataSize; // name
+            } else
+                data[index++] = m_nullIndex;
+
+            data[index++] = (i->isValid() ? (registerString(i->type(), strings) + m_stringDataSize) :  m_nullIndex); // normalized type
+            data[index++] = i->flags();
+            i++;
+        }
+
+        //write properties notify
+        i = m_properties.constBegin() + m_lastProperty;
+        while(i != m_properties.constEnd()) {
+            data[index++] = i->notifyId() >= 0 ? i->notifyId() : 0; //signal notify index
+            i++;
+        }
+
+        m_lastProperty = m_properties.size();
+    }
+
+    //write signals/slots
+    if (m_methods.size()) {
+        if (data[5] == 0)
+            data[5] = index;
+
+        writeMethodsData(m_methods, &data, strings, &index, m_nullIndex, AccessPublic);
+    }
+
     data[index++] = 0; // the end
 
     // create the m_metadata string
     QByteArray str;
+    QByteArray debugStr;
     foreach(QByteArray field, strings) {
+
+        debugStr.append(field);
+        debugStr.append('|');
+
         str.append(field);
         str.append(char(0));
     }
 
-    delete[] d.stringdata;
-    char* stringData = new char[str.count()];
-    std::copy(str.begin(), str.end(), stringData);
-    d.data = data;
-    d.stringdata = stringData;
+    int newSize = (m_stringDataSize + str.count()) * sizeof(char);
+    char *stringdata = reinterpret_cast<char*>(realloc(const_cast<char*>(metaObj->d.stringdata), newSize));
+    Q_ASSERT(stringdata);
+
+    metaObj->d.stringdata = stringdata;
+
+    stringdata += m_stringDataSize; //shift to the end of old position
+    std::copy(str.begin(), str.end(), stringdata);
+
+    m_stringDataSize = newSize;
+    metaObj->d.data = data;
 }
diff --git a/libpyside/dynamicqmetaobject.h b/libpyside/dynamicqmetaobject.h
index 69027f2..c0efdb8 100644
--- a/libpyside/dynamicqmetaobject.h
+++ b/libpyside/dynamicqmetaobject.h
@@ -1,98 +1,65 @@
 /*
-* This file is part of the Shiboken Python Bindings Generator project.
+* This file is part of the PySide project.
 *
-* Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (C) 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
 *
 * Contact: PySide team <contact@pyside.org>
 *
-* This program is free software; you can redistribute it and/or
-* modify it under the terms of the GNU Lesser General Public License
-* version 2.1 as published by the Free Software Foundation. Please
-* review the following information to ensure the GNU Lesser General
-* Public License version 2.1 requirements will be met:
-* http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+* This library is free software; you can redistribute it and/or
+* modify it under the terms of the GNU Lesser General Public
+* License as published by the Free Software Foundation; either
+* version 2.1 of the License, or (at your option) any later version.
 *
-* As a special exception to the GNU Lesser General Public License
-* version 2.1, the object code form of a "work that uses the Library"
-* may incorporate material from a header file that is part of the
-* Library.  You may distribute such object code under terms of your
-* choice, provided that the incorporated material (i) does not exceed
-* more than 5% of the total size of the Library; and (ii) is limited to
-* numerical parameters, data structure layouts, accessors, macros,
-* inline functions and templates.
-*
-* This program is distributed in the hope that it will be useful, but
-* WITHOUT ANY WARRANTY; without even the implied warranty of
+* This library is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 * Lesser General Public License for more details.
 *
 * You should have received a copy of the GNU Lesser General Public
-* License along with this program; if not, write to the Free Software
-* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA
+* License along with this library; if not, write to the Free Software
+* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
 #ifndef DYNAMICQMETAOBJECT_H
 #define DYNAMICQMETAOBJECT_H
 
 #include "pysidemacros.h"
-#include <Python.h>
+#include <sbkpython.h>
 #include <QMetaObject>
-#include <QLinkedList>
-#include <QByteArray>
-#include <QSharedPointer>
-
-#define PYSIDE_SLOT_LIST_ATTR "_slots"
-
-class QObject;
+#include <QMetaMethod>
 
 namespace PySide
 {
 
-class MethodData
-{
-public:
-    MethodData(){}
-    MethodData(const char* signature, const char* type);
-    void clear();
-    bool isValid() const;
-    QByteArray signature() const;
-    QByteArray type() const;
-    bool operator==(const MethodData& other) const;
-    bool operator==(const char* other) const;
-
-private:
-    QSharedPointer<QByteArray> m_signature;
-    QSharedPointer<QByteArray> m_type;
-};
-
-class PYSIDE_API DynamicQMetaObject : public QMetaObject
+class DynamicQMetaObject : public QMetaObject
 {
 public:
     DynamicQMetaObject(const char* className, const QMetaObject* metaObject);
+    DynamicQMetaObject(PyTypeObject* type, const QMetaObject* metaobject);
     ~DynamicQMetaObject();
 
-    void addSignal(const char* signal, const char* type=0);
-    void addSlot(const char* slot, const char* type=0);
+
+    int addMethod(QMetaMethod::MethodType mtype, const char* signature, const char* type);
+    void removeMethod(QMetaMethod::MethodType mtype, uint index);
+    int addSignal(const char* signal, const char* type = 0);
+    int addSlot(const char* slot, const char* type = 0);
+    int addProperty(const char* property, PyObject* data);
+    void addInfo(const char* key, const char* value);
+    void addInfo(QMap<QByteArray, QByteArray> info);
 
     void removeSignal(uint idex);
     void removeSlot(uint index);
+    void removeProperty(uint index);
 
-    //Retrieve Python metadata to create QMetaObject (class name, signals, slot)
-    static DynamicQMetaObject* createBasedOn(PyObject* obj, PyTypeObject* type, const QMetaObject* base);
+    const QMetaObject* update() const;
 
 private:
-    QLinkedList<MethodData> m_signals;
-    QLinkedList<MethodData> m_slots;
-    QByteArray m_className;
+    class DynamicQMetaObjectPrivate;
+    DynamicQMetaObjectPrivate* m_d;
 
-    void updateMetaObject();
+    void parsePythonType(PyTypeObject* type);
 };
 
-PYSIDE_API inline void deleteDynamicQMetaObject(void* data)
-{
-    delete reinterpret_cast<DynamicQMetaObject*>(data);
-}
 
 }
 #endif
diff --git a/libpyside/dynamicqmetaobject_p.h b/libpyside/dynamicqmetaobject_p.h
new file mode 100644
index 0000000..0c99a2a
--- /dev/null
+++ b/libpyside/dynamicqmetaobject_p.h
@@ -0,0 +1,84 @@
+/*
+ * This file is part of the PySide project.
+ *
+ * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+ *
+ * Contact: PySide team <contact@pyside.org>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+#ifndef DYNAMICMETAPROPERTY_P_H
+#define DYNAMICMETAPROPERTY_P_H
+
+#include <sbkpython.h>
+#include <QByteArray>
+#include <QMetaMethod>
+
+#define GLOBAL_RECEIVER_CLASS_NAME "__GlobalReceiver__"
+
+struct PySideProperty;
+namespace PySide
+{
+    class MethodData
+    {
+    public:
+        MethodData();
+        /**
+         * \param signature method signature
+         * \param type method return type
+         */
+        MethodData(QMetaMethod::MethodType mtype, const char* signature, const char* type = 0);
+        void clear();
+        bool isValid() const;
+        const QByteArray& signature() const { return m_signature; }
+        const QByteArray& type() const { return m_type; }
+        QMetaMethod::MethodType methodType() const;
+        bool operator==(const MethodData& other) const;
+
+    private:
+        QByteArray m_signature;
+        QByteArray m_type;
+        QMetaMethod::MethodType m_mtype;
+        static const QByteArray m_emptySig;
+    };
+
+    class PropertyData
+    {
+    public:
+        PropertyData();
+        PropertyData(const char* name, int notifyId=0, PySideProperty* data = 0);
+        const QByteArray& name() const { return m_name; }
+        QByteArray type() const;
+        uint flags() const;
+        bool isValid() const;
+        int notifyId() const;
+        bool operator==(const PropertyData& other) const;
+        bool operator==(const char* name) const;
+
+    private:
+        QByteArray m_name;
+        int m_notifyId;
+        PySideProperty* m_data;
+    };
+
+inline bool MethodData::operator==(const MethodData& other) const
+{
+    return m_mtype == other.methodType() && m_signature == other.signature();
+}
+
+}
+
+#endif
diff --git a/libpyside/globalreceiver.cpp b/libpyside/globalreceiver.cpp
index e37235d..ace1692 100644
--- a/libpyside/globalreceiver.cpp
+++ b/libpyside/globalreceiver.cpp
@@ -1,43 +1,35 @@
 /*
-* This file is part of the Shiboken Python Bindings Generator project.
+* This file is part of the PySide project.
 *
-* Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (C) 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
 *
 * Contact: PySide team <contact@pyside.org>
 *
-* This program is free software; you can redistribute it and/or
-* modify it under the terms of the GNU Lesser General Public License
-* version 2.1 as published by the Free Software Foundation. Please
-* review the following information to ensure the GNU Lesser General
-* Public License version 2.1 requirements will be met:
-* http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+* This library is free software; you can redistribute it and/or
+* modify it under the terms of the GNU Lesser General Public
+* License as published by the Free Software Foundation; either
+* version 2.1 of the License, or (at your option) any later version.
 *
-* As a special exception to the GNU Lesser General Public License
-* version 2.1, the object code form of a "work that uses the Library"
-* may incorporate material from a header file that is part of the
-* Library.  You may distribute such object code under terms of your
-* choice, provided that the incorporated material (i) does not exceed
-* more than 5% of the total size of the Library; and (ii) is limited to
-* numerical parameters, data structure layouts, accessors, macros,
-* inline functions and templates.
-*
-* This program is distributed in the hope that it will be useful, but
-* WITHOUT ANY WARRANTY; without even the implied warranty of
+* This library is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 * Lesser General Public License for more details.
 *
 * You should have received a copy of the GNU Lesser General Public
-* License along with this program; if not, write to the Free Software
-* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA
+* License along with this library; if not, write to the Free Software
+* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
 #include "globalreceiver.h"
+#include "dynamicqmetaobject_p.h"
+#include "pysideweakref.h"
 
 #include <QMetaMethod>
 #include <QDebug>
 #include <QEvent>
+#include <QLinkedList>
 #include <autodecref.h>
+#include <sbkconverter.h>
 #include <gilstate.h>
 
 #include "typeresolver.h"
@@ -50,41 +42,84 @@ namespace PySide
 class DynamicSlotData
 {
     public:
-        DynamicSlotData(int id, PyObject* callback);
+        DynamicSlotData(int id, PyObject* callback, GlobalReceiver* parent);
         void addRef(const QObject* o);
         void decRef(const QObject* o);
         void clear();
-        bool hasRefTo(const QObject* o) const;
+        int hasRefTo(const QObject* o) const;
         int refCount() const;
         int id() const;
-        PyObject* callback() const;
+        PyObject* call(PyObject* args);
         ~DynamicSlotData();
+        static void onCallbackDestroyed(void* data);
 
     private:
         int m_id;
+        bool m_isMethod;
         PyObject* m_callback;
-        QSet<const QObject*> m_refs;
+        PyObject* m_pythonSelf;
+        PyObject* m_pyClass;
+        PyObject* m_weakRef;
+        GlobalReceiver* m_parent;
+        QLinkedList<const QObject*> m_refs;
 };
 
 }
 
 using namespace PySide;
 
-DynamicSlotData::DynamicSlotData(int id, PyObject* callback)
-    : m_id(id)
+DynamicSlotData::DynamicSlotData(int id, PyObject* callback, GlobalReceiver* parent)
+    : m_id(id), m_pythonSelf(0), m_pyClass(0), m_weakRef(0), m_parent(parent)
 {
-    m_callback = callback;
-    Py_INCREF(callback);
+    m_isMethod = PyMethod_Check(callback);
+    if (m_isMethod) {
+        //Can not store calback pointe because this will be destroyed at the end of the scope
+        //To avoid increment intance reference keep the callback information
+        m_callback = PyMethod_GET_FUNCTION(callback);
+#ifdef IS_PY3K
+        m_pyClass = 0;
+#else
+        m_pyClass = PyMethod_GET_CLASS(callback);
+#endif
+
+        m_pythonSelf = PyMethod_GET_SELF(callback);
+
+        //monitor class from method lifetime
+        m_weakRef = WeakRef::create(m_pythonSelf, DynamicSlotData::onCallbackDestroyed, this);
+    } else {
+        m_callback = callback;
+        Py_INCREF(m_callback);
+    }
+}
+
+PyObject* DynamicSlotData::call(PyObject* args)
+{
+    PyObject* callback = m_callback;
+
+    //create a callback based on method data
+    if (m_isMethod)
+#ifdef IS_PY3K
+        callback = PyMethod_New(callback, m_pythonSelf);
+#else
+        callback = PyMethod_New(callback, m_pythonSelf, m_pyClass);
+#endif
+
+    PyObject* result =  PyObject_CallObject(callback, args);
+
+    if (m_isMethod)
+        Py_DECREF(callback);
+
+    return result;
 }
 
 void DynamicSlotData::addRef(const QObject *o)
 {
-    m_refs.insert(o);
+    m_refs.append(o);
 }
 
 void DynamicSlotData::decRef(const QObject *o)
 {
-    m_refs.remove(o);
+    m_refs.removeOne(o);
 }
 
 int DynamicSlotData::refCount() const
@@ -92,43 +127,59 @@ int DynamicSlotData::refCount() const
     return m_refs.size();
 }
 
-
-PyObject* DynamicSlotData::callback() const
-{
-    return m_callback;
-}
-
 int DynamicSlotData::id() const
 {
     return m_id;
 }
 
-bool DynamicSlotData::hasRefTo(const QObject *o) const
+int DynamicSlotData::hasRefTo(const QObject *o) const
 {
-    return m_refs.contains(o);
+    return m_refs.count(o);
 }
 
 void DynamicSlotData::clear()
 {
+    Shiboken::GilState gil;
+    Py_XDECREF(m_weakRef);
+    m_weakRef = 0;
     m_refs.clear();
 }
 
 DynamicSlotData::~DynamicSlotData()
 {
-    Py_DECREF(m_callback);
+    Shiboken::GilState gil;
+    clear();
+    if (!m_isMethod)
+       Py_DECREF(m_callback);
 }
 
+void DynamicSlotData::onCallbackDestroyed(void *data)
+{
+    Shiboken::GilState gil;
+    DynamicSlotData* self = reinterpret_cast<DynamicSlotData*>(data);
+
+    //Disconnect all sources
+    QMetaMethod m = self->m_parent->metaObject()->method(self->m_id);
+    QByteArray methodName = QByteArray::number(m.methodType()).append(m.signature());
+    QLinkedList<const QObject*> sources = self->m_refs;
+    foreach(const QObject* src, sources)
+        const_cast<QObject*>(src)->disconnect(self->m_parent, methodName);
+    self->m_weakRef = 0;
+}
 
 GlobalReceiver::GlobalReceiver()
-    : m_metaObject("GlobalReceiver", &QObject::staticMetaObject)
+    : m_metaObject(GLOBAL_RECEIVER_CLASS_NAME, &QObject::staticMetaObject)
 {
     //slot used to be notifyed of object destrouction
     m_metaObject.addSlot(RECEIVER_DESTROYED_SLOT_NAME);
+    m_metaObject.update();
+    setObjectName("GLOBAL RECEIVER");
 }
 
 GlobalReceiver::~GlobalReceiver()
 {
-    foreach(DynamicSlotData* data, m_slotReceivers) {
+    while(!m_slotReceivers.empty()) {
+        DynamicSlotData* data = m_slotReceivers.take(m_slotReceivers.begin().key());
         data->clear();
         delete data;
     }
@@ -137,35 +188,36 @@ GlobalReceiver::~GlobalReceiver()
 void GlobalReceiver::connectNotify(QObject* source, int slotId)
 {
     if (m_slotReceivers.contains(slotId)) {
-        m_slotReceivers[slotId]->addRef(source);
+        DynamicSlotData* data = m_slotReceivers[slotId];
+        if (!data->hasRefTo(source))
+            QObject::connect(source, SIGNAL(destroyed(QObject*)), this, "1"RECEIVER_DESTROYED_SLOT_NAME);
+        data->addRef(source);
     }
 }
 
 void GlobalReceiver::disconnectNotify(QObject* source, int slotId)
 {
-    if (m_slotReceivers.contains(slotId)) {
-        QObject::disconnect(source, SIGNAL(destroyed(QObject*)), this, "1"RECEIVER_DESTROYED_SLOT_NAME);
-
+   if (m_slotReceivers.contains(slotId)) {
         DynamicSlotData *data = m_slotReceivers[slotId];
         data->decRef(source);
-        if (data->refCount() == 0) {
+        if (data->refCount() == 0)
             removeSlot(slotId);
-        }
+
+        if (!hasConnectionWith(source))
+            QObject::disconnect(source, SIGNAL(destroyed(QObject*)), this, "1"RECEIVER_DESTROYED_SLOT_NAME);
     }
 }
 
 const QMetaObject* GlobalReceiver::metaObject() const
 {
-    return &m_metaObject;
+    return m_metaObject.update();
 }
 
-void GlobalReceiver::addSlot(const char* slot, PyObject* callback)
+int GlobalReceiver::addSlot(const char* slot, PyObject* callback)
 {
-    m_metaObject.addSlot(slot);
-    int slotId = m_metaObject.indexOfSlot(slot);
-    if (!m_slotReceivers.contains(slotId)) {
-        m_slotReceivers[slotId] = new DynamicSlotData(slotId, callback);
-    }
+    int slotId = m_metaObject.addSlot(slot);
+    if (!m_slotReceivers.contains(slotId))
+        m_slotReceivers[slotId] = new DynamicSlotData(slotId, callback, this);
 
     bool isShortCircuit = true;
     for (int i = 0; slot[i]; ++i) {
@@ -179,6 +231,7 @@ void GlobalReceiver::addSlot(const char* slot, PyObject* callback)
         m_shortCircuitSlots << slotId;
 
     Q_ASSERT(slotId >= QObject::staticMetaObject.methodCount());
+    return slotId;
 }
 
 void GlobalReceiver::removeSlot(int slotId)
@@ -206,17 +259,21 @@ int GlobalReceiver::qt_metacall(QMetaObject::Call call, int id, void** args)
 {
     Q_ASSERT(call == QMetaObject::InvokeMetaMethod);
     Q_ASSERT(id >= QObject::staticMetaObject.methodCount());
-    QMetaMethod slot = m_metaObject.method(id);
+    QMetaMethod slot = metaObject()->method(id);
     Q_ASSERT(slot.methodType() == QMetaMethod::Slot);
 
     if (strcmp(slot.signature(), RECEIVER_DESTROYED_SLOT_NAME) == 0) {
         QObject *arg = *(QObject**)args[1];
 
-        QHash<int, DynamicSlotData*>::iterator i = m_slotReceivers.begin();
-        while(i != m_slotReceivers.end()) {
-            if (i.value()->hasRefTo(arg)) {
+        //avoid hash changes during the destruction
+        QHash<int, DynamicSlotData*> copy = m_slotReceivers;
+        QHash<int, DynamicSlotData*>::iterator i = copy.begin();
+        while(i != copy.end()) {
+            //Remove all refs
+            int refs = i.value()->hasRefTo(arg);
+            while(refs) {
                 disconnectNotify(arg, i.key());
-                break;
+                refs--;
             }
             i++;
         }
@@ -230,29 +287,24 @@ int GlobalReceiver::qt_metacall(QMetaObject::Call call, int id, void** args)
     }
 
     Shiboken::GilState gil;
-    int numArgs;
     PyObject* retval = 0;
-    PyObject* callback = data->callback();
     if (m_shortCircuitSlots.contains(id)) {
-        retval = PyObject_CallObject(callback, reinterpret_cast<PyObject*>(args[1]));
+        retval = data->call(reinterpret_cast<PyObject*>(args[1]));
     } else {
         QList<QByteArray> paramTypes = slot.parameterTypes();
-        numArgs = paramTypes.count();
         Shiboken::AutoDecRef preparedArgs(PyTuple_New(paramTypes.count()));
         for (int i = 0, max = paramTypes.count(); i < max; ++i) {
-            PyObject* arg = Shiboken::TypeResolver::get(paramTypes[i].constData())->toPython(args[i+1]);
-            PyTuple_SET_ITEM(preparedArgs.object(), i, arg);
+            const QByteArray& paramType = paramTypes[i];
+            Shiboken::Conversions::SpecificConverter converter(paramType.constData());
+            PyTuple_SET_ITEM(preparedArgs.object(), i, converter.toPython(args[i+1]));
         }
-
-        retval = PyObject_CallObject(callback, preparedArgs);
+        retval = data->call(preparedArgs);
     }
 
-    if (!retval) {
-        qDebug() << "Error calling slot" << m_metaObject.method(id).signature();
+    if (!retval)
         PyErr_Print();
-    } else {
+    else
         Py_DECREF(retval);
-    }
 
     return -1;
 }
diff --git a/libpyside/globalreceiver.h b/libpyside/globalreceiver.h
index 6050036..0bec1ae 100644
--- a/libpyside/globalreceiver.h
+++ b/libpyside/globalreceiver.h
@@ -1,41 +1,29 @@
 /*
-* This file is part of the Shiboken Python Bindings Generator project.
+* This file is part of the PySide project.
 *
-* Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (C) 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
 *
 * Contact: PySide team <contact@pyside.org>
 *
-* This program is free software; you can redistribute it and/or
-* modify it under the terms of the GNU Lesser General Public License
-* version 2.1 as published by the Free Software Foundation. Please
-* review the following information to ensure the GNU Lesser General
-* Public License version 2.1 requirements will be met:
-* http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+* This library is free software; you can redistribute it and/or
+* modify it under the terms of the GNU Lesser General Public
+* License as published by the Free Software Foundation; either
+* version 2.1 of the License, or (at your option) any later version.
 *
-* As a special exception to the GNU Lesser General Public License
-* version 2.1, the object code form of a "work that uses the Library"
-* may incorporate material from a header file that is part of the
-* Library.  You may distribute such object code under terms of your
-* choice, provided that the incorporated material (i) does not exceed
-* more than 5% of the total size of the Library; and (ii) is limited to
-* numerical parameters, data structure layouts, accessors, macros,
-* inline functions and templates.
-*
-* This program is distributed in the hope that it will be useful, but
-* WITHOUT ANY WARRANTY; without even the implied warranty of
+* This library is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 * Lesser General Public License for more details.
 *
 * You should have received a copy of the GNU Lesser General Public
-* License along with this program; if not, write to the Free Software
-* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA
+* License along with this library; if not, write to the Free Software
+* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
 #ifndef GLOBALRECEIVER_H
 #define GLOBALRECEIVER_H
 
-#include <Python.h>
+#include <sbkpython.h>
 #include <QObject>
 #include <QHash>
 #include <QSet>
@@ -53,7 +41,7 @@ public:
     ~GlobalReceiver();
     int qt_metacall(QMetaObject::Call call, int id, void** args);
     const QMetaObject* metaObject() const;
-    void addSlot(const char* slot, PyObject* callback);
+    int addSlot(const char* slot, PyObject* callback);
     void removeSlot(int slotId);
     void connectNotify(QObject* sender, int slotId);
     void disconnectNotify(QObject* sender, int slotId);
@@ -68,3 +56,4 @@ private:
 }
 
 #endif
+
diff --git a/libpyside/globalreceiverv2.cpp b/libpyside/globalreceiverv2.cpp
new file mode 100644
index 0000000..65a37ee
--- /dev/null
+++ b/libpyside/globalreceiverv2.cpp
@@ -0,0 +1,294 @@
+/*
+* This file is part of the PySide project.
+*
+* Copyright (C) 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
+*
+* Contact: PySide team <contact@pyside.org>
+*
+* This library is free software; you can redistribute it and/or
+* modify it under the terms of the GNU Lesser General Public
+* License as published by the Free Software Foundation; either
+* version 2.1 of the License, or (at your option) any later version.
+*
+* This library is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this library; if not, write to the Free Software
+* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+*/
+
+#include "globalreceiverv2.h"
+#include "dynamicqmetaobject_p.h"
+#include "pysideweakref.h"
+
+#include <QMetaMethod>
+#include <QDebug>
+#include <QEvent>
+#include <QLinkedList>
+#include <autodecref.h>
+#include <gilstate.h>
+
+#include "typeresolver.h"
+#include "signalmanager.h"
+
+#define RECEIVER_DESTROYED_SLOT_NAME "__receiverDestroyed__(QObject*)"
+
+namespace
+{
+    static int DESTROY_SIGNAL_ID = 0;
+    static int DESTROY_SLOT_ID = 0;
+}
+
+namespace PySide
+{
+class DynamicSlotDataV2
+{
+    public:
+        DynamicSlotDataV2(PyObject* callback, GlobalReceiverV2* parent);
+        ~DynamicSlotDataV2();
+
+        int addSlot(const char* signature);
+        int id(const char* signature) const;
+        PyObject* callback();
+        QByteArray hash() const;
+        void notify();
+
+        static void onCallbackDestroyed(void* data);
+        static QByteArray hash(PyObject *callback);
+
+
+    private:
+        bool m_isMethod;
+        PyObject* m_callback;
+        PyObject* m_pythonSelf;
+        PyObject* m_pyClass;
+        PyObject* m_weakRef;
+        QMap<QByteArray, int> m_signatures;
+        GlobalReceiverV2* m_parent;
+        QByteArray m_hash;
+};
+
+}
+
+using namespace PySide;
+
+DynamicSlotDataV2::DynamicSlotDataV2(PyObject* callback, GlobalReceiverV2* parent)
+    : m_pythonSelf(0), m_pyClass(0), m_weakRef(0), m_parent(parent)
+{
+    m_isMethod = PyMethod_Check(callback);
+    if (m_isMethod) {
+        //Can not store calback pointe because this will be destroyed at the end of the scope
+        //To avoid increment intance reference keep the callback information
+        m_callback = PyMethod_GET_FUNCTION(callback);
+#ifndef IS_PY3K
+        m_pyClass = PyMethod_GET_CLASS(callback);
+#endif
+        m_pythonSelf = PyMethod_GET_SELF(callback);
+
+        //monitor class from method lifetime
+        m_weakRef = WeakRef::create(m_pythonSelf, DynamicSlotDataV2::onCallbackDestroyed, this);
+
+        m_hash = QByteArray::number((qlonglong)PyObject_Hash(m_callback))
+                 + QByteArray::number((qlonglong)PyObject_Hash(m_pythonSelf));
+
+    } else {
+        m_callback = callback;
+        Py_INCREF(m_callback);
+
+        m_hash = QByteArray::number((qlonglong)PyObject_Hash(m_callback));
+    }
+}
+
+QByteArray DynamicSlotDataV2::hash() const
+{
+    return m_hash;
+}
+
+QByteArray DynamicSlotDataV2::hash(PyObject* callback)
+{
+    Shiboken::GilState gil;
+    if (PyMethod_Check(callback))
+        return  QByteArray::number((qlonglong)PyObject_Hash(PyMethod_GET_FUNCTION(callback)))
+              + QByteArray::number((qlonglong)PyObject_Hash(PyMethod_GET_SELF(callback)));
+    else
+        return QByteArray::number((qlonglong)PyObject_Hash(callback));
+}
+
+PyObject* DynamicSlotDataV2::callback()
+{
+    PyObject* callback = m_callback;
+
+    //create a callback based on method data
+    if (m_isMethod)
+#ifdef IS_PY3K
+        callback = PyMethod_New(m_callback, m_pythonSelf);
+#else
+        callback = PyMethod_New(m_callback, m_pythonSelf, m_pyClass);
+#endif
+    else
+        Py_INCREF(callback);
+
+    return callback;
+}
+
+int DynamicSlotDataV2::id(const char* signature) const
+{
+    if (m_signatures.contains(signature))
+        return m_signatures[signature];
+    return -1;
+}
+
+int DynamicSlotDataV2::addSlot(const char* signature)
+{
+    int index = id(signature);
+    if (index == -1) {
+        DynamicQMetaObject *dmo = const_cast<DynamicQMetaObject*>(reinterpret_cast<const DynamicQMetaObject*>(m_parent->metaObject()));
+        index = m_signatures[signature] = dmo->addSlot(signature);
+    }
+    return index;
+}
+
+void DynamicSlotDataV2::onCallbackDestroyed(void *data)
+{
+    DynamicSlotDataV2* self = reinterpret_cast<DynamicSlotDataV2*>(data);
+    self->m_weakRef = 0;
+    delete self->m_parent;
+}
+
+DynamicSlotDataV2::~DynamicSlotDataV2()
+{
+    Shiboken::GilState gil;
+
+    Py_XDECREF(m_weakRef);
+    m_weakRef = 0;
+
+    if (!m_isMethod)
+       Py_DECREF(m_callback);
+}
+
+GlobalReceiverV2::GlobalReceiverV2(PyObject *callback, SharedMap map)
+    : QObject(0), m_metaObject(GLOBAL_RECEIVER_CLASS_NAME, &QObject::staticMetaObject), m_sharedMap(map)
+{
+    m_data = new DynamicSlotDataV2(callback, this);
+    m_metaObject.addSlot(RECEIVER_DESTROYED_SLOT_NAME);
+    m_metaObject.update();
+    m_refs.append(NULL);
+
+
+    if (DESTROY_SIGNAL_ID == 0)
+        DESTROY_SIGNAL_ID = QObject::staticMetaObject.indexOfSignal("destroyed(QObject*)");
+
+    if (DESTROY_SLOT_ID == 0)
+        DESTROY_SLOT_ID = m_metaObject.indexOfSlot(RECEIVER_DESTROYED_SLOT_NAME);
+
+
+}
+
+GlobalReceiverV2::~GlobalReceiverV2()
+{
+    m_refs.clear();
+    //Remove itself from map
+    m_sharedMap->remove(m_data->hash());
+    delete m_data;
+}
+
+int GlobalReceiverV2::addSlot(const char* signature)
+{
+    return m_data->addSlot(signature);
+}
+
+void GlobalReceiverV2::incRef(const QObject* link)
+{
+    if (link) {
+        if (!m_refs.contains(link)) {
+            if (QMetaObject::connect(link, DESTROY_SIGNAL_ID, this, DESTROY_SLOT_ID))
+                m_refs.append(link);
+            else
+                Q_ASSERT(false);
+        } else {
+            m_refs.append(link);
+        }
+    } else {
+        m_refs.append(NULL);
+    }
+}
+
+void GlobalReceiverV2::decRef(const QObject* link)
+{
+    if (m_refs.size() <= 0)
+        return;
+
+
+    m_refs.removeOne(link);
+    if (link) {
+        if (!m_refs.contains(link)) {
+            bool result = QMetaObject::disconnect(link, DESTROY_SIGNAL_ID, this, DESTROY_SLOT_ID);
+            Q_ASSERT(result);
+            if (!result)
+                return;
+        }
+    }
+
+    if (m_refs.size() == 0)
+        delete this;
+
+}
+
+int GlobalReceiverV2::refCount(const QObject* link) const
+{
+    if (link)
+        return m_refs.count(link);
+
+    return m_refs.size();
+}
+
+void GlobalReceiverV2::notify()
+{
+    QSet<const QObject*> objs = QSet<const QObject*>::fromList(m_refs);
+    foreach(const QObject* o, objs) {
+        QMetaObject::disconnect(o, DESTROY_SIGNAL_ID, this, DESTROY_SLOT_ID);
+        QMetaObject::connect(o, DESTROY_SIGNAL_ID, this, DESTROY_SLOT_ID);
+    }
+}
+
+QByteArray GlobalReceiverV2::hash() const
+{
+    return m_data->hash();
+}
+
+QByteArray GlobalReceiverV2::hash(PyObject* callback)
+{
+    return DynamicSlotDataV2::hash(callback);
+}
+
+const QMetaObject* GlobalReceiverV2::metaObject() const
+{
+    return m_metaObject.update();
+}
+
+int GlobalReceiverV2::qt_metacall(QMetaObject::Call call, int id, void** args)
+{
+    Q_ASSERT(call == QMetaObject::InvokeMetaMethod);
+    Q_ASSERT(id >= QObject::staticMetaObject.methodCount());
+
+    QMetaMethod slot = metaObject()->method(id);
+    Q_ASSERT(slot.methodType() == QMetaMethod::Slot);
+
+    if (id == DESTROY_SLOT_ID) {
+        if (m_refs.size() == 0)
+            return -1;
+        QObject *obj = *(QObject**)args[1];
+        incRef(); //keep the object live (safe ref)
+        m_refs.removeAll(obj); // remove all refs to this object
+        decRef(); //remove the safe ref
+    } else {
+        bool isShortCuit = (strstr(slot.signature(), "(") == 0);
+        Shiboken::AutoDecRef callback(m_data->callback());
+        SignalManager::callPythonMetaMethod(slot, args, callback, isShortCuit);
+    }
+
+    return -1;
+}
diff --git a/libpyside/globalreceiverv2.h b/libpyside/globalreceiverv2.h
new file mode 100644
index 0000000..f22884a
--- /dev/null
+++ b/libpyside/globalreceiverv2.h
@@ -0,0 +1,131 @@
+/*
+* This file is part of the PySide project.
+*
+* Copyright (C) 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
+*
+* Contact: PySide team <contact@pyside.org>
+*
+* This library is free software; you can redistribute it and/or
+* modify it under the terms of the GNU Lesser General Public
+* License as published by the Free Software Foundation; either
+* version 2.1 of the License, or (at your option) any later version.
+*
+* This library is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this library; if not, write to the Free Software
+* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+*/
+
+#ifndef GLOBALRECEIVER_V2_H
+#define GLOBALRECEIVER_V2_H
+
+#include <sbkpython.h>
+#include <QObject>
+#include <QHash>
+#include <QSet>
+#include <QSharedPointer>
+#include <QLinkedList>
+#include <QByteArray>
+
+#include "dynamicqmetaobject.h"
+
+namespace PySide
+{
+
+class DynamicSlotDataV2;
+class GlobalReceiverV2;
+
+typedef QSharedPointer< QMap<QByteArray, GlobalReceiverV2*> >  SharedMap;
+
+/**
+ * A class used to make the link between the C++ Signal/Slot and Python callback
+ * This class is used internally by SignalManager
+ **/
+
+class GlobalReceiverV2 : public QObject
+{
+public:
+    /**
+     * Create a GlobalReceiver object that will call 'callback' argumentent
+     *
+     * @param   callback    A Python callable object (can be a method or not)
+     * @param   ma          A SharedPointer used on Signal manager that contains all instaces of GlobalReceiver
+     **/
+    GlobalReceiverV2(PyObject *callback, SharedMap map);
+
+    /**
+     * Destructor
+     **/
+    ~GlobalReceiverV2();
+
+    /**
+     * Reimplemented function from QObject
+     **/
+    int qt_metacall(QMetaObject::Call call, int id, void** args);
+    const QMetaObject* metaObject() const;
+
+    /**
+     * Add a extra slot to this object
+     *
+     * @param   signature   The signature of the slot to be added
+     * @return  The index of this slot on metaobject
+     **/
+    int addSlot(const char* signature);
+
+    /**
+     * Notify to GlobalReceiver about when a new connection was made
+     **/
+    void notify();
+
+    /**
+     * Used to increment the reference of the GlobalReceiver object
+     *
+     * @param   link    This is a optional paramenter used to link the ref to some QObject life
+     **/
+    void incRef(const QObject* link = 0);
+
+    /**
+     * Used to decrement the reference of the GlobalReceiver object
+     *
+     * @param   link    This is a optional paramenter used to dismiss the link ref to some QObject
+     **/
+    void decRef(const QObject* link = 0);
+
+    /*
+     * Return the count of refs which the GlobalReceiver has
+     *
+     * @param   link    If any QObject was passed, the function return the number of references relative to this 'link' object
+     * @return  The number of references
+     **/
+    int refCount(const QObject* link) const;
+
+    /**
+     * Use to retrive the unique hash of this GlobalReceiver object
+     *
+     * @return  a string with a unique id based on GlobalReceiver contents
+     **/
+    QByteArray hash() const;
+
+    /**
+     * Use to retrive the unique hash of the PyObject based on GlobalReceiver rules
+     *
+     * @param   callback The Python callable object used to calculate the id
+     * @return  a string with a unique id based on GlobalReceiver contents
+     **/
+    static QByteArray hash(PyObject* callback);
+
+private:
+    DynamicQMetaObject m_metaObject;
+    DynamicSlotDataV2 *m_data;
+    QList<const QObject*> m_refs;
+    int m_ref;
+    SharedMap m_sharedMap;
+};
+
+}
+
+#endif
diff --git a/libpyside/proxyslot.cpp b/libpyside/proxyslot.cpp
deleted file mode 100644
index 8852325..0000000
--- a/libpyside/proxyslot.cpp
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
-* This file is part of the Shiboken Python Bindings Generator project.
-*
-* Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-*
-* Contact: PySide team <contact@pyside.org>
-*
-* This program is free software; you can redistribute it and/or
-* modify it under the terms of the GNU Lesser General Public License
-* version 2.1 as published by the Free Software Foundation. Please
-* review the following information to ensure the GNU Lesser General
-* Public License version 2.1 requirements will be met:
-* http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-*
-* As a special exception to the GNU Lesser General Public License
-* version 2.1, the object code form of a "work that uses the Library"
-* may incorporate material from a header file that is part of the
-* Library.  You may distribute such object code under terms of your
-* choice, provided that the incorporated material (i) does not exceed
-* more than 5% of the total size of the Library; and (ii) is limited to
-* numerical parameters, data structure layouts, accessors, macros,
-* inline functions and templates.
-*
-* This program is distributed in the hope that it will be useful, but
-* WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this program; if not, write to the Free Software
-* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA
-*/
-
-#include <Python.h>
-#include <QDebug>
-#include "proxyslot.h"
-#include "abstractqobjectconnection.h"
-#include "signalmanager.h"
-
-using namespace PySide;
-
-ProxySlot::ProxySlot(const QObject* signalSource) : m_metaObject(signalSource), m_signalSource(signalSource)
-{
-    m_nextSlotIndex = m_signalSource->metaObject()->methodCount()-1;
-}
-
-bool ProxySlot::connect(AbstractQObjectConnection* connection)
-{
-    QObject* source = connection->source();
-    attachAbstractConnection(connection);
-    int slotIndex = connection->slotIndex();
-    int signalIndex = connection->signalIndex();
-
-    qDebug() << "conectando" << signalIndex << "em" << slotIndex;
-    if (signalIndex >= 0) {
-        return QMetaObject::connect(source, signalIndex, this, slotIndex, connection->type());
-    } else { // dynamic signals!
-        // TODO: Register dynamic signal
-    }
-    return true;
-
-}
-
-void ProxySlot::attachAbstractConnection(AbstractQObjectConnection* connection)
-{
-    m_nextSlotIndex++;
-    m_connections[m_nextSlotIndex] = connection;
-    connection->setSlotIndex(m_nextSlotIndex);
-}
-
-int ProxySlot::qt_metacall(QMetaObject::Call callType, int slotIndex, void** args)
-{
-    // 2 is the index of deleteLater slot
-    if (slotIndex == 2) {
-        deleteLater();
-        SignalManager::instance().removeProxySlot(m_signalSource);
-    }
-
-    if (m_connections.contains(slotIndex)) {
-//         thread_locker lock;
-        m_connections[slotIndex]->trigger(args);
-        return -1;
-    }
-
-    return QObject::qt_metacall(callType, slotIndex, args);
-}
-
diff --git a/libpyside/pyside.cpp b/libpyside/pyside.cpp
index 3fa63a4..0d96f95 100644
--- a/libpyside/pyside.cpp
+++ b/libpyside/pyside.cpp
@@ -1,50 +1,296 @@
 /*
- * This file is part of the Shiboken Python Bindings Generator project.
+ * This file is part of the PySide project.
  *
- * Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+ * Copyright (C) 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
  *
  * Contact: PySide team <contact@pyside.org>
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * version 2.1 as published by the Free Software Foundation. Please
- * review the following information to ensure the GNU Lesser General
- * Public License version 2.1 requirements will be met:
- * http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
  *
- * As a special exception to the GNU Lesser General Public License
- * version 2.1, the object code form of a "work that uses the Library"
- * may incorporate material from a header file that is part of the
- * Library.  You may distribute such object code under terms of your
- * choice, provided that the incorporated material (i) does not exceed
- * more than 5% of the total size of the Library; and (ii) is limited to
- * numerical parameters, data structure layouts, accessors, macros,
- * inline functions and templates.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-
 #include "pyside.h"
+#include "signalmanager.h"
+#include "pysideclassinfo_p.h"
+#include "pysideproperty_p.h"
+#include "pysideproperty.h"
+#include "pysidesignal.h"
+#include "pysidesignal_p.h"
+#include "pysideslot_p.h"
+#include "pysidemetafunction_p.h"
+#include "pysidemetafunction.h"
+#include "dynamicqmetaobject.h"
+#include "destroylistener.h"
 
-extern "C" void init_signal(PyObject* module);
-extern "C" void init_slot(PyObject* module);
+#include <basewrapper.h>
+#include <conversions.h>
+#include <sbkconverter.h>
+#include <typeresolver.h>
+#include <bindingmanager.h>
+#include <algorithm>
+#include <cstring>
+#include <cctype>
+#include <QStack>
+#include <QCoreApplication>
+#include <QDebug>
+
+static QStack<PySide::CleanupFunction> cleanupFunctionList;
+static void* qobjectNextAddr;
 
 namespace PySide
 {
 
 void init(PyObject *module)
 {
-    init_signal(module);
-    init_slot(module);
+    qobjectNextAddr = 0;
+    ClassInfo::init(module);
+    Signal::init(module);
+    Slot::init(module);
+    Property::init(module);
+    MetaFunction::init(module);
+    // Init signal manager, so it will register some meta types used by QVariant.
+    SignalManager::instance();
+}
+
+bool fillQtProperties(PyObject* qObj, const QMetaObject* metaObj, PyObject* kwds, const char** blackList, unsigned int blackListSize)
+{
+
+    PyObject *key, *value;
+    Py_ssize_t pos = 0;
+
+    while (PyDict_Next(kwds, &pos, &key, &value)) {
+        if (!blackListSize || !std::binary_search(blackList, blackList + blackListSize, std::string(Shiboken::String::toCString(key)))) {
+            QByteArray propName(Shiboken::String::toCString(key));
+            if (metaObj->indexOfProperty(propName) != -1) {
+                propName[0] = std::toupper(propName[0]);
+                propName.prepend("set");
+
+                Shiboken::AutoDecRef propSetter(PyObject_GetAttrString(qObj, propName.constData()));
+                if (!propSetter.isNull()) {
+                    Shiboken::AutoDecRef args(PyTuple_Pack(1, value));
+                    Shiboken::AutoDecRef retval(PyObject_CallObject(propSetter, args));
+                } else {
+                    PyObject* attr = PyObject_GenericGetAttr(qObj, key);
+                    if (PySide::Property::checkType(attr))
+                        PySide::Property::setValue(reinterpret_cast<PySideProperty*>(attr), qObj, value);
+                }
+            } else {
+                propName.append("()");
+                if (metaObj->indexOfSignal(propName) != -1) {
+                    propName.prepend('2');
+                    PySide::Signal::connect(qObj, propName, value);
+                } else {
+                    PyErr_Format(PyExc_AttributeError, "'%s' is not a Qt property or a signal", propName.constData());
+                    return false;
+                };
+            }
+        }
+    }
+    return true;
+}
+
+void registerCleanupFunction(CleanupFunction func)
+{
+    cleanupFunctionList.push(func);
+}
+
+void runCleanupFunctions()
+{
+    //PySide::DestroyListener::instance()->destroy();
+    while (!cleanupFunctionList.isEmpty()) {
+        CleanupFunction f = cleanupFunctionList.pop();
+        f();
+    }
+    PySide::DestroyListener::destroy();
+}
+
+static void destructionVisitor(SbkObject* pyObj, void* data)
+{
+    void** realData = reinterpret_cast<void**>(data);
+    SbkObject* pyQApp = reinterpret_cast<SbkObject*>(realData[0]);
+    PyTypeObject* pyQObjectType = reinterpret_cast<PyTypeObject*>(realData[1]);
+
+    if (pyObj != pyQApp && PyObject_TypeCheck(pyObj, pyQObjectType)) {
+        if (Shiboken::Object::hasOwnership(pyObj) && Shiboken::Object::isValid(pyObj, false)) {
+            Shiboken::Object::setValidCpp(pyObj, false);
+
+            Py_BEGIN_ALLOW_THREADS
+            Shiboken::callCppDestructor<QObject>(Shiboken::Object::cppPointer(pyObj, pyQObjectType));
+            Py_END_ALLOW_THREADS
+        }
+    }
+
+};
+
+void destroyQCoreApplication()
+{
+    SignalManager::instance().clear();
+    QCoreApplication* app = QCoreApplication::instance();
+    if (!app)
+        return;
+
+    Shiboken::BindingManager& bm = Shiboken::BindingManager::instance();
+    SbkObject* pyQApp = bm.retrieveWrapper(app);
+    PyTypeObject* pyQObjectType = Shiboken::Conversions::getPythonTypeObject("QObject*");
+    assert(pyQObjectType);
+
+    void* data[2] = {pyQApp, pyQObjectType};
+    bm.visitAllPyObjects(&destructionVisitor, &data);
+
+    // in the end destroy app
+    delete app;
+}
+
+struct TypeUserData {
+    TypeUserData(PyTypeObject* type, const QMetaObject* metaobject) : mo(type, metaobject) {}
+    DynamicQMetaObject mo;
+    std::size_t cppObjSize;
+};
+
+std::size_t getSizeOfQObject(SbkObjectType* type)
+{
+    using namespace Shiboken::ObjectType;
+    TypeUserData* userData = reinterpret_cast<TypeUserData*>(getTypeUserData(reinterpret_cast<SbkObjectType*>(type)));
+    return userData->cppObjSize;
+}
+
+void initDynamicMetaObject(SbkObjectType* type, const QMetaObject* base, const std::size_t& cppObjSize)
+{
+    //create DynamicMetaObject based on python type
+    TypeUserData* userData = new TypeUserData(reinterpret_cast<PyTypeObject*>(type), base);
+    userData->cppObjSize = cppObjSize;
+    userData->mo.update();
+    Shiboken::ObjectType::setTypeUserData(type, userData, Shiboken::callCppDestructor<TypeUserData>);
+
+    //initialize staticQMetaObject property
+    void* metaObjectPtr = &userData->mo;
+    static SbkConverter* converter = Shiboken::Conversions::getConverter("QMetaObject");
+    if (!converter)
+        return;
+    Shiboken::AutoDecRef pyMetaObject(Shiboken::Conversions::pointerToPython(converter, metaObjectPtr));
+    PyObject_SetAttrString(reinterpret_cast<PyObject*>(type), "staticMetaObject", pyMetaObject);
+}
+
+void initDynamicMetaObject(SbkObjectType* type, const QMetaObject* base)
+{
+    initDynamicMetaObject(type, base, 0);
+}
+
+void initQObjectSubType(SbkObjectType* type, PyObject* args, PyObject* kwds)
+{
+    PyTypeObject* qObjType = Shiboken::Conversions::getPythonTypeObject("QObject*");
+    QByteArray className(Shiboken::String::toCString(PyTuple_GET_ITEM(args, 0)));
+
+    PyObject* bases = PyTuple_GET_ITEM(args, 1);
+    int numBases = PyTuple_GET_SIZE(bases);
+    QMetaObject* baseMo = 0;
+    SbkObjectType* qobjBase = 0;
+
+    for (int i = 0; i < numBases; ++i) {
+        PyTypeObject* base = reinterpret_cast<PyTypeObject*>(PyTuple_GET_ITEM(bases, i));
+        if (PyType_IsSubtype(base, qObjType)) {
+            baseMo = reinterpret_cast<QMetaObject*>(Shiboken::ObjectType::getTypeUserData(reinterpret_cast<SbkObjectType*>(base)));
+            qobjBase = reinterpret_cast<SbkObjectType*>(base);
+            reinterpret_cast<DynamicQMetaObject*>(baseMo)->update();
+            break;
+        }
+    }
+    if (!baseMo) {
+        qWarning("Sub class of QObject not inheriting QObject!? Crash will happen when using %s.", className.constData());
+        return;
+    }
+
+    TypeUserData* userData = reinterpret_cast<TypeUserData*>(Shiboken::ObjectType::getTypeUserData(qobjBase));
+    initDynamicMetaObject(type, baseMo, userData->cppObjSize);
+}
+
+PyObject* getMetaDataFromQObject(QObject* cppSelf, PyObject* self, PyObject* name)
+{
+    PyObject* attr = PyObject_GenericGetAttr(self, name);
+    if (!Shiboken::Object::isValid(reinterpret_cast<SbkObject*>(self), false))
+        return attr;
+
+    if (attr && Property::checkType(attr)) {
+        PyObject *value = Property::getValue(reinterpret_cast<PySideProperty*>(attr), self);
+        Py_DECREF(attr);
+        if (!value)
+            return 0;
+        Py_INCREF(value);
+        attr = value;
+    }
+
+    //mutate native signals to signal instance type
+    if (attr && PyObject_TypeCheck(attr, &PySideSignalType)) {
+        PyObject* signal = reinterpret_cast<PyObject*>(Signal::initialize(reinterpret_cast<PySideSignal*>(attr), name, self));
+        PyObject_SetAttr(self, name, reinterpret_cast<PyObject*>(signal));
+        return signal;
+    }
+
+    //search on metaobject (avoid internal attributes started with '__')
+    if (!attr) {
+        const char* cname = Shiboken::String::toCString(name);
+        uint cnameLen = qstrlen(cname);
+        if (std::strncmp("__", cname, 2)) {
+            const QMetaObject* metaObject = cppSelf->metaObject();
+            //signal
+            QList<QMetaMethod> signalList;
+            for(int i=0, i_max = metaObject->methodCount(); i < i_max; i++) {
+                QMetaMethod method = metaObject->method(i);
+                const char* methSig = method.signature();
+                bool methMacth = !std::strncmp(cname, methSig, cnameLen) && methSig[cnameLen] == '(';
+                if (methMacth) {
+                    if (method.methodType() == QMetaMethod::Signal) {
+                        signalList.append(method);
+                    } else {
+                        PySideMetaFunction* func = MetaFunction::newObject(cppSelf, i);
+                        if (func) {
+                            PyObject_SetAttr(self, name, (PyObject*)func);
+                            return (PyObject*)func;
+                        }
+                    }
+                }
+            }
+            if (signalList.size() > 0) {
+                PyObject* pySignal = reinterpret_cast<PyObject*>(Signal::newObjectFromMethod(self, signalList));
+                PyObject_SetAttr(self, name, pySignal);
+                return pySignal;
+            }
+        }
+    }
+    return attr;
+}
+
+bool inherits(PyTypeObject* objType, const char* class_name)
+{
+    if (strcmp(objType->tp_name, class_name) == 0)
+        return true;
+
+    PyTypeObject* base = (objType)->tp_base;
+    if (base == 0)
+        return false;
+
+    return inherits(base, class_name);
+}
+
+void* nextQObjectMemoryAddr()
+{
+    return qobjectNextAddr;
+}
+
+void setNextQObjectMemoryAddr(void* addr)
+{
+    qobjectNextAddr = addr;
 }
 
 } //namespace PySide
diff --git a/libpyside/pyside.h b/libpyside/pyside.h
index 2048265..779c630 100644
--- a/libpyside/pyside.h
+++ b/libpyside/pyside.h
@@ -1,49 +1,61 @@
 /*
- * This file is part of the Shiboken Python Bindings Generator project.
+ * This file is part of the PySide project.
  *
- * Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+ * Copyright (C) 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
  *
  * Contact: PySide team <contact@pyside.org>
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * version 2.1 as published by the Free Software Foundation. Please
- * review the following information to ensure the GNU Lesser General
- * Public License version 2.1 requirements will be met:
- * http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
  *
- * As a special exception to the GNU Lesser General Public License
- * version 2.1, the object code form of a "work that uses the Library"
- * may incorporate material from a header file that is part of the
- * Library.  You may distribute such object code under terms of your
- * choice, provided that the incorporated material (i) does not exceed
- * more than 5% of the total size of the Library; and (ii) is limited to
- * numerical parameters, data structure layouts, accessors, macros,
- * inline functions and templates.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
 #ifndef PYSIDE_H
 #define PYSIDE_H
 
-#include <Python.h>
+#include <sbkpython.h>
 #include <pysidemacros.h>
 #include <QMetaType>
+#include <QHash>
+#include <QList>
+
+class SbkObjectType;
 
 namespace PySide
 {
 
 PYSIDE_API void init(PyObject *module);
 
+/**
+ * Hash function used to enable hash on objects not supported on native Qt library which has toString function.
+ */
+template<class T>
+inline uint hash(const T& value)
+{
+    return qHash(value.toString());
+}
+
+/**
+ * Fill QObject properties and do signal connections using the values found in \p kwds dictonary.
+ * \param qObj PyObject fot the QObject.
+ * \param metaObj QMetaObject of \p qObj.
+ * \param blackList keys to be ignored in kwds dictionary, this string list MUST be sorted.
+ * \param blackListSize numbe rof elements in blackList.
+ * \param kwds key->value dictonary.
+ * \return True if everything goes well, false with a Python error setted otherwise.
+ */
+PYSIDE_API bool fillQtProperties(PyObject* qObj, const QMetaObject* metaObj, PyObject* kwds, const char** blackList, unsigned int blackListSize);
+
 /**
 *   If the type \p T was registered on Qt meta type system with Q_DECLARE_METATYPE macro, this class will initialize
 *   the meta type.
@@ -65,6 +77,46 @@ template<typename T>
 struct initQtMetaType<T, false> {
 };
 
+PYSIDE_DEPRECATED(PYSIDE_API void initDynamicMetaObject(SbkObjectType* type, const QMetaObject* base));
+PYSIDE_API void initDynamicMetaObject(SbkObjectType* type, const QMetaObject* base, const std::size_t& cppObjSize);
+PYSIDE_API void initQObjectSubType(SbkObjectType* type, PyObject* args, PyObject* kwds);
+
+/// Return the size in bytes of a type that inherits QObject.
+PYSIDE_API std::size_t getSizeOfQObject(SbkObjectType* type);
+
+typedef void (*CleanupFunction)(void);
+
+/**
+ * Register a function to be called before python die
+ */
+PYSIDE_API void registerCleanupFunction(CleanupFunction func);
+PYSIDE_API void runCleanupFunctions();
+
+/**
+ * Destroy a QCoreApplication taking care of destroy all instances of QObject first.
+ */
+PYSIDE_API void destroyQCoreApplication();
+
+/**
+ * Check for properties and signals registered on MetaObject and return these
+ * \param cppSelf Is the QObject which contains the metaobject
+ * \param self Python object of cppSelf
+ * \param name Name of the argument which the function will try retrieve from MetaData
+ * \return The Python object which contains the Data obtained in metaObject or the Python attribute related with name
+ */
+PYSIDE_API PyObject* getMetaDataFromQObject(QObject* cppSelf, PyObject* self, PyObject* name);
+
+/**
+ * Check if self inherits from class_name
+ * \param self Python object
+ * \param class_name strict with the class name
+ * \return Returns true if self object inherits from class_name, otherwise returns false
+ */
+PYSIDE_API bool inherits(PyTypeObject* self, const char* class_name);
+
+PYSIDE_API void* nextQObjectMemoryAddr();
+PYSIDE_API void setNextQObjectMemoryAddr(void* addr);
+
 } //namespace PySide
 
 
diff --git a/libpyside/pyside.pc.in b/libpyside/pyside.pc.in
index 61cb808..7d5e68c 100644
--- a/libpyside/pyside.pc.in
+++ b/libpyside/pyside.pc.in
@@ -1,11 +1,14 @@
 prefix=@CMAKE_INSTALL_PREFIX@
 exec_prefix=@CMAKE_INSTALL_PREFIX@
 libdir=@LIB_INSTALL_DIR@
-includedir=@CMAKE_INSTALL_PREFIX@/include/PySide
+includedir=@CMAKE_INSTALL_PREFIX@/include/PySide@pyside_SUFFIX@
+typesystemdir=@CMAKE_INSTALL_PREFIX@/share/PySide@pyside_SUFFIX@/typesystems
+pythonpath=@SITE_PACKAGE@
 
-Name: PySide
+Name: PySide@pyside_SUFFIX@
 Description: Support library for Python bindings of Qt-based libraries.
-Version: @BINDING_API_VERSION@
-Libs: -L${libdir} -lpython -lpyside
+Version: @BINDING_API_VERSION_FULL@
+Libs: -L${libdir} -lpyside@pyside_SUFFIX@@SHIBOKEN_PYTHON_SUFFIX@@LIBRARY_OUTPUT_SUFFIX@
 Cflags: -I${includedir}
+Requires: shiboken
 
diff --git a/libpyside/pysideclassinfo.cpp b/libpyside/pysideclassinfo.cpp
new file mode 100644
index 0000000..a1a439c
--- /dev/null
+++ b/libpyside/pysideclassinfo.cpp
@@ -0,0 +1,165 @@
+/*
+ * This file is part of the PySide project.
+ *
+ * Copyright (C) 2009-2011 Nokia Corporation and/or its subsidiary(-ies).
+ *
+ * Contact: PySide team <contact@pyside.org>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+#include <sbkpython.h>
+#include "pysideclassinfo.h"
+#include "pysideclassinfo_p.h"
+#include "dynamicqmetaobject.h"
+
+#include <shiboken.h>
+#include <QDebug>
+
+#define CLASSINFO_CLASS_NAME    "ClassInfo"
+
+extern "C"
+{
+
+static PyObject* classInfoTpNew(PyTypeObject* subtype, PyObject* args, PyObject* kwds);
+static int classInfoTpInit(PyObject*, PyObject*, PyObject*);
+static void classInfoFree(void*);
+static PyObject* classCall(PyObject*, PyObject*, PyObject*);
+
+PyTypeObject PySideClassInfoType = {
+    PyVarObject_HEAD_INIT(0, 0)
+    CLASSINFO_CLASS_NAME,      /*tp_name*/
+    sizeof(PySideClassInfo),   /*tp_basicsize*/
+    0,                         /*tp_itemsize*/
+    0,                         /*tp_dealloc*/
+    0,                         /*tp_print*/
+    0,                         /*tp_getattr*/
+    0,                         /*tp_setattr*/
+    0,                         /*tp_compare*/
+    0,                         /*tp_repr*/
+    0,                         /*tp_as_number*/
+    0,                         /*tp_as_sequence*/
+    0,                         /*tp_as_mapping*/
+    0,                         /*tp_hash */
+    classCall,                 /*tp_call*/
+    0,                         /*tp_str*/
+    0,                         /*tp_getattro*/
+    0,                         /*tp_setattro*/
+    0,                         /*tp_as_buffer*/
+    Py_TPFLAGS_DEFAULT,        /*tp_flags*/
+    0,                         /*tp_doc */
+    0,                         /*tp_traverse */
+    0,                         /*tp_clear */
+    0,                         /*tp_richcompare */
+    0,                         /*tp_weaklistoffset */
+    0,                         /*tp_iter */
+    0,                         /*tp_iternext */
+    0,                         /*tp_methods */
+    0,                         /*tp_members */
+    0,                         /*tp_getset */
+    0,                         /*tp_base */
+    0,                         /*tp_dict */
+    0,                         /*tp_descr_get */
+    0,                         /*tp_descr_set */
+    0,                         /*tp_dictoffset */
+    classInfoTpInit,           /*tp_init */
+    0,                         /*tp_alloc */
+    classInfoTpNew,            /*tp_new */
+    classInfoFree,             /*tp_free */
+    0,                         /*tp_is_gc */
+    0,                         /*tp_bases */
+    0,                         /*tp_mro */
+    0,                         /*tp_cache */
+    0,                         /*tp_subclasses */
+    0,                         /*tp_weaklist */
+    0,                         /*tp_del */
+};
+
+PyObject* classCall(PyObject* self, PyObject* args, PyObject* kw)
+{
+    PyObject* klass;
+    klass = PyTuple_GetItem(args, 0);
+
+    if (Shiboken::ObjectType::checkType(reinterpret_cast<PyTypeObject*>(klass))) {
+        PySide::DynamicQMetaObject* mo = reinterpret_cast<PySide::DynamicQMetaObject*>(Shiboken::ObjectType::getTypeUserData(reinterpret_cast<SbkObjectType*>(klass)));
+        if (mo)
+            mo->addInfo(PySide::ClassInfo::getMap(reinterpret_cast<PySideClassInfo*>(self)));
+    }
+
+    Py_INCREF(klass);
+    return klass;
+}
+
+static PyObject* classInfoTpNew(PyTypeObject* subtype, PyObject* args, PyObject* kwds)
+{
+    PySideClassInfo* me = reinterpret_cast<PySideClassInfo*>(subtype->tp_alloc(subtype, 0));
+    me->d = new PySideClassInfoPrivate;
+    return (PyObject*) me;
+}
+
+int classInfoTpInit(PyObject* self, PyObject* args, PyObject* kwds)
+{
+    PySideClassInfo* data = reinterpret_cast<PySideClassInfo*>(self);
+    PySideClassInfoPrivate* pData = data->d;
+
+    PyObject* key;
+    PyObject* value;
+    Py_ssize_t pos = 0;
+    while (PyDict_Next(kwds, &pos, &key, &value)) {
+        if (Shiboken::String::check(key) && Shiboken::String::check(value))
+            pData->m_data[Shiboken::String::toCString(key)] = Shiboken::String::toCString(value);
+    }
+
+    return PyErr_Occurred() ? -1 : 1;
+}
+
+void classInfoFree(void *self)
+{
+    PyObject* pySelf = reinterpret_cast<PyObject*>(self);
+    PySideClassInfo* data = reinterpret_cast<PySideClassInfo*>(self);
+
+    delete data->d;
+    pySelf->ob_type->tp_base->tp_free(self);
+}
+
+
+} // extern "C"
+
+
+namespace PySide { namespace ClassInfo {
+
+void init(PyObject* module)
+{
+    if (PyType_Ready(&PySideClassInfoType) < 0)
+        return;
+
+    Py_INCREF(&PySideClassInfoType);
+    PyModule_AddObject(module, CLASSINFO_CLASS_NAME, ((PyObject*)&PySideClassInfoType));
+}
+
+bool checkType(PyObject* pyObj)
+{
+    if (pyObj)
+        return PyType_IsSubtype(pyObj->ob_type, &PySideClassInfoType);
+    return false;
+}
+
+QMap<QByteArray, QByteArray> getMap(PySideClassInfo* obj)
+{
+    return obj->d->m_data;
+}
+
+} //namespace Property
+} //namespace PySide
diff --git a/libpyside/pysideclassinfo.h b/libpyside/pysideclassinfo.h
new file mode 100644
index 0000000..ac3e239
--- /dev/null
+++ b/libpyside/pysideclassinfo.h
@@ -0,0 +1,51 @@
+/*
+ * This file is part of the PySide project.
+ *
+ * Copyright (C) 2009-2011 Nokia Corporation and/or its subsidiary(-ies).
+ *
+ * Contact: PySide team <contact@pyside.org>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+#ifndef PYSIDE_CLASSINFO_H
+#define PYSIDE_CLASSINFO_H
+
+#include <pysidemacros.h>
+#include <sbkpython.h>
+#include <QMap>
+#include <QByteArray>
+
+extern "C"
+{
+    extern PYSIDE_API PyTypeObject PySideClassInfoType;
+
+    struct PySideClassInfoPrivate;
+    struct PYSIDE_API PySideClassInfo
+    {
+        PyObject_HEAD
+        PySideClassInfoPrivate* d;
+    };
+};
+
+namespace PySide { namespace ClassInfo {
+
+PYSIDE_API bool checkType(PyObject* pyObj);
+PYSIDE_API QMap<QByteArray, QByteArray> getMap(PySideClassInfo* obj);
+
+} //namespace ClassInfo
+} //namespace PySide
+
+#endif
diff --git a/libpyside/pysideclassinfo_p.h b/libpyside/pysideclassinfo_p.h
new file mode 100644
index 0000000..773725c
--- /dev/null
+++ b/libpyside/pysideclassinfo_p.h
@@ -0,0 +1,54 @@
+/*
+ * This file is part of the PySide project.
+ *
+ * Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+ *
+ * Contact: PySide team <contact@pyside.org>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+#ifndef PYSIDE_CLASSINFO_P_H
+#define PYSIDE_CLASSINFO_P_H
+
+#include <sbkpython.h>
+#include <QMetaObject>
+#include "pysideclassinfo.h"
+
+#define __INFO_ATTR_NAME__      "__classInfo__"
+
+struct PySideClassInfo;
+
+extern "C"
+{
+
+struct PySideClassInfoPrivate {
+    QMap<QByteArray, QByteArray> m_data;
+};
+
+} // extern "C"
+
+namespace PySide { namespace ClassInfo {
+
+/**
+ * Init PySide QProperty support system
+ */
+void init(PyObject* module);
+
+
+} // namespace ClassInfo
+} // namespace PySide
+
+#endif
diff --git a/libpyside/pysideconversions.h b/libpyside/pysideconversions.h
index 9539b11..fa82381 100644
--- a/libpyside/pysideconversions.h
+++ b/libpyside/pysideconversions.h
@@ -1,52 +1,47 @@
 /*
-* This file is part of the Shiboken Python Bindings Generator project.
+* This file is part of the PySide project.
 *
 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 *
 * Contact: PySide team <contact@pyside.org>
 *
-* This program is free software; you can redistribute it and/or
-* modify it under the terms of the GNU Lesser General Public License
-* version 2.1 as published by the Free Software Foundation. Please
-* review the following information to ensure the GNU Lesser General
-* Public License version 2.1 requirements will be met:
-* http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+* This library is free software; you can redistribute it and/or
+* modify it under the terms of the GNU Lesser General Public
+* License as published by the Free Software Foundation; either
+* version 2.1 of the License, or (at your option) any later version.
 *
-* As a special exception to the GNU Lesser General Public License
-* version 2.1, the object code form of a "work that uses the Library"
-* may incorporate material from a header file that is part of the
-* Library.  You may distribute such object code under terms of your
-* choice, provided that the incorporated material (i) does not exceed
-* more than 5% of the total size of the Library; and (ii) is limited to
-* numerical parameters, data structure layouts, accessors, macros,
-* inline functions and templates.
-*
-* This program is distributed in the hope that it will be useful, but
-* WITHOUT ANY WARRANTY; without even the implied warranty of
+* This library is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 * Lesser General Public License for more details.
 *
 * You should have received a copy of the GNU Lesser General Public
-* License along with this program; if not, write to the Free Software
-* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA
+* License along with this library; if not, write to the Free Software
+* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
 #ifndef PYSIDECONVERSIONS_H
 #define PYSIDECONVERSIONS_H
 
-#include <Python.h>
+#include <sbkpython.h>
+#include <QFlag>
 #include <conversions.h>
+#include <pysideqflags.h>
 
 template <typename QtDict>
 struct QtDictConverter
 {
+    static inline bool checkType(PyObject* pyObj)
+    {
+        return isConvertible(pyObj);
+    }
+
     static inline bool isConvertible(PyObject* pyObj)
     {
         if (PyObject_TypeCheck(pyObj, Shiboken::SbkType<QtDict>()))
             return true;
 
-        if ((Shiboken::SbkType<QtDict>() && Shiboken::isShibokenType(pyObj)) || !PyDict_Check(pyObj))
+        if ((Shiboken::SbkType<QtDict>() && Shiboken::Object::checkType(pyObj)) || !PyDict_Check(pyObj))
             return false;
 
         PyObject* key;
@@ -62,6 +57,7 @@ struct QtDictConverter
         return true;
     }
 
+    static inline PyObject* toPython(void* cppObj) { return toPython(*reinterpret_cast<QtDict*>(cppObj)); }
     static inline PyObject* toPython(const QtDict& cppobj)
     {
         PyObject* result = PyDict_New();
@@ -78,7 +74,7 @@ struct QtDictConverter
     static inline QtDict toCpp(PyObject* pyobj)
     {
         if (PyObject_TypeCheck(pyobj, Shiboken::SbkType<QtDict>()))
-            return *reinterpret_cast<QtDict*>(Shiboken::getCppPointer(pyobj, Shiboken::SbkType<QtDict>()));
+            return *reinterpret_cast<QtDict*>(Shiboken::Object::cppPointer((SbkObject*)pyobj, Shiboken::SbkType<QtDict>()));
 
         QtDict result;
 
@@ -95,12 +91,17 @@ struct QtDictConverter
 template <typename MultiMap>
 struct QtMultiMapConverter
 {
+    static inline bool checkType(PyObject* pyObj)
+    {
+        return isConvertible(pyObj);
+    }
+
     static inline bool isConvertible(PyObject* pyObj)
     {
         if (PyObject_TypeCheck(pyObj, Shiboken::SbkType<MultiMap>()))
             return true;
 
-        if ((Shiboken::SbkType<MultiMap>() && Shiboken::isShibokenType(pyObj)) || !PyDict_Check(pyObj))
+        if ((Shiboken::SbkType<MultiMap>() && Shiboken::Object::checkType(pyObj)) || !PyDict_Check(pyObj))
             return false;
 
         PyObject* key;
@@ -123,6 +124,7 @@ struct QtMultiMapConverter
         return true;
     }
 
+    static inline PyObject* toPython(void* cppObj) { return toPython(*reinterpret_cast<MultiMap*>(cppObj)); }
     static inline PyObject* toPython(const MultiMap& cppObj)
     {
         PyObject* result = PyDict_New();
@@ -145,10 +147,11 @@ struct QtMultiMapConverter
 
         return result;
     }
+
     static inline MultiMap toCpp(PyObject* pyObj)
     {
         if (PyObject_TypeCheck(pyObj, Shiboken::SbkType<MultiMap>()))
-            return *reinterpret_cast<MultiMap*>(Shiboken::getCppPointer(pyObj, Shiboken::SbkType<MultiMap>()));
+            return *reinterpret_cast<MultiMap*>(Shiboken::Object::cppPointer((SbkObject*)pyObj, Shiboken::SbkType<MultiMap>()));
 
         MultiMap result;
 
@@ -165,11 +168,16 @@ struct QtMultiMapConverter
 template <typename T>
 struct QSequenceConverter
 {
+    static inline bool checkType(PyObject* pyObj)
+    {
+        return isConvertible(pyObj);
+    }
+
     static inline bool isConvertible(PyObject* pyObj)
     {
         if (PyObject_TypeCheck(pyObj, Shiboken::SbkType<T>()))
             return true;
-        if ((Shiboken::SbkType<T>() && Shiboken::isShibokenType(pyObj)) || !PySequence_Check(pyObj))
+        if ((Shiboken::SbkType<T>() && Shiboken::Object::checkType(pyObj)) || !PySequence_Check(pyObj))
             return false;
         for (int i = 0, max = PySequence_Length(pyObj); i < max; ++i) {
             Shiboken::AutoDecRef item(PySequence_GetItem(pyObj, i));
@@ -178,6 +186,7 @@ struct QSequenceConverter
         }
         return true;
     }
+    static inline PyObject* toPython(void* cppObj) { return toPython(*reinterpret_cast<T*>(cppObj)); }
     static PyObject* toPython(const T& cppobj)
     {
         PyObject* result = PyList_New((int) cppobj.size());
@@ -191,7 +200,7 @@ struct QSequenceConverter
     static T toCpp(PyObject* pyobj)
     {
         if (PyObject_TypeCheck(pyobj, Shiboken::SbkType<T>()))
-            return *reinterpret_cast<T*>(Shiboken::getCppPointer(pyobj, Shiboken::SbkType<T>()));
+            return *reinterpret_cast<T*>(Shiboken::Object::cppPointer((SbkObject*)pyobj, Shiboken::SbkType<T>()));
 
         Shiboken::AutoDecRef fastSequence(PySequence_Fast(pyobj, "Invalid sequence object"));
         T result;
@@ -203,4 +212,46 @@ struct QSequenceConverter
     }
 };
 
+
+template <typename T>
+struct QFlagsConverter
+{
+    static inline bool checkType(PyObject* pyObj)
+    {
+        return PyObject_TypeCheck(pyObj, Shiboken::SbkType<T>());
+    }
+
+    static inline bool isConvertible(PyObject* pyObj)
+    {
+        return PyObject_TypeCheck(pyObj, Shiboken::SbkType<T>())
+               || PyObject_TypeCheck(pyObj, Shiboken::SbkType<typename T::enum_type>());
+    }
+
+    static inline PyObject* toPython(void* cppObj)
+    {
+        return toPython(*reinterpret_cast<T*>(cppObj));
+    }
+
+    static inline PyObject* toPython(const T& cppObj)
+    {
+        return reinterpret_cast<PyObject*>(PySide::QFlags::newObject(cppObj, Shiboken::SbkType<T>()));
+    }
+
+    static inline T toCpp(PyObject* pyObj)
+    {
+        long val = 0;
+        if (Shiboken::Enum::check(pyObj)) {
+            val = Shiboken::Enum::getValue(pyObj);
+        } else if (PyObject_TypeCheck(pyObj, Shiboken::SbkType<T>())) {
+            val = PySide::QFlags::getValue(reinterpret_cast<PySideQFlagsObject*>(pyObj));
+        } else if (PyNumber_Check(pyObj)) {
+            Shiboken::AutoDecRef pyLong(PyNumber_Long(pyObj));
+            val = PyLong_AsLong(pyLong.object());
+        } else {
+            PyErr_BadArgument();
+        }
+        return T(QFlag(val));
+    }
+};
+
 #endif
diff --git a/libpyside/pysidemacros.h b/libpyside/pysidemacros.h
index c9e1e11..17f9817 100644
--- a/libpyside/pysidemacros.h
+++ b/libpyside/pysidemacros.h
@@ -1,51 +1,46 @@
 /*
-* This file is part of the Shiboken Python Bindings Generator project.
+* This file is part of the PySide project.
 *
-* Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (C) 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
 *
 * Contact: PySide team <contact@pyside.org>
 *
-* This program is free software; you can redistribute it and/or
-* modify it under the terms of the GNU Lesser General Public License
-* version 2.1 as published by the Free Software Foundation. Please
-* review the following information to ensure the GNU Lesser General
-* Public License version 2.1 requirements will be met:
-* http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+* This library is free software; you can redistribute it and/or
+* modify it under the terms of the GNU Lesser General Public
+* License as published by the Free Software Foundation; either
+* version 2.1 of the License, or (at your option) any later version.
 *
-* As a special exception to the GNU Lesser General Public License
-* version 2.1, the object code form of a "work that uses the Library"
-* may incorporate material from a header file that is part of the
-* Library.  You may distribute such object code under terms of your
-* choice, provided that the incorporated material (i) does not exceed
-* more than 5% of the total size of the Library; and (ii) is limited to
-* numerical parameters, data structure layouts, accessors, macros,
-* inline functions and templates.
-*
-* This program is distributed in the hope that it will be useful, but
-* WITHOUT ANY WARRANTY; without even the implied warranty of
+* This library is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 * Lesser General Public License for more details.
 *
 * You should have received a copy of the GNU Lesser General Public
-* License along with this program; if not, write to the Free Software
-* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA
+* License along with this library; if not, write to the Free Software
+* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
 #ifndef PYSIDEMACROS_H
 #define PYSIDEMACROS_H
 
-#if defined _WIN32 || defined __CYGWIN__
-    #if PYSIDE_BUILD
+#if defined _WIN32
+    #if PYSIDE_EXPORTS
         #define PYSIDE_API __declspec(dllexport)
     #else
-        #define PYSIDE_API __declspec(dllimport)
+        #if defined __MINGW32__
+            #define PYSIDE_API
+        #else
+            #define PYSIDE_API __declspec(dllimport)
+        #endif
     #endif
+    #define PYSIDE_DEPRECATED(func) __declspec(deprecated) func
 #else
     #if __GNUC__ >= 4
         #define PYSIDE_API __attribute__ ((visibility("default")))
+        #define PYSIDE_DEPRECATED(func) func __attribute__ ((deprecated))
     #else
         #define PYSIDE_API
+        #define PYSIDE_DEPRECATED(func) func
     #endif
 #endif
 
diff --git a/libpyside/pysidemetafunction.cpp b/libpyside/pysidemetafunction.cpp
new file mode 100644
index 0000000..17fe839
--- /dev/null
+++ b/libpyside/pysidemetafunction.cpp
@@ -0,0 +1,225 @@
+/*
+ * This file is part of the PySide project.
+ *
+ * Copyright (C) 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
+ *
+ * Contact: PySide team <contact@pyside.org>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+#include <sbkpython.h>
+#include "pysidemetafunction.h"
+#include "pysidemetafunction_p.h"
+
+#include <shiboken.h>
+#include <QObject>
+#include <QMetaMethod>
+#include <QDebug>
+
+extern "C"
+{
+
+struct PySideMetaFunctionPrivate
+{
+    QObject* qobject;
+    int methodIndex;
+};
+
+//methods
+static void         functionFree(void*);
+static PyObject*    functionCall(PyObject*, PyObject*, PyObject*);
+
+PyTypeObject PySideMetaFunctionType = {
+    PyVarObject_HEAD_INIT(0, 0)
+    /*tp_name*/             "PySide.MetaFunction",
+    /*tp_basicsize*/        sizeof(PySideMetaFunction),
+    /*tp_itemsize*/         0,
+    /*tp_dealloc*/          0,
+    /*tp_print*/            0,
+    /*tp_getattr*/          0,
+    /*tp_setattr*/          0,
+    /*tp_compare*/          0,
+    /*tp_repr*/             0,
+    /*tp_as_number*/        0,
+    /*tp_as_sequence*/      0,
+    /*tp_as_mapping*/       0,
+    /*tp_hash*/             0,
+    /*tp_call*/             functionCall,
+    /*tp_str*/              0,
+    /*tp_getattro*/         0,
+    /*tp_setattro*/         0,
+    /*tp_as_buffer*/        0,
+    /*tp_flags*/            Py_TPFLAGS_DEFAULT,
+    /*tp_doc*/              "MetaFunction",
+    /*tp_traverse*/         0,
+    /*tp_clear*/            0,
+    /*tp_richcompare*/      0,
+    /*tp_weaklistoffset*/   0,
+    /*tp_iter*/             0,
+    /*tp_iternext*/         0,
+    /*tp_methods*/          0,
+    /*tp_members*/          0,
+    /*tp_getset*/           0,
+    /*tp_base*/             0,
+    /*tp_dict*/             0,
+    /*tp_descr_get*/        0,
+    /*tp_descr_set*/        0,
+    /*tp_dictoffset*/       0,
+    /*tp_init*/             0,
+    /*tp_alloc*/            0,
+    /*tp_new*/              PyType_GenericNew,
+    /*tp_free*/             functionFree,
+    /*tp_is_gc*/            0,
+    /*tp_bases*/            0,
+    /*tp_mro*/              0,
+    /*tp_cache*/            0,
+    /*tp_subclasses*/       0,
+    /*tp_weaklist*/         0,
+    /*tp_del*/              0,
+};
+
+void functionFree(void *self)
+{
+    PySideMetaFunction* function = reinterpret_cast<PySideMetaFunction*>(self);
+    delete function->d;
+}
+
+PyObject* functionCall(PyObject* self, PyObject* args, PyObject* kw)
+{
+    PySideMetaFunction* function = reinterpret_cast<PySideMetaFunction*>(self);
+
+    PyObject* retVal;
+    if (!PySide::MetaFunction::call(function->d->qobject, function->d->methodIndex, args, &retVal))
+        return 0;
+    return retVal;
+}
+
+} // extern "C"
+
+namespace PySide { namespace MetaFunction {
+
+void init(PyObject* module)
+{
+    if (PyType_Ready(&PySideMetaFunctionType) < 0)
+        return;
+
+    PyModule_AddObject(module, "MetaFunction", ((PyObject*)&PySideMetaFunctionType));
+}
+
+PySideMetaFunction* newObject(QObject* source, int methodIndex)
+{
+    if (methodIndex >= source->metaObject()->methodCount())
+        return 0;
+
+    QMetaMethod method = source->metaObject()->method(methodIndex);
+    if ((method.methodType() == QMetaMethod::Slot) ||
+        (method.methodType() == QMetaMethod::Method)) {
+        PySideMetaFunction* function = PyObject_New(PySideMetaFunction, &PySideMetaFunctionType);
+        function->d = new PySideMetaFunctionPrivate();
+        function->d->qobject = source;
+        function->d->methodIndex = methodIndex;
+        return function;
+    }
+    return 0;
+}
+
+bool call(QObject* self, int methodIndex, PyObject* args, PyObject** retVal)
+{
+
+    QMetaMethod method = self->metaObject()->method(methodIndex);
+    QList<QByteArray> argTypes = method.parameterTypes();
+
+    // args given plus return type
+    Shiboken::AutoDecRef sequence(PySequence_Fast(args, 0));
+    int numArgs = PySequence_Fast_GET_SIZE(sequence.object()) + 1;
+
+    if (numArgs - 1 != argTypes.count()) {
+        PyErr_Format(PyExc_TypeError, "%s only accepts %d arguments, %d given!", method.signature(), argTypes.count(), numArgs);
+        return false;
+    }
+
+    QVariant* methValues = new QVariant[numArgs];
+    void** methArgs = new void*[numArgs];
+
+    // Prepare room for return type
+    const char* returnType = method.typeName();
+    if (returnType)
+        argTypes.prepend(returnType);
+    else
+        argTypes.prepend(QByteArray());
+
+    int i;
+    for (i = 0; i < numArgs; ++i) {
+        const QByteArray& typeName = argTypes[i];
+        // This must happen only when the method hasn't return type.
+        if (typeName.isEmpty()) {
+            methArgs[i] = 0;
+            continue;
+        }
+
+        Shiboken::Conversions::SpecificConverter converter(typeName);
+        if (converter) {
+            int typeId = QMetaType::type(typeName);
+            if (!Shiboken::Conversions::pythonTypeIsObjectType(converter)) {
+                if (!typeId) {
+                    PyErr_Format(PyExc_TypeError, "Value types used on meta functions (including signals) need to be "
+                                                  "registered on meta type: %s", typeName.data());
+                    break;
+                }
+                methValues[i] = QVariant(typeId, (void*) 0);
+            }
+            methArgs[i] = methValues[i].data();
+            if (i == 0) // Don't do this for return type
+                continue;
+            if (typeId == QVariant::String) {
+                QString tmp;
+                converter.toCpp(PySequence_Fast_GET_ITEM(sequence.object(), i - 1), &tmp);
+                methValues[i] = tmp;
+            } else {
+                converter.toCpp(PySequence_Fast_GET_ITEM(sequence.object(), i - 1), methArgs[i]);
+            }
+        } else {
+            PyErr_Format(PyExc_TypeError, "Unknown type used to call meta function (that may be a signal): %s", argTypes[i].constData());
+            break;
+        }
+    }
+
+    bool ok = i == numArgs;
+    if (ok) {
+        QMetaObject::metacall(self, QMetaObject::InvokeMetaMethod, method.methodIndex(), methArgs);
+
+        if (retVal) {
+            if (methArgs[0]) {
+                static SbkConverter* qVariantTypeConverter = Shiboken::Conversions::getConverter("QVariant");
+                Q_ASSERT(qVariantTypeConverter);
+                *retVal = Shiboken::Conversions::copyToPython(qVariantTypeConverter, &methValues[0]);
+                SbkDbg() << (*retVal);
+            } else {
+                *retVal = Py_None;
+                Py_INCREF(*retVal);
+            }
+        }
+    }
+
+    delete[] methArgs;
+    delete[] methValues;
+
+    return ok;
+}
+
+
+} //namespace MetaFunction
+} //namespace PySide
+
diff --git a/libpyside/pysidemetafunction.h b/libpyside/pysidemetafunction.h
new file mode 100644
index 0000000..740cfdc
--- /dev/null
+++ b/libpyside/pysidemetafunction.h
@@ -0,0 +1,59 @@
+/*
+ * This file is part of the PySide project.
+ *
+ * Copyright (C) 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
+ *
+ * Contact: PySide team <contact@pyside.org>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+#ifndef PYSIDE_FUNCTION_H
+#define PYSIDE_METAFUNCTION_H
+
+#include <QObject>
+#include <QString>
+#include <QStringList>
+
+#include <pysidemacros.h>
+#include <sbkpython.h>
+
+extern "C"
+{
+    extern PYSIDE_API PyTypeObject PySideMetaFunctionType;
+
+    struct PySideMetaFunctionPrivate;
+    struct PYSIDE_API PySideMetaFunction
+    {
+        PyObject_HEAD
+        PySideMetaFunctionPrivate* d;
+    };
+}; //extern "C"
+
+namespace PySide { namespace MetaFunction {
+
+/**
+ * This function creates a MetaFunction object
+ *
+ * @param   obj the QObject witch this fuction is part of
+ * @param   methodIndex The index of this function on MetaObject
+ * @return  Return a new reference of PySideMetaFunction
+ **/
+PYSIDE_API PySideMetaFunction*  newObject(QObject* obj, int methodIndex);
+
+} //namespace MetaFunction
+} //namespace PySide
+
+#endif
diff --git a/libpyside/pysidemetafunction_p.h b/libpyside/pysidemetafunction_p.h
new file mode 100644
index 0000000..7e2af4d
--- /dev/null
+++ b/libpyside/pysidemetafunction_p.h
@@ -0,0 +1,43 @@
+/*
+ * This file is part of the PySide project.
+ *
+ * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+ *
+ * Contact: PySide team <contact@pyside.org>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+#ifndef PYSIDE_METAFUNCTION_P_H
+#define PYSIDE_METAFUNCTION_P_H
+
+#include <sbkpython.h>
+#include <QList>
+#include <QByteArray>
+
+class QObject;
+
+namespace PySide { namespace MetaFunction {
+
+    void init(PyObject* module);
+    /**
+     * Does a Qt metacall on a QObject
+     */
+    bool call(QObject* self, int methodIndex, PyObject* args, PyObject** retVal = 0);
+
+} //namespace MetaFunction
+} //namespace PySide
+
+#endif
diff --git a/libpyside/pysideproperty.cpp b/libpyside/pysideproperty.cpp
new file mode 100644
index 0000000..1e1cf29
--- /dev/null
+++ b/libpyside/pysideproperty.cpp
@@ -0,0 +1,500 @@
+/*
+ * This file is part of the PySide project.
+ *
+ * Copyright (C) 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
+ *
+ * Contact: PySide team <contact@pyside.org>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+#include <sbkpython.h>
+#include "pysideproperty.h"
+#include "pysideproperty_p.h"
+#include "dynamicqmetaobject_p.h"
+#include "pysidesignal.h"
+#include "pysidesignal_p.h"
+
+#include <shiboken.h>
+#include <QDebug>
+
+
+#define QPROPERTY_CLASS_NAME "Property"
+
+extern "C"
+{
+
+static PyObject* qpropertyTpNew(PyTypeObject* subtype, PyObject* args, PyObject* kwds);
+static int qpropertyTpInit(PyObject*, PyObject*, PyObject*);
+static void qpropertyDeAlloc(PyObject* self);
+
+//methods
+static PyObject* qPropertyCall(PyObject*, PyObject*, PyObject*);
+static PyObject* qPropertySetter(PyObject*, PyObject*);
+static PyObject* qPropertyGetter(PyObject*, PyObject*);
+static int qpropertyTraverse(PyObject* self, visitproc visit, void* arg);
+static int qpropertyClear(PyObject* self);
+
+static PyMethodDef PySidePropertyMethods[] = {
+    {"setter", (PyCFunction)qPropertySetter, METH_O},
+    {"write", (PyCFunction)qPropertySetter, METH_O},
+    {"getter", (PyCFunction)qPropertyGetter, METH_O},
+    {"read", (PyCFunction)qPropertyGetter, METH_O},
+    {0}
+};
+
+PyTypeObject PySidePropertyType = {
+    PyVarObject_HEAD_INIT(0, 0)
+    QPROPERTY_CLASS_NAME,      /*tp_name*/
+    sizeof(PySideProperty),   /*tp_basicsize*/
+    0,                         /*tp_itemsize*/
+    qpropertyDeAlloc,          /*tp_dealloc*/
+    0,                         /*tp_print*/
+    0,                         /*tp_getattr*/
+    0,                         /*tp_setattr*/
+    0,                         /*tp_compare*/
+    0,                         /*tp_repr*/
+    0,                         /*tp_as_number*/
+    0,                         /*tp_as_sequence*/
+    0,                         /*tp_as_mapping*/
+    0,                         /*tp_hash */
+    qPropertyCall,             /*tp_call*/
+    0,                         /*tp_str*/
+    0,                         /*tp_getattro*/
+    0,                         /*tp_setattro*/
+    0,                         /*tp_as_buffer*/
+    Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC,        /*tp_flags*/
+    0,                         /*tp_doc */
+    qpropertyTraverse,         /*tp_traverse */
+    qpropertyClear,            /*tp_clear */
+    0,                         /*tp_richcompare */
+    0,                         /*tp_weaklistoffset */
+    0,                         /*tp_iter */
+    0,                         /*tp_iternext */
+    PySidePropertyMethods,     /*tp_methods */
+    0,                         /*tp_members */
+    0,                         /*tp_getset */
+    0,                         /*tp_base */
+    0,                         /*tp_dict */
+    0,                         /*tp_descr_get */
+    0,                         /*tp_descr_set */
+    0,                         /*tp_dictoffset */
+    qpropertyTpInit,           /*tp_init */
+    0,                         /*tp_alloc */
+    qpropertyTpNew,            /*tp_new */
+    0,                         /*tp_free */
+    0,                         /*tp_is_gc */
+    0,                         /*tp_bases */
+    0,                         /*tp_mro */
+    0,                         /*tp_cache */
+    0,                         /*tp_subclasses */
+    0,                         /*tp_weaklist */
+    0,                         /*tp_del */
+};
+
+static void qpropertyMetaCall(PySideProperty* pp, PyObject* self, QMetaObject::Call call, void** args)
+{
+    Shiboken::Conversions::SpecificConverter converter(pp->d->typeName);
+    Q_ASSERT(converter);
+
+    QByteArray type(pp->d->typeName);
+
+    switch(call) {
+        case QMetaObject::ReadProperty:
+        {
+            Shiboken::GilState gil;
+            PyObject* value = PySide::Property::getValue(pp, self);
+            if (value) {
+                converter.toCpp(value, args[0]);
+                Py_DECREF(value);
+            } else if (PyErr_Occurred()) {
+                PyErr_Print(); // Clear any errors but print them to stderr
+            }
+            break;
+        }
+
+        case QMetaObject::WriteProperty:
+        {
+            Shiboken::GilState gil;
+            Shiboken::AutoDecRef value(converter.toPython(args[0]));
+            PySide::Property::setValue(pp, self, value);
+            break;
+        }
+
+        case QMetaObject::ResetProperty:
+        {
+            Shiboken::GilState gil;
+            PySide::Property::reset(pp, self);
+            break;
+        }
+
+        case QMetaObject::QueryPropertyDesignable:
+        case QMetaObject::QueryPropertyScriptable:
+        case QMetaObject::QueryPropertyStored:
+        case QMetaObject::QueryPropertyEditable:
+        case QMetaObject::QueryPropertyUser:
+        // just to avoid gcc warnings
+        case QMetaObject::InvokeMetaMethod:
+        case QMetaObject::CreateInstance:
+            break;
+    }
+}
+
+
+static PyObject* qpropertyTpNew(PyTypeObject* subtype, PyObject* args, PyObject* kwds)
+{
+    PySideProperty* me = reinterpret_cast<PySideProperty*>(subtype->tp_alloc(subtype, 0));
+    me->d = new PySidePropertyPrivate;
+    memset(me->d, 0, sizeof(PySidePropertyPrivate));
+    PySidePropertyPrivate* pData = me->d;
+    pData->designable = true;
+    pData->scriptable = true;
+    pData->stored = true;
+    return (PyObject*) me;
+}
+
+int qpropertyTpInit(PyObject* self, PyObject* args, PyObject* kwds)
+{
+    PyObject* type = 0;
+    PySideProperty* data = reinterpret_cast<PySideProperty*>(self);
+    PySidePropertyPrivate* pData = data->d;
+    pData->metaCallHandler = &qpropertyMetaCall;
+
+    static const char *kwlist[] = {"type", "fget", "fset", "freset", "fdel", "doc", "notify",
+                                   "designable", "scriptable", "stored", "user",
+                                   "constant", "final", 0};
+    if (!PyArg_ParseTupleAndKeywords(args, kwds,
+                                     "O|OOOOsObbbbbb:QtCore.QProperty", (char**) kwlist,
+                                     /*OO*/     &type, &(pData->fget),
+                                     /*OOO*/    &(pData->fset), &(pData->freset), &(pData->fdel),
+                                     /*s*/      &(pData->doc),
+                                     /*O*/      &(pData->notify),
+                                     /*bbbbbb*/ &(pData->designable), &(pData->scriptable), &(pData->stored), &(pData->user), &(pData->constant), &(pData->final))) {
+        return 0;
+    }
+
+
+    pData->typeName = PySide::Signal::getTypeName(type);
+
+    if (!pData->typeName)
+        PyErr_SetString(PyExc_TypeError, "Invalid property type or type name.");
+    else if (pData->constant && (pData->fset || pData->notify))
+        PyErr_SetString(PyExc_TypeError, "A constant property cannot have a WRITE method or a NOTIFY signal.");
+
+    if (!PyErr_Occurred()) {
+        Py_XINCREF(pData->fget);
+        Py_XINCREF(pData->fset);
+        Py_XINCREF(pData->freset);
+        Py_XINCREF(pData->fdel);
+        Py_XINCREF(pData->notify);
+        return 1;
+    } else {
+        pData->fget = 0;
+        pData->fset = 0;
+        pData->freset = 0;
+        pData->fdel = 0;
+        pData->notify = 0;
+        return -1;
+    }
+}
+
+void qpropertyDeAlloc(PyObject* self)
+{
+    qpropertyClear(self);
+    Py_TYPE(self)->tp_free(self);
+}
+
+PyObject* qPropertyCall(PyObject* self, PyObject* args, PyObject* kw)
+{
+    PyObject *callback = PyTuple_GetItem(args, 0);
+    if (PyFunction_Check(callback)) {
+        PySideProperty *prop = reinterpret_cast<PySideProperty*>(self);
+        PySidePropertyPrivate* pData = prop->d;
+
+        Py_INCREF(callback);
+        pData->fget = callback;
+
+        Py_INCREF(self);
+        return self;
+    } else {
+        PyErr_SetString(PyExc_TypeError, "Invalid property usage.");
+        return 0;
+    }
+}
+
+PyObject* qPropertySetter(PyObject* self, PyObject* callback)
+{
+    if (PyFunction_Check(callback)) {
+        PySideProperty *prop = reinterpret_cast<PySideProperty*>(self);
+        PySidePropertyPrivate* pData = prop->d;
+
+        Py_INCREF(callback);
+        pData->fset = callback;
+
+        Py_INCREF(callback);
+        return callback;
+    } else {
+        PyErr_SetString(PyExc_TypeError, "Invalid property setter agument.");
+        return 0;
+    }
+}
+
+PyObject* qPropertyGetter(PyObject* self, PyObject* callback)
+{
+    if (PyFunction_Check(callback)) {
+        PySideProperty *prop = reinterpret_cast<PySideProperty*>(self);
+        PySidePropertyPrivate* pData = prop->d;
+
+        Py_INCREF(callback);
+        pData->fget = callback;
+
+        Py_INCREF(callback);
+        return callback;
+    } else {
+        PyErr_SetString(PyExc_TypeError, "Invalid property getter agument.");
+        return 0;
+    }
+}
+
+static int qpropertyTraverse(PyObject* self, visitproc visit, void* arg)
+{
+    PySidePropertyPrivate* data = reinterpret_cast<PySideProperty*>(self)->d;
+    if (!data)
+        return 0;
+
+    Py_VISIT(data->fget);
+    Py_VISIT(data->fset);
+    Py_VISIT(data->freset);
+    Py_VISIT(data->fdel);
+    Py_VISIT(data->notify);
+    return 0;
+}
+
+static int qpropertyClear(PyObject* self)
+{
+    PySidePropertyPrivate* data = reinterpret_cast<PySideProperty*>(self)->d;
+    if (!data)
+        return 0;
+
+    Py_CLEAR(data->fget);
+    Py_CLEAR(data->fset);
+    Py_CLEAR(data->freset);
+    Py_CLEAR(data->fdel);
+    Py_CLEAR(data->notify);
+
+
+    free(data->typeName);
+    free(data->doc);
+    free(data->notifySignature);
+    delete data;
+    reinterpret_cast<PySideProperty*>(self)->d = 0;
+    return 0;
+}
+
+} // extern "C"
+
+namespace {
+
+static PyObject* getFromType(PyTypeObject* type, PyObject* name)
+{
+    PyObject* attr = 0;
+    attr = PyDict_GetItem(type->tp_dict, name);
+    if (!attr) {
+        PyObject* bases = type->tp_bases;
+        int size = PyTuple_GET_SIZE(bases);
+        for(int i=0; i < size; i++) {
+            PyObject* base = PyTuple_GET_ITEM(bases, i);
+            attr = getFromType(reinterpret_cast<PyTypeObject*>(base), name);
+            if (attr)
+                return attr;
+        }
+    }
+    return attr;
+}
+
+} //namespace
+
+
+namespace PySide { namespace Property {
+
+void init(PyObject* module)
+{
+    if (PyType_Ready(&PySidePropertyType) < 0)
+        return;
+
+    Py_INCREF(&PySidePropertyType);
+    PyModule_AddObject(module, QPROPERTY_CLASS_NAME, ((PyObject*)&PySidePropertyType));
+}
+
+bool checkType(PyObject* pyObj)
+{
+    if (pyObj) {
+        return PyType_IsSubtype(pyObj->ob_type, &PySidePropertyType);
+    }
+    return false;
+}
+
+bool isPropertyType(PyObject* pyObj)
+{
+    return checkType(pyObj);
+}
+
+int setValue(PySideProperty* self, PyObject* source, PyObject* value)
+{
+    PyObject* fset = self->d->fset;
+    if (fset) {
+        Shiboken::AutoDecRef args(PyTuple_New(2));
+        PyTuple_SET_ITEM(args, 0, source);
+        PyTuple_SET_ITEM(args, 1, value);
+        Py_INCREF(source);
+        Py_INCREF(value);
+        Shiboken::AutoDecRef result(PyObject_CallObject(fset, args));
+        return (result.isNull() ? -1 : 0);
+    } else {
+        PyErr_SetString(PyExc_AttributeError, "Attibute read only");
+    }
+    return -1;
+}
+
+PyObject* getValue(PySideProperty* self, PyObject* source)
+{
+    PyObject* fget = self->d->fget;
+    if (fget) {
+        Shiboken::AutoDecRef args(PyTuple_New(1));
+        Py_INCREF(source);
+        PyTuple_SET_ITEM(args, 0, source);
+        return  PyObject_CallObject(fget, args);
+    }
+    return 0;
+}
+
+int reset(PySideProperty* self, PyObject* source)
+{
+    PyObject* freset = self->d->freset;
+    if (freset) {
+        Shiboken::AutoDecRef args(PyTuple_New(1));
+        Py_INCREF(source);
+        PyTuple_SET_ITEM(args, 0, source);
+        Shiboken::AutoDecRef result(PyObject_CallObject(freset, args));
+        return (result.isNull() ? -1 : 0);
+    }
+    return -1;
+}
+
+const char* getTypeName(const PySideProperty* self)
+{
+    return self->d->typeName;
+}
+
+PySideProperty* getObject(PyObject* source, PyObject* name)
+{
+    PyObject* attr = 0;
+
+    if (Shiboken::Object::isUserType(source)) {
+        PyObject* dict = reinterpret_cast<SbkObject*>(source)->ob_dict;
+        if (dict)
+            attr = PyDict_GetItem(dict, name);
+    }
+
+    attr = getFromType(source->ob_type, name);
+    if (attr && checkType(attr)) {
+        Py_INCREF(attr);
+        return reinterpret_cast<PySideProperty*>(attr);
+    }
+
+    if (!attr)
+        PyErr_Clear(); //Clear possible error caused by PyObject_GenericGetAttr
+
+    return 0;
+}
+
+bool isReadable(const PySideProperty* self)
+{
+    return true;
+}
+
+bool isWritable(const PySideProperty* self)
+{
+    return (self->d->fset != 0);
+}
+
+bool hasReset(const PySideProperty* self)
+{
+    return (self->d->freset != 0);
+}
+
+bool isDesignable(const PySideProperty* self)
+{
+    return self->d->designable;
+}
+
+bool isScriptable(const PySideProperty* self)
+{
+    return self->d->scriptable;
+}
+
+bool isStored(const PySideProperty* self)
+{
+    return self->d->stored;
+}
+
+bool isUser(const PySideProperty* self)
+{
+    return self->d->user;
+}
+
+bool isConstant(const PySideProperty* self)
+{
+    return self->d->constant;
+}
+
+bool isFinal(const PySideProperty* self)
+{
+    return self->d->final;
+}
+
+const char* getNotifyName(PySideProperty* self)
+{
+    if (!self->d->notifySignature) {
+        PyObject* str = PyObject_Str(self->d->notify);
+        self->d->notifySignature = strdup(Shiboken::String::toCString(str));
+        Py_DECREF(str);
+    }
+
+    return self->d->notifySignature;
+}
+
+void setMetaCallHandler(PySideProperty* self, MetaCallHandler handler)
+{
+    self->d->metaCallHandler = handler;
+}
+
+void setTypeName(PySideProperty* self, const char* typeName)
+{
+    self->d->typeName = strdup(typeName);
+}
+
+void setUserData(PySideProperty* self, void* data)
+{
+    self->d->userData = data;
+}
+
+void* userData(PySideProperty* self)
+{
+    return self->d->userData;
+}
+
+} //namespace Property
+} //namespace PySide
diff --git a/libpyside/pysideproperty.h b/libpyside/pysideproperty.h
new file mode 100644
index 0000000..ad6b209
--- /dev/null
+++ b/libpyside/pysideproperty.h
@@ -0,0 +1,100 @@
+/*
+ * This file is part of the PySide project.
+ *
+ * Copyright (C) 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
+ *
+ * Contact: PySide team <contact@pyside.org>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+#ifndef PYSIDE_PROPERTY_H
+#define PYSIDE_PROPERTY_H
+
+#include <pysidemacros.h>
+#include <sbkpython.h>
+#include <QObject>
+
+extern "C"
+{
+    extern PYSIDE_API PyTypeObject PySidePropertyType;
+
+    struct PySidePropertyPrivate;
+    struct PYSIDE_API PySideProperty
+    {
+        PyObject_HEAD
+        PySidePropertyPrivate* d;
+    };
+};
+
+namespace PySide { namespace Property {
+
+typedef void (*MetaCallHandler)(PySideProperty*,PyObject*,QMetaObject::Call, void**);
+
+PYSIDE_API bool checkType(PyObject* pyObj);
+
+/// @deprecated Use checkType
+PYSIDE_DEPRECATED(PYSIDE_API bool isPropertyType(PyObject* pyObj));
+
+/**
+ * This function call set property function and pass value as arg
+ * This function does not check the property object type
+ *
+ * @param   self The property object
+ * @param   source The QObject witch has the property
+ * @param   value The value to set in property
+ * @return  Return 0 if ok or -1 if this function fail
+ **/
+PYSIDE_API int setValue(PySideProperty* self, PyObject* source, PyObject* value);
+
+/**
+ * This function call get property function
+ * This function does not check the property object type
+ *
+ * @param   self The property object
+ * @param   source The QObject witch has the property
+ * @return  Return the result of property get function or 0 if this fail
+ **/
+PYSIDE_API PyObject* getValue(PySideProperty* self, PyObject* source);
+
+/**
+ * This function return the notify name used on this property
+ *
+ * @param   self The property object
+ * @return  Return a const char with the notify name used
+ **/
+PYSIDE_API const char* getNotifyName(PySideProperty* self);
+
+
+/**
+ * This function search in the source object for desired property
+ *
+ * @param   source The QObject object
+ * @param   name The property name
+ * @return  Return a new reference to property object
+ **/
+PYSIDE_API PySideProperty* getObject(PyObject* source, PyObject* name);
+
+PYSIDE_API void setMetaCallHandler(PySideProperty* self, MetaCallHandler handler);
+
+PYSIDE_API void setTypeName(PySideProperty* self, const char* typeName);
+
+PYSIDE_API void setUserData(PySideProperty* self, void* data);
+PYSIDE_API void* userData(PySideProperty* self);
+
+} //namespace Property
+} //namespace PySide
+
+#endif
diff --git a/libpyside/pysideproperty_p.h b/libpyside/pysideproperty_p.h
new file mode 100644
index 0000000..84589e8
--- /dev/null
+++ b/libpyside/pysideproperty_p.h
@@ -0,0 +1,167 @@
+/*
+ * This file is part of the PySide project.
+ *
+ * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+ *
+ * Contact: PySide team <contact@pyside.org>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+#ifndef PYSIDE_QPROPERTY_P_H
+#define PYSIDE_QPROPERTY_P_H
+
+#include <sbkpython.h>
+#include <QMetaObject>
+#include "pysideproperty.h"
+
+struct PySideProperty;
+
+extern "C"
+{
+
+struct PySidePropertyPrivate {
+    char* typeName;
+    PySide::Property::MetaCallHandler metaCallHandler;
+    PyObject* fget;
+    PyObject* fset;
+    PyObject* freset;
+    PyObject* fdel;
+    PyObject* notify;
+    char* notifySignature;
+    char* doc;
+    bool designable;
+    bool scriptable;
+    bool stored;
+    bool user;
+    bool constant;
+    bool final;
+    void* userData;
+};
+
+} // extern "C"
+
+namespace PySide { namespace Property {
+
+/**
+ * Init PySide QProperty support system
+ */
+void init(PyObject* module);
+
+/**
+ * This function call reset property function
+ * This function does not check the property object type
+ *
+ * @param   self The property object
+ * @param   source The QObject witch has the property
+ * @return  Return 0 if ok or -1 if this function fail
+ **/
+int reset(PySideProperty* self, PyObject* source);
+
+
+/**
+ * This function return the property type
+ * This function does not check the property object type
+ *
+ * @param   self The property object
+ * @return  Return the property type name
+ **/
+const char* getTypeName(const PySideProperty* self);
+
+/**
+ * This function check if property has read function
+ * This function does not check the property object type
+ *
+ * @param   self The property object
+ * @return  Return a boolean value
+ **/
+bool isReadable(const PySideProperty* self);
+
+/**
+ * This function check if property has write function
+ * This function does not check the property object type
+ *
+ * @param   self The property object
+ * @return  Return a boolean value
+ **/
+bool isWritable(const PySideProperty* self);
+
+/**
+ * This function check if property has reset function
+ * This function does not check the property object type
+ *
+ * @param   self The property object
+ * @return  Return a boolean value
+ **/
+bool hasReset(const PySideProperty* self);
+
+/**
+ * This function check if property has the flag DESIGNABLE setted
+ * This function does not check the property object type
+ *
+ * @param   self The property object
+ * @return  Return a boolean value
+ **/
+bool isDesignable(const PySideProperty* self);
+
+/**
+ * This function check if property has the flag SCRIPTABLE setted
+ * This function does not check the property object type
+ *
+ * @param   self The property object
+ * @return  Return a boolean value
+ **/
+bool isScriptable(const PySideProperty* self);
+
+/**
+ * This function check if property has the flag STORED setted
+ * This function does not check the property object type
+ *
+ * @param   self The property object
+ * @return  Return a boolean value
+ **/
+bool isStored(const PySideProperty* self);
+
+/**
+ * This function check if property has the flag USER setted
+ * This function does not check the property object type
+ *
+ * @param   self The property object
+ * @return  Return a boolean value
+ **/
+bool isUser(const PySideProperty* self);
+
+/**
+ * This function check if property has the flag CONSTANT setted
+ * This function does not check the property object type
+ *
+ * @param   self The property object
+ * @return  Return a boolean value
+ **/
+bool isConstant(const PySideProperty* self);
+
+/**
+ * This function check if property has the flag FINAL setted
+ * This function does not check the property object type
+ *
+ * @param   self The property object
+ * @return  Return a boolean value
+ **/
+bool isFinal(const PySideProperty* self);
+
+} // namespace Property
+} // namespace PySide
+
+#endif
diff --git a/libpyside/pysideqflags.cpp b/libpyside/pysideqflags.cpp
new file mode 100644
index 0000000..39f8b04
--- /dev/null
+++ b/libpyside/pysideqflags.cpp
@@ -0,0 +1,150 @@
+/*
+* This file is part of the PySide project.
+*
+* Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+*
+* Contact: PySide team <contact@pyside.org>
+*
+* This library is free software; you can redistribute it and/or
+* modify it under the terms of the GNU Lesser General Public
+* License as published by the Free Software Foundation; either
+* version 2.1 of the License, or (at your option) any later version.
+*
+* This library is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this library; if not, write to the Free Software
+* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+*/
+
+#include "pysideqflags.h"
+#include <sbkenum.h>
+#include <autodecref.h>
+
+extern "C" {
+    struct SbkConverter;
+
+    /**
+     * Type of all QFlags
+     */
+    struct PySideQFlagsType
+    {
+        PyHeapTypeObject super;
+        SbkConverter** converterPtr;
+        SbkConverter* converter;
+    };
+
+    #define PYSIDE_QFLAGS(X) reinterpret_cast<PySideQFlagsObject*>(X)
+
+    PyObject* PySideQFlagsNew(PyTypeObject* type, PyObject* args, PyObject* kwds)
+    {
+        long val = 0;
+        if (PyTuple_GET_SIZE(args)) {
+            PyObject* arg = PyTuple_GET_ITEM(args, 0);
+            if (Shiboken::isShibokenEnum(arg)) {// faster call
+                val = Shiboken::Enum::getValue(arg);
+            } else if (PyNumber_Check(arg)) {
+                Shiboken::AutoDecRef number(PyNumber_Long(arg));
+                val = PyLong_AsLong(number);
+            } else {
+                PyErr_SetString(PyExc_TypeError,"QFlags must be created using enums or numbers.");
+                return 0;
+            }
+        }
+        PySideQFlagsObject* self = PyObject_New(PySideQFlagsObject, type);
+        self->ob_value = val;
+        return reinterpret_cast<PyObject*>(self);
+    }
+
+    static long getNumberValue(PyObject* v)
+    {
+        Shiboken::AutoDecRef number(PyNumber_Long(v));
+        return PyLong_AsLong(number);
+    }
+
+    PyObject* PySideQFlagsRichCompare(PyObject* self, PyObject* other, int op)
+    {
+        int result = 0;
+        if (!PyNumber_Check(other)) {
+            PyErr_BadArgument();
+            return NULL;
+        }
+
+        long valA = PYSIDE_QFLAGS(self)->ob_value;
+        long valB = getNumberValue(other);
+
+        if (self == other) {
+            result = 1;
+        } else  {
+            switch (op) {
+            case Py_EQ:
+                result = (valA == valB);
+                break;
+            case Py_NE:
+                result = (valA != valB);
+                break;
+            case Py_LE:
+                result = (valA <= valB);
+                break;
+            case Py_GE:
+                result = (valA >= valB);
+                break;
+            case Py_LT:
+                result = (valA < valB);
+                break;
+            case Py_GT:
+                result = (valA > valB);
+                break;
+            default:
+                PyErr_BadArgument();
+                return NULL;
+            }
+        }
+        if (result)
+            Py_RETURN_TRUE;
+        else
+            Py_RETURN_FALSE;
+    }
+}
+
+namespace PySide
+{
+namespace QFlags
+{
+    PyTypeObject* create(const char* name, PyNumberMethods* numberMethods)
+    {
+        PyTypeObject* type = reinterpret_cast<PyTypeObject*>(new PySideQFlagsType);
+        ::memset(type, 0, sizeof(PySideQFlagsType));
+        Py_TYPE(type) = &PyType_Type;
+        type->tp_basicsize = sizeof(PySideQFlagsObject);
+        type->tp_flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_CHECKTYPES;
+        type->tp_name = name;
+        type->tp_new = &PySideQFlagsNew;
+        type->tp_as_number = numberMethods;
+        type->tp_richcompare = &PySideQFlagsRichCompare;
+
+        PySideQFlagsType* flagsType = reinterpret_cast<PySideQFlagsType*>(type);
+        flagsType->converterPtr = &flagsType->converter;
+
+        if (PyType_Ready(type) < 0)
+            return 0;
+
+        return type;
+    }
+
+    PySideQFlagsObject* newObject(long value, PyTypeObject* type)
+    {
+        PySideQFlagsObject* qflags = PyObject_New(PySideQFlagsObject, type);
+        qflags->ob_value = value;
+        return qflags;
+    }
+
+    long getValue(PySideQFlagsObject* self)
+    {
+        return self->ob_value;
+    }
+}
+}
diff --git a/libpyside/pysideqflags.h b/libpyside/pysideqflags.h
new file mode 100644
index 0000000..496e84b
--- /dev/null
+++ b/libpyside/pysideqflags.h
@@ -0,0 +1,62 @@
+/*
+ * This file is part of the PySide project.
+ *
+ * Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+ *
+ * Contact: PySide team <contact@pyside.org>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+#ifndef PYSIDE_QFLAGS_H
+#define PYSIDE_QFLAGS_H
+
+#include <sbkpython.h>
+#include "pysidemacros.h"
+
+
+extern "C"
+{
+    struct PYSIDE_API PySideQFlagsObject {
+        PyObject_HEAD
+        long ob_value;
+    };
+
+    PYSIDE_API PyObject* PySideQFlagsNew(PyTypeObject *type, PyObject *args, PyObject *kwds);
+    PYSIDE_API PyObject* PySideQFlagsRichCompare(PyObject *self, PyObject *other, int op);
+}
+
+
+namespace PySide
+{
+namespace QFlags
+{
+    /**
+     * Creates a new QFlags type.
+     */
+    PYSIDE_API PyTypeObject* create(const char* name, PyNumberMethods* numberMethods);
+    /**
+     * Creates a new QFlags instance of type \p type and value \p value.
+     */
+    PYSIDE_API PySideQFlagsObject* newObject(long value, PyTypeObject* type);
+    /**
+     * Returns the value held by a QFlag.
+     */
+    PYSIDE_API long getValue(PySideQFlagsObject* self);
+}
+}
+
+#endif
+
diff --git a/libpyside/pysidesignal.cpp b/libpyside/pysidesignal.cpp
new file mode 100644
index 0000000..71d8c49
--- /dev/null
+++ b/libpyside/pysidesignal.cpp
@@ -0,0 +1,966 @@
+/*
+ * This file is part of the PySide project.
+ *
+ * Copyright (C) 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
+ *
+ * Contact: PySide team <contact@pyside.org>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+#include <sbkpython.h>
+#include "pysidesignal.h"
+#include "pysidesignal_p.h"
+#include "signalmanager.h"
+
+#include <shiboken.h>
+#include <QDebug>
+
+#define SIGNAL_CLASS_NAME "Signal"
+#define SIGNAL_INSTANCE_NAME "SignalInstance"
+#define QT_SIGNAL_SENTINEL '2'
+
+namespace PySide {
+namespace Signal {
+    //aux
+    static char*        buildSignature(const char*, const char*);
+    static void         appendSignature(PySideSignal*, char*);
+    static void         instanceInitialize(PySideSignalInstance*, PyObject*, PySideSignal*, PyObject*, int);
+    static char*        parseSignature(PyObject*);
+    static PyObject*    buildQtCompatible(const char*);
+}
+}
+
+extern "C"
+{
+
+// Signal methods
+static int signalTpInit(PyObject*, PyObject*, PyObject*);
+static void signalFree(void*);
+static void signalInstanceFree(void*);
+static PyObject* signalGetItem(PyObject* self, PyObject* key);
+static PyObject* signalToString(PyObject* self);
+
+// Signal Instance methods
+static PyObject* signalInstanceConnect(PyObject*, PyObject*, PyObject*);
+static PyObject* signalInstanceDisconnect(PyObject*, PyObject*);
+static PyObject* signalInstanceEmit(PyObject*, PyObject*);
+static PyObject* signalInstanceGetItem(PyObject*, PyObject*);
+
+static PyObject* signalInstanceCall(PyObject* self, PyObject* args, PyObject* kw);
+static PyObject* signalCall(PyObject*, PyObject*, PyObject*);
+
+static PyObject* metaSignalCheck(PyObject*, PyObject*);
+
+static PyMappingMethods Signal_as_mapping = {
+    0,
+    signalGetItem,
+    0
+};
+
+static PyMethodDef Signal_methods[] = {
+    {"__instancecheck__", (PyCFunction)metaSignalCheck, METH_O, NULL},
+    {0}
+};
+
+PyTypeObject PySideSignalMetaType = {
+    PyVarObject_HEAD_INIT(0, 0)
+    /*tp_name*/             "PySide.QtCore.MetaSignal",
+    /*tp_basicsize*/        sizeof(PyTypeObject),
+    /*tp_itemsize*/         0,
+    /*tp_dealloc*/          0,
+    /*tp_print*/            0,
+    /*tp_getattr*/          0,
+    /*tp_setattr*/          0,
+    /*tp_compare*/          0,
+    /*tp_repr*/             0,
+    /*tp_as_number*/        0,
+    /*tp_as_sequence*/      0,
+    /*tp_as_mapping*/       0,
+    /*tp_hash*/             0,
+    /*tp_call*/             0,
+    /*tp_str*/              0,
+    /*tp_getattro*/         0,
+    /*tp_setattro*/         0,
+    /*tp_as_buffer*/        0,
+    /*tp_flags*/            Py_TPFLAGS_DEFAULT,
+    /*tp_doc*/              0,
+    /*tp_traverse*/         0,
+    /*tp_clear*/            0,
+    /*tp_richcompare*/      0,
+    /*tp_weaklistoffset*/   0,
+    /*tp_iter*/             0,
+    /*tp_iternext*/         0,
+    /*tp_methods*/          Signal_methods,
+    /*tp_members*/          0,
+    /*tp_getset*/           0,
+    /*tp_base*/             &PyType_Type,
+};
+
+PyTypeObject PySideSignalType = {
+    PyVarObject_HEAD_INIT(&PySideSignalMetaType, 0)
+    /*tp_name*/             "PySide.QtCore."SIGNAL_CLASS_NAME,
+    /*tp_basicsize*/        sizeof(PySideSignal),
+    /*tp_itemsize*/         0,
+    /*tp_dealloc*/          0,
+    /*tp_print*/            0,
+    /*tp_getattr*/          0,
+    /*tp_setattr*/          0,
+    /*tp_compare*/          0,
+    /*tp_repr*/             0,
+    /*tp_as_number*/        0,
+    /*tp_as_sequence*/      0,
+    /*tp_as_mapping*/       &Signal_as_mapping,
+    /*tp_hash*/             0,
+    /*tp_call*/             signalCall,
+    /*tp_str*/              signalToString,
+    /*tp_getattro*/         0,
+    /*tp_setattro*/         0,
+    /*tp_as_buffer*/        0,
+    /*tp_flags*/            Py_TPFLAGS_DEFAULT,
+    /*tp_doc*/              SIGNAL_CLASS_NAME,
+    /*tp_traverse*/         0,
+    /*tp_clear*/            0,
+    /*tp_richcompare*/      0,
+    /*tp_weaklistoffset*/   0,
+    /*tp_iter*/             0,
+    /*tp_iternext*/         0,
+    /*tp_methods*/          0,
+    /*tp_members*/          0,
+    /*tp_getset*/           0,
+    /*tp_base*/             0,
+    /*tp_dict*/             0,
+    /*tp_descr_get*/        0,
+    /*tp_descr_set*/        0,
+    /*tp_dictoffset*/       0,
+    /*tp_init*/             signalTpInit,
+    /*tp_alloc*/            0,
+    /*tp_new*/              PyType_GenericNew,
+    /*tp_free*/             signalFree,
+    /*tp_is_gc*/            0,
+    /*tp_bases*/            0,
+    /*tp_mro*/              0,
+    /*tp_cache*/            0,
+    /*tp_subclasses*/       0,
+    /*tp_weaklist*/         0,
+    /*tp_del*/              0,
+};
+
+static PyMethodDef SignalInstance_methods[] = {
+    {"connect", (PyCFunction)signalInstanceConnect, METH_VARARGS|METH_KEYWORDS, 0},
+    {"disconnect", signalInstanceDisconnect, METH_VARARGS, 0},
+    {"emit", signalInstanceEmit, METH_VARARGS, 0},
+    {0}  /* Sentinel */
+};
+
+static PyMappingMethods SignalInstance_as_mapping = {
+    0,
+    signalInstanceGetItem,
+    0
+};
+
+PyTypeObject PySideSignalInstanceType = {
+    PyVarObject_HEAD_INIT(0, 0)
+    /*tp_name*/             "PySide.QtCore."SIGNAL_INSTANCE_NAME,
+    /*tp_basicsize*/        sizeof(PySideSignalInstance),
+    /*tp_itemsize*/         0,
+    /*tp_dealloc*/          0,
+    /*tp_print*/            0,
+    /*tp_getattr*/          0,
+    /*tp_setattr*/          0,
+    /*tp_compare*/          0,
+    /*tp_repr*/             0,
+    /*tp_as_number*/        0,
+    /*tp_as_sequence*/      0,
+    /*tp_as_mapping*/       &SignalInstance_as_mapping,
+    /*tp_hash*/             0,
+    /*tp_call*/             signalInstanceCall,
+    /*tp_str*/              0,
+    /*tp_getattro*/         0,
+    /*tp_setattro*/         0,
+    /*tp_as_buffer*/        0,
+    /*tp_flags*/            Py_TPFLAGS_DEFAULT,
+    /*tp_doc*/              SIGNAL_INSTANCE_NAME,
+    /*tp_traverse*/         0,
+    /*tp_clear*/            0,
+    /*tp_richcompare*/      0,
+    /*tp_weaklistoffset*/   0,
+    /*tp_iter*/             0,
+    /*tp_iternext*/         0,
+    /*tp_methods*/          SignalInstance_methods,
+    /*tp_members*/          0,
+    /*tp_getset*/           0,
+    /*tp_base*/             0,
+    /*tp_dict*/             0,
+    /*tp_descr_get*/        0,
+    /*tp_descr_set*/        0,
+    /*tp_dictoffset*/       0,
+    /*tp_init*/             0,
+    /*tp_alloc*/            0,
+    /*tp_new*/              PyType_GenericNew,
+    /*tp_free*/             signalInstanceFree,
+    /*tp_is_gc*/            0,
+    /*tp_bases*/            0,
+    /*tp_mro*/              0,
+    /*tp_cache*/            0,
+    /*tp_subclasses*/       0,
+    /*tp_weaklist*/         0,
+    /*tp_del*/              0,
+};
+
+int signalTpInit(PyObject* self, PyObject* args, PyObject* kwds)
+{
+    static PyObject* emptyTuple = 0;
+    static const char* kwlist[] = {"name", 0};
+    char* argName = 0;
+
+    if (emptyTuple == 0)
+        emptyTuple = PyTuple_New(0);
+
+    if (!PyArg_ParseTupleAndKeywords(emptyTuple, kwds,
+        "|s:QtCore."SIGNAL_CLASS_NAME, const_cast<char**>(kwlist), &argName))
+        return 0;
+
+    bool tupledArgs = false;
+    PySideSignal* data = reinterpret_cast<PySideSignal*>(self);
+    if (argName) {
+        data->signalName = strdup(argName);
+    }
+
+    for (Py_ssize_t i = 0, i_max = PyTuple_Size(args); i < i_max; i++) {
+        PyObject* arg = PyTuple_GET_ITEM(args, i);
+        if (PySequence_Check(arg) && !Shiboken::String::check(arg)) {
+            tupledArgs = true;
+            PySide::Signal::appendSignature(data, PySide::Signal::parseSignature(arg));
+        }
+    }
+
+    if (!tupledArgs)
+        PySide::Signal::appendSignature(data, PySide::Signal::parseSignature(args));
+
+    return 1;
+}
+
+void signalFree(void* self)
+{
+    PyObject* pySelf = reinterpret_cast<PyObject*>(self);
+    PySideSignal* data = reinterpret_cast<PySideSignal*>(self);
+
+    for (int i = 0, i_max = data->signaturesSize; i < i_max; i++) {
+        if (data->signatures[i])
+            free(data->signatures[i]);
+    }
+
+    free(data->signatures);
+    free(data->signalName);
+    data->initialized = 0;
+    data->signaturesSize = 0;
+    Py_XDECREF(data->homonymousMethod);
+    data->homonymousMethod = 0;
+
+    pySelf->ob_type->tp_base->tp_free(self);
+}
+
+PyObject* signalGetItem(PyObject* self, PyObject* key)
+{
+    PySideSignal* data = reinterpret_cast<PySideSignal*>(self);
+    char* sigKey;
+    if (key) {
+        sigKey = PySide::Signal::parseSignature(key);
+    } else {
+        if (data->signatures[0])
+            sigKey = strdup(data->signatures[0]);
+        else
+            sigKey = strdup("void");
+    }
+    char* sig = PySide::Signal::buildSignature(data->signalName, sigKey);
+    free(sigKey);
+    PyObject* pySignature = Shiboken::String::fromCString(sig);
+    free(sig);
+    return pySignature;
+}
+
+
+PyObject* signalToString(PyObject* self)
+{
+    return signalGetItem(self, 0);
+}
+
+void signalInstanceFree(void* self)
+{
+    PyObject* pySelf = reinterpret_cast<PyObject*>(self);
+    PySideSignalInstance* data = reinterpret_cast<PySideSignalInstance*>(self);
+
+    PySideSignalInstancePrivate* dataPvt = data->d;
+    free(dataPvt->signalName);
+    free(dataPvt->signature);
+
+    Py_XDECREF(dataPvt->homonymousMethod);
+
+    if (dataPvt->next) {
+        Py_DECREF(dataPvt->next);
+        dataPvt->next = 0;
+    }
+    delete dataPvt;
+    data->d = 0;
+    pySelf->ob_type->tp_base->tp_free(self);
+}
+
+PyObject* signalInstanceConnect(PyObject* self, PyObject* args, PyObject* kwds)
+{
+    PyObject* slot = 0;
+    PyObject* type = 0;
+    static const char* kwlist[] = {"slot", "type", 0};
+
+    if (!PyArg_ParseTupleAndKeywords(args, kwds,
+        "O|O:"SIGNAL_INSTANCE_NAME, const_cast<char**>(kwlist), &slot, &type))
+        return 0;
+
+    PySideSignalInstance* source = reinterpret_cast<PySideSignalInstance*>(self);
+    Shiboken::AutoDecRef pyArgs(PyList_New(0));
+
+    bool match = false;
+    if (slot->ob_type == &PySideSignalInstanceType) {
+        PySideSignalInstance* sourceWalk = source;
+        PySideSignalInstance* targetWalk;
+
+        //find best match
+        while (sourceWalk && !match) {
+            targetWalk = reinterpret_cast<PySideSignalInstance*>(slot);
+            while (targetWalk && !match) {
+                if (QMetaObject::checkConnectArgs(sourceWalk->d->signature, targetWalk->d->signature)) {
+                    PyList_Append(pyArgs, sourceWalk->d->source);
+                    Shiboken::AutoDecRef sourceSignature(PySide::Signal::buildQtCompatible(sourceWalk->d->signature));
+                    PyList_Append(pyArgs, sourceSignature);
+
+                    PyList_Append(pyArgs, targetWalk->d->source);
+                    Shiboken::AutoDecRef targetSignature(PySide::Signal::buildQtCompatible(targetWalk->d->signature));
+                    PyList_Append(pyArgs, targetSignature);
+
+                    match = true;
+                }
+                targetWalk = reinterpret_cast<PySideSignalInstance*>(targetWalk->d->next);
+            }
+            sourceWalk = reinterpret_cast<PySideSignalInstance*>(sourceWalk->d->next);
+        }
+    } else {
+        //try the first signature
+        PyList_Append(pyArgs, source->d->source);
+        Shiboken::AutoDecRef signature(PySide::Signal::buildQtCompatible(source->d->signature));
+        PyList_Append(pyArgs, signature);
+
+        PyList_Append(pyArgs, slot);
+        match = true;
+    }
+
+    if (type)
+        PyList_Append(pyArgs, type);
+
+    if (match) {
+        Shiboken::AutoDecRef tupleArgs(PyList_AsTuple(pyArgs));
+        Shiboken::AutoDecRef pyMethod(PyObject_GetAttrString(source->d->source, "connect"));
+        PyObject* result = PyObject_CallObject(pyMethod, tupleArgs);
+        if (result == Py_True)
+            return result;
+        else
+            Py_XDECREF(result);
+    }
+    if (!PyErr_Occurred())
+        PyErr_Format(PyExc_RuntimeError, "Failed to connect signal %s.", source->d->signature);
+    return 0;
+}
+
+PyObject* signalInstanceEmit(PyObject* self, PyObject* args)
+{
+    PySideSignalInstance* source = reinterpret_cast<PySideSignalInstance*>(self);
+
+    Shiboken::AutoDecRef pyArgs(PyList_New(0));
+    Shiboken::AutoDecRef sourceSignature(PySide::Signal::buildQtCompatible(source->d->signature));
+
+    PyList_Append(pyArgs, sourceSignature);
+    for (Py_ssize_t i = 0, max = PyTuple_Size(args); i < max; i++)
+        PyList_Append(pyArgs, PyTuple_GetItem(args, i));
+
+    Shiboken::AutoDecRef pyMethod(PyObject_GetAttrString(source->d->source, "emit"));
+
+    Shiboken::AutoDecRef tupleArgs(PyList_AsTuple(pyArgs));
+    return PyObject_CallObject(pyMethod, tupleArgs);
+}
+
+PyObject* signalInstanceGetItem(PyObject* self, PyObject* key)
+{
+    PySideSignalInstance* data = reinterpret_cast<PySideSignalInstance*>(self);
+    char* sigKey = PySide::Signal::parseSignature(key);
+    char* sig = PySide::Signal::buildSignature(data->d->signalName, sigKey);
+    free(sigKey);
+    const char* sigName = data->d->signalName;
+
+    while (data) {
+        if (strcmp(data->d->signature, sig) == 0) {
+            free(sig);
+            PyObject* result = reinterpret_cast<PyObject*>(data);
+            Py_INCREF(result);
+            return result;
+        }
+        data = reinterpret_cast<PySideSignalInstance*>(data->d->next);
+    }
+
+    PyErr_Format(PyExc_IndexError, "Signature %s not found for signal: %s", sig, sigName);
+    free(sig);
+    return 0;
+}
+
+PyObject* signalInstanceDisconnect(PyObject* self, PyObject* args)
+{
+    PySideSignalInstance* source = reinterpret_cast<PySideSignalInstance*>(self);
+    Shiboken::AutoDecRef pyArgs(PyList_New(0));
+
+    PyObject* slot;
+    if (PyTuple_Check(args) && PyTuple_GET_SIZE(args))
+        slot = PyTuple_GET_ITEM(args, 0);
+    else
+        slot = Py_None;
+
+    bool match = false;
+    if (slot->ob_type == &PySideSignalInstanceType) {
+        PySideSignalInstance* target = reinterpret_cast<PySideSignalInstance*>(slot);
+        if (QMetaObject::checkConnectArgs(source->d->signature, target->d->signature)) {
+            PyList_Append(pyArgs, source->d->source);
+            Shiboken::AutoDecRef source_signature(PySide::Signal::buildQtCompatible(source->d->signature));
+            PyList_Append(pyArgs, source_signature);
+
+            PyList_Append(pyArgs, target->d->source);
+            Shiboken::AutoDecRef target_signature(PySide::Signal::buildQtCompatible(target->d->signature));
+            PyList_Append(pyArgs, target_signature);
+            match = true;
+        }
+    } else {
+        //try the first signature
+        PyList_Append(pyArgs, source->d->source);
+        Shiboken::AutoDecRef signature(PySide::Signal::buildQtCompatible(source->d->signature));
+        PyList_Append(pyArgs, signature);
+
+        // disconnect all, so we need to use the c++ signature disconnect(qobj, signal, 0, 0)
+        if (slot == Py_None)
+            PyList_Append(pyArgs, slot);
+        PyList_Append(pyArgs, slot);
+        match = true;
+    }
+
+    if (match) {
+        Shiboken::AutoDecRef tupleArgs(PyList_AsTuple(pyArgs));
+        Shiboken::AutoDecRef pyMethod(PyObject_GetAttrString(source->d->source, "disconnect"));
+        PyObject* result = PyObject_CallObject(pyMethod, tupleArgs);
+        if (result == Py_True)
+            return result;
+        else
+            Py_DECREF(result);
+    }
+
+    PyErr_Format(PyExc_RuntimeError, "Failed to disconnect signal %s.", source->d->signature);
+    return 0;
+}
+
+PyObject* signalCall(PyObject* self, PyObject* args, PyObject* kw)
+{
+    PySideSignal* signal = reinterpret_cast<PySideSignal*>(self);
+
+    if (!signal->homonymousMethod) {
+        PyErr_SetString(PyExc_TypeError, "native Qt signal is not callable");
+        return 0;
+    }
+
+    descrgetfunc getDescriptor = signal->homonymousMethod->ob_type->tp_descr_get;
+    Shiboken::AutoDecRef homonymousMethod(getDescriptor(signal->homonymousMethod, 0, 0));
+
+    if (PyCFunction_GET_FLAGS(homonymousMethod.object()) & METH_STATIC)
+        return PyCFunction_Call(homonymousMethod, args, kw);
+
+    ternaryfunc callFunc = signal->homonymousMethod->ob_type->tp_call;
+    return callFunc(homonymousMethod, args, kw);
+}
+
+PyObject* signalInstanceCall(PyObject* self, PyObject* args, PyObject* kw)
+{
+    PySideSignalInstance* PySideSignal = reinterpret_cast<PySideSignalInstance*>(self);
+    if (!PySideSignal->d->homonymousMethod) {
+        PyErr_SetString(PyExc_TypeError, "native Qt signal is not callable");
+        return 0;
+    }
+
+    descrgetfunc getDescriptor = PySideSignal->d->homonymousMethod->ob_type->tp_descr_get;
+    Shiboken::AutoDecRef homonymousMethod(getDescriptor(PySideSignal->d->homonymousMethod, PySideSignal->d->source, 0));
+    return PyCFunction_Call(homonymousMethod, args, kw);
+}
+
+static PyObject* metaSignalCheck(PyObject* klass, PyObject* args)
+{
+    if (PyType_IsSubtype(args->ob_type, &PySideSignalInstanceType))
+        Py_RETURN_TRUE;
+    else
+        Py_RETURN_FALSE;
+}
+
+} // extern "C"
+
+namespace PySide {
+namespace Signal {
+
+void init(PyObject* module)
+{
+    if (PyType_Ready(&PySideSignalMetaType) < 0)
+        return;
+
+    if (PyType_Ready(&PySideSignalType) < 0)
+        return;
+
+    Py_INCREF(&PySideSignalType);
+    PyModule_AddObject(module, SIGNAL_CLASS_NAME, ((PyObject*)&PySideSignalType));
+
+    if (PyType_Ready(&PySideSignalInstanceType) < 0)
+        return;
+
+    Py_INCREF(&PySideSignalInstanceType);
+}
+
+bool checkType(PyObject* pyObj)
+{
+    if (pyObj)
+        return PyType_IsSubtype(pyObj->ob_type, &PySideSignalType);
+    return false;
+}
+
+void updateSourceObject(PyObject* source)
+{
+    PyTypeObject* objType = reinterpret_cast<PyTypeObject*>(PyObject_Type(source));
+
+    Py_ssize_t pos = 0;
+    PyObject* value;
+    PyObject* key;
+
+    while (PyDict_Next(objType->tp_dict, &pos, &key, &value)) {
+        if (PyObject_TypeCheck(value, &PySideSignalType)) {
+            Shiboken::AutoDecRef signalInstance((PyObject*)PyObject_New(PySideSignalInstance, &PySideSignalInstanceType));
+            instanceInitialize(signalInstance.cast<PySideSignalInstance*>(), key, reinterpret_cast<PySideSignal*>(value), source, 0);
+            PyObject_SetAttr(source, key, signalInstance);
+        }
+    }
+
+    Py_XDECREF(objType);
+}
+
+char* getTypeName(PyObject* type)
+{
+    if (PyType_Check(type)) {
+        char* typeName = NULL;
+        if (PyType_IsSubtype(reinterpret_cast<PyTypeObject*>(type), reinterpret_cast<PyTypeObject*>(&SbkObject_Type))) {
+            SbkObjectType* objType = reinterpret_cast<SbkObjectType*>(type);
+            typeName = strdup(Shiboken::ObjectType::getOriginalName(objType));
+        } else {
+            // Translate python types to Qt names
+            PyTypeObject* objType = reinterpret_cast<PyTypeObject*>(type);
+            if (Shiboken::String::checkType(objType))
+                typeName = strdup("QString");
+            else if (objType == &PyInt_Type)
+                typeName = strdup("int");
+            else if (objType == &PyLong_Type)
+                typeName = strdup("long");
+            else if (objType == &PyFloat_Type)
+                typeName = strdup("double");
+            else if (objType == &PyBool_Type)
+                typeName = strdup("bool");
+            else if (Py_TYPE(objType) == &SbkEnumType_Type)
+                typeName = strdup(Shiboken::Enum::getCppName(objType));
+            else
+                typeName = strdup("PyObject");
+        }
+        return typeName;
+    } else if (type == Py_None) { // Must be checked before as Shiboken::String::check accepts Py_None
+        return strdup("void");
+    } else if (Shiboken::String::check(type)) {
+        return strdup(Shiboken::String::toCString(type));
+    }
+    return 0;
+}
+
+char* buildSignature(const char* name, const char* signature)
+{
+    QByteArray signal(name);
+    signal += '(';
+    signal += signature;
+    signal += ')';
+    return strdup(QMetaObject::normalizedSignature(signal));
+}
+
+char* parseSignature(PyObject* args)
+{
+    char* signature = 0;
+    if (args && (Shiboken::String::check(args) || !PySequence_Check(args)))
+        return getTypeName(args);
+
+    for (Py_ssize_t i = 0, i_max = PySequence_Size(args); i < i_max; i++) {
+        Shiboken::AutoDecRef arg(PySequence_ITEM(args, i));
+        char* typeName = getTypeName(arg);
+        if (typeName) {
+            if (signature) {
+                signature = reinterpret_cast<char*>(realloc(signature, (strlen(signature) + 1 + strlen(typeName)) * sizeof(char*)));
+                signature = strcat(signature, ",");
+                signature = strcat(signature, typeName);
+                free(typeName);
+            } else {
+                signature = typeName;
+            }
+        }
+    }
+    return signature;
+}
+
+void appendSignature(PySideSignal* self, char* signature)
+{
+    self->signaturesSize++;
+
+    if (self->signaturesSize > 1) {
+        self->signatures = reinterpret_cast<char**>(realloc(self->signatures, sizeof(char**) * self->signaturesSize));
+    } else {
+        self->signatures = reinterpret_cast<char**>(malloc(sizeof(char**)));
+    }
+    self->signatures[self->signaturesSize - 1] = signature;
+}
+
+PySideSignalInstance* initialize(PySideSignal* self, PyObject* name, PyObject* object)
+{
+    PySideSignalInstance* instance = PyObject_New(PySideSignalInstance, &PySideSignalInstanceType);
+    instanceInitialize(instance, name, self, object, 0);
+    return instance;
+}
+
+void instanceInitialize(PySideSignalInstance* self, PyObject* name, PySideSignal* data, PyObject* source, int index)
+{
+    self->d = new PySideSignalInstancePrivate;
+    PySideSignalInstancePrivate* selfPvt = self->d;
+    selfPvt->next = 0;
+    if (data->signalName)
+        selfPvt->signalName = strdup(data->signalName);
+    else {
+        selfPvt->signalName = strdup(Shiboken::String::toCString(name));
+        data->signalName = strdup(selfPvt->signalName);
+    }
+
+    selfPvt->source = source;
+    selfPvt->signature = buildSignature(self->d->signalName, data->signatures[index]);
+    selfPvt->homonymousMethod = 0;
+    if (data->homonymousMethod) {
+        selfPvt->homonymousMethod = data->homonymousMethod;
+        Py_INCREF(selfPvt->homonymousMethod);
+    }
+    index++;
+
+    if (index < data->signaturesSize) {
+        selfPvt->next = PyObject_New(PySideSignalInstance, &PySideSignalInstanceType);
+        instanceInitialize(selfPvt->next, name, data, source, index);
+    }
+}
+
+bool connect(PyObject* source, const char* signal, PyObject* callback)
+{
+    Shiboken::AutoDecRef pyMethod(PyObject_GetAttrString(source, "connect"));
+    if (pyMethod.isNull())
+        return false;
+
+    Shiboken::AutoDecRef pySignature(Shiboken::String::fromCString(signal));
+    Shiboken::AutoDecRef pyArgs(PyTuple_Pack(3, source, pySignature.object(), callback));
+    PyObject* result =  PyObject_CallObject(pyMethod, pyArgs);
+    if (result == Py_False) {
+        PyErr_Format(PyExc_RuntimeError, "Failed to connect signal %s, to python callable object.", signal);
+        Py_DECREF(result);
+        result = 0;
+    }
+    return result;
+}
+
+PySideSignalInstance* newObjectFromMethod(PyObject* source, const QList<QMetaMethod>& methodList)
+{
+    PySideSignalInstance* root = 0;
+    PySideSignalInstance* previous = 0;
+    foreach(QMetaMethod m, methodList) {
+        PySideSignalInstance* item = PyObject_New(PySideSignalInstance, &PySideSignalInstanceType);
+        if (!root)
+            root = item;
+
+        if (previous)
+            previous->d->next = item;
+
+        item->d = new PySideSignalInstancePrivate;
+        PySideSignalInstancePrivate* selfPvt = item->d;
+        selfPvt->source = source;
+        QByteArray cppName(m.signature());
+        cppName = cppName.mid(0, cppName.indexOf('('));
+        // separe SignalName
+        selfPvt->signalName = strdup(cppName.data());
+        selfPvt->signature = strdup(m.signature());
+        selfPvt->homonymousMethod = 0;
+        selfPvt->next = 0;
+    }
+    return root;
+}
+
+PySideSignal* newObject(const char* name, ...)
+{
+    va_list listSignatures;
+    char* sig = 0;
+    PySideSignal* self = PyObject_New(PySideSignal, &PySideSignalType);
+    self->signalName = strdup(name);
+    self->signaturesSize = 0;
+    self->signatures = 0;
+    self->initialized = 0;
+    self->homonymousMethod = 0;
+
+    va_start(listSignatures, name);
+    sig = va_arg(listSignatures, char*);
+
+    while (sig != NULL) {
+        if (strcmp(sig, "void") == 0)
+            appendSignature(self, strdup(""));
+        else
+            appendSignature(self, strdup(sig));
+
+        sig = va_arg(listSignatures, char*);
+    }
+
+    va_end(listSignatures);
+
+    return self;
+}
+
+template<typename T>
+static typename T::value_type join(T t, const char* sep)
+{
+    typename T::value_type res;
+    if (!t.size())
+        return res;
+
+    typename T::const_iterator it = t.begin();
+    typename T::const_iterator end = t.end();
+    res += *it;
+    ++it;
+
+    while (it != end) {
+        res += sep;
+        res += *it;
+        ++it;
+    }
+    return res;
+}
+
+static void _addSignalToWrapper(SbkObjectType* wrapperType, const char* signalName, PySideSignal* signal)
+{
+    PyObject* typeDict = wrapperType->super.ht_type.tp_dict;
+    PyObject* homonymousMethod;
+    if ((homonymousMethod = PyDict_GetItemString(typeDict, signalName))) {
+        Py_INCREF(homonymousMethod);
+        signal->homonymousMethod = homonymousMethod;
+    }
+    PyDict_SetItemString(typeDict, signalName, reinterpret_cast<PyObject*>(signal));
+}
+
+// This function is used by qStableSort to promote empty signatures
+static bool compareSignals(const QByteArray& sig1, const QByteArray& sig2)
+{
+    return sig1.isEmpty();
+}
+
+void registerSignals(SbkObjectType* pyObj, const QMetaObject* metaObject)
+{
+    typedef QHash<QByteArray, QList<QByteArray> > SignalSigMap;
+    SignalSigMap signalsFound;
+    for (int i = metaObject->methodOffset(), max = metaObject->methodCount(); i < max; ++i) {
+        QMetaMethod method = metaObject->method(i);
+
+        if (method.methodType() == QMetaMethod::Signal) {
+            QByteArray methodName(method.signature());
+            methodName.chop(methodName.size() - methodName.indexOf('('));
+            signalsFound[methodName] << join(method.parameterTypes(), ",");
+        }
+    }
+
+    SignalSigMap::Iterator it = signalsFound.begin();
+    SignalSigMap::Iterator end = signalsFound.end();
+    for (; it != end; ++it) {
+        PySideSignal* self = PyObject_New(PySideSignal, &PySideSignalType);
+        self->signalName = strdup(it.key().constData());
+        self->signaturesSize = 0;
+        self->signatures = 0;
+        self->initialized = 0;
+        self->homonymousMethod = 0;
+
+        // Empty signatures comes first! So they will be the default signal signature
+        qStableSort(it.value().begin(), it.value().end(), &compareSignals);
+        SignalSigMap::mapped_type::const_iterator j = it.value().begin();
+        SignalSigMap::mapped_type::const_iterator endJ = it.value().end();
+        for (; j != endJ; ++j)
+            appendSignature(self, strdup(j->constData()));
+
+        _addSignalToWrapper(pyObj, it.key(), self);
+        Py_DECREF((PyObject*) self);
+    }
+}
+
+PyObject* buildQtCompatible(const char* signature)
+{
+    QByteArray ba;
+    ba.append(QT_SIGNAL_SENTINEL);
+    ba.append(signature);
+    return Shiboken::String::fromStringAndSize(ba, ba.size());
+}
+
+void addSignalToWrapper(SbkObjectType* wrapperType, const char* signalName, PySideSignal* signal)
+{
+    _addSignalToWrapper(wrapperType, signalName, signal);
+}
+
+PyObject* getObject(PySideSignalInstance* signal)
+{
+    return signal->d->source;
+}
+
+const char* getSignature(PySideSignalInstance* signal)
+{
+    return signal->d->signature;
+}
+
+const char** getSignatures(PyObject* signal, int* size)
+{
+    PySideSignal* self = reinterpret_cast<PySideSignal*>(signal);
+    *size = self->signaturesSize;
+    return const_cast<const char**>(self->signatures);
+}
+
+QStringList getArgsFromSignature(const char* signature, bool* isShortCircuit)
+{
+    QString qsignature(signature);
+    QStringList result;
+    QRegExp splitRegex("\\s*,\\s*");
+
+    if (isShortCircuit)
+        *isShortCircuit = !qsignature.contains('(');
+    if (qsignature.contains("()") || qsignature.contains("(void)")) {
+        return result;
+    } else if (qsignature.contains('(')) {
+        static QRegExp regex(".+\\((.*)\\)");
+        //get args types
+        QString types = qsignature.replace(regex, "\\1");
+        result = types.split(splitRegex);
+    }
+    return result;
+}
+
+QString getCallbackSignature(const char* signal, QObject* receiver, PyObject* callback, bool encodeName)
+{
+    QByteArray functionName;
+    QByteArray signature;
+    QStringList args;
+    int numArgs = -1;
+    bool useSelf = false;
+    bool isMethod = PyMethod_Check(callback);
+    bool isFunction = PyFunction_Check(callback);
+
+    if (isMethod || isFunction) {
+        PyObject* function = isMethod ? PyMethod_GET_FUNCTION(callback) : callback;
+        PyCodeObject* objCode = reinterpret_cast<PyCodeObject*>(PyFunction_GET_CODE(function));
+        functionName = Shiboken::String::toCString(reinterpret_cast<PyFunctionObject*>(function)->func_name);
+        useSelf = isMethod;
+        numArgs = objCode->co_flags & CO_VARARGS ? -1 : objCode->co_argcount;
+    } else if (PyCFunction_Check(callback)) {
+        functionName = ((PyCFunctionObject*)callback)->m_ml->ml_name;
+        useSelf = ((PyCFunctionObject*)callback)->m_self;
+        int flags = ((PyCFunctionObject*)callback)->m_ml->ml_flags;
+
+        if (receiver) {
+            //Search for signature on metaobject
+            const QMetaObject* mo = receiver->metaObject();
+            QByteArray prefix(functionName);
+            prefix += '(';
+            for (int i = 0; i < mo->methodCount(); i++) {
+                QMetaMethod me = mo->method(i);
+                if ((strncmp(me.signature(), prefix, prefix.size()) == 0) &&
+                    QMetaObject::checkConnectArgs(signal, me.signature())) {
+                    numArgs = me.parameterTypes().size() + useSelf;
+                    break;
+                }
+           }
+        }
+
+        if (numArgs == -1) {
+            if (flags & METH_VARARGS)
+                numArgs = -1;
+            else if (flags & METH_NOARGS)
+                numArgs = 0;
+        }
+    } else if (PyCallable_Check(callback)) {
+        functionName = "__callback" + QByteArray::number((qlonglong)callback);
+    }
+
+    Q_ASSERT(!functionName.isEmpty());
+
+    bool isShortCircuit = false;
+
+    if (encodeName)
+        signature = qPrintable(codeCallbackName(callback, functionName));
+    else
+        signature = functionName;
+
+    args = getArgsFromSignature(signal, &isShortCircuit);
+
+    if (!isShortCircuit) {
+        signature.append('(');
+        if (numArgs == -1)
+            numArgs = std::numeric_limits<int>::max();
+        while (args.count() && (args.count() > (numArgs - useSelf))) {
+            args.removeLast();
+        }
+        signature.append(args.join(","));
+        signature.append(')');
+    }
+    return signature;
+}
+
+bool isQtSignal(const char* signal)
+{
+    return (signal && signal[0] == QT_SIGNAL_SENTINEL);
+}
+
+bool checkQtSignal(const char* signal)
+{
+    if (!isQtSignal(signal)) {
+        PyErr_SetString(PyExc_TypeError, "Use the function PySide.QtCore.SIGNAL on signals");
+        return false;
+    }
+    return true;
+}
+
+QString codeCallbackName(PyObject* callback, const QString& funcName)
+{
+    if (PyMethod_Check(callback)) {
+        PyObject* self = PyMethod_GET_SELF(callback);
+        PyObject* func = PyMethod_GET_FUNCTION(callback);
+        return funcName + QString::number(quint64(self), 16) + QString::number(quint64(func), 16);
+    } else {
+        return funcName + QString::number(quint64(callback), 16);
+    }
+}
+
+} //namespace Signal
+} //namespace PySide
+
diff --git a/libpyside/pysidesignal.h b/libpyside/pysidesignal.h
new file mode 100644
index 0000000..293e7a1
--- /dev/null
+++ b/libpyside/pysidesignal.h
@@ -0,0 +1,156 @@
+/*
+ * This file is part of the PySide project.
+ *
+ * Copyright (C) 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
+ *
+ * Contact: PySide team <contact@pyside.org>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+#ifndef PYSIDE_SIGNAL_H
+#define PYSIDE_SIGNAL_H
+
+#include <QObject>
+#include <QString>
+#include <QStringList>
+
+#include <pysidemacros.h>
+#include <sbkpython.h>
+#include <basewrapper.h>
+
+extern "C"
+{
+    extern PYSIDE_API PyTypeObject PySideSignalType;
+    extern PYSIDE_API PyTypeObject PySideSignalInstanceType;
+
+    // Internal object
+    struct PYSIDE_API PySideSignal;
+
+    struct PySideSignalInstancePrivate;
+    struct PYSIDE_API PySideSignalInstance
+    {
+        PyObject_HEAD
+        PySideSignalInstancePrivate* d;
+    };
+}; // extern "C"
+
+namespace PySide {
+namespace Signal {
+
+PYSIDE_API bool checkType(PyObject* type);
+
+/**
+ * This function creates a Signal object which stays attached to QObject class
+ *
+ * @param   name of the Signal to be registered on meta object
+ * @param   signatures a list of signatures supported by this signal, ended with a NULL pointer
+ * @return  Return a new reference to PyObject* of type  PySideSignal
+ * @deprecated Use registerSignals
+ **/
+PYSIDE_DEPRECATED(PYSIDE_API PySideSignal* newObject(const char* name, ...));
+
+/**
+ * Register all C++ signals of a QObject on Python type.
+ */
+PYSIDE_API void registerSignals(SbkObjectType* pyObj, const QMetaObject* metaObject);
+
+/**
+ * This function creates a Signal object which stays attached to QObject class based on a list of QMetaMethods
+ *
+ * @param   source of the Signal to be registered on meta object
+ * @param   methods a list of QMetaMethod wich contains the supported signature
+ * @return  Return a new reference to PyObject* of type  PySideSignal
+ **/
+PYSIDE_API PySideSignalInstance* newObjectFromMethod(PyObject* source, const QList<QMetaMethod>& methods);
+
+/**
+ * This function initializes the Signal object by creating a PySideSignalInstance
+ *
+ * @param   self a Signal object used as base to PySideSignalInstance
+ * @param   name the name to be used on PySideSignalInstance
+ * @param   object the PyObject where the signal will be attached
+ * @return  Return a new reference to PySideSignalInstance
+ **/
+PYSIDE_API PySideSignalInstance* initialize(PySideSignal* signal, PyObject* name, PyObject* object);
+
+/**
+ * This function is used to retrieve the object in which the signal is attached
+ *
+ * @param   self The Signal object
+ * @return  Return the internal reference to the parent object of the signal
+ **/
+PYSIDE_API PyObject* getObject(PySideSignalInstance* signal);
+
+/**
+ * This function is used to retrieve the signal signature
+ *
+ * @param   self The Signal object
+ * @return  Return the signal signature
+ **/
+PYSIDE_API const char* getSignature(PySideSignalInstance* signal);
+
+/**
+ * This function is used to retrieve the signal signature
+ *
+ * @param   self The Signal object
+ * @return  Return the signal signature
+ **/
+PYSIDE_API void updateSourceObject(PyObject* source);
+
+/**
+ * @deprecated Use registerSignals
+ **/
+PYSIDE_DEPRECATED(PYSIDE_API void addSignalToWrapper(SbkObjectType* wrapperType, const char* signalName, PySideSignal* signal));
+
+/**
+ * This function verifies if the signature is a QtSignal base on SIGNAL flag
+ * @param   signature   The signal signature
+ * @return  Return true if this is a Qt Signal, otherwise return false
+ **/
+PYSIDE_API bool isQtSignal(const char* signature);
+
+/**
+ * This function is similar to isQtSignal, however if it fails, it'll raise a Python error instead.
+ *
+ * @param   signature   The signal signature
+ * @return  Return true if this is a Qt Signal, otherwise return false
+ **/
+PYSIDE_API bool checkQtSignal(const char* signature);
+
+/**
+ * This function is used to retrieve the signature base on Signal and receiver callback
+ * @param   signature   The signal signature
+ * @param   receiver    The QObject which will receive the signal
+ * @param   callback    Callback function which will connect to the signal
+ * @param   encodeName  Used to specify if the returned signature will be encoded with Qt signal/slot style
+ * @return  Return the callback signature
+ **/
+PYSIDE_API QString getCallbackSignature(const char* signal, QObject* receiver, PyObject* callback, bool encodeName);
+
+/**
+ * This function parses the signature and then returns a list of argument types.
+ *
+ * @param   signature       The signal signature
+ * @param   isShortCircuit  If this is a shortCircuit(python<->python) signal
+ * @return  Return true if this is a Qt Signal, otherwise return false
+ * @todo    replace return type by QList<QByteArray>
+ **/
+QStringList getArgsFromSignature(const char* signature, bool* isShortCircuit = 0);
+
+} // namespace Signal
+} // namespace PySide
+
+#endif
diff --git a/libpyside/pysidesignal_p.h b/libpyside/pysidesignal_p.h
new file mode 100644
index 0000000..083516f
--- /dev/null
+++ b/libpyside/pysidesignal_p.h
@@ -0,0 +1,63 @@
+/*
+ * This file is part of the PySide project.
+ *
+ * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+ *
+ * Contact: PySide team <contact@pyside.org>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+#ifndef PYSIDE_QSIGNAL_P_H
+#define PYSIDE_QSIGNAL_P_H
+
+#include <sbkpython.h>
+
+extern "C"
+{
+    extern PyTypeObject PySideSignalType;
+
+    struct PySideSignal {
+        PyObject_HEAD
+        bool initialized;
+        char* signalName;
+        char** signatures;
+        int signaturesSize;
+        PyObject* homonymousMethod;
+    };
+
+    struct PySideSignalInstance;
+    struct PySideSignalInstancePrivate {
+        char* signalName;
+        char* signature;
+        PyObject* source;
+        PyObject* homonymousMethod;
+        PySideSignalInstance* next;
+    };
+
+
+}; //extern "C"
+
+namespace PySide { namespace Signal {
+
+    void            init(PyObject* module);
+    bool            connect(PyObject* source, const char* signal, PyObject* callback);
+    char*           getTypeName(PyObject*);
+    const char**    getSignatures(PyObject* self, int *size);
+    QString         codeCallbackName(PyObject* callback, const QString& funcName);
+
+}} //namespace PySide
+
+#endif
diff --git a/libpyside/qslot.cpp b/libpyside/pysideslot.cpp
similarity index 59%
rename from libpyside/qslot.cpp
rename to libpyside/pysideslot.cpp
index e74838c..d2aba10 100644
--- a/libpyside/qslot.cpp
+++ b/libpyside/pysideslot.cpp
@@ -1,41 +1,32 @@
 /*
- * This file is part of the Shiboken Python Bindings Generator project.
+ * This file is part of the PySide project.
  *
- * Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+ * Copyright (C) 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
  *
  * Contact: PySide team <contact@pyside.org>
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * version 2.1 as published by the Free Software Foundation. Please
- * review the following information to ensure the GNU Lesser General
- * Public License version 2.1 requirements will be met:
- * http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
  *
- * As a special exception to the GNU Lesser General Public License
- * version 2.1, the object code form of a "work that uses the Library"
- * may incorporate material from a header file that is part of the
- * Library.  You may distribute such object code under terms of your
- * choice, provided that the incorporated material (i) does not exceed
- * more than 5% of the total size of the Library; and (ii) is limited to
- * numerical parameters, data structure layouts, accessors, macros,
- * inline functions and templates.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <shiboken.h>
-#include <dynamicqmetaobject.h>
+#include "dynamicqmetaobject_p.h"
+#include "pysidesignal_p.h"
+#include "pysideslot_p.h"
 
+#include <shiboken.h>
 #include <QString>
+#include <QMetaObject>
 
 #define SLOT_DEC_NAME "Slot"
 
@@ -45,24 +36,19 @@ typedef struct
     char* slotName;
     char* args;
     char* resultType;
-} SlotData;
+} PySideSlot;
 
 extern "C"
 {
 
-static int slot_init(PyObject*, PyObject*, PyObject*);
-static PyObject* slot_call(PyObject*, PyObject*, PyObject*);
-
-//aux
-static char* slot_get_type_name(PyObject*);
-
+static int slotTpInit(PyObject*, PyObject*, PyObject*);
+static PyObject* slotCall(PyObject*, PyObject*, PyObject*);
 
 // Class Definition -----------------------------------------------
-static PyTypeObject Slot_Type = {
-    PyObject_HEAD_INIT(NULL)
-    0,                         /*ob_size*/
-    "QtCore."SLOT_DEC_NAME,    /*tp_name*/
-    sizeof(SlotData),          /*tp_basicsize*/
+static PyTypeObject PySideSlotType = {
+    PyVarObject_HEAD_INIT(0, 0)
+    "PySide.QtCore."SLOT_DEC_NAME, /*tp_name*/
+    sizeof(PySideSlot),        /*tp_basicsize*/
     0,                         /*tp_itemsize*/
     0,                         /*tp_dealloc*/
     0,                         /*tp_print*/
@@ -74,7 +60,7 @@ static PyTypeObject Slot_Type = {
     0,                         /*tp_as_sequence*/
     0,                         /*tp_as_mapping*/
     0,                         /*tp_hash */
-    slot_call,                /*tp_call*/
+    slotCall,                  /*tp_call*/
     0,                         /*tp_str*/
     0,                         /*tp_getattro*/
     0,                         /*tp_setattro*/
@@ -95,7 +81,7 @@ static PyTypeObject Slot_Type = {
     0,                         /*tp_descr_get */
     0,                         /*tp_descr_set */
     0,                         /*tp_dictoffset */
-    (initproc)slot_init,      /*tp_init */
+    slotTpInit,                /*tp_init */
     0,                         /*tp_alloc */
     PyType_GenericNew,         /*tp_new */
     0,                         /*tp_free */
@@ -108,31 +94,7 @@ static PyTypeObject Slot_Type = {
     0,                         /*tp_del */
 };
 
-void init_slot(PyObject *module)
-{
-    if (PyType_Ready(&Slot_Type) < 0)
-        return;
-
-    Py_INCREF(&Slot_Type);
-    PyModule_AddObject(module, SLOT_DEC_NAME, ((PyObject*)&Slot_Type));
-}
-
-
-} // extern "C"
-
-char* slot_get_type_name(PyObject *type)
-{
-    if (PyType_Check(type)) {
-        //tp_name return the full name
-        Shiboken::AutoDecRef typeName(PyObject_GetAttrString(type, "__name__"));
-        return strdup(PyString_AS_STRING(typeName.object()));
-    } else if (PyString_Check(type)) {
-        return strdup(PyString_AS_STRING(type));
-    }
-    return 0;
-}
-
-int slot_init(PyObject *self, PyObject *args, PyObject *kw)
+int slotTpInit(PyObject *self, PyObject *args, PyObject *kw)
 {
     static PyObject *emptyTuple = 0;
     static const char *kwlist[] = {"name", "result", 0};
@@ -145,10 +107,10 @@ int slot_init(PyObject *self, PyObject *args, PyObject *kw)
     if (!PyArg_ParseTupleAndKeywords(emptyTuple, kw, "|sO:QtCore."SLOT_DEC_NAME, (char**) kwlist, &argName, &argResult))
         return 0;
 
-    SlotData *data = reinterpret_cast<SlotData*>(self);
+    PySideSlot *data = reinterpret_cast<PySideSlot*>(self);
     for(Py_ssize_t i = 0, i_max = PyTuple_Size(args); i < i_max; i++) {
         PyObject *argType = PyTuple_GET_ITEM(args, i);
-        char *typeName = slot_get_type_name(argType);
+        char *typeName = PySide::Signal::getTypeName(argType);
         if (typeName) {
             if (data->args) {
                 data->args = reinterpret_cast<char*>(realloc(data->args, (strlen(data->args) + 1 + strlen(typeName)) * sizeof(char*)));
@@ -158,6 +120,9 @@ int slot_init(PyObject *self, PyObject *args, PyObject *kw)
             } else {
                 data->args = typeName;
             }
+        } else {
+            PyErr_Format(PyExc_TypeError, "Unknown signal argument type: %s", argType->ob_type->tp_name);
+            return -1;
         }
     }
 
@@ -165,14 +130,14 @@ int slot_init(PyObject *self, PyObject *args, PyObject *kw)
         data->slotName = strdup(argName);
 
     if (argResult)
-        data->resultType = slot_get_type_name(argResult);
+        data->resultType = PySide::Signal::getTypeName(argResult);
     else
         data->resultType = strdup("void");
 
     return 1;
 }
 
-PyObject* slot_call(PyObject* self, PyObject* args, PyObject* kw)
+PyObject* slotCall(PyObject* self, PyObject* args, PyObject* kw)
 {
     static PyObject* pySlotName = 0;
     PyObject* callback;
@@ -180,20 +145,22 @@ PyObject* slot_call(PyObject* self, PyObject* args, PyObject* kw)
     Py_INCREF(callback);
 
     if (PyFunction_Check(callback)) {
-        SlotData *data = reinterpret_cast<SlotData*>(self);
+        PySideSlot *data = reinterpret_cast<PySideSlot*>(self);
 
         if (!data->slotName) {
             PyObject *funcName = reinterpret_cast<PyFunctionObject*>(callback)->func_name;
-            data->slotName = strdup(PyString_AS_STRING(funcName));
+            data->slotName = strdup(Shiboken::String::toCString(funcName));
         }
 
-        QString signature;
-        signature.sprintf("%s %s(%s)", data->resultType, data->slotName, data->args);
+
+        QByteArray returnType = QMetaObject::normalizedType(data->resultType);
+        QByteArray signature = QString().sprintf("%s(%s)", data->slotName, data->args).toAscii();
+        signature = returnType + " " + signature;
 
         if (!pySlotName)
-            pySlotName = PyString_FromString(PYSIDE_SLOT_LIST_ATTR);
+            pySlotName = Shiboken::String::fromCString(PYSIDE_SLOT_LIST_ATTR);
 
-        PyObject *pySignature = PyString_FromString(QMetaObject::normalizedSignature(signature.toAscii()));
+        PyObject *pySignature = Shiboken::String::fromCString(signature);
         PyObject *signatureList = 0;
         if (PyObject_HasAttr(callback, pySlotName)) {
             signatureList = PyObject_GetAttr(callback, pySlotName);
@@ -218,3 +185,18 @@ PyObject* slot_call(PyObject* self, PyObject* args, PyObject* kw)
     return callback;
 }
 
+} // extern "C"
+
+namespace PySide { namespace Slot {
+
+void init(PyObject* module)
+{
+    if (PyType_Ready(&PySideSlotType) < 0)
+        return;
+
+    Py_INCREF(&PySideSlotType);
+    PyModule_AddObject(module, SLOT_DEC_NAME, ((PyObject*)&PySideSlotType));
+}
+
+} // namespace Slot
+} // namespace PySide
diff --git a/libpyside/pysideslot_p.h b/libpyside/pysideslot_p.h
new file mode 100644
index 0000000..ed5b3c5
--- /dev/null
+++ b/libpyside/pysideslot_p.h
@@ -0,0 +1,32 @@
+/*
+ * This file is part of the PySide project.
+ *
+ * Copyright (C) 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
+ *
+ * Contact: PySide team <contact@pyside.org>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+#ifndef PYSIDE_SLOT_P_H
+#define PYSIDE_SLOT_P_H
+
+#include <sbkpython.h>
+#define PYSIDE_SLOT_LIST_ATTR "_slots"
+
+namespace PySide { namespace Slot {
+    void init(PyObject* module);
+}}
+
+#endif
diff --git a/libpyside/pysideweakref.cpp b/libpyside/pysideweakref.cpp
new file mode 100644
index 0000000..3f4dfd7
--- /dev/null
+++ b/libpyside/pysideweakref.cpp
@@ -0,0 +1,76 @@
+#include "pysideweakref.h"
+
+#include <sbkpython.h>
+
+typedef struct {
+    PyObject_HEAD
+    /* Type-specific fields go here. */
+    PySideWeakRefFunction weakref_func;
+    void*  user_data;
+} PySideCallableObject;
+
+static PyObject* CallableObject_call(PyObject* callable_object, PyObject* args, PyObject* kw);
+
+static PyTypeObject PySideCallableObjectType = {
+    PyVarObject_HEAD_INIT(0, 0)
+    const_cast<char*>("PySide.Callable"),
+    sizeof(PySideCallableObject),    /*tp_basicsize*/
+    0,                         /*tp_itemsize*/
+    0,                         /*tp_dealloc*/
+    0,                         /*tp_print*/
+    0,                         /*tp_getattr*/
+    0,                         /*tp_setattr*/
+    0,                         /*tp_compare*/
+    0,                         /*tp_repr*/
+    0,                         /*tp_as_number*/
+    0,                         /*tp_as_sequence*/
+    0,                         /*tp_as_mapping*/
+    0,                         /*tp_hash */
+    CallableObject_call,       /*tp_call*/
+    0,                         /*tp_str*/
+    0,                         /*tp_getattro*/
+    0,                         /*tp_setattro*/
+    0,                         /*tp_as_buffer*/
+    Py_TPFLAGS_DEFAULT,        /*tp_flags*/
+    0,                         /* tp_doc */
+};
+
+static PyObject* CallableObject_call(PyObject* callable_object, PyObject* args, PyObject* kw)
+{
+    PySideCallableObject* obj = (PySideCallableObject*)(callable_object);
+    obj->weakref_func(obj->user_data);
+
+    Py_XDECREF(PyTuple_GET_ITEM(args, 0)); //kill weak ref object
+    Py_RETURN_NONE;
+}
+
+namespace PySide { namespace WeakRef {
+
+PyObject* create(PyObject* obj, PySideWeakRefFunction func, void* userData)
+{
+    if (obj == Py_None)
+        return 0;
+
+    if (Py_TYPE(&PySideCallableObjectType) == 0)
+    {
+        Py_TYPE(&PySideCallableObjectType) = &PyType_Type;
+        PyType_Ready(&PySideCallableObjectType);
+    }
+
+    PySideCallableObject* callable = PyObject_New(PySideCallableObject, &PySideCallableObjectType);
+    if (!callable || PyErr_Occurred())
+        return 0;
+
+    PyObject* weak = PyWeakref_NewRef(obj, (PyObject*)callable);
+    if (!weak || PyErr_Occurred())
+        return 0;
+
+    Py_DECREF(callable);
+
+    callable->weakref_func = func;
+    callable->user_data = userData;
+    return (PyObject*)weak;
+}
+
+} }  //namespace
+
diff --git a/libpyside/pysideweakref.h b/libpyside/pysideweakref.h
new file mode 100644
index 0000000..03eabd8
--- /dev/null
+++ b/libpyside/pysideweakref.h
@@ -0,0 +1,17 @@
+#ifndef __PYSIDEWEAKREF__
+#define __PYSIDEWEAKREF__
+
+#include <pysidemacros.h>
+#include <sbkpython.h>
+
+typedef void (*PySideWeakRefFunction)(void* userData);
+
+namespace PySide { namespace WeakRef {
+
+PYSIDE_API PyObject* create(PyObject* ob, PySideWeakRefFunction func, void* userData);
+
+} //PySide
+} //WeakRef
+
+
+#endif
diff --git a/libpyside/qsignal.cpp b/libpyside/qsignal.cpp
deleted file mode 100644
index 1edc13c..0000000
--- a/libpyside/qsignal.cpp
+++ /dev/null
@@ -1,539 +0,0 @@
-/*
- * This file is part of the Shiboken Python Bindings Generator project.
- *
- * Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
- *
- * Contact: PySide team <contact@pyside.org>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * version 2.1 as published by the Free Software Foundation. Please
- * review the following information to ensure the GNU Lesser General
- * Public License version 2.1 requirements will be met:
- * http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
- *
- * As a special exception to the GNU Lesser General Public License
- * version 2.1, the object code form of a "work that uses the Library"
- * may incorporate material from a header file that is part of the
- * Library.  You may distribute such object code under terms of your
- * choice, provided that the incorporated material (i) does not exceed
- * more than 5% of the total size of the Library; and (ii) is limited to
- * numerical parameters, data structure layouts, accessors, macros,
- * inline functions and templates.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
-#include <shiboken.h>
-#include <Python.h>
-#include <QDebug>
-
-#include "qsignal.h"
-#include "signalmanager.h"
-
-#define SIGNAL_CLASS_NAME "Signal"
-#define QT_SIGNAL_SENTINEL "2"
-
-namespace PySide
-{
-
-extern "C"
-{
-
-typedef struct {
-    PyObject_HEAD
-    bool initialized;
-    char* signalName;
-    char** signatures;
-    int signaturesSize;
-} SignalData;
-
-static int signal_init(PyObject*, PyObject*, PyObject*);
-static void signal_free(void*);
-static void signal_instance_free(void*);
-
-//methods
-static PyObject* signal_instance_connect(PyObject*, PyObject*, PyObject*);
-static PyObject* signal_instance_disconnect(PyObject*, PyObject*);
-static PyObject* signal_instance_emit(PyObject*, PyObject*);
-static PyObject* signal_instance_get_item(PyObject*, PyObject*);
-
-//aux
-static char* signal_build_signature(const char*, const char*);
-static char* signal_get_type_name(PyObject*);
-static void signal_append_signature(SignalData*, char*);
-static void signal_instance_initialize(PyObject*, PyObject*, SignalData*, PyObject *, int);
-static char* signal_parse_signature(PyObject*);
-static PyObject* signal_build_qt_compatible(const char*);
-
-PyTypeObject Signal_Type = {
-    PyObject_HEAD_INIT(0)
-    0,                         /*ob_size*/
-    SIGNAL_CLASS_NAME,         /*tp_name*/
-    sizeof(SignalData),        /*tp_basicsize*/
-    0,                         /*tp_itemsize*/
-    0,                         /*tp_dealloc*/
-    0,                         /*tp_print*/
-    0,                         /*tp_getattr*/
-    0,                         /*tp_setattr*/
-    0,                         /*tp_compare*/
-    0,                         /*tp_repr*/
-    0,                         /*tp_as_number*/
-    0,                         /*tp_as_sequence*/
-    0,                         /*tp_as_mapping*/
-    0,                         /*tp_hash */
-    0,                         /*tp_call*/
-    0,                         /*tp_str*/
-    0,                         /*tp_getattro*/
-    0,                         /*tp_setattro*/
-    0,                         /*tp_as_buffer*/
-    Py_TPFLAGS_DEFAULT,        /*tp_flags*/
-    SIGNAL_CLASS_NAME,         /*tp_doc */
-    0,                         /*tp_traverse */
-    0,                         /*tp_clear */
-    0,                         /*tp_richcompare */
-    0,                         /*tp_weaklistoffset */
-    0,                         /*tp_iter */
-    0,                         /*tp_iternext */
-    0,                         /*tp_methods */
-    0,                         /*tp_members */
-    0,                         /*tp_getset */
-    0,                         /*tp_base */
-    0,                         /*tp_dict */
-    0,                         /*tp_descr_get */
-    0,                         /*tp_descr_set */
-    0,                         /*tp_dictoffset */
-    (initproc)signal_init,    /*tp_init */
-    0,                         /*tp_alloc */
-    PyType_GenericNew,         /*tp_new */
-    signal_free,              /*tp_free */
-    0,                         /*tp_is_gc */
-    0,                         /*tp_bases */
-    0,                         /*tp_mro */
-    0,                         /*tp_cache */
-    0,                         /*tp_subclasses */
-    0,                         /*tp_weaklist */
-    0,                         /*tp_del */
-};
-
-static PyMethodDef SignalInstance_methods[] = {
-    {"connect", (PyCFunction)signal_instance_connect, METH_VARARGS|METH_KEYWORDS},
-    {"disconnect", (PyCFunction)signal_instance_disconnect, METH_VARARGS},
-    {"emit", (PyCFunction)signal_instance_emit, METH_VARARGS},
-    {NULL}  /* Sentinel */
-};
-
-static PyMappingMethods SignalInstance_as_mapping = {
-    0,
-    signal_instance_get_item,
-    0
-};
-
-PyTypeObject SignalInstance_Type = {
-    PyObject_HEAD_INIT(0)
-    0,                         /*ob_size*/
-    SIGNAL_CLASS_NAME,         /*tp_name*/
-    sizeof(SignalInstanceData),/*tp_basicsize*/
-    0,                         /*tp_itemsize*/
-    0,                         /*tp_dealloc*/
-    0,                         /*tp_print*/
-    0,                         /*tp_getattr*/
-    0,                         /*tp_setattr*/
-    0,                         /*tp_compare*/
-    0,                         /*tp_repr*/
-    0,                         /*tp_as_number*/
-    0,                         /*tp_as_sequence*/
-    &SignalInstance_as_mapping,/*tp_as_mapping*/
-    0,                         /*tp_hash */
-    0,                         /*tp_call*/
-    0,                         /*tp_str*/
-    0,                         /*tp_getattro*/
-    0,                         /*tp_setattro*/
-    0,                         /*tp_as_buffer*/
-    Py_TPFLAGS_DEFAULT,        /*tp_flags*/
-    SIGNAL_CLASS_NAME,         /*tp_doc */
-    0,                         /*tp_traverse */
-    0,                         /*tp_clear */
-    0,                         /*tp_richcompare */
-    0,                         /*tp_weaklistoffset */
-    0,                         /*tp_iter */
-    0,                         /*tp_iternext */
-    SignalInstance_methods,    /*tp_methods */
-    0,                         /*tp_members */
-    0,                         /*tp_getset */
-    0,                         /*tp_base */
-    0,                         /*tp_dict */
-    0,                         /*tp_descr_get */
-    0,                         /*tp_descr_set */
-    0,                         /*tp_dictoffset */
-    0,                         /*tp_init */
-    0,                         /*tp_alloc */
-    PyType_GenericNew,         /*tp_new */
-    signal_instance_free,     /*tp_free */
-    0,                         /*tp_is_gc */
-    0,                         /*tp_bases */
-    0,                         /*tp_mro */
-    0,                         /*tp_cache */
-    0,                         /*tp_subclasses */
-    0,                         /*tp_weaklist */
-    0,                         /*tp_del */
-};
-
-
-void init_signal(PyObject* module)
-{
-    if (PyType_Ready(&Signal_Type) < 0)
-        return;
-
-    Py_INCREF(&Signal_Type);
-    PyModule_AddObject(module, SIGNAL_CLASS_NAME, ((PyObject*)&Signal_Type));
-
-    if (PyType_Ready(&SignalInstance_Type) < 0)
-        return;
-
-    Py_INCREF(&SignalInstance_Type);
-}
-
-
-} // extern "C"
-
-
-PyObject* signal_instance_get_item(PyObject* self, PyObject* key)
-{
-    SignalInstanceData* data = reinterpret_cast<SignalInstanceData*>(self);
-    char* sigKey = signal_parse_signature(key);
-    char* sig = signal_build_signature(data->signalName, sigKey);
-    free(sigKey);
-
-    while(data) {
-        if (strcmp(data->signature, sig) == 0) {
-            free(sig);
-            PyObject *result = reinterpret_cast<PyObject*>(data);
-            Py_INCREF(result);
-            return result;
-        }
-        data = reinterpret_cast<SignalInstanceData*>(data->next);
-    }
-    free(sig);
-    return 0;
-}
-
-void signalUpdateSource(PyObject* source)
-{
-    PyObject* attrs = PyObject_Dir(source);
-    for(int i = 0, i_max = PyList_Size(attrs); i < i_max; i++) {
-        PyObject *attrName = PyList_GET_ITEM(attrs, i);
-        PyObject *attr = PyObject_GetAttr(source, attrName);
-        if (attr->ob_type == &Signal_Type) {
-            Shiboken::AutoDecRef signalInstance(reinterpret_cast<PyObject*>(PyObject_New(SignalInstanceData, &SignalInstance_Type)));
-            signal_instance_initialize(signalInstance, attrName, reinterpret_cast<SignalData*>(attr), source, 0);
-            PyObject_SetAttr(source, attrName, signalInstance);
-        }
-        Py_DECREF(attr);
-    }
-}
-
-char* signal_get_type_name(PyObject* type)
-{
-    if (PyType_Check(type)) {
-        //tp_name return the full name
-        Shiboken::AutoDecRef typeName(PyObject_GetAttrString(type, "__name__"));
-        return strdup(PyString_AS_STRING(typeName.object()));
-    } else if (PyString_Check(type)) {
-        return strdup(PyString_AS_STRING(type));
-    }
-    return 0;
-}
-
-char* signal_build_signature(const char *name, const char *signature)
-{
-    QString signal;
-    signal.sprintf("%s(%s)", name, signature);
-    return strdup(QMetaObject::normalizedSignature(signal.toAscii()));
-}
-
-char* signal_parse_signature(PyObject *args)
-{
-    char *signature = 0;
-
-    if (args && (PyString_Check(args) || (!PySequence_Check(args) && (args != Py_None))))
-        return signal_get_type_name(args);
-
-    for(Py_ssize_t i = 0, i_max = PySequence_Size(args); i < i_max; i++) {
-        Shiboken::AutoDecRef arg(PySequence_ITEM(args, i));
-        char* typeName = signal_get_type_name(arg);
-        if (typeName) {
-            if (signature) {
-                signature = reinterpret_cast<char*>(realloc(signature, (strlen(signature) + 1 + strlen(typeName)) * sizeof(char*)));
-                signature = strcat(signature, ",");
-                signature = strcat(signature, typeName);
-                free(typeName);
-            } else {
-                signature = typeName;
-            }
-        }
-    }
-
-    return signature;
-}
-
-void signal_append_signature(SignalData* self, char* signature)
-{
-    self->signaturesSize++;
-
-    if (self->signaturesSize > 1) {
-        self->signatures = (char**) realloc(self->signatures, sizeof(char**) * self->signaturesSize);
-    } else {
-        self->signatures = (char**) malloc(sizeof(char**));
-    }
-    self->signatures[self->signaturesSize-1] = signature;
-}
-
-int signal_init(PyObject* self, PyObject* args, PyObject* kwds)
-{
-    static PyObject *emptyTuple = 0;
-    static const char *kwlist[] = {"name", 0};
-    char* argName = 0;
-
-    if (emptyTuple == 0)
-        emptyTuple = PyTuple_New(0);
-
-    if (!PyArg_ParseTupleAndKeywords(emptyTuple, kwds,
-                                     "|s:QtCore."SIGNAL_CLASS_NAME, (char**) kwlist, &argName))
-        return 0;
-
-    bool tupledArgs = false;
-    SignalData *data = reinterpret_cast<SignalData*>(self);
-    if (argName) {
-        data->signalName = strdup(argName);
-    }
-
-    for(Py_ssize_t i = 0, i_max = PyTuple_Size(args); i < i_max; i++) {
-        PyObject *arg = PyTuple_GET_ITEM(args, i);
-        if (PySequence_Check(arg) && !PyString_Check(arg)) {
-            tupledArgs = true;
-            signal_append_signature(data, signal_parse_signature(arg));
-        }
-    }
-
-    if (!tupledArgs)
-        signal_append_signature(data, signal_parse_signature(args));
-
-    return 1;
-}
-
-void signal_free(void *self)
-{
-    PyObject *pySelf = reinterpret_cast<PyObject*>(self);
-    SignalData *data = reinterpret_cast<SignalData*>(self);
-
-    for(int i = 0, i_max = data->signaturesSize; i < i_max; i++) {
-        if (data->signatures[i])
-            free(data->signatures[i]);
-    }
-
-    free(data->signatures);
-    free(data->signalName);
-    data->initialized = 0;
-    data->signaturesSize = 0;
-
-    pySelf->ob_type->tp_base->tp_free(self);
-}
-
-void signal_instance_free(void* self)
-{
-    PyObject *pySelf = reinterpret_cast<PyObject*>(self);
-    SignalInstanceData *data = reinterpret_cast<SignalInstanceData*>(self);
-
-    free(data->signalName);
-    free(data->signature);
-
-    while(data) {
-        Py_XDECREF(data->next);
-        data = reinterpret_cast<SignalInstanceData*>(data->next);
-    }
-    pySelf->ob_type->tp_base->tp_free(self);
-}
-
-void signal_instance_initialize(PyObject* instance, PyObject* name, SignalData* data, PyObject* source, int index)
-{
-    SignalInstanceData *self = reinterpret_cast<SignalInstanceData*>(instance);
-    self->next = 0;
-    if (data->signalName)
-        self->signalName = strdup(data->signalName);
-    else
-        self->signalName = strdup(PyString_AsString(name));
-
-    self->source = source;
-    self->signature = signal_build_signature(self->signalName, data->signatures[index]);
-    index++;
-
-    if (index < data->signaturesSize) {
-        self->next = reinterpret_cast<PyObject*>(PyObject_New(SignalInstanceData, &SignalInstance_Type));
-        signal_instance_initialize(self->next, name, data, source, index);
-    }
-}
-
-PyObject* signal_instance_connect(PyObject* self, PyObject* args, PyObject* kwds)
-{
-    PyObject *slot = 0;
-    PyObject *type = 0;
-    static const char *kwlist[] = {"slot", "type", 0};
-
-    if (!PyArg_ParseTupleAndKeywords(args, kwds,
-                                     "O|O:"SIGNAL_CLASS_NAME, (char**) kwlist, &slot, &type))
-        return 0;
-
-    SignalInstanceData *source = reinterpret_cast<SignalInstanceData*>(self);
-    Shiboken::AutoDecRef pyArgs(PyList_New(0));
-
-    bool match = false;
-    if (slot->ob_type == &SignalInstance_Type) {
-        SignalInstanceData *sourceWalk = source;
-        SignalInstanceData *targetWalk;
-
-        //find best match
-        while(sourceWalk && !match) {
-            targetWalk = reinterpret_cast<SignalInstanceData*>(slot);
-            while(targetWalk && !match) {
-                if (QMetaObject::checkConnectArgs(sourceWalk->signature, targetWalk->signature)) {
-                    PyList_Append(pyArgs, sourceWalk->source);
-                    Shiboken::AutoDecRef sourceSignature(signal_build_qt_compatible(sourceWalk->signature));
-                    PyList_Append(pyArgs, sourceSignature);
-
-                    PyList_Append(pyArgs, targetWalk->source);
-                    Shiboken::AutoDecRef targetSignature(signal_build_qt_compatible(targetWalk->signature));
-                    PyList_Append(pyArgs, targetSignature);
-
-                    match = true;
-                }
-                targetWalk = reinterpret_cast<SignalInstanceData*>(targetWalk->next);
-            }
-            sourceWalk = reinterpret_cast<SignalInstanceData*>(sourceWalk->next);
-        }
-    } else {
-        //try the first signature
-        PyList_Append(pyArgs, source->source);
-        Shiboken::AutoDecRef signature(signal_build_qt_compatible(source->signature));
-        PyList_Append(pyArgs, signature);
-
-        PyList_Append(pyArgs, slot);
-        match = true;
-    }
-
-    if (type)
-        PyList_Append(pyArgs, type);
-
-    if (match) {
-        Shiboken::AutoDecRef tupleArgs(PyList_AsTuple(pyArgs));
-        Shiboken::AutoDecRef pyMethod(PyObject_GetAttrString(source->source, "connect"));
-        return  PyObject_CallObject(pyMethod, tupleArgs);
-    }
-
-    return 0;
-}
-
-PyObject* signal_instance_disconnect(PyObject* self, PyObject* args)
-{
-    SignalInstanceData *source = reinterpret_cast<SignalInstanceData*>(self);
-    Shiboken::AutoDecRef pyArgs(PyList_New(0));
-
-    PyObject *slot;
-    if PyTuple_Check(args)
-        slot = PyTuple_GET_ITEM(args, 0);
-    else
-        slot = args;
-
-    bool match = false;
-    if (slot->ob_type == &SignalInstance_Type) {
-        SignalInstanceData *target = reinterpret_cast<SignalInstanceData*>(slot);
-        if (QMetaObject::checkConnectArgs(source->signature, target->signature)) {
-            PyList_Append(pyArgs, source->source);
-            Shiboken::AutoDecRef source_signature(signal_build_qt_compatible(source->signature));
-            PyList_Append(pyArgs, source_signature);
-
-            PyList_Append(pyArgs, target->source);
-            Shiboken::AutoDecRef target_signature(signal_build_qt_compatible(target->signature));
-            PyList_Append(pyArgs, target_signature);
-            match = true;
-        }
-    } else {
-        //try the first signature
-        PyList_Append(pyArgs, source->source);
-        Shiboken::AutoDecRef signature(signal_build_qt_compatible(source->signature));
-        PyList_Append(pyArgs, signature);
-
-        PyList_Append(pyArgs, slot);
-        match = true;
-    }
-
-    if (match) {
-        Shiboken::AutoDecRef tupleArgs(PyList_AsTuple(pyArgs));
-        Shiboken::AutoDecRef pyMethod(PyObject_GetAttrString(source->source, "disconnect"));
-        return  PyObject_CallObject(pyMethod, tupleArgs);
-    }
-
-    return 0;
-}
-
-PyObject* signal_instance_emit(PyObject* self, PyObject* args)
-{
-    SignalInstanceData *source = reinterpret_cast<SignalInstanceData*>(self);
-
-    Shiboken::AutoDecRef pyArgs(PyList_New(0));
-    Shiboken::AutoDecRef source_signature(signal_build_qt_compatible(source->signature));
-
-    PyList_Append(pyArgs, source_signature);
-    for(Py_ssize_t i=0, i_max=PyTuple_Size(args); i < i_max; i++)
-        PyList_Append(pyArgs, PyTuple_GetItem(args, i));
-
-    Shiboken::AutoDecRef pyMethod(PyObject_GetAttrString(source->source, "emit"));
-
-    Shiboken::AutoDecRef tupleArgs(PyList_AsTuple(pyArgs));
-    return PyObject_CallObject(pyMethod, tupleArgs);
-}
-
-PyObject* signalNew(const char* name, ...)
-{
-    va_list listSignatures;
-    char* sig = 0;
-    SignalData* self = PyObject_New(SignalData, &Signal_Type);
-    self->signalName = strdup(name);
-    self->signaturesSize = 0;
-    self->signatures = 0;
-    self->initialized = 0;
-
-    va_start(listSignatures, name);
-    sig = va_arg(listSignatures, char*);
-
-    while(sig != NULL) {
-        signal_append_signature(self, strdup(sig));
-        sig = va_arg(listSignatures, char*);
-    }
-
-    va_end(listSignatures);
-
-    return reinterpret_cast<PyObject*>(self);
-}
-
-
-PyObject* signal_build_qt_compatible(const char* signature)
-{
-    char* qtSignature;
-    qtSignature = reinterpret_cast<char*>(malloc(strlen(signature)+2));
-    sprintf(qtSignature, QT_SIGNAL_SENTINEL"%s", signature);
-    PyObject* ret = PyString_FromString(qtSignature);
-    free(qtSignature);
-    return ret;
-}
-
-
-} //namespace PySide
diff --git a/libpyside/qsignal.h b/libpyside/qsignal.h
deleted file mode 100644
index 63eded1..0000000
--- a/libpyside/qsignal.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * This file is part of the Shiboken Python Bindings Generator project.
- *
- * Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
- *
- * Contact: PySide team <contact@pyside.org>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * version 2.1 as published by the Free Software Foundation. Please
- * review the following information to ensure the GNU Lesser General
- * Public License version 2.1 requirements will be met:
- * http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
- *
- * As a special exception to the GNU Lesser General Public License
- * version 2.1, the object code form of a "work that uses the Library"
- * may incorporate material from a header file that is part of the
- * Library.  You may distribute such object code under terms of your
- * choice, provided that the incorporated material (i) does not exceed
- * more than 5% of the total size of the Library; and (ii) is limited to
- * numerical parameters, data structure layouts, accessors, macros,
- * inline functions and templates.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
-#ifndef PYSIDE_SIGNAL_H
-#define PYSIDE_SIGNAL_H
-
-#include <pysidemacros.h>
-#include <Python.h>
-#include <QObject>
-
-namespace PySide
-{
-
-typedef struct {
-    PyObject_HEAD
-    char* signalName;
-    char* signature;
-    PyObject* source;
-    PyObject* next;
-} SignalInstanceData;
-
-
-extern "C"
-{
-    PyAPI_DATA(PyTypeObject) Signal_Type;
-    PyAPI_DATA(PyTypeObject) SignalInstance_Type;
-}; //extern "C"
-
-PYSIDE_API PyAPI_FUNC(PyObject*) signalNew(const char* name, ...);
-PYSIDE_API void signalUpdateSource(PyObject* source);
-
-} //namespace PySide
-
-#endif
diff --git a/libpyside/signalmanager.cpp b/libpyside/signalmanager.cpp
index f1b39b9..81ce14d 100644
--- a/libpyside/signalmanager.cpp
+++ b/libpyside/signalmanager.cpp
@@ -1,38 +1,32 @@
 /*
-* This file is part of the Shiboken Python Bindings Generator project.
+* This file is part of the PySide project.
 *
-* Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (C) 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
 *
 * Contact: PySide team <contact@pyside.org>
 *
-* This program is free software; you can redistribute it and/or
-* modify it under the terms of the GNU Lesser General Public License
-* version 2.1 as published by the Free Software Foundation. Please
-* review the following information to ensure the GNU Lesser General
-* Public License version 2.1 requirements will be met:
-* http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+* This library is free software; you can redistribute it and/or
+* modify it under the terms of the GNU Lesser General Public
+* License as published by the Free Software Foundation; either
+* version 2.1 of the License, or (at your option) any later version.
 *
-* As a special exception to the GNU Lesser General Public License
-* version 2.1, the object code form of a "work that uses the Library"
-* may incorporate material from a header file that is part of the
-* Library.  You may distribute such object code under terms of your
-* choice, provided that the incorporated material (i) does not exceed
-* more than 5% of the total size of the Library; and (ii) is limited to
-* numerical parameters, data structure layouts, accessors, macros,
-* inline functions and templates.
-*
-* This program is distributed in the hope that it will be useful, but
-* WITHOUT ANY WARRANTY; without even the implied warranty of
+* This library is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 * Lesser General Public License for more details.
 *
 * You should have received a copy of the GNU Lesser General Public
-* License along with this program; if not, write to the Free Software
-* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA
+* License along with this library; if not, write to the Free Software
+* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
 #include "signalmanager.h"
+#include "pysidesignal.h"
+#include "pysideproperty.h"
+#include "pysideproperty_p.h"
+#include "pyside.h"
+#include "dynamicqmetaobject.h"
+#include "pysidemetafunction_p.h"
 
 #include <QHash>
 #include <QStringList>
@@ -41,8 +35,10 @@
 #include <gilstate.h>
 #include <QDebug>
 #include <limits>
+#include <algorithm>
 #include <typeresolver.h>
 #include <basewrapper.h>
+#include <sbkconverter.h>
 #include <conversions.h>
 
 #if QSLOT_CODE != 1 || QSIGNAL_CODE != 2
@@ -50,149 +46,202 @@
 #endif
 #define PYSIDE_SLOT '1'
 #define PYSIDE_SIGNAL '2'
+#include "globalreceiverv2.h"
 #include "globalreceiver.h"
 
 #define PYTHON_TYPE "PyObject"
 
+namespace {
+    static PyObject *metaObjectAttr = 0;
 
-// Use this to wrap PyObject during the Signal/Slot handling
-struct PyObjectWrapper
+    static int callMethod(QObject* object, int id, void** args);
+    static PyObject* parseArguments(const QList< QByteArray >& paramTypes, void** args);
+    static bool emitShortCircuitSignal(QObject* source, int signalIndex, PyObject* args);
+
+#ifdef IS_PY3K
+    static void destroyMetaObject(PyObject* obj)
+    {
+        delete reinterpret_cast<PySide::DynamicQMetaObject*>(PyCapsule_GetPointer(obj, 0));
+    }
+
+#else
+    static void destroyMetaObject(void* obj)
+    {
+        delete reinterpret_cast<PySide::DynamicQMetaObject*>(obj);
+    }
+#endif
+}
+
+namespace PySide {
+
+
+PyObjectWrapper::PyObjectWrapper()
+    :m_me(Py_None)
 {
-    PyObject* m_me;
-    PyObjectWrapper(const PyObjectWrapper &other) : m_me(other.m_me) {}
-    PyObjectWrapper(PyObject* me) : m_me(me) { Py_INCREF(m_me); }
-    PyObjectWrapper() : m_me(Py_None) {}
-    operator PyObject*() const { return m_me; }
-};
+    Py_INCREF(m_me);
+}
 
-Q_DECLARE_METATYPE(PyObjectWrapper)
+PyObjectWrapper::PyObjectWrapper(PyObject* me)
+    : m_me(me)
+{
+    Py_INCREF(m_me);
+}
+
+PyObjectWrapper::PyObjectWrapper(const PyObjectWrapper &other)
+    : m_me(other.m_me)
+{
+    Py_INCREF(m_me);
+}
+
+PyObjectWrapper::~PyObjectWrapper()
+{
+    Shiboken::GilState gil;
+    Py_DECREF(m_me);
+}
+
+PyObjectWrapper& PyObjectWrapper::operator=(const PySide::PyObjectWrapper& other)
+{
+    Py_INCREF(other.m_me);
+    Py_DECREF(m_me);
+    m_me = other.m_me;
+    return *this;
+}
+
+PyObjectWrapper::operator PyObject*() const
+{
+    return m_me;
+}
+
+QDataStream &operator<<(QDataStream& out, const PyObjectWrapper& myObj)
+{
+    if (Py_IsInitialized() == 0) {
+        qWarning() << "Stream operator for PyObject called without python interpreter.";
+        return out;
+    }
+
+    static PyObject *reduce_func  = 0;
+
+    Shiboken::GilState gil;
+    if (!reduce_func) {
+        Shiboken::AutoDecRef pickleModule(PyImport_ImportModule("pickle"));
+        reduce_func = PyObject_GetAttrString(pickleModule, "dumps");
+    }
+    Shiboken::AutoDecRef repr(PyObject_CallFunctionObjArgs(reduce_func, (PyObject*)myObj, NULL));
+    if (repr.object()) {
+        const char* buff = 0;
+        Py_ssize_t size  = 0;
+        if (PyBytes_Check(repr.object())) {
+            buff = PyBytes_AS_STRING(repr.object());
+            size = PyBytes_GET_SIZE(repr.object());
+        } else if (Shiboken::String::check(repr.object())) {
+            buff = Shiboken::String::toCString(repr.object());
+            size = Shiboken::String::len(repr.object());
+        }
+        QByteArray data(buff, size);
+        out << data;
+    }
+    return out;
+}
+
+QDataStream &operator>>(QDataStream& in, PyObjectWrapper& myObj)
+{
+    if (Py_IsInitialized() == 0) {
+        qWarning() << "Stream operator for PyObject called without python interpreter.";
+        return in;
+    }
+
+    static PyObject *eval_func  = 0;
+
+    Shiboken::GilState gil;
+    if (!eval_func) {
+        Shiboken::AutoDecRef pickleModule(PyImport_ImportModule("pickle"));
+        eval_func = PyObject_GetAttrString(pickleModule, "loads");
+    }
+
+    QByteArray repr;
+    in >> repr;
+    Shiboken::AutoDecRef pyCode(PyBytes_FromStringAndSize(repr.data(), repr.size()));
+    Shiboken::AutoDecRef value(PyObject_CallFunctionObjArgs(eval_func, pyCode.object(), 0));
+    if (!value.object()) {
+        value = Py_None;
+    }
+    myObj = PyObjectWrapper(value);
+    return in;
+}
+
+};
 
 namespace Shiboken {
 
 template<>
-struct Converter<PyObjectWrapper>
+struct Converter<PySide::PyObjectWrapper>
 {
-    static PyObjectWrapper toCpp(PyObject* obj)
+    static PySide::PyObjectWrapper toCpp(PyObject* obj)
     {
-        return PyObjectWrapper(obj);
+        return PySide::PyObjectWrapper(obj);
     }
 
     static PyObject* toPython(void* obj)
     {
-        return toPython(*reinterpret_cast<PyObjectWrapper*>(obj));
+        return toPython(*reinterpret_cast<PySide::PyObjectWrapper*>(obj));
     }
 
-    static PyObject* toPython(const PyObjectWrapper& obj)
+    static PyObject* toPython(const PySide::PyObjectWrapper& obj)
     {
+        Py_INCREF((PyObject*)obj);
         return obj;
     }
 };
 
 };
 
-
 using namespace PySide;
 
-bool PySide::isSignal(const char* signal)
-{
-    return signal[0] == PYSIDE_SIGNAL;
-}
-
-bool PySide::checkSignal(const char* signal)
-{
-    if (signal[0] != PYSIDE_SIGNAL) {
-        PyErr_SetString(PyExc_TypeError, "Use the function PySide.QtCore.SIGNAL on signals");
-        return false;
-    }
-    return true;
-}
-
-static QString codeCallbackName(PyObject* callback, const QString& funcName)
-{
-    if (PyMethod_Check(callback)) {
-        PyObject *self = PyMethod_GET_SELF(callback);
-        PyObject *func = PyMethod_GET_FUNCTION(callback);
-        return funcName + QString::number(quint64(self), 16) + QString::number(quint64(func), 16);
-    } else
-        return funcName+QString::number(quint64(callback), 16);
-}
-
-QString PySide::getCallbackSignature(const char* signal, PyObject* callback, bool encodeName)
-{
-    QString functionName;
-    int numArgs = -1;
-    bool useSelf = false;
-
-    bool isMethod = PyMethod_Check(callback);
-    bool isFunction = PyFunction_Check(callback);
-
-    if (isMethod || isFunction) {
-        PyObject* function = isMethod ? PyMethod_GET_FUNCTION(callback) : callback;
-        PyCodeObject* objCode = reinterpret_cast<PyCodeObject*>(PyFunction_GET_CODE(function));
-        functionName = PyString_AS_STRING(objCode->co_name);
-        useSelf = isMethod;
-        numArgs = objCode->co_flags & CO_VARARGS ? -1 : objCode->co_argcount;
-    } else if (PyCFunction_Check(callback)) {
-        functionName = ((PyCFunctionObject*)callback)->m_ml->ml_name;
-        useSelf = ((PyCFunctionObject*)callback)->m_self;
-        int flags = ((PyCFunctionObject*)callback)->m_ml->ml_flags;
-        if (flags & METH_O)
-            numArgs = 1;
-        else if (flags & METH_VARARGS)
-            numArgs = -1;
-        else if (flags & METH_NOARGS)
-            numArgs = 0;
-    } else if (PyCallable_Check(callback)) {
-        functionName = "__callback"+QString::number((size_t)callback);
-    }
-    Q_ASSERT(!functionName.isEmpty());
-
-    QString signature;
-    if (encodeName)
-        signature = codeCallbackName(callback, functionName);
-    else
-        signature = functionName;
-
-    bool isShortCircuit;
-    QStringList args = getArgsFromSignature(signal, &isShortCircuit);
-
-    if (!isShortCircuit) {
-        signature.append('(');
-        if (numArgs == -1)
-            numArgs = std::numeric_limits<int>::max();
-        while (args.count() && args.count() > numArgs - useSelf) {
-            args.removeLast();
-        }
-        signature.append(args.join(","));
-        signature.append(')');
-    }
-    return signature;
-}
-
-QStringList PySide::getArgsFromSignature(const char* signature, bool* isShortCircuit)
-{
-    QString qsignature(signature);
-    QStringList result;
-    QRegExp splitRegex("\\s*,\\s*");
-
-    if (isShortCircuit)
-        *isShortCircuit = !qsignature.contains('(');
-    if (qsignature.contains("()") || qsignature.contains("(void)")) {
-        return result;
-    } else if (qsignature.contains('(')) {
-        static QRegExp regex(".+\\((.*)\\)");
-        //get args types
-        QString types = qsignature.replace(regex, "\\1");
-        result = types.split(splitRegex);
-    }
-    return result;
-}
-
 struct SignalManager::SignalManagerPrivate
 {
+    SharedMap m_globalReceivers;
+
+    //Deprecated
     GlobalReceiver m_globalReceiver;
+
+    SignalManagerPrivate()
+    {
+        m_globalReceivers = SharedMap( new QMap<QByteArray, GlobalReceiverV2*>() );
+    }
+
+    ~SignalManagerPrivate()
+    {
+        if (!m_globalReceivers.isNull()) {
+            QList<GlobalReceiverV2*> values = m_globalReceivers->values();
+            m_globalReceivers->clear();
+            if (values.size()) {
+                qDeleteAll(values);
+            }
+        }
+    }
 };
 
+static void clearSignalManager()
+{
+    PySide::SignalManager::instance().clear();
+}
+
+static void PyObject_PythonToCpp_PyObject_PTR(PyObject* pyIn, void* cppOut)
+{
+    *((PyObject**)cppOut) = pyIn;
+}
+static PythonToCppFunc is_PyObject_PythonToCpp_PyObject_PTR_Convertible(PyObject* pyIn)
+{
+    return PyObject_PythonToCpp_PyObject_PTR;
+}
+static PyObject* PyObject_PTR_CppToPython_PyObject(const void* cppIn)
+{
+    PyObject* pyOut = (PyObject*)cppIn;
+    if (pyOut)
+        Py_INCREF(pyOut);
+    return pyOut;
+}
+
 SignalManager::SignalManager() : m_d(new SignalManagerPrivate)
 {
     // Register Qt primitive typedefs used on signals.
@@ -200,25 +249,22 @@ SignalManager::SignalManager() : m_d(new SignalManagerPrivate)
 
     // Register PyObject type to use in queued signal and slot connections
     qRegisterMetaType<PyObjectWrapper>(PYTHON_TYPE);
+    qRegisterMetaTypeStreamOperators<PyObjectWrapper>(PYTHON_TYPE);
+    qRegisterMetaTypeStreamOperators<PyObjectWrapper>("PyObjectWrapper");
+    qRegisterMetaTypeStreamOperators<PyObjectWrapper>("PySide::PyObjectWrapper");
 
-    TypeResolver::createValueTypeResolver<PyObjectWrapper>(PYTHON_TYPE);
-    TypeResolver::createValueTypeResolver<qint8>("qint8");
-    TypeResolver::createValueTypeResolver<qint16>("qint16");
-    TypeResolver::createValueTypeResolver<qint32>("qint32");
-    TypeResolver::createValueTypeResolver<qint64>("qint64");
-    TypeResolver::createValueTypeResolver<qlonglong>("qlonglong");
-    TypeResolver::createValueTypeResolver<qptrdiff>("qptrdiff");
-    TypeResolver::createValueTypeResolver<qreal>("qreal");
-    TypeResolver::createValueTypeResolver<quint8>("quint8");
-    TypeResolver::createValueTypeResolver<quint16>("quint16");
-    TypeResolver::createValueTypeResolver<quint32>("quint32");
-    TypeResolver::createValueTypeResolver<quint64>("quint64");
-    TypeResolver::createValueTypeResolver<quintptr>("quintptr");
-    TypeResolver::createValueTypeResolver<qulonglong>("qulonglong");
-    TypeResolver::createValueTypeResolver<uchar>("uchar");
-    TypeResolver::createValueTypeResolver<uint>("uint");
-    TypeResolver::createValueTypeResolver<ulong>("ulong");
-    TypeResolver::createValueTypeResolver<ushort>("ushort");
+    SbkConverter* converter = Shiboken::Conversions::createConverter(&PyBaseObject_Type, 0);
+    Shiboken::Conversions::setCppPointerToPythonFunction(converter, PyObject_PTR_CppToPython_PyObject);
+    Shiboken::Conversions::setPythonToCppPointerFunctions(converter, PyObject_PythonToCpp_PyObject_PTR, is_PyObject_PythonToCpp_PyObject_PTR_Convertible);
+    Shiboken::Conversions::registerConverterName(converter, PYTHON_TYPE);
+    Shiboken::Conversions::registerConverterName(converter, "object");
+    Shiboken::Conversions::registerConverterName(converter, "PyObjectWrapper");
+    Shiboken::Conversions::registerConverterName(converter, "PySide::PyObjectWrapper");
+
+    PySide::registerCleanupFunction(clearSignalManager);
+
+    if (!metaObjectAttr)
+        metaObjectAttr = Shiboken::String::fromCString("__METAOBJECT__");
 }
 
 void SignalManager::clear()
@@ -255,138 +301,302 @@ void SignalManager::globalReceiverDisconnectNotify(QObject* source, int slotInde
 
 void SignalManager::addGlobalSlot(const char* slot, PyObject* callback)
 {
-    m_d->m_globalReceiver.addSlot(slot, callback);
+    addGlobalSlotGetIndex(slot, callback);
 }
 
-static bool emitShortCircuitSignal(QObject* source, int signalIndex, PyObject* args)
+int SignalManager::addGlobalSlotGetIndex(const char* slot, PyObject* callback)
 {
-    void* signalArgs[2] = {0, args};
-    QMetaObject::activate(source, signalIndex, signalArgs);
-    return true;
+    return m_d->m_globalReceiver.addSlot(slot, callback);
 }
 
-static bool emitNormalSignal(QObject* source, int signalIndex, const char* signal, PyObject* args, const QStringList& argTypes)
+QObject* SignalManager::globalReceiver(QObject *sender, PyObject *callback)
 {
-    Shiboken::AutoDecRef sequence(PySequence_Fast(args, 0));
-    int argsGiven = PySequence_Fast_GET_SIZE(sequence.object());
-    if (argsGiven > argTypes.count()) {
-        PyErr_Format(PyExc_TypeError, "%s only accepts %d arguments, %d given!", signal, argTypes.count(), argsGiven);
-        return false;
-    }
-
-    void** signalArgs = new void*[argsGiven+1];
-    signalArgs[0] = 0;
-
-    int i;
-    for (i = 0; i < argsGiven; ++i) {
-        Shiboken::TypeResolver* typeResolver = Shiboken::TypeResolver::get(qPrintable(argTypes[i]));
-        if (typeResolver) {
-            signalArgs[i+1] = typeResolver->toCpp(PySequence_Fast_GET_ITEM(sequence.object(), i));
-        } else {
-            PyErr_Format(PyExc_TypeError, "Unknown type used to emit a signal: %s", qPrintable(argTypes[i]));
-            break;
+    SharedMap globalReceivers = m_d->m_globalReceivers;
+    QByteArray hash = GlobalReceiverV2::hash(callback);
+    GlobalReceiverV2* gr = 0;
+    if (!globalReceivers->contains(hash)) {
+        gr = (*globalReceivers)[hash] = new GlobalReceiverV2(callback, globalReceivers);
+        if (sender) {
+            gr->incRef(sender); // create a link reference
+            gr->decRef(); // remove extra reference
         }
+    } else {
+        gr = (*globalReceivers)[hash];
+        if (sender)
+            gr->incRef(sender);
     }
 
-    bool ok = i == argsGiven;
-    if (ok)
-        QMetaObject::activate(source, signalIndex, signalArgs);
+    return reinterpret_cast<QObject*>(gr);
+}
 
-    // FIXME: This will cause troubles with non-direct connections.
-    for (int j = 0; j < i; ++j)
-        Shiboken::TypeResolver::get(qPrintable(argTypes[j]))->deleteObject(signalArgs[j+1]);
+int SignalManager::countConnectionsWith(const QObject *object)
+{
+    int count = 0;
+    foreach(GlobalReceiverV2* g, m_d->m_globalReceivers->values()) {
+        if (g->refCount(object))
+            count++;
+    }
+    return count;
+}
 
-    delete[] signalArgs;
+void SignalManager::notifyGlobalReceiver(QObject* receiver)
+{
+    reinterpret_cast<GlobalReceiverV2*>(receiver)->notify();
+}
 
-    return ok;
+void SignalManager::releaseGlobalReceiver(const QObject* source, QObject* receiver)
+{
+    GlobalReceiverV2* gr = reinterpret_cast<GlobalReceiverV2*>(receiver);
+    gr->decRef(source);
+}
+
+int SignalManager::globalReceiverSlotIndex(QObject* receiver, const char* signature) const
+{
+    return reinterpret_cast<GlobalReceiverV2*>(receiver)->addSlot(signature);
 }
 
 bool SignalManager::emitSignal(QObject* source, const char* signal, PyObject* args)
 {
-    if (!checkSignal(signal))
+    if (!Signal::checkQtSignal(signal))
         return false;
     signal++;
 
     int signalIndex = source->metaObject()->indexOfSignal(signal);
     if (signalIndex != -1) {
-        bool isShortCircuit;
-        QStringList argTypes = getArgsFromSignature(signal, &isShortCircuit);
-
+        // cryptic but works!
+        // if the signature doesn't have a '(' it's a shor circuited signal, i.e. std::find
+        // returned the string null terminator.
+        bool isShortCircuit = !*std::find(signal, signal + std::strlen(signal), '(');
         if (isShortCircuit)
             return emitShortCircuitSignal(source, signalIndex, args);
         else
-            return emitNormalSignal(source, signalIndex, signal, args, argTypes);
+            return MetaFunction::call(source, signalIndex, args);
     }
-    qDebug() << "Signal" << signal << "not found, probably a typo or you are emitting a dynamic signal that has never been used in a connection until now.";
     return false;
 }
 
-int PySide::SignalManager::qt_metacall(QObject* object, QMetaObject::Call call, int id, void** args)
+int SignalManager::qt_metacall(QObject* object, QMetaObject::Call call, int id, void** args)
 {
     const QMetaObject* metaObject = object->metaObject();
-    // only meta method invocation is supported right now.
+    PySideProperty* pp = 0;
+    PyObject* pp_name = 0;
+    QMetaProperty mp;
+    PyObject* pySelf = 0;
+    int methodCount = metaObject->methodCount();
+    int propertyCount = metaObject->propertyCount();
+
     if (call != QMetaObject::InvokeMetaMethod) {
-        qWarning("Only meta method invocation is supported right now by PySide.");
-        return id - metaObject->methodCount();
-    }
-    QMetaMethod method = metaObject->method(id);
+        mp = metaObject->property(id);
+        if (!mp.isValid())
+            return id - methodCount;
 
-    if (method.methodType() == QMetaMethod::Signal) {
-        // emit python signal
-        QMetaObject::activate(object, id, args);
-    } else {
-        // call python slot
         Shiboken::GilState gil;
-
-        QList<QByteArray> paramTypes = method.parameterTypes();
-        PyObject* self = Shiboken::BindingManager::instance().retrieveWrapper(object);
-
-        Shiboken::AutoDecRef preparedArgs(PyTuple_New(paramTypes.count()));
-
-        for (int i = 0, max = paramTypes.count(); i < max; ++i) {
-            PyObject* arg = Shiboken::TypeResolver::get(paramTypes[i].constData())->toPython(args[i+1]);
-            PyTuple_SET_ITEM(preparedArgs.object(), i, arg);
-        }
-
-        QString methodName = method.signature();
-        methodName = methodName.left(methodName.indexOf('('));
-
-        Shiboken::AutoDecRef pyMethod(PyObject_GetAttrString(self, qPrintable(methodName)));
-        if (!pyMethod.isNull()) {
-            Shiboken::AutoDecRef retval(PyObject_CallObject(pyMethod, preparedArgs));
-            if (retval.isNull()) {
-                qWarning() << "Error calling slot" << methodName;
-                PyErr_Print();
-            }
-        } else {
-            qWarning() << "Dynamic slot" << methodName << "not found!";
+        pySelf = (PyObject*)Shiboken::BindingManager::instance().retrieveWrapper(object);
+        Q_ASSERT(pySelf);
+        pp_name = Shiboken::String::fromCString(mp.name());
+        pp = Property::getObject(pySelf, pp_name);
+        if (!pp) {
+            qWarning("Invalid property: %s.", mp.name());
+            Py_XDECREF(pp_name);
+            return id - methodCount;
         }
     }
+
+    switch(call) {
+#ifndef QT_NO_PROPERTIES
+        case QMetaObject::ReadProperty:
+        case QMetaObject::WriteProperty:
+        case QMetaObject::ResetProperty:
+        case QMetaObject::QueryPropertyDesignable:
+        case QMetaObject::QueryPropertyScriptable:
+        case QMetaObject::QueryPropertyStored:
+        case QMetaObject::QueryPropertyEditable:
+        case QMetaObject::QueryPropertyUser:
+            pp->d->metaCallHandler(pp, pySelf, call, args);
+            break;
+#endif
+        case QMetaObject::InvokeMetaMethod:
+            id = callMethod(object, id, args);
+            break;
+
+        default:
+            qWarning("Unsupported meta invocation type.");
+    }
+
+    // WARNING Isn't safe to call any metaObject and/or object methods beyond this point
+    //         because the object can be deleted inside the called slot.
+
+    if (call == QMetaObject::InvokeMetaMethod)
+        id = id - methodCount;
+    else
+        id = id - propertyCount;
+
+    if (pp || pp_name) {
+        Shiboken::GilState gil;
+        Py_XDECREF(pp);
+        Py_XDECREF(pp_name);
+    }
+    return id;
+}
+
+int SignalManager::callPythonMetaMethod(const QMetaMethod& method, void** args, PyObject* pyMethod, bool isShortCuit)
+{
+    Q_ASSERT(pyMethod);
+
+    Shiboken::GilState gil;
+    PyObject* pyArguments = 0;
+
+    if (isShortCuit)
+        pyArguments = reinterpret_cast<PyObject*>(args[1]);
+    else
+        pyArguments = parseArguments(method.parameterTypes(), args);
+
+    if (pyArguments) {
+        Shiboken::AutoDecRef retval(PyObject_CallObject(pyMethod, pyArguments));
+
+        if (!isShortCuit && pyArguments)
+            Py_DECREF(pyArguments);
+
+        if (!retval.isNull() && retval != Py_None && !PyErr_Occurred()) {
+            const char* returnType = method.typeName();
+            if (returnType && std::strcmp("", returnType)) {
+                Shiboken::Conversions::SpecificConverter converter(returnType);
+                if (converter)
+                    converter.toCpp(retval, args[0]);
+                else
+                    PyErr_Format(PyExc_RuntimeError, "Can't find converter for '%s' to call Python meta method.", returnType);
+
+            }
+        }
+    }
+
+    if (PyErr_Occurred())
+        PyErr_Print();
+
     return -1;
 }
 
 bool SignalManager::registerMetaMethod(QObject* source, const char* signature, QMetaMethod::MethodType type)
 {
+    int ret = registerMetaMethodGetIndex(source, signature, type);
+    return (ret != -1);
+}
+
+int SignalManager::registerMetaMethodGetIndex(QObject* source, const char* signature, QMetaMethod::MethodType type)
+{
+    Q_ASSERT(source);
     const QMetaObject* metaObject = source->metaObject();
     int methodIndex = metaObject->indexOfMethod(signature);
     // Create the dynamic signal is needed
     if (methodIndex == -1) {
-        Shiboken::SbkBaseWrapper* self = (Shiboken::SbkBaseWrapper*) Shiboken::BindingManager::instance().retrieveWrapper(source);
-        if (!self->containsCppWrapper) {
-            qWarning() << "You can't add dynamic signals or slots on an object originated from C++.";
-            return false;
+        SbkObject* self = Shiboken::BindingManager::instance().retrieveWrapper(source);
+        if (!Shiboken::Object::hasCppWrapper(self)) {
+            qWarning() << "Invalid Signal signature:" << signature;
+            return -1;
         } else {
-            PySide::DynamicQMetaObject* dynMetaObj = reinterpret_cast<PySide::DynamicQMetaObject*>(const_cast<QMetaObject*>(metaObject));
+            DynamicQMetaObject *dmo = 0;
+            PyObject *pySelf = reinterpret_cast<PyObject*>(self);
+            PyObject* dict = self->ob_dict;
+
+            // Create a instance meta object
+            if (!dict || !PyDict_Contains(dict, metaObjectAttr)) {
+                dmo = new DynamicQMetaObject(pySelf->ob_type, metaObject);
+#ifdef IS_PY3K
+                PyObject* pyDmo = PyCapsule_New(dmo, 0, destroyMetaObject);
+#else
+                PyObject* pyDmo = PyCObject_FromVoidPtr(dmo, destroyMetaObject);
+#endif
+
+                PyObject_SetAttr(pySelf, metaObjectAttr, pyDmo);
+                Py_DECREF(pyDmo);
+            } else {
+                dmo = reinterpret_cast<DynamicQMetaObject*>(const_cast<QMetaObject*>(metaObject));
+            }
+
             if (type == QMetaMethod::Signal)
-                dynMetaObj->addSignal(signature);
+                return dmo->addSignal(signature);
             else
-                dynMetaObj->addSlot(signature);
+                return dmo->addSlot(signature);
         }
     }
-    return true;
+    return methodIndex;
 }
 
 bool SignalManager::hasConnectionWith(const QObject *object)
 {
     return m_d->m_globalReceiver.hasConnectionWith(object);
 }
+
+const QMetaObject* SignalManager::retriveMetaObject(PyObject *self)
+{
+    Shiboken::GilState gil;
+    DynamicQMetaObject *mo = 0;
+    Q_ASSERT(self);
+
+    PyObject* dict = reinterpret_cast<SbkObject*>(self)->ob_dict;
+    if (dict && PyDict_Contains(dict, metaObjectAttr)) {
+        PyObject *pyMo = PyDict_GetItem(dict, metaObjectAttr);
+
+#ifdef IS_PY3K
+        mo = reinterpret_cast<DynamicQMetaObject*>(PyCapsule_GetPointer(pyMo, 0));
+#else
+        mo = reinterpret_cast<DynamicQMetaObject*>(PyCObject_AsVoidPtr(pyMo));
+#endif
+    } else {
+        mo = reinterpret_cast<DynamicQMetaObject*>(Shiboken::Object::getTypeUserData(reinterpret_cast<SbkObject*>(self)));
+    }
+
+    mo->update();
+    return mo;
+}
+
+namespace {
+
+static int callMethod(QObject* object, int id, void** args)
+{
+    const QMetaObject* metaObject = object->metaObject();
+    QMetaMethod method = metaObject->method(id);
+
+    if (method.methodType() == QMetaMethod::Signal) {
+        // emit python signal
+        QMetaObject::activate(object, id, args);
+    } else {
+        Shiboken::GilState gil;
+        PyObject* self = (PyObject*)Shiboken::BindingManager::instance().retrieveWrapper(object);
+        QByteArray methodName = method.signature();
+        methodName = methodName.left(methodName.indexOf('('));
+        Shiboken::AutoDecRef pyMethod(PyObject_GetAttrString(self, methodName));
+        SignalManager::callPythonMetaMethod(method, args, pyMethod, false);
+    }
+    return -1;
+}
+
+
+static PyObject* parseArguments(const QList<QByteArray>& paramTypes, void** args)
+{
+    int argsSize = paramTypes.count();
+    PyObject* preparedArgs = PyTuple_New(argsSize);
+
+    for (int i = 0, max = argsSize; i < max; ++i) {
+        void* data = args[i+1];
+        const char* dataType = paramTypes[i].constData();
+        Shiboken::Conversions::SpecificConverter converter(dataType);
+        if (converter) {
+            PyTuple_SET_ITEM(preparedArgs, i, converter.toPython(data));
+        } else {
+            PyErr_Format(PyExc_TypeError, "Can't call meta function because I have no idea how to handle %s", dataType);
+            Py_DECREF(preparedArgs);
+            return 0;
+        }
+    }
+    return preparedArgs;
+}
+
+static bool emitShortCircuitSignal(QObject* source, int signalIndex, PyObject* args)
+{
+    void* signalArgs[2] = {0, args};
+    source->qt_metacall(QMetaObject::InvokeMetaMethod, signalIndex, signalArgs);
+    return true;
+}
+
+} //namespace
diff --git a/libpyside/signalmanager.h b/libpyside/signalmanager.h
index 233adf1..a464e99 100644
--- a/libpyside/signalmanager.h
+++ b/libpyside/signalmanager.h
@@ -1,80 +1,99 @@
 /*
-* This file is part of the Shiboken Python Bindings Generator project.
+* This file is part of the PySide project.
 *
-* Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (C) 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
 *
 * Contact: PySide team <contact@pyside.org>
 *
-* This program is free software; you can redistribute it and/or
-* modify it under the terms of the GNU Lesser General Public License
-* version 2.1 as published by the Free Software Foundation. Please
-* review the following information to ensure the GNU Lesser General
-* Public License version 2.1 requirements will be met:
-* http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+* This library is free software; you can redistribute it and/or
+* modify it under the terms of the GNU Lesser General Public
+* License as published by the Free Software Foundation; either
+* version 2.1 of the License, or (at your option) any later version.
 *
-* As a special exception to the GNU Lesser General Public License
-* version 2.1, the object code form of a "work that uses the Library"
-* may incorporate material from a header file that is part of the
-* Library.  You may distribute such object code under terms of your
-* choice, provided that the incorporated material (i) does not exceed
-* more than 5% of the total size of the Library; and (ii) is limited to
-* numerical parameters, data structure layouts, accessors, macros,
-* inline functions and templates.
-*
-* This program is distributed in the hope that it will be useful, but
-* WITHOUT ANY WARRANTY; without even the implied warranty of
+* This library is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 * Lesser General Public License for more details.
 *
 * You should have received a copy of the GNU Lesser General Public
-* License along with this program; if not, write to the Free Software
-* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA
+* License along with this library; if not, write to the Free Software
+* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
 #ifndef SIGNALMANAGER_H
 #define SIGNALMANAGER_H
 
 #include "pysidemacros.h"
-#include <Python.h>
+#include <sbkpython.h>
 #include <Qt>
 #include <QStringList>
 #include <QMetaMethod>
+#include <QMetaType>
 
 class QObject;
 
 namespace PySide
 {
 
-PYSIDE_API bool isSignal(const char* signal);
-PYSIDE_API bool checkSignal(const char* signal);
-PYSIDE_API QString getCallbackSignature(const char* signal, PyObject* callback, bool encodeName);
-QStringList getArgsFromSignature(const char* signature, bool* isShortCircuit = 0);
+/// Thin wrapper for PyObject which increases the reference count at the constructor but *NOT* at destructor.
+class PYSIDE_API PyObjectWrapper
+{
+public:
+    PyObjectWrapper();
+    PyObjectWrapper(PyObject* me);
+    PyObjectWrapper(const PyObjectWrapper &other);
+    ~PyObjectWrapper();
+    operator PyObject*() const;
+    PyObjectWrapper& operator=(const PyObjectWrapper &other);
+private:
+    PyObject* m_me;
+    void*     m_data; //future
+};
+
+PYSIDE_API QDataStream &operator<<(QDataStream& out, const PyObjectWrapper& myObj);
+PYSIDE_API QDataStream &operator>>(QDataStream& in, PyObjectWrapper& myObj);
 
 class PYSIDE_API SignalManager
 {
 public:
     static SignalManager& instance();
-    QObject* globalReceiver();
+
+    QObject* globalReceiver(QObject* sender, PyObject* callback);
+    void releaseGlobalReceiver(const QObject* sender, QObject* receiver);
+    int globalReceiverSlotIndex(QObject* sender, const char* slotSignature) const;
+    void notifyGlobalReceiver(QObject* receiver);
+
     bool emitSignal(QObject* source, const char* signal, PyObject* args);
-
     static int qt_metacall(QObject* object, QMetaObject::Call call, int id, void** args);
-    void addGlobalSlot(const char* slot, PyObject* callback);
-
-    void globalReceiverConnectNotify(QObject *sender, int slotIndex);
-    void globalReceiverDisconnectNotify(QObject *sender, int slotIndex);
 
     // Used to register a new signal/slot on QMetaobject of source.
     static bool registerMetaMethod(QObject* source, const char* signature, QMetaMethod::MethodType type);
+    static int registerMetaMethodGetIndex(QObject* source, const char* signature, QMetaMethod::MethodType type);
+
+    // used to discovery metaobject
+    static const QMetaObject* retriveMetaObject(PyObject* self);
 
     // Used to discovery if SignalManager was connected with object "destroyed()" signal.
-    bool hasConnectionWith(const QObject *object);
+    int countConnectionsWith(const QObject *object);
 
     // Disconnect all signals managed by Globalreceiver
     void clear();
+
+    // Utility function to call a python method usign args received in qt_metacall
+    static int callPythonMetaMethod(const QMetaMethod& method, void** args, PyObject* obj, bool isShortCuit);
+
+    PYSIDE_DEPRECATED(QObject* globalReceiver());
+    PYSIDE_DEPRECATED(void addGlobalSlot(const char* slot, PyObject* callback));
+    PYSIDE_DEPRECATED(int addGlobalSlotGetIndex(const char* slot, PyObject* callback));
+
+    PYSIDE_DEPRECATED(void globalReceiverConnectNotify(QObject *sender, int slotIndex));
+    PYSIDE_DEPRECATED(void globalReceiverDisconnectNotify(QObject *sender, int slotIndex));
+    PYSIDE_DEPRECATED(bool hasConnectionWith(const QObject *object));
+
 private:
     struct SignalManagerPrivate;
     SignalManagerPrivate* m_d;
+
     SignalManager();
     ~SignalManager();
 
@@ -84,4 +103,7 @@ private:
 };
 
 }
+
+Q_DECLARE_METATYPE(PySide::PyObjectWrapper)
+
 #endif
diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt
new file mode 100644
index 0000000..a65a421
--- /dev/null
+++ b/plugins/CMakeLists.txt
@@ -0,0 +1,29 @@
+project(plugins)
+
+set(ui_plugin_src
+    customwidgets.cpp
+    customwidget.cpp
+)
+
+set(ui_plugin_moc
+    customwidget.h
+    customwidgets.h
+)
+
+include_directories(${QT_QTDESIGNER_INCLUDE_DIR}
+                    ${SHIBOKEN_INCLUDE_DIR}
+                    ${SHIBOKEN_PYTHON_INCLUDE_DIR})
+
+QT4_WRAP_CPP(MOC_FILES ${ui_plugin_moc})
+add_library(uiplugin STATIC ${ui_plugin_src} ${MOC_FILES})
+add_definitions(-fPIC)
+add_definitions(-DQT_STATICPLUGIN)
+target_link_libraries(uiplugin
+                      ${QT_QTUITOOLS_LIBRARY}
+                      ${SHIBOKEN_LIBRARY}
+                      ${SHIBOKEN_PYTHON_LIBRARY})
+if (CMAKE_BUILD_TYPE STREQUAL "Debug")
+    set(LIBRARY_OUTPUT_SUFFIX ${CMAKE_DEBUG_POSTFIX})
+else()
+    set(LIBRARY_OUTPUT_SUFFIX ${CMAKE_RELEASE_POSTFIX})
+endif()
diff --git a/plugins/customwidget.cpp b/plugins/customwidget.cpp
new file mode 100644
index 0000000..d573ef4
--- /dev/null
+++ b/plugins/customwidget.cpp
@@ -0,0 +1,132 @@
+/*
+ * This file is part of the PySide project.
+ *
+ * Copyright (C) 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
+ *
+ * Contact: PySide team <contact@pyside.org>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+
+#include "customwidget.h"
+
+#include <shiboken.h>
+
+struct PyCustomWidgetPrivate
+{
+    PyObject* pyObject;
+    bool initialized;
+};
+
+PyCustomWidget::PyCustomWidget(PyObject* objectType)
+    : m_data(new PyCustomWidgetPrivate())
+{
+    m_data->pyObject = objectType;
+    m_name = QString(reinterpret_cast<PyTypeObject*>(objectType)->tp_name);
+}
+
+PyCustomWidget::~PyCustomWidget()
+{
+    delete m_data;
+}
+
+bool PyCustomWidget::isContainer() const
+{
+    return false;
+}
+
+bool PyCustomWidget::isInitialized() const
+{
+    return m_data->initialized;
+}
+
+QIcon PyCustomWidget::icon() const
+{
+    return QIcon();
+}
+
+QString PyCustomWidget::domXml() const
+{
+    return QString();
+}
+
+QString PyCustomWidget::group() const
+{
+    return QString();
+}
+
+QString PyCustomWidget::includeFile() const
+{
+    return QString();
+}
+
+QString PyCustomWidget::name() const
+{
+    return m_name;
+}
+
+QString PyCustomWidget::toolTip() const
+{
+    return QString();
+}
+
+QString PyCustomWidget::whatsThis() const
+{
+    return QString();
+}
+
+QWidget* PyCustomWidget::createWidget(QWidget* parent)
+{
+    //Create a python instance and return cpp object
+    PyObject* pyParent;
+    bool unkowParent = false;
+    if (parent) {
+        pyParent = reinterpret_cast<PyObject*>(Shiboken::BindingManager::instance().retrieveWrapper(parent));
+        if (pyParent) {
+            Py_INCREF(pyParent);
+        } else {
+            static Shiboken::Conversions::SpecificConverter converter("QWidget*");
+            pyParent = converter.toPython(&parent);
+            unkowParent = true;
+        }
+    } else {
+        Py_INCREF(Py_None);
+        pyParent = Py_None;
+    }
+
+    Shiboken::AutoDecRef pyArgs(PyTuple_New(1));
+    PyTuple_SET_ITEM(pyArgs, 0, pyParent); //tuple will keep pyParent reference
+
+    //Call python constructor
+    SbkObject* result = reinterpret_cast<SbkObject*>(PyObject_CallObject(m_data->pyObject, pyArgs));
+
+    QWidget* widget = 0;
+    if (result) {
+        if (unkowParent) //if parent does not exists in python, transfer the ownership to cpp
+            Shiboken::Object::releaseOwnership(result);
+        else
+            Shiboken::Object::setParent(pyParent, reinterpret_cast<PyObject*>(result));
+
+        widget = reinterpret_cast<QWidget*>(Shiboken::Object::cppPointer(result, Py_TYPE(result)));
+    }
+
+    return widget;
+}
+
+void PyCustomWidget::initialize(QDesignerFormEditorInterface* core)
+{
+    m_data->initialized = true;
+}
diff --git a/plugins/customwidget.h b/plugins/customwidget.h
new file mode 100644
index 0000000..2f26363
--- /dev/null
+++ b/plugins/customwidget.h
@@ -0,0 +1,58 @@
+/*
+ * This file is part of the PySide project.
+ *
+ * Copyright (C) 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
+ *
+ * Contact: PySide team <contact@pyside.org>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+#ifndef _PY_CUSTOM_WIDGET_H_
+#define _PY_CUSTOM_WIDGET_H_
+
+#include <shiboken.h>
+#include <QtDesigner/QtDesigner>
+#include <QDesignerCustomWidgetInterface>
+
+struct PyCustomWidgetPrivate;
+
+class PyCustomWidget: public QObject, public QDesignerCustomWidgetInterface
+{
+     Q_OBJECT
+     Q_INTERFACES(QDesignerCustomWidgetInterface)
+
+public:
+    PyCustomWidget(PyObject* objectType);
+    ~PyCustomWidget();
+
+    bool isContainer() const;
+    bool isInitialized() const;
+    QIcon icon() const;
+    QString domXml() const;
+    QString group() const;
+    QString includeFile() const;
+    QString name() const;
+    QString toolTip() const;
+    QString whatsThis() const;
+    QWidget *createWidget(QWidget *parent);
+    void initialize(QDesignerFormEditorInterface *core);
+
+private:
+    PyCustomWidgetPrivate* m_data;
+    QString m_name;
+};
+
+#endif
diff --git a/plugins/customwidgets.cpp b/plugins/customwidgets.cpp
new file mode 100644
index 0000000..0c43c5b
--- /dev/null
+++ b/plugins/customwidgets.cpp
@@ -0,0 +1,68 @@
+/*
+ * This file is part of the PySide project.
+ *
+ * Copyright (C) 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
+ *
+ * Contact: PySide team <contact@pyside.org>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+#include "customwidget.h"
+#include "customwidgets.h"
+
+#include <shiboken.h>
+
+struct PyCustomWidgetPrivate
+{
+    PyObject* pyObject;
+    bool initialized;
+};
+
+struct PyCustomWidgetsPrivate
+{
+    QList<QDesignerCustomWidgetInterface*> widgets;
+    ~PyCustomWidgetsPrivate();
+};
+
+
+PyCustomWidgetsPrivate::~PyCustomWidgetsPrivate()
+{
+    foreach(QDesignerCustomWidgetInterface* iface, widgets)
+        delete iface;
+    widgets.clear();
+}
+
+PyCustomWidgets::PyCustomWidgets(QObject *parent)
+    : QObject(parent), m_data(new PyCustomWidgetsPrivate)
+{
+}
+
+PyCustomWidgets::~PyCustomWidgets()
+{
+    delete m_data;
+}
+
+void PyCustomWidgets::registerWidgetType(PyObject* widget)
+{
+    m_data->widgets.append(new PyCustomWidget(widget));
+}
+
+QList<QDesignerCustomWidgetInterface*> PyCustomWidgets::customWidgets() const
+{
+    return m_data->widgets;
+}
+
+Q_EXPORT_STATIC_PLUGIN2(uiplugin, PyCustomWidgets)
diff --git a/plugins/customwidgets.h b/plugins/customwidgets.h
new file mode 100644
index 0000000..b1c4d70
--- /dev/null
+++ b/plugins/customwidgets.h
@@ -0,0 +1,50 @@
+/*
+ * This file is part of the PySide project.
+ *
+ * Copyright (C) 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
+ *
+ * Contact: PySide team <contact@pyside.org>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+#ifndef _PY_CUSTOM_WIDGETS_H_
+#define _PY_CUSTOM_WIDGETS_H_
+
+#include <shiboken.h>
+#include <customwidget.h>
+
+#include <QtDesigner/QtDesigner>
+#include <QtPlugin>
+#include <QDesignerCustomWidgetInterface>
+
+struct PyCustomWidgetsPrivate;
+
+class PyCustomWidgets: public QObject, public QDesignerCustomWidgetCollectionInterface
+{
+    Q_OBJECT
+    Q_INTERFACES(QDesignerCustomWidgetCollectionInterface)
+
+public:
+    PyCustomWidgets(QObject *parent = 0);
+    ~PyCustomWidgets();
+    virtual QList<QDesignerCustomWidgetInterface*> customWidgets() const;
+    void registerWidgetType(PyObject* widget);
+
+private:
+    PyCustomWidgetsPrivate* m_data;
+};
+
+#endif
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index ada5b7a..34e3844 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -1,22 +1,86 @@
+if(CMAKE_VERSION VERSION_LESS 2.8)
+    message("CMake version greater than 2.8 necessary to run tests")
+else()
+    if(NOT CTEST_TESTING_TIMEOUT)
+        set(CTEST_TESTING_TIMEOUT 60)
+    endif()
 
-file(GLOB TEST_FILES */*_test.py)
+   if(WIN32)
+        set(TEST_PYTHONPATH     "${CMAKE_BINARY_DIR};${CMAKE_SOURCE_DIR}/tests/util;${testbinding_BINARY_DIR}")
+        set(TEST_LIBRARY_PATH   "${libpyside_BINARY_DIR};${pysidetest_BINARY_DIR};${SHIBOKEN_INCLUDE_DIR}/../../bin;$ENV{PATH}")
+        set(LIBRARY_PATH_VAR    "PATH")
+        string(REPLACE "\\" "/" TEST_PYTHONPATH "${TEST_PYTHONPATH}")
+        string(REPLACE "\\" "/" TEST_LIBRARY_PATH "${TEST_LIBRARY_PATH}")
 
-set(test_blacklist )
+        string(REPLACE ";" "\\;" TEST_PYTHONPATH "${TEST_PYTHONPATH}")
+        string(REPLACE ";" "\\;" TEST_LIBRARY_PATH "${TEST_LIBRARY_PATH}")
+    else()
+        set(TEST_PYTHONPATH     "${CMAKE_BINARY_DIR}:${CMAKE_SOURCE_DIR}/tests/util:${testbinding_BINARY_DIR}")
+        set(TEST_LIBRARY_PATH   "${libpyside_BINARY_DIR}:${pysidetest_BINARY_DIR}:$ENV{LD_LIBRARY_PATH}")
+        set(LIBRARY_PATH_VAR    "LD_LIBRARY_PATH")
+    endif()
 
-foreach(test_file ${TEST_FILES})
-    string(REGEX MATCH "/([^/]+)//?([^/]+)_test.py" test_name ${test_file} )
-    list(FIND test_blacklist ${CMAKE_MATCH_1}_${CMAKE_MATCH_2} expect_fail)
-    add_test(${CMAKE_MATCH_1}_${CMAKE_MATCH_2} sh
-             ${CMAKE_CURRENT_SOURCE_DIR}/run_test.sh
-             "${pysidebase_BINARY_DIR}:${libpyside_BINARY_DIR}"
-             "${CMAKE_BINARY_DIR}:${CMAKE_CURRENT_SOURCE_DIR}/util"
-             ${PYTHON_EXECUTABLE}
-             ${test_file})
-    set_tests_properties(${CMAKE_MATCH_1}_${CMAKE_MATCH_2} PROPERTIES TIMEOUT 5)
-    if (${expect_fail} GREATER -1)
-        set_tests_properties(${CMAKE_MATCH_1}_${CMAKE_MATCH_2} PROPERTIES WILL_FAIL TRUE)
-    endif(${expect_fail} GREATER -1)
-# Should set python path here
-# Looks like it's fixed in 2.8:
-# http://www.vtk.org/Bug/print_bug_page.php?bug_id=7885
-endforeach(test_file ${TEST_FILES})
+
+    macro(TEST_QT_MODULE var name)
+      if(NOT DISABLE_${name} AND ${var})
+          add_subdirectory(${name})
+      endif()
+    endmacro()
+
+    macro(PYSIDE_TEST)
+        string(REGEX MATCH "/([^/]+)//?([^/]+)\\.py" foo "${CMAKE_CURRENT_SOURCE_DIR}/${ARGV0}" )
+        set(TEST_NAME "${CMAKE_MATCH_1}_${CMAKE_MATCH_2}")
+        if (${ARGC} EQUAL 1)
+            set(EXPECT_TO_FAIL 0)
+        elseif(${ARGC} EQUAL 2)
+            set(EXPECT_TO_FAIL ${ARGV1})
+        else()
+            message(WARNING "Invalid call of macro PYSIDE_TEST")
+        endif()
+        set(TEST_CMD ${XVFB_EXEC} ${SHIBOKEN_PYTHON_INTERPRETER} "${CMAKE_CURRENT_SOURCE_DIR}/${ARGV0}")
+        add_test(${TEST_NAME} ${TEST_CMD})
+        set_tests_properties(${TEST_NAME} PROPERTIES
+                             TIMEOUT ${CTEST_TESTING_TIMEOUT}
+                             WILL_FAIL ${EXPECT_TO_FAIL}
+                             ENVIRONMENT "PYTHONPATH=${TEST_PYTHONPATH};${LIBRARY_PATH_VAR}=${TEST_LIBRARY_PATH}")
+    endmacro()
+
+    # Try to find QtMultimedia
+    # TODO: Remove this hack when cmake support QtMultimedia module
+    if (NOT QT_QTMULTIMEDIA_FOUND AND ${QTVERSION} VERSION_GREATER 4.5.9)
+        find_path(QT_QTMULTIMEDIA_INCLUDE_DIR QtMultimedia
+                PATHS ${QT_HEADERS_DIR}/QtMultimedia
+                    ${QT_LIBRARY_DIR}/QtMultimedia.framework/Headers
+                NO_DEFAULT_PATH)
+        find_library(QT_QTMULTIMEDIA_LIBRARY QtMultimedia PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
+        if (QT_QTMULTIMEDIA_INCLUDE_DIR AND QT_QTMULTIMEDIA_LIBRARY)
+            set(QT_QTMULTIMEDIA_FOUND ON)
+        endif()
+    endif ()
+
+    add_subdirectory(signals)
+    add_subdirectory(pysidetest)
+    TEST_QT_MODULE(QT_QTCORE_FOUND QtCore)
+    TEST_QT_MODULE(QT_QTGUI_FOUND QtGui)
+    TEST_QT_MODULE(QT_QTNETWORK_FOUND QtNetwork)
+    TEST_QT_MODULE(QT_QTWEBKIT_FOUND QtWebKit)
+    TEST_QT_MODULE(QT_QTSVG_FOUND QtSvg)
+    TEST_QT_MODULE(QT_QTXML_FOUND QtXml)
+    TEST_QT_MODULE(QT_QTTEST_FOUND QtTest)
+    TEST_QT_MODULE(QT_QTOPENGL_FOUND QtOpenGL)
+    TEST_QT_MODULE(QT_QTSQL_FOUND QtSql)
+    TEST_QT_MODULE(QT_QTUITOOLS_FOUND QtUiTools)
+    TEST_QT_MODULE(QT_QTHELP_FOUND QtHelp)
+    TEST_QT_MODULE(QT_QTXMLPATTERNS_FOUND QtXmlPatterns)
+    TEST_QT_MODULE(QT_QTMAEMO5_FOUND QtMaemo5)
+    TEST_QT_MODULE(QT_QTSCRIPT_FOUND QtScript)
+    TEST_QT_MODULE(QT_QTSCRIPTTOOLS_FOUND QtScriptTools)
+    TEST_QT_MODULE(QT_QTMULTIMEDIA_FOUND QtMultimedia)
+    TEST_QT_MODULE(QT_PHONON_FOUND phonon)
+    TEST_QT_MODULE(QT_QTDECLARATIVE_FOUND QtDeclarative)
+
+    #platform specific
+    if (ENABLE_MAC)
+        add_subdirectory(mac)
+    endif ()
+endif()
diff --git a/tests/QtCore/CMakeLists.txt b/tests/QtCore/CMakeLists.txt
new file mode 100644
index 0000000..9e49b76
--- /dev/null
+++ b/tests/QtCore/CMakeLists.txt
@@ -0,0 +1,117 @@
+PYSIDE_TEST(bug_278_test.py)
+PYSIDE_TEST(bug_332.py)
+PYSIDE_TEST(bug_408.py)
+PYSIDE_TEST(bug_428.py)
+PYSIDE_TEST(bug_462.py)
+PYSIDE_TEST(bug_505.py)
+PYSIDE_TEST(bug_515.py)
+PYSIDE_TEST(bug_606.py)
+PYSIDE_TEST(bug_656.py)
+PYSIDE_TEST(bug_686.py)
+PYSIDE_TEST(bug_699.py)
+PYSIDE_TEST(bug_706.py)
+PYSIDE_TEST(bug_723.py)
+PYSIDE_TEST(bug_724.py)
+PYSIDE_TEST(bug_820.py)
+PYSIDE_TEST(bug_826.py)
+PYSIDE_TEST(bug_829.py)
+PYSIDE_TEST(bug_835.py)
+PYSIDE_TEST(bug_920.py)
+PYSIDE_TEST(bug_927.py)
+PYSIDE_TEST(bug_931.py)
+PYSIDE_TEST(bug_938.py)
+PYSIDE_TEST(bug_953.py)
+PYSIDE_TEST(bug_987.py)
+PYSIDE_TEST(bug_994.py)
+PYSIDE_TEST(bug_1019.py)
+PYSIDE_TEST(bug_1031.py)
+PYSIDE_TEST(bug_1063.py)
+PYSIDE_TEST(bug_1069.py)
+PYSIDE_TEST(blocking_signals_test.py)
+PYSIDE_TEST(classinfo_test.py)
+PYSIDE_TEST(child_event_test.py)
+PYSIDE_TEST(deepcopy_test.py)
+PYSIDE_TEST(deletelater_test.py)
+PYSIDE_TEST(destroysignal_test.py)
+PYSIDE_TEST(duck_punching_test.py)
+PYSIDE_TEST(hash_test.py)
+PYSIDE_TEST(inherits_test.py)
+PYSIDE_TEST(max_signals.py)
+PYSIDE_TEST(missing_symbols_test.py)
+PYSIDE_TEST(mockclass_test.py)
+PYSIDE_TEST(python_conversion.py)
+PYSIDE_TEST(qabs_test.py)
+PYSIDE_TEST(qabstractfileengine_test.py)
+PYSIDE_TEST(qabstractitemmodel_test.py)
+PYSIDE_TEST(qabstracttransition_test.py)
+PYSIDE_TEST(qanimationgroup_test.py)
+PYSIDE_TEST(qbitarray_test.py)
+PYSIDE_TEST(qbytearray_buffer_protocol_test.py)
+PYSIDE_TEST(qbytearray_concatenation_operator_test.py)
+PYSIDE_TEST(qbytearray_operator_iadd_test.py)
+PYSIDE_TEST(qbytearray_operator_test.py)
+PYSIDE_TEST(qbytearray_test.py)
+PYSIDE_TEST(qcoreapplication_instance_test.py)
+PYSIDE_TEST(qdatastream_test.py)
+PYSIDE_TEST(qdatetime_test.py)
+PYSIDE_TEST(qdate_test.py)
+PYSIDE_TEST(qeasingcurve_test.py)
+PYSIDE_TEST(qenum_test.py)
+PYSIDE_TEST(qevent_test.py)
+PYSIDE_TEST(qfileinfo_test.py)
+PYSIDE_TEST(qfile_test.py)
+PYSIDE_TEST(qflags_test.py)
+PYSIDE_TEST(qinstallmsghandler_test.py)
+PYSIDE_TEST(qlinef_test.py)
+PYSIDE_TEST(qlocale_test.py)
+PYSIDE_TEST(qmetaobject_test.py)
+PYSIDE_TEST(qmodelindex_internalpointer_test.py)
+PYSIDE_TEST(qobject_children_segfault_test.py)
+PYSIDE_TEST(qobject_connect_notify_test.py)
+PYSIDE_TEST(qobject_destructor.py)
+PYSIDE_TEST(qobject_event_filter_test.py)
+PYSIDE_TEST(qobject_inherits_test.py)
+PYSIDE_TEST(qobject_objectproperty_test.py)
+PYSIDE_TEST(qobject_parent_test.py)
+PYSIDE_TEST(qobject_property_test.py)
+PYSIDE_TEST(qobject_protected_methods_test.py)
+PYSIDE_TEST(qobject_test.py)
+PYSIDE_TEST(qobject_timer_event_test.py)
+PYSIDE_TEST(qobject_tr_as_instance_test.py)
+PYSIDE_TEST(qpoint_test.py)
+PYSIDE_TEST(qprocess_test.py)
+PYSIDE_TEST(qproperty_decorator.py)
+PYSIDE_TEST(qrect_test.py)
+PYSIDE_TEST(qregexp_test.py)
+PYSIDE_TEST(qresource_test.py)
+PYSIDE_TEST(qsize_test.py)
+PYSIDE_TEST(qslot_object_test.py)
+PYSIDE_TEST(qsrand_test.py)
+PYSIDE_TEST(qstatemachine_test.py)
+PYSIDE_TEST(qstate_test.py)
+PYSIDE_TEST(qstring_test.py)
+PYSIDE_TEST(qsysinfo_test.py)
+PYSIDE_TEST(qtext_codec_test.py)
+PYSIDE_TEST(qtextstream_test.py)
+PYSIDE_TEST(qthread_prod_cons_test.py)
+PYSIDE_TEST(qthread_signal_test.py)
+PYSIDE_TEST(qthread_test.py)
+PYSIDE_TEST(qtimer_singleshot_test.py)
+PYSIDE_TEST(qtimer_timeout_test.py)
+PYSIDE_TEST(qtnamespace_test.py)
+PYSIDE_TEST(qurl_test.py)
+PYSIDE_TEST(repr_test.py)
+PYSIDE_TEST(setprop_on_ctor_test.py)
+PYSIDE_TEST(staticMetaObject_test.py)
+PYSIDE_TEST(static_method_test.py)
+PYSIDE_TEST(static_protected_methods_test.py)
+PYSIDE_TEST(thread_signals_test.py)
+PYSIDE_TEST(tr_noop_test.py)
+PYSIDE_TEST(translation_test.py)
+PYSIDE_TEST(unaryoperator_test.py)
+PYSIDE_TEST(unicode_test.py)
+PYSIDE_TEST(versioninfo_test.py)
+
+if(X11)
+    PYSIDE_TEST(qhandle_test.py)
+endif()
diff --git a/tests/qtcore/blocking_signals_test.py b/tests/QtCore/blocking_signals_test.py
similarity index 100%
rename from tests/qtcore/blocking_signals_test.py
rename to tests/QtCore/blocking_signals_test.py
diff --git a/tests/QtCore/bug_1019.py b/tests/QtCore/bug_1019.py
new file mode 100644
index 0000000..b7f1f68
--- /dev/null
+++ b/tests/QtCore/bug_1019.py
@@ -0,0 +1,32 @@
+import unittest
+from PySide.QtCore import *
+
+class MyTimer (QTimer):
+    def __init__(self):
+        QTimer.__init__(self)
+        self.startCalled = False
+
+    @Slot()
+    def slotUsedToIncreaseMethodOffset(self):
+        pass
+
+class MyTimer2 (MyTimer):
+
+    @Slot()
+    def slotUsedToIncreaseMethodOffset2(self):
+        pass
+
+    def start(self):
+        self.startCalled = True
+        QCoreApplication.instance().quit()
+
+class TestBug1019 (unittest.TestCase):
+    def testIt(self):
+        app = QCoreApplication([])
+        t = MyTimer2()
+        QTimer.singleShot(0, t.start)
+        app.exec_()
+        self.assertTrue(t.startCalled)
+
+if __name__ == "__main__":
+    unittest.main()
diff --git a/tests/QtCore/bug_1031.py b/tests/QtCore/bug_1031.py
new file mode 100644
index 0000000..b974525
--- /dev/null
+++ b/tests/QtCore/bug_1031.py
@@ -0,0 +1,5 @@
+from PySide.QtCore import QStateMachine, QState
+
+mach = QStateMachine()
+state = QState(mach)
+print(state.machine())
diff --git a/tests/QtCore/bug_1063.py b/tests/QtCore/bug_1063.py
new file mode 100644
index 0000000..fe78730
--- /dev/null
+++ b/tests/QtCore/bug_1063.py
@@ -0,0 +1,30 @@
+''' unit test for BUG #1063 '''
+
+import unittest
+import tempfile
+from PySide import QtCore
+import os
+import py3kcompat as py3k
+
+class QTextStreamTestCase(unittest.TestCase):
+    def setUp(self):
+        self.temp_file = tempfile.NamedTemporaryFile(delete=False)
+        self.temp_file.close()
+        self.f = QtCore.QFile(self.temp_file.name)
+        self.f.open(QtCore.QIODevice.WriteOnly)
+        self.strings = (py3k.unicode_('foo'), py3k.unicode_('bar'))
+        self.stream = QtCore.QTextStream(self.f)
+
+    def testIt(self):
+        for s in self.strings:
+            self.stream << s
+
+        self.f.close()
+
+        # make sure we didn't get an empty file
+        self.assertNotEqual(QtCore.QFile(self.temp_file.name).size(), 0)
+
+        os.unlink(self.temp_file.name)
+
+if __name__ == "__main__":
+    unittest.main()
diff --git a/tests/QtCore/bug_1069.py b/tests/QtCore/bug_1069.py
new file mode 100644
index 0000000..7033e18
--- /dev/null
+++ b/tests/QtCore/bug_1069.py
@@ -0,0 +1,22 @@
+''' unit test for BUG #1069 '''
+
+from PySide import QtCore
+import unittest
+
+class QDataStreamOpOverloadTestCase(unittest.TestCase):
+    def setUp(self):
+        self.ba = QtCore.QByteArray()
+        self.stream = QtCore.QDataStream(self.ba, QtCore.QIODevice.WriteOnly)
+
+    def testIt(self):
+        self.stream << "hello"
+        ok = False
+        for c in self.ba:
+            if c != b'\x00':
+                ok = True
+                break
+
+        self.assertEqual(ok, True)
+
+if __name__ == "__main__":
+    unittest.main()
diff --git a/tests/QtCore/bug_278_test.py b/tests/QtCore/bug_278_test.py
new file mode 100644
index 0000000..28d7b37
--- /dev/null
+++ b/tests/QtCore/bug_278_test.py
@@ -0,0 +1,24 @@
+#!/usr/bin/python
+
+import unittest
+
+from PySide import QtCore
+
+def setValue(o):
+    values = ['Name']
+    o.setProperty('test1', values)
+
+class QQtVersionTest(unittest.TestCase):
+    '''Tests for QVariant conversion of QStringList'''
+
+    def testGet(self):
+        o = QtCore.QObject()
+        setValue(o)
+        self.assertEqual(o.property('test1'), ['Name'])
+
+
+
+if __name__ == '__main__':
+    unittest.main()
+
+
diff --git a/tests/QtCore/bug_332.py b/tests/QtCore/bug_332.py
new file mode 100644
index 0000000..32ff414
--- /dev/null
+++ b/tests/QtCore/bug_332.py
@@ -0,0 +1,18 @@
+#!/usr/bin/python
+
+import unittest
+from PySide import QtCore
+
+class Lock(QtCore.QMutex):
+    def tryLock(self,timeoutt=10):
+        return QtCore.QMutex.tryLock(self,timeoutt)
+
+class TestBug(unittest.TestCase):
+
+    def testCase(self):
+        l = Lock()
+        l.tryLock() # this cause a assertion
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/tests/QtCore/bug_408.py b/tests/QtCore/bug_408.py
new file mode 100644
index 0000000..5827e56
--- /dev/null
+++ b/tests/QtCore/bug_408.py
@@ -0,0 +1,28 @@
+import unittest
+
+from PySide.QtCore import *
+
+class MyDevice(QIODevice):
+    def __init__(self, txt):
+        QIODevice.__init__(self)
+        self.txt = txt
+        self.ptr = 0
+
+    def readData(self, size):
+        size = min(len(self.txt) - self.ptr, size)
+        retval = self.txt[self.ptr:size]
+        self.ptr += size
+        return retval
+
+class QIODeviceTest(unittest.TestCase):
+
+    def testIt(self):
+        device = MyDevice("hello world\nhello again")
+        device.open(QIODevice.ReadOnly)
+
+        s = QTextStream(device)
+        self.assertEqual(s.readLine(), "hello world")
+        self.assertEqual(s.readLine(), "hello again")
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/tests/QtCore/bug_428.py b/tests/QtCore/bug_428.py
new file mode 100644
index 0000000..9816b3e
--- /dev/null
+++ b/tests/QtCore/bug_428.py
@@ -0,0 +1,18 @@
+import unittest
+
+from PySide.QtCore import QObject
+
+class MyBaseObject(QObject):
+    def __init__(self, number):
+        self.myMember = 'myMember' + number
+        QObject.__init__(self)
+
+class QObjectConstructorTest(unittest.TestCase):
+    def testBug(self):
+        for i in range(10):
+            number = str(i)
+            obj = MyBaseObject(number)
+            self.assertEqual(obj.myMember, 'myMember' + number)
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/tests/QtCore/bug_462.py b/tests/QtCore/bug_462.py
new file mode 100644
index 0000000..47ab57a
--- /dev/null
+++ b/tests/QtCore/bug_462.py
@@ -0,0 +1,46 @@
+import unittest
+import sys
+
+from PySide.QtCore import QObject, QCoreApplication, QEvent, QThread
+
+class MyEvent(QEvent):
+    def __init__(self,i):
+        print("TYPE:", type(QEvent.User))
+        super(MyEvent,self).__init__(QEvent.Type(QEvent.User + 100 ))
+        self.i = i
+
+class MyThread (QThread):
+    def __init__(self,owner):
+        super(MyThread,self).__init__()
+        self.owner=owner;
+
+    def run(self):
+        for i in range(3):
+            e=MyEvent(i);
+            QCoreApplication.postEvent(self.owner,e)
+
+class MyBaseObject(QObject):
+    def __init__(self):
+        QObject.__init__(self)
+        self.events = []
+        self.t = MyThread(self)
+        self.t.start()
+
+    def customEvent(self, event):
+        self.events.append(event)
+        if len(self.events) == 3:
+            self.t.wait()
+            self.app.quit()
+
+
+class CheckForEventsTypes(unittest.TestCase):
+    def testTypes(self):
+        o = MyBaseObject()
+        o.app = QCoreApplication(sys.argv)
+        o.app.exec_()
+        for e in o.events:
+            self.assertTrue(isinstance(e, MyEvent))
+        o.app = None
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/tests/QtCore/bug_505.py b/tests/QtCore/bug_505.py
new file mode 100644
index 0000000..5fbaa4f
--- /dev/null
+++ b/tests/QtCore/bug_505.py
@@ -0,0 +1,22 @@
+import unittest
+
+from PySide.QtCore import QObject
+
+class MyBaseObject(QObject):
+    def __init__(self, parent=None):
+        QObject.__init__(self, parent)
+        self.setObjectName("PySide")
+
+    def __del__(self):
+        if self.objectName() != "PySide":
+            raise NameError('Fail')
+
+class CheckForEventsTypes(unittest.TestCase):
+    def testDelObject(self):
+        p = MyBaseObject()
+        o = MyBaseObject(p)
+        del o
+        del p
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/tests/QtCore/bug_515.py b/tests/QtCore/bug_515.py
new file mode 100644
index 0000000..c2bd9c7
--- /dev/null
+++ b/tests/QtCore/bug_515.py
@@ -0,0 +1,18 @@
+""" Unittest for bug #515 """
+""" http://bugs.openbossa.org/show_bug.cgi?id=515 """
+
+from PySide import QtCore
+
+callCleanup = False
+def _cleanup():
+    global callCleanup
+    callCleanup = True
+
+def _checkCleanup():
+    global callCleanup
+    assert(callCleanup)
+
+app = QtCore.QCoreApplication([])
+QtCore.qAddPostRoutine(_cleanup)
+QtCore.qAddPostRoutine(_checkCleanup)
+del app
diff --git a/tests/QtCore/bug_606.py b/tests/QtCore/bug_606.py
new file mode 100644
index 0000000..219b8d9
--- /dev/null
+++ b/tests/QtCore/bug_606.py
@@ -0,0 +1,34 @@
+import unittest
+
+import PySide
+from PySide.QtCore import QPoint, QPointF
+from PySide.QtCore import QLine, QLineF
+from PySide.QtCore import QSize, QSizeF
+
+class testCases(unittest.TestCase):
+    def testQPointToTuple(self):
+        p = QPoint(1, 2)
+        self.assertEqual((1, 2), p.toTuple())
+
+    def testQPointFToTuple(self):
+        p = QPointF(1, 2)
+        self.assertEqual((1, 2), p.toTuple())
+
+    def testQLineToTuple(self):
+        l = QLine(1, 2, 3, 4)
+        self.assertEqual((1, 2, 3, 4), l.toTuple())
+
+    def testQLineFToTuple(self):
+        l = QLineF(1, 2, 3, 4)
+        self.assertEqual((1, 2, 3, 4), l.toTuple())
+
+    def testQSizeToTuple(self):
+        s = QSize(1, 2)
+        self.assertEqual((1, 2), s.toTuple())
+
+    def testQSizeFToTuple(self):
+        s = QSizeF(1, 2)
+        self.assertEqual((1, 2), s.toTuple())
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/tests/QtCore/bug_656.py b/tests/QtCore/bug_656.py
new file mode 100644
index 0000000..ba56174
--- /dev/null
+++ b/tests/QtCore/bug_656.py
@@ -0,0 +1,9 @@
+from PySide.QtCore import *
+
+class CoreApp(QCoreApplication):
+    def __init__(self,*args):
+        super(CoreApp,self).__init__(*args)
+        # It shouldn't crash after the __init__ call
+
+import sys
+app = CoreApp(sys.argv)
diff --git a/tests/QtCore/bug_686.py b/tests/QtCore/bug_686.py
new file mode 100644
index 0000000..984e007
--- /dev/null
+++ b/tests/QtCore/bug_686.py
@@ -0,0 +1,87 @@
+from __future__ import with_statement
+
+import unittest
+from PySide.QtCore import *
+
+class MyWriteThread(QThread):
+    def __init__(self, lock):
+        QThread.__init__(self)
+        self.lock = lock
+        self.started = False
+        self.canQuit = False
+
+    def run(self):
+        self.started = True
+        while not self.lock.tryLockForWrite():
+            pass
+        self.canQuit = True
+
+class MyReadThread(QThread):
+    def __init__(self, lock):
+        QThread.__init__(self)
+        self.lock = lock
+        self.started = False
+        self.canQuit = False
+
+    def run(self):
+        self.started = True
+        while not self.lock.tryLockForRead():
+            pass
+        self.canQuit = True
+
+class MyMutexedThread(QThread):
+    def __init__(self, mutex):
+        QThread.__init__(self)
+        self.mutex = mutex
+        self.started = False
+        self.canQuit = False
+
+    def run(self):
+        self.started = True
+        while not self.mutex.tryLock():
+            pass
+        self.canQuit = True
+
+class TestQMutex (unittest.TestCase):
+
+    def testReadLocker(self):
+        lock = QReadWriteLock()
+        thread = MyWriteThread(lock)
+
+        with QReadLocker(lock):
+            thread.start()
+            while not thread.started:
+                pass
+            self.assertFalse(thread.canQuit)
+
+        thread.wait()
+        self.assertTrue(thread.canQuit)
+
+    def testWriteLocker(self):
+        lock = QReadWriteLock()
+        thread = MyReadThread(lock)
+
+        with QWriteLocker(lock):
+            thread.start()
+            while not thread.started:
+                pass
+            self.assertFalse(thread.canQuit)
+
+        thread.wait()
+        self.assertTrue(thread.canQuit)
+
+    def testMutexLocker(self):
+        mutex = QMutex()
+        thread = MyMutexedThread(mutex)
+
+        with QMutexLocker(mutex):
+            thread.start()
+            while not thread.started:
+                pass
+            self.assertFalse(thread.canQuit)
+
+        thread.wait()
+        self.assertTrue(thread.canQuit)
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/tests/QtCore/bug_699.py b/tests/QtCore/bug_699.py
new file mode 100644
index 0000000..e731b5b
--- /dev/null
+++ b/tests/QtCore/bug_699.py
@@ -0,0 +1,17 @@
+import unittest
+from PySide.QtCore import *
+
+class TestBug699 (unittest.TestCase):
+
+    def defClass(self):
+        class Foo (QObject):
+            def foo(self):
+                pass
+
+            prop = Property(foo, foo)
+
+    def testIt(self):
+        self.assertRaises(TypeError, self.defClass)
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/tests/QtCore/bug_706.py b/tests/QtCore/bug_706.py
new file mode 100644
index 0000000..1825029
--- /dev/null
+++ b/tests/QtCore/bug_706.py
@@ -0,0 +1,27 @@
+import unittest
+
+from PySide.QtCore import *
+
+class MyModel (QAbstractListModel):
+    def rowCount(self, parent = None):
+        return 3
+
+class TestBug706(unittest.TestCase):
+
+    def mySlot(self, idx, start, end):
+        self.start = start
+        self.end = end
+
+    def testIt(self):
+        self.start = None
+        self.end = None
+
+        app = QCoreApplication([])
+        model = MyModel()
+        model.columnsAboutToBeInserted.connect(self.mySlot)
+        model.columnsAboutToBeInserted.emit(QModelIndex(), 0, 1)
+        self.assertEqual(self.start, 0)
+        self.assertEqual(self.end, 1)
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/tests/QtCore/bug_723.py b/tests/QtCore/bug_723.py
new file mode 100644
index 0000000..5bffe56
--- /dev/null
+++ b/tests/QtCore/bug_723.py
@@ -0,0 +1,55 @@
+import unittest
+from PySide.QtCore import *
+
+class MyFileEngine (QAbstractFileEngine):
+
+    def __init__(self):
+        QAbstractFileEngine.__init__(self)
+        self.contents = "Foo \0bar for the win!"
+        self.pos = 0
+
+    def open(self, mode):
+        return True
+
+    def read(self, maxlen):
+        print("Reading... to return ", self.contents[self.pos:maxlen])
+
+        if self.pos > len(self.contents):
+            return -1
+
+        res = self.contents[self.pos:maxlen]
+        self.pos += len(res)
+        return res
+
+    def readLine(self, maxlen):
+        return self.contents[self.pos:maxlen]
+
+class MyFileEngineHandler (QAbstractFileEngineHandler):
+
+    def create(self, fileName):
+        if fileName.startswith("foo:/"):
+            return MyFileEngine()
+        return None
+
+
+class TestBug723 (unittest.TestCase):
+
+    def testIt(self):
+        fh = MyFileEngineHandler()
+
+        f = QFile("foo:/bar")
+
+        print(type(QFile.ReadOnly))
+        v = (QFile.ReadOnly | QFile.Text)
+        print(type(v))
+
+        """
+        assert(f.open(QFile.ReadOnly | QFile.Text))
+        contents = f.readAll()
+        self.assertEqual(contents, "Foo \0bar for the win!")
+        f.close()
+        """
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/tests/QtCore/bug_724.py b/tests/QtCore/bug_724.py
new file mode 100644
index 0000000..75b3718
--- /dev/null
+++ b/tests/QtCore/bug_724.py
@@ -0,0 +1,23 @@
+from PySide.QtCore import QAbstractFileEngine, QIODevice, QFile
+import unittest
+import tempfile
+import os
+import py3kcompat as py3k
+
+class TestBug724 (unittest.TestCase):
+
+    def testIt(self):
+        # creates a temporary file
+        handle, self.filename = tempfile.mkstemp()
+        os.write(handle, py3k.b('a'))
+        os.close(handle)
+
+        engine = QAbstractFileEngine.create(self.filename)
+        engine.open(QIODevice.ReadOnly)
+        memory = engine.map(0, 1, QFile.NoOptions)
+        self.assertEqual(len(memory), 1)
+        self.assertEqual(memory[0], py3k.b('a'))
+        engine.unmap(memory)
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/tests/QtCore/bug_820.py b/tests/QtCore/bug_820.py
new file mode 100644
index 0000000..0e72197
--- /dev/null
+++ b/tests/QtCore/bug_820.py
@@ -0,0 +1,69 @@
+import functools
+import unittest
+
+from PySide.QtCore import QObject, Slot, Signal, SIGNAL
+
+def log_exception():
+    def log_exception_decorator(func):
+        @functools.wraps(func)
+        def wrapper(*args, **kwds):
+            try:
+                return func(*args, **kwds)
+            except Exception:
+                raise
+
+        return wrapper
+
+    return log_exception_decorator
+
+
+def log_exception2():
+    def log_exception_decorator(func):
+        def wrapper(*args, **kwds):
+            try:
+                return func(*args, **kwds)
+            except Exception:
+                raise
+
+        return wrapper
+
+    return log_exception_decorator
+
+class MyObject(QObject):
+
+    def __init__(self, parent=None):
+        QObject.__init__(self, parent)
+        self._mySlotcalled = False
+        self._mySlot2called = False
+
+    @Slot()
+    @log_exception()
+    def mySlot(self):
+        self._mySlotcalled = True
+
+    @Slot(name="mySlot2")
+    @log_exception2()
+    def mySlot2(self):
+        self._mySlot2called = True
+
+    def poke(self):
+        self.events.emit()
+
+    events = Signal()
+
+
+class SlotWithDecoratorTest(unittest.TestCase):
+    def testSlots(self):
+        o = MyObject()
+        self.assert_(o.metaObject().indexOfSlot("mySlot()") > 0)
+        self.assert_(o.metaObject().indexOfSlot("mySlot2()") > 0)
+
+        o.events.connect(o.mySlot)
+        o.events.connect(o.mySlot2)
+        o.poke()
+        self.assertTrue(o._mySlotcalled)
+        self.assertTrue(o._mySlot2called)
+
+if __name__ == '__main__':
+    unittest.main()
+
diff --git a/tests/QtCore/bug_826.py b/tests/QtCore/bug_826.py
new file mode 100644
index 0000000..d04b9f3
--- /dev/null
+++ b/tests/QtCore/bug_826.py
@@ -0,0 +1,29 @@
+from PySide.QtCore import QEvent, Qt
+import PySide
+
+import unittest
+
+TEST_EVENT_TYPE = QEvent.Type(QEvent.registerEventType())
+
+class TestEvent(QEvent):
+    TestEventType = QEvent.Type(QEvent.registerEventType())
+
+    def __init__(self, rand=0):
+        super(TestEvent, self).__init__(TestEvent.TestEventType)
+        self._rand = rand
+
+    def getRand(self):
+        return self._rand
+
+
+class TestEnums(unittest.TestCase):
+    def testUserTypesValues(self):
+        self.assert_(QEvent.User <= int(TestEvent.TestEventType) <= QEvent.MaxUser)
+        self.assert_(QEvent.User <= int(TEST_EVENT_TYPE) <= QEvent.MaxUser)
+
+    def testUserTypesRepr(self):
+        self.assertEqual(eval(repr(TestEvent.TestEventType)), TestEvent.TestEventType)
+        self.assertEqual(eval(repr(TEST_EVENT_TYPE)), TEST_EVENT_TYPE)
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/tests/QtCore/bug_829.py b/tests/QtCore/bug_829.py
new file mode 100644
index 0000000..945d8df
--- /dev/null
+++ b/tests/QtCore/bug_829.py
@@ -0,0 +1,22 @@
+# Test case for PySide bug 829
+# Thomas Perl <thp.io/about>; 2011-04-16
+
+import unittest
+from PySide.QtCore import QSettings
+import tempfile
+
+class QVariantConversions(unittest.TestCase):
+    def testDictionary(self):
+        confFile = tempfile.NamedTemporaryFile(delete=False)
+        s = QSettings(confFile.name, QSettings.IniFormat)
+        # Save value
+        s.setValue('x', {1: 'a'})
+        s.sync()
+        del s
+
+        # Restore value
+        s = QSettings(confFile.name, QSettings.IniFormat)
+        self.assertEqual(s.value('x'), {1: 'a'})
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/tests/QtCore/bug_835.py b/tests/QtCore/bug_835.py
new file mode 100644
index 0000000..42f613f
--- /dev/null
+++ b/tests/QtCore/bug_835.py
@@ -0,0 +1,65 @@
+from PySide.QtCore import *
+
+import unittest
+
+get_counter = 0
+set_counter = 0
+
+class Descriptor(object):
+    def __get__(self, obj, owner):
+        global get_counter
+
+        if not obj:
+            return self
+
+        get_counter += 1
+        return obj.var
+
+    def __set__(self, obj, value):
+        global set_counter
+
+        set_counter += 1
+        obj.var = value
+
+class FooBar(QObject):
+    test = Descriptor()
+    var = 0
+
+class SetAndGetTestCases(unittest.TestCase):
+    def setUp(self):
+        global get_counter
+        global set_counter
+
+        get_counter = 0
+        set_counter = 0
+
+    def testSetMethod(self):
+        global get_counter
+        global set_counter
+
+        f = FooBar()
+
+        f.test = 1
+        self.assertEqual(get_counter, 0)
+        self.assertEqual(set_counter, 1)
+
+        get_counter = 0
+        set_counter = 0
+
+    def testGetMethod(self):
+        global get_counter
+        global set_counter
+
+        f = FooBar()
+        f.test = 1
+        set_counter = 0
+
+        ret = f.test
+        self.assertEqual(get_counter, 1)
+        self.assertEqual(set_counter, 0)
+
+        get_counter = 0
+        set_counter = 0
+
+if __name__ == "__main__":
+    unittest.main()
diff --git a/tests/QtCore/bug_920.py b/tests/QtCore/bug_920.py
new file mode 100644
index 0000000..d7365b9
--- /dev/null
+++ b/tests/QtCore/bug_920.py
@@ -0,0 +1,25 @@
+#!/usr/bin/env python
+
+import sys
+import unittest
+import PySide.QtCore as QtCore
+
+class Signaller(QtCore.QObject):
+    s1 = QtCore.Signal()
+    s2 = QtCore.Signal()
+
+class TestBug920(unittest.TestCase):
+
+    def testIt(self):
+        s = Signaller()
+        s.s1.connect(self.onSignal)
+        s.s2.connect(self.onSignal)
+        self.assertTrue(s.s1.disconnect(self.onSignal))
+        self.assertTrue(s.s2.disconnect(self.onSignal))
+
+    def onSignal(self):
+        pass
+
+
+if __name__ == "__main__":
+    unittest.main()
diff --git a/tests/QtCore/bug_927.py b/tests/QtCore/bug_927.py
new file mode 100644
index 0000000..87fb016
--- /dev/null
+++ b/tests/QtCore/bug_927.py
@@ -0,0 +1,24 @@
+import time
+import unittest
+
+from PySide.QtCore import QTime, QRunnable, QThreadPool
+
+class Task(QRunnable):
+   def run(self):
+       t = QTime()
+       t.start()
+       time.sleep(2) # Sleep 2 seconds
+
+
+class QThreadPoolTest(unittest.TestCase):
+    '''This used to cause a segfault due the ownership control on globalInstance function '''
+    def testSlowJobs(self):
+       for i in range(3):
+           task = Task()
+           QThreadPool.globalInstance().start(task)
+           time.sleep(1) # Sleep 1 second
+
+       QThreadPool.globalInstance().waitForDone()
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/tests/QtCore/bug_931.py b/tests/QtCore/bug_931.py
new file mode 100644
index 0000000..32a33ac
--- /dev/null
+++ b/tests/QtCore/bug_931.py
@@ -0,0 +1,21 @@
+import unittest
+
+from PySide.QtCore import QObject, Signal
+o = QObject()
+class MyObject(QObject):
+    s = Signal(int)
+
+class CheckSignalType(unittest.TestCase):
+    def testSignal(self):
+        self.assertTrue(isinstance(QObject.destroyed, Signal))
+        self.assertEqual(type(QObject.destroyed), Signal)
+
+        self.assertEqual(type(o.destroyed).__name__, "SignalInstance")
+        self.assertNotEqual(type(o.destroyed), Signal)
+
+        self.assertTrue(isinstance(o.destroyed, Signal))
+        self.assertTrue(isinstance(MyObject.s, Signal))
+        self.assertFalse(isinstance(int, Signal))
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/tests/QtCore/bug_938.py b/tests/QtCore/bug_938.py
new file mode 100644
index 0000000..b2ab565
--- /dev/null
+++ b/tests/QtCore/bug_938.py
@@ -0,0 +1,14 @@
+import unittest
+from PySide.QtCore import *
+
+class TestBug938 (unittest.TestCase):
+
+    def testIt(self):
+        b = QBuffer()
+        b.open(QBuffer.WriteOnly)
+        b.write("\x0023\x005")
+        b.close()
+        self.assertEqual(b.buffer().size(), 5)
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/tests/QtCore/bug_953.py b/tests/QtCore/bug_953.py
new file mode 100644
index 0000000..37ef28e
--- /dev/null
+++ b/tests/QtCore/bug_953.py
@@ -0,0 +1,18 @@
+from PySide.QtCore import *
+
+class Dispatcher(QObject):
+    _me = None
+
+    def __init__(self):
+        super(Dispatcher, self).__init__()
+        self._me = self
+        QTimer.singleShot(0, self._finish)
+
+    def _finish(self):
+        del self._me # It can't crash here!
+        QTimer.singleShot(10, QCoreApplication.instance().quit)
+
+if __name__ == '__main__':
+    app = QCoreApplication([])
+    Dispatcher()
+    app.exec_()
diff --git a/tests/QtCore/bug_987.py b/tests/QtCore/bug_987.py
new file mode 100644
index 0000000..9609a45
--- /dev/null
+++ b/tests/QtCore/bug_987.py
@@ -0,0 +1,15 @@
+from PySide.QtCore import QObject
+
+import unittest
+
+
+class TestBug987(unittest.TestCase):
+    def callback(self):
+        pass
+
+    def testInvalidDisconnection(self):
+        o = QObject()
+        self.assertRaises(RuntimeError, o.destroyed.disconnect, self.callback)
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/tests/QtCore/bug_994.py b/tests/QtCore/bug_994.py
new file mode 100644
index 0000000..67070d6
--- /dev/null
+++ b/tests/QtCore/bug_994.py
@@ -0,0 +1,26 @@
+import unittest
+import py3kcompat as py3k
+from PySide.QtCore import QIODevice, QTextStream
+
+
+class MyIODevice (QIODevice):
+    def readData(self, amount):
+        return py3k.b("\0a" * int(amount/2))
+
+    def readLineData(self, maxSize):
+        return py3k.b("\0b" * 4)
+
+    def atEnd(self):
+        return False
+
+class TestBug944 (unittest.TestCase):
+
+    def testIt(self):
+        device = MyIODevice()
+        device.open(QIODevice.ReadOnly)
+        s = QTextStream(device)
+        self.assertEqual(s.read(4), "\0a\0a")
+        self.assertEqual(device.readLine(), "\0b\0b\0b\0b")
+
+if __name__ == "__main__":
+    unittest.main()
diff --git a/tests/qtcore/child_event_test.py b/tests/QtCore/child_event_test.py
similarity index 93%
rename from tests/qtcore/child_event_test.py
rename to tests/QtCore/child_event_test.py
index ccc27c8..1be1ce1 100644
--- a/tests/qtcore/child_event_test.py
+++ b/tests/QtCore/child_event_test.py
@@ -39,16 +39,13 @@ class TestChildEvent(UsesQCoreApplication):
         parent = ExtQObject()
         child = QObject()
         child.setParent(parent)
-        print "parent seted"
-        #self.assert_(parent.child_event_received)
+        self.assertTrue(parent.child_event_received)
 
-    """
     def testQTimer(self):
         parent = ExtQTimer()
         child = QObject()
         child.setParent(parent)
         self.assert_(parent.child_event_received)
-    """
 
 if __name__ == '__main__':
     unittest.main()
diff --git a/tests/QtCore/classinfo_test.py b/tests/QtCore/classinfo_test.py
new file mode 100644
index 0000000..a343118
--- /dev/null
+++ b/tests/QtCore/classinfo_test.py
@@ -0,0 +1,29 @@
+import unittest
+import sys
+from PySide.QtCore import QObject, ClassInfo
+
+@ClassInfo(author='pyside',url='http://www.pyside.org')
+class MyObject(QObject):
+    pass
+
+class TestClassInfo(unittest.TestCase):
+    def testMetaData(self):
+        o = MyObject()
+        mo = o.metaObject()
+        self.assertEqual(mo.classInfoCount(), 2)
+
+        ci = mo.classInfo(0) #author
+        self.assertEqual(ci.name(), 'author')
+        self.assertEqual(ci.value(), 'pyside')
+
+        ci = mo.classInfo(1) #url
+        self.assertEqual(ci.name(), 'url')
+        self.assertEqual(ci.value(), 'http://www.pyside.org')
+
+if __name__ == '__main__':
+    if sys.version_info[0] < 2:
+        sys.exit(0)
+    elif (sys.version_info[0] == 2) and (sys.version_info[1] <= 5):
+        sys.exit(0)
+    else:
+        unittest.main()
diff --git a/tests/QtCore/deepcopy_test.py b/tests/QtCore/deepcopy_test.py
new file mode 100644
index 0000000..d440177
--- /dev/null
+++ b/tests/QtCore/deepcopy_test.py
@@ -0,0 +1,79 @@
+
+import unittest
+from copy import deepcopy
+
+from PySide.QtCore import QByteArray, QDate, QDateTime, QTime, QLine, QLineF
+from PySide.QtCore import Qt, QSize, QSizeF, QRect, QRectF, QDir, QPoint, QPointF
+from PySide.QtCore import QUuid
+
+class DeepCopyHelper:
+    def testCopy(self):
+        copy = deepcopy([self.original])[0]
+        self.assert_(copy is not self.original)
+        self.assertEqual(copy, self.original)
+
+class QByteArrayDeepCopy(DeepCopyHelper, unittest.TestCase):
+    def setUp(self):
+        self.original = QByteArray('the quick brown fox jumps over the lazy dog')
+
+
+class QDateDeepCopy(DeepCopyHelper, unittest.TestCase):
+    def setUp(self):
+        self.original = QDate(2010, 11, 22)
+
+
+class QTimeDeepCopy(DeepCopyHelper, unittest.TestCase):
+    def setUp(self):
+        self.original = QTime(11, 37, 55, 692)
+
+
+class QDateTimeDeepCopy(DeepCopyHelper, unittest.TestCase):
+    def setUp(self):
+        self.original = QDateTime(2010, 5, 18, 10, 24, 45, 223, Qt.LocalTime)
+
+
+class QSizeDeepCopy(DeepCopyHelper, unittest.TestCase):
+    def setUp(self):
+        self.original = QSize(42, 190)
+
+
+class QSizeFDeepCopy(DeepCopyHelper, unittest.TestCase):
+    def setUp(self):
+        self.original = QSizeF(42.7, 190.2)
+
+
+class QRectDeepCopy(DeepCopyHelper, unittest.TestCase):
+    def setUp(self):
+        self.original = QRect(100, 200, 300, 400)
+
+
+class QRectFDeepCopy(DeepCopyHelper, unittest.TestCase):
+    def setUp(self):
+        self.original = QRectF(100.33, 200.254, 300.321, 400.123)
+
+class QLineDeepCopy(DeepCopyHelper, unittest.TestCase):
+    def setUp(self):
+        self.original = QLine(1, 2, 3, 4)
+
+class QLineFDeepCopy(DeepCopyHelper, unittest.TestCase):
+    def setUp(self):
+        self.original = QLineF(1.1, 2.2, 3.3, 4.4)
+
+class QPointDeepCopy(DeepCopyHelper, unittest.TestCase):
+    def setUp(self):
+        self.original = QPoint(1, 2)
+
+class QPointFDeepCopy(DeepCopyHelper, unittest.TestCase):
+    def setUp(self):
+        self.original = QPointF(1.1, 2.2)
+
+class QDirDeepCopy(DeepCopyHelper, unittest.TestCase):
+    def setUp(self):
+        self.original = QDir("./")
+
+class QUuiCopy(DeepCopyHelper, unittest.TestCase):
+    def setUp(self):
+        self.original = QUuid("67C8770B-44F1-410A-AB9A-F9B5446F13EE")
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/tests/qtcore/deletelater_test.py b/tests/QtCore/deletelater_test.py
similarity index 100%
rename from tests/qtcore/deletelater_test.py
rename to tests/QtCore/deletelater_test.py
diff --git a/tests/QtCore/destroysignal_test.py b/tests/QtCore/destroysignal_test.py
new file mode 100644
index 0000000..f6a9fb5
--- /dev/null
+++ b/tests/QtCore/destroysignal_test.py
@@ -0,0 +1,27 @@
+from PySide.QtCore import QTimer, QObject
+import sys
+import unittest
+
+class TestDestroySignal(unittest.TestCase):
+    def onObjectDestroyed(self, timer):
+        self.assert_(isinstance(timer, QObject))
+        self._destroyed = True
+
+    def testSignal(self):
+        self._destroyed = False
+        t = QTimer()
+        t.destroyed[QObject].connect(self.onObjectDestroyed)
+        del t
+        self.assert_(self._destroyed)
+
+    def testWithParent(self):
+        self._destroyed = False
+        p = QTimer()
+        t = QTimer(p)
+        t.destroyed[QObject].connect(self.onObjectDestroyed)
+        del p
+        self.assert_(self._destroyed)
+
+if __name__ == '__main__':
+    unittest.main()
+
diff --git a/tests/qtcore/duck_punching_test.py b/tests/QtCore/duck_punching_test.py
similarity index 60%
rename from tests/qtcore/duck_punching_test.py
rename to tests/QtCore/duck_punching_test.py
index e20c0c1..8e856ab 100644
--- a/tests/qtcore/duck_punching_test.py
+++ b/tests/QtCore/duck_punching_test.py
@@ -4,9 +4,16 @@
 
 import unittest
 import types
-from PySide.QtCore import QObject, QEvent
+import sys
+from PySide.QtCore import QObject
 from helper import UsesQCoreApplication
 
+def MethodType(func, instance, instanceType):
+    if sys.version_info[0] == 3:
+        return types.MethodType(func, instance)
+    else:
+        return types.MethodType(func, instance, instanceType)
+
 class Duck(QObject):
     def __init__(self):
         QObject.__init__(self)
@@ -32,11 +39,16 @@ class TestDuckPunchingOnQObjectInstance(UsesQCoreApplication):
         parent = QObject()
         def childEvent(obj, event):
             self.duck_childEvent_called = True
-            QObject.childEvent(obj, event)
-        parent.childEvent = types.MethodType(childEvent, parent, QObject)
+        parent.childEvent = MethodType(childEvent, parent, QObject)
         child = QObject()
         child.setParent(parent)
         self.assert_(self.duck_childEvent_called)
+        # This is done to decrease the refcount of the vm object
+        # allowing the object wrapper to be deleted before the
+        # BindingManager. This is useful when compiling Shiboken
+        # for debug, since the BindingManager destructor has an
+        # assert that checks if the wrapper mapper is empty.
+        parent.childEvent = None
 
     def testChildEventMonkeyPatchWithInheritance(self):
         #Test if the new childEvent injected on a QObject's extension class instance is called from C++
@@ -46,10 +58,16 @@ class TestDuckPunchingOnQObjectInstance(UsesQCoreApplication):
             self.duck_childEvent_called = True
         child = QObject()
         child.setParent(parent)
-        parent.childEvent = types.MethodType(childEvent, parent, QObject)
+        parent.childEvent = MethodType(childEvent, parent, QObject)
         child = QObject()
         child.setParent(parent)
         self.assert_(self.duck_childEvent_called)
+        # This is done to decrease the refcount of the vm object
+        # allowing the object wrapper to be deleted before the
+        # BindingManager. This is useful when compiling Shiboken
+        # for debug, since the BindingManager destructor has an
+        # assert that checks if the wrapper mapper is empty.
+        parent.childEvent = None
 
 if __name__ == '__main__':
     unittest.main()
diff --git a/tests/QtCore/hash_test.py b/tests/QtCore/hash_test.py
new file mode 100644
index 0000000..bf02176
--- /dev/null
+++ b/tests/QtCore/hash_test.py
@@ -0,0 +1,57 @@
+#!/usr/bin/python
+import unittest
+from PySide.QtCore import QDate, QDateTime, QTime, QUrl
+from PySide.QtCore import QLine, QPoint, QRect, QSize
+
+class HashTest(unittest.TestCase):
+    def testInsert(self):
+        myHash = {}
+        qdate = QDate.currentDate()
+        qdatetime = QDateTime.currentDateTime()
+        qtime = QTime.currentTime()
+        qurl = QUrl("http://www.pyside.org")
+        qpoint = QPoint(12, 42)
+
+        myHash[qdate] = "QDate"
+        myHash[qdatetime] = "QDateTime"
+        myHash[qtime] = "QTime"
+        myHash[qurl] = "QUrl"
+        myHash[qpoint] = "QPoint"
+
+        self.assertEqual(myHash[qdate], "QDate")
+        self.assertEqual(myHash[qdatetime], "QDateTime")
+        self.assertEqual(myHash[qtime], "QTime")
+        self.assertEqual(myHash[qurl], "QUrl")
+        self.assertEqual(myHash[qpoint], "QPoint")
+
+    def testQPointHash(self):
+        p1 = QPoint(12, 34)
+        p2 = QPoint(12, 34)
+        self.assertFalse(p1 is p2)
+        self.assertEqual(p1, p2)
+        self.assertEqual(hash(p1), hash(p2))
+
+    def testQSizeHash(self):
+        s1 = QSize(12, 34)
+        s2 = QSize(12, 34)
+        self.assertFalse(s1 is s2)
+        self.assertEqual(s1, s2)
+        self.assertEqual(hash(s1), hash(s2))
+
+    def testQRectHash(self):
+        r1 = QRect(12, 34, 56, 78)
+        r2 = QRect(12, 34, 56, 78)
+        self.assertFalse(r1 is r2)
+        self.assertEqual(r1, r2)
+        self.assertEqual(hash(r1), hash(r2))
+
+    def testQLineHash(self):
+        l1 = QLine(12, 34, 56, 78)
+        l2 = QLine(12, 34, 56, 78)
+        self.assertFalse(l1 is l2)
+        self.assertEqual(l1, l2)
+        self.assertEqual(hash(l1), hash(l2))
+
+if __name__ == '__main__':
+    unittest.main()
+
diff --git a/tests/QtCore/inherits_test.py b/tests/QtCore/inherits_test.py
new file mode 100644
index 0000000..da85621
--- /dev/null
+++ b/tests/QtCore/inherits_test.py
@@ -0,0 +1,16 @@
+import unittest
+
+from PySide.QtCore import QObject
+
+class MyObject(QObject):
+    pass
+
+class MainTest(unittest.TestCase):
+    def testInherits(self):
+        o = MyObject()
+        mo = o.metaObject()
+        self.assertEqual(mo.className(), 'MyObject')
+        self.assertTrue(o.inherits('MyObject'))
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/tests/QtCore/max_signals.py b/tests/QtCore/max_signals.py
new file mode 100644
index 0000000..154eac4
--- /dev/null
+++ b/tests/QtCore/max_signals.py
@@ -0,0 +1,34 @@
+import unittest
+
+from PySide.QtCore import QObject, SIGNAL
+
+class MyObject(QObject):
+    pass
+
+
+class TestSignalLimitless(unittest.TestCase):
+    SIGNAL_MAX = 100
+    def test100DynamicSignals(self):
+
+        self.count = 0
+        def onSignal():
+            self.count += 1
+
+        #create 100 dynamic signals
+        o = MyObject()
+        for i in range(self.SIGNAL_MAX):
+            o.connect(SIGNAL('sig%d()'%i), onSignal)
+
+        #chek if the signals are valid
+        m = o.metaObject()
+        for i in range(self.SIGNAL_MAX):
+            self.assert_(m.indexOfSignal('sig%d()'%i) > 0)
+
+        #emit all 100 signals
+        for i in range(self.SIGNAL_MAX):
+            o.emit(SIGNAL('sig%d()'%i))
+
+        self.assertEqual(self.count, self.SIGNAL_MAX)
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/tests/qtcore/missing_symbols_test.py b/tests/QtCore/missing_symbols_test.py
similarity index 100%
rename from tests/qtcore/missing_symbols_test.py
rename to tests/QtCore/missing_symbols_test.py
diff --git a/tests/QtCore/mockclass_test.py b/tests/QtCore/mockclass_test.py
new file mode 100644
index 0000000..4210efd
--- /dev/null
+++ b/tests/QtCore/mockclass_test.py
@@ -0,0 +1,27 @@
+# Test case for PySide bug 634
+# http://bugs.pyside.org/show_bug.cgi?id=634
+# Marcus Lindblom <macke@yar.nu>; 2011-02-16
+
+import unittest
+from PySide.QtCore import QCoreApplication
+
+class Mock(object):
+    def __init__(self):
+        self.called = False
+        self.return_value = None
+
+    def __call__(self, *args, **kwargs):
+        self.called = True
+        return self.return_value
+
+
+class MockClassTest(unittest.TestCase):
+    def testMockQCoreApplication(self):
+        mock = Mock()
+        setattr(QCoreApplication, 'instance', mock)
+        QCoreApplication.instance()
+        self.assert_(mock.called)
+
+if __name__ == '__main__':
+    unittest.main()
+
diff --git a/tests/QtCore/python_conversion.py b/tests/QtCore/python_conversion.py
new file mode 100644
index 0000000..84845c0
--- /dev/null
+++ b/tests/QtCore/python_conversion.py
@@ -0,0 +1,64 @@
+#!/usr/bin/python
+'''Test cases for QLineF'''
+
+import unittest
+import datetime
+
+from PySide.QtCore import QTime, QDateTime, QDate
+
+class TestDateTimeConversions (unittest.TestCase):
+    def testQDate(self):
+        date = datetime.date(2010, 4, 23)
+        other = QDate(date)
+        self.assertEqual(date.year, other.year())
+        self.assertEqual(date.month, other.month())
+        self.assertEqual(date.day, other.day())
+
+        self.assertEqual(date, other.toPython())
+
+    def testQTime(self):
+        time = datetime.time(11, 14, 0, 1000)
+        other = QTime(time)
+        self.assertEqual(time.hour, other.hour())
+        self.assertEqual(time.minute, other.minute())
+        self.assertEqual(time.second, other.second())
+        self.assertEqual(time.microsecond/1000, other.msec())
+
+        self.assertEqual(time, other.toPython())
+
+    def testQDateTime(self):
+        dateTime = datetime.datetime(2010, 4, 23, 11, 14, 0, 1000)
+        other = QDateTime(dateTime)
+
+        otherDate = other.date()
+        self.assertEqual(dateTime.year, otherDate.year())
+        self.assertEqual(dateTime.month, otherDate.month())
+        self.assertEqual(dateTime.day, otherDate.day())
+
+        otherTime = other.time()
+        self.assertEqual(dateTime.hour, otherTime.hour())
+        self.assertEqual(dateTime.minute, otherTime.minute())
+        self.assertEqual(dateTime.second, otherTime.second())
+        self.assertEqual(dateTime.microsecond/1000, otherTime.msec())
+
+        self.assertEqual(dateTime, other.toPython())
+
+    def testQDateTime6arg(self):
+        dateTime = datetime.datetime(2010, 4, 23, 11, 14, 7)
+        other = QDateTime(dateTime)
+
+        otherDate = other.date()
+        self.assertEqual(dateTime.year, otherDate.year())
+        self.assertEqual(dateTime.month, otherDate.month())
+        self.assertEqual(dateTime.day, otherDate.day())
+
+        otherTime = other.time()
+        self.assertEqual(dateTime.hour, otherTime.hour())
+        self.assertEqual(dateTime.minute, otherTime.minute())
+        self.assertEqual(dateTime.second, otherTime.second())
+        self.assertEqual(dateTime.microsecond/1000, otherTime.msec())
+
+        self.assertEqual(dateTime, other.toPython())
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/tests/qtcore/qabs_test.py b/tests/QtCore/qabs_test.py
similarity index 88%
rename from tests/qtcore/qabs_test.py
rename to tests/QtCore/qabs_test.py
index 1727ae6..37ff9c7 100644
--- a/tests/qtcore/qabs_test.py
+++ b/tests/QtCore/qabs_test.py
@@ -14,7 +14,8 @@ class QAbsTest(unittest.TestCase):
         check(0)
         check(-10)
         check(10)
-
+        check(10.5)
+        check(-10.5)
 
 if __name__ == '__main__':
     unittest.main()
diff --git a/tests/QtCore/qabstractfileengine_test.py b/tests/QtCore/qabstractfileengine_test.py
new file mode 100644
index 0000000..457c5c5
--- /dev/null
+++ b/tests/QtCore/qabstractfileengine_test.py
@@ -0,0 +1,75 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+import unittest
+import os
+from PySide.QtCore import QAbstractFileEngineIterator, QAbstractFileEngine, QAbstractFileEngineHandler, QDir
+
+
+class TestFSIterator(QAbstractFileEngineIterator):
+    def __init__(self, parent, filters, filterNames):
+        QAbstractFileEngineIterator.__init__(self, filters, filterNames)
+        self.index = -1
+        self._list = ['.', '..']
+        if parent == '/bup':
+            self._list += ['A', 'B', 'C']
+
+    def next(self):
+        self.index += 1
+        return self.currentFileName()
+
+    def hasNext(self):
+        return (self.index + 1) < len(self._list)
+
+    def currentFileName(self):
+        if self.index < len(self._list):
+            return self._list[self.index]
+        return None
+
+
+class TestFS(QAbstractFileEngine):
+    def __init__(self, path):
+        QAbstractFileEngine.__init__(self)
+        self.path = path
+
+    def beginEntryList(self, filters, filterNames):
+        return TestFSIterator(self.path, filters, filterNames)
+
+    def fileFlags(self, _ = QAbstractFileEngine.FileInfoAll):
+        return QAbstractFileEngine.ExistsFlag\
+               |QAbstractFileEngine.ReadOwnerPerm\
+               |QAbstractFileEngine.ReadUserPerm\
+               |QAbstractFileEngine.ReadGroupPerm\
+               |QAbstractFileEngine.ReadOtherPerm\
+               |QAbstractFileEngine.DirectoryType
+
+    def fileName(self, path=QAbstractFileEngine.DefaultName):
+        if path == QAbstractFileEngine.DefaultName:
+            return self.path
+        return os.path.basename(self.path)
+
+    def setFileName(self, path):
+        self.path = path
+
+class TestFSHandler(QAbstractFileEngineHandler):
+    def __init__(self):
+        QAbstractFileEngineHandler.__init__(self)
+
+    def create(self, path):
+        if path.startswith('/bup'):
+            return TestFS(path)
+        return None
+
+class QAbstractFileEngineTest(unittest.TestCase):
+
+    def testBeginEntryList(self):
+        obj = TestFSHandler()
+        qdir = QDir('/bup')
+        for n1, n2 in zip(qdir.entryList(), ['.', '..', 'A', 'B', 'C']):
+            self.assertEqual(n1, n2)
+        self.assertEqual(len(qdir.entryList()), 5)
+
+
+if __name__ == '__main__':
+    unittest.main()
+
diff --git a/tests/QtCore/qabstractitemmodel_test.py b/tests/QtCore/qabstractitemmodel_test.py
new file mode 100644
index 0000000..52e6f8d
--- /dev/null
+++ b/tests/QtCore/qabstractitemmodel_test.py
@@ -0,0 +1,28 @@
+# -*- coding: utf-8 -*-
+
+import unittest
+from PySide.QtCore import *
+
+class MyModel (QAbstractListModel):
+    pass
+
+class Foo:
+    pass
+
+class TestQModelIndexInternalPointer(unittest.TestCase):
+
+    def testInternalPointer(self):
+        m = MyModel()
+        foo = Foo()
+        idx = m.createIndex(0,0, foo)
+
+    def testPassQPersistentModelIndexAsQModelIndex(self):
+        # Related to bug #716
+        m = MyModel()
+        idx = QPersistentModelIndex()
+        m.span(idx)
+
+
+if __name__ == '__main__':
+    unittest.main()
+
diff --git a/tests/qtcore/qabstracttransition_test.py b/tests/QtCore/qabstracttransition_test.py
similarity index 87%
rename from tests/qtcore/qabstracttransition_test.py
rename to tests/QtCore/qabstracttransition_test.py
index 510b8ef..fa1e355 100644
--- a/tests/qtcore/qabstracttransition_test.py
+++ b/tests/QtCore/qabstracttransition_test.py
@@ -1,8 +1,7 @@
 #!/usr/bin/python
 import unittest
 from sys import getrefcount
-from PySide.QtCore import QObject, SIGNAL, QCoreApplication, QTimer, QVariant
-from PySide.QtCore import QState, QFinalState, QStateMachine, QParallelAnimationGroup, QEventTransition
+from PySide.QtCore import *
 
 def addStates(transition):
     sx = QState()
@@ -19,11 +18,11 @@ class QAbstractTransitionTest(unittest.TestCase):
         app = QCoreApplication([])
 
         o = QObject()
-        o.setProperty("text", QVariant("INdT"))
+        o.setProperty("text", "INdT")
 
         machine = QStateMachine()
         s1 = QState()
-        s1.assignProperty(o, "text", QVariant("Rocks"))
+        s1.assignProperty(o, "text", "Rocks")
 
         s2 = QFinalState()
         t = s1.addTransition(o, SIGNAL("change()"), s2)
@@ -90,8 +89,8 @@ class QAbstractTransitionTest(unittest.TestCase):
         del states
         del transition
 
-        self.assertEqual(getrefcount(state1), refcount1)
-        self.assertEqual(getrefcount(state2), refcount2)
+        self.assertEqual(getrefcount(state1), refcount1 - 1)
+        self.assertEqual(getrefcount(state2), refcount2 - 1)
 
     def testRefCountOfTargetStatesAfterSingleTargetState(self):
         transition = QEventTransition()
@@ -120,8 +119,8 @@ class QAbstractTransitionTest(unittest.TestCase):
         del states
         del transition
 
-        self.assertEqual(getrefcount(state1), refcount1)
-        self.assertEqual(getrefcount(state2), refcount2)
+        self.assertEqual(getrefcount(state1), refcount1 - 1)
+        self.assertEqual(getrefcount(state2), refcount2 - 1)
 
     def testRefCountOfTargetStatesBeforeSingleTargetState(self):
         transition = QEventTransition()
@@ -148,8 +147,8 @@ class QAbstractTransitionTest(unittest.TestCase):
 
         del states
 
-        self.assertEqual(getrefcount(state1), refcount1)
-        self.assertEqual(getrefcount(state2), refcount2)
+        self.assertEqual(getrefcount(state1), refcount1 - 1)
+        self.assertEqual(getrefcount(state2), refcount2 - 1)
 
 if __name__ == '__main__':
     unittest.main()
diff --git a/tests/qtcore/qanimationgroup_test.py b/tests/QtCore/qanimationgroup_test.py
similarity index 71%
rename from tests/qtcore/qanimationgroup_test.py
rename to tests/QtCore/qanimationgroup_test.py
index 05bd81e..58886d1 100644
--- a/tests/qtcore/qanimationgroup_test.py
+++ b/tests/QtCore/qanimationgroup_test.py
@@ -1,6 +1,6 @@
 #!/usr/bin/python
 import unittest
-from PySide.QtCore import QObject, QState, QFinalState, SIGNAL, QCoreApplication, QTimer, QStateMachine, QSignalTransition, QVariant, QParallelAnimationGroup, QSequentialAnimationGroup, QAnimationGroup
+from PySide.QtCore import *
 
 class QAnimationGroupTest(unittest.TestCase):
 
diff --git a/tests/qtcore/qbitarray_test.py b/tests/QtCore/qbitarray_test.py
old mode 100755
new mode 100644
similarity index 100%
rename from tests/qtcore/qbitarray_test.py
rename to tests/QtCore/qbitarray_test.py
diff --git a/tests/qtcore/qbytearray_buffer_protocol_test.py b/tests/QtCore/qbytearray_buffer_protocol_test.py
old mode 100755
new mode 100644
similarity index 89%
rename from tests/qtcore/qbytearray_buffer_protocol_test.py
rename to tests/QtCore/qbytearray_buffer_protocol_test.py
index 117e50b..2ae0548
--- a/tests/qtcore/qbytearray_buffer_protocol_test.py
+++ b/tests/QtCore/qbytearray_buffer_protocol_test.py
@@ -3,14 +3,18 @@
 '''Tests QByteArray implementation of Python buffer protocol'''
 
 import unittest
+import py3kcompat as py3k
 
 from os.path import isdir
 from PySide.QtCore import QByteArray
 
+
 class QByteArrayBufferProtocolTest(unittest.TestCase):
     '''Tests QByteArray implementation of Python buffer protocol'''
 
     def testQByteArrayBufferProtocol(self):
+        if py3k.IS_PY3K:
+            return
         #Tests QByteArray implementation of Python buffer protocol using the os.path.isdir
         #function which an unicode object or other object implementing the Python buffer protocol
         isdir(QByteArray('/tmp'))
diff --git a/tests/qtcore/qbytearray_concatenation_operator_test.py b/tests/QtCore/qbytearray_concatenation_operator_test.py
old mode 100755
new mode 100644
similarity index 74%
rename from tests/qtcore/qbytearray_concatenation_operator_test.py
rename to tests/QtCore/qbytearray_concatenation_operator_test.py
index b9a01ff..13fd231
--- a/tests/qtcore/qbytearray_concatenation_operator_test.py
+++ b/tests/QtCore/qbytearray_concatenation_operator_test.py
@@ -12,20 +12,17 @@ class QByteArrayConcatenationOperatorTest(unittest.TestCase):
     def testConcatQByteArrayAndPythonString(self):
         #Test concatenation of a QByteArray with a Python string, in this order
         qba = QByteArray('foo')
-        result = qba + 'bar'
-        self.assert_(isinstance(result, QByteArray))
-        self.assertEqual(result, 'foobar')
-        # NOTICE: the standard behavior of PyQt is to return a QString object
-        # for this case. As this is a minor issue the assertion will be left commented.
-        #self.assertEqual(result.__class__.__name__, 'QString')
+        result = qba + '\x00bar'
+        self.assertEqual(type(result), QByteArray)
+        self.assertEqual(result, 'foo\x00bar')
 
     def testConcatPythonStringAndQByteArray(self):
         #Test concatenation of a Python string with a QByteArray, in this order
         concat_python_string_add_qbytearray_worked = True
         qba = QByteArray('foo')
-        result = 'bar' + qba
-        self.assert_(isinstance(result, QByteArray))
-        self.assertEqual(result, 'barfoo')
+        result = 'bar\x00' + qba
+        self.assertEqual(type(result), QByteArray)
+        self.assertEqual(result, 'bar\x00foo')
 
     # NOTICE: Does not makes sense concat a unicode string with a QByteArray, because the
     # user does not know nothing about the internal representation of the unicode string.
diff --git a/tests/qtcore/qbytearray_operator_iadd_test.py b/tests/QtCore/qbytearray_operator_iadd_test.py
similarity index 86%
rename from tests/qtcore/qbytearray_operator_iadd_test.py
rename to tests/QtCore/qbytearray_operator_iadd_test.py
index 168f22d..55559c4 100644
--- a/tests/qtcore/qbytearray_operator_iadd_test.py
+++ b/tests/QtCore/qbytearray_operator_iadd_test.py
@@ -1,13 +1,11 @@
-
 import unittest
-import new
 
-from PySide.QtCore import QByteArray, QString
+from PySide.QtCore import QByteArray
 from helper.docmodifier import DocModifier
 
 class BaseQByteArrayOperatorIAdd(object):
     '''Base class for QByteArray += operator tests.
-    
+
     Implementing classes should inherit from unittest.TestCase and implement
     setUp, setting self.obj and self.orig_obj to the target QByteArray and original
     one, respectively'''
@@ -41,13 +39,6 @@ class BaseQByteArrayOperatorIAdd(object):
         self.assertEqual(self.obj, self.orig_obj + s)
         self.assertEqual(self.obj.size(), self.orig_obj.size() + 1)
 
-    def testQString(self):
-        '''QByteArray += QString'''
-        s = QString('dummy')
-        self.obj += s
-        self.assertEqual(self.obj, self.orig_obj + s)
-        self.assertEqual(self.obj.size(), self.orig_obj.size() + s.size())
-
 class NullQByteArrayOperatorIAdd(unittest.TestCase, BaseQByteArrayOperatorIAdd):
     '''Test case for operator QByteArray += on null QByteArrays'''
 
diff --git a/tests/qtcore/qbytearray_operator_test.py b/tests/QtCore/qbytearray_operator_test.py
similarity index 83%
rename from tests/qtcore/qbytearray_operator_test.py
rename to tests/QtCore/qbytearray_operator_test.py
index 4a20c04..9631ab6 100644
--- a/tests/qtcore/qbytearray_operator_test.py
+++ b/tests/QtCore/qbytearray_operator_test.py
@@ -3,8 +3,9 @@
 '''Test cases for QByteArray operators'''
 
 import unittest
+import py3kcompat as py3k
 
-from PySide.QtCore import QByteArray, QString
+from PySide.QtCore import QByteArray
 
 class QByteArrayOperatorEqual(unittest.TestCase):
     '''TestCase for operator QByteArray == QByteArray'''
@@ -26,9 +27,9 @@ class QByteArrayOperatorEqual(unittest.TestCase):
         self.assertEqual(QByteArray(string), string)
 
     def testQString(self):
-        #QByteArray(string) == QString(string)
+        #QByteArray(string) == string
         string = 'another test string'
-        self.assertEqual(QByteArray(string), QString(string))
+        self.assertEqual(QByteArray(string), string)
 
 class QByteArrayOperatorAt(unittest.TestCase):
     '''TestCase for operator QByteArray[]'''
@@ -39,7 +40,7 @@ class QByteArrayOperatorAt(unittest.TestCase):
         obj = QByteArray(string)
 
         for i in range(len(string)):
-            self.assertEqual(obj[i], string[i])
+            self.assertEqual(obj[i], py3k.b(string[i]))
 
     def testInRangeReverse(self):
         #QByteArray[x] where x is a valid index (reverse order)
@@ -47,7 +48,7 @@ class QByteArrayOperatorAt(unittest.TestCase):
         obj = QByteArray(string)
 
         for i in range(len(string)-1, 0, -1):
-            self.assertEqual(obj[i], string[i])
+            self.assertEqual(obj[i], py3k.b(string[i]))
 
 
     def testOutOfRange(self):
@@ -56,6 +57,10 @@ class QByteArrayOperatorAt(unittest.TestCase):
         obj = QByteArray(string)
         self.assertRaises(IndexError, lambda :obj[len(string)])
 
+    def testNullStrings(self):
+        ba = QByteArray('\x00')
+        self.assertEqual(ba.at(0), '\x00')
+        self.assertEqual(ba[0], py3k.b('\x00'))
 
 class QByteArrayOperatorLen(unittest.TestCase):
     '''Test case for __len__ operator of QByteArray'''
diff --git a/tests/qtcore/qbytearray_test.py b/tests/QtCore/qbytearray_test.py
similarity index 56%
rename from tests/qtcore/qbytearray_test.py
rename to tests/QtCore/qbytearray_test.py
index 20bba14..9621a44 100644
--- a/tests/qtcore/qbytearray_test.py
+++ b/tests/QtCore/qbytearray_test.py
@@ -3,9 +3,10 @@
 
 import unittest
 import ctypes
-import sys
+import pickle
+import py3kcompat as py3k
 
-from PySide.QtCore import QByteArray
+from PySide.QtCore import QByteArray, QSettings, QObject
 
 class QByteArrayTestToNumber(unittest.TestCase):
     def testToNumberInt(self):
@@ -26,6 +27,25 @@ class QByteArrayTestToNumber(unittest.TestCase):
         self.assertEqual((ctypes.c_double(37.109).value, True),
                          obj.toDouble())
 
+    def testSetNum(self):
+        b = QByteArray()
+        b.setNum(py3k.long(-124124))
+        self.assertEqual(b, "-124124")
+        b = QByteArray()
+        b.setNum(-124124)
+        self.assertEqual(b, "-124124")
+        b = QByteArray()
+        b.setNum(-0.5)
+        self.assertEqual(b, "-0.5")
+
+    def testAppend(self):
+        b = QByteArray()
+        b.append("A")
+        self.assertEqual(b.size(), 1)
+        b.append("AB")
+        self.assertEqual(b.size(), 3)
+
+
 class QByteArraySplit(unittest.TestCase):
     '''Test case for QByteArray.split'''
 
@@ -40,7 +60,14 @@ class QByteArrayData(unittest.TestCase):
 
     def testData(self):
         url = QByteArray("http://web.openbossa.org/")
-        self.assertEqual(url.data(), "http://web.openbossa.org/")
+        self.assertEqual(url.data(), py3k.b("http://web.openbossa.org/"))
+
+    def testDataWithZeros(self):
+        s1 = "123\000321"
+        ba = QByteArray(s1)
+        s2 = ba.data()
+        self.assertEqual(py3k.b(s1), s2)
+        self.assertEqual(s1, ba)
 
 class QByteArrayOperatorAtSetter(unittest.TestCase):
     '''Test case for operator QByteArray[] - __setitem__'''
@@ -91,7 +118,47 @@ class QByteArrayOperatorAtSetterLargeIndex(unittest.TestCase):
         obj[10] = 'normal'
         self.assertEqual(obj, QByteArray('mystring  normal'))
 
+class QByteArrayOnQVariant(unittest.TestCase):
+    def testQByteArrayOnQVariant(self):
+        a = QSettings().value("some_prop", QByteArray())
+        self.assertEqual(type(a), QByteArray)
 
+class TestBug666(unittest.TestCase):
+    '''QByteArray does not support slices'''
+    def testIt(self):
+        if not py3k.IS_PY3K:
+            ba = QByteArray('1234567890')
+            self.assertEqual(ba[2:4], '34')
+            self.assertEqual(ba[:4], '1234')
+            self.assertEqual(ba[4:], '567890')
+            self.assertEqual(len(ba[4:1]), 0)
+
+class QByteArrayBug514(unittest.TestCase):
+    def testIt(self):
+        data = py3k.b("foobar")
+        a = QByteArray.fromRawData(data)
+        self.assertEqual(type(a), QByteArray)
+        self.assertEqual(a.data(), data)
+
+class TestPickler(unittest.TestCase):
+    def testIt(self):
+        ba = QByteArray("321\x00123")
+        output = pickle.dumps(str(ba))
+        ba2 = pickle.loads(output)
+        self.assertEqual(ba, ba2)
+
+class QByteArrayBug720(unittest.TestCase):
+    def testIt(self):
+        ba = QByteArray(b"32\"1\x00123")
+        self.assertEqual(str(ba), "32\"1\x00123")
+        self.assertEqual(repr(ba), "PySide.QtCore.QByteArray('32\"1\x00123')")
+
+class QByteArrayImplicitConvert(unittest.TestCase):
+    def testString(self):
+        # No implicit conversions from QByteArray to python string
+        ba = QByteArray("object name")
+        obj = QObject()
+        self.assertRaises(TypeError, obj.setObjectName, ba)
 
 
 if __name__ == '__main__':
diff --git a/tests/qtcore/qcoreapplication_instance_test.py b/tests/QtCore/qcoreapplication_instance_test.py
old mode 100755
new mode 100644
similarity index 100%
rename from tests/qtcore/qcoreapplication_instance_test.py
rename to tests/QtCore/qcoreapplication_instance_test.py
diff --git a/tests/qtcore/qdatastream_test.py b/tests/QtCore/qdatastream_test.py
similarity index 81%
rename from tests/qtcore/qdatastream_test.py
rename to tests/QtCore/qdatastream_test.py
index d71ed2f..aa4c115 100644
--- a/tests/qtcore/qdatastream_test.py
+++ b/tests/QtCore/qdatastream_test.py
@@ -2,9 +2,9 @@
 '''Unit tests for QDataStream'''
 
 import unittest
+import py3kcompat as py3k
 
-from PySide.QtCore import QDataStream, QString, QIODevice, QByteArray
-from PySide.QtCore import QBitArray, QDate, QTime, QDateTime, QLine, QChar
+from PySide.QtCore import QBitArray, QByteArray, QIODevice, QDataStream, QDate, QTime, QDateTime
 
 def create_bitarray(string):
     array = QBitArray(len(string))
@@ -23,7 +23,7 @@ class QDataStreamWrite(unittest.TestCase):
     def testWriteUInt8(self):
         '''QDataStream.writeUInt8 (accepting str of size 1)'''
         x = 0xFF
-        self.write.writeUInt8(chr(x))
+        self.write.writeUInt8(x)
         y = self.read.readUInt8()
         self.assertEqual(x, y)
 
@@ -66,7 +66,6 @@ class QDataStreamWrite(unittest.TestCase):
         y = int(self.read.readUInt32())
         self.assertEqual(x, y)
 
-
 class QDataStreamShift(unittest.TestCase):
     '''Test case for << and >> operators'''
 
@@ -77,22 +76,17 @@ class QDataStreamShift(unittest.TestCase):
 
     def testQCharValid(self):
         '''QDataStream <<>> QChar - valid'''
-        self.stream << QChar(42)
+        self.stream.writeQChar(42)
 
-        res = QChar()
-
-        self.read_stream >> res
-        self.assertEqual(res, QChar(42))
+        res = self.read_stream.readQChar()
+        self.assertEqual(res, py3k.unichr(42))
 
     def testQCharNull(self):
         '''QDataStream <<>> QChar - null'''
-        self.stream << QChar()
+        self.stream.writeQChar(None)
 
-        res = QChar()
-
-        self.read_stream >> res
-        self.assertEqual(res, QChar())
-        self.assert_(res.isNull())
+        res = self.read_stream.readQChar()
+        self.assertEqual(res, py3k.unicode_('\x00'))
 
     def testQByteArrayValid(self):
         '''QDataStream <<>> QByteArray - valid'''
@@ -111,8 +105,8 @@ class QDataStreamShift(unittest.TestCase):
 
         self.read_stream >> res
         self.assertEqual(res, QByteArray(""))
-        self.assert_(res.isEmpty())
-        self.assert_(not res.isNull())
+        self.assertTrue(res.isEmpty())
+        self.assertFalse(res.isNull())
 
     def testQByteArrayNull(self):
         '''QDataStream <<>> QByteArray - null'''
@@ -122,40 +116,29 @@ class QDataStreamShift(unittest.TestCase):
 
         self.read_stream >> res
         self.assertEqual(res, QByteArray())
-        self.assert_(res.isEmpty())
-        self.assert_(res.isNull())
+        self.assertTrue(res.isEmpty())
+        self.assertTrue(res.isNull())
 
     def testQStringValid(self):
         '''QDataStream <<>> QString - valid'''
-        self.stream << QString('Ka-boom')
+        self.stream.writeQString('Ka-boom')
 
-        res = QString()
-
-        self.read_stream >> res
-        self.assertEqual(res, QString('Ka-boom'))
+        res = self.read_stream.readQString()
+        self.assertEqual(res, py3k.unicode_('Ka-boom'))
 
     def testQStringEmpty(self):
         '''QDataStream <<>> QString - empty'''
-        self.stream << QString('')
+        self.stream.writeQString('')
 
-        res = QString()
-
-        self.read_stream >> res
-        self.assertEqual(res, QString(""))
-        self.assert_(res.isEmpty())
-        self.assert_(not res.isNull())
+        res = self.read_stream.readQString()
+        self.assertEqual(res, py3k.unicode_(''))
 
     def testQStringNull(self):
         '''QDataStream <<>> QString - null'''
-        self.stream << QString()
-
-        res = QString()
-
-        self.read_stream >> res
-        self.assertEqual(res, QString())
-        self.assert_(res.isEmpty())
-        self.assert_(res.isNull())
+        self.stream.writeQString(None)
 
+        res = self.read_stream.readQString()
+        self.assertEqual(res, py3k.unicode_(''))
 
     def testQBitArrayNull(self):
         '''QDataStream <<>> QBitArray - null'''
@@ -183,8 +166,8 @@ class QDataStreamShift(unittest.TestCase):
 
         self.read_stream >> res
         self.assertEqual(res, QDate())
-        self.assert_(not res.isValid())
-        self.assert_(res.isNull())
+        self.assertFalse(res.isValid())
+        self.assertTrue(res.isNull())
 
     def testQDateValid(self):
         '''QDataStream <<>> QDate - valid'''
@@ -194,8 +177,8 @@ class QDataStreamShift(unittest.TestCase):
 
         self.read_stream >> res
         self.assertEqual(res, QDate(2012, 12, 21))
-        self.assert_(res.isValid())
-        self.assert_(not res.isNull())
+        self.assertTrue(res.isValid())
+        self.assertFalse(res.isNull())
 
 
     def testQTimeNull(self):
@@ -206,8 +189,8 @@ class QDataStreamShift(unittest.TestCase):
 
         self.read_stream >> res
         self.assertEqual(res, QTime())
-        self.assert_(not res.isValid())
-        self.assert_(res.isNull())
+        self.assertFalse(res.isValid())
+        self.assertTrue(res.isNull())
 
     def testQTimeValid(self):
         '''QDataStream <<>> QTime - valid'''
@@ -217,8 +200,8 @@ class QDataStreamShift(unittest.TestCase):
 
         self.read_stream >> res
         self.assertEqual(res, QTime(12, 12, 21))
-        self.assert_(res.isValid())
-        self.assert_(not res.isNull())
+        self.assertTrue(res.isValid())
+        self.assertFalse(res.isNull())
 
     def testQDateTimeNull(self):
         '''QDataStream <<>> QDateTime - null'''
@@ -229,13 +212,13 @@ class QDataStreamShift(unittest.TestCase):
 
         self.read_stream >> res
         self.assertEqual(res, QDateTime())
-        self.assert_(not res.isValid())
-        self.assert_(res.isNull())
+        self.assertFalse(res.isValid())
+        self.assertTrue(res.isNull())
 
     def testQDateTimeValid(self):
         '''QDataStream <<>> QDateTime - valid'''
         time = QTime(23, 23, 23)
-        date = QDate(2009, 01, 01)
+        date = QDate(2009, 1, 1)
 
         self.stream << QDateTime(date, time)
 
@@ -243,8 +226,8 @@ class QDataStreamShift(unittest.TestCase):
 
         self.read_stream >> res
         self.assertEqual(res, QDateTime(date, time))
-        self.assert_(res.isValid())
-        self.assert_(not res.isNull())
+        self.assertTrue(res.isValid())
+        self.assertFalse(res.isNull())
 
 
 class QDataStreamShiftBitArray(unittest.TestCase):
@@ -325,6 +308,19 @@ class QDataStreamShiftBitArray(unittest.TestCase):
 
         self._check_bitarray(data)
 
+class QDataStreamRawData(unittest.TestCase):
+    def testRawData(self):
+        data = QDataStream()
+        self.assertEqual(data.readRawData(4), None)
+
+        ba = QByteArray()
+        data = QDataStream(ba, QIODevice.WriteOnly)
+        data.writeRawData('AB\x00C')
+        self.assertEqual(ba.data(), py3k.b('AB\x00C'))
+
+        data = QDataStream(ba)
+        self.assertEqual(data.readRawData(4), py3k.b('AB\x00C'))
 
 if __name__ == '__main__':
     unittest.main()
+
diff --git a/tests/qtcore/qdate_test.py b/tests/QtCore/qdate_test.py
similarity index 82%
rename from tests/qtcore/qdate_test.py
rename to tests/QtCore/qdate_test.py
index 4923448..e1386ab 100644
--- a/tests/qtcore/qdate_test.py
+++ b/tests/QtCore/qdate_test.py
@@ -23,6 +23,11 @@ class TestQDate (unittest.TestCase):
         self.assertEqual(week, 52)
         self.assertEqual(yearNumber, 1999)
 
+    def testBooleanCast(self):
+        today = QDate.currentDate()
+        self.assertTrue(today)
+        nodate = QDate()
+        self.assertFalse(nodate)
 
 if __name__ == '__main__':
     unittest.main()
diff --git a/tests/QtCore/qdatetime_test.py b/tests/QtCore/qdatetime_test.py
new file mode 100644
index 0000000..589254f
--- /dev/null
+++ b/tests/QtCore/qdatetime_test.py
@@ -0,0 +1,23 @@
+import unittest
+import datetime
+
+from PySide.QtCore import QDateTime, QDate, QTime
+
+class TestQDate (unittest.TestCase):
+    def testDateConversion(self):
+        dateTime = QDateTime(QDate(2011, 5, 17), QTime(11, 1, 14, 15))
+        dateTimePy = QDateTime(datetime.date(2011, 5, 17), datetime.time(11, 1, 14, 15000))
+        self.assertEqual(dateTime, dateTimePy)
+
+    def testDateTimeConversion(self):
+        dateTime = QDateTime(QDate(2011, 5, 17), QTime(11, 1, 14, 15))
+        dateTimePy = QDateTime(datetime.datetime(2011, 5, 17, 11, 1, 14, 15000))
+        self.assertEqual(dateTime, dateTimePy)
+
+    def testDateTimeNow(self):
+        py = datetime.datetime.now()
+        qt = QDateTime(py)
+        self.assertEqual(qt, py)
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/tests/QtCore/qeasingcurve_test.py b/tests/QtCore/qeasingcurve_test.py
new file mode 100644
index 0000000..77c0e6c
--- /dev/null
+++ b/tests/QtCore/qeasingcurve_test.py
@@ -0,0 +1,26 @@
+import unittest
+
+from PySide.QtCore import QEasingCurve
+
+def myFunction(progress):
+    if progress == 1.0:
+        return 100.0
+    else:
+        return -100.0
+
+class TestQEasingCurve(unittest.TestCase):
+    def testCustomType(self):
+        ec = QEasingCurve()
+        ec.setCustomType(myFunction)
+        self.assertEqual(ec.valueForProgress(1.0), 100.0)
+        self.assertEqual(ec.valueForProgress(0.5), -100.0)
+
+    def testObjectCleanup(self):
+        for i in range(100):
+            ec = QEasingCurve()
+            ec.setCustomType(myFunction)
+            self.assertEqual(ec.valueForProgress(1.0), 100.0)
+            self.assertEqual(ec.valueForProgress(0.5), -100.0)
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/tests/qtcore/qenum_test.py b/tests/QtCore/qenum_test.py
similarity index 90%
rename from tests/qtcore/qenum_test.py
rename to tests/QtCore/qenum_test.py
index e3f9638..d896ae6 100644
--- a/tests/qtcore/qenum_test.py
+++ b/tests/QtCore/qenum_test.py
@@ -3,7 +3,7 @@
 
 import unittest
 
-from PySide.QtCore import QIODevice, QString, Qt, QVariant
+from PySide.QtCore import *
 
 class TestEnum(unittest.TestCase):
 
@@ -18,7 +18,7 @@ class TestEnum(unittest.TestCase):
         self.assertEqual(QIODevice.Unbuffered, 32)
 
     def testToIntInFunction(self):
-        self.assertEqual(QString.number(QIODevice.WriteOnly), "2")
+        self.assertEqual(str(int(QIODevice.WriteOnly)), "2")
 
 class TestQFlags(unittest.TestCase):
     def testToItn(self):
diff --git a/tests/qtcore/qevent_test.py b/tests/QtCore/qevent_test.py
similarity index 100%
rename from tests/qtcore/qevent_test.py
rename to tests/QtCore/qevent_test.py
diff --git a/tests/qtcore/qfile_test.py b/tests/QtCore/qfile_test.py
similarity index 56%
rename from tests/qtcore/qfile_test.py
rename to tests/QtCore/qfile_test.py
index adbdd68..0b911cf 100644
--- a/tests/qtcore/qfile_test.py
+++ b/tests/QtCore/qfile_test.py
@@ -3,6 +3,7 @@ import unittest
 
 import os
 import tempfile
+import py3kcompat as py3k
 
 from PySide.QtCore import QFile, QIODevice
 
@@ -12,7 +13,7 @@ class GetCharTest(unittest.TestCase):
     def setUp(self):
         '''Acquire resources'''
         handle, self.filename = tempfile.mkstemp()
-        os.write(handle, 'a')
+        os.write(handle, py3k.b('a'))
         os.close(handle)
 
     def tearDown(self):
@@ -24,8 +25,19 @@ class GetCharTest(unittest.TestCase):
         obj = QFile(self.filename)
         obj.open(QIODevice.ReadOnly)
         self.assertEqual(obj.getChar(), (True, 'a'))
-        self.assert_(not obj.getChar()[0])
+        self.assertFalse(obj.getChar()[0])
         obj.close()
 
+    def testBug721(self):
+        obj = QFile(self.filename)
+        obj.open(QIODevice.ReadOnly)
+        memory = obj.map(0, 1)
+        self.assertEqual(len(memory), 1)
+        self.assertEqual(memory[0], py3k.b('a'))
+        obj.unmap(memory)
+        # now memory points to wild bytes... :-)
+        # uncommenting this must cause a segfault.
+        # self.assertEqual(memory[0], 'a')
+
 if __name__ == '__main__':
     unittest.main()
diff --git a/tests/qtcore/qfileinfo_test.py b/tests/QtCore/qfileinfo_test.py
similarity index 100%
rename from tests/qtcore/qfileinfo_test.py
rename to tests/QtCore/qfileinfo_test.py
diff --git a/tests/QtCore/qflags_test.py b/tests/QtCore/qflags_test.py
new file mode 100644
index 0000000..9d2f4b1
--- /dev/null
+++ b/tests/QtCore/qflags_test.py
@@ -0,0 +1,92 @@
+#!/usr/bin/python
+'''Test cases for QFlags'''
+
+import unittest
+from PySide.QtCore import Qt, QTemporaryFile, QFile, QIODevice, QObject
+
+class QFlagTest(unittest.TestCase):
+    '''Test case for usage of flags'''
+
+    def testCallFunction(self):
+        f = QTemporaryFile()
+        self.assertTrue(f.open())
+        fileName = f.fileName()
+        f.close()
+
+        f = QFile(fileName)
+        self.assertEqual(f.open(QIODevice.Truncate | QIODevice.Text | QIODevice.ReadWrite), True)
+        om = f.openMode()
+        self.assertEqual(om & QIODevice.Truncate, QIODevice.Truncate)
+        self.assertEqual(om & QIODevice.Text, QIODevice.Text)
+        self.assertEqual(om & QIODevice.ReadWrite, QIODevice.ReadWrite)
+        self.assertTrue(om == QIODevice.Truncate | QIODevice.Text | QIODevice.ReadWrite)
+        f.close()
+
+
+class QFlagOperatorTest(unittest.TestCase):
+    '''Test case for operators in QFlags'''
+
+    def testInvert(self):
+        '''QFlags ~ (invert) operator'''
+        self.assertEqual(type(~QIODevice.ReadOnly), QIODevice.OpenMode)
+
+    def testOr(self):
+        '''QFlags | (or) operator'''
+        self.assertEqual(type(QIODevice.ReadOnly | QIODevice.WriteOnly), QIODevice.OpenMode)
+
+    def testAnd(self):
+        '''QFlags & (and) operator'''
+        self.assertEqual(type(QIODevice.ReadOnly & QIODevice.WriteOnly), QIODevice.OpenMode)
+
+    def testIOr(self):
+        '''QFlags |= (ior) operator'''
+        flag = Qt.WindowFlags()
+        self.assertTrue(Qt.Widget == 0)
+        self.assertFalse(flag & Qt.Widget)
+        result = flag & Qt.Widget
+        self.assertTrue(result == 0)
+        flag |= Qt.WindowMinimizeButtonHint
+        self.assertTrue(flag & Qt.WindowMinimizeButtonHint)
+
+    def testInvertOr(self):
+        '''QFlags ~ (invert) operator over the result of an | (or) operator'''
+        self.assertEqual(type(~(Qt.ItemIsSelectable | Qt.ItemIsEditable)), Qt.ItemFlags)
+
+    def testEqual(self):
+        '''QFlags == operator'''
+        flags = Qt.Window
+        flags |= Qt.WindowMinimizeButtonHint
+        flag_type = (flags & Qt.WindowType_Mask)
+        self.assertEqual(flag_type, Qt.Window)
+
+        self.assertEqual(Qt.KeyboardModifiers(Qt.ControlModifier), Qt.ControlModifier)
+
+    def testOperatorBetweenFlags(self):
+        '''QFlags & QFlags'''
+        flags = Qt.NoItemFlags | Qt.ItemIsUserCheckable
+        newflags = Qt.NoItemFlags | Qt.ItemIsUserCheckable
+        self.assertTrue(flags & newflags)
+
+    def testOperatorDifferentOrder(self):
+        '''Different ordering of arguments'''
+        flags = Qt.NoItemFlags | Qt.ItemIsUserCheckable
+        self.assertEqual(flags | Qt.ItemIsEnabled, Qt.ItemIsEnabled | flags)
+
+class QFlagsOnQVariant(unittest.TestCase):
+    def testQFlagsOnQVariant(self):
+        o = QObject()
+        o.setProperty("foo", QIODevice.ReadOnly | QIODevice.WriteOnly)
+        self.assertEqual(type(o.property("foo")), QIODevice.OpenMode)
+
+class QFlagsWrongType(unittest.TestCase):
+    def testWrongType(self):
+        '''Wrong type passed to QFlags binary operators'''
+
+        self.assertRaises(TypeError, Qt.NoItemFlags | '43')
+        self.assertRaises(TypeError, Qt.NoItemFlags & '43')
+        self.assertRaises(TypeError, 'jabba' & Qt.NoItemFlags)
+        self.assertRaises(TypeError, 'hut' & Qt.NoItemFlags)
+        self.assertRaises(TypeError, Qt.NoItemFlags & QObject())
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/tests/qtcore/qhandle_test.py b/tests/QtCore/qhandle_test.py
similarity index 100%
rename from tests/qtcore/qhandle_test.py
rename to tests/QtCore/qhandle_test.py
diff --git a/tests/QtCore/qinstallmsghandler_test.py b/tests/QtCore/qinstallmsghandler_test.py
new file mode 100644
index 0000000..b4aa2d5
--- /dev/null
+++ b/tests/QtCore/qinstallmsghandler_test.py
@@ -0,0 +1,53 @@
+
+'''Test cases for qInstallMsgHandler'''
+
+import unittest
+import sys
+
+from PySide.QtCore import *
+
+param = []
+
+def handler(msgt, msg):
+    global param
+    param = [msgt, msg.strip()]
+
+def handleruseless(msgt, msg):
+    pass
+
+class QInstallMsgHandlerTest(unittest.TestCase):
+
+    def tearDown(self):
+        # Ensure that next test will have a clear environment
+        qInstallMsgHandler(None)
+
+    def testNone(self):
+        ret = qInstallMsgHandler(None)
+        self.assertEqual(ret, None)
+
+    def testRet(self):
+        ret = qInstallMsgHandler(None)
+        self.assertEqual(ret, None)
+        refcount = sys.getrefcount(handleruseless)
+        retNone = qInstallMsgHandler(handleruseless)
+        self.assertEqual(sys.getrefcount(handleruseless), refcount + 1)
+        rethandler = qInstallMsgHandler(None)
+        self.assertEqual(rethandler, handleruseless)
+        del rethandler
+        self.assertEqual(sys.getrefcount(handleruseless), refcount)
+
+    def testHandler(self):
+        rethandler = qInstallMsgHandler(handler)
+        qDebug("Test Debug")
+        self.assertEqual(param[0], QtDebugMsg)
+        self.assertEqual(param[1], "Test Debug")
+        qWarning("Test Warning")
+        self.assertEqual(param[0], QtWarningMsg)
+        self.assertEqual(param[1], "Test Warning")
+        qCritical("Test Critical")
+        self.assertEqual(param[0], QtCriticalMsg)
+        self.assertEqual(param[1], "Test Critical")
+
+if __name__ == '__main__':
+    unittest.main()
+
diff --git a/tests/qtcore/qlinef_test.py b/tests/QtCore/qlinef_test.py
similarity index 100%
rename from tests/qtcore/qlinef_test.py
rename to tests/QtCore/qlinef_test.py
diff --git a/tests/qtcore/qlocale_test.py b/tests/QtCore/qlocale_test.py
similarity index 100%
rename from tests/qtcore/qlocale_test.py
rename to tests/QtCore/qlocale_test.py
diff --git a/tests/qtcore/qmetaobject_test.py b/tests/QtCore/qmetaobject_test.py
similarity index 64%
rename from tests/qtcore/qmetaobject_test.py
rename to tests/QtCore/qmetaobject_test.py
index 667e763..e0062e3 100644
--- a/tests/qtcore/qmetaobject_test.py
+++ b/tests/QtCore/qmetaobject_test.py
@@ -14,6 +14,7 @@ class DynObject(QObject):
         pass
 
 class qmetaobject_test(unittest.TestCase):
+    """
     def test_QMetaObject(self):
         qobj = QObject()
         qobj_metaobj = qobj.metaObject()
@@ -30,20 +31,23 @@ class qmetaobject_test(unittest.TestCase):
         f = QFile()
         fm = f.metaObject()
         self.assertEqual(m.methodCount(), fm.methodCount())
+    """        
 
     def test_DynamicSlotSignal(self):
         o = DynObject()
         o2 = QObject()
 
-        method_count_base  = o.metaObject().methodCount()
+        o.connect(o2, SIGNAL("bars()"), o.slot)
+        self.assertTrue(o2.metaObject().indexOfMethod("bars()") > -1)
+        #self.assertTrue(o.metaObject().indexOfMethod("bar()") == -1)
+        #self.assertTrue(o.metaObject().indexOfMethod("slot()") > -1)
 
-        o.connect(o2, SIGNAL("bar()"), o.slot)
-        slot_index = o.metaObject().indexOfMethod("slot()")
+        #slot_index = o.metaObject().indexOfMethod("slot()")
 
-        o.connect(o, SIGNAL("foo()"), o2, SIGNAL("bar()"))
-        signal_index = o.metaObject().indexOfMethod("foo()");
+        #o.connect(o, SIGNAL("foo()"), o2, SIGNAL("bar()"))
+        #signal_index = o.metaObject().indexOfMethod("foo()");
 
-        self.assert_(slot_index != signal_index)
+        #self.assert_(slot_index != signal_index)
 
 
 if __name__ == '__main__':
diff --git a/tests/qtcore/qmodelindex_internalpointer_test.py b/tests/QtCore/qmodelindex_internalpointer_test.py
similarity index 100%
rename from tests/qtcore/qmodelindex_internalpointer_test.py
rename to tests/QtCore/qmodelindex_internalpointer_test.py
diff --git a/tests/qtcore/qobject_children_segfault_test.py b/tests/QtCore/qobject_children_segfault_test.py
similarity index 100%
rename from tests/qtcore/qobject_children_segfault_test.py
rename to tests/QtCore/qobject_children_segfault_test.py
diff --git a/tests/qtcore/qobject_connect_notify_test.py b/tests/QtCore/qobject_connect_notify_test.py
similarity index 94%
rename from tests/qtcore/qobject_connect_notify_test.py
rename to tests/QtCore/qobject_connect_notify_test.py
index 4410375..b87dd4d 100644
--- a/tests/qtcore/qobject_connect_notify_test.py
+++ b/tests/QtCore/qobject_connect_notify_test.py
@@ -14,9 +14,11 @@ class Obj(QObject):
         QObject.__init__(self)
         self.con_notified = False
         self.dis_notified = False
+        self.signal = ""
 
     def connectNotify(self, signal):
         self.con_notified = True
+        self.signal = signal
 
     def disconnectNotify(self, signal):
         self.dis_notified = True
@@ -39,6 +41,7 @@ class TestQObjectConnectNotify(UsesQCoreApplication):
         receiver = QObject()
         sender.connect(SIGNAL("destroyed()"), receiver, SLOT("deleteLater()"))
         self.assert_(sender.con_notified)
+        self.assertEqual(sender.signal, SIGNAL("destroyed()"))
         sender.disconnect(SIGNAL("destroyed()"), receiver, SLOT("deleteLater()"))
         self.assert_(sender.dis_notified)
 
diff --git a/tests/QtCore/qobject_destructor.py b/tests/QtCore/qobject_destructor.py
new file mode 100644
index 0000000..036bf1d
--- /dev/null
+++ b/tests/QtCore/qobject_destructor.py
@@ -0,0 +1,19 @@
+import sys
+import unittest
+from PySide import QtCore
+
+class MyObject(QtCore.QObject):
+    def __init__(self, other=None):
+        QtCore.QObject.__init__(self, None)
+        self._o = other
+
+class TestDestructor(unittest.TestCase):
+    def testReference(self):
+        o = QtCore.QObject()
+        m = MyObject(o)
+        self.assertEqual(sys.getrefcount(o), 3)
+        del m
+        self.assertEqual(sys.getrefcount(o), 2)
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/tests/qtcore/qobject_event_filter_test.py b/tests/QtCore/qobject_event_filter_test.py
similarity index 68%
rename from tests/qtcore/qobject_event_filter_test.py
rename to tests/QtCore/qobject_event_filter_test.py
index 8018fcd..8fded79 100644
--- a/tests/qtcore/qobject_event_filter_test.py
+++ b/tests/QtCore/qobject_event_filter_test.py
@@ -2,6 +2,8 @@
 '''Test cases for QObject.eventFilter'''
 
 import unittest
+import weakref
+import sys
 
 from PySide.QtCore import QObject, QTimerEvent
 
@@ -76,5 +78,39 @@ class TestQObjectEventFilterPython(UsesQCoreApplication):
         self.assertEqual(filtered.times_called, 5)
         self.assertEqual(self.obj_filter.events_handled, 5)
 
+    def testInstallEventFilterRefCountAfterDelete(self):
+        '''Bug 910 - installEventFilter() increments reference count on target object
+        http://bugs.pyside.org/show_bug.cgi?id=910'''
+        obj = QObject()
+        filt = QObject()
+
+        self.assertEqual(sys.getrefcount(obj), 2)
+        self.assertEqual(sys.getrefcount(filt), 2)
+        obj.installEventFilter(filt)
+        self.assertEqual(sys.getrefcount(obj), 2)
+        self.assertEqual(sys.getrefcount(filt), 2)
+
+        wref = weakref.ref(obj)
+        del obj
+        self.assertEqual(wref(), None)
+
+    def testInstallEventFilterRefCountAfterRemove(self):
+        # Bug 910
+        obj = QObject()
+        filt = QObject()
+
+        self.assertEqual(sys.getrefcount(obj), 2)
+        self.assertEqual(sys.getrefcount(filt), 2)
+        obj.installEventFilter(filt)
+        self.assertEqual(sys.getrefcount(obj), 2)
+        self.assertEqual(sys.getrefcount(filt), 2)
+        obj.removeEventFilter(filt)
+        self.assertEqual(sys.getrefcount(obj), 2)
+        self.assertEqual(sys.getrefcount(filt), 2)
+
+        wref = weakref.ref(obj)
+        del obj
+        self.assertEqual(wref(), None)
+
 if __name__ == '__main__':
     unittest.main()
diff --git a/tests/qtcore/qobject_inherits_test.py b/tests/QtCore/qobject_inherits_test.py
similarity index 60%
rename from tests/qtcore/qobject_inherits_test.py
rename to tests/QtCore/qobject_inherits_test.py
index 9e02b0a..a3db11a 100644
--- a/tests/qtcore/qobject_inherits_test.py
+++ b/tests/QtCore/qobject_inherits_test.py
@@ -38,6 +38,26 @@ class InheritsCase(unittest.TestCase):
         self.assert_(Dummy().inherits('QObject'))
         self.assert_(not Dummy().inherits('Parent'))
 
+    def testSetAttributeBeforeCallingInitOnQObjectDerived(self):
+        '''Test for bug #428.'''
+        class DerivedObject(QObject):
+            def __init__(self):
+                self.member = 'member'
+                QObject.__init__(self)
+        obj0 = DerivedObject()
+        # The second instantiation of DerivedObject will generate an exception
+        # that will not come to surface immediately.
+        obj1 = DerivedObject()
+        # The mere calling of the object method causes
+        # the exception to "reach the surface".
+        obj1.objectName()
+
+    def testMultipleInheritance(self):
+        def declareClass():
+            class Foo(object, QObject):
+                pass
+
+        self.assertRaises(TypeError, declareClass)
 
 if __name__ == '__main__':
     unittest.main()
diff --git a/tests/QtCore/qobject_objectproperty_test.py b/tests/QtCore/qobject_objectproperty_test.py
new file mode 100644
index 0000000..2456b82
--- /dev/null
+++ b/tests/QtCore/qobject_objectproperty_test.py
@@ -0,0 +1,29 @@
+#!/usr/bin/python
+# -*- coding: utf-8 -*-
+'''Test case for the bug #378
+http://bugs.openbossa.org/show_bug.cgi?id=378
+'''
+
+import unittest
+from PySide.QtCore import QObject
+
+class ExtQObject(QObject):
+    def __init__(self):
+        # "foobar" will become a object attribute that will not be
+        # listed on the among the type attributes. Thus for bug
+        # condition be correctly triggered the "foobar" attribute
+        # must not previously exist in the parent class.
+        self.foobar = None
+        # The parent __init__ method must be called after the
+        # definition of "self.foobar".
+        QObject.__init__(self)
+
+class TestBug378(unittest.TestCase):
+    '''Test case for the bug #378'''
+
+    def testBug378(self):
+        obj = ExtQObject()
+
+if __name__ == '__main__':
+    unittest.main()
+
diff --git a/tests/qtcore/qobject_parent_test.py b/tests/QtCore/qobject_parent_test.py
similarity index 86%
rename from tests/qtcore/qobject_parent_test.py
rename to tests/QtCore/qobject_parent_test.py
index 4699fc6..ea393d8 100644
--- a/tests/qtcore/qobject_parent_test.py
+++ b/tests/QtCore/qobject_parent_test.py
@@ -4,7 +4,7 @@
 import unittest
 from sys import getrefcount
 
-from PySide.QtCore import QObject, QTimer
+from PySide.QtCore import *
 
 class ParentRefCountCase(unittest.TestCase):
     '''Test case for the refcount changes of setParent'''
@@ -25,6 +25,13 @@ class ParentRefCountCase(unittest.TestCase):
         self.child.setParent(self.parent)
         self.assertEqual(getrefcount(self.child), 3)
 
+    def testSetParentTwice(self):
+        self.assertEqual(getrefcount(self.child), 2)
+        self.child.setParent(self.parent)
+        self.assertEqual(getrefcount(self.child), 3)
+        self.child.setParent(self.parent)
+        self.assertEqual(getrefcount(self.child), 3)
+
     def testConstructor(self):
         #QObject(QObject) refcount changes
         child = QObject(self.parent)
@@ -71,6 +78,17 @@ class ParentCase(unittest.TestCase):
         for i, child in enumerate(children):
             self.assertEqual(child, parent.findChild(QObject, name % i))
 
+    def testFindChildWithoutName(self):
+        parent = QObject()
+        name = 'object%d'
+        children = [QObject(parent) for i in range(20)]
+
+        for i, child in enumerate(children):
+            child.setObjectName(name % i)
+
+        child = parent.findChild(QObject)
+        self.assertTrue(isinstance(child, QObject))
+
     def testFindChildren(self):
         #QObject.findChildren() with all QObject
         parent = QObject()
@@ -87,8 +105,16 @@ class ParentCase(unittest.TestCase):
         # Emulates findChildren with the intended outcome
         target_children = [x for x in children if x.objectName() == target_name]
         test_children = parent.findChildren(QObject, target_name)
+        self.assertEqual(target_children, test_children)
+
+        # test findChildren default value
+        res = parent.findChildren(QTimer)
+        self.assertEqual(len(res), 20)
+
+        # test findChildre with a regex
+        res = parent.findChildren(QObject, QRegExp("^fo+"))
+        self.assertEqual(res, test_children)
 
-        self.assertEqual(sorted(target_children), sorted(test_children))
 
     def testParentEquality(self):
         #QObject.parent() == parent
@@ -191,7 +217,7 @@ class ReparentingTest(unittest.TestCase):
             object_list.append(obj)
             obj.setParent(parent)
         for child in parent.children():
-            self.assert_(child in object_list)
+            self.assertTrue(child in object_list)
 
     def testParentedExtQObjectType(self):
         object_list = []
@@ -214,7 +240,7 @@ class ReparentingTest(unittest.TestCase):
         for obj in object_list:
             obj.setParent(new_parent)
         for child in new_parent.children():
-            self.assert_(child in object_list)
+            self.assertTrue(child in object_list)
 
     def testReparentedExtQObjectType(self):
         object_list = []
diff --git a/tests/QtCore/qobject_property_test.py b/tests/QtCore/qobject_property_test.py
new file mode 100644
index 0000000..17589cb
--- /dev/null
+++ b/tests/QtCore/qobject_property_test.py
@@ -0,0 +1,42 @@
+
+'''Test cases for QObject property and setProperty'''
+
+import unittest
+
+from PySide.QtCore import QObject, Property, Signal
+
+class MyObjectWithNotifyProperty(QObject):
+    def __init__(self, parent=None):
+        QObject.__init__(self, parent)
+        self.p = 0
+
+    def readP(self):
+        return self.p
+
+    def writeP(self, v):
+        self.p = v
+        self.notifyP.emit()
+
+    notifyP = Signal()
+    myProperty = Property(int, readP, fset=writeP, notify=notifyP)
+
+class PropertyWithNotify(unittest.TestCase):
+    def called(self):
+        self.called_ = True
+
+    def testNotify(self):
+        self.called_ = False
+        obj = MyObjectWithNotifyProperty()
+        obj.notifyP.connect(self.called)
+        obj.myProperty = 10
+        self.assert_(self.called_)
+
+    def testHasProperty(self):
+        o = MyObjectWithNotifyProperty()
+        o.setProperty("myProperty", 10)
+        self.assertEqual(o.myProperty, 10)
+        self.assertEqual(o.property("myProperty"), 10)
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/tests/qtcore/qobject_protected_methods_test.py b/tests/QtCore/qobject_protected_methods_test.py
similarity index 87%
rename from tests/qtcore/qobject_protected_methods_test.py
rename to tests/QtCore/qobject_protected_methods_test.py
index 530b870..37bda37 100644
--- a/tests/qtcore/qobject_protected_methods_test.py
+++ b/tests/QtCore/qobject_protected_methods_test.py
@@ -23,7 +23,7 @@ class QObjectReceivers(unittest.TestCase):
         self.assertEqual(obj.receivers(SIGNAL("destroyed()")), 0)
 
         QObject.connect(obj, SIGNAL("destroyed()"), self.cb)
-        self.assertEqual(obj.receivers(SIGNAL("destroyed()")), 0)
+        self.assertEqual(obj.receivers(SIGNAL("destroyed()")), 1)
 
     def testQThreadReceiversExtern(self):
         #QThread.receivers() - Inherited protected method
@@ -31,7 +31,7 @@ class QObjectReceivers(unittest.TestCase):
         obj = QThread()
         self.assertEqual(obj.receivers(SIGNAL('destroyed()')), 0)
         QObject.connect(obj, SIGNAL("destroyed()"), self.cb)
-        self.assertEqual(obj.receivers(SIGNAL("destroyed()")), 0)
+        self.assertEqual(obj.receivers(SIGNAL("destroyed()")), 1)
 
 
 if __name__ == '__main__':
diff --git a/tests/qtcore/qobject_test.py b/tests/QtCore/qobject_test.py
similarity index 93%
rename from tests/qtcore/qobject_test.py
rename to tests/QtCore/qobject_test.py
index a1749ba..492fc91 100644
--- a/tests/qtcore/qobject_test.py
+++ b/tests/QtCore/qobject_test.py
@@ -3,6 +3,7 @@
 '''Test cases for QObject methods'''
 
 import unittest
+import py3kcompat as py3k
 
 from PySide.QtCore import QObject
 
@@ -31,8 +32,7 @@ class ObjectNameCase(unittest.TestCase):
         self.assertEqual('', obj.objectName())
 
     def testUnicode(self):
-        #QObject.setObjectName(unicode)
-        name = u'diseño'
+        name = py3k.unicode_('não')
         #FIXME Strange error on upstream when using equal(name, obj)
         obj = QObject()
         obj.setObjectName(name)
diff --git a/tests/qtcore/qobject_timer_event_test.py b/tests/QtCore/qobject_timer_event_test.py
similarity index 100%
rename from tests/qtcore/qobject_timer_event_test.py
rename to tests/QtCore/qobject_timer_event_test.py
diff --git a/tests/qtcore/qobject_tr_as_instance_test.py b/tests/QtCore/qobject_tr_as_instance_test.py
similarity index 100%
rename from tests/qtcore/qobject_tr_as_instance_test.py
rename to tests/QtCore/qobject_tr_as_instance_test.py
diff --git a/tests/qtcore/qpoint_test.py b/tests/QtCore/qpoint_test.py
similarity index 100%
rename from tests/qtcore/qpoint_test.py
rename to tests/QtCore/qpoint_test.py
diff --git a/tests/QtCore/qprocess_test.py b/tests/QtCore/qprocess_test.py
new file mode 100644
index 0000000..96a6b79
--- /dev/null
+++ b/tests/QtCore/qprocess_test.py
@@ -0,0 +1,29 @@
+#!/usr/bin/python
+'''Test cases for QProcess'''
+
+import unittest
+import os
+import py3kcompat as py3k
+
+from PySide.QtCore import *
+
+class TestQProcess (unittest.TestCase):
+    def testStartDetached(self):
+        value, pid = QProcess.startDetached("dir", [], os.getcwd())
+        self.assertTrue(isinstance(value, bool))
+        self.assertTrue(isinstance(pid, py3k.long))
+
+    def testPid(self):
+        p = QProcess()
+        p.start("dir")
+        p.waitForStarted()
+        pid = p.pid()
+        # We can't test the pid method result because it returns 0 when the
+        # process isn't running
+        if p.state() == QProcess.Running:
+            self.assertNotEqual(pid, 0)
+        else:
+            print("PROCESS ALREADY DEAD :-/")
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/tests/QtCore/qproperty_decorator.py b/tests/QtCore/qproperty_decorator.py
new file mode 100644
index 0000000..404ce24
--- /dev/null
+++ b/tests/QtCore/qproperty_decorator.py
@@ -0,0 +1,35 @@
+import weakref
+import unittest
+
+from PySide.QtCore import QObject, Property
+
+class MyObject(QObject):
+    def __init__(self):
+        QObject.__init__(self)
+        self._value = None
+
+    @Property(int)
+    def value(self):
+        return self._value
+
+    @value.setter
+    def valueSet(self, value):
+        self._value = value
+
+
+class PropertyTest(unittest.TestCase):
+    def destroyCB(self, obj):
+        self._obDestroyed = True
+
+    def testDecorator(self):
+        self._obDestroyed = False
+        o = MyObject()
+        weak = weakref.ref(o, self.destroyCB)
+        o.value = 10
+        self.assertEqual(o._value, 10)
+        self.assertEqual(o.value, 10)
+        del o
+        self.assertTrue(self._obDestroyed)
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/tests/qtcore/qrect_test.py b/tests/QtCore/qrect_test.py
similarity index 88%
rename from tests/qtcore/qrect_test.py
rename to tests/QtCore/qrect_test.py
index 3c5f5be..a6d38d9 100644
--- a/tests/qtcore/qrect_test.py
+++ b/tests/QtCore/qrect_test.py
@@ -3,7 +3,7 @@
 
 import unittest
 
-from PySide.QtCore import QPoint, QRect
+from PySide.QtCore import QPoint, QRect, QRectF
 
 class RectConstructor(unittest.TestCase):
 
@@ -97,6 +97,16 @@ class RectOperator(unittest.TestCase):
         rect3 = rect1 | rect2
         self.assertEqual(rect3, rect1)
 
+    def testGetCoordsAndRect(self):
+        rect1 = QRect(1, 2, 3, 4)
+        self.assertEqual(rect1.getRect(), (1, 2, 3, 4))
+        self.assertEqual(rect1.getCoords(), (1, 2, 3, 5))
+
+        rect1 = QRectF(1, 2, 3, 4)
+        self.assertEqual(rect1.getRect(), (1, 2, 3, 4))
+        self.assertEqual(rect1.getCoords(), (1, 2, 4, 6))
+
+
 
 if __name__ == '__main__':
     unittest.main()
diff --git a/tests/QtCore/qregexp_test.py b/tests/QtCore/qregexp_test.py
new file mode 100644
index 0000000..5499185
--- /dev/null
+++ b/tests/QtCore/qregexp_test.py
@@ -0,0 +1,20 @@
+#!/usr/bin/python
+
+import unittest
+from PySide.QtCore import QRegExp
+
+class QRegExpTest(unittest.TestCase):
+
+    def testReplace1(self):
+        re = QRegExp('a[mn]')
+        string = re.replace('Banana', 'ox')
+        self.assertEqual(string, 'Boxoxa')
+
+    def testReplace2(self):
+        re = QRegExp('<i>([^<]*)</i>')
+        string = re.replace('A <i>bon mot</i>.', '\\emph{\\1}')
+        self.assertEqual(string, 'A \\emph{bon mot}.')
+
+if __name__ == '__main__':
+    unittest.main()
+
diff --git a/tests/QtCore/qresource_test.py b/tests/QtCore/qresource_test.py
new file mode 100644
index 0000000..4abc3ca
--- /dev/null
+++ b/tests/QtCore/qresource_test.py
@@ -0,0 +1,42 @@
+# -*- coding: utf-8 -*-
+
+'''Test cases for QResource usage'''
+
+import unittest
+from helper import adjust_filename
+from PySide.QtCore import QFile, QIODevice
+import resources_mc
+
+class ResourcesUsage(unittest.TestCase):
+    '''Test case for resources usage'''
+
+    def testPhrase(self):
+        #Test loading of quote.txt resource
+        f = open(adjust_filename('quoteEnUS.txt', __file__), "r")
+        orig = f.read()
+        f.close()
+
+        f = QFile(':/quote.txt')
+        f.open(QIODevice.ReadOnly) #|QIODevice.Text)
+        print("Error:", f.errorString())
+        copy = f.readAll()
+        f.close()
+        self.assertEqual(orig, copy)
+
+    def testImage(self):
+        #Test loading of sample.png resource
+        f = open(adjust_filename('sample.png', __file__), "rb")
+        orig = f.read()
+        f.close()
+
+        f = QFile(':/sample.png')
+        f.open(QIODevice.ReadOnly)
+        copy = f.readAll()
+        f.close()
+        self.assertEqual(len(orig), len(copy))
+        self.assertEqual(orig, copy)
+
+
+if __name__ == '__main__':
+    unittest.main()
+
diff --git a/tests/qtcore/qsize_test.py b/tests/QtCore/qsize_test.py
similarity index 100%
rename from tests/qtcore/qsize_test.py
rename to tests/QtCore/qsize_test.py
diff --git a/tests/qtcore/qslot_object_test.py b/tests/QtCore/qslot_object_test.py
similarity index 100%
rename from tests/qtcore/qslot_object_test.py
rename to tests/QtCore/qslot_object_test.py
diff --git a/tests/qtcore/qsrand_test.py b/tests/QtCore/qsrand_test.py
similarity index 100%
rename from tests/qtcore/qsrand_test.py
rename to tests/QtCore/qsrand_test.py
diff --git a/tests/qtcore/qstate_test.py b/tests/QtCore/qstate_test.py
similarity index 69%
rename from tests/qtcore/qstate_test.py
rename to tests/QtCore/qstate_test.py
index d7c9a4c..bee73e4 100644
--- a/tests/qtcore/qstate_test.py
+++ b/tests/QtCore/qstate_test.py
@@ -1,6 +1,6 @@
 #!/usr/bin/python
 import unittest
-from PySide.QtCore import QObject, QState, QFinalState, SIGNAL, QCoreApplication, QTimer, QStateMachine, QSignalTransition, QVariant
+from PySide.QtCore import *
 
 
 class QStateTest(unittest.TestCase):
@@ -8,11 +8,11 @@ class QStateTest(unittest.TestCase):
         app = QCoreApplication([])
 
         o = QObject()
-        o.setProperty("text", QVariant("INdT"))
+        o.setProperty("text", "INdT")
 
         machine = QStateMachine()
         s1 = QState()
-        s1.assignProperty(o, "text", QVariant("Rocks"));
+        s1.assignProperty(o, "text", "Rocks");
 
         s2 = QFinalState()
         t = s1.addTransition(o, SIGNAL("change()"), s2);
@@ -28,7 +28,7 @@ class QStateTest(unittest.TestCase):
         QTimer.singleShot(100, app.quit)
         app.exec_()
 
-        txt = o.property("text").toString()
+        txt = o.property("text")
         self.assert_(txt, "Rocks")
 
 if __name__ == '__main__':
diff --git a/tests/qtcore/qstatemachine_test.py b/tests/QtCore/qstatemachine_test.py
similarity index 100%
rename from tests/qtcore/qstatemachine_test.py
rename to tests/QtCore/qstatemachine_test.py
diff --git a/tests/QtCore/qstring_test.py b/tests/QtCore/qstring_test.py
new file mode 100644
index 0000000..5f2eb9a
--- /dev/null
+++ b/tests/QtCore/qstring_test.py
@@ -0,0 +1,22 @@
+#!/usr/bin/python
+# -*- coding: utf-8 -*-
+'''Test cases for QString'''
+
+import unittest
+import py3kcompat as py3k
+from PySide.QtCore import QObject
+
+class QStringConstructor(unittest.TestCase):
+    '''Test case for QString constructors'''
+
+    def testQStringDefault(self):
+        obj = QObject()
+        obj.setObjectName('foo')
+        self.assertEqual(obj.objectName(), py3k.unicode_('foo'))
+        obj.setObjectName(py3k.unicode_('áâãà'))
+        self.assertEqual(obj.objectName(), py3k.unicode_('áâãà'))
+        obj.setObjectName(None)
+        self.assertEqual(obj.objectName(), py3k.unicode_(''))
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/tests/QtCore/qsysinfo_test.py b/tests/QtCore/qsysinfo_test.py
new file mode 100644
index 0000000..e9486f5
--- /dev/null
+++ b/tests/QtCore/qsysinfo_test.py
@@ -0,0 +1,14 @@
+import unittest
+from PySide.QtCore import QSysInfo
+
+class TestQSysInfo(unittest.TestCase):
+    def testEnumEndian(self):
+        self.assertEqual(QSysInfo.BigEndian, 0)
+        self.assertEqual(QSysInfo.LittleEndian, 1)
+        self.assert_(QSysInfo.ByteOrder > -1)
+
+    def testEnumSizes(self):
+        self.assert_(QSysInfo.WordSize > 0)
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/tests/qtcore/qtext_codec_test.py b/tests/QtCore/qtext_codec_test.py
similarity index 100%
rename from tests/qtcore/qtext_codec_test.py
rename to tests/QtCore/qtext_codec_test.py
diff --git a/tests/qtcore/qtextstream_test.py b/tests/QtCore/qtextstream_test.py
similarity index 82%
rename from tests/qtcore/qtextstream_test.py
rename to tests/QtCore/qtextstream_test.py
index 13dc651..c5c87ed 100644
--- a/tests/qtcore/qtextstream_test.py
+++ b/tests/QtCore/qtextstream_test.py
@@ -2,9 +2,9 @@
 '''Unit tests for QTextStream'''
 
 import unittest
+import py3kcompat as py3k
 
-from PySide.QtCore import QTextStream, QIODevice, QString, QByteArray
-from PySide.QtCore import QTextCodec, QFile
+from PySide.QtCore import QByteArray, QTextStream, QIODevice, QTextCodec, QFile
 
 class QTextStreamShiftTest(unittest.TestCase):
 
@@ -16,18 +16,11 @@ class QTextStreamShiftTest(unittest.TestCase):
     def testNumber(self):
         '''QTextStream << number'''
 
-        self.write << QString('4')
+        self.write << '4'
         self.write.flush()
         res = self.read.readLine()
-        self.assert_(isinstance(res, QString))
-        self.assertEqual(res, QString('4'))
-
-    def testString(self):
-        self.write << QString('Test_it!')
-        self.write.flush()
-        res = QString()
-        self.read >> res
-        self.assertEqual(res, QString('Test_it!'))
+        self.assertTrue(isinstance(res, py3k.unicode))
+        self.assertEqual(res, '4')
 
 class QTextStreamGetSet(unittest.TestCase):
 
@@ -60,7 +53,7 @@ class QTextStreamInitialization(unittest.TestCase):
         self.assertEqual(obj.device(), None)
         self.assertEqual(obj.string(), None)
 
-        self.assert_(obj.atEnd())
+        self.assertTrue(obj.atEnd())
         self.assertEqual(obj.readAll(), '')
 
 class QTextStreamReadLinesFromDevice(unittest.TestCase):
diff --git a/tests/qtcore/qthread_prod_cons_test.py b/tests/QtCore/qthread_prod_cons_test.py
similarity index 100%
rename from tests/qtcore/qthread_prod_cons_test.py
rename to tests/QtCore/qthread_prod_cons_test.py
diff --git a/tests/qtcore/qthread_signal_test.py b/tests/QtCore/qthread_signal_test.py
old mode 100755
new mode 100644
similarity index 100%
rename from tests/qtcore/qthread_signal_test.py
rename to tests/QtCore/qthread_signal_test.py
diff --git a/tests/qtcore/qthread_test.py b/tests/QtCore/qthread_test.py
similarity index 94%
rename from tests/qtcore/qthread_test.py
rename to tests/QtCore/qthread_test.py
index 410afb9..dc99c8e 100644
--- a/tests/qtcore/qthread_test.py
+++ b/tests/QtCore/qthread_test.py
@@ -17,6 +17,7 @@ class Dummy(QThread):
 
     def run(self):
         #Start-quit sequence
+        self.qobj = QObject()
         mutex.lock()
         self.called = True
         mutex.unlock()
@@ -70,6 +71,7 @@ class QThreadSimpleCase(UsesQCoreApplication):
         QTimer.singleShot(1000, self.abort_application)
         self.app.exec_()
 
+        self.assertEqual(obj.qobj.thread(), obj) # test QObject.thread() method
         self.assert_(self.called)
 
 if __name__ == '__main__':
diff --git a/tests/qtcore/qtimer_singleshot_test.py b/tests/QtCore/qtimer_singleshot_test.py
similarity index 56%
rename from tests/qtcore/qtimer_singleshot_test.py
rename to tests/QtCore/qtimer_singleshot_test.py
index 96107ec..09c9ed6 100644
--- a/tests/qtcore/qtimer_singleshot_test.py
+++ b/tests/QtCore/qtimer_singleshot_test.py
@@ -4,7 +4,7 @@
 
 import unittest
 
-from PySide.QtCore import QObject, QTimer, QCoreApplication, SIGNAL
+from PySide.QtCore import QObject, QTimer, QCoreApplication, Signal
 from helper import UsesQCoreApplication
 
 class WatchDog(QObject):
@@ -40,7 +40,36 @@ class TestSingleShot(UsesQCoreApplication):
         self.app.quit()
 
     def testSingleShot(self):
-        timer = QTimer.singleShot(100, self.callback)
+        QTimer.singleShot(100, self.callback)
+        self.app.exec_()
+        self.assert_(self.called)
+
+class SigEmitter(QObject):
+
+    sig1 = Signal()
+
+
+class TestSingleShotSignal(UsesQCoreApplication):
+    '''Test case for QTimer.singleShot connecting to signals'''
+
+    def setUp(self):
+        UsesQCoreApplication.setUp(self)
+        self.watchdog = WatchDog(self)
+        self.called = False
+
+    def tearDown(self):
+        del self.watchdog
+        del self.called
+        UsesQCoreApplication.tearDown(self)
+
+    def callback(self):
+        self.called = True
+        self.app.quit()
+
+    def testSingleShotSignal(self):
+        emitter = SigEmitter()
+        emitter.sig1.connect(self.callback)
+        QTimer.singleShot(100, emitter.sig1)
         self.app.exec_()
         self.assert_(self.called)
 
diff --git a/tests/qtcore/qtimer_timeout_test.py b/tests/QtCore/qtimer_timeout_test.py
similarity index 92%
rename from tests/qtcore/qtimer_timeout_test.py
rename to tests/QtCore/qtimer_timeout_test.py
index 8dfe395..5b833fd 100644
--- a/tests/qtcore/qtimer_timeout_test.py
+++ b/tests/QtCore/qtimer_timeout_test.py
@@ -3,6 +3,7 @@
 
 import unittest
 import os
+import sys
 from tempfile import mkstemp
 from PySide.QtCore import QObject, QTimer, SIGNAL
 from helper import UsesQCoreApplication
@@ -44,6 +45,7 @@ class TestTimeoutSignal(UsesQCoreApplication):
 
     def testTimeoutSignal(self):
         #Test the QTimer timeout() signal
+        refCount = sys.getrefcount(self.timer)
         QObject.connect(self.timer, SIGNAL('timeout()'), self.callback)
         self.timer.start(4)
         self.watchdog.startTimer(10)
@@ -51,6 +53,7 @@ class TestTimeoutSignal(UsesQCoreApplication):
         self.app.exec_()
 
         self.assert_(self.called)
+        self.assertEqual(sys.getrefcount(self.timer), refCount)
 
 if __name__ == '__main__':
     unittest.main()
diff --git a/tests/qtcore/qtnamespace_test.py b/tests/QtCore/qtnamespace_test.py
similarity index 100%
rename from tests/qtcore/qtnamespace_test.py
rename to tests/QtCore/qtnamespace_test.py
diff --git a/tests/qtcore/quoteEnUS.txt b/tests/QtCore/quoteEnUS.txt
similarity index 100%
rename from tests/qtcore/quoteEnUS.txt
rename to tests/QtCore/quoteEnUS.txt
diff --git a/tests/qtcore/qurl_test.py b/tests/QtCore/qurl_test.py
similarity index 100%
rename from tests/qtcore/qurl_test.py
rename to tests/QtCore/qurl_test.py
diff --git a/tests/QtCore/repr_test.py b/tests/QtCore/repr_test.py
new file mode 100644
index 0000000..5e85b60
--- /dev/null
+++ b/tests/QtCore/repr_test.py
@@ -0,0 +1,72 @@
+import PySide
+import unittest
+
+from PySide.QtCore import QByteArray, QDate, QDateTime, QTime, QLine, QLineF
+from PySide.QtCore import Qt, QSize, QSizeF, QRect, QRectF, QPoint, QPointF
+from PySide.QtCore import QUuid
+
+class ReprCopyHelper:
+    def testCopy(self):
+        copy = eval(self.original.__repr__())
+        self.assert_(copy is not self.original)
+        self.assertEqual(copy, self.original)
+
+class QByteArrayReprCopy(ReprCopyHelper, unittest.TestCase):
+    def setUp(self):
+        self.original = QByteArray('the quick brown fox jumps over the lazy dog')
+
+
+class QDateReprCopy(ReprCopyHelper, unittest.TestCase):
+    def setUp(self):
+        self.original = QDate(2010, 11, 22)
+
+
+class QTimeReprCopy(ReprCopyHelper, unittest.TestCase):
+    def setUp(self):
+        self.original = QTime(11, 37, 55, 692)
+
+
+class QDateTimeReprCopy(ReprCopyHelper, unittest.TestCase):
+    def setUp(self):
+        self.original = QDateTime(2010, 5, 18, 10, 24, 45, 223, Qt.LocalTime)
+
+
+class QSizeReprCopy(ReprCopyHelper, unittest.TestCase):
+    def setUp(self):
+        self.original = QSize(42, 190)
+
+
+class QSizeFReprCopy(ReprCopyHelper, unittest.TestCase):
+    def setUp(self):
+        self.original = QSizeF(42.7, 190.2)
+
+class QRectReprCopy(ReprCopyHelper, unittest.TestCase):
+    def setUp(self):
+        self.original = QRect(100, 200, 300, 400)
+
+class QRectFReprCopy(ReprCopyHelper, unittest.TestCase):
+    def setUp(self):
+        self.original = QRectF(100.33, 200.254, 300.321, 400.123)
+
+class QLineReprCopy(ReprCopyHelper, unittest.TestCase):
+    def setUp(self):
+        self.original = QLine(1, 2, 3, 4)
+
+class QLineFReprCopy(ReprCopyHelper, unittest.TestCase):
+    def setUp(self):
+        self.original = QLineF(1.1, 2.2, 3.3, 4.4)
+
+class QPointReprCopy(ReprCopyHelper, unittest.TestCase):
+    def setUp(self):
+        self.original = QPoint(1, 2)
+
+class QPointFReprCopy(ReprCopyHelper, unittest.TestCase):
+    def setUp(self):
+        self.original = QPointF(1.1, 2.2)
+
+class QUuiCopy(ReprCopyHelper, unittest.TestCase):
+    def setUp(self):
+        self.original = QUuid("67C8770B-44F1-410A-AB9A-F9B5446F13EE")
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/tests/qtcore/resources.qrc b/tests/QtCore/resources.qrc
similarity index 68%
rename from tests/qtcore/resources.qrc
rename to tests/QtCore/resources.qrc
index cea17b4..0a0b03d 100644
--- a/tests/qtcore/resources.qrc
+++ b/tests/QtCore/resources.qrc
@@ -1,6 +1,7 @@
 <RCC>
     <qresource prefix="/">
         <file alias="quote.txt">quoteEnUS.txt</file>
+        <file alias="sample.png">sample.png</file>
     </qresource>
 </RCC>
 
diff --git a/tests/QtCore/resources_mc.py b/tests/QtCore/resources_mc.py
new file mode 100644
index 0000000..80cf227
--- /dev/null
+++ b/tests/QtCore/resources_mc.py
@@ -0,0 +1,3543 @@
+# -*- coding: utf-8 -*-
+
+# Resource object code
+#
+# Created: Thu Feb 3 16:09:36 2011
+#      by: The Resource Compiler for PySide (Qt v4.6.3)
+#
+# WARNING! All changes made in this file will be lost!
+
+from PySide import QtCore
+
+qt_resource_data = b"""\
+\x00\x00\x00\x35\
+\x46\
+\x69\x6e\x65\x21\x20\x44\x69\x73\x68\x6f\x6e\x6f\x72\x21\x20\x44\
+\x69\x73\x68\x6f\x6e\x6f\x72\x20\x6f\x6e\x20\x79\x6f\x75\x2c\x20\
+\x64\x69\x73\x68\x6f\x6e\x6f\x72\x20\x6f\x6e\x20\x79\x61\x20\x63\
+\x6f\x77\x21\x0a\
+\x00\x00\xda\x88\
+\x89\
+\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
+\x00\x00\xb1\x00\x00\x00\xd2\x08\x06\x00\x00\x00\x05\x49\x21\x31\
+\x00\x00\x00\x01\x73\x52\x47\x42\x00\xae\xce\x1c\xe9\x00\x00\x00\
+\x06\x62\x4b\x47\x44\x00\xff\x00\xff\x00\xff\xa0\xbd\xa7\x93\x00\
+\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0b\x13\x00\x00\x0b\x13\x01\
+\x00\x9a\x9c\x18\x00\x00\x00\x07\x74\x49\x4d\x45\x07\xda\x03\x0a\
+\x0c\x02\x2e\xb0\x96\x99\x74\x00\x00\x00\x19\x74\x45\x58\x74\x43\
+\x6f\x6d\x6d\x65\x6e\x74\x00\x43\x72\x65\x61\x74\x65\x64\x20\x77\
+\x69\x74\x68\x20\x47\x49\x4d\x50\x57\x81\x0e\x17\x00\x00\x20\x00\
+\x49\x44\x41\x54\x78\xda\x94\xbd\xd9\xaf\x24\xd9\x7a\xdd\xf7\x8b\
+\x21\x33\x77\x44\xe4\x9c\xa7\xaa\xcf\xa9\xb1\xab\x87\x6b\xf2\x92\
+\xd4\x15\x49\x0b\x84\x64\xd9\x22\x64\x3f\xd8\x30\x0c\xd8\x8f\x34\
+\xfc\x68\x43\x7f\x8b\xfe\x04\x02\x06\xfc\x64\xbf\xd1\x06\x04\x13\
+\x7a\x30\x65\x59\x04\x4d\x03\xa4\x48\xba\x29\xf9\x72\xb8\xdd\x5d\
+\x55\x5d\xc3\x39\x75\xea\x9c\x9c\x23\xf6\xce\xcc\x18\xfc\xb0\x87\
+\x88\xc8\xcc\x6a\xd9\xd9\x68\x44\xce\x79\x2a\x73\xc5\x8a\xb5\xd7\
+\xb7\xbe\x2f\xbc\xdf\xff\x17\xbf\x57\x09\x00\x15\x82\xc8\x29\x89\
+\xb0\x97\x24\xaa\x90\x52\x51\x12\x91\x44\x95\xb9\x37\x42\x56\x1e\
+\x91\x97\x91\x4a\xcf\x3d\x27\x8a\x04\x12\x1a\xaf\xd6\xcf\x45\x54\
+\xa0\x3c\x7e\xfc\x22\xeb\xe7\x9b\xeb\xfa\xbd\xea\xdb\x08\x01\x4a\
+\x01\x11\x42\x54\x28\xe5\xe9\x2d\x20\xc0\xdd\x6e\x5e\xdc\x7d\x4a\
+\x02\x7d\x2a\xd1\x73\x8f\x79\x6a\x07\xa2\xa0\x22\xd6\xd7\x81\x24\
+\xdb\xe3\x8d\x87\xad\xf7\xc8\xe3\x12\x80\x30\xf3\xc9\xe3\x92\x30\
+\xf3\x09\x63\x81\x22\x43\x10\x03\x99\x79\x66\x6c\xfe\xce\x12\x94\
+\x5f\xbf\xc1\xd1\xed\x38\x28\xf4\xfb\x85\x11\x79\x2e\xf1\x37\x7d\
+\xb6\xb1\xe4\x61\x76\xe0\xf6\xe5\x82\xc3\x04\x46\xe3\x01\x00\x7d\
+\x42\xb6\xe4\x4c\xbd\x31\xd5\x70\xc3\xc6\xef\x33\x28\xb7\x78\xeb\
+\x01\xeb\x47\x01\x09\x3d\x52\x76\x24\xe8\x7f\x57\x90\x29\x3a\x71\
+\x0f\x45\xfd\x7d\x77\x85\x60\xaf\xd4\xc9\x37\x2e\x44\x81\x52\x01\
+\x82\x0a\x85\x87\xcc\x04\xdf\x7e\xbc\x67\x1c\x06\xfa\xfb\x99\x54\
+\xcc\x98\x50\x72\x4f\x12\x27\x88\x69\x42\x99\x15\x27\xef\xe3\xc7\
+\x41\xeb\xfe\xbd\x52\xc8\x4c\x00\x50\x72\x8f\xcf\x8c\x49\x2c\x29\
+\x45\x84\x1f\x07\x54\x9d\x11\xde\x61\xa5\x1f\xcf\x0a\x56\x73\xb8\
+\x5b\xbc\xa4\x5a\xae\x4f\xde\xdb\x1b\x0f\x19\x52\xf1\xd9\xe3\x11\
+\x4c\x1f\x52\x75\x46\x27\xcf\x79\xf4\xe8\x6b\x42\xfd\x63\x07\x20\
+\x72\x50\x01\xb0\xa7\x2b\xba\xec\x91\xec\xa5\x06\x88\xaf\x0e\x48\
+\x72\x03\x18\x0d\xea\x14\x8f\x3d\x12\x64\xc4\x1e\x40\xda\xfb\x61\
+\x8f\x44\x00\x25\x5e\x8d\x4f\xc0\x47\x52\x12\x31\x2c\x3d\xd6\x7e\
+\xe5\x6e\x83\x47\x15\x65\x78\xd2\xc3\x8f\xa0\x94\xfa\x47\x90\x91\
+\xa4\xb4\x3b\x8a\x52\x06\xd2\x12\x94\x05\xa9\xbe\x47\x99\x5d\x47\
+\x35\x76\x16\x0b\x68\x0d\xe4\x08\xa5\x4a\x03\x66\xe8\x09\xfd\xfc\
+\xca\x00\xaf\x12\x3d\xfa\xf3\x0d\x69\xdc\xa5\xf2\xf5\xeb\x06\xa5\
+\xc7\xc6\xaf\x18\x64\x3e\x79\x2c\xd0\x1f\x1a\x93\xc7\x10\x02\x82\
+\xb8\x01\xe4\x06\x58\x9b\x00\x06\x8a\x2a\x26\x40\x11\x67\x92\x2c\
+\x8e\xc8\x8a\x80\xa2\x27\x98\x50\xd6\xc0\xce\x24\x19\x53\x1e\xbe\
+\x80\x2d\x39\x7d\x42\xd4\x7c\x05\xd3\x11\x7d\x42\xf6\xd5\x16\x56\
+\x1e\x83\xd1\x96\xd5\x6a\x44\x39\xd8\x32\xe2\x82\x42\x1c\x10\xf8\
+\xa0\x34\x80\x01\x14\x1e\x5d\x21\xda\x80\xa5\xa2\x14\x91\x03\x73\
+\x57\x08\x94\x52\xee\x7e\x94\xe2\x2f\x6e\x7e\xce\x24\xeb\xc3\x64\
+\x48\x31\x9a\x10\x2c\x16\x94\x13\x0d\xc2\xae\xf8\x34\xfd\x34\x01\
+\x5c\x55\x63\xba\x62\x09\x68\x20\xfb\xcc\xea\xbf\xc9\x3e\x7f\x59\
+\x12\x24\xf5\x0e\xc0\xbc\x60\xbb\x08\x48\x3c\x48\xab\x09\x89\xb7\
+\x00\x20\x8d\xbb\x24\xcb\x35\x98\x1d\x1a\xc0\x3b\xac\x5a\x40\xf6\
+\x0e\x2b\x92\x7e\x07\xfd\x8d\x0b\xf3\x87\x88\x02\x44\x41\xa6\xe6\
+\x35\x9b\x01\x4a\xe4\x1a\xe8\xe6\xf6\x1e\xc9\x1e\x49\xd7\x80\xa7\
+\x4b\x64\x71\x85\xdf\x40\xed\xbe\x71\xbd\x06\x2c\x6c\xfd\xcc\xec\
+\xa9\x91\x7b\xcc\x93\xb1\x7e\x8e\xf4\xf0\x0d\xeb\x5b\x30\xa7\xd2\
+\x03\xa9\xdc\xbb\xc9\x06\x5f\xcb\x16\x9b\xd7\xcf\x50\xca\xd3\x47\
+\x81\x06\xb8\x85\xa8\xe8\x89\x88\x9d\x92\x20\x0a\xc7\xc0\x9e\xda\
+\xe9\x2f\x30\x38\xb8\x77\xdb\xf8\x15\xd1\x11\xb3\xb7\x18\x3a\x53\
+\xa7\x00\xb6\xc0\xed\x09\xb7\x0d\x76\x35\x80\x5b\xaf\xcf\x25\x59\
+\x11\x10\xb3\x26\x9c\x68\x60\x66\x0c\x99\x7a\x63\xba\x5e\x9f\x7c\
+\x9a\x68\x20\x37\x2e\x87\x95\xa7\x9f\x1f\xea\xf7\x4a\xf0\x89\x18\
+\x20\x44\x41\x11\x0b\x3a\x71\xef\x04\xc0\x80\x06\xea\x19\x66\xb6\
+\xc0\x96\x99\xe0\xe3\xdb\x1c\x80\x65\x5e\x10\xac\x34\x90\x3e\x96\
+\x17\x44\xb1\x3a\x01\xeb\xa7\x2e\x41\xb2\xd1\xdf\x7e\x56\xff\x0d\
+\xf6\xf5\x00\x45\x3a\x20\x48\x36\x54\x9d\x11\x65\x56\x50\xa4\x83\
+\xd6\xe3\x16\xc0\xcb\xaa\x20\xc9\xf6\xa4\x71\xb7\xf5\xfe\x16\xc0\
+\x96\xc9\x01\xd2\xed\x01\x3f\x57\x92\x03\x19\x76\xbb\xc9\x4b\x64\
+\xd8\x63\x93\x97\xe4\x4a\xb2\xc9\x4b\x0e\xee\x90\x69\x7e\x33\x15\
+\x9a\x43\xc7\xbe\x05\x5a\x0b\x72\xcb\x5b\xdd\x86\xb8\x28\x3f\x71\
+\xdd\x8f\x2a\x4a\x22\xfd\x3e\x91\xa8\x81\x6c\xbe\x78\xbb\xb5\xaf\
+\x29\xa5\x57\x33\xf5\xb1\xe4\x70\xd7\x23\x07\xe0\x63\x56\xf6\xcc\
+\xbf\x45\x19\x06\x06\xe8\x77\x05\x24\x29\x69\xd1\x31\xcc\x1c\x18\
+\x00\x1b\x90\x92\x91\xc7\x82\x4c\x1f\x73\xb4\x1c\x88\x85\x79\x9f\
+\x8c\xa2\x8a\xdb\x3f\xe6\x4e\x51\xf4\x04\x83\x3c\xa5\x9f\x45\x2d\
+\x70\x0f\x7b\x5d\x27\x27\xe2\xa0\x60\x3b\xd0\xe0\xf7\x37\x7d\xca\
+\xc1\x96\x65\xe5\xc3\xd8\x27\x9c\x8c\xc8\xa7\x89\xf9\xf4\x5a\xe2\
+\x6c\x07\x3e\x49\x6c\x8f\x44\x01\x3e\x29\x25\x09\x82\xaa\x75\x88\
+\xf7\xe3\xa0\x75\x88\x3f\xbe\xde\x7c\x7e\x3e\xd2\xdf\xe7\x22\xde\
+\x32\x0e\x03\x96\xb9\x06\xec\x67\x7e\xc5\xff\x9f\x4b\x91\x0e\xd8\
+\x2b\xd5\x02\xe6\xb9\xbf\xc1\x3b\xac\xf0\xe3\x80\x20\xd9\x38\xc0\
+\xa7\xd5\x84\x65\x55\xb0\xac\x0a\xc6\x5e\xe0\xe4\x5d\x4b\x5e\x18\
+\xf0\x1e\xcb\x0a\x1f\x40\xe5\xe6\x07\x31\xdb\x6a\xb5\x43\x76\x6f\
+\xc9\x52\xc3\x6b\xf7\x1e\x07\xb1\xa9\x59\x57\xe4\x0e\xa0\xea\x88\
+\x71\xbb\x47\xaa\xf8\xdf\x75\xb1\x80\x6c\x5e\xb7\x4c\xec\x47\x15\
+\xa5\x92\x24\x51\x85\x2f\x22\xf7\xce\xb5\x3e\xaf\xb9\x58\xfe\x88\
+\x0e\x3f\xa7\x97\x05\xe0\x91\x51\x88\x94\x8d\x5f\x69\x20\x43\x83\
+\x7d\x63\xc2\x4c\x19\x29\x11\x1b\x19\x12\xb6\x98\x16\xa0\xd3\x9b\
+\x12\xec\x94\xbb\xff\x18\xa8\x00\x59\x1c\x31\xec\x75\xb5\x84\x88\
+\x43\x26\x71\x5b\x72\x0c\x09\xf0\x1f\x7b\x84\x61\x84\xff\xd8\x63\
+\x1d\x7b\x24\x71\xc2\xe8\xf1\x23\xd4\x24\xc1\x9f\x14\x74\x27\x43\
+\xb6\x03\x9f\x69\xd8\x37\x47\x80\x94\xd5\xfa\xee\x93\x8c\xdb\xbc\
+\x58\x76\xb6\x5b\x61\x8e\xbc\x16\x58\xe1\xaa\x82\xcf\x87\x4c\xb2\
+\xbe\x03\x70\x1b\x24\xe9\x89\x0e\x3e\x77\xf1\xbc\x25\x9d\xde\x65\
+\x8b\x89\x9b\x92\xc6\x32\xb5\x05\x61\x91\x1a\xed\x3f\x29\x38\x70\
+\xe7\xc0\x6b\xc1\x9c\xc6\x5d\x56\xc5\x96\xdc\xdf\x9e\x30\xb1\x05\
+\x74\x52\x76\xf1\xe7\xb1\xbe\x21\xc3\x9e\x03\xef\x7d\x25\x51\xe9\
+\x73\x7d\x7f\xf7\x16\x6f\xd4\xc3\x33\xa0\xd8\x23\x41\x05\x7a\x2b\
+\x0a\xba\x44\x8e\x99\xed\xe3\x25\x91\xd6\xd2\x47\x2c\x7d\x0c\xc0\
+\x13\xc9\xd1\x7c\xcc\xcb\x5a\xbb\x43\xa9\x34\xc3\xfa\x51\x85\x3c\
+\x62\xbe\x7a\x39\x69\x24\x85\xf2\xea\x6d\x53\x52\x58\x80\x9a\x6d\
+\x45\x4c\xa0\x12\x06\xa5\xc7\x76\xaf\xa8\x44\x8f\x4c\x2f\x13\x90\
+\x4a\xb2\xf1\xab\xc6\xc2\x0d\x02\xe5\xd3\x31\x12\xa1\x29\x17\x8a\
+\x9e\xd0\x92\xe2\xdc\x4e\x3a\xd8\xd6\x6c\x1c\xd7\xdf\xd3\x64\x3a\
+\xe3\xb3\xe1\x8c\xd1\xf0\x82\x22\x16\x24\xf4\x98\x4d\x05\x13\x31\
+\x62\x22\x46\x88\x69\x42\x57\x08\x92\x38\x21\x89\x93\x13\xb0\x0a\
+\x62\x46\xc3\x36\x68\x7d\x25\x5b\x00\x6b\x5d\x37\x40\x14\x54\x2d\
+\xe9\xd3\x15\x82\x0f\xa5\xc7\x17\xd5\x80\x7c\x90\x30\x79\xe0\x9f\
+\x2c\x00\x7f\x4c\x07\x37\x3f\xa7\xaa\xc6\x1c\x76\x37\x6e\x51\xd7\
+\x94\x16\xcd\x1d\xcc\x02\xd0\x82\x7a\xbb\xa8\xc1\x0b\xb4\x98\xd8\
+\xf3\xe6\x84\x65\x9f\xd2\x5f\xb4\x64\x84\xdd\x01\x52\x7f\x8f\x2f\
+\x3e\xd6\xd4\xac\x1e\xac\x48\x6f\xbb\x04\xc9\x15\x22\x79\xcd\x32\
+\x1e\x9f\xa7\x4f\x51\x20\x54\x48\x97\x48\x83\x56\x74\xcc\xa2\x50\
+\x33\xb1\x05\xaf\x3a\xf3\xd2\x54\x1e\x39\x15\x91\xa8\xb7\x52\xd5\
+\xb7\x81\x2d\x9a\x85\x25\x90\x44\x42\xbb\x22\x44\x2d\x80\x47\x44\
+\x48\x64\x43\x54\x44\x48\x51\x19\x38\x37\x80\x2c\xaa\xda\xc5\x30\
+\x00\x2e\x44\xda\x62\xe2\x41\xe9\xe1\xa9\x82\x98\x2e\x91\xa8\x18\
+\x94\x9e\x63\xe1\x4e\x4f\xd0\x69\x68\x5d\x0b\x5a\xa7\x7f\xab\x98\
+\x49\xec\x33\xa1\x64\x81\xef\xd8\x36\x0c\x23\xfc\x49\xa1\xc1\x48\
+\x8f\x84\x1e\x13\x31\xd2\x32\x40\x44\x74\x85\xa0\x2b\x84\x5e\xfd\
+\xf7\x8b\x5a\x0a\x64\x6b\xf6\x4a\xb1\x5a\xdf\xb1\x79\xa7\x98\xe7\
+\x5b\xfa\x1b\xf3\x99\xf3\xa5\x01\x98\x80\x78\xe8\x40\x74\xcc\xc4\
+\x4d\xb0\xa5\x94\x27\x2e\x85\xd5\xc7\x0f\xfa\x4b\xe7\x4a\xe4\xe5\
+\xd4\x49\x8a\x7d\xfe\xf6\x64\xa1\xfa\x63\x8b\x3b\xcf\x5b\xb6\x34\
+\xbf\xd5\xc4\x4d\xe9\x52\x75\x46\x0e\x80\xe7\xdc\x06\x56\xa1\x03\
+\xf3\xb2\x2a\xa8\xd6\x93\x16\x13\xdb\xc5\x5d\x90\x6c\xdc\xe7\x86\
+\xcb\x78\xcc\xc4\x82\x2e\x7d\xce\xc5\x58\xb2\x38\x40\xb4\x7f\x48\
+\xd4\x91\xb0\x7f\xe8\x98\x7a\x00\xa0\x02\xba\xa2\x8b\x62\x6f\xd8\
+\x2e\xd0\xc7\xe6\xc6\x1e\x5b\x44\x15\x9e\x8c\xe9\x1e\x31\x6e\xd7\
+\x30\x69\x53\x42\x68\x17\x83\x1a\xc0\x66\x5b\x20\xe9\x13\x21\x1d\
+\xb0\x65\xad\x51\xab\x18\xe9\x65\x0e\xc0\xc7\xf6\x5c\xa4\x3c\x63\
+\xc9\x79\x2d\x69\xa1\x0c\x0b\x6b\xdd\x9e\x11\xa8\x84\xc8\x00\xde\
+\x31\xa4\x88\x0c\x30\x05\x01\x0a\xcf\x80\xf4\x90\x78\x3c\xac\x1a\
+\xd2\xa7\xf3\x04\xff\xb0\xa4\xec\x8c\x19\x1c\x24\x9b\x4e\x04\x87\
+\x25\xe5\xe8\x82\x27\x07\x49\xca\x8e\x72\x74\xc1\x2c\xa8\xce\xda\
+\x52\x30\x84\xac\x60\xaf\x94\x61\xbb\x21\x7e\x39\x39\x79\x6e\x18\
+\x46\x0c\x27\xda\x70\xc3\xab\xd9\x7e\xbf\xbd\xa5\xe4\x33\xba\xfd\
+\x05\x6c\x87\xf8\x86\x89\x89\xfb\x2d\x60\xed\x95\xa2\x10\x07\x22\
+\x06\xec\x51\x28\x3c\x07\xaa\xbd\x52\x74\x85\x60\x53\x44\x2c\xf3\
+\x3b\xc2\x4d\x4a\x10\x06\x5c\x4c\xc6\x6c\xbf\xff\x81\xd7\x6f\x97\
+\x84\xbf\x1e\x31\x11\x33\x67\xa5\x1d\x5b\x6a\xcd\x7f\x93\x9a\xa7\
+\xa4\x59\x0a\xa4\x5a\xe3\x4f\xee\x81\xc4\xd9\x6b\x7a\x61\xb7\x72\
+\xee\x84\x5b\xb0\xd2\x90\x45\xa3\xdc\x5d\x1d\x7b\x01\xde\x70\x01\
+\x8c\xf5\x77\x53\xb6\xdd\x89\xaa\x1a\x6b\x77\xe2\x59\xa4\x57\xe8\
+\x83\xd0\x67\xd2\x91\x6e\xdb\xbc\x0c\x42\x9f\x41\xe8\x23\x1a\x4e\
+\x46\x57\x74\xe9\x12\x39\x3b\xae\x7b\xc6\x69\x00\xa8\xa2\x0c\xdf\
+\x3c\xbe\x8f\x2a\xa7\xa1\xfd\xa8\x62\xdf\x94\x0f\x0d\x00\x97\xd2\
+\xd3\x00\x06\x22\xc3\xcc\xa9\xf4\x88\x3c\xfd\xfc\xc8\xab\xb0\x0a\
+\x39\x32\xff\x39\x96\x76\x87\x15\x0f\x41\xa6\xf7\x2f\x7c\xad\x89\
+\x0d\xa0\x2d\x13\xdb\x45\x5e\x24\x2a\x36\x7e\xe5\x3c\xe1\x09\x25\
+\xe3\x64\xc3\x70\xa2\xd9\xf5\x6a\x1a\xf2\xac\x17\x50\x4e\xa1\xec\
+\x8c\x29\xa7\x10\x07\x6b\x84\xf0\x99\x05\x15\x62\x9a\x30\x0b\x2a\
+\x26\x62\xc4\xe0\x20\xcd\xce\x30\xe2\xc1\xc0\x77\xcc\xea\x18\xb6\
+\xaf\xfd\xd0\xd2\x5f\xe0\xc7\x01\x62\x9a\x68\xe7\x27\xab\xef\xd7\
+\xd2\x63\x48\x21\x0e\x24\x71\x42\x11\x0b\xed\x3e\x3c\xaa\xdc\xf5\
+\x45\x19\x10\x64\x8a\xfd\x5d\x17\x5f\x49\x14\x9e\xf6\x87\xb3\xf5\
+\x09\x80\x03\xd5\x69\xb1\x70\xd3\x47\xde\x2b\xc5\xe0\x20\x19\x87\
+\x01\xf9\x20\x61\xbb\xd0\x7f\xc7\xe7\x5f\x3c\xe3\x65\x01\x7f\xfe\
+\xe7\x6f\xb9\xff\x6e\x89\x9a\xa7\xf8\xa4\xa8\x79\x4a\x31\x5f\x3a\
+\xf6\xf7\xe3\x00\x6f\x34\x85\xf9\x56\x1f\x31\x16\x01\xf3\x45\xc0\
+\xd8\x2b\x9d\x0c\xaa\xaa\xb1\x93\x0f\xe7\xd8\xb7\xc3\x05\xdb\xfd\
+\xde\x31\xb1\x05\xf0\xb2\x2a\x60\x51\x51\x6d\x47\x90\xad\x5b\x1e\
+\x33\x80\x3f\xf6\x49\xb7\x07\x2d\x00\xfd\x20\x01\x34\x80\xed\xed\
+\xc4\x93\x66\xd5\x18\x91\xab\x39\x21\x7d\x54\x83\x6d\xad\x96\x3d\
+\x5e\xc8\x95\x44\x54\x51\x46\xe9\x2c\xb3\x18\x90\x1a\xd4\xb2\x21\
+\x1f\xa4\xd2\xaf\x8d\xaa\x1f\x2d\x7f\x58\xa0\xa6\x46\x9c\xe8\x42\
+\xcb\xe9\x6b\x9a\xf7\x09\x7c\x14\x25\x8a\x58\xb3\x8e\x28\x50\xca\
+\xa3\x27\x22\x3c\x91\x39\x00\x6b\x9f\xb8\xf6\x85\x43\x2a\x2d\x13\
+\xa2\x10\xaf\x6a\xc8\x2c\x55\x32\x13\xa1\x96\xc7\xc1\x9a\x84\x29\
+\x25\x05\x1f\x45\x48\xe2\x57\x06\x80\x09\x92\x0d\x01\x7b\x20\xd1\
+\x2c\x87\x70\xee\x81\x64\x43\xc4\x00\x89\x07\x2c\x49\x08\x80\x35\
+\xc4\x43\x0d\xe4\xf9\x2d\xa8\x00\x21\x02\x4a\x0a\xe8\xaf\x09\x54\
+\x97\x94\x1d\x42\xf8\x04\xaa\x83\xa2\xa6\xb0\xd1\xf0\x82\x0e\x15\
+\x05\x70\xc8\x76\x04\x40\x11\x17\x28\x95\x50\x88\x0d\x81\xea\x18\
+\x1d\xdf\x39\xfb\xfd\x5a\x20\xdb\x62\x47\x31\x9a\xc0\xbd\x66\xc4\
+\xe5\xee\x9a\xe2\xb3\x2b\x7e\xf6\x1b\x3f\x43\xbe\x7a\xcd\xdb\xc5\
+\x9a\x3c\x2f\xf8\xea\xc1\x8c\x7c\xb1\xe4\xe5\xab\x1f\xe8\x7c\xbf\
+\xe6\x97\x7f\xf5\x21\x28\x78\x9b\xdd\xb1\xf9\x7e\xc3\xab\x97\xbf\
+\xa0\x3f\xb9\xe0\xf3\x17\xcf\xd9\x8e\xa7\x4c\xd0\x45\x8e\xaa\xaa\
+\xa5\x80\x95\x03\xf6\xfa\x87\xd2\xe3\xc0\x1d\x7d\x19\x43\x37\x87\
+\x51\x4e\x59\x6d\x59\xd2\xaf\x8f\xec\x71\x41\x27\x9e\xb5\x5e\x5b\
+\xa4\x03\x0e\xbb\xf7\x24\xfd\x8e\x06\xb1\x05\xac\x03\xa5\xbd\xad\
+\x02\x12\x21\x41\x44\x40\x61\xa4\x43\xe1\x00\x9c\x56\x8d\xe7\x36\
+\xfd\x60\x0b\xe0\x06\xa0\x01\x3a\x51\xc6\x41\x2a\x84\x01\xb2\x4f\
+\xd5\xf2\x85\x6d\xd5\xcf\x8f\xaa\x96\x71\x26\x91\x24\x51\xf4\x49\
+\x00\x9f\xfe\x40\x65\xcb\x5a\xb3\xd7\x2b\x2b\x29\x94\x44\x08\xed\
+\x4e\x48\x15\x13\x09\xcd\xc2\x21\x10\x1f\x2a\xaa\x78\xd5\x02\x71\
+\xbe\xde\xf0\x61\x0d\xa3\x61\x44\x21\xba\xa4\x99\xd6\x7e\x0f\xc2\
+\x0a\xca\x09\x29\x25\xb0\xb1\x4b\x57\x53\x45\xcb\x59\xd8\x4a\x20\
+\xf7\x28\x42\x02\x14\x59\x67\xc8\xe0\x70\x57\xaf\x17\x94\x22\x25\
+\x04\x42\xc8\x52\x56\x6b\x49\x18\x2a\x12\xa5\xdf\xc7\xee\x44\xed\
+\x23\x70\x0a\x24\x0e\x88\x6b\x34\xb9\x0c\xb3\x80\x22\xfe\x34\x70\
+\x8f\xdd\x82\x26\x98\x3f\xf3\x2b\x82\x30\x60\x39\x48\x58\xbe\x4b\
+\x11\xd3\x25\x0c\xe0\xf1\x6f\xfe\x1a\xf3\xfb\x35\xb3\xd5\x82\xbb\
+\xc5\x92\x8b\xc9\x98\xce\x62\xcd\xdd\x72\xc1\x9b\x77\x05\x30\xe1\
+\xf5\xea\x7b\xaa\x65\xc8\x7e\xf4\x80\x8b\xf1\x98\x8b\xc9\xf8\x93\
+\x8b\xb9\x26\x08\x83\x64\xc3\x67\x7e\x85\xe4\x82\x03\xcb\x9a\x89\
+\x8d\xa3\x58\x56\x5b\xaa\xf1\x8c\x73\xb5\x96\xc3\xee\x86\x34\x4b\
+\x35\x13\x77\x89\xd8\xab\xba\x4a\x67\x81\xbc\x57\xfb\x96\xce\x75\
+\xa5\xca\xc6\xe1\x3f\x91\xf2\x44\xf3\x5a\x3f\x57\xeb\x62\x08\xa4\
+\x47\x69\xc0\xad\x88\xe8\xe2\x81\x94\x4e\x3e\xf8\x8d\x85\x9c\x2b\
+\x63\x9b\xeb\xbe\xb9\x1e\x9d\x61\x5b\x0b\xee\xa8\xe1\x4e\xb4\xca\
+\xd1\xca\xab\x8b\x1c\xf8\xba\xb8\x41\xa6\xe5\x84\xa8\x1c\x1b\x6b\
+\x49\x11\xb9\xd2\x76\x10\x17\x44\xbd\x09\x4a\x95\x08\xa1\x8f\x4c\
+\x01\x11\xc5\xbb\x94\x70\xbc\x45\x70\xe1\x0e\xf7\x6c\xd7\xa4\xe6\
+\xcb\xd7\x40\xcb\x0d\xa0\xd1\xc0\xcc\x72\x88\x43\x03\x52\x48\xb3\
+\x14\x3f\xde\x91\x66\xf5\xe2\x47\xdb\x70\xfa\x79\xc4\x21\xa1\x71\
+\x32\x52\xeb\x6f\x1a\x47\xc3\x02\xda\x28\x65\xc0\xee\x20\x3d\x86\
+\x04\xac\x29\x28\xe2\xc2\x01\xbc\x59\x8e\xfe\x14\x13\x0b\x2a\xc7\
+\xc4\x51\xac\x28\x4a\xcd\xc6\x77\xcb\x05\x17\xff\x46\x4b\x8a\x7e\
+\xfa\x9a\x89\x0f\xc5\x63\xc1\x40\x1b\x7b\xfc\xf2\xaf\x3e\x44\x66\
+\xcf\xf8\x50\xea\xef\x77\xb6\x78\x00\x63\xf8\x7c\x32\x74\x00\x1e\
+\x4d\x6b\xdd\x1a\x24\x1b\x07\xda\xa6\x1c\xd0\xd2\x62\xce\x61\xb5\
+\xd4\x0c\xbc\x5a\x90\x45\x09\xfd\xf5\x18\x46\x39\xb3\xaa\xa0\xda\
+\x54\xe4\xfe\x96\x90\x87\xad\x85\x9d\x98\x42\xa7\x77\x59\x57\xec\
+\xba\xa2\x7b\x22\x0d\x9c\xe6\x6d\xdc\xa7\xce\xf9\xc0\x0d\x10\x36\
+\x75\x70\x20\x3d\x57\xc0\xd8\x9b\x6d\xb7\xc1\xba\xcd\xd7\x36\xfd\
+\x5f\xd9\xb8\x1e\xb5\x96\x6b\x5a\x4a\x70\x24\x33\xb0\x15\x2a\x03\
+\xdc\xf6\x4e\x57\x39\x37\xc5\x82\xba\x09\xe0\x8a\x18\xd1\x5c\xd1\
+\x2b\xc5\x26\x0b\x90\xbb\x05\x42\xf8\xba\x54\xdd\x94\x4a\xeb\x7a\
+\xa5\x9f\x66\x4b\x94\x52\xa8\xf9\x1e\xb9\x5b\x40\x96\xb3\xf5\x52\
+\x16\x59\xa9\xc1\x9b\x99\x05\x8a\xb9\xbe\x96\x5b\x88\x43\xfd\xb8\
+\x2d\xa1\x14\x0d\xbf\x35\xab\x17\x34\xe5\xa2\xed\xc3\xae\xe5\xf6\
+\x47\x59\xd5\x32\x71\x90\x05\x67\x01\x5c\x88\xc3\x89\x2b\x61\x4b\
+\xce\xda\xae\xab\xe8\x0a\xc1\x6c\x02\x83\x99\x96\x03\x87\xd5\x92\
+\x57\xdf\xff\xc0\xab\x05\x6c\x19\x93\xb2\x73\xef\xbb\xe9\xe8\xef\
+\x2c\x58\x2d\x90\xaf\x5e\xeb\x1d\x72\x90\x70\x31\x19\x73\x98\x8c\
+\x98\x4c\xd3\x56\x15\xaf\xcc\x0a\x67\xa7\x59\x67\x22\x48\x36\x94\
+\x4b\xfd\x5d\xac\xaa\x0a\x56\x21\xfe\x48\x2f\x6c\xcb\xa1\x26\x86\
+\x85\xaf\x8f\x86\x61\xd9\x3f\xa9\xd4\x55\x9d\xd1\x91\x26\x6e\x94\
+\x84\x9b\x8b\xb4\x63\x1f\x57\x57\xe2\x74\x2e\x42\x49\x45\x27\xaa\
+\x38\x48\x75\xe4\x4a\x68\xf6\xb5\x4c\x5b\x36\xae\xfb\x4d\x1b\xad\
+\x11\x2c\x6a\x32\x30\x47\xc0\x75\x60\x3d\x62\xe2\xda\x56\x13\x44\
+\x48\x04\xc2\x1d\x25\xd4\xa7\x02\x47\x8e\xa9\x33\x97\x9b\x50\x4a\
+\x22\x44\x44\x98\xf9\x60\x16\x76\x9b\x2c\x00\x16\xa4\x72\x07\xd9\
+\x54\x33\xe6\x7c\xc5\xbb\x65\xc9\x44\x7e\x64\xdb\xbf\x22\x3e\x54\
+\x06\x88\x3b\xf0\x04\x78\x8a\x78\xe5\x43\x08\x6b\x4f\xd5\xb9\x09\
+\x2f\x63\x58\x09\x5d\xd5\xcb\x72\x5b\x5f\xd2\x36\x5c\xaf\xcb\xda\
+\x53\x0c\xa3\x3e\x6b\xb9\x65\x68\xf3\x06\x93\x7b\x67\x51\x85\x59\
+\xc4\x30\xee\xff\x7f\xab\x98\x19\x26\x4e\x8e\xc4\xc7\x39\x79\x61\
+\xf3\x0c\x7a\xc1\xa7\xaf\x0f\x0e\x92\xd0\x17\x7c\x18\x4d\x18\xfe\
+\x6c\xc2\x37\x7f\xfe\x0d\x37\x7f\xfb\x1d\x00\x3f\x7d\xa8\xa9\xf5\
+\x62\x5c\x3b\x28\x77\xcb\x05\xe3\xa7\x4f\x18\xcc\x2e\xf8\xcc\xaf\
+\x0c\xfb\xae\xb4\x55\x58\x6a\x17\xc3\x3a\x1a\x96\x89\x2d\x98\x2d\
+\x90\xef\xbe\x5f\x3a\x57\xa2\x5c\x2d\xe8\xf3\x80\xb2\xb3\x87\x55\
+\x48\x39\x5c\xe2\x8d\x4a\xe0\x49\x4b\x8a\x34\xb5\x71\xd2\xef\x10\
+\x5a\xd0\xee\x39\x95\x06\x4e\x5a\x44\x15\x5d\xa9\x0b\x08\x5d\x0b\
+\x9d\x48\xa0\x9a\xbe\xae\x54\x1c\xa4\x87\x88\x2a\x0d\x77\x03\x52\
+\xcd\xce\xc2\x95\xa3\x6d\x65\x2e\x89\x04\xa9\xac\x8b\x1c\xf2\x18\
+\xbc\x55\x4c\xe4\x65\xad\x4c\x5b\x1b\xc0\xb5\x3f\x8c\x10\x67\x81\
+\xab\x8e\x00\x7c\x2c\x25\xdc\xfb\x29\x0f\xcf\x4f\xe9\x67\x09\x39\
+\x0a\x01\x7c\x54\x7a\xf7\x2e\x59\x72\xd8\xa4\xe0\x57\x78\xc5\x9c\
+\xc5\xed\x94\x22\x54\xed\x32\xbb\xf1\x52\x33\x51\x12\x28\x05\xf8\
+\xae\x10\x82\xd0\x80\x0d\xbc\x8c\x45\x15\x13\xec\x14\x0b\x63\xdb\
+\xad\x3d\x45\x51\xc5\x2c\xb2\x92\xc0\x33\xc0\x8e\x57\x90\xc1\x26\
+\x4c\x18\xe4\x69\xcd\xd2\x8d\x42\x89\x9f\x8d\x28\xe3\x15\x65\x67\
+\x0c\xc6\x0d\x19\x12\xb0\xce\xb4\x1f\x7d\x4e\x4a\x58\x4f\x58\xa7\
+\xd7\x54\xcb\x62\xf3\x95\x34\xe1\x28\x8f\xd1\x14\xba\xac\x51\xaa\
+\xe4\xef\xfc\xa3\x67\x8c\xdf\x3e\x61\xf9\xdd\x5b\xc6\x4f\x1f\x13\
+\x6e\x52\xc7\xba\x83\xd9\x05\x4f\x79\x6e\x4a\xd3\x95\x29\x35\x9b\
+\x85\xec\x76\xa8\x17\xa7\x8d\x94\x9b\x95\x14\x16\xbc\x45\x3a\xc0\
+\x1f\xfb\x5c\x4c\x0a\xde\x7c\xf8\x6b\x58\xc5\x64\x51\x42\x2c\x3f\
+\x92\x1d\x12\xe2\xe1\x12\xd6\x07\x2a\xff\xe2\x93\xba\xba\xea\x8c\
+\x1a\x9a\xb8\x01\xe4\x26\xa0\x1d\x78\xa5\x76\x85\x9b\x55\xb8\x52\
+\x7a\x0e\x94\x0a\x0c\x2b\x7b\x6e\xa1\x56\x1a\x4f\x58\x57\x1d\x6a\
+\xeb\xcc\x8f\x04\xbe\x94\x86\xcf\x9b\xa0\x6e\xfb\xb5\x78\x59\xcb\
+\xa9\x88\x1a\xce\x44\xdb\x1f\xe6\x4c\x04\xf4\x0c\x98\xcf\x00\xb8\
+\xa5\x8b\x55\x00\x5d\x1d\xb9\x54\x71\xd9\x08\xfa\xf8\x78\xc1\x80\
+\x70\xb1\x26\x1f\x02\x83\xda\x73\x0e\x33\x1f\x11\x0b\x17\x02\x2a\
+\xaa\x98\x40\x64\xa0\x34\x68\x8b\x5e\xac\x41\xdd\x03\x94\xcf\x20\
+\x48\xc9\x08\x08\xcc\xbf\xcd\x66\x2e\x26\xb1\xcf\x5a\xd6\xd2\x61\
+\x90\x14\x4c\xd2\x84\xfc\x53\xc5\x05\x53\x65\x1d\x1c\xa4\xa9\x88\
+\xa5\x4e\x52\x68\x4d\x5c\xeb\x68\x0b\x66\x6b\xb1\xd9\x20\x97\x95\
+\x19\x7b\x05\x5d\x11\xe9\x8a\x9e\x0a\xf0\x95\x24\xeb\x0c\x89\xc5\
+\x9a\x9f\x54\x4f\xf9\xc9\x17\x70\xff\xc5\x0b\xd6\xd5\x8a\x7c\xae\
+\x01\x35\x9b\x98\x52\xb5\x75\x4a\xa6\x38\x8a\x2a\x49\xa8\xaa\x31\
+\x9e\xb7\x3c\xf1\x96\xeb\x62\x48\xe0\x40\xf9\xa1\xf4\x28\xb2\x88\
+\x15\x15\x03\x99\x6a\x4d\x2c\x63\x4a\x99\xc2\xb0\x53\x07\xac\xce\
+\x64\x28\xbc\xc3\x4a\x97\x9d\x8f\x59\xb7\xbd\x72\x52\xee\x7e\x6d\
+\x87\x09\x2d\x3b\x4c\x50\xc7\x79\xbb\x86\x85\x5d\xde\xc1\xea\x61\
+\xf3\x7a\x11\x09\x84\x54\xee\xb1\xa8\xa1\xa3\x65\x83\x89\x9d\x94\
+\x30\x3f\xae\xb4\x8c\x6c\x41\xeb\x65\x48\xf3\x9f\xf3\x87\x95\xd2\
+\xc5\x8d\x63\x8b\xae\x51\xe4\xb0\x9f\x96\x37\xdc\x0a\x17\xc3\x24\
+\x76\xd7\x9b\xf9\x61\xfb\x3a\x1b\xf4\xc9\x5f\x0c\xa9\x82\xa9\xcb\
+\x16\xeb\xc7\x1a\x5f\xae\xf2\x5d\x39\xda\x7e\xe9\xc1\x4e\x11\x07\
+\x85\x03\xad\x8d\x61\x1e\x03\x78\x91\x95\x0c\x23\x2d\x19\x86\x95\
+\xc0\xab\x46\x2c\xf0\x5d\xe6\xb8\xa9\x9b\xfd\x6c\x84\x9f\x8d\x5c\
+\x49\x37\x8a\xef\x19\xd2\xd4\xd0\xc9\x09\x80\xcf\xbb\x13\x29\x89\
+\x0a\x11\x54\x8d\x50\x50\x0a\xa2\xe4\xc1\x21\x23\x62\x40\xb0\xbb\
+\x26\xf0\xde\x71\xe1\xad\xf8\x6a\x2f\xf9\xc9\x45\xc5\x2f\xf5\x33\
+\xfd\x78\xac\x18\x4d\x61\x38\x19\x9f\x94\xb6\x03\xef\xdd\x27\x3f\
+\xb7\x29\x2d\x9a\x21\xa3\xd1\x58\xef\x84\xb1\x4c\x29\xf9\x88\x3f\
+\x9a\x90\x1d\xba\xee\xbb\x3d\x97\x66\xab\x3a\x23\x5d\x76\xb6\xcc\
+\xeb\xd8\xf7\x48\x13\x1f\x87\x75\x2c\x38\x8b\x66\xe5\xcd\x80\xb2\
+\x4b\xa4\xb5\xaf\x88\xe8\x97\x71\xeb\xb1\xd2\x80\xce\x37\x1a\x98\
+\x23\x56\x6f\xb1\xaa\x97\x41\x15\x1b\x49\x51\xb5\x64\xc3\x89\x3f\
+\x7c\x9c\x9b\x68\x2c\x00\x2d\x5b\xdb\x05\x5d\xa0\x12\xc7\xc2\xde\
+\x51\x32\x0f\x60\xbb\x57\x28\x25\x1d\x50\x15\x31\x79\xa6\x1c\x90\
+\xbd\xf1\x90\x62\x90\x10\xc6\x25\x79\xe6\xbb\x14\x1b\xa2\xd4\x91\
+\x55\xfb\x85\xdb\x2f\x5d\x94\x64\x9d\xd3\x1d\xac\xa8\x62\x97\x27\
+\x5e\xcb\xad\x2e\x55\x67\xa5\x06\x34\x1a\xd4\xf6\x71\x1b\x22\x22\
+\xcb\xf1\x99\x69\x19\x61\x98\x38\x8a\x95\x73\x3a\x80\x86\x94\xc8\
+\x29\x3b\xe3\x23\x47\xa3\x1d\x06\x82\xd8\x2d\xec\xba\x42\x80\xf2\
+\xb5\x0f\x6d\xfe\x76\x5f\x69\x8f\xd7\x25\xe5\x6c\x9a\xb0\xb1\x18\
+\xf4\x95\x74\x59\x89\xbd\x52\x2d\x96\xf7\x49\x5d\xd1\xc5\xb2\xb1\
+\xbd\x7e\xbc\xc8\x6b\x16\x39\x36\xd5\x85\xbb\x1d\x77\xf6\x3f\x1a\
+\xc5\xb4\xdb\xb3\x9a\xd8\x8f\x2a\x94\x2d\x46\x9c\xa0\x46\xb3\xaf\
+\x27\xe3\xda\x03\x96\xed\x1d\x20\xf1\x32\xd6\xbe\xe7\xec\xb3\xd2\
+\xd9\x65\xed\xbc\xb0\x05\x78\xd3\xb1\x70\x4c\x6c\xca\xca\x2d\xb8\
+\x2a\x79\x26\xf0\x13\x9d\x08\x0a\x0d\x7c\x88\x84\xae\xcd\x09\x17\
+\x00\xca\xe8\xb5\x0a\x1d\x75\x97\x47\xbf\x2b\xd8\xfa\x29\x42\x44\
+\x48\xe5\x11\xc5\x25\x52\x49\xa2\xb8\x22\x37\x07\x68\x9d\x68\xcb\
+\x34\x58\xe3\x92\xdc\xb2\xbc\xf9\xe1\x85\xcd\x15\xdb\xc3\x9f\xbd\
+\xae\x7c\x17\xa0\x1f\xe4\xa9\x76\x25\x4c\xaa\x6d\x51\xc5\x2c\x4c\
+\x95\x70\x2d\x33\x26\x71\xdf\x69\xe0\x45\x56\x32\xc8\x53\x07\xe4\
+\x32\x5e\x39\x3d\xec\x67\x23\xd2\x78\x75\xe4\x1e\xef\xdc\xfd\xfe\
+\x61\x79\x96\x89\xf7\x4a\x91\xb2\x43\x66\x23\xee\xb3\x05\x33\x26\
+\xdc\xb3\x70\x5d\x1c\x92\x99\x0b\xef\x90\x65\xb5\xf7\x9d\xd5\x8c\
+\x5f\x4b\x17\xa3\xf7\x17\xef\xc8\x33\x9f\x65\x3e\x24\xdc\xdc\xd2\
+\x9f\x0c\xf9\xfa\x71\x8f\xa6\xc1\x7b\x5c\xaa\x76\x60\x36\x05\xca\
+\x55\x55\x31\xf0\xa0\x42\x67\xd9\xb7\x51\x46\xbc\x3e\xc0\xf8\x54\
+\x46\x1c\x83\x3a\x3c\xab\x21\x8d\x0c\x38\x66\x65\x5d\xc8\x88\x8c\
+\xcb\x60\x5d\x88\xca\xad\xc6\x6c\xf8\x27\x95\x6d\x5b\x4e\x44\x15\
+\xd8\x16\xa6\x33\x15\xba\xa8\xe1\x0b\x63\x98\x58\x36\x16\x70\xd1\
+\x89\x5f\xd1\xbe\x1e\xa4\x3e\x45\x22\x8d\xe7\x19\x6b\x29\x61\x74\
+\x70\x33\xb5\xe6\x18\x58\x05\xae\x72\x67\x3b\x3b\xb6\x4a\x01\x01\
+\x0a\x49\x64\x81\xec\x5e\x97\x91\xc7\x75\x2b\x92\x75\x34\x5c\x5b\
+\x92\x05\xaa\xf2\x81\x0c\xa1\xe2\x13\x1d\x67\x3b\x41\x28\xe2\xfa\
+\xc7\xdf\x29\xe7\x50\x60\x1d\x0c\xeb\x5c\x64\x39\x13\x80\x30\x3a\
+\xab\x87\xed\xd6\x7a\xc4\xc7\x8f\xdb\xd6\x25\xc7\xe0\x68\xc7\x63\
+\xbd\xe9\xb3\xdd\x5f\xa3\x78\x8b\x48\x07\xcc\x79\xa9\x19\x90\x0d\
+\x07\xee\xe8\x18\x49\x60\xf3\x0c\x1d\x2e\x38\xf0\x9a\x4e\x12\x41\
+\x9a\x40\x92\x9a\x0c\xf6\x15\xd3\x49\xa1\x8f\x18\x93\x0b\xfc\xde\
+\x88\xa7\xb1\x42\x66\x33\x3e\xbe\xfc\x86\x8f\x3c\xe7\xc1\x63\x23\
+\xad\xe2\xe1\x27\x43\xf5\x77\x8b\x25\xdb\xc5\x1d\xfd\xc9\x45\xeb\
+\xfe\xb8\xa9\x89\x8f\xd8\xfc\xb8\xb3\x23\xb4\xc0\xeb\x1c\x81\xd1\
+\x05\x76\x8c\xfd\xe6\xb6\x51\x45\x81\xc4\x23\xa6\x38\xb2\xd8\xdc\
+\x73\x84\x4e\x9a\xa9\xa3\x50\x8f\x05\x6a\xd4\xd0\xbb\x78\x19\x52\
+\x2a\x92\x48\x1c\x89\x04\xd9\x28\x33\x67\xed\x62\x88\x54\xf4\xcb\
+\x98\xad\x9f\xd1\x2f\x63\xca\x6a\x4b\x90\xf6\x51\x49\x0d\x9c\xc8\
+\x84\x7f\x44\xc3\x9d\xe8\x99\x9e\xb8\x4a\xf4\x4e\xe4\xc4\x09\x13\
+\x8b\x0a\xa9\x3c\x2a\x11\xe0\xa9\x82\x48\x64\xda\x86\x03\xfa\x24\
+\x90\x59\xfd\x9c\x81\x8a\x5d\x44\x53\x19\x50\x2b\xe5\x6b\x66\x36\
+\x92\x43\x58\xd6\xb6\x8f\x99\x85\xdf\xda\xfc\xdb\x16\xf8\x47\x6c\
+\x6c\xe4\xc6\x6e\xcf\xb0\xd7\xa5\x4a\xd2\x56\x15\xd1\xcf\x46\x44\
+\xf1\x3d\xeb\x46\x26\xb9\x20\x27\x25\xac\x01\x6c\x5e\x9f\x67\x2f\
+\x5d\x90\x3f\x8c\x25\xcf\x26\x0f\x5d\xae\x61\xd3\x79\xee\x02\x4c\
+\xb3\xe0\x19\x00\xf7\x85\xc7\xe0\xf0\xb0\xf1\xed\x3c\x44\x66\xc2\
+\x85\xe7\xa7\xfe\xe8\x24\x47\x6c\xfe\x71\x74\x7a\x63\xf2\xc5\x73\
+\xfc\xf9\x1b\x0e\xde\x63\x3a\x8f\x22\x5d\x5e\x27\x71\x0b\xbc\x63\
+\x40\xf7\x27\x17\x8e\x81\x87\x5e\xc9\xba\xf2\x09\xe3\x88\x78\x9d\
+\xe2\x0d\xe6\x28\x9e\x20\x3e\x91\x61\x66\xed\x69\x39\x21\x22\xa1\
+\xcb\xc1\x06\xcc\xbe\xd4\xdb\xbd\xd4\x8f\xf9\x52\xb6\xec\xb2\xc0\
+\x64\x1e\x8a\x06\xe0\xad\xee\xf5\x91\x94\x0a\xfc\x48\xcb\x05\xd1\
+\x14\x00\x86\x69\x2d\x18\x71\xcd\xa6\xfa\x59\x41\xea\xb3\xf6\x2b\
+\x92\x48\xd6\xcc\xac\xe6\x48\xd0\x1a\xdb\xd7\x00\x06\xd8\x26\x3a\
+\xb5\x5c\x50\x12\xa4\x7d\xca\x6a\xeb\x52\x6e\x51\x23\xbd\xa6\x0c\
+\x9b\xf6\x88\xd9\x71\x5e\x4e\xd8\x7e\xba\xfe\xa1\x64\x4b\x0d\x60\
+\xbd\x2d\x88\x44\x85\x52\x92\x64\x69\xbe\xfc\x81\x87\x17\x0c\x1a\
+\x7d\x76\x70\xd8\x29\x02\x51\x82\x52\x28\x15\x23\x0c\x58\x01\xa6\
+\x99\x47\x16\x57\x4e\xd3\x17\x76\xe1\xd7\x70\x60\x02\x2f\x63\x6d\
+\x16\x76\x64\xb9\x03\x35\xa2\x24\x3f\x48\xc2\x34\x69\x34\x9a\xe4\
+\x8e\x71\xf5\xdf\xbf\x65\xed\xf7\xcf\xba\x12\xf3\x6c\xce\xe2\xd5\
+\x86\xc9\xe7\xcf\xe8\x67\xe0\x4f\x6c\x61\x44\x7f\x8f\x63\x63\x44\
+\x0e\xe2\x94\x85\x79\xcb\x32\x97\x6c\x36\x7a\xa1\xb9\x04\x86\xcc\
+\x59\xe3\xb1\xfd\x3e\xa0\x3f\xd1\xa5\x66\xfd\x7b\xcf\x09\xe7\x26\
+\xa7\x3c\x1d\xd1\xf5\xfa\xc0\x9c\xed\xcb\x37\x7a\x31\x3c\x5d\xd2\
+\x7f\xb7\x25\xf9\x72\xd6\x62\x53\xbb\xd5\x72\xe0\xde\x01\x18\x60\
+\x5d\xf9\x0c\xbd\x12\x64\xda\x4e\x3a\x9e\x61\xe2\x32\x2b\x60\x58\
+\x11\x0a\xa0\x40\x22\xf0\x50\xc6\x45\x50\x40\xc7\xbe\x58\x7a\x54\
+\x51\x45\x60\x4b\xc5\xad\x36\xa4\x88\x22\xca\x60\x11\x22\xd8\x3a\
+\xf1\xaf\x5b\x8a\x32\x84\x01\x5c\x5c\x94\x64\x52\xe9\x6d\xe0\xeb\
+\xcc\x6f\xa3\xd8\x11\xa4\x3e\x65\xb5\x65\x1b\xf8\x0c\xcb\x98\xad\
+\x94\xe8\x67\xe9\x2c\x85\x8e\x66\xda\xfc\x80\xd0\xaf\x6f\xf8\x19\
+\x9d\x24\xe3\x90\xf6\x29\x1a\xcd\x97\x3d\x62\x76\x22\x73\xad\x52\
+\x4d\x00\x1f\x5f\x36\xbe\xce\x0e\x6f\x8b\x0e\xd1\xe0\xdf\x91\xcd\
+\x30\x00\xae\x8a\x8d\x0d\x91\x1e\xc9\x89\x1a\xc0\x7a\xab\x8b\x09\
+\xb6\x22\x88\x10\x47\xa5\x08\x0d\x5c\x5b\x20\xb1\xa5\xe6\x49\x96\
+\xb3\xf6\x14\xf1\xa1\x22\x0c\xa3\x9a\x89\x1b\x9e\xb1\x2e\x67\xe7\
+\x2c\xca\x80\xa9\x1f\x38\x56\xd6\xe5\x6f\x28\xdf\x55\x75\x45\x6c\
+\xf1\x3d\x0b\x60\xf5\x32\x60\xe0\xdd\x39\xb0\xcc\x06\x3e\x55\x30\
+\x65\x34\x1e\xb0\x5a\x6e\x1a\x7f\xd5\x7d\xbd\xe6\x32\xdb\x47\x93\
+\x81\x03\x6f\xdf\xe4\x3d\x6e\x57\x25\xbb\x72\x41\x6f\x55\x72\x98\
+\x68\x81\x3b\x1b\xe9\x9d\x77\x38\x99\xb2\x5f\xac\x51\x4a\xd1\x15\
+\xc9\x89\xe5\xe6\x9b\x1d\xd1\x63\x4a\xc5\x9c\x75\xe5\xb7\x81\xdc\
+\xac\x14\xf7\xd7\x94\xdb\xe1\x49\xe8\xdf\x55\xec\x02\x22\x8a\x48\
+\xd2\x95\x1e\x45\x54\x21\xa4\x87\x32\x7a\xb7\x59\x81\x73\x8b\x32\
+\x23\x0f\xb4\x5c\x88\x40\x28\x50\x03\x67\xbb\x95\x52\xea\xae\x65\
+\x22\x7c\x35\x27\x03\xf2\x55\x48\x16\xe7\x70\x00\x9f\xd0\x24\xdb\
+\x42\xed\xc2\x89\x9c\xb8\x71\x84\x89\x8c\xf4\x00\xed\x37\x27\x54\
+\xa7\xb5\x3c\x67\xa1\xe9\x18\xa2\xdc\xef\x89\x92\xb0\x4e\xb1\x19\
+\xf3\x5e\x9d\x69\xf6\xac\xce\xb0\xb1\x2d\x4f\xb7\xb5\x70\xa3\x5d\
+\x49\x05\x78\xe3\x1a\x7e\xc5\x20\xa1\xb0\x5a\x57\x65\x74\x7a\x53\
+\x0e\xbb\x66\x79\x25\xa3\xa8\xa6\xa8\xe5\x9a\x55\xb6\x67\xc4\x80\
+\x2c\xae\xc8\xe7\x7b\xe7\x6e\x0c\x07\x1d\xe6\xc5\x0e\x44\x0d\xe4\
+\xb5\xa7\x40\xc2\x10\xe1\xaa\x82\x6b\x4f\x31\x34\x4c\x6c\xf5\x32\
+\x71\xe8\x4a\xd5\xfd\x4d\xc9\x7a\x52\x34\x98\x38\x24\x5f\x6f\x08\
+\x27\x11\x53\x86\xae\x73\xa2\x3f\x29\x98\x4c\xe0\x62\xf2\x33\xf6\
+\x8b\xef\xf1\x99\x32\xf6\x4a\xf6\x95\x6e\x52\x7d\x61\xed\xb2\xb1\
+\x0f\xcb\x52\x6f\x81\x4e\xdc\xe3\x90\x35\x9c\x8e\xc6\x63\x4f\xbc\
+\x3e\xf0\x14\xc6\x3e\x45\x2c\x08\xde\x67\xfc\xdb\xf9\x96\xc3\x6a\
+\xc9\xaf\x98\x58\x67\x90\x05\xf8\x22\xc5\x25\x7b\x4c\xea\x4f\x4b\
+\x1c\xc9\x76\x71\x47\x32\xf1\x9d\x94\x38\x06\xb2\x00\x28\x27\xae\
+\x80\xd2\x64\x65\x9d\x9d\x30\x01\x74\xeb\x36\x78\xb2\xb6\xc6\x02\
+\x63\x7d\x15\x06\xb8\x2e\xd0\xde\xd0\xb9\x42\x2a\x23\x87\xf2\x96\
+\x13\xa1\x6d\x9a\x43\xa3\xb1\x32\x22\xee\xf4\x28\xc5\x54\x5b\x27\
+\x22\x32\x5b\x3d\xeb\xa2\xea\xc7\x44\x91\xa0\x30\xba\x56\xb7\x31\
+\x45\x6e\xdb\xea\xa8\x33\x00\x96\xe6\xf0\x2c\xa5\x32\x76\x4c\x64\
+\x42\xef\x25\x42\x54\x2e\x3b\x21\x1a\x8b\xba\x73\x00\xf6\xc8\xd8\
+\xf8\x15\xc9\xa1\x3c\xe9\x70\x96\xd6\x6b\x1e\xd7\x11\xff\xad\x9f\
+\x36\x58\x22\x43\x08\xdb\xb2\x94\x35\x58\x58\x7f\x6a\x12\x1c\x60\
+\xe0\xb1\xc6\xd3\x95\x3f\x20\xce\xbc\xba\x64\xed\xa4\x9d\x62\x10\
+\x17\x14\x55\xec\x00\x9d\x15\x01\x59\xc7\xd3\xc9\xba\x24\xd5\x76\
+\x5c\xec\xd7\x00\x8e\xdb\xeb\xf2\x66\x79\x24\x0c\x23\x92\x38\x61\
+\x32\x9d\xd5\x8c\x3f\xe8\xf0\xf4\xf1\x15\xc3\xc9\x98\x07\x5f\x7e\
+\xc1\x83\xc7\x3d\x18\xfb\x74\x27\x43\xc6\x13\x03\x5e\x03\x4e\xb7\
+\x35\x51\xcf\x4e\xdc\x70\x3a\xcc\x63\x55\xb9\x6a\xbd\x26\xc8\x14\
+\xc5\xa3\x98\x27\x13\x0d\x56\xdb\xad\xdd\x89\xf5\x71\xb4\xcc\x0a\
+\x17\x4d\xfd\xb1\x4b\x93\x85\x8f\x17\x76\xc7\x76\x5d\xba\x3d\xe0\
+\x97\xd2\xe3\x60\x80\x77\x68\x54\xdb\x9a\x16\x98\x03\x76\xc3\xdb\
+\x15\x0d\xbd\xdb\x64\xd0\x33\xc7\x5f\x10\x11\xd1\x24\x24\x4b\x2e\
+\xf0\x45\x0d\xd8\xaa\x1f\xeb\x34\x5c\x54\x39\x97\x57\x82\x03\x27\
+\xc7\xc5\x68\x0b\xda\xa6\xa1\x26\x74\x01\x46\xcb\x14\x79\xc6\x6a\
+\xf1\x5a\x1d\xd8\xad\x05\x89\xa9\xd6\x09\x11\xe9\xb6\xfd\x8e\xef\
+\x40\x6b\xc1\x7c\x0c\xea\x3c\x2e\xdb\xa1\x21\xd0\x92\x41\x94\xad\
+\x56\x26\x5b\xec\xf0\x2f\x9e\x52\x0c\x1e\x90\xc7\x25\xfe\xc5\x53\
+\xdd\x35\x1d\x47\x84\xd3\xae\x91\x1e\xb5\x2b\xb1\x34\xbe\xe9\x02\
+\xdf\xb1\x70\x7c\xa8\xc8\x3a\x9e\xc9\x73\x68\x3d\xbc\xc8\xca\x16\
+\x13\x77\x46\x55\x43\x5e\x68\x67\xc2\x76\x44\xef\x95\xe2\xd5\xcb\
+\x5f\xe8\xac\xef\xa6\xc4\xdf\x7e\xa0\xb8\xff\x86\xe2\xfb\xb9\x66\
+\x57\x13\xc2\x71\xdb\x26\xdb\x36\xfe\xdf\x6f\x6f\xf5\x76\xb1\x86\
+\x65\x49\x55\xae\x38\xac\x6a\x0f\xbc\x13\xf7\xdc\xc8\x80\xe9\x17\
+\x9f\xb3\xaa\x2a\x3e\x2e\xee\xe9\x4e\x86\x94\x62\xd6\xc8\x9b\x27\
+\xf8\xe8\x80\x7d\xdd\x28\x7a\xe1\xd8\x37\x59\x04\x2d\x36\x06\xc8\
+\xfd\xad\x2b\xa4\x9c\x6b\x52\x0d\xab\x28\x03\xe9\xd5\xe1\x19\x03\
+\x13\x81\x70\x5e\x71\x2d\x13\xbc\x56\x74\xb2\x95\x87\x20\x42\x52\
+\xb5\x53\x6a\x22\xd7\x93\x85\x9a\xa5\xe4\x46\x93\xe7\x71\xb9\xd8\
+\x39\xbe\x4a\x9d\x3c\x2e\xed\x82\xcd\xde\x67\x26\x02\x49\xa0\x5f\
+\x64\x7a\x87\x20\xd2\xbe\xb0\x69\x41\xe2\x4c\x97\x73\x93\x85\x2d\
+\x2b\x4b\xe5\xe1\x99\xd8\xa9\x05\xad\x95\x15\x76\xf2\x8f\x03\xb0\
+\x59\xcc\xe9\x49\x40\xa5\xb3\xd8\x94\x52\x08\x3b\x94\x44\x98\x8a\
+\x5c\x4f\x03\x39\x30\x56\x5c\xd1\xf0\x92\x6d\x89\x7a\x58\xe9\x06\
+\xad\x45\x55\x7b\xc8\x71\x50\xe0\x6f\xfa\xc4\x83\xed\x89\x76\x76\
+\x0b\xbe\x46\x1a\xee\xb0\xf2\xf4\x5a\xcb\xb1\x73\x6a\x5c\x0a\x78\
+\x9b\x49\x7e\xc8\xde\xf1\x2c\x7e\x4c\xc6\x90\xb2\xd4\xef\xe9\x57\
+\x3e\xf1\x62\x8d\x9a\x24\x0c\x97\x25\xeb\x71\x45\xb9\xd0\x7a\xb7\
+\x4e\xc7\x4d\xdd\xa2\x6e\xbc\xd2\x8b\x39\x7f\x92\xa0\xa8\x28\x17\
+\x23\xfc\x49\x41\xb6\x80\xb7\x8b\x35\x89\xb7\xe0\xd9\xaf\x3c\x41\
+\xc4\x7d\x3e\x6e\x34\x03\xaf\x4d\x85\xf3\x84\x55\x0d\x13\xd7\x8d\
+\xa2\x5a\x4e\x00\xdc\x72\xc0\x67\xc1\xc5\xe2\x21\xc1\xf4\x00\xf8\
+\xe4\x65\xff\xbc\x17\x6c\x41\x3c\xdf\x54\x44\xb9\x42\xe6\x25\x22\
+\x54\xd8\xce\xa4\xb2\x55\x46\x8e\xf0\xe5\xf9\x84\x82\x6a\x65\x2a\
+\xda\xc5\x0d\x0d\xe0\xcd\x49\x41\xc2\x5e\xfb\x54\xde\x41\x0a\x41\
+\xa4\x54\xed\x0f\x3b\xc0\x4a\x22\x21\x74\xa9\xb9\x51\xbd\xcb\x02\
+\x9f\x7e\xea\x53\xcc\xaa\xd6\xdf\x64\xab\x68\x9f\x5a\xd0\x35\xdb\
+\x93\xd4\x32\x68\x69\x62\xeb\x50\x0c\x4e\xfe\xbd\xd9\xc9\x6d\xa1\
+\x62\xc7\xc8\x1a\xc8\x3e\x42\x64\xee\xd8\x65\xc3\x40\x81\x97\xb5\
+\x87\xac\x54\x31\x50\xb2\xde\xed\xb5\x5f\x5c\x04\xf4\xb3\x88\x6d\
+\x2c\xc9\x81\x69\xa3\xec\xdc\x04\xb0\x5d\x04\x0e\x2b\x41\xb9\x08\
+\xd8\x0e\xf4\x2a\xc3\xb2\x73\xea\xe4\x46\x8f\x19\x13\x7e\xfa\xf8\
+\x67\x6e\x41\x96\x15\x11\x79\xa6\x18\x32\xe7\x36\x8e\x18\x02\x6f\
+\xa3\x1d\x43\xba\xf8\x93\x02\x1f\x5d\xf2\x1e\x8d\xa6\x4c\x0f\x4b\
+\xfc\xec\x0b\xc6\x23\x8f\xca\xd7\x12\xc1\x5f\xac\x18\x4e\xc6\xdc\
+\x4f\x2a\xfc\xc5\x8a\xf1\x17\x63\xc2\xc5\x92\xbb\xc5\x90\x37\xef\
+\x16\x4c\x33\xd8\xee\x74\xa5\xed\xcb\xa1\x47\xc7\x24\xeb\x9a\x12\
+\xa2\x29\x29\xf2\xec\x3c\x0a\xd2\x49\xe1\xa6\x6d\x08\x30\xc9\xb8\
+\xba\x68\xd2\x64\xe4\x50\x9b\xfd\x15\x03\x7c\x36\xb9\xa0\x13\xe2\
+\x1a\x3a\x05\xc2\xb8\x13\x19\x05\x10\x50\x39\xc6\x16\x26\x5b\x21\
+\x8e\x18\xd9\xea\xd9\x54\x7a\xf4\x3b\x7b\xb2\xc3\x00\xc8\xd9\x02\
+\x81\x54\x10\x9d\xd6\xdb\x4e\x8a\x1f\x8e\x89\x4d\x5a\xcd\x54\xea\
+\x22\x03\xe6\xd6\x7d\x40\x50\xc6\x4e\x4b\xdb\xe6\xd0\xf6\xac\x89\
+\xcc\xfd\x8d\xc7\x9a\xb8\x32\x0b\x33\x08\x8c\x4c\xa8\x5a\x5a\xf8\
+\xf4\x62\xbc\xe6\x62\xe3\x16\x27\xea\xcc\x0e\xa2\x41\xed\x1b\xfb\
+\x6d\x4e\x60\x3e\xaf\xe8\x09\x0d\xe6\xaa\xd6\xc2\xe0\xeb\xad\xd0\
+\x1d\xde\x76\xc1\xb3\xde\xc1\xb0\x17\x01\xca\x01\xbd\xc9\xca\xa0\
+\x47\x02\x9c\xbb\x24\xb1\xa9\xe0\x21\x18\x3f\x7d\x42\xb8\x49\xe9\
+\x4e\x9e\xd1\x05\xa2\x89\x62\xd3\x89\x74\x03\xd0\xea\x8e\x71\xef\
+\x8a\xe5\xee\x9a\x71\xef\x8a\xbb\xc5\x92\xe9\xa4\x60\xfe\xca\x94\
+\xd2\x78\x69\xaa\x6a\x13\x57\xa3\xbb\x5b\x4c\x18\x32\xe7\x8e\x29\
+\x77\x8b\xa5\x71\x78\x34\x83\x87\xbb\x3d\x79\x16\x71\x31\x9e\x50\
+\x4e\x86\x28\x8a\x13\xd9\x69\x01\x6c\x01\xb9\x1b\x97\xb0\x80\x64\
+\xe2\x73\x28\x3e\xf0\x78\xf1\x84\x74\x52\xb0\xae\xec\x20\x2c\xce\
+\x96\xaf\x7d\x52\x5d\xec\x18\x0c\x62\xa7\xe5\x06\xa6\x75\x48\x49\
+\x2d\x27\xea\x92\x70\x44\x61\xb5\x70\x43\x5b\xda\x38\xa6\x38\x93\
+\x03\xf6\x91\x26\xc0\xb1\xa9\xa1\x6a\x16\x91\xcd\x7e\x0c\x3b\x8c\
+\x30\x6a\x15\x94\xdb\xcd\x49\x91\x59\xb0\x49\x03\xee\x08\xd9\xaa\
+\xf4\xcd\x92\x82\xc2\xf6\xcb\xd9\xd6\xfc\xc6\xce\x55\x11\x23\x0c\
+\xd0\x76\xc6\xd7\x3d\x76\x29\x3c\x91\xa1\x96\x7b\x2a\xd1\x6b\x31\
+\xf1\xd6\x46\x34\xe3\xa3\x24\x55\x30\xe0\xb0\xd9\x20\x06\x89\x03\
+\xb6\xb2\xfa\x18\x9c\x57\x8c\x5b\xe4\x95\x2d\x06\x0e\x3c\x3d\x39\
+\x28\x35\x16\x5d\x62\x99\xdc\x56\xf6\x8c\x55\xb7\x46\xdb\x6c\x04\
+\x85\x8b\x74\x5a\x56\x76\x51\xcd\x66\xb0\xde\xb2\x31\x90\xc4\x39\
+\x12\x1d\x74\x0f\xc2\x80\x57\x1f\xfe\x8a\x7e\x57\x10\xee\x04\x79\
+\x76\xad\xa5\x6f\x3e\xe4\x62\x78\xed\x7a\xeb\xc2\x18\xe6\x8b\x88\
+\x3c\x96\x84\x59\x44\x1e\x0b\x53\xc8\x91\x0d\xfa\x92\x6c\x7a\x13\
+\xf2\x9d\x74\x05\x9d\x61\x35\x61\x34\x9a\xea\x46\xd9\x09\xbc\x01\
+\x62\xd6\x08\x1e\xb4\xfe\xed\xad\x30\x90\x92\x2c\xf3\x82\xa9\x17\
+\xba\x8e\x98\x4e\xf0\x19\xe9\xa4\x40\x72\x4f\xd4\x82\xb0\x0d\x18\
+\x0d\x1b\x8b\xbc\xc4\x44\x31\xed\x62\xce\xe8\x5d\xd5\xe8\x81\xb3\
+\xb2\xa0\x38\xb3\x60\xb2\x61\x20\xa1\x6c\x0f\x5e\x0d\x3e\x69\x3d\
+\x61\x36\x8d\xc7\x3e\x7d\xb1\x15\x38\xcb\xa6\x16\xe6\x91\x6d\xbb\
+\x6f\x48\x15\x07\x6f\xc3\xca\x49\x54\x71\x48\x03\x48\x24\xa8\xa8\
+\x9e\x94\x69\x62\x97\x98\xc5\x9b\x05\x74\xaf\x31\xc9\xd2\x02\xd8\
+\xca\x09\x31\xee\x1a\x56\x8e\x1c\x13\x27\x87\x92\x66\x48\x2c\x63\
+\x4f\x6c\xf4\x71\xb0\xd1\x51\xcd\x30\x36\xa0\xb3\x9f\xd3\x00\xad\
+\x6a\xe6\x2b\x44\xc9\x61\x37\x77\xce\xc5\x61\x37\x87\xa8\x24\x69\
+\xac\x13\x6a\x56\xcf\x48\xbd\x92\x40\xfa\xf8\xa2\x44\x1c\x22\x07\
+\xe0\xb5\xa7\x75\xf6\x49\xca\xed\xf8\x90\x4c\x08\xdc\xb3\xb9\x87\
+\x8b\xe1\x9e\x71\x3c\x26\xcf\x14\x0b\x25\x19\x18\xef\xfa\x62\xb8\
+\x67\xdc\xbb\xa2\x8c\x57\xae\x6b\x63\x70\x90\x04\x19\x74\x26\x3d\
+\x14\xa6\x0b\x64\x3a\xf9\xd1\xdf\xd0\xc6\x2f\x2b\xff\xd2\x84\x82\
+\x16\x74\xbd\x91\x2b\xbf\x5b\x09\xe1\xb6\x26\x60\x34\x0e\x77\xbc\
+\x5d\x94\x8e\x8d\xfd\xc9\x82\x74\x31\x21\x99\xcc\x18\x2c\xbe\x85\
+\xe1\x57\xba\x3d\x69\x7b\xa1\x19\xdc\x3a\x1c\x59\xe2\x2c\xb6\xd0\
+\xfa\xbe\x55\x54\x51\xca\xb8\x66\xd7\x48\xb4\x17\x69\xcd\x85\x9f\
+\x54\xf8\x4d\xf7\x41\x6d\x80\x01\xd2\xa6\x39\xc0\xb0\xf0\xce\x59\
+\x74\x41\x43\x38\x14\x48\x02\x3b\x53\xc2\x14\x43\xb6\x41\xe6\xc8\
+\xd7\x8d\x89\x35\xc5\x01\x54\x04\xaa\xd6\xc3\x56\x7f\x46\xa6\xca\
+\xe7\xba\x76\x45\xd5\x72\x20\x9a\x96\x9a\x65\xdf\xe3\xaa\x9d\x6d\
+\x16\xf5\x44\x81\x5a\xee\x9d\x2e\xb2\x4c\x7c\x2a\x26\x72\x0a\x21\
+\x08\x94\xc2\x0b\x29\xf9\xbd\x95\x00\x00\x20\x00\x49\x44\x41\x54\
+\x06\x6c\xf7\x77\x24\x45\x8f\xce\x80\x46\x67\x89\x72\xec\xac\x7d\
+\xe4\x7a\xf8\xa0\x10\x82\xd4\xcb\x48\x2a\xed\x4c\xf8\x55\xc6\x6e\
+\xa7\x0b\x0b\xc1\x46\x5b\xa9\x5f\x4c\x47\x2c\x6d\x2b\x96\xf9\xda\
+\x8a\x95\x2e\x96\xac\x1b\x9e\xf2\x8f\x01\xb8\xd9\xf2\x14\x74\x57\
+\x14\xbd\x09\x4f\xe2\x88\xee\x95\x68\xb5\xf2\xd7\xbf\x6a\xcf\x65\
+\x94\x01\x96\xa3\x89\xbb\xbe\xc8\x22\x4a\x5b\xf2\x68\xb4\x51\x35\
+\x27\x13\x09\xf1\xce\xe8\x7d\xc9\x3a\x8b\x78\x44\x40\x35\xdc\x00\
+\xbd\x96\x23\xe1\xa4\x84\x19\x66\x68\xc7\x66\xf5\x96\x3e\xfe\x64\
+\x41\xb9\x98\xe0\x4f\x16\xc0\x8c\xcd\xe4\x2b\x2e\x4c\x7b\x52\xd9\
+\x2f\xf0\xb7\xfa\xf5\xf6\x3d\xf6\x4a\xe9\xb2\xb3\xed\xc0\x08\xa4\
+\x6c\x31\x5e\x13\xb4\xcd\x7f\x6a\x57\x7a\x0e\xc0\x71\x51\x92\x89\
+\x9c\xb8\xe8\x91\x1d\x36\x2d\x85\xab\x7d\xdb\x1e\x19\xd0\x27\x62\
+\x6b\x80\x6b\x8b\x2b\x4d\x19\xd2\xeb\x47\xf8\x69\x40\x91\xa4\x48\
+\xe9\x1d\x39\x15\x5e\xad\x9e\x8d\x0e\xce\x84\x47\xac\xac\x7f\xbc\
+\xa3\x93\x14\x3a\xb3\xa0\x70\x4c\x6c\x01\xaa\x27\x60\xd6\x32\xa8\
+\xf7\x09\x9f\xd8\x16\x3b\x6c\x76\xc2\x96\xa3\xb7\x45\x87\x04\xad\
+\x7f\xad\x53\xb1\x53\xb9\x63\xe3\x3e\x17\x1a\xc8\xef\x2b\x78\xd4\
+\x6f\x15\x3b\x9a\x3e\xb2\x65\x66\x9f\x0c\x5d\x14\xcc\xb8\x55\x8a\
+\xe2\xed\x82\x0f\xab\x5b\x76\x77\x7b\x3e\x2c\xdf\xf2\x48\xe4\xfc\
+\xd5\x93\x9f\xf0\xd3\xe7\xda\x76\xaa\x06\x53\x3a\x55\xc2\xd5\x64\
+\x4c\xe0\x95\x40\x41\xbe\x92\x70\x26\xe2\xd9\xb4\xdd\xec\xed\xf5\
+\x22\x73\x76\x1f\x71\xa9\x3b\xb0\x33\x93\xcb\xcb\xd2\xd3\xd7\x34\
+\x0f\xdd\x71\x42\x9a\xa5\x5a\x5f\x37\x82\x44\xee\x08\x9a\x09\xfa\
+\x2c\x59\x2e\x20\x98\xe0\xbc\xe4\x92\x7b\x32\x86\x8c\x58\x81\xf2\
+\x4d\xa1\x83\xf6\xe2\x4e\x49\xba\x22\x22\xdc\xdc\x36\xdc\xa9\x19\
+\xcb\xe2\x9a\x31\x57\xa4\x8b\x92\xab\xa9\xfe\x4b\x9a\x4c\xdc\xf2\
+\x8a\x15\xba\xec\x8c\x49\xa4\x45\xd1\x84\x54\xea\x6a\x91\x30\x76\
+\x1a\x26\x81\x56\x18\xe0\xb9\xd2\x85\x19\xc8\x9d\xf5\xe3\xfa\xe7\
+\x92\xbe\x2b\x2b\x47\x91\x60\x7b\x34\x1c\xb0\xa9\x77\xb7\x48\x44\
+\x14\xd5\x95\x3f\x24\x24\x11\x30\xa5\x44\x11\xa4\x1e\x45\x52\x3a\
+\x2d\x8c\x8a\x9c\x6b\x81\x52\xc4\xf4\x88\x84\x44\xa8\x8c\x83\x9e\
+\xd3\xd3\xea\xa1\xeb\x89\xc8\x01\xd3\x5e\xb7\xba\xb8\x82\x93\xf6\
+\x24\x77\x5b\x05\x48\xea\x8a\x5d\x4e\x45\x1f\xc1\x76\x0f\xc9\x26\
+\x85\x60\xe0\xd8\xb8\xe9\x1b\x57\xfe\x0c\xaf\xeb\xa1\x96\x8a\x24\
+\x38\xb8\xb2\xb4\x17\x0c\x34\xd0\xb7\xd7\x6c\xc3\x09\x87\x4d\xca\
+\xdb\xbb\x0f\x6c\xb2\x15\x3f\x7c\xfb\xbd\xfe\x61\xa3\x4b\xd4\xf5\
+\x3b\xae\xf7\x1a\xe4\x7f\x79\xb7\x81\x3f\xff\xd7\xfc\xcb\x8b\x01\
+\x5f\x3e\xec\x90\x2d\x0b\xe2\x71\xc0\xdf\xfb\xfa\x37\x99\x3d\x0b\
+\x18\x8b\x3e\xb3\xcf\x1e\x30\x59\xc3\x75\x67\x8f\x98\x07\x84\x93\
+\x91\x2e\x96\x78\x05\x1e\xc9\x09\x30\x3d\xb5\x23\x4e\xba\x75\x07\
+\x36\xb0\x5e\x64\xc4\x41\x41\xb6\x08\x18\xf6\xba\x8d\xce\x6b\xbd\
+\x28\x94\xd9\x0c\x50\x8e\x6d\x93\x38\x41\x70\x8f\x6a\x4d\xe0\x94\
+\x2c\xb2\x31\xdb\xf8\x9a\x07\xf1\xd8\xb1\xeb\x7a\xb7\xe7\x89\xd7\
+\x83\x46\x50\xc8\x02\xf8\xb8\xd8\x91\x0f\xea\xeb\xe9\xc2\xca\xc9\
+\x7b\x60\xc2\x87\x6a\xc1\x8c\x19\x61\xb7\x51\x59\xb5\xd5\xbe\x6c\
+\x4d\x57\x24\x86\x89\x5b\xae\x6d\xbb\x4d\xc8\xea\x61\xcb\xa0\x96\
+\x4f\x14\x15\x42\x49\x5d\xc9\x33\x00\xb7\x56\x17\x46\x0a\xb8\x09\
+\xf2\x26\xff\x10\x48\x0f\x19\xd1\x7a\x3f\x5b\x1c\xd1\x96\x9a\xfe\
+\x1b\x92\x08\x48\xeb\x50\x7b\xa4\x1a\xf6\x9c\x93\x17\x0a\x44\x84\
+\x42\xb5\x7a\x1a\x6c\x5e\xa2\x6d\xff\x65\x8d\x83\xe5\xa9\x57\xdc\
+\x6a\x4f\x32\x5e\xf1\x71\xe9\x19\xd0\x63\x5f\x8b\x3b\x44\x3c\x3d\
+\x11\x18\x91\xc8\x08\xd1\xab\xfd\x3c\xee\x12\x66\xba\x2c\x1d\x6c\
+\x36\x04\x1b\xf8\xb6\x90\xdc\xbe\x7b\xc5\xab\x77\x19\xea\xfa\x1d\
+\x37\xcb\x37\xf5\x0e\x14\x6b\x6a\x98\x45\x4f\xb9\x97\x6f\x78\xf6\
+\xf4\xa7\x74\x0b\x0d\xea\xef\x6e\x0f\xa4\x77\x1b\x7e\x7a\x7b\xe0\
+\x7f\xf8\x8b\xff\x91\x17\xcf\x03\xa2\xc7\xff\x21\xff\xf1\x3f\xe8\
+\xf1\x60\xf4\x1f\x10\xcb\x15\x74\x21\xcf\xbb\xf8\x1d\x89\x57\x3d\
+\x04\x8e\x3a\xad\x9b\x15\x3c\x7a\x48\x46\x94\xdc\x33\xec\x75\xf5\
+\x00\xed\xd0\xce\x10\x6e\x57\xd1\xce\x8d\x67\x55\xce\x8d\xa9\x07\
+\xaf\x44\xb1\x62\x9f\x17\x7a\x04\x80\x29\xf5\xf7\xb3\xa8\x36\x33\
+\x1a\x91\xd4\x93\xe9\x9a\x4a\x4f\x1e\x7a\x6b\x6f\x4f\x16\x70\x87\
+\x93\x14\x0f\x17\x0b\x18\xce\xc8\xf7\x99\x03\xb2\x93\x23\xb6\x83\
+\xc5\xdf\xb7\x3d\xe4\x61\xe9\xb1\x95\xd2\x68\x52\xa9\x01\x28\x3d\
+\x8a\xc8\x00\xcf\x68\xe1\x75\x2a\x11\x89\x06\xa6\x02\x02\x93\x58\
+\x3b\x8e\xa7\xdb\x02\x48\xab\xf3\xf6\x9c\xa9\xd6\xd0\x9e\xa9\xf4\
+\xf0\xcd\x02\x4f\x2f\xec\xa4\x0b\xfc\x38\x6b\xad\xe1\x11\x97\xd5\
+\x16\x21\xa6\x28\x2a\x76\x66\xae\x84\x05\x72\xd3\x99\x50\x67\x5c\
+\x89\xe3\xdc\xc4\xb1\xfd\x66\xc3\xf1\x22\xee\x12\x66\x3e\xdb\x3d\
+\xa8\xe5\xbe\x55\x82\x6e\xca\x06\xab\x50\x42\x33\x88\xe5\xa6\x08\
+\xd8\xbc\xbb\x65\x79\x77\xcd\xdf\xbc\xc9\x1d\x38\x89\x1f\xb3\xca\
+\xbf\xe6\x8b\x81\xa2\x5b\xbc\x63\x1f\x3c\x6e\x01\x79\x16\x3d\x65\
+\x16\xa1\x1f\x7b\xfa\x53\xb6\xa6\xdf\xf7\x46\xbe\x81\xd7\x6f\xf8\
+\xfd\x6b\x9f\xaf\x2e\xbf\xe3\xf1\xd3\xdf\xe2\xcb\x9f\x8c\x08\x46\
+\xa5\x8e\x86\xae\x37\x8e\x4d\x5d\x51\x84\x7a\x0e\x73\x9a\xa5\x10\
+\xef\x48\x48\x4c\x6b\x93\x32\x91\xcd\x5e\xeb\x76\x42\xaf\x9e\x7b\
+\xd1\x92\x18\x5a\x4e\x94\x8b\x40\xa7\xe1\x0c\x4b\x87\x8d\xcc\xf3\
+\x49\x37\x89\x25\x9e\x13\x97\xc1\xa7\x14\x11\xdb\xc5\xc7\xd3\xcf\
+\x31\xda\xf8\x76\x82\xd3\xc4\xc7\xaf\xb7\x3a\x3b\x29\xbb\xa6\x65\
+\xdf\xf8\xba\xbe\x99\xe0\x6e\x17\x5c\x76\x3b\xd8\x56\x64\x81\x02\
+\x15\xa2\xa8\x78\x38\x6b\x03\xd1\x2d\xd4\x8e\xfc\x5f\xdf\xee\x08\
+\x8d\x12\x36\x47\xbd\x19\xc7\xd5\xbb\x56\xde\xd8\x31\xaf\x74\xa7\
+\x3a\x88\xec\x8e\x61\xc6\xf5\x1f\xbc\x7e\x63\x9a\x4e\xfb\x3c\x1e\
+\x9f\xb2\xd4\xf2\xa3\x56\xa5\x66\xc3\xa8\x75\x2b\x8e\x2b\x76\xeb\
+\xd8\xc7\xf7\x0b\x50\x92\x30\xbb\x38\xb1\xdc\x74\x9c\x32\xa5\xa8\
+\x12\x96\x4a\xb2\x58\x2c\xb9\xfb\xdb\x1f\x78\x69\xe6\x32\xdc\xef\
+\xeb\xe7\xcf\xa2\xa7\x20\x7f\x01\x3c\xe5\xe3\xc3\xe7\x3c\x0d\xcc\
+\x21\xfe\x16\xc2\x27\x2f\xe0\x5e\xdf\xde\x07\x8f\x99\x8f\x5e\x33\
+\x5d\x3d\x77\xe0\xee\x16\xba\x7f\xed\xdb\x1b\x8f\xf7\xea\xcf\xa8\
+\xe6\x13\x2e\xfe\xee\xd7\x8c\x45\x9f\xac\x0f\x76\xc4\xc4\xc4\x00\
+\x2b\xcf\x22\xbc\xfd\x12\x46\x38\x6d\x2b\x19\x99\xd6\x26\xad\x89\
+\xed\x10\x40\xdb\xea\x94\x92\xb7\xe4\x45\x13\xc0\x76\xa4\xc0\xc9\
+\xbf\x3d\x53\x10\xf7\x74\xff\xdf\xe4\x9e\xa6\xa5\xd3\x94\x0f\xee\
+\xfa\x27\x4e\xa1\xd0\x09\x3e\x63\x77\xf7\x81\xf1\x85\x4f\xba\x98\
+\xe8\xcc\xd0\x51\x83\x41\xf3\xfd\x5a\x4c\xec\x37\x42\xf1\x27\x8b\
+\xdc\xc0\x2e\xe5\x36\x08\x11\x35\x3a\x99\x55\x6d\x7c\x35\x1a\x33\
+\xa3\x33\xe0\x94\xb4\xa5\x84\x3c\x03\xe6\xd6\xb4\x9f\x93\xce\x46\
+\xe3\x25\xab\xfa\xb1\x43\x1a\xd0\x49\x0a\x0a\x0b\x76\x3b\x40\x45\
+\x54\x27\x65\x71\x61\x58\x53\xcf\x24\x6e\x3b\x17\x1a\xac\x09\x1b\
+\xbf\x6a\x8d\xb6\x02\x58\xc7\x3e\x9e\xaa\x88\x45\x0e\x22\x22\x38\
+\x94\xdc\xed\xef\xb9\x60\x76\x02\xe4\x55\xe5\x91\x2f\x17\xbc\x7e\
+\xbb\xe0\xf5\x9f\xfd\x6b\xae\xf7\x25\xe9\xdd\x86\xe4\x62\xd0\x06\
+\x30\xf0\xe2\xab\x7f\x00\xc0\x4f\x2e\x66\xfc\x5f\x87\x11\x7f\xbf\
+\xb3\x82\xce\xbd\xae\x52\x3d\x86\x37\xea\x9a\xd1\x7d\xce\x74\xf5\
+\xfc\x84\xa5\x01\xc6\x83\x1b\xb2\x65\xc1\x1f\x2e\xef\x78\x51\x24\
+\x3c\xfb\xf2\x09\x97\xcf\xd7\x04\xa3\xaf\x48\xb3\x1d\xfd\x2a\x6a\
+\x05\xfe\xf3\x5c\x92\x66\x11\xc4\x21\x65\x76\xcf\xf5\x62\x4f\x1c\
+\x14\x84\x59\xc4\x7a\xb7\xa7\x9f\x45\xa6\x62\xa7\xc1\x3a\x1a\x5e\
+\x1c\xfd\x00\xf7\x46\x72\xd4\xd2\xc3\x4e\x0f\xb2\x2d\x4b\x13\x11\
+\x51\x66\xf7\x67\x17\x89\x9f\xac\xd8\x0d\xda\x32\xe6\x50\x7c\xa0\
+\x77\xd1\x65\x79\x77\x4d\xef\xa2\x0b\xcc\x4c\x05\xf4\x47\xca\xce\
+\x0e\x58\x52\x1d\x85\x79\x2a\xa4\xe9\x4c\xde\x22\xf5\x4c\x09\x67\
+\x87\xe1\xba\x3b\xdc\x20\x6d\x75\xe4\x2a\x9c\x01\x63\xd0\x90\x26\
+\x67\x2b\x75\xe7\xcb\x5e\x8d\xec\x84\x6a\x06\x3c\x5a\xfa\x8c\x46\
+\x07\xc7\xb9\x2a\xa2\x6a\x1c\xfe\x43\x51\x11\x9a\x53\x1f\xb8\x8a\
+\x9d\xef\x52\xbf\x8e\x89\x0b\x91\xd2\x27\x66\x2b\xb4\x0f\xac\x94\
+\xa4\x1f\x0c\x10\x9d\x94\x2d\x29\xa2\x39\x1d\x49\x49\x3e\x2e\x56\
+\xfc\xe2\xdf\x7c\xcf\xcb\xd7\x6f\x48\xef\x74\x2e\x20\xb9\x18\x38\
+\x20\xcf\xa2\xa7\x0c\x1f\xc2\xd7\xbf\xf6\x05\x9f\x5d\x3d\xa5\x5c\
+\xf7\x99\x87\x1e\xff\x19\x70\xb3\xdc\x33\x9e\xe9\x21\x21\xcb\xbf\
+\x79\xcb\x53\x71\x05\x8f\x61\xfd\xae\xd6\xcf\x57\x5d\x9f\x3d\x70\
+\x2f\xdf\x00\x4f\xe9\xa2\x59\xf9\xe5\xab\xd7\x04\xea\x15\xd9\xe1\
+\xef\xf1\xc5\x57\xdf\xe2\x75\x9e\x52\x25\x29\xc5\xca\x07\xfa\x6c\
+\xf7\x8a\xe7\xbe\xaf\xa7\xc5\x65\x39\xf9\x62\x45\x8e\x07\x03\xed\
+\x3b\x8d\x7b\x57\x44\x13\x75\x04\xd6\xf3\xce\x73\x21\xba\x04\x6a\
+\x6f\x8a\x32\x5e\xab\x42\xb8\x57\xaa\x76\x30\x1a\x71\xcd\xba\xf1\
+\x34\x69\x6d\x8b\xde\x15\xe1\xe6\x07\x0e\xc5\x07\xc3\xc0\xba\x5c\
+\x5d\x2e\x26\x74\x02\x78\xb8\xf8\x1e\x86\x33\x42\x7f\xeb\x7e\xcd\
+\xe3\x1d\x22\xe9\x77\x08\x0f\x44\x7a\xa2\x62\x54\xb9\xe8\x65\xad\
+\x65\x95\x03\x30\x91\x3e\xac\x67\x87\x2e\x7e\x60\x60\x7a\x34\x57\
+\xa2\x06\xb0\x6c\xed\x00\x7d\xfb\x63\x2b\xb3\xc3\x44\xc7\x13\x7e\
+\x9a\x4c\xac\x1f\xf1\xb6\x15\xbd\x7e\xa4\xb3\xc2\xa2\x6a\xa5\xd6\
+\x38\x3e\xa5\x55\xe3\xf4\x60\x34\x4f\x0b\x66\xde\x51\x1c\x55\x1a\
+\x43\xe5\x9d\x48\x8a\xe6\xc2\x4e\x29\xdd\x67\x97\x31\x44\xa9\x0d\
+\x7d\x11\xbb\xbe\xba\x9c\xd2\x81\x77\x6b\x5e\x9b\x2f\x7d\x16\x8b\
+\x0d\xdf\xfd\xe5\x1f\xf3\xd2\x2c\xc6\x2c\xfb\x5a\x30\x03\x46\x0a\
+\x3c\x06\x15\xf0\xf9\x64\x4c\x32\xd1\xc5\x85\x70\x55\x71\xff\xc5\
+\x0b\xf2\xfb\x35\x9b\xfb\x3b\xe6\xbf\x35\x63\xf9\xdd\x5b\x6e\xee\
+\xee\x19\x3e\x7e\x0a\x87\x37\xac\x6f\x71\xda\xf9\xaa\xeb\x73\xdd\
+\x90\x17\xfb\xe0\x31\xdf\xde\xbc\xe3\x2b\xfe\x94\xb9\xf7\x35\xd3\
+\x2f\xa1\x58\xfd\xc4\xc8\x81\x85\x9e\xb8\xee\x5f\x81\xc9\xe3\x86\
+\x93\x11\xd3\x46\x77\x74\x84\x72\x5d\xd2\x1a\xc0\xe9\x19\x20\x9b\
+\xd0\x8e\xb2\xc3\x0c\xdb\xcf\x49\x33\x5c\x72\x2e\xcf\x25\x8c\xdb\
+\x3a\xb6\x14\x91\x2b\x70\xd8\xad\x67\xe6\xd8\x5d\x97\x57\x3c\x0b\
+\x4a\x7a\x17\x5d\x76\x77\x7b\xc7\xc6\x37\x8b\x2f\xe8\x15\x77\x84\
+\xe5\xdf\x39\x49\xc1\x95\xa6\x33\x3b\xdd\x1e\x08\x3b\x48\x94\xf4\
+\x10\x78\xad\xc6\xce\x52\x7a\xe6\xd4\x5e\x9e\x69\xee\xd4\x95\x39\
+\xa1\xb4\x1f\xdc\xca\x50\x28\xe9\x5c\x09\xfd\xe3\x5a\x45\xa4\x41\
+\x1b\xa4\x3e\x71\xb5\x25\x13\xa7\x5a\xda\xce\x21\xb6\x47\x02\x89\
+\x47\x5c\x94\xb0\x3e\xe8\x25\x42\x3f\x6e\x2f\x10\x8e\x00\x2c\xa8\
+\x58\xd8\x40\x90\xd2\x3e\xb7\x70\x61\x9c\xc8\x01\x59\x1d\xb1\xf2\
+\x49\x2a\xaa\x31\x3c\x51\x88\xc8\x01\xd4\xc7\xd3\x41\xa0\x32\x21\
+\xa7\x64\x4b\x46\x9f\xd8\x9d\x16\x01\xe0\xe3\xe2\x3d\x2f\x7f\x71\
+\x7d\x16\xc0\xcb\x71\xc4\x78\xa9\xbf\x99\xeb\x7d\xc9\x0b\xe0\x90\
+\xbd\xe3\xcf\xfe\x48\x31\x1e\x8f\x78\xfe\xec\x21\xa3\x2f\x86\x8c\
+\x83\x29\xab\xc9\x03\x1e\x3d\x19\x72\x2b\x61\x91\x57\xa8\x59\x84\
+\xb8\x97\xdc\xdc\xc1\xd0\xb0\xf2\xf7\x1b\xc1\x28\xd4\x32\x46\x33\
+\x32\x5c\x75\x35\x23\xa7\x1f\x0a\xbe\x15\x07\xbe\xe2\x9e\xe9\x97\
+\x7f\xcb\x65\xfc\x33\xe6\x0b\x7d\x3a\xad\xfd\x62\x0d\x93\xc4\x65\
+\x90\xdb\xe7\xc0\x4b\x1b\xdf\x48\xda\x62\xde\x20\x0b\x28\xe2\xa2\
+\x35\x1a\xa0\x5c\x28\xfc\x09\x24\x71\x0d\xe4\xa4\xe1\x82\x4d\xfc\
+\xe2\x6c\x89\xb9\x05\xe4\x26\xa3\x1e\xde\x40\xe7\xb1\x63\x62\xc0\
+\x5c\xff\xc0\x20\xb8\x3a\xab\x89\xf5\x18\x81\xa4\x0e\x00\x75\xa2\
+\xca\x00\x19\x57\x72\xb6\x00\x2d\x4c\x76\x42\x33\x99\x86\x42\x3e\
+\x3f\xd0\x79\x6c\xaa\x70\x91\x30\x2c\xae\x4b\xcd\xbe\xd7\x67\xeb\
+\x7b\xa6\x25\xc9\x27\x8a\xa4\xb9\xad\xa5\x88\x46\x79\xe6\xb4\xb6\
+\x34\xef\x19\x45\xc2\x74\x2d\xeb\x56\x26\x26\x3d\x77\x68\xaf\x27\
+\xbf\xab\x23\xde\xd6\x72\xa2\xc9\xd2\x75\x7b\xbe\x0d\xc4\x47\x2e\
+\x5d\x86\x19\x46\x2d\x84\x40\x2d\x7d\x42\x3b\xab\xd8\x9c\x98\xd1\
+\x2e\xf2\xb6\xa4\x84\xca\xa3\x14\x03\x60\xa3\x47\xbf\xa2\x25\x46\
+\x5f\xc4\x6c\xc9\x88\x22\xc1\x66\xe1\xf1\xf1\xfa\x9a\x6f\xfe\xcf\
+\x6b\xfa\xd7\xdf\x90\xe6\x9d\x16\xfb\xf6\xe3\x35\x49\x38\x68\xc1\
+\xc2\x97\x37\xec\xee\x9e\xc0\xc5\x3d\x72\x79\x4f\x59\x6d\xc9\x8a\
+\xc7\xbc\xb8\x0a\x18\xc7\x43\xf0\x21\x61\xc0\x8b\x9f\x7c\xc9\x57\
+\x8b\x19\x1f\x9e\x7b\xf0\xe7\xdf\x38\x56\xfe\xe2\x9d\x96\x12\x16\
+\xc0\x76\xe7\xd0\x54\x1f\xc2\xab\xd7\x04\x4a\xff\xdb\xfb\xbf\x91\
+\x52\x15\x1b\x92\xac\x42\x7d\xf6\xd0\x2d\xec\xdc\x62\xce\x6c\xb5\
+\x17\xbc\x6b\xf9\xc8\x3e\x82\x92\x94\xf5\x4e\xc2\xae\x4e\x9b\x85\
+\xb1\x84\x18\x86\xb4\x4f\xcf\x65\x99\x78\xb9\xbb\x26\xcf\x46\x8c\
+\x9b\x55\x6a\x53\x72\xf7\x4d\xb1\x4a\x6f\x7d\xf6\x96\x5a\x3a\x4f\
+\x39\x14\xd7\x9f\xd4\xbc\xd6\x62\xb3\x16\x5d\xb3\x62\xe7\xe6\x13\
+\x07\x44\x04\x0d\xae\x2a\x90\x46\xdc\x7a\x04\xd2\xd3\x16\x9a\x05\
+\xb8\xd2\xad\x45\xba\x65\xa9\x69\x9b\x29\x67\x79\xc5\x05\x64\x87\
+\x1d\x1c\xc0\x2b\x7a\x70\x50\xd0\xe9\x21\x03\x45\x54\x98\x25\xd6\
+\x61\x07\x41\xd4\x0a\xd2\x17\xcd\x6e\x65\xdb\xd1\xa1\x38\x93\x38\
+\x6e\x6b\x60\x94\x57\x57\xf7\x8e\xc0\x5b\x7f\x91\xb2\x5e\x8c\x58\
+\x50\x5b\xcf\x58\xc4\xad\xa1\x2a\xa1\xb2\xb2\x6a\x4d\x6c\x40\xdb\
+\xa7\x5e\xec\xf5\x89\xd9\xca\x8c\xc5\x62\xc5\xcb\x5f\x5c\xf3\xc3\
+\x9b\x9f\xb3\xd8\x45\x4c\x7a\xa7\x95\xaf\x77\x79\xce\xe3\xc6\xc2\
+\xee\xbb\xdb\x03\xf0\x96\xcf\xcc\x90\xbc\x1f\xee\xde\xf2\xc3\x77\
+\x6f\xf9\xf0\xe5\x13\xaa\xbe\xc7\x2c\x18\x31\x0a\xfa\x84\x93\x11\
+\xb3\x27\x0f\x39\xa4\x7d\x5e\xfc\xe6\x13\xf8\x33\xb8\xb9\xbb\x67\
+\x35\x0b\xc9\xdf\xbe\x3c\xf9\x9c\xab\xae\xcf\xf5\xbe\xe4\xaa\xeb\
+\xf3\xed\x8d\x07\xfc\x82\xdd\xf8\x92\x8b\xb0\xa0\x1a\x4c\x1d\xd0\
+\x5c\x07\x88\xa9\xc6\xd5\xee\x44\x7d\x6e\xbd\x3c\x53\xe4\xf1\x9e\
+\x4e\x4f\x30\x31\x7e\x72\x39\xb1\x33\x2f\xbc\x06\x7b\x9f\xd7\xce\
+\x3a\x59\xd7\x37\x5d\x21\x01\x9d\x66\x17\x58\x63\x36\x47\xb7\xc1\
+\xc4\x9d\xf8\x31\x87\xe2\x43\xcb\xa5\x38\x14\x1f\xd8\x14\x77\xc0\
+\x17\xad\x79\x1e\x2d\xbf\xd9\x16\x3b\x22\x24\xdb\x48\x77\x70\x54\
+\x64\x6e\xe1\x25\x51\x26\xf7\x50\x03\xa6\x14\x1d\xc8\x34\x7f\xb6\
+\x22\x21\x91\xd0\x0c\xbb\x3e\xc0\xb0\x43\x2c\x4d\x3a\x3f\x2b\x08\
+\xed\xa9\x36\x94\x47\x66\x7c\xc4\xb8\xd3\xa3\x3a\xd3\x09\x22\xcf\
+\x74\x88\xd4\x8b\xba\xe8\x14\xcc\x06\xb8\x91\xad\xd8\x99\x57\x58\
+\xfc\x0a\x4e\xf3\x1f\xe2\x68\xa9\x7b\x5c\xbd\x2b\x44\x4a\xa0\xb4\
+\x36\x54\x4a\x12\xe2\xe9\x69\xa0\xa2\xd6\xc2\x1b\xe5\xb1\xbe\x97\
+\xbc\x7c\xfd\x86\xc5\x4e\x1f\x8a\x6f\x97\xb7\x94\xf2\x23\x7e\xf4\
+\xc0\x6d\xbf\x78\xf4\x81\x2a\x7c\xec\x18\x3a\xb9\x18\xf0\xdd\xed\
+\x81\x6c\xf9\x9a\x78\x5c\xdb\x50\xd7\x3f\xcf\xf9\xfc\x71\xcc\x9b\
+\xbb\x37\x8c\x2f\xae\x18\xce\x03\xbe\x79\xf5\x57\xae\xcb\x66\xd0\
+\xdf\x73\x73\x47\xcb\xa9\x68\x5e\x2c\x1b\x37\x81\x5c\x7c\xf3\x06\
+\xef\xc1\x67\xf4\x1e\xed\x18\x35\x2c\xb3\x34\x83\x3c\xbf\xd3\x43\
+\x5c\x76\x4b\x13\x62\x12\x80\xae\xde\xd1\xeb\xba\x41\x29\x7a\x4c\
+\x86\x76\x1c\x44\x7c\xcf\x21\x0b\x28\x9c\x8c\x48\x5d\x37\x89\x1e\
+\x68\x98\xd6\xbe\xb1\x59\xd8\x75\x6c\xf3\xa4\xcd\x93\xd8\x3c\xb5\
+\x6a\x30\xf1\x99\x8b\x05\xf4\x3e\x9b\xd6\x7e\xbc\x8a\x8f\xa4\xc8\
+\xbd\x2e\x3b\x07\x52\xb3\x58\xd0\x58\x5a\x35\xe3\x92\x4d\xc6\x45\
+\xe9\x54\xdb\x7e\xda\x21\x57\xba\xdf\xcd\x49\x04\x57\xb1\x2b\xf5\
+\xe4\x16\x33\xf8\x62\xb8\x3e\x40\xa7\x47\xd5\x8f\x89\xb7\x86\x81\
+\x2d\x78\xb6\x19\x55\xdf\x33\x59\x63\xcf\x2d\x0e\xcf\xf9\xc7\x38\
+\xcd\x6b\xd8\x3f\xf5\xdb\xc5\x12\xd1\x38\xf5\x97\x09\x17\xc5\x8b\
+\x1d\xea\x51\xd7\xc5\x4a\xad\x25\x77\x3e\xfc\xab\x35\x7f\x61\xea\
+\xfc\x96\x91\x9b\x0b\x40\x3b\xe2\x2a\xc7\x63\x7b\x7d\xcd\x87\xf7\
+\xd7\xbc\x7d\x27\x99\xf4\x72\x07\x64\x3f\x7a\xc0\xf5\xf5\x47\x36\
+\xea\x8a\xe7\xd1\x8e\x6f\xe5\x1b\x1e\x4d\x15\xf1\x44\x90\x5c\x3c\
+\x76\x52\xe3\x26\x5e\x53\xed\x1f\xd7\x8b\xb3\x0d\xfc\xf5\xf5\x2f\
+\xf4\x0e\xbe\x7c\x4b\x19\x5d\x72\xd5\x0b\x29\x67\x0f\x88\xbc\x15\
+\xb2\x1a\x11\x5e\x48\x9e\x7f\xff\x96\x25\x97\xe7\xbd\x83\xbb\x0d\
+\x3f\x0d\x0f\xbc\x1e\x4f\xb9\xea\xfa\x7c\x58\xbe\x25\x50\xaf\x78\
+\x11\x7f\x8d\xba\x1c\x73\x55\x14\xbc\x3b\xe4\x2c\x97\x7b\x67\xbd\
+\x0d\x07\x3d\xc2\x49\xd4\xee\xd7\xcb\x72\xa7\x83\x13\xe7\x03\x07\
+\x1c\x8e\x9c\x8a\x66\x55\x70\x8d\x9e\xc8\x39\x5f\xac\xc9\x83\xc2\
+\x2d\xec\x4e\x98\xd8\xc4\x4c\x5b\x4c\xfc\x23\x72\xa2\x1b\xcf\xeb\
+\x1c\xb7\x28\xcd\xe0\x43\x9b\xc7\x30\x51\x4c\x94\xc4\x13\x15\x92\
+\x18\xdb\xbe\x7f\x30\x4c\x17\x34\x2c\x14\x1b\xc7\x3c\x18\x98\xf5\
+\x85\x0e\xe4\xb4\xea\x5e\x07\x74\xf4\xb2\xd3\x00\xb6\xd5\xb6\x96\
+\x43\x27\x13\x5d\x44\x31\xe0\x97\xd2\xa3\x1f\x09\x88\x6c\x20\x3c\
+\x6a\x49\x85\x48\x19\x77\xa2\xb5\xb0\x93\x14\x89\x66\xd9\xa2\xd1\
+\x0e\xef\x6d\xeb\x10\xfc\xa4\x1f\x71\x28\x63\xca\xed\x96\x83\xa7\
+\xc1\xbb\xf5\x33\xfa\x69\x4c\xc7\x10\x71\x2e\x2a\xba\x4a\x39\xb6\
+\x6b\x9e\x1e\xcc\x56\xe2\xb4\xb4\xd0\x05\x92\x91\x57\x91\x4a\x9f\
+\x74\xb1\xe3\xcd\x56\xb2\xbe\xc5\x49\x88\x49\x2f\x87\xde\x43\x16\
+\xbb\x90\xab\x2b\xa8\xf6\x1b\xe6\xf7\x5b\xa6\xab\x29\xef\xf9\x88\
+\x2f\x1f\xf0\x70\x5c\x3b\x15\x6f\x16\x53\x9e\xf2\x8e\xbf\xcc\x73\
+\x1e\x87\x21\x3a\x81\x6b\xa4\xc1\x12\xf6\x1b\xf0\x07\x6f\x29\x77\
+\x39\xbe\xbc\x71\x39\x8b\x57\xfe\x8e\xe9\x27\xd8\x2b\xb9\x18\xf0\
+\xf3\xbb\x0d\x09\x70\xb3\x7c\xc3\x25\x4f\x79\x3f\x0e\x79\x01\xc4\
+\xdb\x15\xeb\x87\x0f\x61\x1e\x33\x1e\x6b\x54\x0d\x7b\xdd\xd3\x00\
+\x90\xb9\x6e\xa5\xc7\xf5\x42\x03\xfe\xb0\xf9\x08\x9b\x0a\x6f\x3c\
+\x64\xca\xd0\x2c\xe4\x12\x88\x77\xad\xd7\x8f\x99\x50\xb2\x3d\x62\
+\xe2\x8c\x7a\x68\x46\xdc\x8a\x6f\xde\x2d\xbf\x39\x2b\x27\x5c\x46\
+\x32\xb8\x38\x91\x21\x7a\xca\xbd\x19\x8a\x68\x27\xc5\x57\x06\xc0\
+\x56\xdf\x76\x8c\xab\x60\x59\xb6\x38\x1a\xb4\x6d\x17\x73\xba\x63\
+\xb9\xa7\x81\x2b\x22\xa2\x89\x7e\x97\x4d\xdf\xa3\xea\xc7\x8d\x22\
+\x89\x65\xdd\xd8\x2d\xe2\xaa\x7e\xec\x1a\x46\x6d\x17\xf3\xf1\x28\
+\x69\xd9\x3c\x81\x62\xc3\x33\xa6\x51\xec\xa8\xdf\xbf\x7e\xde\xcc\
+\x9c\x07\xad\x93\x14\xf8\x9e\x1d\xac\xa2\x8f\x1a\x4d\x26\x0e\x95\
+\x47\x89\x71\x30\x84\xce\x22\xe7\xa2\x72\x6c\x0c\xf5\xf4\xcc\x50\
+\x79\xa4\xd2\xd7\x67\x7f\x52\x7b\xf2\xeb\x65\xeb\x90\xbe\x10\x6b\
+\xed\x4a\x8c\xe6\x3c\x1c\x3f\xe4\xf9\xe8\x4b\xae\xae\x1e\x70\x3f\
+\xdd\x73\x58\x4d\x9d\xdc\xb0\x8c\x3d\xe9\xe5\x6c\xb3\x21\xe3\xa5\
+\x24\xbd\xdb\xf0\x2e\xcf\xf1\xb2\x77\x4e\x12\x74\x8b\x77\x7c\xef\
+\xef\x50\xd7\xef\xf8\xee\xf6\xc0\x72\x73\xc9\xcb\xd7\x6f\xa8\x6e\
+\xfc\x13\x29\x61\x59\xd8\xca\x95\xf4\x6e\xc3\x36\x1b\x72\xbd\x2f\
+\xc9\xff\xf6\x03\xdf\xbe\x3e\xb0\x54\x5b\x86\x1b\x7d\x62\x9d\xe1\
+\x24\x76\x00\xb6\x13\x36\xc9\x72\xd6\x8b\x8c\xf5\x6e\xc9\x7a\xb7\
+\x67\xbd\xdb\xb3\xc0\x67\xd8\xeb\x52\xf4\x04\x9d\xc1\x03\x3a\x8f\
+\x1e\x32\x9d\x0c\x0d\x6b\x1b\x2b\x2e\xcb\x5b\x91\xd0\x6d\xac\x65\
+\x8b\x8e\x61\x6a\x26\x3e\x2e\xd1\x5b\x39\x71\xd8\xdd\xe0\x4d\xf3\
+\x96\x7c\xb8\xde\xb5\xd7\x15\x5a\x13\x5b\x77\xca\x9e\x8b\xa5\x30\
+\x80\x16\x5a\x13\x7b\xe6\x84\x2c\xf6\x47\xde\x34\xaa\x6a\x59\xe0\
+\x9b\xfb\xda\x05\x85\x8e\xed\xac\x88\x74\xf0\xbc\xe5\xf3\x46\xda\
+\x23\x26\xaa\xbd\xe7\x28\xaa\xb4\x53\x71\xb6\x25\xa9\x2e\x26\xe3\
+\x3a\x38\x4c\x00\x47\x79\xad\xb3\x82\xfe\xd8\xa5\xd7\x8f\x38\xa4\
+\x81\x3e\x59\x49\x30\x45\x71\x40\x50\x19\xd0\x6a\xbf\x59\xdb\x75\
+\x95\x63\x61\xbb\x80\x13\xce\x58\x0e\x40\xe4\x46\x0f\x9f\x9f\x9e\
+\x99\x2e\x76\xac\xd3\x2d\x2f\x5f\xbf\xe1\xed\x3b\xa9\x0d\x9e\xd1\
+\x9c\xd9\x4a\x91\xaa\x0d\x4f\x2e\x1e\x33\x7b\xf0\x94\xd1\x2c\x24\
+\x7f\x1b\xd1\x79\x27\x39\x74\xdf\xd7\x3b\x9e\x7c\xcf\x62\x24\x60\
+\x35\x6d\x2d\x04\xc7\x4b\xc9\x96\x21\x64\x1a\x88\xd7\xfb\x12\x6e\
+\x7c\xbe\xbd\x5b\x91\x5c\x0c\xf8\xe1\xcd\xcf\x1d\x40\xcf\x31\x70\
+\x13\xcc\xcd\xeb\x3f\xc4\x92\x70\xf9\x96\xcd\x5d\x87\x95\xe8\x13\
+\xf7\x2e\x59\x54\xfa\x2c\x2a\xc1\x22\x33\x1d\x29\x99\xcb\x3b\xc7\
+\x41\x8f\x4d\xa8\xc9\x68\xc6\x84\x32\x5e\x31\x01\x7c\xae\xf4\x18\
+\xab\xc3\x52\x0f\x67\xc9\x72\x73\xb6\xd3\x94\xb7\x59\xc2\x73\x3c\
+\x37\x11\x6e\xb8\xf4\x60\x3c\x82\x65\x49\xe7\x51\x55\x47\x52\xdd\
+\x11\xae\x66\xe3\xe1\xa2\x03\x9d\xa7\x80\x96\x13\x57\xbd\xb6\xf9\
+\x19\x6f\x1e\x34\x18\xbc\x31\xb0\x51\x94\x28\x15\xe8\xb2\xb3\x88\
+\x22\xbc\x6d\xd9\x0a\xe8\x34\xcb\xc3\x75\xa5\xad\x6a\xb4\x14\xe9\
+\xdb\xce\x0f\x36\x80\x2b\x90\x6c\x81\x81\x99\xf8\x33\x28\x2a\xb2\
+\xc0\x73\x85\x0f\x3b\x7f\x4d\x7a\x99\xfe\x0c\x13\x78\x2f\x0c\x80\
+\xb7\x48\xfa\xca\x7c\x8a\x01\xef\xa7\x7b\xdd\xda\xee\x84\x12\x11\
+\xba\xe6\x56\x72\x6f\xd4\xdb\x71\x35\x4f\x9f\x0e\x2c\x72\xcc\x5a\
+\x11\xb3\xb3\xc3\x01\x8d\x26\xd6\x3a\x58\x5b\x6c\x42\x44\x4e\x07\
+\x5b\xe0\xef\xd5\x9e\x0f\xef\xaf\xf9\xe3\xbf\x0a\x98\xde\xbf\x61\
+\x5e\xcd\x99\xfa\x8a\x1f\x4a\xc1\xd4\x7f\x03\x7f\x03\xcf\x3f\x7f\
+\xca\x17\xc5\xd7\xdc\x5c\x96\x78\x79\x07\x5e\xb5\xff\xe4\x89\x1a\
+\xb2\x30\xec\xdd\x04\xb3\xf5\x94\xdf\xe5\x39\x95\xfa\xc0\x44\x0d\
+\x5b\xc0\xb4\xdb\xc5\x2e\x74\xaf\x59\x88\x35\xdc\x81\xbf\xbb\xe5\
+\xde\xec\x1c\x33\xde\x53\xf6\xf4\x2c\xb5\x67\xfb\x88\x6c\x59\xb0\
+\x7b\xbb\x64\x79\xb1\xa5\xea\xcc\x49\x3f\xe8\xf7\x19\x8f\xc7\xe6\
+\x7b\x89\xdd\xf9\xa8\x75\x37\x5d\x69\xec\xb8\x7b\xb0\x45\x8c\xf8\
+\x9e\x74\x65\xf3\x17\xd6\x17\xd6\x79\x8b\x60\xa7\xa0\x17\x39\x97\
+\x63\x3d\xae\x18\x2e\x4b\xaa\xe1\x86\x43\x36\xa2\x13\x17\x0e\xc0\
+\x3a\xca\x99\x02\x31\x5d\x21\xf4\x74\xa2\xe6\x02\x75\x97\xb7\x80\
+\x9c\x0d\x3e\x12\x96\xbf\xd6\x98\x2e\xea\xb9\x4e\x99\xd5\xfa\x4e\
+\x0f\xd9\xde\x42\x9d\x0b\x3e\xec\x5a\xb3\x82\x2d\x1b\x47\xad\x13\
+\x82\x73\x02\x78\x54\xed\xd5\xf6\x8f\x78\xb6\x5f\xc6\xee\xf5\x11\
+\xb8\xe1\x80\x7d\xd3\x7a\x14\x89\x8a\x3e\x7a\x28\x76\xdf\x76\xd4\
+\x99\xb3\x7c\x5a\xcb\x2c\xfa\x31\x36\x6e\x9e\x3d\xf4\x4c\x1f\xb5\
+\x70\x27\xe5\x3e\x75\x42\x9a\xd5\x3a\x65\xd8\xa1\xc9\xd0\x4d\x00\
+\x2b\xe5\xb1\x59\x6a\x16\x5e\xdf\xc2\xb3\xe1\x96\xde\x65\x40\x35\
+\xeb\x43\xf5\x88\x72\x5b\x70\xb7\xee\x30\x5f\x49\xfe\x8f\x3f\xff\
+\x53\x7e\xef\x5f\xfc\x3e\xdf\xfe\x6f\x7f\x42\xa5\x4e\x75\xde\xed\
+\xf2\x96\x19\xef\x5b\x00\x5e\xec\x42\x57\x14\x99\x7e\x78\x0d\xab\
+\x5a\xf9\xfa\xbb\x5b\x16\x62\xcd\xed\xf2\x16\x7f\x77\x5b\xdf\xb7\
+\x0b\x99\xad\x14\xb7\xcb\x5b\x6e\x24\xb0\x9a\x72\x90\xef\xdd\xe3\
+\x00\x3f\xcf\x3b\x5c\xef\x4b\xde\xa7\x1f\xd9\xdc\x7d\x44\xca\x1d\
+\x62\xdc\x65\x3c\xee\xba\x93\xa9\x0f\x27\x71\x3b\x58\x7f\x54\x81\
+\xb3\xb7\xab\x24\x35\xce\x86\xe4\xcd\xbb\x35\x2b\x33\xde\x3e\x0e\
+\x0a\x37\x99\x33\x37\x33\xde\x18\xfb\x78\x8d\x3c\xf1\x69\x97\x78\
+\x8d\xb3\x66\x69\xfd\x3c\x51\x95\x4e\x4e\x08\x2a\xe7\x13\x87\x61\
+\x04\xc3\x0a\xdf\xe6\x26\xb4\x7e\xd5\xa3\xa8\x2c\x38\x5d\xde\xb7\
+\xd1\x91\x71\x0c\xe0\xbe\x95\x00\x46\xd3\x7a\xdb\x86\x5d\xd5\x8f\
+\x29\x92\xf4\x44\x40\x44\x46\xe3\x44\x06\x84\x5b\x03\x58\xe9\xca\
+\xd3\xf5\x4e\x11\x35\x18\x59\x8a\x7a\x28\x9f\x2e\x8c\xf4\x5c\xce\
+\x58\x77\x36\x47\x35\x3b\x37\xec\x35\x7d\x52\x6e\x79\xb6\xdf\xaf\
+\x9e\x12\xd4\x5c\xc8\xb5\xf5\x70\x6e\xce\x46\xaa\xa4\xe2\xc3\xc7\
+\x90\xbf\xdc\xd4\x3e\xed\xa3\x6e\xc4\x7c\xf6\xcb\x78\xcf\x47\x5c\
+\x0c\x1e\xc0\x60\x82\x2f\xfe\x3e\x9b\xad\xe0\xc3\x12\xb6\xff\x77\
+\xca\xfb\x7d\xdb\xdb\xee\x44\x8f\xda\x00\x6d\x58\x74\x8b\x5d\xa8\
+\x01\x69\x80\x7d\xbb\xbc\xe5\x9e\x47\x1c\x6e\x14\x9d\x4b\xc1\x8d\
+\xd4\x92\xa4\xb9\x75\x55\xae\xf9\x37\xda\xf9\x90\x70\x3f\x12\x0e\
+\xc8\x5e\xf6\x8e\xf7\x66\xfe\xc7\xa3\xd0\x23\x16\x25\xc3\xde\xb8\
+\x35\xe8\xdb\xe9\xda\xc6\x22\x2d\xcd\xf4\x54\xcd\xd5\x5a\xb2\xde\
+\xed\xa9\xde\x0e\x59\xef\xf6\xb0\xd9\x13\xc6\xc2\x9d\xfd\x29\x2b\
+\x02\x86\x04\x24\xb1\x9e\x32\xf4\xe9\x4b\xbd\xb8\x6b\x4e\xa8\x1f\
+\x3e\x3c\xcf\xc2\x1f\x96\x6f\x19\x04\x17\xe4\xfb\xf3\xdd\xe4\x93\
+\xe9\x4c\x4f\x00\xa2\x15\x93\xdc\x9c\xd8\x5b\xda\xf6\x92\xad\x06\
+\xd1\xe3\x92\x71\xe1\x16\x5c\x7a\x12\x4f\x16\xf8\x66\x52\xbc\x96\
+\x17\x52\xaa\x76\x89\xc2\x02\xce\x16\x0f\x84\xce\x58\x34\x83\xe8\
+\xf2\x18\xf6\x8d\x94\x5c\x6d\xb3\xed\x1c\x08\x95\x63\x62\xd9\x38\
+\x97\x88\x57\x6f\x8f\x00\x9c\x37\x66\xac\x7d\xea\x62\x99\x3a\x37\
+\x9f\xbb\xbe\x97\x70\x78\xc3\x78\xa9\x6d\x35\x0b\xc6\xab\xce\xdf\
+\xf2\xa8\x1b\x39\x66\xfe\xc9\x8b\x9c\xe7\x83\xc7\x9a\xa5\xcf\x79\
+\xa0\x0d\xf0\xdd\x48\x98\xf1\x9e\x83\x7c\x4f\x27\x7a\xe4\x98\xf4\
+\x20\xf5\x7d\x97\x11\xf5\x7d\x37\xaa\xf1\x3b\xe8\x1c\xee\xee\xa6\
+\x70\x5b\x3f\x7a\x50\x7f\x86\x79\xae\x05\xf2\x68\xb5\xe3\x4d\xea\
+\xb1\x54\x5b\x53\x23\x50\xba\x7d\xc9\x53\x0c\x2b\x41\xd6\xf1\xf4\
+\x18\xd8\x5c\x32\x5f\xac\xdd\xe2\x2e\x0e\x0a\xe7\x64\x6c\x63\xc9\
+\xb0\xd7\x25\x9c\x8c\x18\x4e\x62\x9e\xf4\xea\xef\x74\x4d\x41\x90\
+\x05\x84\xc3\x01\x43\x82\xda\x1f\x3e\x26\x8d\x46\xa1\x62\xd3\xd1\
+\xad\xfd\xeb\xdb\x1a\xc0\xea\xf5\x77\xad\xc5\x9d\x5b\xd8\x99\x69\
+\xf6\xd6\x27\x46\x94\xae\x62\xd7\x3a\x19\x42\xdc\xe9\x59\x5b\xa0\
+\x96\x0a\x26\x0b\x61\x2f\x76\x8c\x6b\x33\x3f\x1c\xb4\xc6\x4e\xe9\
+\x05\x62\x91\x94\xce\xff\x2d\xa2\xaa\xb5\x23\x1c\x27\x3e\xb7\x4a\
+\xd1\x17\xa2\xa5\x7f\x23\x23\x31\x4e\xcb\xcd\xb4\x2a\x7c\xee\xac\
+\x49\xcd\x8e\x0e\x57\xe9\x10\x66\xc4\x54\xd5\xaa\xda\xb5\x98\x56\
+\x14\xc0\x96\x24\xeb\xb6\xc1\x7d\xec\x94\xd8\xe2\xcd\xad\x66\xc8\
+\xc5\x4e\x2f\xe8\x2e\x23\xe8\x5c\x8a\x16\x33\x03\xdc\x4f\xf7\x0e\
+\xd8\xf6\xbe\x73\x60\xb6\x40\x6e\xde\x6e\x5e\x9a\x4c\x6b\x19\xbd\
+\x94\x1f\xb9\x09\xfa\xad\xfb\x7b\x97\xc1\x09\xe3\xdf\x48\x28\x7b\
+\x0f\xd9\x66\x43\xfe\x62\x71\x8d\xc8\x7f\x41\x55\x4d\x11\x87\xc8\
+\xb5\x28\x59\x40\xeb\xef\xcc\x1c\x8d\x62\x41\x1c\x14\x3a\xaa\x19\
+\x46\xae\x48\x72\x35\xe9\xd6\x7e\x72\x83\xb1\xe3\xa0\xd0\xc5\x8e\
+\xd8\x33\x1e\xb3\xe0\x90\x05\x7a\x56\xdb\x27\xba\x43\x40\x37\xa5\
+\xde\x2d\x17\x6e\x41\x77\xbd\xcb\x59\x5c\x3e\x6f\xb1\xb1\xb3\xd8\
+\xcc\x6f\x6a\x7d\x62\xd7\xd9\xe1\x98\xb8\x59\xac\x50\x52\x83\xb0\
+\xb1\xb8\xeb\x9b\xd6\x9b\xe2\xf8\x7c\x1e\xa2\x72\x9a\xb8\x99\x47\
+\xab\xfa\x5e\xad\x8f\x1b\x92\x44\x36\xb4\xae\x34\xe0\x75\x5a\xf8\
+\xa8\x25\xc8\xb9\x18\x6a\x61\x2a\x72\xf2\x13\xba\xf8\x4c\x19\xda\
+\x4a\x04\x25\x99\x05\x5d\xed\x3e\x28\x69\x16\x7f\x38\x76\xdd\x39\
+\x9d\xd6\x27\x8d\xf7\x27\x72\xa2\x09\xea\x7b\x29\xf9\xf0\xfe\xda\
+\x49\x89\x83\x7c\xcf\xeb\x1f\x16\xbc\x9f\x7f\x6c\x31\x64\x13\xcc\
+\x16\x54\x96\x2d\x8f\x41\x66\x6f\x37\xc1\xb9\xbb\x29\x78\xbf\x97\
+\x6e\x5b\xca\x8f\x6e\x3b\x9b\x77\xdd\x73\xed\xf5\xe6\x4e\x62\x3f\
+\xd3\xb2\xb4\x95\x28\x76\x81\xb7\xbd\xa9\x48\x8b\x1d\xf3\x62\xa7\
+\x4f\x24\x49\xe6\x66\x28\x5b\x67\x22\xeb\x78\x9a\x6d\x2d\x78\xe3\
+\xd0\x69\xe3\x34\xd3\xe0\xb5\xb7\x8b\x58\x83\xb7\x79\x5e\x11\x9d\
+\x5b\x6e\x58\x94\xe5\x4a\x77\xff\x64\x01\x90\x11\x64\xca\x1c\x21\
+\x33\x3a\xbd\xcb\xb3\x0b\xba\x0f\x4b\xdd\xb0\xf4\xd9\xf8\x09\x9b\
+\xe2\xae\xdd\x63\xd7\xc8\x61\x58\xb9\xe8\xdb\x1f\xdc\x95\x7a\x85\
+\x96\x04\xc1\xd1\x02\x6f\x6b\x40\xe9\xce\x9a\x74\xd4\x56\xa4\xdf\
+\xa7\x1d\x75\xdf\x1a\x95\xdb\x5c\x00\xda\xfb\x11\x95\x5b\xdc\x6d\
+\x1b\x8b\xb4\x02\xc9\x20\xfc\x8e\x87\xe1\x77\x5c\xc9\x3f\xe0\xaa\
+\xfa\x23\xbd\x95\x7f\xc0\x17\xf2\x0f\xce\x80\xb6\xbd\x60\xd3\x80\
+\xf5\x98\x65\x26\x8c\x53\xec\x48\xb2\xae\xfe\xe2\xcc\xde\x9c\x8b\
+\x8a\xb0\xb5\x43\xd4\x4c\x7c\x96\x8d\x8f\x80\x6d\x19\xd3\xbb\xdf\
+\x72\x58\x4d\xb9\xbe\xfe\x78\x02\x9e\x26\x2b\xf7\x2e\x83\xd6\x6d\
+\x0b\x44\x0b\xba\x47\xdd\x88\xdd\x4d\xc1\x61\x35\x75\x0c\x0e\x70\
+\x59\x6c\xf1\xa3\x07\xcc\xe6\x5d\x6e\x82\x3e\x9d\xd1\xdc\x5d\xff\
+\x14\xc3\x3f\xea\x46\x2d\x59\x71\x69\x9e\xf2\x43\x57\x7f\xe6\xc7\
+\x77\x5b\xd4\x72\x6e\x16\xad\x71\x6b\x01\x1c\x86\x91\x9b\x2c\xe4\
+\x16\x79\x59\xee\x0a\x1f\x55\x92\xb6\x16\x7b\x36\xe1\x36\x24\x30\
+\x27\x82\x84\xf5\xe6\x70\x32\x4a\x20\xc8\xb4\xbc\x50\x24\x0d\x99\
+\x11\xbb\x93\xd6\x58\x26\x6e\x82\xf7\x7a\x97\x13\xa8\x57\xec\xb3\
+\x69\x5b\x13\x1f\x9f\x17\x05\x08\x2d\x70\x20\x72\xbe\x6e\x3d\x0c\
+\xbb\x06\x68\xdf\x36\x6c\x46\xed\x2f\x4e\xdb\x64\xb5\x08\xd0\x0f\
+\x6b\xef\x37\x10\xc2\xcc\x1f\xae\x08\x54\xd4\x38\xac\xdb\x05\x9d\
+\xb6\xd9\xfa\x4a\x4b\x87\xad\x52\x7c\x5d\xfd\x11\xdf\x7f\xf7\x03\
+\xbf\xc6\x3f\x6f\x7d\xce\xe8\x57\x61\xf5\x6f\xe1\xea\x19\xcc\x57\
+\x5f\xb1\x0f\x3f\xd3\x96\x9a\xeb\xb9\x33\x21\x24\xa1\x13\x77\xf3\
+\xed\x1c\xdf\x4c\x90\xdf\x99\xf3\x8e\x1e\x33\x71\xcb\xff\x8d\xf7\
+\x66\xf4\x95\x70\xe5\x66\xcb\xca\x12\x49\x59\x64\xac\x6f\xe1\x71\
+\x18\xf2\xd6\x68\xd7\x6a\xd6\x67\x7e\x3f\x67\xea\x4d\x99\xdf\xcf\
+\x39\x78\x53\x3a\x68\x20\xdf\x04\xfd\x13\x90\x59\x0d\xfd\x88\xf7\
+\x0e\xcc\xb3\x79\x97\xf7\x53\xc9\xe5\x68\xcb\x4d\xd0\x77\xb7\x67\
+\x68\xb0\x5e\xca\x8f\xdc\x4f\xfb\x06\xf0\x30\x6b\xec\x0c\xcd\xf7\
+\x3d\x27\x45\xac\xa4\x78\x68\x54\xe2\x7b\x15\xf2\x2b\x71\xce\x78\
+\x3c\xd5\xa3\x18\x7a\x42\xcf\x76\x43\xb9\x59\x16\xf1\xa1\x22\x18\
+\x95\x78\x69\x52\x4b\x06\x03\xe6\x7e\x95\xd4\x21\xa2\x58\xe7\x62\
+\xc8\x20\xcf\xb7\x4c\xb3\xbe\xcb\x2b\xbb\x35\x85\x3f\x72\x92\x42\
+\x19\x3d\x6c\x2d\x36\x45\xd2\x38\x93\x93\x61\x62\x03\xde\x0f\xcb\
+\xb7\x5c\x8d\x9f\xf0\x76\xf7\x84\x17\xf1\xfc\x14\xc0\x26\x47\xe1\
+\x02\x41\x91\xd0\x91\xca\xed\x51\x91\xa3\xa5\x1f\x0d\xe0\xa4\x39\
+\x31\xe3\xb1\x47\xdb\x5c\x74\xe9\xbe\xbc\xa8\x15\xce\x29\x8c\x2e\
+\x2d\x94\x02\xe5\x11\x08\xd1\xf0\x89\x8d\x3b\x61\x98\x7e\xfe\xb1\
+\x38\x01\x30\x68\x00\x03\x24\x3f\xfc\x2e\xcb\xd5\xff\x4e\x37\xfb\
+\x43\xae\xaa\x3f\xa2\x77\xfb\xaf\xb8\x92\x7f\xa0\x65\x07\x92\x37\
+\xd7\xd7\x2c\xae\xaf\x5d\xa2\xae\xea\x7b\x2e\x5c\x6f\x83\xf1\x16\
+\xc0\xa1\x68\x9f\x69\x5e\x34\x0a\x21\xb9\xf2\x50\x4a\x91\x1b\xf6\
+\xbe\x5b\xea\x0a\xdd\xbb\x3c\x77\x8b\xba\x47\xdd\x88\xab\xab\x07\
+\x6e\x41\xd7\xbb\x0c\x9c\x56\xfd\x14\xd0\xec\x02\xce\x3e\xc7\x32\
+\xef\x61\xd5\x2e\x26\x77\x46\x73\x2e\x8b\x1a\xd8\x56\x4e\x58\x56\
+\xb7\x2c\xdb\x89\x1e\x69\xbb\xee\x13\x97\xcb\xa8\x5e\xdc\x7d\x36\
+\x7e\x42\x34\x11\xf8\xa2\x64\x1a\xf4\x18\xe4\xa9\x1b\x4e\x68\xe7\
+\x23\x03\x1a\xc0\x86\x79\x01\x2a\x4f\x03\x71\xeb\xa5\xee\xfe\xe6\
+\x49\xd6\xed\xc2\xae\x5e\x8d\xed\x9d\x94\x68\x6e\x15\x89\x91\x13\
+\x89\x73\x27\xe6\xe6\x24\xe7\x96\x89\x7d\x79\xe3\x98\x78\x72\xf3\
+\xba\xd6\xc4\x67\x2a\xb6\xd8\x28\xa6\x34\x4c\x1c\x34\x67\x12\x5b\
+\xa0\xba\xd3\xde\x4a\xe3\xe1\xd2\x6e\xf8\xb4\xaf\x55\xb5\x7b\x10\
+\x99\x96\x7f\xf7\x9e\x06\xb4\xf5\xb6\x7d\x98\x8e\x44\xc5\x42\xbe\
+\xe7\x4a\xea\x39\x0c\xf3\xee\xbf\xc7\xe8\xcb\x1a\xb4\x2d\xcd\xfe\
+\x52\x11\xbf\x10\x7c\xf9\xf2\x7f\x21\x7e\x21\xe0\x07\x13\x50\xf9\
+\x01\xbe\xe2\x77\x79\x13\xfd\xb7\x26\xe0\x08\x1f\xd7\x01\xdd\x87\
+\xbf\xc9\x58\x3c\xaa\xa7\x55\x9e\xe9\xf0\x68\xc6\x32\xed\x8e\x9b\
+\x2b\xcf\x65\x34\x6e\x17\x92\xb7\x77\x8a\x97\x6f\xdb\x83\xfb\x26\
+\xbd\xdc\x55\xde\x00\x9e\x9b\xaf\xef\x37\xa2\xf7\xdc\xf3\xa5\x73\
+\x16\xee\x47\x82\xd9\x4a\x71\x3f\x9a\xf3\xb0\xf7\x90\x85\x58\x73\
+\xb8\x79\xdf\x3a\xfc\xef\x6e\x0a\xee\xa7\x7b\xb7\x20\x9c\xcd\xbb\
+\xdc\x4c\xfb\x78\xf7\x5b\x2e\xc7\x5b\x6e\xa6\x7d\xa0\xcf\xcc\xb0\
+\xf7\x65\xa1\xff\x96\xf7\x12\x6e\x02\x3d\x69\xbd\x33\x14\x1c\x56\
+\x53\x7a\x97\x81\x4b\xd0\xe9\xfc\x59\x0d\xf2\x40\xbd\xc2\xdb\x3e\
+\x61\xb7\x93\x94\xbd\xb8\x35\x03\x19\x30\xed\x4c\x0d\x26\xad\x46\
+\x3a\xee\x64\x40\xdd\xdc\xda\xa2\x87\x1d\x45\x8b\xe9\x14\xc9\x73\
+\x09\x9b\x3d\x6b\x0a\x06\xe8\xb1\xb3\x76\x7e\xb2\x3d\x4f\x88\x6d\
+\x2a\x3d\x89\x70\x46\x97\x4e\x13\x5f\x8d\x9f\xf0\x61\xd4\xab\xa3\
+\x98\x67\x4a\xd7\xee\x77\x44\x08\x02\x75\x6c\x7f\x09\xe7\x32\x64\
+\x52\x21\xa9\x4f\xba\x58\x34\x7c\xe4\xbe\x10\xe6\x40\x6d\x2b\x6b\
+\x5a\x46\x38\x96\xc5\x04\x77\x94\x4e\x95\x79\x32\x23\x2a\x04\x15\
+\x86\x7d\x8d\x84\x78\xd6\x81\xe4\xbb\xdf\xd5\x9f\xf1\xec\x9f\x38\
+\x00\x5b\x09\x61\xc1\x6b\x81\x7c\x0c\x6a\xbb\x7d\x2a\xff\x7b\xf7\
+\xf8\xf2\xc5\x7f\xc5\x68\xf7\x15\x8a\x47\xda\xa5\x68\xe9\x66\xdd\
+\x8a\xe4\xe6\xa6\x19\x0f\xd9\xc9\x0d\xa5\xe8\x89\x29\xd1\xa3\x29\
+\xdd\xf9\x8a\x57\x7f\xfd\x3d\xa3\xfb\x25\xf7\xa6\x3c\xdc\xac\xbc\
+\xd1\xcb\x5d\xe5\xed\x20\xdf\xa3\x55\xde\x7b\xae\xaf\x3f\xf2\x6e\
+\x5b\xe0\xf7\x03\x0e\x57\x0f\xb8\x44\x11\x4f\x60\xd9\xfd\x8c\xce\
+\xe5\x07\x58\x4d\x79\xbd\xfa\xce\xb1\xb1\x5d\xac\x35\x81\xdc\x19\
+\xe3\x98\xb8\x33\x9a\x73\x33\xed\xb7\x00\x0e\x50\x6d\x57\xcc\xfb\
+\x02\x96\x50\xcd\xf6\xcc\x6e\xba\xf4\x2e\x1f\x38\x16\xbe\x91\xef\
+\xb9\xbf\x14\x4e\xfd\xce\xc6\x25\x1d\xff\x0e\x8f\x08\x3d\xc5\x2a\
+\x26\x0c\x23\x27\x25\xf4\x64\x7a\x13\x5e\x7f\xd7\x67\xc9\x9a\xe1\
+\xa0\x43\x18\x46\x0c\xca\x2d\x8b\x55\xc1\x6a\xb9\xe1\xbb\xa5\xc7\
+\x78\x5c\xb1\xac\x0a\xc6\x5e\xe0\xba\xf3\x96\x4b\x8f\x07\x55\xc5\
+\x43\x42\x16\x14\x84\xf3\x94\xce\x68\xe8\xf4\x73\x1d\x28\xcb\x5a\
+\x79\xe4\xeb\xa3\xa0\xd3\xb1\x3b\x51\xf7\x4c\xc6\x6d\x30\xaf\x3d\
+\xfc\x63\x8a\xce\xf0\x35\x90\x27\x3a\x3e\xe9\xca\xcd\x51\xbd\xea\
+\xb7\x20\x95\x8d\xa0\x4e\xd4\x00\x30\xc6\x3b\x8e\x1a\xa7\x24\x00\
+\x5c\x20\x9e\x46\xd8\xa7\x0f\x6c\xf2\x47\xfc\xe9\xb3\x7f\xca\xe8\
+\x57\xe1\xd1\xf0\x77\x4f\x24\x44\x13\xa8\xe7\xc0\xdc\xbc\x6d\x1f\
+\xff\x35\xfe\x39\xd3\xd1\xb7\x34\xcf\x34\xda\x3e\x12\x79\x47\xb7\
+\xdb\xef\xf7\xd3\xab\x47\xfc\xd2\xc3\x2f\xf8\x8d\x5f\xfa\x75\x7e\
+\xe7\x77\xfe\x4b\x56\xb3\x90\x77\x79\x4e\x3f\x5e\xb7\x42\x3f\x00\
+\x4f\x7d\x78\xf2\x38\xe2\xdf\xff\xb5\xdf\xe6\xeb\xdf\xfe\x4f\x98\
+\x7e\xfe\x9f\xf2\x1f\xfd\xce\xef\xf0\xdb\xff\xdd\x7f\xc3\xb3\x2f\
+\x7e\xc6\xdf\xbe\x0c\xf9\xc3\x9f\x87\x7c\xff\x5e\x31\x5e\x4a\x3c\
+\xf1\x59\x4b\x72\x58\x66\xb5\x60\x76\x7a\x36\xe8\x73\x59\x6c\x5d\
+\x88\xc8\x5e\x9f\xcd\xbb\x54\xb3\x3e\x53\x6f\x8a\xdf\xd7\x00\x9a\
+\x7a\xd3\x13\x0f\xf9\x9e\x47\x3c\x1c\x3f\x74\xe5\x6b\xfd\x47\x57\
+\xf4\x47\x5f\xe9\xe7\xa9\xbe\x9e\xef\xb6\x5b\x12\xcf\x77\xac\x37\
+\x07\x0e\x1f\xef\x79\xfd\xc3\x2d\xab\x37\xf7\xbc\x5c\x7c\xcf\x76\
+\x7f\x07\x1b\xed\x1f\x6f\xfc\x3e\x6b\x3c\x96\x4b\x8f\xd2\x68\x7f\
+\x7b\x26\xd0\x65\x55\xb0\x5c\x7a\x1c\xe6\x4b\x3e\x7a\xfa\xbb\x9d\
+\x8c\xf4\xdf\x76\x58\x79\x14\x71\x61\x1c\x8a\x76\xcf\x9e\x23\x84\
+\x9b\xd7\x94\xd1\x25\x65\x74\xc9\xe4\xe6\xb5\xf3\x8a\xad\x4f\x2c\
+\x5a\xf6\x5c\xe6\x16\x8c\x7a\x8c\x55\x53\xdb\x02\x3d\x95\x91\x89\
+\x18\x5f\x35\xa6\xfb\x98\x98\x64\x60\x9e\x13\x08\x71\x54\xf6\xad\
+\x90\xaa\x06\x70\x20\x84\x9b\xa1\x66\x27\xf8\xc4\x45\xd5\x2a\x61\
+\x7b\xdb\x0a\xb6\xd2\x55\xf6\x22\x35\xe1\x3d\xff\x84\x47\xc3\xdf\
+\x75\x0c\x7c\x8e\x71\xdd\xc2\xf9\x08\xcc\xf6\xf6\xf1\xf5\x41\xfe\
+\x3d\x9b\xfc\x57\x8d\x8f\x6c\x22\x97\x94\x27\x76\x9d\x95\x1b\x5b\
+\xb5\x60\xb0\x6d\x3f\xf6\x60\x1c\xf0\x54\x5c\xf1\xea\xc3\xcf\xd9\
+\xf6\x86\x75\xeb\x51\xfc\x18\xfa\x70\xd9\x1d\x21\xfe\x2e\x7c\xfd\
+\xac\x47\x67\xf6\x80\xc7\x0f\xea\x91\xa4\x6f\xff\xf3\xff\x9a\x5f\
+\x7c\xf3\xcf\xf8\x97\xbf\xf7\x27\xfc\x3f\x3f\xbf\xe5\x5d\xfe\x97\
+\x3c\xfe\xfa\x92\x87\xe3\x87\x2c\x46\x82\xc3\x8d\x72\x8b\x40\x2b\
+\x2b\x66\x8b\x3b\xee\xa7\x17\x8e\x75\x67\xf3\x2e\xf7\xd3\x3d\x97\
+\x05\xee\xba\x77\xbf\xe5\x7e\xa6\x65\x86\xd6\xce\x7b\xed\x66\x5c\
+\x3e\x00\x1e\x98\x00\xcf\x7b\x6e\x96\xf0\x70\xfc\x90\xcf\x86\x07\
+\xde\xab\x90\x17\xc5\x1d\xd5\xeb\x19\xde\xf2\x9e\xc5\x66\x06\xa3\
+\x1c\x56\x21\x25\x1f\xb9\x9e\xc3\xd5\x14\xa6\xe3\x0b\x18\x78\x3c\
+\x0f\xc6\x30\xe8\xba\x12\x6f\x9e\x4b\xa6\x93\x21\x17\x93\x17\x6e\
+\x42\xd0\x33\xcb\xf0\xe6\xc4\x8f\xeb\xdd\x03\xe2\x4c\xa2\x26\x5a\
+\x72\x0c\x67\x03\x9d\x68\xdb\x6e\x29\xfa\xfd\x86\xab\xd1\xee\x0c\
+\x59\x5c\x3e\x67\x7d\x0b\xcf\xcb\xd7\xce\x2b\x56\x37\xbb\xb6\x26\
+\x76\x85\x12\x9d\xc3\xe8\xc4\x45\x7d\xf6\x24\x0b\x60\xcb\xb0\xb1\
+\xd2\xfe\x6f\xd1\x00\x6c\xa0\xa2\xf3\xb6\x93\xd5\xc2\x8d\x60\x50\
+\x64\x16\x82\x36\x47\xe1\x6d\x2b\xb2\xc3\x0e\x2f\xa8\xf0\xb6\xc6\
+\x37\x6e\xb4\x2a\x79\xdb\x8c\xbc\x1f\xf1\x0b\xfe\x21\xac\x39\x01\
+\xb2\x05\x65\x13\x9c\x4d\xf0\x66\x2f\x55\x4b\x72\xb8\x7d\xfd\x87\
+\xdf\x65\xfb\xe5\x3f\x25\x1c\x97\xe4\x4b\x0f\xc4\xe9\x79\x3b\x74\
+\xdf\x5d\xec\x5c\x8e\x3e\x11\x1f\x56\xaf\xd8\x7a\xb7\x88\x43\x42\
+\xd5\x19\x51\x36\xce\x67\xb1\x10\x6b\x9e\xfa\x75\x4b\xd0\xcd\x34\
+\x87\xb9\x8f\xff\x2a\x60\xf9\x17\xff\x8a\xde\xd5\x13\x66\x2f\x4a\
+\x61\xbb\xb5\x57\x00\x00\x20\x00\x49\x44\x41\x54\xae\xa2\xa7\x8c\
+\x7e\xeb\xa7\x5c\x7c\xf9\x1d\xbf\xfe\xe2\x1f\xf1\xd5\x97\xff\x90\
+\x3f\xf9\x9f\xff\x57\xfe\xa7\x7f\xf6\x47\xbc\xfb\xc5\x5b\xf8\xfa\
+\xd4\x53\xbe\x1c\x6d\x99\xcd\xa7\x0e\xc0\x96\x99\xf5\x22\xcf\x30\
+\xf3\x68\xce\x6c\x3e\xa5\x33\x06\xcc\xc2\xaf\x66\xf5\x48\xeb\x70\
+\xf4\x22\xf2\x9e\x47\x5c\x46\xef\x29\x81\x9b\xfc\x73\x7e\x63\xb5\
+\xe3\xe3\xea\x5b\xf6\xd9\x94\x0f\xd5\x82\x08\xf8\xdc\x9b\xc2\xb8\
+\xc2\x1b\x7f\xc1\x97\x9f\x4f\xd8\xc6\x92\x7e\x16\xb5\x86\x77\x5b\
+\x00\xd7\xdb\xfb\x56\xe3\x28\xe8\x89\x43\xd5\x62\x0d\x4c\x58\xa3\
+\x98\x02\xfb\xed\x96\x43\xe5\xd1\x5d\x0f\x5c\x34\xd3\xfa\xcb\x82\
+\x98\x45\x26\x98\xfa\x35\x61\x0c\x1f\xc2\x4a\xf6\xb4\xac\xe8\x3d\
+\x61\x75\xa4\x89\x2d\x1b\x37\xab\x7e\x49\xbf\xa3\xe7\x4e\xf4\x1b\
+\x3e\x30\x4a\x9a\x74\x9a\x6e\x51\xda\x2a\xe9\xdc\x04\x17\x8a\x57\
+\xb2\x66\xe3\x46\x7a\x8d\x08\xe7\x74\x1c\x07\x81\xe2\x4e\x0f\x0a\
+\x5c\x27\x47\x9f\x08\x5b\xc7\x8b\x44\x45\xa0\x3c\x54\xf5\xdd\x59\
+\x5b\xed\xac\xd5\xf6\x5f\x88\x13\x90\x1f\x3f\x0f\x20\x5d\x7f\xcf\
+\x46\xfd\x8a\x61\x5a\x6b\xb5\x35\xcf\x2b\x12\x21\x54\x66\x66\xbb\
+\xd5\xc2\x63\xf1\xcd\x77\x4c\xff\xf1\x18\x8a\x05\xf3\x72\xc4\xcb\
+\x6f\xff\x98\xff\x97\xb1\x37\x0b\x92\xe5\xbe\xce\xfc\x7e\xb9\x55\
+\x65\x66\x65\xd6\xd6\xdd\xb7\xb7\xdb\xb7\xef\x0a\x10\x0b\x09\x82\
+\x94\x48\x88\x04\x29\x8a\xa3\x65\x28\x5b\x33\xf6\x84\x2d\xc6\x48\
+\xb2\x3c\x96\x46\xa1\xa7\x79\x72\xf8\xc1\x0f\x8e\x90\xdf\xec\x07\
+\xdb\x31\xe1\x07\x4d\x8c\x6c\x86\x56\xca\xb2\x3d\x5a\x47\xa4\x16\
+\x8b\x82\x28\x40\x24\x38\x20\x81\x0b\x5c\x2c\xbc\x6b\xef\xcb\xed\
+\xee\xda\x32\x2b\x33\xab\x72\xf3\xc3\x3f\xf3\x5f\x59\xdd\x17\xd2\
+\x54\x44\x47\xd6\xd2\x6b\xf5\xc9\x93\xdf\xf9\xce\x77\xbe\xe3\x3f\
+\xda\x65\xe3\x23\xab\x60\x8f\xc8\xed\x75\x8e\xba\x09\xf9\x91\xca\
+\x51\xb0\x4b\xf0\x28\x12\x8d\x8f\x91\x98\xce\x78\xf9\xda\x0a\xcf\
+\xbc\xb7\xcf\xb5\xa7\x6f\xd1\xf8\x44\x9d\x1f\x7b\xe1\xa3\x5c\xb9\
+\xfc\x4f\x68\xae\x6f\xf0\x6f\x7e\xf5\x77\x99\x1c\x4d\x2e\x74\xd9\
+\x54\x6b\x09\x86\xa9\xc8\xac\x5d\x47\x64\xe4\xce\xa2\xe4\x8f\x4b\
+\xb6\x62\xa5\xd5\x93\x70\x43\x7e\x5d\xb5\x4b\x17\xde\x46\xb5\x96\
+\x04\xed\x56\xfc\x1b\x94\x60\x1f\xea\xab\x2c\xb5\x6e\xf2\xfc\xad\
+\x9b\x1c\x6a\x53\x1a\x76\x1d\x2f\xd0\x64\x61\x97\xe1\x63\x43\x61\
+\xa2\xf2\x84\x2e\xa3\xad\xa3\x07\xc5\x4e\xbd\x71\x63\xee\xd8\x19\
+\x37\xd8\x56\x73\x94\xe8\xf0\x9c\xcd\x17\x4c\x73\x9f\x86\xe3\xc8\
+\xa6\x47\x6a\xa7\x44\x04\x58\xb6\x22\xd9\x89\xce\xd1\x36\xc3\x56\
+\x9d\x81\xb7\x42\xf3\x92\x28\xee\x5a\xc3\x59\x26\x8e\x0b\xae\xd9\
+\xac\x64\xe3\x88\x40\xe8\x89\xb5\x50\xc1\x2f\xf8\x61\xdf\x0a\x71\
+\xfd\x1c\x4d\x53\x29\x5d\x1b\x34\x14\x52\x22\xe2\x02\xf5\x36\x8b\
+\xc9\x8f\x38\x12\xba\xe2\x18\x4b\x2c\x65\xac\x32\x18\x73\x10\x25\
+\xac\x74\xf1\x66\xca\x63\xbf\x38\x6a\x58\xf4\xcb\xd5\x04\xe1\x3c\
+\x26\xae\x06\x63\x15\x23\x97\xcf\x3d\x29\xc8\xcf\x7f\xae\x7f\xe3\
+\x7a\xa5\x30\xb0\x3e\x24\x13\x2b\x17\x5c\x95\xde\x1b\x9d\x31\x79\
+\xf3\xeb\xd4\x59\xe6\xbb\x5b\x31\x7b\xfb\xe1\x1c\xbd\x05\xc0\xc3\
+\x43\xc2\x7e\x24\x33\x5f\x3c\xec\x62\xb4\x7a\xc4\xa3\x88\xdf\xfa\
+\xee\x5b\xb4\xde\x7a\xc4\x0f\x5c\x49\x78\xf9\xc5\x4f\x30\xfe\xcc\
+\xdb\x98\x9f\xfb\x29\x9e\xfb\xe2\x02\x3f\xb3\xff\x32\xaf\xfd\xe5\
+\x5f\x31\x39\x4a\x59\x5b\xb1\x24\x5f\x9c\xb5\x04\x27\xac\x9c\xc1\
+\x4a\xdb\x27\xce\xd7\x80\xe9\x5c\x26\x5e\xe8\xd5\xa0\x35\xc3\xcb\
+\x47\x9a\x23\xdb\xd0\x2b\xa9\x5f\xfc\x0e\x48\x86\xa2\xca\x13\xbf\
+\xd9\x3f\xa4\xf1\x7d\x0d\x77\x71\x49\x0e\x8f\xaa\x40\x69\x53\x6c\
+\xc6\x16\x91\x51\xe8\x4f\x8a\xd6\x74\xd9\x8d\xd3\x5a\x19\x8c\x93\
+\x0b\x2c\x45\x79\x1c\x4d\xa6\x24\x67\x03\x0c\x16\xe9\x2e\xa8\xb8\
+\xc5\x82\x1b\x9f\x84\x4e\x4b\x63\xea\xfb\xe0\x38\x73\xf0\xad\xdf\
+\x33\xa9\x0d\x4f\x24\x9c\x10\x93\x21\x47\xb4\x8e\x26\x98\x9b\x37\
+\x38\x66\x4f\x66\xe2\xb2\x59\x22\x5c\x87\x02\x4c\x02\x89\x89\xd5\
+\x52\x2f\x6c\x15\x81\x7c\x5e\x7a\x59\xbe\x1e\x9e\x2b\x8e\xc2\x22\
+\x80\x0d\x42\x01\x43\x42\x85\xf3\xdb\x23\x7c\x19\xac\x52\x0d\x21\
+\x77\x52\x68\xa6\x39\x73\xdb\xac\x60\xf2\x57\xef\x7c\xe9\x43\x39\
+\xcf\x6a\x40\x97\xb7\x77\xf8\xd2\x85\xe7\x5b\xcf\xc3\xf8\xca\x2f\
+\x33\xbe\xf2\xcb\xc4\xfa\x73\xe8\xd2\x15\xe8\x09\x05\x5e\xa1\xa8\
+\x22\x0a\xa5\xb7\x45\x58\xec\x50\xf6\x92\x35\x72\xb7\xcb\xc9\x83\
+\x37\xd9\x1e\x3e\xb8\xd0\x91\xdb\xcd\x90\x6a\xb2\xb9\x6c\x0a\xb4\
+\xda\x57\xe9\xb6\x2c\x1e\x0e\x5d\xde\xf9\x46\xca\x5f\xbc\xb6\xcd\
+\x5f\xfe\xc5\xd7\x98\xf6\xde\xa7\xfb\x42\x1b\xe7\xda\x06\xdb\x61\
+\x9d\x2c\x3c\x91\x05\x5b\xc9\x50\x2c\x17\xac\x44\x2f\xef\xcd\x15\
+\x79\x25\x4b\x51\x16\x79\xe5\x73\xc7\x83\x59\xf7\xf0\xac\x3b\xe5\
+\x78\x30\xfb\x3d\x56\x2c\x81\xdf\xfd\x60\x56\xdc\x79\xa7\x27\x74\
+\xe2\xc2\x6d\xa7\x68\x3b\x97\x41\x0b\xe0\xe4\x5d\x19\xbc\x25\x0f\
+\xac\x8c\x05\x7d\x56\xed\xc6\x95\x8f\x47\x93\x01\x83\xc1\x00\x86\
+\x3a\x6b\x9d\x84\x8e\x9a\x12\x0f\x15\xfa\xc3\x74\xae\xf1\x51\xe5\
+\x93\xcb\x42\x7a\xda\x5a\x92\x9a\x94\xce\xd1\x36\x03\x6f\x85\xfe\
+\xca\x26\x87\x93\x84\xd6\x70\x32\x47\xa7\x09\x8e\x79\xe6\xad\x37\
+\x8f\x89\x0b\x3c\x6b\x59\x39\xfd\x92\x22\x2b\xe9\xb4\xbe\xe8\x82\
+\x35\x11\x6b\xa6\x47\xe7\xa4\x38\x71\xa8\x88\xe5\xe6\x73\x19\x78\
+\x9e\x0f\x08\xe2\x09\x16\xb6\x80\x29\xc5\x66\xa4\xb9\x56\x6e\x81\
+\xa1\xaf\x18\xf0\xf5\xec\xaf\x78\x99\x7f\xf8\x36\xbc\x23\x82\xb5\
+\x6c\x8c\x54\xb3\xf2\x9d\x07\xff\x92\xda\xda\x75\x3c\xbd\xc0\x52\
+\x91\x52\x09\xe0\xb0\xe8\x4f\xce\xae\x0a\x22\x13\xe7\x33\x2f\x37\
+\x60\x6b\x3f\x00\x8e\xf1\x81\x81\xb7\x22\x03\xb4\x64\x27\xf6\xfc\
+\x7d\x16\x86\x11\x47\x15\x46\xc0\x68\xc1\xe4\x68\x86\x69\x8d\xa6\
+\x08\xc2\x3b\x1c\xb0\xb6\xbd\xc4\x35\x1e\x72\x7a\x3b\xe1\x7e\x07\
+\x94\x65\x03\xf7\xe1\x61\x51\xbd\x77\x61\x8e\x27\x16\x8f\x97\xdb\
+\x70\x7c\xe6\x73\xb4\xe0\x54\x20\x46\x54\x14\x76\xb0\xa0\x9e\xd2\
+\xcb\x4d\xd1\x31\xcc\x7b\xb2\xe0\x5b\x6e\xcf\x32\xf1\x59\xcb\x24\
+\x0b\x9a\xf2\xf7\xbe\x7f\xa4\x70\xed\x69\xe8\x3f\x36\x20\x0c\x51\
+\x34\x17\x02\x95\x49\x2a\x7e\x57\x45\x73\x19\xd9\x03\x6c\xad\x2e\
+\xdb\xc8\xfe\xd4\xa3\x11\x4c\xc1\x15\xef\xcd\xd8\x50\x69\xf4\xd2\
+\x42\x6f\xe2\xd0\xd0\x62\x1a\x41\xce\xb8\xd5\xc1\x01\xe2\x61\xb1\
+\x88\xb1\xdb\x90\x0c\xc5\x88\x94\x06\x62\x0f\x75\x56\x19\x44\x2b\
+\x33\x71\x89\x87\xdb\x1c\xc9\xe0\x19\xb6\xea\x4f\x16\x4e\x15\x90\
+\xc4\x84\x8b\x2a\x36\xc5\xcf\xe5\x3e\x66\x67\x2c\xf4\x13\xb6\x51\
+\x87\xa8\xb0\xb2\xc2\x91\x6b\x99\x9a\xb2\x13\x25\x96\x38\x96\x54\
+\xdc\x05\xb9\x64\x45\x83\xe1\x14\xd4\x5b\x58\x48\x2f\x4b\x41\x50\
+\x58\x60\xd4\x07\xe1\xd6\x1c\x14\xf8\x8f\x09\xe4\x5f\xcf\x6a\x73\
+\x30\xe3\x7b\xfc\x32\x93\x4b\x3f\x4c\x9c\x5c\x17\x2e\x99\xf2\xac\
+\xb7\x3e\x54\x0b\x21\x56\x25\x08\x58\x64\x12\x72\x96\x8b\x77\xf1\
+\x83\x37\xee\xf1\xdd\x3f\xf8\x4d\x6e\x9f\x7c\x5b\x34\x1e\x2c\xf0\
+\x83\x26\xbb\x19\xa2\x81\xc1\x9a\x0c\x60\xd5\x5a\x92\xfa\x86\x95\
+\xd4\x07\xe5\x60\x4e\x69\x76\x14\x42\xb2\x13\x71\x90\xee\x90\x1f\
+\xa9\xb4\x07\x21\xf9\x82\x73\x11\xef\x16\x59\xb9\x7c\x9c\x2f\x08\
+\x6c\x7c\x3c\x10\x54\x5c\x2f\xab\x00\x9f\x5c\xfc\xfc\x32\x63\x97\
+\xd4\x5b\xb5\xfb\x57\xd2\x6b\x65\x26\xb6\xdb\x1a\x93\xbd\x01\x4a\
+\xda\x03\x2f\xa7\xdf\xef\xd3\xef\xf7\x19\x8c\x12\x06\xbb\xd0\xef\
+\xf7\x89\x0f\x7c\x74\xdd\x22\x48\x35\xfc\x69\x44\x7c\x10\x33\xc8\
+\x53\xf0\x72\xc6\xa9\x41\xa3\x27\xb2\xa9\x53\x5b\xa4\x11\x4c\x69\
+\x69\x0e\xe3\xbc\x43\x43\xe9\xe3\x17\x06\xe4\xee\xb5\x26\x9d\x96\
+\x86\xa2\xb6\xc8\x2a\x30\xc2\x53\x1d\x49\xb5\x59\x76\x34\x97\x89\
+\xa9\x24\x8c\x92\x2b\x2e\x31\xb1\xea\xfb\x92\x67\xae\xca\x3c\xc7\
+\x7e\x8c\x9a\x5a\xb9\xd8\x5e\x64\x99\x72\xa6\x4e\xeb\x47\xf8\xd3\
+\x33\x88\x74\x31\xed\x61\x76\x65\xb6\x8d\x11\x03\x95\x71\xe1\x0a\
+\xa4\x95\xc7\x50\x91\x4a\xb7\x92\x27\x76\xe6\x66\xd4\xc2\xf9\x76\
+\x74\xa1\x66\x4b\x09\xb1\x22\xf1\xb5\xee\xc1\x16\xf6\xce\x0f\xf3\
+\xeb\x59\xed\x3f\x2a\x88\xcb\xcf\x7b\x07\x01\x41\x0e\x46\xbf\x5c\
+\xd1\x1f\x5b\xf2\xb2\x25\x3a\x72\x33\x71\x92\x98\xdf\x8b\x8a\x20\
+\xcf\x99\xf8\xe1\xac\x03\x54\x14\xac\xa3\xc7\x62\x60\xf3\x78\x64\
+\xcc\x4d\x59\x94\x19\x2d\xab\x5f\x92\x9d\xb0\xd2\x67\x62\xae\xd5\
+\x9c\xaf\x49\x01\x4f\x19\xe8\xdb\xb5\x75\x8e\x47\x86\x1c\x08\x2d\
+\x1b\x1d\x65\x93\x63\x2e\xdb\x14\x3f\x53\x64\x74\x73\xae\x90\x2b\
+\x3f\xbf\x97\xf7\x24\x5f\x5c\x3e\x5e\xe8\x9f\x62\x14\x85\xdf\x8a\
+\x35\xe3\xb2\xd5\xc9\x63\x82\xbe\x48\x50\x8f\x3b\x1d\xf2\x62\x51\
+\x62\x5b\xd1\xe8\x74\x3a\x74\x3a\x1d\x36\xaf\x3a\x6c\x76\xda\x74\
+\xda\x9b\x24\x89\xd0\x0e\x5f\xae\xad\x72\xe3\xc5\x75\xba\xd7\xaf\
+\xd1\x69\x6f\x72\xb9\xb6\x8a\xd2\xde\xa4\xd3\xde\x04\x3a\x28\xed\
+\x4d\x86\x03\x0f\xa7\x93\xa2\xb4\x9b\x05\x9b\x92\xa3\xa8\xad\x82\
+\x57\x2e\xf4\xc8\x85\x29\x84\x9b\xf9\x32\x8b\x7a\x86\xc5\xd1\xe9\
+\xd9\x9c\x30\x5e\xc2\xb2\xa2\xf1\x51\xf2\xc4\xb3\x13\xa1\x51\xd4\
+\x37\x36\x71\xa0\x89\x4c\xac\x99\x33\x0b\x14\xb9\xaa\xb6\xd3\x01\
+\xd3\xc2\x3f\x27\x92\xb7\xca\x9d\x64\x45\x86\x4b\xcb\x59\x8c\x42\
+\xbe\xa9\xf8\x02\x57\xeb\xa1\x28\x10\xc3\x7e\x84\xd5\xd7\x84\x25\
+\x40\x38\x2b\xf2\x6c\x3f\x28\xd8\x8b\x50\x66\x6a\x13\x13\x6f\xed\
+\x2a\x1f\x78\xdf\x62\xe7\xdd\xda\x3f\x98\x8d\x7f\x3d\xab\xb1\xf3\
+\xae\xf8\x90\x75\xd6\xce\x0e\xd1\x9a\x5a\x74\xe8\x66\xab\x74\x4b\
+\x56\x62\x5e\x64\x6f\x8a\x93\x71\xac\x51\x77\x8a\xe9\x90\x73\x3f\
+\x63\x6f\x3f\xe4\xe1\x41\x84\xff\x68\x97\xe5\xf6\x0c\x07\x5f\x76\
+\xd6\x65\x70\x9c\xc7\xc2\x17\x5a\xa9\x45\x96\x5e\x75\x14\xa9\x61\
+\x38\xaf\x3a\x2b\x71\xec\x4a\xea\xcb\x63\x99\x8d\x7b\x79\x8f\x23\
+\x4d\x04\x6a\xd9\xa5\xeb\xe5\x3d\x19\xb8\x0b\xbd\x9a\xcc\xc4\xcb\
+\x6d\x64\xa6\x2e\x8b\xba\x4e\xd4\xe4\xf1\xe0\x31\x07\xbd\x13\x8e\
+\x42\x21\x8e\xbf\xd4\xef\x33\xb6\xa7\x28\xed\x26\x69\x65\xcf\xc8\
+\xa8\xe8\xcc\x96\xf4\x5a\xd2\x1f\xb2\xab\xf6\xd8\x79\x38\xc6\x3b\
+\x3e\x62\x57\xed\xb1\x37\x3d\x04\xfa\x0c\xe8\xa3\xdb\x21\xba\x1d\
+\x62\xac\x5d\xa2\xe9\x1a\xb4\xe9\xa0\x77\x44\xf0\x96\x7a\x89\x86\
+\xcd\x9c\x9f\x5b\xe6\x38\x73\xf4\xdc\x95\xc2\xde\x61\xf4\x58\x64\
+\xe1\xb6\x3b\xeb\xda\x55\x31\x71\xc9\x2f\x6b\x41\xb9\x3b\x31\x10\
+\xdf\x53\xe8\x89\x43\xd1\x55\x3b\x27\x69\xb4\x2c\x53\x8c\xe0\x9b\
+\x16\xb9\x15\x48\xbf\x09\x2a\xd9\x56\x0b\x15\x69\xc4\xcd\x28\x16\
+\xc6\x28\x51\x28\x9c\x7e\xe2\x09\x49\xa0\x73\x9c\xf7\xc9\x23\xa1\
+\x8c\x3b\xe9\x47\xe8\x61\x48\xa0\xa9\x28\x7e\x40\xd8\x37\xb0\xd3\
+\x8c\xb0\x9f\x90\x0f\xb6\xd8\xe8\xc7\x8c\x57\x27\xbc\xf3\x76\xfd\
+\x43\xb3\xf1\xf0\x0e\xfc\xeb\xb7\x45\xf0\xde\xc9\xc6\x8c\x57\x67\
+\x7f\xe8\xf5\x2b\x57\xb0\x8d\xcf\xcc\x4f\x83\x48\x43\xc1\xf0\x82\
+\x88\x24\x8a\x14\x8c\x46\x4a\x3c\xd6\x64\xb3\xa3\xc4\xc4\x67\xe1\
+\x2e\x71\x78\x20\x29\xb0\x12\x5f\x6e\xa8\x82\xae\xea\x44\x4d\x09\
+\x27\x00\x96\xb5\x53\xb2\xf0\x44\x04\xab\xb5\x24\xb3\xe1\x6a\xa1\
+\xad\x56\x6a\x8b\x4f\xfc\x7b\x26\x47\xa9\xec\xd8\x1d\x0f\xb8\x70\
+\x5c\x6e\x8b\xa2\xad\x5a\xe4\x55\x03\xb9\xcc\xc6\x00\xf1\x28\x9a\
+\x3b\x56\x27\x3b\x0e\xf7\x52\xb2\xf0\x84\x61\xab\x4e\xb8\x7e\x95\
+\x89\x1f\x72\x3a\x0d\xd8\x3f\x1c\xd0\xef\xf7\x39\x9d\x06\xf4\xfb\
+\x7d\x0e\xa6\xa2\x73\x27\xd2\x66\x8d\x8e\x69\xd1\x5e\x37\x30\xdb\
+\x35\x3a\xed\x3a\xed\x95\x26\x7a\xb7\x56\x38\x06\x09\x65\x59\xa9\
+\x3f\x56\x3b\xe9\x1c\x6c\x68\xa2\x31\x0e\x98\x19\xb1\x14\x01\xdd\
+\xb0\x0b\x53\xc7\x61\xce\x4e\x2c\x10\x6d\xdb\x3d\xa2\xed\x1e\x49\
+\x38\x71\xfe\x56\x85\x13\x65\x46\x2e\x23\x56\xad\x96\x38\x98\xf9\
+\x6c\x73\x7d\xa9\x03\xb6\x72\x49\xaf\x11\x46\x62\xea\x23\x54\xf0\
+\xfb\x7d\xfc\x52\xe9\x66\x5a\xc2\x24\xa5\xea\x3f\x61\x5a\x34\x5b\
+\x1a\xcb\xad\x4b\xe2\x44\x70\x14\x1c\xd3\x22\x29\xa4\x9c\xbe\xd6\
+\x10\xcb\x6b\x34\x15\xf0\x38\x1d\x2f\xb2\xdb\x31\x78\x66\xe9\x65\
+\x94\xe7\x7b\xec\xbc\x5b\xe3\x5f\xbf\xfd\xe4\x8c\x5c\x06\x30\x80\
+\x77\xf7\xe7\xe4\xf3\xb7\x13\x95\x38\x3f\x38\x27\x96\xaf\xee\xfc\
+\x50\x66\x27\x6b\x41\xeb\xc5\xc5\xd6\xa6\xb2\x5a\x2e\xc7\x9d\x86\
+\xc9\x2d\x0c\x6b\x0d\xe5\xcc\x97\x01\x59\x36\x39\x72\x7b\x9d\x41\
+\x5b\x78\xaf\x95\x7a\xdd\x43\x3f\x67\xd5\x51\x38\x4e\x17\xc9\xc2\
+\x13\x9e\x1f\xac\xc9\x00\x5e\xd6\x4e\x9f\xf8\x8f\x31\xac\x35\xce\
+\xba\xd3\x39\xec\x5c\x66\x54\xe5\xcc\x27\x5f\x70\x64\x40\x57\xdb\
+\xca\x5d\xb5\x08\x52\x65\xa6\x6b\xee\xaa\x11\xbd\xcc\x64\xb9\x8d\
+\x84\x1f\xcb\xda\x29\x47\x61\x31\xba\x94\x8f\x58\xeb\x2e\xb1\xdc\
+\xbe\xcc\xc6\x92\x41\x77\xa3\xcd\x62\xcd\x66\x7d\xb5\x8d\xbe\xd0\
+\xa6\x6e\x5a\x74\x3a\x1d\xb1\xac\xd1\x36\x09\xd2\x59\x72\x68\xd6\
+\x6b\x98\xa6\x49\x33\x17\x1f\x25\xaf\x5c\x15\x0f\x25\x49\x38\xe7\
+\x22\x94\x24\x21\xa9\x9d\x4a\xaa\xad\x2a\x92\x97\x57\x29\x7b\x76\
+\x7f\xe0\xad\xcc\x65\xe2\x12\x4e\xc8\x02\xd0\x71\x64\x46\x8f\x8b\
+\x8c\x1c\x81\x98\x76\x9e\xf7\x98\x9c\x05\x74\x5a\x04\xad\x16\x2a\
+\x18\x84\x58\x15\x16\x42\xaa\x87\x8a\x06\x41\x69\xa6\x52\x7e\x84\
+\x08\xa3\xc0\xa0\x30\x48\x29\x9d\x35\x2d\x2b\x97\xd3\x1e\xaa\x95\
+\x0b\x45\x9c\x65\xe2\x03\xef\xef\xef\xc2\xe3\x1b\xd4\xf2\xa7\x04\
+\xce\x7d\xbb\x3e\x87\x7b\xab\x85\xdc\x9d\x6c\x4c\x7e\x47\xfc\x53\
+\xdd\xa7\x7e\x7b\x16\x14\xfa\x55\x3a\xd6\xf5\x4a\xf0\x7e\x88\x77\
+\xdb\xdc\x88\x53\x5d\x42\x9d\x30\x8a\x20\x8a\x48\x4e\x5d\x5a\xfa\
+\x3d\xe2\xf0\x80\xd5\xd5\x19\xa6\xdd\xcd\x40\x29\x6c\x54\x85\x6b\
+\x8f\xe8\x8e\x3d\x7b\x68\x08\xfb\x2a\x3f\x97\xd9\xf8\x4e\xfb\x80\
+\xc3\xa2\x7d\x7d\x9c\x8a\x2c\x6c\x77\x4c\x59\x18\xaa\x93\xc7\x42\
+\xe9\x96\xfa\x12\x26\xcc\x06\x24\x45\xa0\x56\x9f\xaf\x66\x62\x59\
+\xdc\xe5\x6b\x17\x9e\x2b\x83\x3e\x0b\x4f\xe4\x09\x75\xea\x9d\xd0\
+\x6d\x59\x3c\xff\xe2\x47\xa8\x2f\xd6\x08\xf4\x06\x69\xde\x40\xef\
+\xd6\x30\xb1\xe9\x98\x16\x1d\xd3\x42\xe9\xb4\xe5\x68\x12\xd8\x72\
+\xca\xa3\x9c\xc3\x4b\x92\x90\x91\x12\x09\xf1\x7c\xbd\x26\xc7\xfc\
+\x47\x93\xa9\x18\x1a\x2d\xf4\xc7\x49\x12\xd2\x6a\x5a\x8c\x03\x91\
+\x91\xcb\x2c\x5c\xc2\x09\xd5\xf7\x81\x06\x99\x21\x30\x5a\xb9\xc2\
+\xa1\x74\xbf\x1f\x78\x2b\x73\x22\xa0\xf3\x90\x22\xb5\x53\x89\xab\
+\xc7\xea\x14\x75\x6c\x65\x33\xea\xa9\xf8\x27\xa6\x15\xac\xca\x39\
+\x3a\xad\x54\x13\x39\xa6\x25\x82\xba\x90\x66\x6a\x17\x2c\x51\x28\
+\x3c\xdd\xaa\xcc\x72\xb9\x70\x3c\xaf\x28\xe6\x20\xd4\xeb\xe8\xab\
+\x6d\xe8\x36\x69\xad\xdc\xa2\x3d\xbc\x89\xf2\x7c\x8f\x3f\xfd\x5d\
+\x97\x7f\xa1\x4e\x2f\xe0\x60\x00\xe5\x79\xf1\x4f\xfd\x49\xe5\x27\
+\x79\xf9\xf9\xaf\x73\x37\xfc\x9f\x41\xb9\x01\x91\x52\xe8\x84\x0b\
+\xe1\x4f\x21\xa9\x94\x59\xb8\xa2\x81\x2e\x2d\x60\xc5\x54\x4b\x51\
+\x08\x86\x17\x47\x8d\x54\x6b\x09\xd5\x5a\xa2\x7b\xb2\x47\x3e\x5d\
+\xe7\xc6\x25\x03\x65\x25\x93\xa6\x25\xef\xad\xc6\x73\x83\x9a\x65\
+\xf0\x96\x99\xb9\xcc\xd6\xbb\x99\x28\x0c\x17\x86\x11\x47\x21\x1c\
+\x1e\x9e\xc8\xa0\x2b\x9b\xb7\x17\x02\xf5\xef\xb9\x9d\x87\x18\xcb\
+\x6d\x24\xb4\x50\xad\x25\x26\x47\x29\x87\x7b\x22\x0b\x3f\xf3\xe2\
+\x2d\x96\xdb\x97\x59\x6e\x5d\xa2\xdd\x6e\x63\x4b\x81\x79\x25\x40\
+\x26\xe2\x6f\x0f\x52\x8d\xb4\x2e\x32\x6e\x1f\x95\xa6\x25\xbe\xa7\
+\xa7\x37\xb0\xe3\x9c\xd1\x64\x4a\xaf\x3f\x62\xe7\xf8\x31\x23\x2f\
+\xc6\x09\x2c\x6c\x2d\x95\x1c\xb2\xae\x8b\x00\x2e\xb3\x70\x19\xc0\
+\xe5\x63\x4f\x75\x80\x31\x6a\x2c\xfe\xf8\xd2\x3c\x3c\x18\xa4\x4c\
+\xb5\x75\xda\xee\x11\x6a\x78\xc4\x61\x3e\xcb\xec\xd3\x02\x4e\x94\
+\x90\x42\x0b\x84\x8f\x6b\xc3\x31\x50\x1b\xa1\x2a\x2b\xf5\x52\xd4\
+\x5e\x06\xb0\x9d\x66\xd8\x69\x86\x1e\x9e\xb3\xb1\x2a\xb2\x6f\x19\
+\xb8\x17\xd6\xe6\x16\x81\x20\x97\x2f\x9a\x22\xdb\x96\x46\x85\x69\
+\x71\xa2\x94\x5f\xdb\x75\x15\xae\x2d\x76\xb1\x2d\x8b\x4e\xd6\xe4\
+\x0b\x9f\xff\xe2\x5c\xe0\x96\x90\xa2\x84\x11\x6f\xbf\x29\x84\x07\
+\x1f\xef\xfc\x02\xfb\x0b\x2b\x1c\x8c\x7e\x19\x4f\xbf\x2e\x5c\x3a\
+\x4d\x93\x64\x30\x28\xe8\xb2\x73\x53\xd2\xe7\x94\x6a\xf2\x14\x33\
+\x73\x4c\xd3\x14\xac\x85\x25\x0a\xdd\xf1\xa9\xc7\x61\xfc\xd4\xdc\
+\x3c\xdc\x5b\x7b\x39\xe3\xe3\x3d\x54\xee\xf1\x63\x2f\x3f\xc5\xad\
+\x97\x3e\x8a\xbb\xfc\x31\x39\x82\x54\x06\xf2\xf1\x40\x60\xd0\x9d\
+\xfd\x0e\x59\x78\xc2\x19\x6b\xd8\x1d\x81\xa7\xcb\x06\x49\xb5\x71\
+\xe2\xf9\x95\x69\x72\x3f\xbd\x10\xd4\xe5\x73\xe2\xd8\xff\xd0\xa0\
+\x3e\x1e\xcc\x98\x8b\xc9\x51\x2a\x83\xbc\xdb\xb2\x58\x6e\xc6\xd4\
+\x17\x6b\xac\x6c\x26\x42\x4f\x1c\xa9\xc2\xc2\xb5\xd0\xf8\x96\xbe\
+\x10\xe5\x73\x79\x7f\xc0\xfe\x78\xca\xc9\xf1\x01\xb7\x1f\xee\xf3\
+\xfa\x07\x77\xb9\xfb\xc1\x07\x7c\xf7\xfe\x2e\x0f\x0e\x0f\xd8\x9d\
+\x84\x44\x64\x82\x9e\xa3\x7f\xa1\x39\x32\x0b\xd6\x99\x87\x85\xa7\
+\x8a\x2c\x5c\xfa\xb8\x95\x16\x5a\x67\xe1\xae\x84\x11\x1f\x76\x53\
+\x9b\x22\x70\xcd\x39\x6a\x54\x50\x6c\x7a\x18\xcd\xfb\x12\x6b\x28\
+\x85\x07\xb1\x27\xc9\x31\x3f\x56\x70\x4a\xf1\x4c\x91\x79\x4b\x5d\
+\xb1\x71\xce\xab\xb8\x2c\x0a\xcb\xc5\xe3\x61\x18\x91\x72\xb1\x19\
+\xe2\x54\x2e\xed\x21\x16\x5a\xa7\x58\xb4\x68\xc1\xb5\xe6\x0f\xf0\
+\xf1\x4e\xc2\xd6\xc6\x37\xd9\x79\x77\x02\x1f\x9d\xf2\xea\x9d\x2f\
+\x71\x27\xfb\x33\x00\x3e\xf6\xe2\x3d\xda\xc3\x9b\x5c\x7d\x41\xe7\
+\xd9\xcd\x97\x85\x01\x92\x9c\x30\x89\xf8\xce\x77\x1e\xb1\x5a\xdf\
+\x25\x5b\x58\xc2\x6e\xc0\xae\x1f\xb2\xe1\x58\x2c\x75\x8a\x00\x0d\
+\x23\x82\x7e\x8f\xb8\x63\x16\x89\x7a\x42\x4c\x9f\x28\x99\x51\x71\
+\x83\xb6\x45\xfe\xf8\xb6\xcc\xd0\x0b\xbd\x1a\x3d\xe0\xad\xbd\x1e\
+\x8d\xe5\xcb\xfc\xd0\x0b\x2a\x57\x3e\xf5\x0c\x2b\x1b\x47\xfc\xed\
+\xff\x73\x83\xbf\x7b\x5f\x83\xfc\x35\xba\x47\x45\x3b\xd7\xd1\xa8\
+\xaf\x68\xac\x58\x4b\x64\x85\x41\x8a\x1f\x34\x89\x07\x8f\x99\x1c\
+\xef\xd2\xcb\x4c\x32\x3f\x65\xcc\x14\xd7\xb1\xe8\x67\x03\xf4\xc0\
+\xc4\x75\x34\xa0\x4f\xe6\x37\x51\x9d\x4e\x11\xb4\x85\x13\x10\x53\
+\x5c\x3a\x78\x7e\x88\xeb\x5c\xd4\x36\x2c\xb7\x41\xb5\x34\x0e\xa6\
+\x8e\x5c\xed\xad\xe6\x23\x36\xaf\x3e\x45\xa3\x2b\x4e\xfc\x47\x7b\
+\x09\x56\x3a\x00\x06\xc5\xea\x62\x70\x6a\xe2\xb8\xaf\x0e\x68\x16\
+\x5a\x06\xe1\xe9\x51\x9c\x58\x51\x48\xa7\xd3\xa4\x5e\xd0\x96\x1d\
+\xd3\x22\xad\x17\x54\xe4\xb0\x8f\x47\x4e\xb3\x08\xde\x20\xd5\xb0\
+\x99\xd9\xc8\xba\x99\x2f\x83\x17\xd5\x21\x73\x1c\x86\xa3\x90\xe5\
+\x26\x8c\x6d\x81\xbb\x17\xac\x0d\x06\x1e\xd4\xd8\x97\xc1\x3c\xf0\
+\x56\xe4\x4e\x12\x80\x24\x73\xd0\x64\xe7\xae\xd0\x26\x17\x7c\xb3\
+\xf4\x27\x0e\xb1\xa4\xbd\x2a\x51\x02\x08\x97\xf4\xf3\x2a\xfa\xf2\
+\x72\x6b\x22\x96\xc8\xb4\xc6\x0d\xfc\x62\x75\x58\xc9\x1d\xfb\x85\
+\x49\x77\x79\xa4\x32\x2c\x5a\xf5\xa8\x28\x67\xec\xac\x88\xd9\x65\
+\x1f\x70\x8d\x3a\xff\xd5\x47\x3f\xc2\xee\xf5\x67\x78\xe5\xe1\xfb\
+\xfc\xf4\xed\xaf\xf0\xbc\xfa\xb7\x02\x37\x0d\x6f\xf2\x85\xcf\x7f\
+\x91\xd6\xca\x2d\xd6\xeb\xcb\x72\xd4\xdf\x2a\x0b\x52\x33\xa4\x7e\
+\xf3\x19\x0e\xef\xbf\x0f\x27\x3a\x6b\xdd\x26\xd7\xcc\x70\x6e\xa8\
+\x54\xb5\x72\x74\x4b\x74\x97\xc4\x89\xd9\x21\xf2\x32\xfa\xb1\xc5\
+\x52\x57\xe7\x23\x2f\x75\x69\x3f\x7d\x99\x77\x6e\xff\x07\xb6\x5e\
+\x7f\x0f\xff\xd1\xee\xec\xd2\xed\xc1\xfb\x6f\xde\xe3\x6b\x03\x8f\
+\x1f\xfc\xcf\xee\xf3\xc9\x4f\x7c\x9a\xab\xbf\xf4\x73\xdc\x7a\xe7\
+\x36\x6f\xbc\x7a\x1d\x9f\xf7\x71\x8e\x37\x50\x96\x0d\x89\x9b\xc5\
+\x7f\x77\x24\xfd\x8b\x7b\x99\x89\xe7\x87\xc4\x4e\x0d\xc3\x17\x99\
+\xb8\xe3\xe4\x78\x45\x56\x6e\xd0\x44\x75\x46\x32\x90\xc7\x84\xb8\
+\x95\x2c\xd1\xa0\x46\x8f\x94\x2e\x33\x2d\x71\x95\x1b\x06\x0b\x56\
+\x80\xbb\x22\x6b\x5f\xbf\x76\x8b\x2b\x37\xaf\x73\xe9\xc6\x66\x31\
+\xc2\x50\x38\x3e\x15\xff\x4b\xbd\x48\x4c\x5d\x20\x9d\xb6\xd0\x6a\
+\x43\x3a\x99\x22\x18\x08\x33\x93\xc5\x5b\x75\x25\x18\x64\xf4\x51\
+\x51\xa2\x09\x4e\xcd\x94\x01\x0c\xa0\x7a\x0e\x74\x52\x19\xc0\x79\
+\x63\x8c\x37\x76\xc4\xe3\xc0\x41\xd7\x2d\x22\x1a\xa8\x81\x29\x33\
+\xf1\x8d\x4b\x06\x03\x6f\x1d\x06\xfb\xd8\x6d\xad\xc0\xc7\xf3\x58\
+\x58\x14\x85\xce\xdc\xf0\xa9\xdc\x63\x27\xc5\xec\x16\x28\xa1\x82\
+\x6a\x26\xb3\x82\xc8\x32\x71\xc2\x48\x76\xe4\xe2\x0a\x56\xd6\x42\
+\x05\x5f\x0d\xb0\xac\xfc\x82\x2d\xab\x66\x9a\xa4\x51\x24\x8f\x16\
+\x33\x75\x5c\x5a\xd1\x50\x94\x41\x1d\x86\x0a\x76\x9a\x0b\x89\x26\
+\x26\x53\x7d\x99\xe5\x16\x7c\xe1\x3a\x6c\x7d\xe3\x26\xbf\xf5\x78\
+\x99\x17\x6f\xbd\xc6\x8f\x7e\xe1\x5f\xb1\x79\x6b\x1d\x3b\x2a\xf6\
+\xdd\x45\x9c\x9b\xc1\x52\x58\x30\x15\xb2\x67\xae\x8a\xb3\xbc\x5b\
+\xc7\x2a\xf7\x89\x16\xda\x08\xcb\x34\xcf\x95\x7c\x39\xb0\x80\xdb\
+\x1f\x01\x36\x86\xe2\x89\xa5\x8f\x4f\xe2\x7d\x95\x26\xbd\xe1\x88\
+\x3f\x7e\x4b\x8c\xee\x7b\x67\x47\x18\xcb\x9f\xe3\xc7\xaf\x2d\xf2\
+\x89\x8d\x0e\xdb\x7b\x1d\x8e\x0f\x0e\x51\xc3\x23\x1e\xaa\x22\xd3\
+\xe4\x47\x2a\x0f\x0f\x22\x26\xc7\xbb\x9c\x8e\x0c\xc6\x14\x12\x4b\
+\x5f\x1c\x5d\x27\xc2\x2b\x24\xaa\xe2\x3e\xb8\x88\xe0\x6d\xf8\xb5\
+\x27\x66\xdd\x6e\x65\x4f\x5c\x2f\xef\xb1\x0c\xac\xac\x3e\x87\x6d\
+\x8f\xb8\xb6\xbe\xce\xa3\xfb\x0f\xe8\xf5\x15\xbe\xf8\x99\x0e\x37\
+\x57\x72\xdc\xee\x0a\x0b\x56\x9d\x34\xb7\x30\xea\x1d\xb4\x49\x84\
+\x55\x0c\xd5\x96\x59\x55\x9b\x44\x60\x4e\x49\x8b\xd7\xc5\x7b\xa6\
+\x0a\x0b\x40\x2d\x9d\x33\x53\xa1\x92\xe6\x3c\x35\xa7\x59\xb0\x18\
+\x49\x12\xe2\xdb\x21\x76\x92\xd2\x47\xa3\xab\x6a\xe4\x5e\x8e\xa7\
+\xce\xe0\xc5\xf9\x9b\xcc\xc4\x45\x81\x57\xb2\x14\xab\x4a\x32\x27\
+\xdf\xd4\x82\x96\x1c\x46\x4d\xed\x14\x83\x27\x6c\x14\xbd\x70\xb3\
+\x4c\x39\xae\x54\xbe\x65\x9a\x55\x32\x17\x8a\x1c\xeb\x11\x2e\x98\
+\x79\xa5\xbd\x6c\x49\x09\x67\xd9\x6e\x0e\x0b\xef\x8a\x92\x97\x4e\
+\x2b\x30\x26\x2c\x27\xac\xe3\x09\xf6\x48\x63\x94\xa7\xe8\x76\x82\
+\x6d\xd4\xd9\xcb\x6a\x74\x9e\xdd\x42\x7b\xa8\x70\x9c\xff\x2c\x97\
+\x17\x4d\x16\xc8\xc0\x9c\x59\xbf\x5a\x91\x22\x8a\xd2\xb2\x33\x17\
+\x28\xa8\x5a\x83\xfa\xa4\x47\xd4\x1f\x48\x08\x24\x3b\x75\x4f\x5a\
+\x8a\x16\xf6\x19\x8d\x43\x9a\x45\x76\x4e\xc7\x27\x6c\x6f\xdd\xe3\
+\xdd\xf7\x1e\xe3\x9a\xf3\x05\x54\xb7\x65\xf1\xa8\x77\xc4\x1f\xbf\
+\xf5\x88\x3f\x7e\xeb\x11\x1f\x7f\xe6\x11\xef\xdf\x5a\xe6\xe6\xa6\
+\x8d\xaa\x7d\x9a\xcb\xf9\x1e\xf7\x07\x0a\x0c\x0e\xd9\xcd\x60\xf2\
+\x68\x97\xe3\x01\x78\x7e\x8e\xeb\x8c\xc0\x37\x49\xec\x09\xf9\x28\
+\xc7\xd0\x4d\x19\xc0\x02\x1f\x8b\xfb\xfd\x6c\x40\xc7\x69\x8b\x23\
+\x6d\x09\x21\x24\x04\xa9\x24\x8c\xae\x1a\xf1\xe9\x85\x15\x8c\xb5\
+\x16\x76\xbb\xcb\x83\xc7\x31\x2b\x16\x1c\x76\x72\x1a\xcb\x97\x49\
+\xcd\xab\x74\xac\x19\x3c\x88\x27\x3d\xb4\xca\xb8\xbe\x36\x11\xc2\
+\x1a\x0d\x5b\x14\xee\x93\xf3\xdb\xa9\x32\xce\x39\x6c\x8b\x91\xa6\
+\x89\x38\x09\x95\x68\x02\x8d\x99\x78\x9e\x54\x58\x5d\xe1\xd6\x18\
+\x91\x92\xbb\x0a\xc5\x8c\xa9\xcc\xce\x42\xe0\x3e\x9f\x89\xcb\xcc\
+\x5b\xf2\xc5\x2d\xb6\x67\xed\xe5\x00\x1a\xc5\x74\x88\x9c\x12\x29\
+\x8a\x3c\xdd\x2a\x27\x94\xad\x52\xe7\x10\xce\x63\xe4\x48\xd0\x68\
+\x46\x45\x7d\xe6\x44\x96\x5c\x18\x63\xa7\x19\x9e\xa3\x14\x7b\x3f\
+\x66\x25\x93\x53\x1d\x5f\x2a\xe6\xed\xca\xad\x19\x56\x14\x51\x6e\
+\x75\x88\xc2\x10\x2b\x35\x45\x00\x17\x2e\x3b\x4d\x25\x23\x34\x73\
+\xea\x96\xc5\xb3\x5a\xc4\xfd\xad\x9f\x27\xdf\x3c\xe6\x27\xba\x75\
+\x0c\xb3\x0f\x74\xa4\x5b\x50\xd5\x2e\x36\x2c\x32\x31\x40\x43\x09\
+\xa1\xd3\x91\x85\x80\x45\x58\x08\x93\x8a\x1d\xd1\x61\xb9\xca\x61\
+\x16\x0c\x4a\xab\xce\x58\xab\x95\x12\x3c\xf2\xe3\x18\xd7\x3c\x94\
+\x4d\x85\xf2\x76\x3a\x32\x68\xb5\x5b\xe0\x41\x2f\x85\xbf\xb9\xf3\
+\x88\xb7\xf6\xca\xae\xd9\x43\xd9\x70\xe8\x65\xe1\x5c\x80\xba\xf9\
+\x2c\xe3\xea\x41\x5d\x2e\x2c\x8a\x93\x08\xa3\xb0\x53\x4d\xec\x09\
+\x7a\x50\xa7\xa3\xb6\x0b\x9c\x5c\x27\x23\x95\xb8\xb9\x85\x5b\x64\
+\x66\xf1\x3e\x74\xd5\x08\xa3\x69\xd2\xb0\x2f\x71\x65\x25\x07\x12\
+\x82\x9a\xca\xdf\x85\xd0\x6d\xde\xe0\xc5\xce\x2a\x37\x37\x0d\x1c\
+\x7d\x4c\x4e\x1d\x3d\x50\xd1\xed\x4c\x14\x74\x72\x99\xa4\x2d\xbb\
+\x60\xe7\xe7\xd8\x6c\xad\x4e\x50\xbc\xa7\xd5\x2c\x2c\xda\xd2\x16\
+\x03\x90\x70\xa2\xba\x85\xb4\x67\xe7\x98\x05\x3e\xee\x78\x39\xfd\
+\x4c\xbc\xe6\xa9\x0e\x49\x12\xa2\x05\xb3\xac\x3c\x3e\xf5\x18\x58\
+\xcf\x4a\x0c\x1c\x0c\x52\xda\xed\x23\x0e\x07\x3a\x3f\xa6\x05\x24\
+\x99\xf3\x44\x48\x21\xdb\xce\x8a\x1f\x40\xa4\xe3\xfa\x79\xe1\x9f\
+\x36\x7f\x4b\x09\x65\x03\x40\x2b\x98\x85\x12\x0a\xd8\x46\x5d\xfa\
+\x53\xa4\x17\xa4\x9a\x4f\x30\x9e\xaa\x70\xb4\xae\x9f\xa3\xf8\x39\
+\x56\x6a\x12\x6a\x11\x4a\x49\xbb\x35\x0d\x68\x1a\x58\xa9\xc9\xc4\
+\x0f\x09\xb1\xb9\x7a\x45\xe7\x85\xee\x9f\x8a\x4b\xb0\xb2\x36\xe7\
+\x16\x54\xde\x0f\x2b\x98\x37\x4b\xc7\x60\x89\x25\x07\x96\x69\xd2\
+\x31\x4d\x30\x3b\x73\x3c\x38\x96\x39\xa3\x11\x73\xf1\x77\xbb\xae\
+\x8d\x6a\x07\x9c\x45\x19\xbd\xdb\x03\x76\x46\xce\x05\x2a\x6b\xe0\
+\x88\xa2\xcd\xf3\x4d\x3c\xe3\x59\xba\xed\x0e\x69\x7b\x83\xde\x00\
+\x86\x83\x21\x77\xdf\x7a\xc8\xab\x6f\x3d\xe2\xf5\x87\x87\xf4\x06\
+\x02\x1e\xc8\x2c\xab\xcc\x02\x35\x4e\x22\xe2\x24\x2a\xf8\x6d\x13\
+\x37\x8f\x64\x70\x27\xf6\x44\x64\x60\x35\xc7\x75\x2c\xc6\x4c\xf1\
+\xfc\x90\x56\xe0\x56\x58\x8a\x59\x00\x7f\x7a\xa1\xcd\xf2\x52\x01\
+\xcf\xcc\xab\x92\x27\xde\xbc\xa6\x61\x6e\xde\x90\xfa\xe1\x34\x6f\
+\xa0\xdb\x99\x18\x0e\xb5\x33\xf4\x40\x9d\x9b\x59\x33\x2f\x4c\x14\
+\xdb\x04\xe9\x64\xae\xb9\x71\xfe\x96\x9b\x75\xfc\x69\x34\x37\x01\
+\x22\xdc\x2b\x6d\xec\x20\x2c\xae\x2a\xb3\xf4\xe6\x66\x42\x5c\x94\
+\xda\xb3\x9f\x56\x2e\x65\x2f\xa9\xb6\xea\xed\x30\xb5\xd1\x55\x1f\
+\x37\xf3\x19\x91\x4a\x0d\x45\x49\xb5\x8d\xfd\x18\x5d\xec\xd0\x98\
+\x10\xc4\x00\x13\xd1\x75\x2b\x60\x82\x53\x66\xd1\xca\xf8\x52\x89\
+\x85\xd3\xc2\x38\x5b\xc2\x85\x62\x1c\xdf\x2a\xee\x5b\x55\xc6\xa0\
+\xc2\x4c\xa4\x73\x6b\x09\x98\x1b\x22\x0d\xac\xc9\xec\x22\x37\x8a\
+\x09\x3b\x29\x9d\xa2\xc3\x77\xd4\xff\x4f\xa1\x53\x4a\x39\x43\xc2\
+\xc2\x26\x40\x40\x89\x19\x33\x21\xbc\x36\x8b\x8c\x62\xe6\xf4\xfb\
+\x03\xa9\xb6\xd3\x0a\xcd\x44\x29\x3e\xc2\x2a\x1d\x3d\x33\xc6\xa1\
+\x45\x03\x11\xf0\x47\xe3\x87\xc2\xae\xea\xf4\x8d\x0f\xc5\xa2\xb1\
+\x53\xa3\xcb\x7b\xe2\xf2\xe7\x37\x41\x2f\xd8\x84\x36\xb4\x80\x1e\
+\x29\x86\x3f\xc5\xf3\x9f\xf0\x8f\x2f\x60\x44\x35\x0b\x97\x01\x5e\
+\xc5\xc7\x5e\x91\x0e\x5c\x27\x2a\x8a\xbc\xb2\xd8\xd3\x8a\x4c\x6c\
+\xb1\xd6\x5d\xa2\x61\x77\xa8\xaf\x2e\xc8\xb1\x7c\x50\x58\xeb\x2e\
+\xcd\x35\x37\xce\x27\x94\xa4\x08\xe0\xf3\x9b\x57\xab\x33\x6c\x60\
+\x4b\x49\xe6\x93\x6e\x65\x61\x57\xcd\xce\xba\x6e\x61\xc7\x62\x0d\
+\x46\x99\x8d\xd7\x8d\xa9\xcc\xc0\x9e\xee\xc8\x79\xb9\xb3\x22\x9e\
+\xce\xef\xad\xb6\xdb\x1a\xc1\x20\x65\x55\x49\xa4\x8a\xad\x6c\x63\
+\xa7\xa4\xa8\xbe\x4f\xe6\x38\x32\x90\xd5\xb2\x55\x2c\x47\xd6\xcb\
+\x82\x26\x0a\x45\xa6\x2c\x2d\x58\x4b\x21\xbb\x29\xba\x73\x8e\xa4\
+\xd3\x84\xd9\xb6\x2c\xd0\x2a\x19\xb2\x0c\x5a\x2b\x52\xb0\xa2\x08\
+\xfb\x34\x94\x43\x98\xaa\xe2\x10\x68\x2a\xb9\x23\xcc\xae\xcb\x6c\
+\x1c\xc4\x93\xb9\xe5\x34\x61\x91\x2d\x57\x3a\xff\x9e\xb5\xcd\x87\
+\x52\xca\x59\x9e\x24\xe5\xb6\xd1\xb4\x82\x75\xad\x64\x22\x03\x35\
+\x26\x60\x74\x16\x72\xb6\x17\xe1\xf7\xfb\x78\xfd\x03\xa2\x28\x62\
+\x2f\x88\xe8\x13\x32\xee\x4f\x88\x22\x85\x2c\x1d\x33\x0e\x22\xa2\
+\xfe\x80\x47\x7b\x3e\xf9\x71\x7c\xa1\xdd\x5b\x75\xb9\xec\xa2\x91\
+\xf9\x4d\xf0\x40\x75\x46\xa8\xf9\x88\xcc\x4f\xf1\xfc\x50\x06\x70\
+\x99\x5d\x65\x51\x98\x1c\x3f\x59\x1f\x9b\x44\x17\x30\xb1\xeb\x44\
+\x73\x59\xbc\x2c\x06\xcb\xf0\xe9\xaa\x16\x57\xd6\x2c\x36\x94\x58\
+\x66\xe1\xd5\x8a\x66\xe2\xfa\x35\xd1\xdc\xb8\xb4\xbe\x8c\x65\xd5\
+\x45\x16\x0e\xc4\xba\x86\x24\x88\xd0\x6d\x93\xa4\x92\x8d\xa3\x39\
+\x18\x81\x84\x0f\x65\xfb\x39\x48\x27\x04\x86\x72\xa1\x39\x92\x9b\
+\x75\x9c\xda\xac\x4d\x5d\xe5\x89\xf5\x40\xc5\xd6\x52\x19\xc0\xe5\
+\xd8\x7f\xc9\xb1\x2c\xcc\xef\xdf\x9a\x5d\x07\x06\x22\x38\x0f\x73\
+\x7d\xe6\x8a\x59\xb4\xac\xcb\x2e\xa0\x9c\x76\x06\xd4\xb2\xf5\x8b\
+\x65\x8a\x0e\xdc\x39\x0b\xd4\x28\x0c\xa5\xc8\xa7\x0c\xd4\xb2\x79\
+\x51\xbe\x5e\x85\x1e\x56\xa4\x10\xa0\x16\xde\x6b\xa2\x71\xa2\xf8\
+\x81\xcc\xbe\x0b\xb9\xd8\xa3\x91\x36\xb2\x62\x0b\xa9\x60\x40\x72\
+\x6c\x49\xfd\xc8\x5f\xba\x02\x3f\x9e\x57\x1b\x1c\x6c\x5f\x97\xc1\
+\x29\x57\xe5\x56\x27\xb0\xab\xcd\x8c\x02\x22\xd8\x96\x45\x73\xbd\
+\xc7\x71\xfa\x06\xdf\xf7\xbe\x0a\xfa\x9b\x8c\x03\x85\x86\x2d\x4c\
+\x62\xfa\x39\x78\x9e\x90\x03\xb6\xfa\x23\x46\x67\x21\xc9\xde\x23\
+\xe2\xf0\x00\x2f\x5a\xc5\x68\xf5\x58\x5d\x5d\x92\xed\xe7\xd5\xd5\
+\xa5\x59\x57\xcc\xd1\xc0\xed\xe0\x45\xcf\x92\x29\x4d\x09\x15\x0c\
+\x7f\x2a\x03\x30\x4e\x22\x19\xbc\xaa\xbe\x4c\x9c\x44\x68\x0c\xe7\
+\x82\xb7\xcc\xca\x25\x6e\x4e\xec\x09\x78\x22\xa0\xdd\x3c\x9a\x73\
+\xdc\x15\xc1\xdc\xc1\x68\x9a\x28\xb5\x45\x1a\xf6\x25\xea\xab\x97\
+\x59\x1d\x45\x1c\x36\x4d\xc6\xc7\x29\x76\x5b\xc3\x5c\x5d\x67\xe9\
+\xa9\x45\xec\x92\x7a\x8c\x14\x92\xca\x25\x3c\x2a\x82\xcc\x53\xf3\
+\xb9\xbd\xd7\x65\x20\x27\x81\x3a\x17\xc0\xb6\x56\x97\xef\x6f\x55\
+\x57\x01\xe0\x4f\xa3\xbf\x37\x63\x97\x81\x5d\x16\x75\xe5\xe3\xb3\
+\xa2\x71\x33\x3e\xf5\x64\x16\xae\x76\xf0\xec\xb6\xc6\xaa\x16\xc8\
+\xef\xe1\xa9\x0e\x0d\x5b\x7c\x9f\xaa\x12\x4e\x8f\x8a\x0e\x9b\x9c\
+\xce\xb0\x2a\xc6\x29\x9a\x0a\x56\x77\xbe\x0d\x1d\x4e\x24\x37\x25\
+\x16\xd3\x98\x78\xc5\xc4\x47\xc7\x34\xf1\xa3\x90\x7a\xd1\xcc\xa8\
+\x0f\x8e\x50\x8a\x3d\x64\x81\x95\xa1\x98\x39\x5b\x96\x85\x43\x26\
+\xa8\xae\x28\x92\xd8\x59\x29\xb7\x29\x99\x39\xa3\xde\x08\xa5\xdb\
+\x04\x84\xcb\xbc\xae\x3e\xc7\x78\x75\xc2\x33\x4b\x0f\x81\x2f\x14\
+\xdb\x94\x94\x73\xeb\xc1\x22\x89\xc6\x75\xd3\x82\xa8\x47\xdf\xdc\
+\xe7\xdd\xdd\x3f\x83\xf4\x35\x00\xde\xef\x89\xbf\xf1\xb9\xa5\xcf\
+\x22\xfc\xf5\x2c\x3a\xb6\x49\x98\x5b\xdc\xed\x8f\x21\xab\x73\x7c\
+\xf8\x16\xc3\xe4\x16\xf0\x80\x9b\x2b\x87\xb2\x95\x6c\x58\x6b\xac\
+\x71\x20\x0d\x00\x0f\x8a\x6e\x82\x72\xe6\xd3\x48\xf6\x64\xa6\x2c\
+\x31\x6d\x6f\x00\xdd\x36\x68\x83\x21\x29\x2d\xd2\x4a\xf1\x56\x3e\
+\x2e\x03\xb8\x84\x14\x71\x12\x41\x1b\x0a\xef\x6b\x12\x7b\x82\x17\
+\x08\x26\xa3\x15\xd4\xc8\xfc\x1a\x6e\x3e\xa2\xab\x2a\xac\x3a\x16\
+\xd7\x36\x35\x16\xb4\x36\x93\xc3\x3d\x0e\x57\x2f\xcb\x69\x88\x35\
+\x33\xc1\x59\xde\xc7\xb4\xae\x91\xb2\xc0\x70\xd8\xc2\x69\x0e\xd0\
+\xbc\x13\x52\x77\xe6\xdd\x90\xd8\xe0\x06\x2a\x04\xc5\xff\xd6\x36\
+\x99\xd9\xbb\x22\x03\x53\xf0\xbf\xa9\x74\xcd\xbc\xe4\x19\xf8\xae\
+\xc8\xd4\x83\x82\x27\x16\x81\x6d\xcb\xe2\x2f\x09\x22\x9a\xe4\xc2\
+\x80\xbb\xd0\x58\xf4\x93\x10\x5d\x9d\xf1\xcd\x79\xbf\x28\xc2\x17\
+\x5d\xa6\xda\x3a\x67\xe1\x2e\xab\x35\x75\x2e\xa0\x0f\x53\x9b\x85\
+\x51\xb1\x6a\xb7\xe0\x99\x1b\x8e\x03\xc1\x0c\x17\xab\x06\xa1\x98\
+\xce\xc0\x22\x0e\x15\xfa\x05\x4e\x09\x34\x55\x72\xc3\xe5\xe4\x72\
+\x75\x49\xa2\x16\x2a\xf2\xd2\xaf\x87\x82\x9a\xb2\xa2\x08\xd7\xcf\
+\xd1\xc3\x10\xe5\x60\xca\xe9\x78\x91\xbc\xf7\x50\x16\x81\x66\xa7\
+\x23\x9c\x30\x9f\xd0\x02\x2e\x0b\x44\xd3\xb2\xb8\xb4\x7e\x95\xc4\
+\xb2\xa4\xa6\xe1\xda\xe5\x90\x56\xf0\xf3\x1c\x6c\x5f\x17\x2a\xb5\
+\x48\xe1\x71\xd8\xe3\x9d\xed\xbf\xe4\xfb\x93\x2d\xfc\xa8\x3f\xd7\
+\x8a\xf4\x92\x8c\x1d\xf5\x88\x77\xb7\xfe\x07\xde\x3f\x79\x55\x06\
+\xaf\xbc\x64\x27\x19\x53\x42\x82\xa8\x47\x18\xf6\xa1\xd0\x8f\x1c\
+\x9d\x9e\x31\x7a\x0c\xde\xf1\xdb\x73\x1a\x61\x63\xc5\x94\x73\x74\
+\x6b\x35\x4b\xb6\x8c\x95\x33\x5f\x52\x5e\x73\xf4\x53\x50\xa7\xab\
+\x41\x6f\x20\x02\xf6\x49\xb0\x41\x14\xca\xc3\x39\x66\x42\x69\x2a\
+\xf4\x33\x05\x75\x34\x00\xb7\x60\x30\x98\x1d\xc7\x4c\xe9\xb6\x2c\
+\x8c\xa6\xc9\x95\x7a\x8b\xfa\x69\x93\x83\x74\x47\x66\xe2\xea\x6d\
+\xa9\x75\x93\xd5\x85\x18\x27\xf6\x69\xeb\x23\xb9\xba\xa1\x84\x0f\
+\x26\xd0\x0d\xce\xd9\xd8\x06\x62\x61\xa2\x5d\x3e\xef\x09\x61\x8f\
+\x1d\x84\x22\x48\xbd\x29\x76\x6f\x82\x4f\x82\x3a\x39\x12\xc1\x3d\
+\x6e\x90\xa7\x9e\xc4\xd8\xd5\xa6\xc7\x79\x46\x63\x3e\x33\x8f\x59\
+\xec\xb4\x65\x26\x06\x61\x81\xf0\x24\x58\xa1\x36\x05\x84\x28\x33\
+\xf1\x38\x10\x22\x7b\xd5\xf7\x05\x3b\x11\x63\xc9\x81\x4f\x2c\x93\
+\xe6\x13\xd8\x89\xaa\x07\x9b\x55\xc2\x0f\xc1\x42\x91\x04\x3a\x56\
+\x2a\x2a\xfd\xb0\x1f\x31\x1a\xa6\x58\x7d\x8d\xe3\xbc\x4f\x53\xc9\
+\x88\x6e\x6c\xca\xc5\x8c\x73\xad\x67\x33\x2f\x4c\xb4\xc5\xd1\xb2\
+\x04\xcd\x56\x62\xe0\x52\x34\x5f\x42\x99\xa1\xfd\x9b\x22\x10\xa2\
+\x0e\x29\x21\x5b\x8f\xbf\xcb\x1f\xde\xfe\xb7\x7c\xf3\xce\x7f\xcf\
+\x7b\xdb\xaf\xe2\x85\x33\x06\x21\x1f\x4e\x38\x39\xfe\xd3\xb9\xe0\
+\xad\xde\x37\xf5\x08\xb3\xd3\xc6\xe9\x74\xb0\x3a\xe2\x32\xd9\x31\
+\x42\x76\xa3\x43\xb1\x5e\xab\xd5\x9b\x5b\x49\x50\xfa\x0f\x67\xe1\
+\x89\x14\xed\x94\x01\x3c\xb4\x3d\xdc\x7c\xc6\x34\x94\xc7\x5e\x3a\
+\x1f\xac\x4f\xba\x95\x01\x5e\x32\x15\xf9\x28\xa7\xa3\xe6\xa8\xfa\
+\xf2\x1c\x35\x57\xb6\x8f\xdd\x5c\xb0\x11\x6b\xdd\x25\xce\xda\x2e\
+\x93\xc5\x11\x6b\xda\x15\xc6\xc7\x29\x87\x85\xfc\x32\x18\xa4\xdc\
+\x3b\x78\xc4\x64\x6f\xc0\xe5\xf6\x0d\x6a\xed\x53\xc8\x66\x7c\x6b\
+\x9e\x7a\x12\x2e\x8c\x2a\x7b\x33\x66\xcf\x47\x8c\x50\x64\x20\x27\
+\x41\xc4\x70\xe0\x11\x1f\xf8\x0c\x07\x1e\xc3\x81\xc7\xe8\x6c\x9b\
+\xfe\x63\x83\x24\x88\x38\x53\x4f\x18\x8c\x12\xf2\xc1\xa8\x08\x76\
+\x4d\xb2\x12\x81\x9d\xcf\x69\x2a\x3a\x6a\x3a\x87\x99\x8f\xb3\xf9\
+\x93\x48\xee\xa8\xae\xdc\xaa\x70\xa2\x84\x11\x25\x53\xe1\xa9\x8e\
+\xb0\xb1\x32\x08\xe5\xe8\xbd\xc1\x6c\x4c\x47\x21\x90\x10\x22\xaa\
+\xd0\x66\xe5\x06\x24\x2c\x13\xc7\xb4\xd0\xed\x44\x70\xbc\xe9\xfc\
+\x2f\xe0\xda\x2d\xd4\x56\x87\xdc\x12\x70\x22\xd4\x22\x29\x34\xaa\
+\x1a\x4b\x95\x38\xdb\x27\xc4\x2a\xb4\x0d\x61\x18\x11\x86\x82\x4b\
+\xb6\x2c\x93\x38\x9a\x15\x00\x86\xd9\xe7\xbd\xed\x57\xb9\x7d\xfa\
+\x15\xa1\x05\xd8\x4f\xb8\x7d\xfa\x15\xee\x9e\xfc\x2e\x3b\x93\xad\
+\x42\xfa\xf8\x06\xef\x9f\xbc\xfa\xa1\x18\xcd\x30\xfb\x95\x6a\xdd\
+\x22\xc2\xe2\x74\x30\x60\xc3\x5c\x2d\x34\x9f\x5d\x28\xda\xb8\x07\
+\xd3\x90\x83\x69\xc8\xfe\xbd\x23\xee\xef\x85\x73\xc5\xd5\x98\x29\
+\x7a\x50\xc7\x53\xcc\x19\x1c\x28\x82\x52\x63\x38\x07\x1f\x3e\x2c\
+\x90\x65\xa1\xa8\x21\xb3\x77\x19\xd4\x55\x1a\xae\x6c\xb2\xac\x3a\
+\x0a\x1f\x69\x74\x58\x6e\xc6\xac\x69\x57\xd0\x33\x31\x6c\x3a\x39\
+\xdc\x93\x9f\xf7\x68\x3b\xe5\x7f\xfc\x3f\xfe\x6f\xfe\xe8\xab\xbf\
+\xc3\x5a\x57\x5c\xa5\x9c\xe4\x54\x0c\x85\x7a\x39\x79\xea\x89\x8f\
+\xc1\x48\x7c\xa4\x9e\x78\xbe\x7c\x3c\x18\x31\x4c\x7d\x46\x28\x34\
+\xc9\xe5\xd8\x51\xab\xed\x16\xc5\xee\xa2\xc4\xc2\x6a\x14\x63\xb0\
+\x28\x5f\x8b\xbd\x93\x4a\x16\xae\xcf\x4d\x48\x97\x54\x5b\x19\xd8\
+\xba\x3a\xdf\x44\x3a\x9f\x89\xed\xb6\xc6\x59\xc7\x44\x2f\x78\xe2\
+\xb2\xa0\x2b\x27\xa7\xdd\xcc\x17\x23\xfb\xf1\x39\xf2\x45\x0b\x15\
+\xcc\x62\x3a\xa3\x1c\x10\x35\x08\xe9\x17\xa3\xf9\x17\x6e\xc5\x42\
+\xc6\xc0\xb1\xc5\x0a\xad\xae\x41\xb0\xd6\x82\x4e\x07\xbf\x58\x38\
+\x5e\x2e\x61\xec\x17\xcd\x94\xf4\x1c\xe3\x21\x99\x0d\x98\xe3\xaa\
+\xa5\x9a\xce\xb2\x68\x05\x3f\xcf\xd0\xfe\x4d\x3c\x7f\x55\x06\x6f\
+\x79\x7b\x6f\x38\xe6\xfd\x93\x57\x19\x1e\xdd\x63\x67\xb2\xc5\xd6\
+\x4e\x32\xf7\xfa\x05\x36\x20\xea\xcc\xf1\xca\x7a\xa7\x49\x72\xea\
+\x32\xda\x9f\x59\xb7\x32\xec\x4a\xfb\x56\xe5\xcc\x67\xe0\x88\xe0\
+\xea\x0d\xfa\x92\xa7\x6d\x30\x6b\x09\x97\x4c\x44\x57\x9b\x65\xd9\
+\x38\x89\x18\x28\xf9\x85\x40\x2e\x9f\xab\x06\x70\x2f\x85\x61\x3a\
+\x9c\x2b\xf4\xca\xa3\x9b\x47\x74\x5b\x16\xd7\x5b\x1e\x57\xea\x2d\
+\x26\x8b\x23\x09\x25\x76\x72\xc1\xa2\xd4\x57\x2f\xcf\x7d\xcf\xfb\
+\x5b\x11\xaf\xff\xc6\x9f\xf1\x27\xbf\xfd\x7d\x8c\x56\x46\x9e\x77\
+\xc9\x07\x23\xc6\x76\x0d\xbc\x5c\x7c\x80\x98\x60\xf6\xf2\xd9\x24\
+\xb3\x5d\x34\x7b\x8a\xd7\xcb\x40\x6e\xb5\x5d\x70\x6b\xb4\x36\x16\
+\x38\x53\x33\x5a\x6d\x17\xa7\xb6\x8a\xd5\x71\x49\xdc\x06\x7a\x4f\
+\xb4\xe4\x5a\x9a\x43\x60\x5b\xb3\xc9\x8f\x0f\x29\xf4\xb4\x40\x23\
+\xc9\xba\x12\x13\x97\x38\xb8\x9a\x8d\x83\x41\x4a\xbd\x7f\x89\x44\
+\xf5\xe7\x98\x8d\x5e\x52\xe1\x2d\x47\x0a\xba\x59\x76\xa3\xc3\x88\
+\x18\x05\x2d\x0a\x49\x02\x5d\xb4\x7d\x43\x55\x58\x3f\x15\x7b\xe8\
+\x64\xfe\x54\x02\xc1\x2f\x16\x63\xfd\x3d\xec\x02\x8e\x88\xa0\xec\
+\x17\xcb\x5c\x3a\x45\x9f\x3b\x04\x52\xcb\x22\xe9\x0b\xa1\x91\x63\
+\xe5\x85\x6e\x19\xe9\x3e\x24\x79\x64\xb2\x42\x46\x54\x6a\x76\xcc\
+\xd9\x04\x09\xc2\x27\x78\x6b\x67\x3e\x40\x9f\x6d\x35\x78\x6f\x38\
+\x06\xbe\xc2\x0b\xfc\x02\x5b\x5b\xdf\x84\x96\x08\xf4\x6b\xeb\x17\
+\x3b\xeb\x7b\xa7\x11\x8b\x49\x0f\x55\x6b\xd0\x98\x4c\x79\xe4\x3f\
+\xe4\xd1\xfd\x77\x8a\xe5\x8a\xd0\x67\xb6\xf5\xb3\xf9\xa1\xce\xa2\
+\x00\x00\x20\x00\x49\x44\x41\x54\xcf\x1a\x9b\x3f\xb4\xc9\x95\xe3\
+\x98\x38\x3c\xe0\xee\x23\x9d\x31\xe0\x72\x28\xcd\xfc\x44\x37\x6d\
+\x02\xa3\x7c\x0e\x46\x9c\xc7\xbf\x29\x2d\x06\x4a\x4e\x3b\x9f\xbf\
+\x8c\xf6\xd2\xd9\xeb\x55\x48\x12\x27\x11\x5d\x8d\x82\xf9\x88\x49\
+\x1a\x62\x9a\xf2\x78\x64\xb0\x10\x3c\x46\xc7\xa4\x7e\xda\x84\x65\
+\x18\x1f\xa7\x34\x96\x35\x29\xd4\x87\x7b\xfc\xd1\xde\x19\xfe\xd7\
+\xfe\x98\x6b\x4f\xdf\xc2\x5d\x54\xa1\x09\x8d\x51\x07\x5c\x05\x45\
+\x73\xc9\x53\x4f\x64\xe7\x36\xa2\x08\x5b\xcb\x59\x0b\x14\x46\x45\
+\x07\xae\xcc\xd0\x07\x76\x8d\x86\x16\xe3\x8f\x1d\xdc\x4c\xa1\xd5\
+\x76\x19\xa6\x3e\x8a\xa6\x30\x0e\x23\x16\xac\xc7\x64\xdd\x0d\xa0\
+\xf7\xa1\x38\xb8\xda\xae\x2e\xa7\x3e\xf4\xa0\x27\x31\xf1\x74\xe3\
+\x59\x59\xd8\x55\x6f\x0e\x3b\xc0\x75\x92\x24\x44\xd1\x5b\x24\xc9\
+\x2c\xa0\x3d\xd5\x99\x37\x4f\x31\x81\xa4\xd8\xf3\xac\xdb\x89\x64\
+\x14\x88\xc2\x79\x5f\x89\x73\x78\x19\x20\x33\x67\xff\x94\x7e\x14\
+\x51\x37\x33\xea\xa5\x1d\x7d\x81\x7b\x35\x2c\xb9\x0f\x3a\xec\x47\
+\x72\xa8\xb4\xc4\xbf\x5a\xa8\x08\x0e\x38\x8c\x24\xa4\x98\x1b\xa8\
+\xdc\x7c\x88\x77\xf7\xe7\x48\xb2\x77\x49\x86\xbf\x07\x20\x03\xf4\
+\xd1\x7e\x22\x03\x79\x6b\x27\x61\xd0\xba\x3f\xbb\xb4\x3e\x21\x23\
+\x5f\x5e\x34\x51\xb5\x06\x1d\x05\x46\x63\xbf\x22\xfa\x3f\x60\x7b\
+\xf8\x00\xff\xd1\x2e\xdb\xc3\x07\xbc\xf5\x78\x9b\x38\x3c\x60\x5d\
+\xd7\xf9\xdc\x67\x9e\xe2\xd6\x17\x7e\x94\x9f\xf8\xb1\x4d\x9e\x7b\
+\xf6\xd2\x1c\xd5\x56\x16\x5f\x55\xaa\x4c\x63\xc8\x40\xc9\x59\xc8\
+\x47\x0c\x94\x5c\x06\xe8\xf9\x00\xae\x06\xf8\x93\x20\x47\xa6\x34\
+\x59\x6c\xc6\x5c\x59\x13\x19\x7f\x67\x32\xfb\x9c\xe3\x91\xc1\x64\
+\x71\x84\x9e\x1d\x62\x5f\x3e\x65\x7c\x3c\x0b\x9e\x9b\x9b\xd7\x71\
+\x17\x37\x79\x63\x47\xe7\x95\x3f\xfa\x6d\xe8\x17\xfc\x7d\x77\x8a\
+\xa2\xb9\x24\x76\x86\xa2\xb9\x45\x07\x4f\x64\xdc\x24\x50\x8b\x2c\
+\x9a\xa1\x17\xaf\x1b\x6b\x0e\x4e\xcd\x44\xd1\x5c\x94\x68\x82\x3f\
+\x15\x18\xb9\xa5\x39\x78\x6a\x8e\x1a\xc5\xe4\x66\x9d\x8c\x1e\x81\
+\x9d\x4b\x03\x42\x89\xe5\x3d\xe7\x89\x74\x1b\x34\xe6\xd8\x89\x5a\
+\xba\x7f\x21\x80\x57\x95\x04\xbf\xb3\x39\xd3\x6a\x90\x0a\x96\xa2\
+\x80\x16\x49\x12\x8a\x4c\x5c\x95\x81\x39\x66\xb1\xe3\xc8\x2c\x3a\
+\x5c\x85\xc8\x47\xc3\x22\x0e\x23\x34\xcb\x9a\x2b\xf6\xca\x72\x6d\
+\x12\x05\xa5\x4e\x4c\x14\x86\x51\x50\x74\xc7\x66\x66\x24\x32\x53\
+\x47\xb3\x8e\x1c\x56\x86\x92\xd6\x09\xe2\x44\xb6\x8d\xe4\xe2\x46\
+\x39\x6d\x91\xe3\x14\x13\xd9\x49\xf2\x2a\xf0\x45\xf4\xd6\x97\x09\
+\xe3\x5f\xe5\x51\xc1\xc4\x5c\x5b\xd7\x79\x6f\x38\xe6\xd9\x56\x83\
+\xb7\xf6\xbf\xc2\xdb\x6f\xde\xe2\x63\x2f\xde\x9b\x0b\x74\x39\xab\
+\x95\x3f\x85\xdb\xe9\x60\x91\x11\x46\x0a\x9b\x37\xdb\x6c\xd2\xe6\
+\xf2\xa2\xc9\x4b\x67\x9f\xe2\x2c\x0f\x49\x0e\x07\x72\xed\xed\xf6\
+\xf0\x01\x93\x57\xef\xf2\xe8\xfe\x03\xae\xdd\xbc\xc1\xb5\x4f\xa9\
+\x2c\xbc\xf3\x14\xb7\x4f\x7a\xb0\x53\x71\xc3\x29\x34\x0f\xe5\xed\
+\x4c\x69\xa2\xa4\x1e\x67\x5a\x93\x85\x7c\x34\xc7\x52\x68\x0c\xe9\
+\x65\x0a\x2d\xb5\xf9\xa1\x01\x5c\xc2\x92\x6e\x33\x96\x33\x73\x92\
+\x2b\x3e\xde\x23\xa8\x2d\x62\x03\xb5\xd1\x63\x76\x9a\x97\xb8\xb2\
+\x03\x8d\x55\x0d\x8e\xc4\xc9\x78\xea\x9d\xb0\xe8\x2e\xd1\x1b\x8d\
+\x38\x7a\xbd\xcf\xdb\x1f\xf9\x16\x9f\xfc\xc9\x97\x60\x0c\x89\x9d\
+\x11\x45\x21\x4e\x31\xfe\x1e\x16\xa6\x7e\x4a\x34\xc1\x2c\x82\xda\
+\x84\x4a\x8b\x5a\x50\x72\x6b\xd4\x19\xa1\x90\x07\x53\x86\xa9\x8f\
+\x65\x37\xe8\x99\x06\x6e\xa6\x10\x14\x63\x4d\xea\xe4\x88\xac\x58\
+\x28\xa3\xeb\x16\x49\x31\x39\x5d\x35\xe3\x2e\x19\x6f\xa5\xa3\x5e\
+\xc8\xc4\x55\x6c\x5c\x4e\x76\x64\x23\x31\x0d\x9a\x24\x21\xa5\x53\
+\x4a\x13\x4d\xe4\xfd\x66\x5e\xf0\xc4\x72\x70\x31\x87\x50\x21\xb4\
+\x72\x0c\x59\xd0\x39\x18\x84\x84\x16\x72\x71\xf9\x6c\x1a\x4f\x3c\
+\x6e\x9e\xc3\xca\xa5\xdc\x32\x2e\x9c\x34\x4d\x29\xd5\x01\x8a\xac\
+\x1d\x10\x02\x2e\x81\x96\x60\x39\x3a\x61\x98\x14\x5d\xc0\x59\x6b\
+\x58\x37\x33\x32\x9a\xd4\x8a\xe0\x1b\xb4\x5e\x01\xbe\x48\x32\xfc\
+\x3d\xac\xac\xce\xb5\x75\x9d\x47\xfb\x02\xff\x3e\xbb\x2e\x32\xb1\
+\x45\x5d\x06\xf0\xf9\xdb\x33\x5d\x85\xd6\xca\x2d\x08\x1b\xf4\x95\
+\x00\xc2\x08\x6f\xff\xa8\x70\xfb\x11\x96\xfb\xc9\x24\x81\xe5\x7d\
+\x7e\x64\xfd\x69\xec\x8f\x76\xc9\xc6\xbf\xc4\x07\xdf\x7e\xc8\xdf\
+\xfe\xcd\x5f\xb1\xb7\x1f\xf2\x77\xbf\xe1\xb0\x6a\xbc\x22\xe9\xb6\
+\x83\x05\xc1\x54\xe8\x41\x1d\x37\x8f\x28\x4b\x15\x25\xf5\xc8\x35\
+\xf7\x42\x00\x0b\x38\xd1\xa2\xa5\xc2\x30\x1b\xa1\x07\x36\x0d\xe7\
+\x43\x8a\x3f\xb7\x03\x44\xc4\xa3\x88\xc3\x0a\xc4\x5a\x75\x14\xf2\
+\xe9\x29\x41\x7f\x91\x40\x69\xa2\x37\xcb\xe0\x4e\x4b\x89\xb8\xa0\
+\xfd\xbc\x13\x16\x9b\x37\x78\x5b\x39\xa0\x7b\xf0\x88\x6b\x0f\x6e\
+\xe1\x5c\x5b\x64\x1c\x8a\x55\xc0\x5e\x34\x9b\x7a\x51\x08\xc8\x4d\
+\x9b\x28\x0a\x30\x4d\x8b\x24\x50\x49\xec\x0c\x93\xa0\xa0\xcf\x54\
+\x02\xdb\xa4\x1d\x58\xf4\x19\xd1\xd2\x1c\x46\x41\x97\x66\x31\xf8\
+\x59\x76\xf7\xec\x69\x97\x32\xa3\xc9\xac\xeb\x4d\xb1\xcf\x65\xe8\
+\x71\x00\x49\xd6\x65\xb4\xbf\x3b\x87\x89\xab\xd9\xb8\x2a\xc5\xac\
+\x4e\x8b\xb8\x99\x4f\x2f\xd3\x68\x35\xad\xc2\x64\xbb\x12\xc0\x31\
+\x16\xe1\x79\xdd\xb0\x99\x12\x87\x0a\x56\xa8\x30\x31\x85\x54\x4f\
+\xc3\xfa\x7b\x2b\xed\xf2\xc4\xc8\x4c\x45\x32\x1e\x73\xf2\x4e\x20\
+\xed\x98\x44\x1d\xbd\xe8\xda\x95\x8d\x13\xf1\x7d\xc7\x56\x46\xcd\
+\x74\x51\x69\x52\x37\x67\x99\xb4\x3d\xbc\xc9\xee\xc1\x26\x7a\xeb\
+\xcb\x73\x50\xa1\xcc\xb6\x96\x2f\xde\xbd\xb7\xdf\xbc\x45\xe8\x4c\
+\x2e\xfc\x5e\x35\xf5\xbf\xc1\x9a\x5e\xe2\xc4\x3f\x65\xb4\xd7\x67\
+\x74\x16\xb2\xb5\x1f\xf0\x68\x7b\x97\xec\xf6\x6d\x1e\x6d\x6d\x13\
+\xee\xff\x2d\xea\x96\xc6\xde\xfd\x3f\x67\xe1\x83\xbf\xe3\x73\x37\
+\x1e\xf3\x33\xff\xf2\x13\xfc\xea\x6f\xfd\x77\xfc\x4f\xff\xe6\x7f\
+\xe7\x67\x7f\xea\xd3\x18\xd6\x1a\x77\x1f\xe9\xdc\x7d\xa4\xe3\x6f\
+\x9f\x48\xa1\xba\xa7\x98\x73\x81\xd8\xce\x67\xae\x8f\xe7\xe1\x03\
+\x40\x4b\x6d\x5e\xa0\xdc\x4a\x96\x02\xb7\x33\x9b\x6a\xfe\x30\xf1\
+\xcd\xf4\x94\xb3\xb6\x2b\x70\xf1\x13\x6e\xca\x66\x4b\x4c\x44\xe7\
+\x6b\xd4\x4f\x9b\xec\xe5\x6d\xc2\xa2\x59\x55\xf2\xc6\x4a\x34\x41\
+\x21\xc0\xc9\x1a\x58\xa6\x58\x38\x5f\x72\xc9\x7a\xa0\x4a\xfe\xb7\
+\xec\xf6\x0d\xe8\xa3\xb4\x9b\x45\x21\xd7\xc7\x60\x71\xd6\xd5\x2b\
+\x68\xb9\xf3\x1d\xbd\xf3\x10\x23\x48\xc5\xd8\xbe\x36\xec\xd3\x5c\
+\xdf\x98\xe3\x89\xab\x85\x5d\x75\xc6\xae\x4a\xd1\x8d\x5c\x85\x8e\
+\x2a\x6c\x00\xc6\xea\x14\xed\x17\xff\xeb\x2f\xff\x8a\x0e\xa8\x89\
+\x82\x9e\x24\xd4\x0c\x71\x22\xd5\x12\x05\x3d\x0a\xd1\x93\x04\xc5\
+\xd5\xd1\x0c\xd0\x93\x18\x8d\x84\x29\x86\xa4\xe5\x94\x22\x1b\xab\
+\x18\xe4\x24\x92\xaa\x8b\xb1\xa8\x25\xb3\xcf\x51\x99\x71\xc5\x96\
+\xa1\x93\x62\x54\x8c\xe0\x22\x62\x55\xc1\x30\x74\x30\x4d\x6c\x1d\
+\x14\xea\xd4\x4d\x9d\x20\xb3\xc8\xb5\x3a\x5e\x36\xe2\x71\xfe\xef\
+\xb8\xba\x92\xe0\x0d\x3b\x1c\xbe\xb1\x8d\x72\xa9\x18\x25\xf2\x32\
+\x3a\x4d\x95\xc3\x3c\xc4\x98\xea\x2c\xaf\xf6\x30\xa6\xfa\x1c\x66\
+\xfe\xcc\x8d\xcf\xd3\x5d\x79\x89\xae\xbd\x44\xbd\x6e\x50\x37\x14\
+\xb2\x85\x36\x76\xb6\xc6\x7e\xf2\x01\x77\xb6\x15\x26\x83\x6d\xa6\
+\x6a\x9d\xfe\x60\x80\x91\x65\xec\xbd\x99\xf3\xc6\x5f\xff\x21\x6a\
+\xf8\x3a\x6b\xa9\x4f\x67\xc1\xe3\xb3\x3f\xb4\xc6\x17\xfe\xe9\x97\
+\x59\x79\xee\x29\x06\x93\x6d\x1e\xef\xe8\x4c\xa3\x13\xe2\x72\xb7\
+\x71\x26\x7e\x66\x3a\x56\x09\xf5\x31\x2d\xb5\xc9\xd8\x8f\xa9\xd5\
+\x04\x3e\x48\xfd\x84\x7a\x2d\xc6\xf7\x35\xac\x9a\x2f\x77\xb4\x69\
+\x0c\xd1\xf5\x36\x75\x37\xa1\x6b\x59\x84\xb9\x8e\x55\xc9\x44\xd9\
+\x24\x91\x1f\x43\x2f\xa1\x55\xac\x9f\x5d\x4d\x14\x8c\xc6\x21\x8e\
+\xd9\x64\xd8\xee\xa3\x9b\x8b\xf8\x9e\x4a\xcf\x88\x51\xce\x7c\x2c\
+\x25\xe1\x99\x4f\xac\xb0\x70\xe3\x32\x2d\xd7\x66\xd5\x5d\xa6\x96\
+\xe5\xc4\x9a\x82\x12\x65\xc5\x32\x4a\xa8\xe5\x35\xd4\x58\xa1\x5e\
+\xc1\xec\xbe\x3a\xa6\x96\x8b\x00\xcc\x8c\x29\x09\x31\x6a\xdc\x25\
+\x1f\x3c\xa6\xd6\x71\x38\xeb\xeb\x9c\xa9\x27\xb4\x8c\x04\xd7\x76\
+\x19\x4d\x5b\x44\xe9\x09\x79\x6a\x52\xaf\x6b\x04\xe9\x04\x63\x9c\
+\x41\x79\x5f\x15\xef\x8d\xa1\xe6\xa4\xa9\x81\x5f\x5f\xe0\xcd\x6f\
+\x7e\x93\xe1\xe8\x84\x49\xbd\xc6\xc2\xd9\x19\x43\xd3\xc2\xd5\x14\
+\xf2\xec\x21\x6b\xaa\xcb\xc6\x33\x9b\xb4\xad\x0e\x51\xae\x12\xe5\
+\x85\x47\x45\x9c\xc9\x8c\xfc\x6b\xff\xe7\x1f\xa1\x0b\x6b\x53\x87\
+\x04\x5f\x98\xc1\x61\x61\x11\xcc\x74\x0b\xa6\x45\x1c\xce\xb2\x68\
+\x35\xb3\x96\xc1\x1a\x57\x38\xd7\x27\x57\xe6\xd6\xdc\x72\x9b\xb0\
+\x92\xad\x6b\xa1\x32\x6f\x08\x57\xb9\x1d\x4c\x32\xd6\xcc\x33\x0e\
+\x22\x91\x05\x1a\x87\x75\x0e\x82\xeb\x5c\xbd\xa2\xf3\xe7\xcf\x7d\
+\x89\x65\x7e\x67\xae\x80\x7b\x76\xbd\xc1\x23\x3f\x99\x7b\xee\xda\
+\xba\xce\x4f\x7e\xfc\x0b\x2c\x2d\xff\x27\x5c\xaa\x5f\x2d\x76\x74\
+\x44\xf2\x0a\xd0\x6f\x4c\x66\x45\xdd\x51\x4a\xef\xf6\xdb\x2c\x6f\
+\x74\x08\xba\x4b\x40\x1f\xbb\xb6\xce\x07\xbf\xb7\xc7\xdf\xd5\xff\
+\x3f\xae\x6f\xbe\x0e\xc0\x47\x3e\xb3\xc6\x27\xd7\x6e\xb1\xf1\x8f\
+\x3f\xc3\x6b\xee\x21\xb7\x4f\x74\xde\x7a\x73\x0b\xc3\x9f\xce\xb1\
+\x0f\x25\xe6\x05\x9b\xb1\x1f\x93\xd8\x21\x2d\xa7\x49\x4a\x8b\xa6\
+\x33\x94\x99\x57\x64\xab\x56\xf1\xae\x74\x8a\x63\xff\x43\xdf\xcf\
+\x72\xa2\xba\xf4\xb5\x98\x36\x2f\x09\xaa\xad\x07\x70\x0f\x75\x22\
+\x0c\x59\x0e\xfd\x14\x9a\xb0\xdc\x8c\x59\x6e\x5f\xe6\xc6\x66\xca\
+\x38\x99\x5c\xd0\xc7\x34\xe2\x0c\xb4\xf3\x97\xed\x1c\x37\x6b\xe0\
+\xa9\xb9\x94\xbd\x8a\x0c\xdd\x07\x57\x11\x8d\x92\xc6\x18\xb5\x1f\
+\x33\xb6\x6c\x8c\x54\xa3\x49\x0f\x34\x87\x51\x01\x21\x12\x54\x90\
+\xf3\x95\x36\x78\xa1\xc8\xca\xde\x94\xc6\xba\x45\x6f\x5f\x70\xd8\
+\x49\xfb\x13\xac\xd6\x1e\xb0\xdd\xee\x4a\x38\xa1\xa8\xd7\x39\xcc\
+\x61\xc2\x31\x70\x4d\xb2\x1a\x1d\x35\x95\x7c\x71\x3f\x2b\xd6\x1d\
+\xa4\x1d\x13\xc2\x14\xbd\xf0\xee\x4d\xa2\x10\xaf\xd2\xc9\xd1\x41\
+\x42\x0c\x2b\x8c\x88\x2d\xeb\x42\x73\xc4\xac\x48\xfa\xce\x5f\x00\
+\x8d\x8a\xb2\x38\x0b\x15\x72\x2b\x90\x01\x3f\xb3\x69\x61\x7e\x2b\
+\x53\xc9\x48\x98\x11\x07\x91\xc9\x42\x9e\x31\x6d\x5d\x63\xaf\xbf\
+\xca\x20\xfb\x0a\xbb\xf7\xbf\xc4\xf2\xc2\xd7\xe7\x0a\xb8\xf2\x76\
+\x6d\x5d\xa7\x15\xfc\xfc\x5c\x97\xaf\x96\x3f\xc5\x7a\x7d\x79\x26\
+\x12\x2a\x30\x77\x33\xea\x73\x82\xc9\x60\xef\x69\xe0\x51\x65\x6a\
+\xb8\x4f\x3c\x8a\x88\x2e\xf5\x78\x6a\xba\xce\x71\xba\xc8\x71\x00\
+\x3b\x77\xf7\x50\x6a\x8b\xfc\x7e\xff\x80\x1f\x68\x6f\xd3\xe8\xde\
+\xa2\xd7\x9a\x70\x39\x5c\x27\x5e\x8d\x78\xf7\xf0\x08\x86\xa2\x62\
+\x6e\x34\x0d\x81\xd7\xba\xcb\x6c\x5c\xb6\x8a\x89\x66\x97\x2c\x39\
+\xa6\xa5\xb5\x80\xd6\x6c\xbe\xc7\x2d\x27\x34\x2c\x7a\x59\x9f\x5e\
+\x56\xdc\x1f\x86\xe0\x96\xcf\x9b\x52\xbd\x56\x8a\xee\x71\x2c\x76\
+\x26\x43\xae\xec\xc0\x6e\x6e\x90\x4f\x4f\x39\xf4\x73\x8e\x07\x42\
+\x73\xac\x3a\x1a\xbd\x6c\x84\xa2\x5e\xe7\xd9\x4f\x6a\xb8\x8b\x9f\
+\x20\x88\x54\xc2\x48\xc1\xcd\x14\xbc\x22\x38\x7d\x03\xdc\xac\x0c\
+\xdc\x2e\xd0\x17\x81\x1b\x08\xad\x76\x29\xa4\x8f\x0a\xd5\x9b\xa2\
+\xb9\x15\xe8\x98\x57\xc4\x43\x8a\xa4\xe6\x02\xb7\x81\x4e\x4e\x80\
+\x8d\x4d\x3a\x5f\xd4\xb9\x35\xe1\x0c\xd4\x12\x05\x7b\x4b\xbf\xc7\
+\xe1\x14\x36\x07\x3d\xb6\xdb\x5d\x09\x2d\x56\x95\x84\x3a\xcb\x73\
+\xf8\xba\xaa\x88\x93\x3c\xb1\xc4\xc3\x61\xb9\xdb\xcd\x22\x26\xc0\
+\x28\xd4\xfe\xfd\x0a\xbd\x16\x5a\x79\x91\x27\xac\x8b\x58\xf7\x5c\
+\xe6\x45\x1a\x70\xcf\xa8\x38\xd5\xca\x49\x8b\x6c\x3f\x1b\x37\x14\
+\x5b\x4a\xcb\x5d\xce\x16\x30\x54\x72\x3a\x39\x1c\x44\x26\x6d\xa3\
+\x41\x3f\xde\x23\xed\x9f\xd1\x79\x76\x8b\x6f\xfe\xfb\x5b\xc0\x7d\
+\xd8\xb9\xf5\xa1\x3f\xff\x6a\x7d\x13\x96\xf7\x99\x2a\x2f\x73\xb0\
+\x7d\x9d\xcb\x9b\x2f\x17\xeb\xc8\x84\x6b\x8c\x19\xaa\x58\x56\x46\
+\x88\x45\x3b\xe8\xd3\xd2\xef\xd1\x2b\xc4\xef\xdd\xd6\xec\x77\x0b\
+\x8e\x2c\x76\xd4\x90\x5e\x76\x57\x9c\x14\x2b\x21\xad\x74\x91\xe5\
+\xe9\x1e\xaf\xeb\x21\xda\xc0\xe0\x8a\xb9\xcf\x6e\xb4\x3e\x87\x83\
+\xc7\xea\x94\x06\x06\x5a\x73\x80\x9b\xb7\x00\x4b\x4e\x63\x64\xfe\
+\x06\xe4\x23\x32\xa5\x89\x8a\x06\x6e\x5f\x06\xf0\xe9\xc8\x60\xb1\
+\x09\xbd\x61\x48\xcf\x35\xc1\x0d\x81\x0e\xbd\x61\xbf\xb8\x2f\xfc\
+\x28\x4a\xac\xbc\x73\x10\x62\x34\x4d\x0e\xfd\x81\xb4\xae\x3a\x1d\
+\x19\xa8\xce\xa8\xe0\x89\xfa\xe0\xc1\x83\xef\x7f\x8b\xef\xbf\x96\
+\xb3\xfe\xdc\x2a\xa1\x16\xe1\x45\x0a\x0e\x2e\x69\x60\x11\xdb\x01\
+\x35\xb3\x26\x0b\xd2\x5e\x69\x09\x30\x84\x86\x65\x62\x4e\x8b\xeb\
+\xa4\x9a\x42\xa4\xc9\x29\x0e\x80\x78\x1c\xa2\x07\x11\x8d\xc5\x18\
+\xa8\x31\xa2\x4b\x93\x1e\x8a\xe6\x62\x07\x82\x6e\x0b\x52\xe4\x5e\
+\xbb\x32\x0b\xe3\xd6\x04\xbb\x30\xec\x33\x5c\xd0\x61\x4f\x04\x6d\
+\x99\x89\x6b\x8f\x4f\x99\x5e\x5a\x64\xd8\xaa\xcb\x4c\x0c\x42\x04\
+\xe4\x5d\x18\x58\x05\x3d\x2e\x38\x62\x2a\x05\x9d\x4b\xe1\xda\x13\
+\x2a\xd2\x97\xb8\xea\x00\x64\x86\x11\x69\x31\xce\x54\xce\xdc\x95\
+\xa3\x97\xd5\xcc\x6b\x5e\x10\xd2\x17\x99\xbb\x42\xbd\x95\x59\x58\
+\x2c\x83\x34\x2f\x64\xe2\x49\x98\xd1\xa1\xc5\x59\x32\xa0\x71\x78\
+\x51\xee\x57\x7a\x50\x7c\xec\xc5\x7b\xb3\xe6\xc6\xf2\x3e\xba\xfa\
+\x1c\x64\x70\xf5\x0a\xe8\xfb\xc7\xec\x2c\x42\x27\x6b\x62\x60\x13\
+\x11\x11\x45\x30\x3a\x13\xfb\x9a\xcb\xc2\x62\xb9\x0d\xc7\x03\x53\
+\x8e\xfe\xe0\x85\xf4\xdc\x70\x2e\xa8\x03\xee\x32\x5c\x09\x79\xf6\
+\xbe\xc1\x6e\xbe\x8b\xb8\x0e\xec\x72\xa4\x39\x28\x99\x37\x33\x27\
+\x18\x29\x33\xff\x5b\x99\x41\x2d\x7a\x4e\xa9\x81\x1d\x81\x27\x5a\
+\xc9\xbd\x61\x48\x8f\x10\xd5\x0d\x39\x1d\x35\x51\xdd\x10\xbc\x7e\
+\x91\xa9\xfb\x32\x53\x0b\xa8\xd1\xa7\x97\xcd\x8a\xbe\xe3\x81\x08\
+\xd4\x4c\x69\x16\xe3\xff\x5a\x45\x38\xdf\xa1\xdb\x8a\xd8\x39\x08\
+\xf9\xf3\xbf\xf9\x36\x3f\x6a\x5e\xe5\xfa\x3f\x5a\x27\x39\x55\x21\
+\x4c\x50\xcc\x84\x1a\x35\x99\x60\xb2\x50\x41\x35\x2d\xb2\x28\xa4\
+\x99\x29\xa4\xc0\x59\x18\xd0\xb0\x4c\xb4\xb3\x29\x69\x23\x23\xee\
+\x87\x0c\x06\x43\x74\xdb\x22\x09\x42\x74\x3b\x11\x41\xab\x19\x40\
+\x4f\x76\xf8\x02\x3b\xc7\xf6\xa6\x42\x5e\x6f\xe7\xd8\x81\x22\x8a\
+\x3f\xb7\x2e\xf6\xdc\xad\x2b\x0c\x4e\x12\x5a\x67\x09\x3b\xa7\x1e\
+\x87\x8b\xae\xcc\xc4\xab\x97\x16\x39\x9c\x66\x7c\x62\x28\x32\x71\
+\xd9\xae\xee\x67\x1a\x64\x33\x83\x96\x8e\x9a\x8a\x41\x51\xbd\x17\
+\x93\x48\x6d\xc4\x19\x16\x0b\xf8\x76\x42\xde\x13\x15\xb4\x62\xb7\
+\x30\x80\x04\xd0\x7b\x3a\xd8\x7d\x30\xad\x8a\x34\x33\x42\x43\x41\
+\xa1\x47\x8e\x2d\x7c\x2b\xe4\x88\x87\x78\x2d\xaa\x9c\x24\x5a\xa8\
+\x88\x0d\x9e\xf9\x03\x31\xbb\x67\xad\x41\xa8\x14\x1c\x74\x3e\x6f\
+\xce\x9d\x2e\xa0\xe1\x61\x53\xc3\xd4\x23\xf4\xd6\x97\xf9\xa8\xf1\
+\x87\xbc\xfb\x5e\x4c\x76\x6b\x85\x5b\x9f\xbb\x83\xe5\xd7\x65\x20\
+\x03\x12\x4a\x04\xf9\x1f\xf0\xb5\xdb\xaf\x70\x6d\x5d\xe7\x36\xd0\
+\x7a\xf8\xf3\x5c\xbd\xa2\x73\xeb\xca\x75\xe2\xa8\x83\x12\x29\x1c\
+\x1f\x1c\xb2\x35\xd9\xa6\x3f\xd1\x67\x01\x51\x09\x96\x7e\x43\x81\
+\x0c\xd4\xd1\x80\x56\xbb\x45\x3f\x53\xe8\xa8\x39\xc1\x3d\x8b\xbf\
+\x56\x4c\x5c\x67\xa6\x9e\xf3\xfd\x90\x3c\xc9\x19\xfb\x31\x8d\xac\
+\x86\xd6\x14\x13\x25\xc3\x74\x48\xcb\x6b\x51\xb2\x6c\xc2\x33\xad\
+\xf4\x93\x80\x5e\x16\x16\x41\xda\x11\x01\xab\xcc\x9a\x1c\xaa\x37\
+\x2a\x68\xb6\xd2\x87\xa2\x2f\x7f\xb7\xed\x91\xd0\x1a\x7b\x8a\x09\
+\x0a\xb8\x8e\x46\x5c\x06\xa4\x53\x99\x84\x2e\x9d\x84\x0e\x42\xee\
+\xbe\xf2\x75\x5e\xfc\xe4\x2f\xf2\xec\xb3\x26\x7b\x87\x42\x28\x5f\
+\x62\x5d\x5f\x1d\x93\x9b\xf6\x1c\xb4\xd3\x81\xba\x69\x15\xd0\xc3\
+\x42\x07\x14\x26\xb4\x25\xdd\x53\xa3\xd3\xe9\x08\x3e\xd9\x9b\xca\
+\x00\x1e\xa1\x08\x28\x61\xe7\x42\xce\x99\x4e\x44\x16\x4e\x27\x82\
+\xb9\xb0\x61\x95\x7a\x11\x55\xf3\x98\x18\xa0\xf6\xf8\x14\xda\x5d\
+\x69\xb2\xdd\x51\x53\x19\xc8\xe5\xfd\xea\x94\x88\xf6\x5f\xfc\xf4\
+\x8f\xfc\x4a\x42\x88\x81\x4d\x42\x48\x42\x08\xf1\x04\x8b\x05\x01\
+\x29\x8c\x0c\x35\xd0\x89\xe3\x3e\x06\x36\xaa\x91\xe1\x27\x09\xd3\
+\x24\xa1\x96\x24\x78\x7a\x4c\x8e\x41\x14\x25\x4c\xf4\x98\x29\x31\
+\x71\x94\x00\x06\x89\xfc\x35\x21\x4b\x14\xb2\x44\x41\xb1\x72\x32\
+\x0c\xe2\xe4\x4d\x3e\xd8\xff\x36\x0b\xcd\x65\x74\xe3\x92\x1c\x63\
+\xb2\x30\x88\x8d\x9c\x3a\x53\xb4\x54\xc1\xa6\x46\x6a\x66\x4c\x26\
+\x3e\x63\xe5\x1b\xdc\x7b\xfb\x98\x93\x93\x4c\xec\x55\xde\xb9\x44\
+\xf3\xd6\x21\x9f\xfb\xd8\x98\xab\xfa\xbf\xe0\xa5\xa7\x7f\x90\xcd\
+\xa7\x9f\x26\x0d\x56\x89\xf9\x80\x7b\x47\x5b\x0c\xbc\x8c\xc3\x3c\
+\x64\x2f\x7b\x83\x3b\xfd\xef\xb0\xa8\x83\x37\x9e\xd2\x4e\x1b\x0c\
+\xec\x2d\xfa\xdf\x07\x6d\x1a\x31\x6d\xa7\xc4\x6c\x31\xad\x5f\x47\
+\x09\x85\x88\x3d\x19\x9b\xb4\xea\x09\x66\x6c\xc2\x14\xa6\xd1\x90\
+\x49\x34\x21\x74\x2d\xd2\x30\x91\x8f\x83\xc8\x44\x53\x75\xb2\x2c\
+\x21\x9e\x66\xc4\x4a\x4a\xbd\x36\x2b\x77\x4d\xd5\x24\xac\x25\x58\
+\x8a\x81\xd1\x34\x71\x4c\xa8\x4f\x15\xc2\x5a\x42\x57\xb5\x08\x73\
+\xb7\xc8\xb8\x1d\x16\xcc\x29\xe1\x28\x41\x71\x6d\xb2\xb8\x86\x52\
+\x1b\x02\x1d\xfc\xe9\x84\xfa\x24\xa1\x6f\x4c\x48\xc6\x85\xb6\x42\
+\xb1\xa9\xa1\x11\xda\x01\xc9\x38\x27\xd7\x03\x42\xc5\xc0\x3a\x57\
+\x2a\x8b\xe9\x14\x97\xb7\xb6\x1f\x92\x3c\x7a\xc4\xf2\xd3\x4b\x58\
+\x96\x42\x10\x66\xc4\x7e\xc8\xd4\xc8\x69\xc4\x19\x5a\xc3\xc0\x0c\
+\xc7\xd4\x95\x3a\x53\x45\x4c\x87\x5b\x53\xc1\x17\x5b\x53\x15\xcd\
+\xca\x31\xb3\x4b\x58\x16\x58\x96\x85\x65\x59\x34\xc9\x31\x62\x85\
+\xc0\xce\x71\xe2\x99\xd6\xc2\x88\x15\x62\x03\x8c\x71\x46\x6c\x40\
+\x9c\xa7\xd8\x81\x78\x0e\x6c\x54\x4b\x25\x1f\x2b\xdc\x79\xff\xfb\
+\x78\x8f\xdf\x66\x52\xaf\xb1\x39\xe8\x31\x34\x2d\x86\xa6\xc5\x8a\
+\xbe\xc5\xd2\xd4\x61\xe3\x99\x4d\x14\x12\xf2\x22\x60\xa3\x5c\xa5\
+\xa3\xa6\x44\xb9\x4a\x96\x25\xfc\xd6\x57\xfe\x10\xd5\x62\x01\xd7\
+\x6e\x11\xd9\x09\xae\xdd\x62\x59\xe9\xe0\xda\x2d\x74\x3b\x41\xb7\
+\x13\xc1\x5c\x74\x0d\xc2\x5c\x7c\x0e\xa6\x45\x6e\xe6\x58\x1d\x13\
+\xc5\xcc\x31\x8a\x49\x00\xdd\xb4\x30\xb0\x31\xb0\xd1\xcd\x99\xfa\
+\x21\x89\x42\x4c\xc0\x8c\x42\xcc\x28\x44\x09\xed\x19\x9e\x4e\x5f\
+\xe3\xde\xce\xc3\x62\x0a\x44\x29\x67\x92\x69\x84\x2a\x2a\x4d\x6c\
+\x12\xd2\xa2\x7d\xed\x98\x1d\xf6\x5f\xbf\xc9\xfe\xc1\x4c\x20\x74\
+\xeb\x73\x77\x24\x0b\xf1\xc2\xa7\x9e\xe1\xd6\xe6\x3f\xe1\x52\xfd\
+\x2a\x97\xd5\x29\x07\xdb\xd7\xe7\xba\x75\x96\x5f\xc7\xf2\xeb\x7c\
+\xed\xad\x57\xf8\xc3\xdb\xff\x96\xbb\xe9\x9f\xb2\xb5\x93\x30\x3e\
+\xf5\x78\x3c\x78\xcc\xe9\xe1\xeb\xb4\x94\x17\x58\xab\x59\x2c\xb7\
+\x3b\xe4\x0b\x1b\x73\xe3\x45\xa5\x26\x42\xd5\x97\xe9\x8c\x73\x94\
+\xa6\x42\x4b\x6b\x15\x45\x1a\x9c\xa4\x21\x03\x25\x27\x76\x75\x9a\
+\xce\x6c\xec\xa0\x7c\xfd\x82\x92\xae\x69\xce\x15\x6c\x42\x1f\xd1\
+\xa7\x37\x0c\xe5\x7d\x31\xf2\xd4\x14\xe3\xfa\x45\xd6\xed\x8c\x73\
+\xc9\x4b\xcf\xae\x3e\xae\x3c\xb6\xfd\xf3\x56\x58\x45\x07\xb1\x3b\
+\xa5\xdb\xbc\xc1\xab\x8f\x8e\xf8\xcb\x5f\xfd\x0e\x4d\x7f\x97\x56\
+\xc3\x43\x35\x81\x48\xc3\x37\x1c\xa2\xc1\x94\xb1\xa1\x12\xa8\xa7\
+\xb8\x99\x82\xe6\x09\x51\x8f\xe6\x8d\x69\x92\x17\x8f\xfb\x52\xe9\
+\x56\xc2\x06\x79\xe5\xb4\x73\x9a\xe4\x0c\x0b\xab\x5a\x5b\xab\xcb\
+\x6c\x6c\x07\x8a\xe4\x8b\xed\x20\x84\x20\x61\x90\xcc\xff\x9e\xdb\
+\xed\x2e\x4a\x20\xda\xcf\x47\x89\x18\x78\x9d\x70\x4c\xab\xf4\x7e\
+\xf6\xa6\xe8\xba\x45\x3f\xd3\xe6\x70\xb1\xaa\xdb\x09\x3e\x60\x06\
+\xe2\x1f\xde\xb3\xc4\x6e\x0d\x1f\xc4\x0a\x00\x53\x00\x7a\xbb\x31\
+\x73\xc1\xb4\x2d\x21\xa0\x4f\x2c\x6b\x0e\xc5\x1a\x56\x8e\x61\xe5\
+\x98\xc5\xe5\xc8\xb4\x4c\x9c\x4e\x47\xf8\xfe\x9a\x16\xe0\xa2\x12\
+\x12\x84\x21\x77\xf3\xff\x55\xd0\x43\xca\x5d\xe2\xfc\xa0\x70\xf0\
+\x11\x05\x9e\x6e\xe6\x4c\xa3\x79\x83\xef\x99\xf1\x21\x64\xb7\x56\
+\xf8\xd8\x8b\xf7\x64\x60\x86\xce\x84\xdb\xdf\x79\x9f\xa4\x7f\x80\
+\xe7\x05\x6c\xed\x07\x24\xc3\xdf\xbb\x80\xa1\xab\x0d\x90\xaf\xbd\
+\xf5\x0a\xca\xde\x1b\x38\xcf\x37\xb8\xfe\xf2\x35\x3e\x7e\xeb\x9f\
+\x61\xac\xcc\x3b\xb2\x8b\x4b\x79\x87\x7e\x43\xa1\xad\x37\x51\xf5\
+\x65\x31\xc8\xa9\x98\x74\xd4\x1c\x4f\x99\x0d\x78\xb6\x73\x45\x52\
+\x6b\x23\xdf\x96\xcd\x8b\x52\x99\x86\x27\xa0\x83\xf4\x10\x2e\x9c\
+\xe0\x05\xb6\xed\xc8\x21\xd0\x4c\x69\xa2\xe6\x23\x7a\x03\x71\xe2\
+\xa8\xf9\x88\x38\x11\x3f\xb3\x2a\xcb\x1c\x33\x65\xcc\x14\x35\x1f\
+\x49\x51\x7e\xf5\xb9\x6a\x20\x1b\xad\xde\x9c\x1b\xfd\x9f\xbf\xfb\
+\x36\xbf\xf3\x17\xc7\x4c\xb3\x45\xda\xed\x36\x0d\x2d\x46\x89\x26\
+\xe4\x66\x9d\x1c\x1b\x3b\x5b\xc4\x57\xc7\x28\x9a\x2b\x8f\x23\x14\
+\x52\xb7\x41\x93\x99\xfa\x6d\x54\x42\xc5\x73\xc3\xa7\x33\x9e\x6e\
+\x3a\xd7\xfc\x28\x1b\x22\x81\x7d\x8e\xe2\x5b\x9c\xb1\x1d\x57\xa6\
+\x16\x87\xd3\x4c\x52\x6d\x25\x3b\x51\x16\x86\x25\x4b\x51\x1e\xc7\
+\xea\x14\xd5\x9f\xfb\x25\x74\x12\x7c\x72\x33\x27\xd4\x45\x00\xf8\
+\x51\x48\x82\x2f\x46\x7e\x0a\x86\x22\x0e\x15\x6a\x85\x68\xc7\x8f\
+\x42\x92\xa2\xfb\x53\x32\x1c\x51\x18\x11\x59\xa6\x38\x16\x18\xcb\
+\x04\x22\x33\x11\x8f\xf5\x37\x61\xbf\x25\xb3\x71\x9c\x6c\x31\xee\
+\x4f\xe4\x40\x7d\x52\x14\x7d\x7e\xb9\xfe\xd4\x6e\xa0\x16\x93\xd5\
+\xed\xa5\xcb\x7c\xfe\x7a\x3e\x17\x94\x65\xa7\xee\xfb\xde\x57\x85\
+\xca\x6d\xb2\xcd\x9d\x6c\xcc\x9d\x6c\x4c\xe8\x4c\xe4\xeb\xe5\xb1\
+\xfc\xba\x37\x1b\x62\x82\xe3\xea\x15\x9d\x5b\x2f\x7d\x94\xab\x1f\
+\x79\x99\xeb\x2f\x5f\x63\xf3\x4a\x87\xfe\xd9\x90\x87\xc3\x1e\xbb\
+\x7b\x8f\xd1\x83\x3a\x63\xa6\x85\x7d\x54\x73\x6e\xa0\xb3\x1a\x58\
+\x4f\x52\xa8\xa5\xb4\x64\xa0\xe3\x09\xe6\xe1\x78\xd0\xe7\xd4\x3b\
+\xe1\x74\x64\x14\xde\x14\x21\x78\x30\x48\x46\x0c\x92\x11\x0f\xb3\
+\xfc\xc2\x15\xa0\xbc\x2a\x9c\x0f\xe6\xf3\x8f\xdd\x3c\x92\xc1\x5f\
+\x1a\x15\x1e\x0f\x90\x8b\x69\xc8\xd7\x20\x5f\xe3\x4f\xff\xe0\x2f\
+\xf9\xf6\x6f\xfc\x11\xb6\x3f\xa4\xbe\x64\xe1\xe8\xc7\x4c\x10\xb3\
+\x86\x83\xa4\x89\x93\x35\xf0\xd5\x31\x4e\xd6\x98\x1b\xfc\x2c\xb3\
+\xac\xd0\x2f\xcc\xe4\x9a\xe5\xe3\x11\x0a\x0b\x43\x45\x66\x66\x91\
+\x79\x95\x0b\x5d\xbb\xb9\x04\x55\x14\xd6\xe3\x53\x4f\x66\xe3\xa3\
+\xc1\xae\x7c\x7d\x58\x9a\x2f\x16\x27\x85\xcc\xc2\xde\x54\x2c\x63\
+\x0c\xc6\x88\x2c\x6b\x27\x24\x81\x4e\x30\x86\xa6\x69\x63\x14\x57\
+\xe2\x50\xaf\xe3\xea\x2a\x5e\x92\x15\x60\xdf\x2d\xce\x79\x11\xbc\
+\x66\xa0\x13\xd9\x09\x49\x14\xe2\x98\x56\x31\x32\x1f\xcd\xfc\xa5\
+\x8a\x63\x64\x99\x85\xdc\x33\xb8\xf0\x47\x6c\x1d\x64\x3c\xbb\x19\
+\x10\x16\xd6\x54\x94\x36\x01\x66\x0e\x4a\x80\xe7\x5b\x50\x04\xf1\
+\xe6\x95\x0e\x3f\xf2\x85\x7f\x0e\xc0\x77\x1f\xff\xb7\xf4\xf7\xaf\
+\xd2\x79\x76\x0b\x02\x38\xd8\xbe\xce\xd5\xba\x28\xa8\xfc\x37\x5f\
+\xc2\x79\xf1\xdb\x32\x70\xcb\xe0\x2d\xb3\x77\xf9\x58\xd9\x7b\x03\
+\xae\xbc\xc4\xfd\xad\xdb\x5c\xcf\xea\xa8\xd7\x5f\xe0\xea\x15\x9d\
+\x1f\xf9\xd1\x7f\xcc\x2b\xaf\xbe\xc9\xd6\xdd\x0f\xe8\x9f\x0d\x45\
+\x23\x23\x19\x61\xf8\x17\xf9\xec\xb1\x1f\xd3\x70\x0c\x19\xc0\x0d\
+\xc7\x28\xda\xcd\x23\x5a\x6a\x53\xe8\x90\x2b\x6a\x35\x06\x14\x9c\
+\x0f\xc5\xfd\x99\xe6\xe2\xc3\x4e\x88\x32\x98\xcf\x4f\x90\x9c\x1f\
+\x7d\xea\x8d\x14\x68\x0a\x49\xa8\xa1\x97\xde\x6e\xa5\x21\xcc\x10\
+\x9a\x33\xac\xfe\xd5\x6f\x7c\x93\xb3\xe3\x01\x3f\xfc\x4f\x3b\x74\
+\x9f\xf9\x0c\xab\x78\x0c\xc7\xa0\xd5\xce\xf0\x58\x40\x89\x34\xa8\
+\x95\xfc\xb1\x22\x8e\xb8\xe4\xc5\xef\x2e\x82\x37\x9f\x0d\x96\xda\
+\x19\xcd\x00\xce\x5a\xb9\x54\x8b\x88\x39\xbd\x69\x25\x0b\xe7\xd8\
+\x41\x48\xa2\xa5\xe8\x5e\xc6\x43\xcf\x94\x9d\x5b\xc7\x1e\x41\x30\
+\x62\xa5\xbd\x51\xb4\x9f\x45\xcc\x65\xf5\x15\x49\xcd\x05\xa9\x26\
+\x1c\x86\x0a\x0f\xa3\xb1\x1f\xa3\xdb\x0d\x70\xcd\x9c\xb8\x67\x10\
+\x72\x46\x57\x59\x90\xdf\x34\x02\x5c\xbd\xe8\xa3\xbb\xe5\x1b\xea\
+\x4b\x52\x7b\xd6\x53\xf7\x67\x9a\x89\x32\x78\x2d\xb3\xb0\x29\x2c\
+\xec\x0a\x8b\xe7\x13\xcb\xe2\xe1\xce\x07\x73\x63\x43\xcf\x2c\xdd\
+\x25\x08\x3f\xc9\x25\x6b\x26\xfe\x91\xbb\xed\x2c\x18\x26\x6f\xb1\
+\x3f\xed\xb1\xe7\xef\x73\xd9\x59\xe7\xda\x62\x39\x46\xff\xbf\xc0\
+\x25\x48\xb2\x77\x79\xe5\x9b\xdf\xe0\x70\xfd\x5d\x86\x76\x03\x6f\
+\xef\xe7\xd8\xbc\xd2\xe1\xf4\x4e\x97\xe8\xa5\x43\x09\x39\x9e\x14\
+\xd0\xb1\xfb\x00\x78\x89\x9b\x57\x5f\x20\xc9\xde\x25\xcb\xde\x85\
+\xe3\x75\x92\xe5\x77\x79\xf9\xc6\x35\x2e\x5f\x56\xd9\xbd\x7f\x48\
+\x7c\x24\x9a\x19\x49\xe6\x49\xdf\x88\x93\x34\x04\x05\xda\xce\xfc\
+\xf8\xd5\x30\x1b\xc9\x8e\x9d\x10\xf9\x58\x45\x70\xb7\x24\x7b\x41\
+\xa1\xc0\x2a\x4f\x80\xea\x11\x57\xa7\x9d\x2b\x4f\xcc\xec\xd5\x00\
+\xd7\x18\x72\xa6\x34\xe7\x3f\xa7\x99\xc3\x48\x41\x6b\x0e\x88\x93\
+\x52\x70\x2f\xe6\xf8\x1a\xd4\x0a\x1e\x59\xa3\xab\x46\xdc\xdf\x8a\
+\xe8\x0d\x5f\xe7\xde\x5e\xc2\x33\x5f\xac\xf1\x23\xff\x68\x93\x56\
+\x0b\x86\x63\x17\x8d\x33\x2c\xad\x4e\x62\xd7\xc4\x30\x69\xa1\xb3\
+\xa0\x36\x7f\x12\x6b\xca\x18\xdd\x6e\x08\xc1\x50\xa0\x32\x2c\x34\
+\xc8\xb4\xcb\xc0\x16\x6c\x84\x1d\x08\xf8\xd1\x0c\x20\xb0\x2d\x6c\
+\x52\x12\xb7\xc1\x75\x37\x62\x67\x20\x78\xe2\xfb\xa7\x4d\x21\x06\
+\x7a\x7c\x8a\x52\x0b\x19\x5e\xba\x4a\xdb\x74\x60\x72\x44\xe6\xae\
+\xcc\x0d\xa3\x06\xe9\x84\xc0\xb6\x05\x13\xf4\x4b\x3f\xfb\xcf\x7e\
+\xc5\x1b\x8d\x04\x2b\x01\x18\xd8\x04\xca\x94\x2c\x31\x41\xcf\x25\
+\x84\xb0\x42\x85\x28\xca\x69\x64\x6a\x05\x50\x1b\x98\x7a\x4e\x4d\
+\x37\x98\x26\x09\x59\x92\xa0\xea\x86\x50\xc1\x85\x29\x86\x21\x9a\
+\x22\x13\x1c\x8c\x24\x2e\x06\x46\xa1\x37\x18\x93\xe6\x6f\x89\x81\
+\x46\x4b\x01\xf5\x0a\x0b\x8d\x8f\xa2\x1a\x16\x49\x92\x60\xe8\x3a\
+\x09\x70\x12\xbe\xcb\x69\xff\x5b\xbc\x7b\xff\x1b\x7c\xf0\xad\xaf\
+\xd2\x7f\xb8\x4c\xf7\xd9\x36\x37\x6e\x3c\x83\xe9\x3a\x2c\x2d\x98\
+\xb8\x8d\x26\x23\xcf\xe2\x7b\xfd\xaf\x62\x4c\x75\x06\x5e\x46\x50\
+\x7b\x0b\x3b\xbc\x45\xbd\x13\xe2\x7a\x97\x88\xcc\x99\x96\xa2\xd3\
+\x54\xe9\x34\x55\x96\xcc\x1a\x9d\xa6\xca\xdd\xd1\x84\xa3\xbb\x43\
+\xf2\xbd\x3b\x74\xd3\x4d\x9e\x6e\xe7\x9c\x3a\x1e\x5b\x3b\x09\xc3\
+\xed\xbf\x62\xab\x77\x9f\xcd\xeb\xcf\xd3\x55\x1f\x60\x2d\x5d\xa1\
+\x33\x99\x72\x96\x4d\x38\x8b\x62\xda\xb9\x82\x89\x08\xb6\xd4\x4f\
+\xa4\x3e\xc2\x54\xea\x4c\xf2\x09\x93\x7c\x82\x1e\x58\x24\x76\x88\
+\x1a\x1b\xc4\x85\xb8\x25\x6c\xf8\xa4\x89\x3a\x7b\xac\x8f\x51\x63\
+\x83\x5a\xa4\x13\x34\x0b\x48\xa6\x5c\xd4\x1e\x0f\xb3\x11\xa6\x52\
+\xc7\x44\x61\x98\x8d\xa8\x29\x2d\xf9\xf3\x4d\x14\xc1\x4d\xd7\x41\
+\xab\x0f\x49\x47\x6d\xa8\x43\x98\x8b\x40\x9e\x2a\x3a\x35\x34\xd4\
+\x7c\x04\x75\x8b\x4b\x2f\xbd\xc4\xca\xd2\x06\x7b\x3d\x9b\x93\x41\
+\xcc\x3b\x6f\xbd\xcd\x69\x3f\xc2\xe8\x8f\x68\x99\x1a\x8e\x69\xa0\
+\x28\x21\xea\x74\x04\xf9\x90\x3c\xd3\xa8\xa9\x19\xe4\x53\x5a\xb6\
+\xcb\x24\x9f\x42\x3e\x45\x49\x5c\xb2\x58\x21\x4f\x3d\x0c\xc7\xc0\
+\x4d\xeb\x4c\xa2\x29\x13\x23\x46\x51\xeb\xa8\x46\x2e\x33\xb0\x13\
+\x97\x9c\x71\x82\xde\x70\xe8\x07\xf0\x17\x6f\xec\xa2\x46\x87\x4c\
+\xea\x35\xe2\x60\x4a\x9d\x53\x06\xee\x32\x18\x4d\xae\x25\x09\x4b\
+\xb7\x56\xc9\xda\x4b\xe8\xc3\x9c\xd8\x00\x3b\x48\x08\xf4\x1a\xb6\
+\xa6\x62\xa8\x39\x5f\xf9\x77\xff\x2f\xba\x17\x0c\x99\x9c\x4e\xa5\
+\x97\x6f\x54\x92\x62\x66\x4a\x68\xe5\x24\x5e\x8e\x8e\x82\x97\x64\
+\xb8\xba\x2a\xf1\x6f\x5e\x30\x13\x11\x08\x88\x50\x39\x41\xad\x0a\
+\x87\x1c\xa3\x80\xe5\x63\x58\x14\x13\xd5\x17\x95\x59\xef\x9f\xbc\
+\xca\xd3\xee\xcf\x90\x5a\x42\x5f\x11\x02\x51\xf8\xee\xdc\xb8\xfd\
+\x9d\x2c\xc6\x9f\x86\xdc\xd2\x6f\x48\xfd\x43\x84\x82\x69\x9a\x34\
+\x2e\x4d\xf9\x78\xe7\x17\xf8\x56\xfc\xab\x32\xdb\xa6\xfa\x3d\xb4\
+\xe4\x16\xa9\x2e\xbc\x8c\x3b\xcf\x6e\xc9\x51\xa6\x6a\x46\x6e\x0f\
+\x6f\x72\xe9\x6c\x83\xef\x05\xb7\xf9\x93\xd7\xfe\x84\xf5\xb5\x80\
+\xc5\xd5\x4f\xf3\x03\xed\x98\x23\xfd\x53\x90\xbc\x22\x26\x45\x10\
+\xf2\x82\xfa\xb5\x0d\x9e\xbf\x15\xb1\xf7\x70\x91\xc1\xc9\x9e\xc8\
+\xca\x5e\x42\xec\xea\x0c\xd3\xd1\xb9\xa9\x67\x6b\xee\x98\xd8\x21\
+\x7a\x60\xc9\xc0\xae\xbe\x06\x30\x74\x86\x18\x9e\x55\x29\xde\x90\
+\x5f\xd7\x52\x9b\xe8\x81\xc5\xc0\x15\x42\xfb\x96\x2a\xb2\x3a\x88\
+\x2b\xc1\xd8\x8f\x69\x34\xcb\x8c\xde\x82\x66\x8e\x36\xe8\xd3\x5a\
+\xe8\xe0\x29\xa6\xf0\xc1\xf0\x22\x70\xe1\xb3\x9f\xdc\xe0\xa7\xff\
+\xf9\x17\x59\x59\xb9\xce\xeb\x6f\xbc\xc7\xb7\xbf\xf5\x1d\xd9\xe6\
+\x3d\x8a\x1e\xb1\xb6\xb7\x44\x6d\x51\x9c\x60\xf5\xfe\x25\xbc\xf4\
+\x14\xb7\xd8\x9b\x93\xe7\x5d\x89\x8b\xe7\xa6\x43\x4a\xec\x5b\x8e\
+\x3c\x15\x18\x39\x28\x47\x9c\x02\x24\x7f\xfc\x61\x37\xa7\xd8\x99\
+\xbd\x39\xe8\xb1\x53\x0b\x69\x5c\x11\x23\x57\xb6\x3f\xc4\xb7\x3b\
+\x12\x9a\x88\x4c\x2c\x06\x52\xc7\x7e\x8c\x6e\xb1\x00\x8b\x67\x34\
+\xbb\x39\x61\x41\x97\xc5\x04\x8c\x73\x0b\x95\x00\xdd\x55\xc8\x02\
+\x1b\x57\x9f\x15\x70\x12\x87\x15\xf8\xb6\xa4\xd9\xb0\x4c\xe2\xb0\
+\x87\x81\x2d\xb3\x77\x39\x64\x12\x87\x63\xa9\xac\xb8\xba\xa6\x72\
+\x77\x6f\x5e\xe7\xfb\x68\xf4\x06\xcf\x76\x5e\x16\xd6\x53\x51\x9f\
+\xbd\x9d\x87\x90\xbd\x26\xa7\x94\xf3\x3b\x5d\x1a\xc6\x5d\x36\xb4\
+\x44\x2e\x89\x29\x27\x4a\x26\xd6\x75\xae\x5e\xb9\xc7\x5b\xb7\x67\
+\xc1\x39\x68\xdd\xa7\x3d\x84\x6c\x6f\x83\x61\x7e\x1b\x10\x94\xcd\
+\x0f\x76\x0e\x41\x05\xbd\xf5\x65\x76\xef\x1f\xb2\xbd\xd3\x67\xff\
+\xec\x84\x7c\xe1\x29\xda\x4b\x00\x77\x39\x3d\x7c\x9d\xdf\x7f\xd3\
+\xc2\x5e\xf9\x1e\x4f\xdb\x2f\xf0\x78\x61\x97\x6b\xba\xcd\x23\x66\
+\x3a\x8d\x95\xd4\x47\x51\x73\xfa\x4d\x85\x58\xd1\x31\xbc\x84\xc4\
+\x9e\x0f\xe0\x32\x68\xcf\x07\x75\xf9\x7c\x62\x87\x44\xc9\x18\x33\
+\x98\x15\x4f\xcd\xc4\x67\x54\x70\xa2\x0d\xc7\x60\x98\x8d\xe8\xaa\
+\x39\xbd\x6c\x44\xcb\x69\x42\x2e\xd8\x8f\xc4\x1e\xd1\x75\x72\xc9\
+\x86\x94\x9f\xab\x63\x49\xec\xad\x2e\xae\x42\x51\x10\xf6\x06\x70\
+\xb3\x6b\xb1\x79\x75\x83\x9b\x57\x63\x56\xf3\x57\xb9\xd4\x35\xf9\
+\xe9\xff\xfc\x26\x2f\xbd\x20\xae\x20\x4d\x7f\x97\x83\xf4\x29\x9c\
+\xf8\x21\xf5\x7e\x8d\xc3\xd4\x66\x3a\x7d\x8d\xc9\xe3\x65\x98\x7e\
+\x1f\xd7\xfa\x2c\x63\x77\x42\x23\x10\x70\x28\x77\xbd\xb9\x40\x3e\
+\x98\x9e\xd2\xd0\xea\x2c\x0c\x15\xce\x5a\xa2\xc8\x23\x50\xd0\xed\
+\x8c\x51\xa0\x8a\xc2\x2f\x50\x19\x21\xbc\x90\x75\x6f\x3c\x6f\xc2\
+\x12\x34\x71\xd8\x67\xbb\xbd\x8e\x12\xec\x73\x10\xe9\x7c\xec\x43\
+\x02\xbe\xd4\x62\x34\x1c\x03\x35\xb2\x13\x8c\xee\x0a\x8f\x13\x93\
+\x98\x00\x2f\xc9\x48\x2c\x0b\xd5\x2e\x46\xa5\xbd\x9c\x2c\x1d\x13\
+\x13\x10\xea\x75\xf2\x8a\xb7\x5a\xc9\x0b\xcf\x04\xf5\x91\xdc\x8e\
+\x94\x05\x76\x25\x33\x8f\xe7\xf5\xc4\x8f\x6f\x80\xf6\xd9\x0b\xe3\
+\xf4\x23\x80\xfe\x84\xbd\xca\x34\x73\xa9\x5e\x7b\x27\x5e\x60\x1c\
+\x3f\xc5\xd6\x64\x1b\xf2\x07\x98\xa6\x89\x1a\x99\xc4\xb9\x4b\xbb\
+\xa3\xa3\xab\xcf\xf1\xf1\xce\x2f\xcc\xd1\x68\x83\xd6\x7d\x86\xf9\
+\x6d\xc6\xf1\x53\xf4\x77\x7b\xf4\x77\x7b\xec\xbc\xf3\x29\xf4\xb3\
+\xcf\x03\xf0\xb9\x2f\x6e\xf0\xc3\x3f\xfe\x53\xac\xff\x60\x84\x7f\
+\x75\x11\x7f\xfb\x84\xbd\xa3\x65\xf6\x8e\x96\xc9\x17\x36\x04\xe3\
+\x11\xdc\x26\xb9\x67\xf2\x60\x4b\xb8\xa5\x2c\x1d\x5a\x64\x7b\x1b\
+\xe8\xb7\x4a\xc5\xd9\xec\xb2\x9f\x6b\xae\xcc\xb4\xd5\xa0\x8d\x92\
+\xf1\xdc\xb1\xfa\xba\xa9\x37\xe4\x6b\x7a\x60\xd1\x6b\x6a\x73\x05\
+\x63\xae\xb9\xa4\xb4\xe4\xd7\x48\x35\x9c\xda\x94\x54\x5e\x62\x87\
+\x0c\x33\x51\x44\x36\x1c\x43\xaa\xe3\x4a\xe7\x21\xd7\x89\xf8\xe2\
+\xf3\x5d\xbe\xf0\xc3\x57\xf9\xf1\x1f\xba\xc9\x0f\x3d\xb3\x49\xef\
+\x24\x25\x7a\xf0\x1e\x83\xb7\xbf\x49\xd3\xdf\xa5\xe9\xef\x32\x8a\
+\x0e\x58\x2b\x46\x6f\xce\x3a\x26\xdd\xd6\x7d\xa8\x3d\x4d\xfd\xd2\
+\x31\xd4\x9e\xc6\x4b\x4f\x31\xf4\x87\x28\x69\x4f\x7c\x28\x3d\xf2\
+\xc1\x48\x4e\x4a\x37\x02\x31\x84\x7a\xd6\xca\x65\x26\x16\x0e\x9c\
+\x42\x40\x34\x42\x11\xd6\x59\xc5\xf4\x48\xe2\x36\x68\xe9\x22\x31\
+\x6c\x0e\x7a\x17\x02\xb5\x35\x9c\x08\x4c\x5c\x72\xce\x55\x9d\x72\
+\x51\xe8\x8d\xfd\x18\xbd\x0c\x4a\xc1\x40\x98\xa2\x90\xab\x24\x5c\
+\x8f\x1c\xdd\x55\x30\x42\x9b\x88\x8c\x28\x31\x71\x4d\x55\x36\x32\
+\xf4\x62\x01\x4d\x49\xaf\x59\xc5\x64\x48\x23\x0c\x67\xc5\xdd\xb9\
+\x25\x36\xc9\xfa\x32\xec\xcc\x67\xe2\xa9\x72\x17\x3d\xfc\x24\x5e\
+\x6f\xc4\x54\xb9\x3b\x17\xdc\x7b\xfd\x55\x3e\x6a\x9c\xb1\x7f\x10\
+\xa2\xec\x05\xa0\x7c\x89\x96\xe9\xd2\x32\x61\xdc\x6d\xc0\x3e\x1c\
+\x65\xef\x4a\x1a\xad\x9c\xf8\x00\xe8\x6c\x74\x19\x3f\x2c\xde\x14\
+\xe5\x05\xb2\xf0\x84\x37\xf7\x0f\x60\x1f\x94\x6b\x97\xd9\xfc\x0c\
+\x5c\xbb\xfc\xaf\xf8\x51\xe0\xfe\xf5\x4b\xec\xde\x3f\x64\xe7\xcd\
+\xb7\xe1\x6c\xc4\x78\xa1\xd8\xd9\x61\xde\xc5\x0d\x61\xb8\x2b\xe4\
+\x31\xe3\xb8\x41\x63\xb7\x07\x95\x3d\x76\x73\x7f\x9f\x1d\xd2\x55\
+\xf3\x22\x63\x86\x5c\x1a\xe5\xf4\xec\x10\x33\x68\xcc\x65\xda\xc4\
+\x0e\xe9\x8e\x52\x1e\xa3\xc8\x60\x3e\xff\x7d\x16\xf2\x9c\x5e\xa6\
+\xa0\x33\x9f\xd1\x35\x47\x48\x3c\x7b\x99\x42\xae\xb9\xf2\x44\xea\
+\x6a\x85\xfb\x66\x1e\xd1\x6a\xb7\x58\x6e\x77\xf8\xec\x8b\x2b\x34\
+\xba\xb7\x78\xea\x6a\xca\x92\x95\xb2\x6a\x6d\x30\x71\x84\x19\xcc\
+\x28\x3a\xa0\x69\x8a\xbf\xa3\x3c\xd6\xfd\x35\x70\x1e\x52\xf7\xd7\
+\x84\xef\x83\xb5\x21\x9d\x81\x0e\x0f\x76\x61\x4d\xc0\x0c\x3f\x69\
+\xd0\x70\x15\x5a\x9a\x23\xe6\xee\xda\xae\xec\xd8\x55\xa9\xb8\x79\
+\x88\xa5\x82\x2d\x5c\xe6\xf3\xbd\x5d\x86\xc9\x2d\x74\xbe\x27\x5a\
+\xce\x15\xaa\xcd\xb1\x91\x83\xaf\x92\x9d\xb0\x2b\x22\xa2\x0a\xc5\
+\xa6\x8a\x3d\x15\x02\x1a\xcc\x18\x08\xe1\x92\x13\x13\xa0\x6a\x0d\
+\x12\x2f\x97\xd0\xc1\xd5\x55\x99\xb1\xcb\x13\x20\x0e\x95\x39\xea\
+\xac\x8a\x89\xcf\x07\x30\x61\x84\x85\xc5\xd3\xee\xcf\xcc\x65\x63\
+\xd2\xd7\xe8\xab\x23\xb6\x92\x7b\x17\x3c\x23\x2e\x77\x0e\x19\xc7\
+\x4f\xd1\x51\x73\x6e\xbc\xfc\x8b\xfc\xc0\x0f\x76\x68\x2d\x6f\x62\
+\x77\x5b\x58\xbd\x43\xa2\xc1\xf7\xd9\x3d\xd8\x64\xf7\xfe\x21\xed\
+\xe1\xcd\x0b\x6f\x5c\xb9\xec\xf0\x60\x1a\xe2\x99\x07\xb8\xd1\x1a\
+\x2d\xe5\x05\xee\xbd\x9f\xf1\xf5\xff\xed\x1b\xfc\xd9\xaf\xfd\x1a\
+\xde\x1b\x7f\xc2\xd5\x2b\x3a\x9f\x7b\xee\x25\x3e\xfb\x5f\xfe\x04\
+\xf9\xc2\x06\xca\xd9\x2e\xca\xd9\x2e\xe3\xf8\x29\xa9\xab\x08\x8e\
+\xd6\x68\x18\x77\x09\x8e\xd6\xe8\x67\x83\xf9\x2e\x5c\x81\x8d\xf5\
+\xc0\x92\x59\x12\x90\x41\x0b\xf0\xb8\xca\xec\x8c\x32\x46\xba\x83\
+\xde\x54\x2f\x40\x8e\xf2\x7e\x2f\x53\xe6\xb2\x70\xa3\x60\x42\xce\
+\x14\x91\x75\x5b\x6a\xf3\x42\x01\x58\x8e\xf8\xbf\x78\xfd\x29\x3e\
+\xfb\xe2\x0a\xb7\xd6\xae\xf1\xd9\x67\xa6\x2c\x59\x29\xdd\x25\x4d\
+\x06\xb0\x0c\xd8\x22\x98\xcb\xdb\xc4\x99\x05\x76\xf9\xb9\x87\xe1\
+\x2e\x87\xe1\x2e\xab\xd6\x06\x0b\xfd\x08\x2f\x3d\xc5\xd1\xc7\x84\
+\xc6\x84\x7d\x75\xd6\xfc\x10\x7a\x11\x5f\x36\x48\x12\xe9\x87\x5c\
+\xb0\x5c\xc5\xfd\x0e\x19\xca\xe5\xf5\x0b\x5c\x71\xb5\xf9\x31\x3e\
+\x4e\x19\x44\x3e\xea\xe4\x68\x46\xd7\x79\x53\x02\x7b\xd6\x29\x1c\
+\xfb\xf1\x6c\xb8\xc2\xc0\xc6\x08\x91\x7c\xb0\xa0\x54\x14\x32\x5d\
+\x5c\x02\xa7\xf9\x02\xa6\x7e\x86\x97\x98\x72\x6a\x2e\x4a\x4c\xa6\
+\x9a\x25\x0c\xad\x8b\x13\xc1\xc0\xe6\x1f\xbc\x85\x11\x56\xc7\xa4\
+\x36\x7a\x8a\xa9\x86\x2c\xde\x3e\xd4\xec\xc4\xbb\xc1\xe6\x95\x0e\
+\x5c\xe9\x70\x79\xd1\x64\xf7\x9e\xce\xc3\x83\xef\x72\xf4\x1f\xfe\
+\x8a\x07\x8f\x63\xf6\xfc\x7d\x36\x54\xb1\xae\x76\x3b\xba\x47\xe3\
+\xb0\xce\xb5\xf5\xd9\xf8\x92\x6a\x2d\x41\x3e\xfb\x27\xa9\xd6\x12\
+\xc3\xfc\x36\x2e\x6b\x44\x97\x7a\x18\xd1\x1a\xbf\xff\xd7\xef\x63\
+\xbf\xff\x3d\x99\xbd\xd7\x6a\x1b\x1c\x54\x02\xb9\x0c\x60\xe8\x13\
+\x1c\x95\x26\xd7\x0a\xf9\x28\x97\xd8\x6c\xec\xc7\x18\x9e\xf8\x99\
+\x4d\x27\x98\x0b\x40\x3d\xb0\x04\xfe\xd5\x1b\x02\x3a\x34\x55\x49\
+\x15\x57\x03\xb7\x84\x16\xd5\xcc\xdc\x74\x82\xb9\x93\x22\x76\x05\
+\x06\xa7\x08\xe8\xaa\x3f\x45\xa9\x3f\x7e\xe6\xc5\x5b\xdc\xbc\x1a\
+\xb3\x62\x5e\x43\xff\x84\x06\xfd\x6c\x2e\x70\x27\xce\x81\xc8\xc2\
+\x8b\x6b\x73\xd9\xb8\x7a\xbf\xbe\x08\x9c\x8a\xcf\xbd\xba\xb8\x21\
+\x02\xdd\x87\xe1\x60\x93\xd5\xf6\x36\x67\x1c\x63\x27\xcb\x88\x66\
+\x6f\x5d\x62\xe3\xb2\xd0\x2b\x1f\x57\x03\xb9\x0c\xe6\x91\x12\x31\
+\xd8\x3d\x45\x1f\x7c\x4f\x06\xee\xf8\xd4\x13\x8b\xd4\x03\x91\x89\
+\xcb\xb6\xb3\xaf\x6f\x80\x2e\x54\x71\x12\x13\x17\x8c\x87\xa0\x7f\
+\x8b\x46\x46\x99\x61\xc1\xc4\x4a\x26\xb2\x63\x27\x05\x4b\xca\x19\
+\x06\x36\x53\x4d\xe0\xe5\xc4\xcb\x31\xf5\x08\x88\xf0\x12\x13\x53\
+\x17\x27\x42\x4c\x80\x11\xb9\xc4\xa6\xf7\xa1\x01\x6d\x58\x82\x2e\
+\xbf\xbc\xf9\x32\xde\xe4\x16\x27\x85\xe3\x69\x47\x7d\x30\x37\x2a\
+\xf9\x4c\x57\x61\xe7\xdd\x1a\x37\xd6\x2e\x91\x6f\xc1\xc3\x83\x88\
+\x0f\xfe\xe2\xbb\x7c\xe5\xbd\xff\x8b\xc3\xc3\x13\xb1\xbc\x25\x89\
+\xb8\xd9\xb9\xc1\xee\xc7\x1b\x6c\x04\xfb\x5c\xbd\xfe\x79\x39\xd2\
+\x2f\xab\xfe\x02\x17\x5f\xbe\x7e\xca\xde\xc3\xa7\x68\x15\x34\xed\
+\x91\xe6\x70\x79\xe3\xff\xe7\xec\x4d\x63\x24\x49\xef\x33\xbf\x5f\
+\x44\x46\x1e\x91\x77\x66\xdd\xdd\x55\xdd\x5d\xd5\xdd\xc3\x69\x0e\
+\x39\x33\xa4\x48\x91\xa2\xa4\x15\xe1\x7e\xba\x07\x00\x00\x20\x00\
+\x49\x44\x41\x54\xb5\xdc\x5d\xd0\xdc\xc5\x7a\xd7\xd2\xae\xbd\x6b\
+\x08\x82\x05\x08\x86\x77\x05\xfb\xc3\x2e\x20\xd8\x1f\x6c\xd9\x30\
+\x60\xaf\xe1\x05\x0c\xfb\x83\xf5\xc1\xb2\x56\xb0\x21\xcb\xd6\xb5\
+\xb2\x6e\xea\xe0\x50\x9a\xa1\x66\x28\x72\x86\x33\x54\x4f\xcf\x74\
+\x75\xd7\xdd\x75\x57\x9e\x11\x19\x79\xc4\xe1\x0f\x6f\xbc\x6f\xbe\
+\x11\x99\xd5\x43\x39\x1b\x8d\xc8\x23\x32\x2b\x33\xe2\x79\x9f\x78\
+\xfe\x77\x93\xa3\x9d\x32\xa5\xd5\x63\x06\xa7\x36\xc5\x55\x0f\x7f\
+\xbb\x00\x5c\x50\x2a\x1c\x53\x5b\x7b\x45\xbd\x5f\x82\xb9\x45\x15\
+\x23\xec\x63\xf6\x3a\xaa\xc0\x53\x1a\x57\x92\x1d\x74\x00\x2b\x2d\
+\x5c\x35\x19\xf6\x04\x80\xfd\x5e\x48\xc1\x2a\x31\xa9\x58\x04\xed\
+\x2e\x05\xab\xa4\x0c\xbe\x82\x25\x64\x47\xab\x9a\x11\x6c\x5c\xf4\
+\xb0\xe2\x85\x22\x19\xbf\x54\xce\xce\x74\xd3\x14\xe9\xa4\x0d\x7e\
+\xf4\xae\xc9\xb8\x3a\x61\xa5\x52\xa4\xbc\x60\xb0\xd4\x8e\xdb\xd4\
+\x2e\x65\x68\x5d\x04\x34\x97\x8e\x15\x98\x7b\x1c\x0b\x50\x3b\x24\
+\x18\x5a\x82\x39\xbf\x08\xce\xe5\xe7\xd9\xeb\x5e\x02\xf7\x58\xcb\
+\x0c\xa8\xd5\xf7\xb5\x90\x76\x48\x8d\x3e\x93\xae\x8b\x63\x2d\x02\
+\xd3\x28\x9f\x9e\x3c\xaf\x87\xa4\x1d\xd3\xe5\x56\x54\x25\x73\x23\
+\x8b\x5f\xff\x34\x56\xe7\x6d\xc5\xc4\x72\x00\xbc\x5a\x70\xac\x50\
+\xf6\xdb\x74\xc6\x0b\x74\x03\xd1\x2a\x40\x06\x56\x40\x4c\x14\xb5\
+\x26\x0c\xa8\x58\x45\xc5\xc6\x43\x62\x99\xe0\x8b\x68\x5d\xc1\x1a\
+\x32\xf4\x0b\x62\x3c\x96\x35\xc0\x2c\x46\x0a\xc0\xe3\x68\x81\x9c\
+\x71\xa5\x34\xb3\x64\x6f\x09\xe0\x34\x33\x67\xed\x88\x81\xe7\xb1\
+\xbd\xff\x6d\x95\x37\x91\x8b\x5e\x20\xc7\x0b\x31\xa3\xdc\x01\x76\
+\x78\xd0\x34\x78\xd4\x8a\x78\xd4\x8a\x28\x01\x2b\x95\x22\x4f\x98\
+\x30\x3a\x3b\xe4\x1b\xc0\xc3\xb7\xb6\xa1\x1a\x51\xb7\xaa\x74\x18\
+\xb2\xdf\x7f\x46\xf8\xb5\x33\x0e\xea\x35\xa2\xbd\x36\xeb\x5b\x6b\
+\xd0\x86\xcd\x8f\xef\xd1\xee\x0a\x66\xe5\xf0\x31\x47\x3b\x2f\x50\
+\xca\x3e\xa6\x1b\x09\x7d\x4c\xf6\x5d\xf5\x9c\x3b\x79\x81\xd5\xba\
+\xc3\xe9\x64\x43\x68\xe0\xe1\x0d\xb5\x00\x2a\xc3\x1b\x50\x78\x0c\
+\xab\x82\x8d\x9b\xb4\x69\xf5\xa6\xbd\xd4\x64\xb9\x91\xce\x96\xba\
+\x77\xc2\xaa\x9a\xe2\x31\x9e\x00\x6b\xbc\x95\x80\xcc\x5a\xa5\x19\
+\x46\xee\x59\x65\x2c\x2d\xb8\x29\xd9\xb8\x54\xce\x2a\x30\x27\x00\
+\x5c\x81\x57\xd7\x9b\x94\x56\xd6\xc9\xdf\x99\x70\xab\x52\xa4\xb9\
+\x30\xa6\x6e\x4f\x73\x28\x5a\x17\x81\x02\xef\x89\x77\x48\x73\xe9\
+\x58\xb1\xf2\x0c\x43\xc7\x6c\x5c\xb8\xfb\x71\x88\xee\xb3\xff\xf6\
+\xb7\x79\xfc\xf4\x9b\x9c\x76\x0e\x19\xb4\x87\x7c\xac\x71\xc5\x6a\
+\xed\x26\x0b\x9f\xda\xe0\xb3\x2f\xdc\x60\x52\xfb\x12\x74\x9f\x10\
+\x45\x4d\x9c\xac\x4b\x69\x12\x2a\xcf\x45\x2d\x53\x4e\xf4\x7d\x2b\
+\x87\x25\x7a\xa3\x31\xe1\xd0\x53\x4c\x3c\xe3\xa5\x28\xf6\x54\x2a\
+\xa6\x72\xd7\x55\x4a\xaa\x89\xfd\x90\xb8\x21\x62\x35\xc2\x32\x86\
+\x06\x7d\x2b\xc9\xc4\x12\xcc\xd2\xd8\x93\xcc\x3c\xf4\x45\x88\xd0\
+\xaa\x18\xe0\xc5\x63\x05\x2c\x12\xba\x57\x56\x86\x48\x00\x2b\x57\
+\x9b\x5d\x60\xe2\x0d\xd9\x3b\xff\x36\xe3\xf0\x17\xb5\x06\x7f\xaf\
+\xf3\xa0\x69\x40\xe6\x07\x79\x78\xf8\x98\x17\x6e\xbc\xc8\x6f\xbd\
+\x97\xf4\x25\x1a\x93\x15\x16\x3a\x8f\xc8\xaf\x6c\xc4\x8d\xfe\xb6\
+\xc9\x16\x3e\x8e\xeb\xef\x28\x36\x32\xad\x15\xba\x9d\x33\xc2\xd0\
+\xa0\x73\x01\x0d\x33\xa2\x7d\x58\xa5\x66\x08\x2f\xc3\x0b\x96\xcd\
+\x99\x61\x63\xae\x37\x09\x8f\x36\xe2\x16\xad\xaf\x50\x09\x2e\x98\
+\xb4\x9b\xb0\xfc\x98\x53\xa6\xc3\x17\xa5\x76\x3e\xcd\x94\xa1\xf0\
+\x98\xc1\xa9\x2d\x74\x32\x87\xb4\x43\x03\xa3\x2a\x3a\xbe\x4f\x23\
+\x72\xc5\x84\xac\xd0\xdd\x6b\x7e\x2f\xc4\x7a\xce\x88\x1f\x25\x0f\
+\x9e\x63\x24\xea\x75\x79\x69\xf6\xd5\x01\x7c\xef\x4e\x72\x42\x4c\
+\xc7\x7b\x46\xdd\x4e\x8e\x11\x10\x00\x16\xac\xbc\x66\x13\x6f\x37\
+\x12\x60\xa6\x20\x00\x5c\x28\x2d\x72\xef\xd3\x5b\x6c\x6d\xdd\xe1\
+\xbd\x6f\xdf\xe7\x7f\xfe\x7f\xdf\xe4\xcd\xf7\xff\x98\x3f\x63\x85\
+\xdb\xb6\xcb\xcb\x5f\xfd\x7d\xde\xff\xd4\x67\xf9\x7b\xff\xc9\x6d\
+\x6e\x37\x36\xd9\x6f\xef\x62\x52\x42\xd5\xed\x6b\xb9\x15\x51\xd0\
+\x27\x5b\x29\x31\xe9\xbb\x50\xc8\xa9\x5c\x62\x1d\xc8\x12\xc0\xd2\
+\x3b\x91\xf8\x8c\x81\x41\x2f\xd6\xd5\xd5\x38\x02\xa8\x34\xb1\x94\
+\x14\xb2\x3a\x5e\xea\x62\x09\x6a\x29\x2d\x0a\xd6\x90\xf1\x60\x21\
+\xd6\xc0\x02\xe8\x82\x79\xa7\x80\xb5\x3c\x4f\xb1\xb0\xa7\x97\x36\
+\x69\x33\xed\x66\x82\x1d\xad\x08\x78\x5d\x19\x78\x0f\x9a\x86\x7a\
+\x7e\xf3\xea\x2e\x23\xff\x28\xae\xd1\xbb\x10\x45\xa9\xd5\x08\xfc\
+\x1d\x35\x81\xc8\xa8\x1a\x58\x83\x3c\xa6\xb5\x42\xcd\x14\xe3\x02\
+\xfa\x40\xeb\x03\x78\x56\xdd\xa6\x61\x46\x84\xf5\x06\xf7\x1f\x5c\
+\x11\xad\xff\x0d\xb8\x03\xd9\xd8\x47\x4c\xa6\x4c\x69\x59\x48\x89\
+\xd2\xaa\xf0\x8a\x48\xe9\x50\xa9\x83\x71\x75\xc8\x20\xfe\xe2\xa5\
+\xec\x63\x06\xd8\x58\x83\xbc\xea\xb3\x56\x37\xab\x74\x2a\x11\x46\
+\xd0\x9f\x31\xca\x54\x40\x03\x21\x23\x0a\x83\x52\x02\xdc\xa5\x30\
+\x87\x6b\x8e\xe7\x02\x58\x0f\x8c\xb4\x8a\x1e\xd6\x60\x42\xb5\x3c\
+\x6d\xac\x22\x73\x29\x9a\x35\xd1\x31\xbe\xbc\x61\xb0\x5c\x10\x12\
+\x02\xa0\xb2\xb0\x4a\xeb\xea\x94\xca\xc2\x2a\x10\x70\xe1\x65\x58\
+\x9a\xc3\xca\x12\xd0\x27\x17\x87\xca\x2b\xd5\xf1\xde\xa4\xb5\x9d\
+\xe3\x07\x2f\xa1\xf0\x37\xff\x46\x9c\x45\x18\xf1\xf2\xf7\xbd\xcc\
+\xff\xd0\xa8\xf2\xcb\x2f\x2e\xf1\xf3\xff\xeb\xff\xc5\xbe\x97\xe7\
+\xd2\x2f\xb3\xf8\xf0\x3d\xdc\x7f\x7d\xce\x57\x7e\xf2\xef\x73\xeb\
+\xd3\x9f\x63\x70\x7c\x86\x1b\x64\x21\x18\x52\xce\x25\x03\x22\x7e\
+\x5c\xa3\x57\x8d\x0a\x5c\x5d\x66\xe7\x06\x3c\x9c\x41\x15\x73\x74\
+\x4e\xe9\xc5\x64\xf5\x6a\x14\xf4\x45\x7f\x65\x2d\x4f\xa3\x54\xce\
+\x92\xf9\x07\x3f\xf9\x4f\x7e\x6e\x1c\x46\xd8\xfe\x88\x61\x6c\xb0\
+\x15\xac\x21\x7e\x68\xe1\x87\x96\xba\x0f\x60\x99\x3e\x93\x20\xc2\
+\x34\x3d\x32\x64\x19\x87\x11\x56\xce\xc7\x18\x1a\x04\xd6\x04\xd3\
+\xf7\x15\x98\xf3\x7e\x0e\x3f\x0b\x96\xe7\x31\xb6\x2d\xe5\xb5\xa8\
+\xd6\x8e\xb8\xea\xbd\xc3\xe5\x35\x25\x7a\x97\x9e\x08\x45\x9f\xbc\
+\xf9\x80\xc2\xd5\x12\xd6\x55\x95\x76\x77\xcc\x5b\x57\x1d\x1e\xef\
+\xed\x91\x5d\xbc\x64\xbf\x56\x63\x6b\xa9\x45\xbf\x9f\x05\x31\x72\
+\x84\x30\xf4\xc9\x98\x16\xe3\xf1\x94\xf2\xc2\xd0\x87\x91\x48\x66\
+\x3f\xef\x44\x5c\x5c\x7a\x8c\x8f\x5b\x2c\xe4\x4f\xa8\xde\xf9\x18\
+\xb7\x22\x1f\x7f\x60\x30\xe2\x8c\x71\x7e\x8b\x5c\xe6\x4a\x80\xb9\
+\x26\x1e\x47\xf9\x3d\x26\xce\x32\xd1\xc2\x12\x86\xd7\x63\xe2\x64\
+\x69\x87\x06\x61\x36\x10\xe3\x4d\x62\x26\x68\xe4\x1c\x26\xee\x34\
+\xe0\x60\x8a\xcc\x6f\xc2\xac\x8f\x35\xb0\x19\x7b\x63\xac\xaa\xa9\
+\x1e\x97\xc2\x1c\x13\x23\x60\x62\xcc\xe6\xfd\x56\x7d\x07\xb7\x1c\
+\xf7\xe5\x9d\x64\xa9\x96\x07\x78\x91\x81\x39\xc9\xaa\xf2\x7e\xaf\
+\x6b\xd0\x2c\x4e\x01\xbc\x75\x7f\x85\x92\x55\xe2\xde\xed\xa9\x9c\
+\x19\x7b\x4e\x0c\x60\x38\x3b\x3b\x67\x7d\xc1\xe6\xc2\xcb\x50\xca\
+\x4e\x89\x65\xcd\xde\xc0\xf1\x7b\x78\x83\xe9\x73\x17\x5e\x86\xde\
+\x69\x95\x0f\xbe\x71\xc8\xd7\x7f\xe5\x6b\x5c\xee\x3f\xe1\x85\x4f\
+\xbe\x82\x5d\x76\x70\x4b\x36\x8d\xb5\x25\xb6\xee\x7f\x8c\xbf\xf3\
+\xf2\x8b\x7c\xf5\xe1\x11\x8e\x13\x50\xb7\x8a\xbc\x7d\x70\x89\xfb\
+\xf5\xd7\x29\xdc\xf4\x78\x61\xf5\x2e\x41\xc9\x20\x37\x09\x31\xcc\
+\x3c\xc8\x10\x75\x2c\x2f\x5c\xcb\xc7\xb0\xb3\xf4\x7a\x97\xbc\xf5\
+\xc6\xeb\xd8\xd6\xd4\xe8\x1c\x4f\xf2\x71\xf3\x19\x97\xd5\x5c\x8d\
+\xad\xcf\x6f\x60\x79\x6b\x8c\x30\xc8\x96\xb3\x54\x07\x06\x79\xc0\
+\x9b\x98\xe4\x81\xff\xe5\xdf\xfc\x3f\x64\x7e\xfc\x27\xfe\xf1\xcf\
+\x01\xf8\x71\x4f\x80\x8a\x9f\x25\xf2\x27\x64\xc3\x80\x6c\x18\x30\
+\xa4\x30\x03\xea\xa1\x5f\xc0\x34\x3d\xfc\xd0\x22\x34\x6a\x64\xb2\
+\x82\x89\x87\x51\x15\xc3\xe8\xe1\x4f\x6a\xe4\x0c\x1f\x7c\x8f\x71\
+\xb4\x40\xd6\xef\x91\xf7\x73\xb8\x91\xcd\x64\xb2\x42\x77\x74\xc5\
+\x52\xe1\x90\x25\xdb\x98\x01\xf3\x83\xa6\xc1\x37\x5e\xbf\x4d\xdd\
+\xbf\x03\x41\x95\xcb\xee\x05\xdf\xba\xff\x2d\x46\x2d\x9f\x83\xf3\
+\x90\x8b\x8b\x90\x4f\xfe\xad\x13\x38\xb7\xa9\x56\x26\xf4\x2e\x85\
+\x81\x13\x95\x03\xc2\x6c\x80\x39\x99\x82\xb8\x15\x4d\x28\x60\xe0\
+\x38\x19\x72\xb9\x0c\x97\x97\x13\xba\x83\x31\x4f\x9e\x9c\x72\xbe\
+\x73\x44\xb8\xde\xc3\xa8\xf6\xa8\x2c\xfc\x6d\xca\xb5\x0f\xb8\xba\
+\xda\x80\x62\x8d\x5c\xe6\x8a\x49\xb8\xc0\x24\x5c\xa0\x54\xdb\xc3\
+\xbf\x18\x08\x29\xe1\xf5\xb0\x0d\x18\x46\x06\x5c\x88\x3c\x85\x41\
+\xde\xa4\xc8\x08\xd7\xf2\x29\x18\x79\x02\xd7\xc4\x2f\x7a\x54\x46\
+\x25\x02\x5f\xdc\xcf\x05\x45\xcc\x49\x16\x73\x92\x55\xec\x7b\xdd\
+\x2d\x5f\xf5\x99\xb8\x62\x7f\xbf\xe8\xe1\xc5\xee\xb3\x4a\xbe\xa8\
+\x6a\xf7\x9a\x8d\x88\x95\x8d\x06\xeb\x0b\x59\xb6\xee\xaf\x50\x69\
+\x42\xde\x86\x72\x7e\xca\x6c\x95\x85\x55\x9c\xd3\x88\x5c\xd9\x20\
+\x5f\x2c\x33\xf0\xcd\x04\x13\x03\x38\x7e\x0f\x72\x1f\x83\xe0\x8a\
+\x0b\x2f\xc3\xf9\x91\x41\xfb\x69\xc0\x37\x8f\x8e\x79\xfb\xd1\x01\
+\x6f\x1c\xfa\xbc\xbb\x7f\xc6\xc1\xaf\x7f\x97\x85\xdb\x11\x77\x6e\
+\x3f\x80\x4c\x01\xdf\xce\x71\xab\xb1\xc8\xf7\xdf\x59\xe6\xd9\x38\
+\xc7\xc3\xed\x03\x26\x66\x95\x67\xe3\x21\xce\xce\x77\xa8\xad\x67\
+\x59\xb9\xd1\x24\x18\x16\x71\xfd\x88\xa5\x6c\x71\x9a\x6b\x91\xa9\
+\x90\xf5\x47\x50\x5c\x64\x6f\xcf\xe3\xfd\x47\x0f\x13\x20\x2e\x17\
+\x7b\x8c\x27\x79\x8c\xc0\xe5\xc1\x8b\x8b\x2c\x2d\xdf\xc2\xce\x07\
+\xe4\x02\x9b\xec\xc4\x50\xd2\x42\x26\xe4\xff\xca\x2f\xfe\xb6\x90\
+\x13\x51\x77\x84\x11\x8b\xe8\xbe\x35\x01\xf2\x6a\x78\x8b\x74\xa5\
+\x29\x39\x11\xbb\xda\x86\x7e\x41\x79\x27\x94\x7f\xcf\xf0\x70\x23\
+\x21\x37\xa4\x26\xce\x1a\x9e\xea\x4b\x11\x06\x2e\x05\x6b\x48\x2e\
+\x12\xae\xb5\x79\x3d\x84\xbf\xf1\xfa\x6d\xc2\xa3\x0d\x06\xf6\x90\
+\x62\xa3\xc0\xc5\x5a\x12\xe5\xe1\xfd\x55\xa0\xcf\x77\x27\x0b\x34\
+\x2f\x3c\x8c\xaa\xf2\xc3\x27\x7a\xa1\x4d\xfc\xa1\x9e\x6c\xa7\xf4\
+\xaa\x0c\xd3\xb6\xc2\x1e\xbb\x7f\xd8\xa3\x5e\xaf\xf1\x62\xf3\x5b\
+\x98\xf6\x06\xeb\x5b\x87\x71\x98\x3a\x96\x0e\xa7\x36\x03\x6c\xe5\
+\x33\x16\xc5\x8a\xb1\x5b\xad\x2a\x00\x95\x35\x27\xf4\x28\xd2\x2c\
+\x0f\x68\xc5\x61\x5f\x6b\x60\xcf\x00\x55\xc9\x88\x6a\xa4\xb5\x01\
+\x4d\xbe\x56\xf5\x45\x7b\x26\xb9\x0c\x65\x16\x5c\xcd\xac\xaa\xcc\
+\xb4\x5a\xa3\xc6\xab\x0f\x9a\xb1\x7c\x58\xa6\x12\x27\xf4\x49\x19\
+\x21\x6d\x08\x80\xc6\xea\x21\x76\xff\xd3\xf4\x2a\xd3\xe1\x2d\xa3\
+\xf3\x15\x11\x81\x53\xd4\xf7\x21\x17\x5e\x06\xe7\x34\x62\xfb\x78\
+\x97\x9d\xed\x33\x0e\x8e\x3d\x2e\x7b\x59\xee\xdd\xbe\x01\xc6\x31\
+\xbf\xb1\xf3\x3a\xc1\x7f\xf1\x88\x27\xff\xf1\x84\x1f\xfb\xf7\xff\
+\x19\xf5\xd2\x15\xbd\x46\x9e\x57\xbf\xf4\x2a\x3f\x7b\xe7\x36\xff\
+\x0a\x78\xf3\x6b\x7f\xcc\x62\x65\x89\x6f\x1e\xc2\x8d\x7f\xfb\x3e\
+\x4b\xb5\x7b\x34\xef\x82\xe7\x56\x38\x26\xa0\xcc\xd4\xed\xf6\xbc\
+\x9b\x33\x98\xed\x66\xd4\xce\xe6\x30\xc6\x86\x32\x12\x25\x80\xfd\
+\x81\x29\x3a\x00\xfd\xf8\x4f\xfc\xe3\x9f\x33\x62\x31\x1c\x75\x47\
+\xc8\xfb\xbe\x69\x29\x76\x96\x00\x1e\xfa\x05\xa2\x68\x02\xa5\x2c\
+\xe1\x18\xc5\xce\x7e\x68\x91\x37\xe3\x9e\x5e\x46\x8f\x0c\x59\x06\
+\x7e\x06\xd3\xf4\x18\xf8\x19\x6c\x33\x27\xf4\x75\x29\x4b\xde\xcf\
+\x51\x2d\x2d\xd1\x77\xc7\x34\x4b\x25\x96\x0a\x87\x5c\x7a\x22\x31\
+\xe7\x62\x34\x21\x30\x7b\xd8\x79\x8b\xe5\xaa\x8f\x91\xe9\x53\xae\
+\x1d\x70\x1e\x4d\x30\x96\x3d\xce\x1f\xe6\x31\x5a\x0e\xcb\x2f\x8d\
+\x59\xbe\x82\x9e\xdb\x24\xeb\x1a\x62\x1c\x97\x33\x62\x6c\x58\x62\
+\xd0\x4b\xe8\xc7\xd5\xd6\x86\x0a\x10\x74\x8c\x88\x8a\x65\x13\x86\
+\x22\xdb\xac\x64\x0c\xc9\x19\x35\x32\xa3\x2e\xdb\xad\x2e\xee\xd5\
+\x33\xce\x2e\x2d\x7c\xf7\x8a\x6c\xd9\xc7\x9d\xbc\x40\xa9\x76\xc6\
+\xc4\xc9\xaa\xad\x04\xb0\xcc\x26\x23\x0f\x93\x71\xa8\x3c\x07\x92\
+\x3d\xf5\x6d\x98\xf5\x15\x0b\x03\x2a\x73\x4d\xbf\xc9\xfd\x27\x41\
+\x49\xed\x27\xf7\xad\xe4\x8b\x8a\x7d\x0b\xb5\x02\xaf\xde\x9d\x05\
+\x30\x40\xc5\x5c\x87\x4c\x1c\xde\xcf\xb8\x8c\x3d\x07\xab\x78\x93\
+\x30\xff\x01\x21\x35\xaa\xfd\x45\xda\xe6\x90\x6a\xbd\x9f\x90\x0e\
+\x03\xdf\xe4\xc9\xde\x0e\xad\xf7\x43\x5e\x3f\x18\xd0\x3a\xbd\xa2\
+\xd5\xf5\x58\xa8\xae\xab\x16\x58\x3f\x52\x1e\xf1\xa7\xc3\x32\x7f\
+\xf0\xbb\xbf\x4d\xdd\x3b\xe6\xe3\x4b\x2f\x61\xaf\x2e\xc7\x95\x29\
+\x79\xbe\xf8\xea\x5d\x1e\x9e\x79\x3c\xdc\x3e\xe0\x46\x29\xcf\xdb\
+\x07\x97\x64\x4e\x0f\xd9\xfa\xf4\x3a\xd5\x8a\xc5\xb0\x6f\x32\xca\
+\xda\x4c\x46\x23\xf2\xd9\x12\xae\x1f\x51\xcc\x5a\x3c\x3b\x1f\xcc\
+\x30\xb1\x39\x3a\x27\xb2\x4a\x18\x81\x8b\xbd\xb4\xcc\xbd\xad\x9b\
+\x64\x73\x8b\x94\x27\x50\x30\x73\x74\x03\x87\xb1\x99\x27\x18\x3a\
+\xd4\xcc\x1c\x3f\xff\xcb\xbf\x4e\xe6\x27\xfe\xc9\xbf\xfb\x73\x12\
+\xac\x45\x2b\xc0\x37\x2d\xda\x13\x1b\x3b\x93\x34\x36\xa4\x2e\x2e\
+\x58\x43\xc2\xac\x00\x71\xc1\x1a\x62\x99\x3e\x7e\x68\x61\x9a\x1e\
+\xc3\xa8\x4a\xc1\x98\x66\xbc\x49\xdd\x6c\x9a\x53\x59\x91\x21\x4b\
+\x86\x2c\xc5\xc5\x5b\x58\x85\x1b\x94\x2a\x5f\xa2\x18\x8d\xd8\x3b\
+\x38\x22\x1b\xeb\xd9\xf6\xe2\x09\x95\x9b\x5d\x0a\x57\x4b\x84\xf9\
+\x36\xa5\x1b\x11\xed\xbf\xa8\x13\x3c\x9d\xe0\xe5\x4d\x4e\xc7\xb7\
+\x39\x0f\x8b\x94\x4f\x9e\x61\x98\x65\xaa\xe3\x0c\x8e\x61\x4c\x75\
+\xb0\x96\x77\x5b\x8d\xd3\x23\x87\x06\xe4\xc2\x80\x8e\x11\x31\x34\
+\xc0\x8b\x53\x1a\x23\x0a\x14\x8c\x3c\x8e\x93\x61\xdc\x17\xc3\x4d\
+\xba\x97\x65\x8a\x91\xd0\xc0\xd0\x60\xe2\xf8\xb4\xa8\xd2\x34\x46\
+\x78\x43\x18\x45\x23\x02\xd7\x24\x37\xb4\xf0\x4a\x42\x0f\x57\xcb\
+\x03\x5c\xcb\x57\x46\x9b\x04\xa3\xdc\x4a\x50\xa7\xf5\xef\xc8\xcc\
+\x4d\xf5\x6f\xac\x87\xa5\xec\x98\x18\x01\xb9\x5c\x46\xe9\xdf\x8f\
+\xdd\xac\xf2\xe2\x8a\x41\xa1\x94\x04\xf0\x4a\xa5\x38\x05\xb0\x26\
+\x27\x44\x5f\x0f\x01\x60\xaf\xf2\x36\x0b\x76\x59\x01\x77\xe0\x9b\
+\x38\xa7\x11\xfd\xed\x23\xbe\xf9\xc1\x84\x6f\x6f\x6f\x73\x76\xe2\
+\x31\x18\x65\x58\xa8\xae\xd3\x8a\x5a\x78\x91\x85\x87\x47\x2f\x73\
+\x83\x62\xbe\x44\x60\x65\xf9\xe3\xd7\xdf\xa0\x7f\xf2\x2e\x9f\xa8\
+\xaf\x53\xdc\x68\x60\xe6\xc6\x14\x16\x1a\x7c\xe1\x07\x3e\xc5\x07\
+\x7b\x1d\x25\x2d\xee\xf6\x73\x9c\x1d\x5c\xf0\xb9\x57\x6d\xfc\xea\
+\x3a\x13\xa7\x4f\x29\x63\xe0\xfa\x11\xa5\xcc\x84\x28\x58\xe4\xb8\
+\xf3\x98\xf7\xdf\xdf\x57\x20\x6e\x8f\x2c\x8a\xf4\x15\x88\xef\x17\
+\x2b\x6c\x7d\x7e\x83\x49\x2f\xcb\xd8\xcc\x33\x0c\x1c\x6a\x99\xb2\
+\xda\xf6\x30\xf8\xc5\x5f\xfe\x35\x61\xd8\x29\xa0\xc6\x60\x96\x00\
+\xd6\x99\x39\x01\xe6\xa0\x44\x3e\xd3\x17\x2e\xb7\x18\xc4\x96\xe9\
+\x13\x50\x24\x67\xf8\xca\xf0\x9b\x30\xc0\x36\x73\x84\x4c\x98\x04\
+\x11\x94\xb2\x0c\x87\x11\x79\x53\xe4\x26\x67\x83\x12\x76\x71\x15\
+\xb7\xd3\x66\x64\xbd\xcb\x49\xe4\xf1\xc2\x52\x01\xe7\x4a\xe4\xfc\
+\x0e\x17\x2e\xd8\x6c\xff\x30\xc1\x59\x91\x61\xc5\xa2\x91\x5b\x22\
+\x6b\x44\xac\xd7\x7a\xdc\x9b\x34\x58\xa8\xd7\x69\x56\xb3\x9c\xf5\
+\xc4\x84\x4e\x59\x71\xac\xae\x1e\x31\x13\x0f\xf2\x26\x0b\x51\x8f\
+\x88\x82\xca\xd3\xd5\xf3\x6f\xe9\x19\xe4\x2a\x22\xbf\xd7\xca\x89\
+\x96\x53\x41\x98\xc1\xf7\x0b\xe4\xd6\x1a\x18\x5e\x06\x9b\x2e\xed\
+\xd0\xa0\x33\x8e\xa8\x1b\x05\x26\xe3\x90\x5c\xc5\xa4\x60\xe4\xf1\
+\x2c\x97\x9c\x51\x23\x70\x67\x1b\x72\x55\xcb\x03\x46\xe3\xec\x5c\
+\x30\x4b\x00\xab\x4b\xbd\x99\x13\x00\x2e\x8b\x86\x78\xb9\x5c\x46\
+\x34\x18\xd4\x3c\x10\x3a\x80\x1b\xed\x2c\xb5\xe5\xd9\x4a\x13\x63\
+\xb2\x42\xa9\x7c\x48\x18\xbb\xe3\xc2\xfc\x07\xd4\xed\x9b\x5c\x78\
+\x62\x41\xf7\xaf\x4e\x19\x7b\x0e\x4f\x8e\x2e\xf8\x83\x0f\x26\x5c\
+\x3d\x3b\x54\xc9\xf2\x46\xce\xc4\x75\x1c\x0c\xad\x3b\xa5\x17\xff\
+\x5b\xc8\x2f\x12\x65\x3c\x3e\x3c\xed\x70\xfa\xfa\x1e\x2f\xdd\xbd\
+\xa4\x72\xe7\x53\x90\x29\x50\x2a\x98\xfc\xc8\x8b\x5b\x3c\x3c\xf3\
+\x38\xda\xdb\xe1\x70\x78\xc4\xc3\xc3\x1d\x16\x7d\x9f\x97\x3f\x96\
+\x21\x30\x8a\xb8\x81\x09\x85\x0c\xb9\x30\xc2\x30\x43\x4e\x5b\x59\
+\xde\x7f\xf4\x90\x61\x60\x62\x5b\x21\xc3\xc0\x64\xb1\x31\x51\x9a\
+\xb8\x76\x67\x95\xad\x1b\xeb\x80\x4d\xcd\xcc\x31\xea\x8d\x18\x65\
+\x27\x22\x57\x23\x70\xc8\x96\xb3\xfc\xc2\x2f\xfd\x7a\x72\x40\xb9\
+\x94\x0c\xea\x60\xd4\xe6\xcf\x26\x0b\x03\x57\x19\x7c\x52\x1b\x0f\
+\xfd\x02\x56\x65\x40\xbf\x2f\x06\x9a\xfb\x95\x08\xbf\x5f\x60\x48\
+\xa8\xc2\xd4\xd3\x28\x5f\xec\x53\x5d\x2a\xe1\x5e\xf4\x55\xc6\xda\
+\xc7\x6b\xa5\x44\x97\xcb\xfa\xe3\x8f\x93\x77\xaa\x2c\x2f\xc2\x32\
+\x90\xdf\xa8\x72\x70\xd7\xe3\xd6\xd8\xe6\x20\xe7\x69\x61\xe4\x21\
+\x27\x8f\x1f\xd3\xd2\x0b\x29\xe3\x5c\x5b\xbf\xe8\xb1\x94\x59\x66\
+\xe2\x0b\x40\xd7\xf5\x2a\x0a\x73\x2c\xf4\xa9\x09\xa5\x5e\x4e\xf4\
+\xbe\x95\x2d\xa8\xa4\x5b\x67\xbf\x8b\x51\x16\x85\x9b\xdd\xb0\x8b\
+\x21\x9a\xe3\xa8\x84\x1c\xd7\x99\x40\x11\xd5\x73\x4d\x0f\x4c\xf8\
+\x45\x2f\xf6\xeb\x4e\x34\x1f\x32\x73\xc3\xc9\x7a\x30\x43\xef\x9e\
+\xd9\xac\xad\x6a\x2e\xb4\x24\x03\xe7\xd7\xd6\x39\xed\xef\x26\xf4\
+\x30\x40\x79\xd5\x60\xc2\xad\xb8\xe8\x20\xa0\xe3\x91\x00\xf0\x59\
+\x7f\xc0\x93\xbd\x2c\x8f\xde\xd9\xe3\xb2\x97\x05\xb2\xaa\x57\x85\
+\x6c\x7f\x95\xbe\xb5\x08\x20\x6a\xd1\xac\xde\x05\xe0\x4f\x7a\x0f\
+\x09\x7e\xf6\x11\x3f\xf5\x9f\xdf\xe6\x85\x7f\xef\xd3\x98\x61\x83\
+\xfa\x66\x93\x7f\xf5\x5f\xff\x34\x3f\x1b\x6b\x64\x80\xff\xe9\xb7\
+\xde\xc3\x37\xd7\xf8\x77\xfe\xe9\x4b\x0c\xfc\x88\xc1\xb0\x4d\x29\
+\xae\x00\x3f\xbd\x14\x35\x7d\x8d\xbc\x20\x9e\x05\x8e\x19\xb4\x81\
+\xfc\xac\x2e\xee\x76\x66\xb5\xb4\x3f\x30\x29\x85\x39\xd1\xa0\xa0\
+\x10\x77\x29\xd6\x01\xac\x1b\x76\xe9\x9b\x7c\x4d\xdf\x5f\x82\x74\
+\x26\x6b\x29\x4e\x2a\xd2\xff\x46\xdf\x0f\xb1\x2a\x06\xa3\xa1\xc9\
+\xe9\xa3\xbd\xb9\x9d\x7d\x00\x96\x0b\xcb\xac\x2c\x79\xdc\xc8\xdc\
+\xe2\x96\x91\x65\x61\xa5\xce\xa7\x1a\x6b\x2c\xac\xd4\xd9\xba\x73\
+\x87\xd5\xfa\x06\xab\xf5\x0d\xbe\xf0\xf1\xfb\xdc\x7a\xe5\x8b\x82\
+\x59\x35\x00\xcb\x04\x99\xce\x9c\x03\x40\xcf\x10\xd1\x2f\xad\x54\
+\x48\x2f\xef\x71\x9d\x89\xf0\x05\xb7\xfa\xb4\x3a\x72\x86\xb0\xad\
+\x52\x2e\xf5\x84\x9c\x74\xee\x43\x2b\x34\xd4\xf3\xf2\xbb\xc8\xfd\
+\xf5\x72\x7e\x3d\xc2\x17\x50\x53\x00\xce\xd0\xa5\x99\x81\x17\xee\
+\xdc\xe1\xf6\x9d\x8d\xb9\x00\x06\x88\xb2\x67\x73\x25\x84\x88\xbe\
+\x8a\x34\xc1\x9d\xa3\x0b\x26\xdc\x22\xcb\x01\xce\x69\xc4\xd3\xc3\
+\x55\xde\x7b\x27\xe0\xd1\xdb\xae\x62\x5f\x09\xda\x16\x02\xc0\xb2\
+\x52\x5a\xaf\x98\x96\xe3\x80\xf7\xfb\xcf\x44\xbb\xaf\xea\x5d\x7e\
+\xe3\x38\xe2\x7f\xff\xef\xfe\x4b\xce\xfe\xf4\x37\x09\xcd\x76\x0c\
+\x44\x83\xff\xf4\xef\x7f\x9e\xca\xfa\x16\x93\xf3\x47\xb4\xda\x06\
+\x6f\x7e\xfb\x77\x79\xfb\xe1\x1f\x51\x2b\x89\xf3\x70\x15\x64\x54\
+\x3a\xa6\x32\xde\x46\x56\x3c\xa6\x41\xef\x00\x15\x5f\x55\x75\x5c\
+\xf5\xa7\x19\x72\x55\x22\xd1\x01\x48\x02\x4b\x67\x61\x19\xa1\x93\
+\xcf\xe9\x85\xa2\x05\x6b\x88\x17\xb3\x70\xdb\xec\x61\x8f\x97\x13\
+\xde\x0b\xc1\xc8\x86\xa8\x08\xa9\xcc\xd6\x87\xc9\x7d\xf2\x85\x22\
+\xfb\xdb\x87\xfc\x9f\xbf\xff\xfb\xac\x6f\xad\xd1\x58\xdb\x4b\xec\
+\xf7\x29\xe7\xa7\xb9\x71\xc3\x8f\xe3\xe7\x00\xeb\xe8\x50\x2f\xe1\
+\xc3\x2a\x1c\x0f\x05\x6b\x7f\x76\xb3\xc4\xc3\xf7\xf2\x74\x3a\xfd\
+\x44\x0e\x83\x1e\x45\x2b\x85\x39\x5c\x67\x9c\xa8\x6f\xc3\x8c\xbd\
+\x16\x3d\x43\x31\xb1\x6b\x8e\xd5\x73\x92\xad\xa5\x6b\x4c\xa6\x3d\
+\x76\xe3\x9c\x5e\x09\x4c\x09\x48\xc9\xb6\x2e\x93\x44\xf2\xbb\x04\
+\x7a\xd0\xab\x53\xad\x76\x14\x53\xcb\x1e\xc5\x72\x41\x64\xe8\x52\
+\xb1\x36\x58\x59\xcf\x70\xff\x81\xc9\x72\x21\x43\xa5\xb9\x3c\x73\
+\x1c\x25\xfb\xea\x2c\xdc\x8f\x83\x1b\x62\x2b\x98\xb8\xb9\x30\xa6\
+\x7d\x1a\x71\x3a\xf4\x79\xb2\x77\xc4\xa3\x77\x44\xfe\xee\x65\x3f\
+\xc9\xbe\x9d\x32\xd4\x1d\x68\x95\x83\x69\x87\x1f\x8d\x99\x25\xa0\
+\xc5\xa4\x54\x9b\x56\xd4\xe2\xde\x9d\x02\xaf\x75\x3d\xf8\xd9\x5f\
+\xe0\xbf\xfd\xd5\x2f\x62\xdd\x01\xb3\x7e\x87\x57\xbf\xf4\x2a\xff\
+\xa2\xd5\xe1\x5f\x03\xfd\xa3\x1d\xbe\xfa\xee\x23\xee\x7f\xf5\x92\
+\xad\xa6\xc1\xda\x9d\x09\xed\xab\x01\xbe\x96\x6f\xde\x1e\x59\x2c\
+\x70\xcc\xa9\x07\x61\x7d\x19\x73\x74\xae\xb2\xd8\x64\xa5\x48\xf6\
+\x20\x62\xd2\x98\x56\x8d\xc8\x6c\x39\x71\x25\x4e\xb1\x6a\xd4\x15\
+\x00\xd6\x99\x58\xa6\x69\x56\x2c\x53\x81\x74\x1c\x2d\x60\x8f\x97\
+\x15\x30\xa3\xee\x68\x86\x99\x93\x12\x62\xea\xae\x6b\x56\x0c\xf6\
+\xb7\x9f\xf1\xdb\xff\xe3\xaf\x13\xed\x8b\x94\x9f\xef\x73\xbe\x28\
+\xfc\xc4\x4b\x3f\xc4\x57\x8c\xaf\xb0\x56\x79\xc6\x8d\x92\x68\x9a\
+\x71\xa3\xb4\x44\x94\x3d\x53\x8f\xcb\xab\x86\xda\xae\xd4\xd7\xb9\
+\x51\xf0\x29\xd6\x33\xd3\xaa\xde\xde\xd4\x2b\x21\x80\x3b\x51\xc0\
+\x95\xcc\x3b\xf7\x75\x9d\x91\xe3\x9e\x06\xfa\xf3\x93\x8a\x85\x11\
+\xf4\x71\x9d\x89\x02\xf0\xa4\x62\xcd\x24\xff\xe8\xee\xbc\xaa\x9f\
+\xf4\xa7\xe9\x9f\x59\x33\xab\x6a\x92\x92\x5c\x34\xb5\x7a\x8d\xb5\
+\xf5\x0c\x37\x9a\x4b\x2c\x17\x96\xe7\x5e\xa1\x56\x2a\x45\xce\xfa\
+\x83\x84\x06\x6e\x2e\x8c\x13\x8c\xdc\xbf\x12\xe9\x8b\xad\xab\x1c\
+\xee\x59\xc0\x77\xde\x5f\xe0\xd1\x3b\xdb\x71\x9b\x80\x42\x42\x32\
+\xc8\xfb\x66\x39\x43\x5d\xfb\xba\x66\x39\x33\x33\x68\x32\x74\x92\
+\x97\xfa\x66\xf5\x2e\xbf\x75\x74\xc5\x6f\xff\x57\xff\x0d\x61\x4b\
+\xb0\x71\xd7\xb0\xf8\x3b\x9f\x79\x99\x97\xee\x8b\x31\xc6\xf5\x66\
+\x85\x3f\x7c\xf8\x1e\x7f\xf1\xb5\xd7\x71\xba\x17\x94\x1a\x79\xfc\
+\x14\x13\x5f\xd5\x0a\x2c\xc7\x00\xbe\xe2\x06\xd1\xf8\x52\xe5\x13\
+\x03\xf8\xd5\x56\x82\x8d\x75\xb7\xa9\x39\x88\x8d\xda\x28\x8e\x53\
+\x4b\x1d\x3c\x70\xd1\x7c\xc1\x02\x8c\x6e\x64\x53\xb0\x44\x8e\xb0\
+\xf4\xf9\xca\xa4\x1f\xa3\x26\x80\xef\xe5\xce\x95\xac\x90\x6c\xac\
+\x12\x88\x62\x1d\x7c\x75\x34\xe4\x6b\xbf\xfe\x4d\x9e\xb4\x9f\xd2\
+\x69\xf5\x59\xbe\xda\xa0\xdf\x12\x40\x2e\xec\x3e\xa0\xb2\xb0\xca\
+\xcd\xdc\x27\xe8\x55\x2e\x15\x70\xe5\xa5\xf2\x46\x69\x89\x6a\x7f\
+\x91\xcd\xcd\x90\x6a\x7f\x91\x8d\x8c\x4b\x79\xd5\x60\xd0\xd1\xb4\
+\x9c\x04\xa2\xce\xaa\x12\x60\xf1\x6b\x0a\xcc\xf1\xeb\x6a\xab\x57\
+\x1d\x6b\x60\xd4\x2b\x98\x75\xb0\xa6\x73\x79\x75\x4d\x2b\x2b\x35\
+\xa6\xd5\xce\xb3\x61\xd6\x7a\xd7\x4c\x04\x31\x5e\x5d\x6f\x72\xff\
+\x81\xc9\xe6\xed\x0c\x95\x26\xb3\x5e\x08\xe0\xa4\x7f\x73\x46\x07\
+\xb7\xae\x72\x54\x16\x56\xc9\x72\xa0\x18\xd9\x39\x8d\x78\xb2\x3f\
+\xe0\x57\xbf\xf5\x4d\xde\xfd\xe6\xeb\xb4\xba\xde\x73\xe5\x42\x2b\
+\x6e\x14\x6e\x96\xc5\xfd\xd0\x09\xa8\x94\x6d\xd5\xbf\xc2\x65\x9c\
+\x78\x7f\x2b\x2c\x80\x71\x4c\x60\x36\x79\xeb\xfd\x6d\xfe\xf2\xb7\
+\xbe\x4a\x14\xec\x51\x8b\x7c\x8c\xad\x65\xfe\xd9\x7f\xf8\x25\x2a\
+\xeb\x5b\xb8\xd6\x3a\x4f\xf6\x86\xfc\xd5\x1f\xfc\x11\x1f\xbe\xf1\
+\x94\xc6\x64\x4c\x33\x35\x0b\x7a\xa1\x3b\xe4\xbc\x73\x4e\x98\x9f\
+\x2e\x5c\x79\x95\x15\x12\xae\x89\x5b\x1c\x27\x6a\xf8\xe4\x79\x30\
+\x8b\x5a\x41\x81\x97\x3b\x57\x60\x96\xcf\xeb\x00\x34\x8b\xc9\xac\
+\xb4\xa1\x9f\x4c\xdb\xf4\xac\x7c\x82\x9d\x6d\x7f\x84\xdf\x8f\x30\
+\x33\xe2\xc3\x2a\x95\x22\x97\xdd\x5d\x7e\xed\xd7\xbe\xce\xc3\xf7\
+\xcf\xa9\x5b\x55\x32\xd5\x0e\xc5\x46\x41\x9d\x24\xa5\x83\x62\xa3\
+\x04\xa0\x57\xb9\xa4\xda\x5f\x54\x4e\xfb\xfc\x7a\x5d\x39\xed\xcf\
+\xe3\x01\x8e\x85\xb5\x9b\xac\xad\x2d\x25\x81\xa2\x81\x59\x3d\xdf\
+\x33\x66\x8c\x3f\xfd\x39\xf9\xfc\xa4\x62\x25\xc0\x6b\x0d\x6c\xb2\
+\x7d\x9f\x6e\xd8\x4b\xfc\x0d\xf9\x19\x72\x2b\xf7\x97\x8f\x9b\x66\
+\xa4\x72\x28\xa4\xa1\x29\x35\xb3\x6e\xc0\xdd\xbb\x53\x60\x65\xa3\
+\xa1\xf4\xef\x3c\xe9\x20\xc1\xbb\x56\x79\x36\xa3\x8d\x9b\x0b\x63\
+\x9c\xd3\x48\x19\x74\x4f\xf6\x76\xf8\xea\x5f\x3c\xe1\xb5\xd7\xc6\
+\x9c\x1d\xb6\x55\xa2\x50\xdf\xf1\x12\xcc\x2b\xb5\x70\xe8\x04\x4a\
+\xf7\xca\xfb\x2e\x63\xda\x61\x87\x12\x39\xd1\x71\x33\x1a\x2a\x40\
+\xeb\x40\xae\x37\x2b\xfc\xc6\x71\xc4\xff\xf1\xab\xbf\x40\xe7\xbd\
+\xdf\xc4\x98\x74\x31\x87\x23\x3e\xfd\xc2\xdd\x04\x1b\xbf\xe6\x85\
+\xfc\xe1\xd7\xdf\xe4\x6c\xf8\x94\x61\xd6\xa3\xf7\xec\x50\x8d\x1b\
+\x96\x7a\xd8\x1c\x9d\xb3\xc0\x31\x46\x6e\x91\x1b\x05\x5f\x94\x27\
+\xf5\x23\x8c\xa0\xa5\x6a\xfb\x66\xfc\xec\xad\x62\x97\xa8\x3b\xc2\
+\x5e\x88\xb0\xc7\xcb\x53\x46\xd5\xf2\x89\x65\xef\x89\x84\x11\x61\
+\x99\x4a\x72\xd8\xfe\x28\x21\x19\x6c\x7f\x84\x77\x65\x24\xbc\x19\
+\x56\xa5\x42\xbf\x3f\xe0\x77\x7f\xe3\x21\x6f\xfc\xd9\x1f\xa9\x95\
+\x5d\xab\x0b\x4b\xd5\x30\xb7\x38\xe9\x8b\x6c\x2b\xe7\x34\xa2\x57\
+\xb9\x64\x74\xbe\xa2\x00\x7c\xec\x5e\xe0\x9c\x46\x1c\xbb\x17\xec\
+\x7e\xb8\x4d\xaf\x72\xc9\xee\xae\xc9\x72\x5b\x9c\xa0\xcf\x7d\xfc\
+\x0e\x9b\xf7\xee\xd2\xac\x37\xa6\xa0\x95\xe0\x8c\x8d\xb5\x19\x03\
+\x4e\xb2\x63\x7c\x5f\x02\x50\xa6\x48\xa6\x8b\x3b\xa5\x51\x27\xb3\
+\xd4\xe6\x97\xdf\xd8\x09\xe3\xad\x15\x1a\x34\x7b\x41\x82\xdd\xa5\
+\x61\x28\xd9\x77\xb3\x29\x3c\x10\x42\x03\x2f\xcf\x30\xf0\x59\x7f\
+\x90\x00\xaf\x8c\xc8\x25\x0c\xa3\xd3\x0d\xa2\xec\x19\xce\x69\xc4\
+\x1b\xdf\x9d\xf0\xee\x5b\x67\xfc\xc9\xdb\x8f\x79\xb2\xbf\x23\x7a\
+\xbb\x55\x44\xd7\x22\xa1\x69\x05\x98\x25\x20\xa5\x84\x90\x4c\x2c\
+\x25\x84\x18\x8c\x5e\x51\xdd\x8f\x64\x27\x23\xd9\x3a\x4b\x02\xd9\
+\x2c\x67\xa8\x37\x2b\xfc\xc9\x3b\x7d\x3e\xf8\x9d\xa7\x30\x38\xa5\
+\x6a\x3a\x98\x75\x93\xff\xe0\x27\xff\x96\x62\xe3\x56\xdb\xa0\xbe\
+\xd7\xe1\xc3\x37\x9e\xd2\xe9\x74\xa8\xce\x57\x4b\x4a\x4e\x1c\x0f\
+\x2d\x3a\x43\xf1\xe5\xda\xe6\xfc\x9e\x76\xa5\x30\x87\xd9\x1c\xd4\
+\x12\xac\x0a\xd0\x2a\x26\xa7\xf8\xb8\x91\xad\x80\xac\x8a\x49\x87\
+\x1e\x52\x8a\x78\x56\x1e\x23\x6e\x3d\x65\xfb\x23\xa2\x41\x97\x62\
+\x49\x48\x12\x2f\x77\x2e\x02\x24\x83\x90\xc7\x5f\xdf\xe3\xaf\xbe\
+\xf6\x8c\x52\x39\x4b\xa5\x70\x42\xa5\x2c\x9a\xf7\xad\x54\x27\xdc\
+\x5b\x8d\x30\xb5\x6a\x62\x09\x58\xb9\x55\x49\x2b\x71\x2f\x33\xe7\
+\x34\x22\xca\x9e\xa9\x7d\x72\xfe\x19\x9b\xb7\x37\x58\x5b\x5b\xc2\
+\x35\xc7\xb8\xce\x44\x48\x84\x58\xf3\xea\xf7\x13\x97\x7e\x4d\x3f\
+\x5b\x03\x5b\x31\xb0\xd2\xb4\x31\x20\x25\x98\xf5\x8c\xb3\x52\x59\
+\x44\xda\xe4\x7f\xdd\xeb\x20\xdf\x57\x33\xab\xb4\xaa\x99\xc4\xdf\
+\x95\x8d\x4f\x64\x16\x5a\xb6\x5a\xa0\xbc\xa1\x95\x86\xb5\x66\x59\
+\x58\x6a\xe0\xb3\xfe\x60\xc6\x2b\x21\x2f\xbd\x4f\xf6\x07\x7c\xf5\
+\x2f\x9e\xf0\xe8\x9d\x6d\xfe\xf4\xaf\x5a\xd4\xad\x2a\xcd\x5b\xf5\
+\x18\xb4\x05\x35\xfd\xb4\xef\x78\x54\xca\xb6\x92\x0a\x92\x91\x75\
+\x3d\x1c\x3a\x81\x6a\xdf\x25\x81\xad\xb7\xd2\x2a\x91\xa3\xa3\x8d\
+\xa8\x5b\xac\x2c\x11\x98\x4d\xfe\xed\x6f\xbe\x46\x6b\xe7\xf7\x94\
+\xb7\xe2\x53\x5b\x9b\x8a\x8d\xb3\xcb\x0f\x78\xcd\x0b\xd9\x3e\xde\
+\x65\x10\x57\xac\x67\xed\x1b\xca\xc5\x96\xbe\xe9\x57\xe5\x46\xd8\
+\x15\x72\xa2\x1f\x89\x0c\x39\xcd\xc6\x30\x13\xec\x19\xb3\xaf\x3d\
+\x5e\x4e\x30\x6b\x18\xb8\xaa\x82\x59\x37\xde\x24\x50\x75\x46\xf6\
+\xac\x3c\x5e\x54\x13\x9a\x7a\xa9\x4b\x25\x7f\x17\xdf\xb6\x79\xeb\
+\xdd\x0f\xf9\xed\xaf\xfe\x2a\xf8\x3b\x82\x2d\xe5\x17\x6d\x2e\x61\
+\x98\x5b\x1c\x0f\x2d\x56\x0b\x9b\x73\xf5\x90\xfa\xc2\x67\x01\xdf\
+\xce\x95\x67\x72\x04\xa2\xec\x19\x3b\x3b\xaf\xf3\xe2\xca\x33\x3e\
+\xf3\xc9\x2f\x2a\x00\xea\x5a\x77\x86\x7d\xe3\x4b\x7e\xa7\x16\x26\
+\x58\x52\xa5\x48\xc6\xc0\xd6\xfd\xb8\xe9\x5c\x07\x99\x4b\x9c\x76\
+\xb1\xe9\xef\x93\x0b\x60\x5e\x32\x7b\xf3\x56\xc4\xad\x1b\x36\x9f\
+\x5b\xa8\xb3\x5c\x58\x9e\x61\xe1\x46\x3b\xab\xc0\xbb\x5a\xd8\xe4\
+\xac\x3f\x48\x1c\x23\x63\xb2\xc2\x49\xff\x26\x67\xfd\x01\x3b\x7b\
+\x7b\xec\x6c\x9f\xf1\xed\xf7\x4e\xb9\xec\x65\xb5\x63\xdc\x8e\xbd\
+\x0a\xb6\xca\xfd\x10\x3d\xe5\x82\x84\x34\x90\x60\x95\xc0\x34\xcb\
+\x19\xfc\xe2\x28\xf6\x04\xe5\x14\x78\xf5\x4e\xa1\x4d\x6d\xd0\x47\
+\x2b\x6a\x29\xc9\xf0\x07\xff\xf7\x5b\x0c\xdd\x0f\x31\x26\x5d\x72\
+\x8d\xbc\xd2\xc6\x20\xfa\x2e\x77\xbf\x66\x72\xfe\x6c\xba\x10\xcf\
+\x3b\x42\x42\xcc\xbb\x45\x91\xd0\xc2\x41\xc7\x10\x72\xa2\x62\x50\
+\xca\x4c\x12\xc6\x9d\x39\x70\x85\x31\x37\x70\x3f\xba\x34\x4e\xd6\
+\xd2\xcd\xfc\xa1\x41\x97\x81\x2b\x00\x5d\xe8\x9d\x2b\x03\x51\xea\
+\xe3\xc9\xd1\x90\xdf\xfd\xc5\xd7\x68\x1d\x74\xd4\xc1\x14\xa5\x34\
+\xb0\x79\x3b\x43\xb9\xbe\xc3\x8d\x82\xaf\x80\x7b\x3c\xb4\x58\x68\
+\xef\xf1\xe4\xd4\xe0\x78\x68\xe1\x9e\x05\x9c\x0e\x77\xe9\xd6\xf2\
+\x98\x6c\xe3\x9e\x05\xea\x79\x79\x32\x8d\xc9\x0a\xce\x69\xc4\xc7\
+\x36\x2c\x9a\xf5\x06\x43\xdf\xa5\x63\x44\x09\x46\xcd\xd0\x55\x79\
+\x14\x12\xa4\xd9\xbe\xaf\x3c\x04\x7e\xd1\x23\xdb\xf7\x67\x8c\x3c\
+\xdd\xa7\x2b\x1f\xcb\x82\xd0\x34\x0b\x57\xcb\x83\x19\xd7\x9e\x5c\
+\x00\x19\xba\x6a\x18\x8d\xac\x44\x2e\x6f\x18\xb4\x96\x7b\x09\x16\
+\x96\xff\xdb\x8d\xe9\xc2\x3a\x1d\x8a\xa0\x46\x94\x3d\x53\xc0\x3e\
+\x1e\x5a\x98\x6c\xc7\x81\x8b\x6d\xde\xfe\xc0\x4f\x30\xa9\x04\x6d\
+\xa7\x2c\x1e\xf7\x1d\x8f\x86\x59\xc7\x65\xac\x58\x57\x9e\x0f\x09\
+\x54\xf9\x7c\xdf\xf1\x54\x42\x95\x64\x61\xd9\x9d\x53\x7d\xd7\x94\
+\x3e\x5e\xac\x2c\xd1\x6a\x1b\xbc\xfe\xce\xdb\x0c\x9f\xbe\x4f\x68\
+\xb6\xa9\x45\x7e\x42\x1b\x77\x5a\x7d\xde\x31\x77\x78\xed\x8f\xff\
+\x94\xe1\xc9\xb3\xb9\x78\x6a\xe4\x7d\x4e\x9c\x78\x40\xa4\x21\xb4\
+\x70\xaf\x59\xc5\x08\x5a\x49\x16\x0e\x46\xc2\x3b\x21\x19\xb4\x58\
+\x42\x79\x17\xd2\x99\x6b\xba\xac\xb0\x2a\x15\xac\x8a\x81\x67\x09\
+\xe0\x17\x4b\x60\x23\x7a\x32\xd8\x46\x57\xf4\x31\x5e\xea\xaa\x40\
+\x47\x7f\xf4\x94\x5f\xfb\xb5\xaf\x33\x39\x7f\x44\x76\xf9\xc1\x74\
+\x15\x9b\x43\xc5\xc2\x21\xa2\xd3\xbb\x04\xa8\xdb\xda\xe6\x20\x9a\
+\x10\x85\x3b\xd4\xba\x23\xba\xb5\x7c\x82\x81\xba\xb5\xbc\x7a\x5e\
+\xf7\x27\xde\x28\x2d\x51\x7e\x39\xc3\xad\xad\x57\xf0\x82\x20\x61\
+\x60\x89\xcc\xb5\x38\x49\x29\xe8\xab\xdc\x5f\xf9\x58\x82\x52\x37\
+\xd8\x66\x18\x3a\x7e\x6c\x0d\x6c\x8c\xa0\x9f\xe8\xe2\x23\x75\xae\
+\xac\xbc\xd0\x17\x81\xde\xea\x35\x43\x97\x5a\x46\x00\xf8\xfe\x03\
+\x53\x05\x75\x94\xad\xd1\x64\x46\x13\x57\xba\xb7\x66\xdc\x6a\x67\
+\xfd\x01\x6e\x6b\x9b\xf7\xde\x09\x78\xe3\xdb\xef\xf1\x64\x6f\xa8\
+\x64\x41\xb7\xd8\x57\x8c\x1a\x99\x15\xb2\xce\x58\xe9\x5a\x09\x38\
+\xc9\xbc\xb2\x62\x5b\xea\x5c\xf9\xbc\xde\xff\x58\xb2\xb0\x5e\x4d\
+\xa2\x7f\x9e\x32\x10\xa3\xa7\x64\xaa\x1d\xbe\x75\x60\xf1\xc1\xef\
+\x3c\xc5\x74\x46\xc2\xc8\xd3\xb4\x71\x76\xf9\x01\x97\x3d\xb1\xe8\
+\x5e\xff\xf6\x37\x94\x61\x97\x0e\x7c\xac\x95\x0d\xdc\xb3\x80\xa8\
+\xd2\xc4\x08\x5a\xd0\x8d\x65\x5e\x26\x36\xa4\x8b\x39\x4a\x99\xbc\
+\xf0\x4e\xd8\x46\x97\x68\xd0\x55\x6e\xb5\xc2\x45\x2d\x61\xbc\xc9\
+\x66\x28\x6e\x24\xaa\x9a\xc3\x41\xa8\x5e\x93\x72\xa2\x15\xf9\x71\
+\xe2\xce\x94\x81\xbd\xdc\x39\xfd\xd1\x19\x5f\xff\x8d\x90\x87\xef\
+\x9f\x93\x5d\x7e\x40\xa5\x70\xa2\x19\x3c\xe2\xa0\xe4\xce\x2f\x71\
+\x5b\xdb\x6c\x1f\xef\xd2\x6f\x4d\x07\xf0\x19\xe6\xd6\xf4\x72\x11\
+\x6b\xe5\x5a\x77\x44\xc8\xfd\x84\x76\x06\xd1\x9f\xe0\x46\x69\x89\
+\x5e\xe5\x92\xd5\xae\xc9\x46\xa3\x45\x79\xb1\xa9\xdc\x57\xd2\xa3\
+\x20\x7d\xbb\x72\x4b\xaa\xf8\x72\x52\xb1\xa6\x9a\x38\x96\x14\x92\
+\x45\xab\xbe\x93\x78\x8f\x94\x11\x12\xf8\xf5\xc8\x98\x61\xef\xf4\
+\x63\x05\xe0\x8d\x86\x1a\xdf\x25\x01\x2c\x41\x2b\x59\xb8\xd1\x9e\
+\x32\x4e\x71\xfd\x32\xa1\x89\x85\xf7\x21\xab\xe4\x03\x7d\x61\xfd\
+\xcb\xa0\x85\x6c\xb6\xdd\x29\x43\xd6\x19\x33\x29\xe7\x14\xf0\x74\
+\x90\x96\xc8\x29\xb6\x95\x3a\x57\xbe\x26\x41\x9a\xbe\xf5\x8d\x02\
+\x7e\x71\xa4\x5e\x4b\xba\xec\xaa\x6c\x36\x57\xe9\x5e\xb5\x79\x6b\
+\xcf\x65\xec\xff\x99\xd2\xc6\x77\x63\x6d\x3c\x39\x7f\x84\x6b\xad\
+\x27\x5b\x2a\xd8\x70\x9a\xba\xc8\x1b\xb9\x45\x4a\x2b\x19\x8c\x7e\
+\x8b\x28\xd3\x24\xac\x76\x84\x9b\x2d\x66\xe2\xd2\x60\x3c\xf5\x13\
+\x7b\x51\x2d\xa1\x71\x8b\x25\x91\x18\x5f\xb1\x4c\xdc\xc8\x06\xca\
+\x98\x99\x92\xea\x02\x34\xf5\xaf\x65\x12\x39\x16\xc5\x12\x4a\x3e\
+\xb4\x27\x36\x95\xfc\x0a\xdd\x77\x07\x22\x86\xee\xef\x30\x29\x1c\
+\x29\x57\x4e\x8b\x80\xa6\x39\xe4\xd4\x83\x0f\xdc\x36\x67\xbd\x2c\
+\x67\x3d\xf1\xe5\xa2\x70\x87\xb3\x5e\x56\x0c\xe3\xcb\xdc\x4a\xb0\
+\x70\xb7\x96\xe7\x46\xc1\x27\xe4\x7e\xc2\x11\x0e\x28\xe3\xef\xd0\
+\x35\x58\xad\x6f\x24\x7c\xc0\xf3\xd8\x75\x5e\x70\xc2\x08\xfa\x09\
+\xc3\xad\xea\x3b\x8a\x59\x7b\x56\x99\x52\x39\xab\xc0\xac\x03\x35\
+\xad\x87\x75\x2f\x87\xee\xda\xab\x65\x6a\x34\x6b\x36\x6b\x65\x43\
+\xb9\xd2\xce\x87\xe7\x09\x63\x4e\xb2\xf0\x41\x34\x49\xb0\xae\x2e\
+\x37\x9e\xec\x65\x79\xf2\xf4\x30\x21\x1f\x24\x40\xa5\x1c\x70\x19\
+\x2b\x00\xeb\x06\x9b\x04\xb4\xce\xc6\xe9\xed\xdc\x3a\x40\x5f\x74\
+\xd6\x9c\xf8\x43\xd5\x99\x3e\xbd\x7f\xa7\x4c\x9c\x8b\x01\x27\xef\
+\xfc\x25\x7f\xf5\x97\x21\x70\x85\x31\xe9\x72\xb7\x9e\xe1\xcb\x3f\
+\xf4\x22\xcd\x4f\xff\xdd\xf8\x12\x71\x83\xb3\xb8\x6d\x47\x1a\xc0\
+\x13\xef\x38\xf1\x9c\x11\xb4\x30\x0d\x69\x0b\x39\xb8\x41\x16\xb7\
+\x38\x0d\x6c\x99\x00\x5e\x54\x53\x8d\xb5\x3d\x2b\x8f\x9b\xcf\x29\
+\xc0\xda\x9e\x8b\x59\x14\x4d\x54\xb2\x14\x09\x03\x57\x05\x33\xa4\
+\x9c\x90\x1e\x0a\x29\x45\x1a\x59\x8f\xd3\xc3\x36\x7f\xfe\x8d\xc7\
+\xe0\xef\x80\x15\x5b\xa7\xce\x98\x6e\xb1\x2f\x1c\xeb\x61\x81\x95\
+\xcc\x34\x59\x7b\x83\x67\x9c\xf5\xb2\xe4\x2f\xab\xac\xc4\x3d\x74\
+\x4b\x2b\x99\x84\x85\x7a\xa3\x20\x1a\xde\x01\x8c\x4e\x8e\x66\x13\
+\xaa\x4f\x23\x96\xdb\xed\xc4\x68\xd5\xeb\x8a\x2f\x55\xb2\x79\xec\
+\x41\x90\x2d\xa3\x74\xab\x37\x30\x9b\x33\xb9\x0f\x41\xbd\x81\x5f\
+\xf4\x12\x0b\x62\x52\xb1\x12\xbe\x66\xe9\x86\xd3\x17\x49\xa6\xda\
+\x49\x64\xa3\xe9\xf9\x21\x69\x26\xd6\x1f\xa7\x75\xf2\xee\x7e\xc0\
+\xa3\x77\xb6\x39\x39\x0a\x12\xec\x28\x99\x31\xcd\xb4\x52\x4a\x28\
+\xd7\xa1\x33\x9e\xd9\x6f\xc6\x80\x8e\x35\x70\x1a\xa4\x12\xc8\x66\
+\xd4\x4b\x68\x6f\xa9\xb9\xf5\xc5\xf2\x9a\x17\xf2\xc1\x6b\x5f\xe3\
+\xea\xd1\xd5\x54\xeb\xbe\xf2\xb2\x62\xe3\xcb\xfe\x85\xaa\x9b\xd4\
+\x6f\xa7\x9e\xf0\x58\xe8\xd8\x88\x32\xcd\x79\xe9\xf3\x74\x7a\x3e\
+\x54\x23\x21\x27\x8a\xa5\x64\x32\x4f\x18\xb8\x62\xc8\x4c\x51\x54\
+\x2d\xdb\x9e\x41\xce\xb8\x4a\xf8\x81\x7d\x1c\x8c\x5a\x1e\x8b\xa9\
+\xb7\x40\x32\xf1\x65\xa7\xc3\x77\x7e\xe7\x1b\x3c\x7c\xef\x4d\x4a\
+\xe4\x98\x14\x8e\x14\x2b\x58\x83\x7c\xac\xc3\xda\x53\xf1\x9e\x7b\
+\xc6\x21\xc2\x47\x3c\x5a\x14\xc3\x03\x6f\x64\x6e\xcd\xb8\x90\xdc\
+\xb3\x80\x4a\xf7\x16\x83\x4e\x40\xbb\x31\xa1\xd6\x1d\x71\x3a\xdc\
+\x4d\x78\x32\x0e\x83\x52\xa2\x9b\x4c\x3a\xa0\x21\xc1\xaa\x4b\x0a\
+\xf9\x5a\xda\x7d\xe6\x9a\x63\xaa\xe5\x41\xc2\x78\xd3\xc1\x2e\x19\
+\xb7\x1e\x89\xd2\xf1\x6e\xd8\x4b\x84\x91\x75\xc6\xae\xd5\x6b\x6c\
+\xd5\xfa\x8a\x81\xd3\x01\x0d\xdd\xad\x26\xef\x4b\xe0\x02\x9c\xf5\
+\xb2\xec\xee\x07\xca\xfb\xa0\x03\x71\xe2\xcf\x02\x2e\x0d\x52\xe9\
+\x69\x90\x7e\x62\x5d\x36\xcc\xc4\x00\xa2\xa4\x01\xa7\x37\xf4\x96\
+\xc6\x9d\x94\x1b\x69\xf6\x07\xa8\x2c\xde\xa6\x7b\xd5\xe6\xf5\x77\
+\xde\xc6\x3f\x79\x08\x03\x11\x02\xff\xfc\xed\x1a\xaf\xbe\xb8\x44\
+\x76\xf9\x01\xae\xb5\x4e\x7f\xb8\xc6\xa4\x37\x64\x74\x3a\x5d\x90\
+\x2b\x99\x4b\xa5\x93\xd3\x1e\x2a\x11\xb1\x2b\x53\x1a\x8c\x99\xb8\
+\x19\xea\x55\x2b\xd6\xc4\x2c\x10\x0d\xba\x2a\x60\x21\xdd\x65\x22\
+\xe1\xa7\xac\x65\x45\x15\x15\x3b\x5b\x94\x45\x07\x79\x3f\x1b\x97\
+\x33\x25\xb3\xd6\x76\x8f\x1c\x5e\x7f\xa7\x05\xd6\x56\x22\x46\xdf\
+\x8c\x5b\xde\x34\xcc\x88\x96\xd6\x01\xaa\x79\x3e\x8d\xc7\x4b\x29\
+\x71\x1c\x1c\x70\x3c\xb4\x14\x48\x4d\xb6\x39\x89\x2c\x8e\x83\x03\
+\xa2\x70\x87\x7e\x0b\x8e\x83\x03\x2a\xdd\x5b\xca\x7a\xd7\xeb\xb4\
+\xb2\x7d\x3f\xd9\xc0\x4f\x73\xaf\xc9\xfc\x07\xbd\xe2\xb8\x14\xe6\
+\xe6\x06\x30\xf4\x26\x28\x52\x2f\x4b\xc3\x50\x06\x36\xf4\x90\xb4\
+\x0c\x43\xeb\x4c\xdd\xac\xc3\x67\x1a\x3e\x85\x17\x85\x4b\x50\x4a\
+\x88\xe7\xdd\x74\x50\x9f\xf5\x84\x7c\xf8\xf6\x7b\xa7\x74\xfc\xa4\
+\x01\xe6\x32\x4e\x34\x51\xd1\x8d\x2e\xb9\x9f\xae\x7d\xe7\x01\x3d\
+\xdd\x02\x40\xba\xd2\x74\x96\x96\x7f\x23\x6b\x89\xd7\x24\x53\xeb\
+\xfe\x62\xfd\x6f\x06\x66\x93\x6f\x1d\x58\xec\xbe\xf9\x94\x8b\xc3\
+\x7d\x8c\x89\xb0\xbb\xbe\xf0\x7d\x2f\x2b\x77\x5b\xc9\x3f\x52\xa1\
+\xeb\xd0\xbb\x20\xf4\x2e\x30\x72\x8b\xb3\xdf\x33\x0e\x37\x8b\x88\
+\x9d\x43\x27\x0a\xc8\x96\xa6\xc0\x37\x3b\x97\x27\x4a\x1a\x78\x57\
+\x46\x22\xf9\xc7\xf2\x2e\x54\x98\x59\x6f\x6f\x35\x4d\x49\x9b\xad\
+\xd6\xbd\x68\x89\x1f\x5b\xbe\xd9\x67\x52\x38\xa2\xef\x78\xea\x12\
+\xd6\x8e\xbd\x03\x7d\x47\x4c\xa3\x97\xfd\xcd\x74\x17\x93\x3c\x69\
+\xf9\xcb\x2a\x6e\x6b\x9b\x7e\x4b\x18\x74\xfd\x96\xd0\xcb\x72\xa2\
+\xbc\xdc\x9e\x44\x02\xe0\x12\xcc\x1b\x19\x97\xa8\x78\x53\x01\x4e\
+\xca\x87\xeb\x72\x22\x54\x10\xc4\x1c\xcf\x78\x27\xd2\x59\x68\x3a\
+\x78\x3b\x46\xa4\xb2\xd7\xa6\x33\x9c\x67\x33\xe7\x36\x6a\x59\x56\
+\xea\x0d\xfc\xd2\xb2\x92\x0f\xd7\x25\xf6\x28\xbf\x69\x0c\xf2\xf3\
+\xe1\xb9\x02\xf0\xd9\x61\x5b\x8c\x5b\xb0\x92\xb3\x42\xd2\x63\x0f\
+\xd2\x0c\xab\xdf\xaf\x94\x87\x6a\xd6\xc8\x3c\xcd\xab\xfa\x18\xc7\
+\x21\x6a\x1d\xe4\xb2\x45\x01\x88\x76\x01\x62\xc2\xd3\x73\x16\x45\
+\x4c\x1a\x27\x1f\x3e\xc3\xcd\xf7\x08\xcd\x36\x95\x7c\x86\xc6\x0b\
+\x5b\xca\xdd\xe6\xb4\xe4\x57\x92\x00\x00\x20\x00\x49\x44\x41\x54\
+\x5a\xeb\xca\x28\x3c\xeb\x88\xf6\x62\x69\x7d\x3c\xe2\x4c\x85\x9b\
+\xaf\x8a\x13\x26\x6e\x66\x0a\xe0\x58\xd6\x9a\xe1\xc2\x92\x72\x8f\
+\xd9\x86\x08\x41\xcb\x00\x86\xcc\xfd\x95\x00\x96\x92\x43\xb2\x6f\
+\x1a\xd8\x51\x77\x44\xe0\x4e\x3d\x10\xd9\xe1\xba\xba\x94\x4d\xfc\
+\x61\x82\x0d\x4c\x6b\x05\xfa\x10\x8d\x2f\x71\xcf\x16\x18\xb4\x87\
+\x0c\xda\xe2\x00\x0e\xda\x43\x3e\x70\xdb\xf8\x07\x43\xce\x7a\x59\
+\x8e\x83\x69\x0b\xcd\x83\x9c\xc7\x59\x2f\xcb\x68\xb1\xa7\x0c\xc1\
+\x4a\xf7\x16\xfd\x9a\x60\xee\x5e\xe5\x92\xcd\xdb\x1b\x2c\x65\x92\
+\xbd\x80\x75\x60\xea\x9a\x55\x07\x72\x9a\x89\xd3\x41\x8c\x74\xe2\
+\x8f\x8c\xcc\xb9\xce\x44\x19\x80\xd5\xf2\x80\x6c\xdf\x27\x43\x97\
+\x6a\x79\x30\x63\xc8\xcd\xbb\x55\x9a\x49\xe0\x4a\x83\xcf\x3d\x5b\
+\x50\x00\x16\x33\x38\x0a\x33\xc0\x9b\x07\x64\x1d\x4c\xba\x97\xa1\
+\xef\x14\x94\xbf\xf7\x3a\xa3\x4d\xee\xa3\x0f\xd6\x91\x7f\xb7\x1e\
+\x19\xea\xb1\x7e\x25\xa8\x3b\xd3\xbf\x23\x3f\xbb\x6e\x55\xe9\x06\
+\x5d\x1e\x05\x63\xf2\x7b\x87\xca\xc0\x03\x78\xf5\xc5\xa5\x44\xa4\
+\x4f\xca\xa3\xe3\xb1\xa7\xb4\xf0\x89\x13\x71\xa3\xe0\x33\xf1\xb7\
+\xb8\x8a\x9b\xa9\x64\x5c\x93\x6c\x29\xa0\x34\xc8\x31\x71\x33\x8a\
+\xa1\x55\xc4\xce\x8b\x6a\x78\x51\x0d\xdb\xe8\xce\x00\x73\xc6\x8f\
+\x37\xb1\x67\xb6\x97\x9d\x0e\x57\x91\xc7\xee\x91\xc3\xde\x5b\xef\
+\x63\x5c\x39\x4c\x0a\x47\x31\x18\xf2\xea\x80\xe8\x07\xb0\x1b\x74\
+\x39\x71\xa2\x38\xed\xee\x4a\x01\x58\xe9\xdb\x28\x8b\x91\x7b\xa6\
+\xd8\xf9\xac\x97\xe5\xd6\xd8\xe6\xd6\xd8\x56\xde\x0c\xc3\xdc\xe2\
+\x38\x38\xc0\xe9\x6c\xb1\xd0\xde\xe3\x9d\xb7\x77\x18\x9e\x3c\x53\
+\x56\xb8\x0e\x44\x09\x60\xd1\x10\xdb\x4b\xe4\x44\x74\x6a\xa1\x8a\
+\xac\xcd\xcb\x87\x48\x34\x3d\x29\x67\xc9\x74\xda\xca\x07\xac\xbf\
+\xa7\x15\x1a\xca\x2d\x27\x73\x22\x9e\x07\xe0\xf3\xe1\x79\x42\x3a\
+\xc8\xe7\x9c\xc3\x88\xe3\xd6\x05\x8f\xf7\xf6\x12\x43\x67\xf4\x63\
+\x98\xb5\x0a\x33\xcc\x3c\x4f\xc7\xea\xa0\xee\x1b\x05\x05\x58\xf9\
+\x3f\x6b\x15\x08\xfd\xb3\x29\x90\x8d\xe7\xb3\xfd\x75\x8b\xa6\xe3\
+\xf7\x94\x7d\x61\x46\x3d\xe8\x84\x1c\xb7\xb6\xd9\xdb\x1f\x13\xb6\
+\x62\x9f\xb8\x0d\xab\x8b\x0b\x4a\x52\xe8\x89\x48\x0b\xed\x4b\xce\
+\x02\x21\x27\xa4\x0b\x72\xc8\x10\xc3\x89\x08\x4a\x71\x43\x1f\x37\
+\xa3\xe4\xc4\xc4\xcd\x4c\x2b\x3b\x8e\xc2\x9c\x02\xaf\x04\xb2\x8c\
+\xbe\x19\xb5\xfc\x0c\x90\x0b\xa5\x7d\xe5\x85\xf0\x72\xe7\x34\xb2\
+\x02\x08\x12\xc0\x0f\xdf\x7b\x93\x16\xc2\x5a\xd5\x5d\x3a\xfa\x41\
+\x50\x07\xa8\x37\xe4\xc4\x89\x70\x0e\x93\x55\x21\xd1\x58\xac\xc8\
+\xf5\xb1\x00\xb0\xf4\x58\xe8\x65\x49\x80\x1a\x15\x15\x85\x3b\x7c\
+\xcb\x13\x1e\x8e\xa7\x1f\xfe\x85\x00\x9f\xd6\x32\x55\xca\x00\x1d\
+\xc0\x7a\x80\x43\x1a\x75\xe9\xe0\xc6\x3c\x9d\x2c\xbd\x14\x7a\x25\
+\xb5\x9e\x23\x0c\x62\x08\xa3\x34\xe4\x74\xc6\xfd\x28\xf9\x20\x82\
+\x37\x0b\x7c\xe7\xa8\xc5\xd9\x61\x5b\x31\xbc\xce\xc2\xcf\x03\xae\
+\x0e\xcc\x79\x52\x43\x67\x57\xfd\x33\x03\x6a\xaa\x29\xb7\xfe\x19\
+\xe9\x5b\xa2\x03\xe7\x75\xee\xb8\xd6\x48\xc9\x8d\xc3\x68\x89\x63\
+\xf7\x82\xf6\xd9\xd4\x0b\x51\xbf\xbb\xce\xad\xaa\xa3\xc2\xd5\x7a\
+\xec\x40\xf7\x56\x1c\x0f\x2d\x2a\xd6\x31\xa6\x51\x26\xe3\x9a\x04\
+\xa5\x90\xba\x91\x21\x28\x85\xd3\x8c\xb6\x6a\x24\x40\xbc\x60\xd8\
+\xd0\xac\xce\x0f\x29\xc7\x3d\x29\xa4\xfb\xac\x3d\xb1\x95\x17\x22\
+\xea\x8e\x18\xba\xb7\xb9\xec\x08\x2b\xcd\x3f\xda\x65\xbf\xfb\x14\
+\xac\x2d\x31\x32\xab\x3c\xbb\x72\x3b\x86\x68\x3b\x25\x0f\x5c\xab\
+\x3b\x1d\x50\x28\x81\xab\xdf\x0e\xb9\xc9\x4a\x75\x32\x03\xe4\x85\
+\x4e\x9f\xdd\x7d\x41\x51\xbb\xfb\x01\xbb\xfb\x01\xcd\xf3\x2a\xee\
+\xd9\x11\x7f\xfe\xc1\x00\x3a\xbd\x19\x8d\xab\x1b\x67\x12\xd0\xcf\
+\x73\xc3\xc9\xe8\x9c\x0e\x64\x09\x6c\xf9\x79\x3a\x80\xd3\xfe\xe0\
+\xc2\x8b\x2b\x09\x0d\xac\x33\xee\xf9\xf0\x3c\x61\xe0\x45\xe3\x38\
+\x83\xef\x30\x62\x7f\xef\x50\x69\xcf\xeb\xd8\xef\xa3\x9e\xbf\x8e\
+\x34\xd2\x8b\x20\x0d\xe4\x34\x18\xaf\xfb\x7b\x92\xad\x13\x2e\x3a\
+\x2d\x53\x50\x1a\x77\x67\x87\x6d\xe5\x0e\x0d\xcd\x27\x54\xf2\x19\
+\x6e\xd7\x16\xa8\xac\x88\x41\x06\xd1\x82\x00\x49\x7f\xb8\xa6\x48\
+\x4d\x77\xa9\x4e\xfc\x2d\xea\x46\x3c\xd0\x87\x88\x4e\x14\x90\x71\
+\x4d\xc5\xc6\xae\x33\xc1\x1c\x2e\x75\xb9\x8a\x3c\x91\x37\xbc\x94\
+\x64\x63\x19\x42\x8e\xba\x23\x15\xc9\x2b\x94\xf6\x13\x09\xf4\x6b\
+\x76\x5b\xb1\xf0\xd1\x33\x0f\xe7\x59\x05\xfc\x1d\x2a\x65\x9b\xc6\
+\x42\x8d\x97\xd6\x56\x55\x7a\xa4\xd4\x55\xed\x7e\x98\x90\x14\xad\
+\xae\xa7\xdc\x6d\x3a\x90\xa3\xf1\x25\x46\xee\x19\xfe\xc1\x50\x49\
+\x0a\x29\x39\x0e\xa3\xd8\x30\x3b\x9b\xfa\x8b\x0f\x46\xe2\xfb\x77\
+\x3a\x7d\xae\x3a\x9d\xb9\x27\x54\x7a\x0f\xd2\x0c\xab\x3f\xd6\x19\
+\x3a\x1d\x8e\xd6\x47\x7a\xc9\x5c\x0b\x23\xe8\x8b\xdf\x17\x37\x38\
+\x59\xd9\x68\x70\xfb\xce\xc6\x47\x1a\x6e\xd3\xc4\xa6\x05\x8c\xdc\
+\x33\x9e\xee\x2d\x70\xe2\x44\xec\xb6\x4e\x13\xde\x9b\xff\x3f\xc0\
+\x9d\x07\xc4\xb4\x1c\x79\xee\xe7\xc5\xf3\xf0\x5c\x67\x22\x16\xaa\
+\xe6\x07\xd7\x59\x5e\x77\xf3\x51\x8d\x12\x95\x31\xcd\x46\x44\xf7\
+\xaa\xcd\x69\xf7\x19\xfe\xc9\x43\x25\x29\xac\x85\x29\x61\x3a\xcf\
+\x84\xbb\x52\x46\x73\x2f\x7b\x59\x46\xa7\x41\xc2\x4b\xd1\x89\x02\
+\x25\x25\x80\x84\xb4\x28\x95\xb3\x98\x7a\x98\x59\x32\xac\x04\xb0\
+\xfe\x9c\x64\x63\xf9\x58\x26\xd0\xb7\x4d\x21\xba\xf7\xf7\xb6\x71\
+\x76\x0f\x15\x80\xa3\x85\x32\xb7\x6f\x35\xd8\xbc\x77\x97\x5b\x5b\
+\xaf\xd0\xa9\x85\x73\xfd\xb1\x41\xaf\x1e\x5b\xa7\xc2\x6f\x7c\xe2\
+\x44\x09\x0b\xd5\x39\x8c\x38\x8c\xb2\x0c\xda\x43\xdc\xb3\x23\xdc\
+\xb3\x23\xa2\xf1\xa5\xfa\x2f\xc1\x2e\xef\x97\x56\xd6\xe7\xea\x5a\
+\xbf\xe8\x31\xa9\x58\x89\x82\xcf\x79\x60\xd6\xbf\x9f\x5f\xf4\x04\
+\x40\xb5\x1c\x60\x1d\xc0\x51\xa6\x92\xa8\x93\xcb\x54\x3b\xa2\xbc\
+\xa8\x6c\x50\x5a\xb9\x9a\x09\x64\xe8\x00\x96\xf2\x49\xdf\x9e\x9c\
+\x3c\xe6\xd1\x9e\x90\x10\x59\xab\x90\x60\xf9\xef\xe5\xfe\x5f\x07\
+\xe8\xcf\xf3\x6e\x48\x63\x57\x5e\x6d\x16\xa2\x5e\x02\x9c\xcf\xfb\
+\x6c\x5d\x8e\xf5\x8d\x02\xd4\x4d\x06\x9d\x2a\xef\xb5\x8e\xe3\x64\
+\xad\x2e\xb5\xb0\x97\x30\xee\xd2\x49\x4b\x18\xc7\x1c\xb7\xa6\xb2\
+\x22\x8c\x92\x25\x5e\x19\xad\x35\x82\xeb\x4c\x84\x9c\x58\x37\xc7\
+\x44\xdd\x91\x48\x8e\x37\xba\x1c\xc5\xa5\x3b\x92\x99\xa5\x2e\x96\
+\x00\x1e\x2e\x75\x29\x5c\xd4\x54\x9e\x84\x7f\xd2\x21\x3a\x9b\xb0\
+\xdf\x7f\x06\xd6\x16\x2b\x75\xb8\x91\x13\x27\xdb\x58\x0d\xb9\xf3\
+\xb9\x8f\xb3\x94\x7f\x89\xa3\xc9\xe5\xcc\x6a\xcf\x54\x3b\x62\xfe\
+\x71\x1f\xe5\x72\x5b\xc9\x08\x81\x2f\x45\xbe\x0e\x52\x79\x93\xcc\
+\x9d\xde\xee\x1c\x0f\xa1\x5e\x55\x1d\xd9\x75\x90\xea\x7a\x38\x3d\
+\x1c\x66\x1e\x2b\xeb\xaf\xe9\xc0\x4e\xcb\x11\xd7\x99\x90\x09\x5b\
+\x6c\x36\x57\x79\x75\xbd\xa9\x74\xb0\x1e\x85\x3b\xeb\x65\x95\xc1\
+\x26\x81\xbb\xeb\x0f\xd4\xef\xfb\xce\x51\x04\xfd\x24\xc8\xe4\x40\
+\x46\x79\x05\xd1\xef\xcf\x2b\x8f\x9a\x07\xe8\x4e\x2d\x7c\x2e\xd8\
+\xaf\x03\xa2\xaa\x02\x8f\x8d\xd5\xef\x65\x41\xe8\x59\x83\x7a\x6e\
+\xf5\x71\x4b\xe4\xba\x48\x5d\x1c\x99\xd5\x19\xe3\x4e\x37\xf0\x2e\
+\x7b\x59\x65\xd8\x95\xad\x64\x7a\xa5\x04\xb4\xdc\x2a\xc3\x4e\xca\
+\x07\xc9\xc0\x0b\x86\x9d\xd0\xc4\x51\x77\x34\x95\x1a\xb9\x73\x05\
+\x60\xc9\xc6\xbb\xfb\x87\x7c\x67\x47\xf4\x98\xbd\x6d\x8f\x30\xed\
+\x25\xb2\xab\x05\xd6\xcb\x37\xb9\x73\xcb\xe2\xde\xc7\xee\xf3\x89\
+\x1f\xbd\x49\x79\xb1\xa9\x26\xd1\xab\xd0\x6e\xac\xc3\xe4\x20\x6f\
+\xc9\xc8\xd2\xf9\x2d\xd9\x19\xe0\x2c\x58\x54\xf7\xd3\x80\x9e\xf4\
+\x86\x1c\x1c\x7b\x9c\x9c\x3c\xc6\x08\x45\x86\x59\x7a\x98\x8b\xee\
+\x61\x90\x1e\x04\xbf\xe8\xcd\x14\x73\x4a\xd6\x95\xfb\xcb\x13\xa3\
+\xfb\x8d\xf5\xc7\x55\xdf\xa1\xb6\xd0\x48\x78\x22\x96\x0b\xcb\xf4\
+\x5b\x53\xe6\x35\x72\xcf\x70\x0e\x23\x1e\xfb\xcf\xd4\x6f\xf0\xb7\
+\x0b\x9c\x38\x11\xdf\x39\x6a\xd1\x0e\x3b\x4a\x03\x77\x8c\x68\x2e\
+\xe8\x74\x20\xab\x63\x28\x2f\xf7\xa9\xd7\x75\xf9\xa6\x6f\xbf\x57\
+\x30\xa7\xf3\x4e\xbe\x17\xb6\xd7\x17\x94\x7c\x6d\xe8\xbb\xec\x74\
+\x2b\x38\xa7\x11\x9d\xa1\x43\x68\xb6\x29\xd8\x49\xe3\x4e\xea\x61\
+\x3d\xc3\x4e\x1e\xa3\xab\x8e\x99\x00\xad\x69\x94\x09\x23\x47\xe5\
+\x52\xa8\xa4\x78\xf3\xea\x82\xa3\x30\xc7\xe8\x72\xac\xbc\x14\x57\
+\x91\xa7\x74\xb0\x64\x5c\xc9\xc6\x92\x99\x0b\x17\x35\xae\x22\x8f\
+\xa3\x67\x22\xa0\x51\x29\xdb\x64\x6b\x49\x7f\xd1\xde\x81\x4f\xe0\
+\x9e\xb0\xbe\x6e\x26\x58\x2d\x1d\x7c\xe8\x39\x45\xba\x9d\xee\x8c\
+\xb8\xd7\x81\x2a\x2d\x57\xf9\x03\x0f\x8e\x85\x51\x38\xe9\x0d\x69\
+\x85\x9e\xf8\xdf\x81\x4e\xa7\xab\x66\x64\x5c\xc7\xb4\x3d\xa7\x48\
+\xd5\x77\xc4\x90\x18\x6d\x30\xcc\xdc\xf0\x73\xaa\xbf\x84\xee\x72\
+\xab\x96\x07\x50\x37\x55\x7d\x5c\x22\x68\xb3\x28\x02\x30\x6f\x39\
+\x7b\x42\x2e\x38\x11\x85\x73\x41\xcf\x8f\xfd\x67\x6a\xd1\x02\x6a\
+\xf6\x47\x1a\xb0\x3a\x30\x5d\x67\xa2\x80\x22\xbf\xe3\x44\x1b\xa1\
+\x9b\xb8\x55\x93\x8f\xd3\x2c\x9e\xce\xed\xb8\x8e\x91\xd3\x36\x41\
+\x22\xd3\xac\x6a\x24\x5d\x79\x73\x3e\x6b\x99\x88\x56\xd7\x53\xc6\
+\x9d\xe9\x8c\xa8\xe4\x33\x34\xfd\x48\x19\x77\xa5\xb8\xff\xb4\x64\
+\xe2\x79\x9e\x0f\x09\x5a\x09\x60\x5d\x62\x98\x57\x91\xc7\x45\xb3\
+\xcc\xba\x29\xa6\x8a\x1e\x85\x39\xae\x22\x8f\x75\x73\xcc\x55\xe4\
+\xa9\x5c\x08\xdb\x17\x6c\xdc\x9e\xd8\xca\xb0\x1b\x2e\x75\xf1\x2f\
+\x2b\xec\x77\x9f\x72\x11\x78\x44\x0b\x65\xf2\x9b\x1b\x64\x57\x85\
+\xe5\x6a\x0c\x9e\xc1\xce\x09\x4f\xf6\xde\xe5\xe8\x28\xa4\x5e\xab\
+\xcd\xd5\x4f\x32\xdf\xb6\x15\x1a\x74\x3b\x5d\x76\x5b\xa7\x2a\xc3\
+\x49\x02\xba\x5f\x38\x56\xf7\xd3\xc0\xdd\xef\x45\xf4\x9d\x42\xa2\
+\xc9\x89\x1c\xee\x22\x07\x1e\x02\x34\x7b\x41\x82\x8d\x75\xf0\xce\
+\xd3\xc9\x7a\x7e\xc5\xf3\xea\xea\x36\x9b\xab\x33\xa9\x95\xe7\xc3\
+\x73\x31\xfc\x1c\x31\x10\xf2\xc4\x89\x38\xeb\xb4\x69\x85\x62\xe1\
+\x15\xce\x9b\x9c\x75\xda\xb4\x43\x23\x61\xc4\xe9\x40\xd5\xb7\x7a\
+\xf1\xaa\x7e\x5f\x26\xf5\x1b\x41\x3f\x31\x0b\x5a\xff\xde\xf2\x33\
+\x25\x6b\xcf\x63\x58\xd7\x99\x90\xa1\x9b\xcc\xc0\x0b\x73\x2a\x45\
+\x75\x1e\x80\x75\x03\x7d\x26\x33\xb0\x27\x00\x1e\xd4\x1b\xca\xb8\
+\xeb\x5f\x5e\xe0\x8f\xe3\x29\x5c\x0b\x9a\xe1\xd6\xea\x27\x24\x45\
+\xdf\x28\xa8\x73\xed\xc5\x73\xf5\xc2\xc8\x49\x00\x58\x07\xb2\x59\
+\x5a\x1e\xb3\x58\xaf\x2b\x1d\xbc\x6e\x8e\x59\x30\x6c\x8e\xc2\x9c\
+\x02\xf2\x82\x61\x73\xe8\x08\x66\x96\x3e\x62\x10\xb9\xc7\xd6\x62\
+\x1f\xc3\x78\x85\x7a\x64\x28\x1d\xac\xdc\x63\xa1\xd0\xa8\x3b\xaf\
+\xef\x32\xde\x13\xef\x93\x39\xbe\xe9\x03\x23\x67\xba\x49\x40\x77\
+\x3b\x7b\x89\x93\x2e\x26\x16\x4d\x99\xab\x15\x7a\xf1\x7e\x5d\x11\
+\x12\xed\xf4\x13\x4c\x20\x87\xbb\xe8\x33\x33\xa8\x9b\x33\x2e\xb3\
+\xe7\x69\x61\xfd\xf3\xf4\xf2\x24\x7d\x9f\x5a\xa6\xa6\x1a\x5d\x8b\
+\x61\xe7\xd3\xdb\xae\x3f\xc0\x39\x8c\xe8\x46\xef\x72\xd6\x69\xd3\
+\x34\x6d\xf5\xdd\xe5\x55\xc3\xec\x25\xdd\x10\x93\x8a\x95\x60\x5e\
+\x1d\x20\x69\x2d\xac\x57\x5e\xeb\xad\x04\xe6\x85\xd8\xd3\x9f\x21\
+\x35\xaf\x9e\x52\xaa\xe7\x89\x7c\x94\xa4\x88\x7a\x11\x8d\x8a\x99\
+\x04\x70\x2c\x61\x4a\x61\x4e\x15\xe7\x36\xe3\xd4\x99\x41\xa7\xca\
+\xe8\xa8\xc3\x38\x3f\xf5\xcc\x2c\xdc\x11\x57\x93\xec\xf2\x03\x42\
+\x27\x50\xff\x2b\x91\x20\xa8\xed\xe3\x5d\x6a\xb1\xc7\xc9\x34\xca\
+\x0c\x26\xb9\x19\x4d\x0c\x60\x95\x82\x4d\x42\x5c\x16\xeb\xf5\x38\
+\x42\xb2\x0c\xdd\x11\x8b\xf5\x3a\x5e\x77\xc4\x82\x21\x18\x37\xe3\
+\xde\xc6\xc8\x7a\xb8\xe7\x39\xec\x7a\x9e\xcb\x4e\x87\x05\xc3\x66\
+\xf7\xc8\x81\xcb\x37\x68\xd6\x1b\x64\x57\x0b\x6c\x98\x02\xbc\x93\
+\xd3\x21\xc7\x63\x0f\xe3\x2a\x76\x6a\x13\x40\xa7\x07\x18\xb1\x6b\
+\xca\x9e\xd1\xaa\x3d\x0b\xd5\xa3\xb7\xe6\xd4\x68\x11\x89\xd6\xfe\
+\x15\x0f\xfa\xd0\x8a\xfb\xf1\xb7\xf0\xe8\x06\x5d\x4c\x6b\x85\xe0\
+\x9a\xcb\x98\x35\xb0\xd5\x9c\x0c\xc5\xbc\xf1\x02\xb9\xee\xf2\x38\
+\x0f\xd4\x7a\xe7\x1e\x2b\x6e\x7c\x22\x07\x2a\x6e\xd4\xb2\x09\x19\
+\x71\x73\xf2\x03\x89\x80\xc5\xd2\x38\xe2\xe0\xd8\x63\x10\xda\x89\
+\x85\xd7\x77\xa6\x2e\x2a\x11\xf1\x43\xb1\xa8\x94\x06\x7a\xc7\xa2\
+\x49\xc5\x82\x48\xb8\xf7\x6a\xe5\xaa\x72\xf5\xa9\x2b\x45\x0c\x7c\
+\xc9\x9a\x92\x9d\xb3\xf1\xa2\x70\xfb\xc9\xb4\xd1\x7a\x39\x0b\x44\
+\x33\x75\x85\x35\x6a\x22\x73\x2f\xfe\x7d\x32\x37\xba\x6e\x56\x67\
+\x02\x1e\x13\x7f\x48\xbb\x1f\xb2\x64\xd9\x94\xca\x4c\x7b\x7c\xf4\
+\x72\x64\xc2\x16\x41\x3c\x6d\x55\x04\x3d\xda\x1c\xb7\xb6\x39\x76\
+\x1f\x70\xef\xc0\xa0\xb8\x71\x48\x73\xe1\x06\x1b\x85\x35\x2a\xeb\
+\x5b\xf4\x8f\x76\xa6\x0b\xc7\x5a\x07\x7f\x87\x70\x6f\x9a\xbe\x30\
+\x98\x8c\x80\x1c\xe5\x5c\x0e\x34\xbf\xb4\x33\x8e\x87\x31\xca\x22\
+\xd0\xc4\xa5\x22\x2e\xfb\x31\x6a\x79\x8c\x5a\x9e\x52\xb0\xa9\xa2\
+\x72\xeb\x8b\x05\xa2\x18\xe4\x99\xa6\xd0\x77\x6b\x6b\x4b\xdc\xda\
+\x7a\x85\xf5\xf2\x4d\x8e\x72\x2b\xd0\x15\xcf\x1b\x57\x0e\x2d\x02\
+\x5a\x9d\x36\x74\x7a\xaa\x79\xc9\x3c\x36\x94\x9e\x04\x31\x35\xc8\
+\x26\x13\xb6\xa0\x67\x08\x3f\x72\x47\x38\xfe\xf5\xff\x00\xe1\xe5\
+\xc9\xb5\x9a\x4e\x4a\x88\x19\x63\x44\xbb\x02\xa4\x59\xa6\x66\x56\
+\x67\xa2\x79\x7e\xd1\x13\xf9\x11\x5a\xe7\x9e\x9e\x55\xa6\xea\x3b\
+\x34\x6b\xb6\x2a\x31\x4a\xdf\x8e\x5b\x17\x1c\x1c\x7b\x0a\xb8\xf2\
+\xaa\xd1\xea\x24\x93\x69\xea\xf5\x4a\xe2\x72\x4f\xcf\x50\x60\xec\
+\xd4\x42\xda\xa3\x5e\x3c\x61\xa9\xa0\xd8\x56\xce\x7b\x56\xa0\xbc\
+\xc6\xf7\x7d\x9d\x9f\x3c\x1d\x95\xd4\x0d\x6d\xf9\xfb\x24\x53\xeb\
+\x5d\x8a\xd2\x40\x96\xb9\x14\xfa\x42\x70\xcd\x31\x41\xbd\x41\xa6\
+\xd3\xa6\xd9\x10\x41\x8f\x8b\x74\x2b\xbc\xe1\xec\x31\x53\x7a\xb8\
+\x70\x42\x25\x1a\x52\x5b\x68\x88\x1c\x99\x23\x71\xa5\x2a\x66\xc7\
+\x38\xe3\xb1\x60\xe0\xb8\x54\xa9\x98\x15\x6e\x40\xeb\xf4\xd1\x1e\
+\xd6\x5a\xfd\xda\x1f\xbd\x51\xb6\x19\x65\x4a\x1a\x38\x0a\x88\x41\
+\x19\x60\x37\x61\x73\xbd\x8c\x7f\xef\xae\x72\xa7\xdd\x3c\xb5\xd8\
+\xf5\xf6\x39\x39\xb9\x50\xec\xab\x0e\x76\xcc\x2c\xe9\xc1\xdd\x69\
+\xf0\x15\xac\x52\xac\x57\xc7\xe0\x14\x81\x79\x40\x2d\xe2\x57\x3d\
+\xfc\x9e\xcb\x72\xdd\xe0\xbc\x13\x25\xe6\x24\xa7\x3f\x4f\x2d\xd0\
+\xa0\x0f\xd8\x73\x0d\x11\x31\x89\x47\x78\x23\xdc\xfe\x34\x8b\xed\
+\xaa\x62\x91\xc5\x9f\xeb\x8d\x90\x3a\x58\x67\xe0\xe3\xd6\x85\xd2\
+\xec\xf4\xa7\x9e\x17\x7d\xe6\x5d\x5d\x16\x9c\xfa\x43\xc5\x92\xa3\
+\xb6\xc3\xc6\x9d\x06\x5f\x7a\xe5\x25\x8a\xdf\x27\xaa\x59\x8e\x8e\
+\x42\xf6\xb7\xf3\x1c\x7e\xe7\x37\xa7\xa9\x9d\x65\x31\x2a\xb7\x16\
+\x7f\xcf\x6e\xd1\x83\x38\x47\xba\x1b\xf4\x00\x9b\x7a\xd7\xc4\x35\
+\xe7\x87\xd3\x67\xec\x92\x8a\x35\x3b\x82\xa1\x1a\x7d\xcf\x5e\x09\
+\xd7\x99\x88\x6c\x39\xf9\x19\x3d\x43\x68\xe1\xa0\x4b\x00\x2c\x55\
+\x60\xa7\x5b\xe1\x4b\xf2\x9c\x30\x20\xdb\xee\xb2\xba\xb8\xc0\xad\
+\xaa\xc3\x43\x92\xdd\x88\xfa\x86\xc8\xe5\x70\xcf\x8e\x38\x76\xd7\
+\x69\x70\x87\xc1\x24\x37\x35\xf0\x6a\x3e\x61\xe4\x30\x98\xe4\xc4\
+\x1c\x3b\x00\xff\xa4\x43\xef\x9c\xb9\xcd\x2c\x76\xe9\x70\x18\x5c\
+\xb0\x21\x9b\x6e\x67\x37\xb0\x16\x3d\xe8\x78\x5c\x76\x3a\xec\x1e\
+\x39\x18\xab\x21\xcd\xee\x6d\x5a\xec\xab\x6c\xa4\x76\x0c\x60\x79\
+\x59\xcb\xf6\x7d\xa8\x66\xc1\x99\x3f\x81\x3e\x7d\x19\x97\xc3\x0a\
+\xa5\x81\xa6\xef\x2b\x81\xe9\xf7\x42\xac\xaa\xc9\x79\x27\x54\xc3\
+\x0c\xf5\xf7\xa5\x01\x3c\x2f\x99\x67\x9e\x7c\x90\xd3\xea\x6b\x66\
+\x95\x6e\xb1\x47\xb6\x9f\x7c\x4f\x6d\xa1\x41\xf1\xbe\x37\x53\x62\
+\x24\x3c\x10\x17\x42\xb7\xc7\xe0\xad\xc5\x6d\x4c\x45\xc6\x5b\x72\
+\x68\xa3\x94\x00\x2a\x21\x7c\x73\x8d\x4f\xbd\x7c\x8b\xaf\xfc\xa3\
+\xaf\x50\xfa\xc4\x0b\x5c\x99\xd0\xde\x1e\xf1\x27\xfc\x1e\x3b\x4f\
+\x2d\xba\x81\x90\x13\xad\xd0\x88\x67\x47\xcb\xdc\x0d\x21\x21\xba\
+\x7a\xc6\x5e\x0c\x28\x29\x2f\x66\x7e\x73\xdc\xc2\xb6\x1b\x4e\x7f\
+\x9f\x3c\x76\x69\x43\x4d\x77\x9d\x49\x29\xa1\x8c\xc8\x9e\x41\xb5\
+\x3a\xa0\xe7\xa4\xdc\x73\x64\x45\x20\x4b\xef\x6d\x17\x8f\xb9\x5d\
+\x2a\x14\xe8\x67\x8d\x19\x26\x56\xa5\x6b\xe5\x21\xdd\x8e\xf0\x42\
+\x1d\x0f\x2d\x36\x8d\x0e\x9d\x48\xe4\x87\x86\x91\x83\xd9\xab\x63\
+\xd6\x62\x92\xab\x46\x58\x7f\xfe\xf0\x4d\x8c\xc2\x0a\x37\x2d\x8b\
+\xab\x7d\xc1\xa6\xd1\xa9\x89\xb5\xbe\x49\xe0\x3f\xa5\xd9\xbd\xcd\
+\xed\xca\x11\xa1\x1d\xb7\x0d\x9d\x1c\xb2\x7b\x64\xb1\x91\xf1\x39\
+\x0c\x2c\x02\x5f\x18\x33\xad\xda\x3e\xd1\xa9\xc9\x33\x3f\x3e\x29\
+\x12\xc0\x9a\x2b\xa8\x1b\xf4\xa0\x48\xa2\xc0\x52\x19\x53\xd2\x10\
+\xd3\xb6\x0c\x50\xc3\x0b\x67\x46\xca\x0e\x52\xef\x21\xf6\xe1\x22\
+\x64\x49\x61\x30\x7f\xe0\xb7\xc8\x62\x9b\x0f\xe0\x9a\x53\x4b\x9c\
+\x7c\xb7\x2f\x98\x59\xf7\x0f\x37\x7b\x01\xcd\xda\x0d\x3e\xbe\xb9\
+\x30\x13\x42\x96\xfe\x6a\x9d\x7d\xbb\x41\x37\x1e\x30\x8e\xda\xaa\
+\x4b\x7b\xd7\x84\x6a\x96\x97\x1e\xbc\xc0\xe6\xbd\xbb\xdc\x5d\xce\
+\x72\xeb\xde\x16\xc5\x9b\x2b\x74\xdb\x01\xa7\xef\x74\x78\xfd\x83\
+\x3f\x63\xef\xf1\x07\x64\xfb\x3e\xf5\xfa\x72\x9c\xd2\x6a\x43\x6c\
+\x68\x4a\x26\x15\xfa\xf5\xfa\xe8\xa3\xf4\x77\x2b\xad\x1d\x77\xfb\
+\x94\xbf\x6f\x26\x27\x79\x4e\xee\x35\xc0\x45\xe0\xb1\x64\xd9\xd4\
+\x25\x1b\x57\xa3\x69\x3b\x83\xf8\x73\xab\xe5\x81\xf0\xff\xc7\x00\
+\x0e\xea\x0d\x76\x5b\xa7\x1c\x07\x07\x94\xdb\xfb\x30\xfc\x24\x64\
+\xcb\x2c\xad\x5b\xc2\xcd\xf6\xfe\x1f\xd3\x1f\xae\x51\xe2\x48\x54\
+\x89\x94\x1b\x10\xe7\x9b\xd7\x52\xc9\x67\x83\x49\x8e\x62\xb5\xc3\
+\x60\x3c\x6d\x0c\x69\xad\x97\x6f\x2a\xe0\x3d\xf3\x7d\x38\x82\x68\
+\x78\x02\x1f\x3c\x8b\x13\x70\x4e\xe0\x02\x8c\x82\xf8\xa1\x37\x63\
+\x6b\x69\x37\x96\x0f\x00\xd1\xa9\xd0\x38\x47\xcf\x3c\x26\xde\x31\
+\xce\xb3\x8a\xd0\x4c\xfe\x90\x4e\xcc\x04\xf5\xc8\x48\x8c\xbc\xd5\
+\xe7\xb4\xc9\xc7\x12\xb0\x0a\x9c\x96\x60\xdd\x4c\xa6\x06\x74\xa7\
+\xcc\x1a\x3b\x0a\x74\xd0\x4b\x26\x2e\x0c\x4a\x0c\x7b\x2e\x3e\x42\
+\x52\xe8\x4c\x2c\x80\xd8\x67\xe8\x4f\xf7\x6f\xf6\x02\xa5\xc3\x25\
+\x80\xf5\x74\x4d\x6b\x20\x18\xd9\x65\x42\xd3\x8c\xa8\xdd\x91\x79\
+\x11\x57\x8a\x85\xa5\x0f\x58\x67\xe0\x80\x9a\xca\xb3\xf0\x7d\xf1\
+\x7d\xe4\x1c\x3b\xc8\xaa\xb6\xb2\x9f\xb9\xb3\xcc\xdf\xfc\xa7\xf7\
+\xb9\x63\xdd\xc7\x66\x81\xca\x4d\x8b\x63\xe0\xe8\x9b\xdf\xe5\xe7\
+\xff\xb7\xd7\x79\xba\x2d\x86\xf3\x98\xc5\x08\x3a\x02\x28\xa5\x6a\
+\x36\x31\x9c\xd1\xed\x4f\x70\x99\x02\x52\x1a\x7c\x89\x81\x90\x45\
+\x0f\xd7\x91\xe0\x1c\xcf\x18\xae\x3a\x0b\xeb\x4c\x3d\x4f\x53\x5f\
+\x04\x1e\x75\x8c\x44\x74\xcf\x35\xc7\x6a\xa8\x8e\x34\x56\xe9\x19\
+\x64\x9b\x79\x2a\xd1\x90\xee\x55\x88\x7f\x30\xe4\x24\x28\xb2\x64\
+\x3a\xc0\x22\x8d\xc1\xd4\xc5\x39\x29\x1c\x81\x13\xbb\xd8\x1c\x8f\
+\x5a\xa6\x46\xb7\xd3\xe5\x38\x38\xe0\x13\xbc\x48\x31\x9b\x67\x30\
+\x11\x3a\x58\x4a\x0b\x95\x9d\xa8\x03\x53\x6e\x29\xdf\x9c\x7b\x99\
+\x7f\xe6\xfb\x18\x83\x67\xc2\x78\x03\x38\x12\xef\x79\xe6\xfb\xd4\
+\x3b\x1e\xfb\xdd\xfd\xb8\x55\xeb\x98\x8b\xc0\x03\x63\x3a\x87\x58\
+\x9d\xd0\x39\xab\x3e\x5d\x41\xa1\xef\x53\xb0\x4a\xd0\xf7\x09\xe2\
+\xfb\xf3\xe4\x85\x3c\xf8\xe9\xc9\x9d\x72\x7f\xc9\xf4\x69\x5f\xb0\
+\xf4\x88\xe8\x60\x96\xba\xd9\x2f\x6a\x03\x15\x7b\x39\xaa\xa1\x43\
+\x2d\xd3\x88\x27\x77\x4e\x01\x7c\x30\xbc\xc9\xc8\x39\x54\x00\x6e\
+\xb5\x0d\x5c\x53\xe8\x78\x0b\x9b\xf1\xf8\x04\x62\x83\x4c\xaf\xd3\
+\x93\x03\xcc\xd7\xca\x06\x7b\x07\x3e\x66\xb8\xc3\xa0\xb3\xcd\xe9\
+\x1f\x1f\xf2\x03\xaf\xfe\x10\x00\x9f\xf8\xd1\x9b\xdc\xb6\x3f\x4b\
+\x6b\xe1\x81\xb2\xe0\xcf\xb6\xdf\xa0\x49\x53\x63\xc0\x89\x02\xae\
+\x3c\xc6\x6e\x6c\x43\xc8\xb6\x5c\xfa\xa0\x48\x1d\x74\x7a\xf0\x46\
+\x12\x86\x3c\x4e\x99\xb8\x87\xf2\xdc\x4e\x9e\xb1\x8c\x90\x19\xe9\
+\x72\xf1\xcf\xb8\xf4\xaa\x59\x91\x9f\x1c\x67\xca\x1d\x8c\xba\x30\
+\xfe\x10\xf8\x7e\x16\x32\x11\x7b\x95\x12\x5b\x95\x21\x0f\xd7\xb7\
+\xe8\xef\xed\x28\xcf\x83\xe8\xfb\x86\x60\xe3\x5e\x96\x43\xd7\xa0\
+\x52\x14\x03\x0b\x07\x13\x7d\x5e\x74\x9c\x69\x28\xe5\x43\x7a\x9b\
+\x06\xef\x4d\xcb\xe2\xa6\x65\x11\x59\x37\xb9\xa9\x3d\x0f\x10\x9d\
+\x4d\x78\x77\xe7\x21\x51\xdc\x0e\xe9\x22\xf0\x94\x1f\xd3\x2f\x82\
+\x3b\xe7\xb2\x95\x98\x7d\x9c\x9a\x44\x6f\x61\xce\x68\x59\x09\xc8\
+\xb4\xbc\x60\x30\xdf\xf8\x48\x03\x7e\xd8\x73\xa7\x2e\x37\x8d\xe9\
+\xe5\xdf\xed\x59\x82\xe5\xba\xe5\x6e\xa2\xb3\x8f\x72\xb1\x99\x4d\
+\x56\x36\xea\xca\x9d\x26\x2b\x2f\x46\xad\x29\x80\x0f\xbb\x13\x86\
+\xa1\x0b\xa1\xb6\x80\x62\x00\xcb\xef\x2a\xbd\x1d\x3d\x47\x8c\x0d\
+\x33\x72\x8b\xac\x5c\x1e\xf0\xd4\xbf\xc3\x07\xaf\x3f\x06\xe3\x98\
+\xa8\x78\x93\xfb\x9f\xff\x24\x3f\x76\xe3\x0b\x14\xbf\xfc\x05\x26\
+\x8d\x02\x17\xad\x2f\xf1\xd6\x1f\xee\xf2\x26\x30\x39\x7f\x04\x3d\
+\x03\xbf\xec\xc5\xda\xb8\x88\xcb\xac\xf4\x91\x25\x55\x69\x3b\x20\
+\x13\xb6\xf0\xcb\x99\xc4\x00\xf5\x82\x55\x12\x83\xd1\x7b\x0e\xe7\
+\xb8\xe0\x94\x66\xd2\x2b\xf5\xec\x36\xf5\x58\x6b\x40\x9e\x96\x23\
+\xea\xbd\x71\x0e\x89\xe5\x9e\xb3\xbb\x6b\xb2\xb1\x75\xc1\xc2\xc6\
+\x6d\x2a\x0b\x8b\x74\x17\xe4\x49\xd8\xc2\x2c\x9c\x28\x03\xaf\x44\
+\x8e\x7e\x27\x6e\xec\xee\x6f\x03\x9f\xc1\x1f\x58\x58\xc5\x3e\x50\
+\x49\x78\x44\x4c\x80\xae\x7f\x7f\xea\xc4\x8e\x01\x6c\xac\x86\x82\
+\x79\x57\x43\x6e\x5a\x96\x92\x0e\xfa\x56\x32\xf7\x7e\xf7\x29\xad\
+\x83\x4e\x02\xc0\x1d\x23\xa2\x66\x56\xe7\xb2\xaf\x1e\x54\x48\xaf\
+\x74\x69\xb0\xe9\x46\x9c\x6e\xa4\xe9\xa1\x64\xfd\x73\xd3\x9a\x59\
+\x37\xfe\x74\x50\xfb\xbd\x90\x28\x53\x51\x72\x42\x06\x32\xfc\xa2\
+\x97\x00\x70\xa2\x8a\x23\x14\x5d\xd1\xd7\xca\xd3\x0a\x8d\x83\xe1\
+\x4d\x8e\x5b\xc2\x88\x6b\x75\x62\x00\xfb\xee\xdc\x2b\x80\xba\x52\
+\xc4\x7f\xaf\x15\x0a\x5f\x79\xd0\xab\x73\xdc\xba\xc0\xfe\xf4\x16\
+\x3f\x7c\xcb\xe0\xc1\x8f\xdf\xe3\xc5\x1f\xfc\x22\x9b\xb7\x37\xf0\
+\x4f\x3a\x7c\xeb\xf0\x82\x77\xdf\x38\xe1\xfd\xdf\xd9\x65\xcd\xdb\
+\xe7\x1f\xfc\x0d\x93\x2f\xff\xc4\x06\xd9\xe5\x07\x1c\x4d\x2e\x89\
+\x32\x95\x44\xcf\x37\xfd\x7b\xcf\xdb\xca\xbf\x9f\x0e\xb3\xeb\x84\
+\x71\x8e\x91\x78\xec\x9a\x63\x5c\x73\x3c\x75\xb3\x69\x1d\x46\x13\
+\xb3\x4f\xb4\x9b\x1e\xf5\xd3\x0d\xbb\x9d\xae\x00\xdf\xd9\xf0\x29\
+\xe3\xe1\x15\x99\x6e\x9b\x8d\xc2\x9a\xc8\xa1\xf0\x77\x66\xab\x45\
+\xea\x26\x83\xf6\x90\x6a\x7f\x91\xfe\xa0\x8b\x55\xf4\xf1\x07\x96\
+\x62\x61\x95\x3b\x11\x9d\x9a\xd4\xd7\x3f\x4c\x80\x57\x82\xba\xcc\
+\x83\x19\x46\x4e\x3f\xb6\xd6\x37\xb9\x5d\xbb\x4b\xb6\x99\xe7\x22\
+\xf0\x44\xda\x5e\x2a\x14\x19\x65\x2a\x89\x18\xbc\x7e\x40\xf5\x01\
+\x31\xd7\x01\x53\x02\x21\x0d\x50\xc9\xdc\x12\x2c\x2a\xd4\xdc\x0b\
+\x67\x16\x8d\xee\xa9\xd0\xf5\xae\xcc\xa3\xb8\xce\x53\xe2\x3a\x13\
+\x6a\x77\xa6\xc9\x3d\x52\x03\x37\x2f\x8e\x14\x80\xaf\x3a\x9d\x04\
+\x9b\xe9\xdf\x5b\x7e\x17\x1d\x60\x7a\x7f\x8b\xb3\xc3\x36\x7b\xaf\
+\x1d\x52\x5e\x35\xf8\xe2\x67\x3e\xc7\x8f\xfe\xbd\xcf\xf2\xf2\x27\
+\x57\xb9\x73\xb3\xc8\x46\xc6\xe7\x5b\xdf\x7d\x8d\xdf\xfa\x8d\x5f\
+\xe1\xf7\x7e\xf5\xf7\x38\x0a\x73\xdc\xbb\xf3\x0a\xad\x07\x1b\x34\
+\xf2\xd5\x99\x06\xdf\xd7\x79\x5c\x12\x55\xdf\x73\x8e\xb1\x7e\x7f\
+\x99\x48\x91\x46\x22\x76\x10\xf4\xe7\xba\xe9\xd2\xcf\xa5\xcf\xab\
+\xee\x92\x6b\x75\x3d\xa2\xec\x19\x79\x56\x70\x49\x85\xb2\xad\x64\
+\xb9\x52\x89\x1c\x01\x35\xd1\xe2\xd5\xbd\x60\xa3\x34\xdf\xe5\x57\
+\x2a\x67\xb1\xee\x7f\xfe\x93\xf8\x97\x15\xac\xcf\xf7\x45\xf4\x0d\
+\x78\xf5\xee\x90\xc3\xe0\x2e\x0b\x77\x7c\x02\x1f\x16\xec\x0d\x5a\
+\xec\xc7\xa0\xfe\x50\x31\xf6\xfa\xba\xa8\xe6\x30\x56\xb2\xe2\x4b\
+\x04\x0f\x55\x56\x5a\x3d\x32\xe8\xc4\x91\x26\x79\x49\x13\xee\x9e\
+\xf9\x2e\xae\xb4\x3e\x53\x46\x9a\xef\x42\x0f\x7c\xdc\x84\x11\x37\
+\x57\x0f\xc7\xd2\x41\xee\x3b\xec\xb9\x09\xa3\x45\x07\xb2\x6e\xd0\
+\x28\x3d\x88\xa9\x5c\x4d\xcd\xfa\x40\x15\x82\x16\x57\x93\x25\x56\
+\x8f\xfd\x67\x14\xce\x9b\x74\x3b\x5d\xdc\x98\x09\x75\xf6\x95\x2c\
+\xaf\xff\x16\x7d\xe1\xd6\x23\x43\xc8\x8c\x6a\xc4\xf6\x55\x87\xee\
+\xaf\x7f\x9d\x47\xef\xdc\xa0\xfc\xca\x21\x0b\x5d\xd1\x19\xe9\x0b\
+\x1f\xbf\x4f\xb1\x9e\x61\xf3\xde\x5d\x8e\xc7\x1e\x61\x7e\x19\x3f\
+\x7c\x88\x65\xbe\xc4\x0f\x1b\x23\xde\x90\x2e\xba\x39\x2c\x7c\x5d\
+\xe4\x32\x7d\xac\xf5\xab\x97\xce\xc4\x46\x3f\x22\xdf\x28\xcf\x1c\
+\x2f\x5d\xeb\xea\xe4\x23\xc9\x44\x12\x4b\xda\xd5\x26\xd9\xbf\x06\
+\x8c\x0f\x26\xf0\xfd\x10\x19\x5d\x20\x98\x1b\xf4\x90\x92\xa2\xa9\
+\x35\x79\xba\x74\x45\xae\x85\x55\xf4\x29\x7a\x2e\x7d\x16\x89\x68\
+\x09\x4d\xbc\xba\xb1\x81\xb3\x50\xa6\x5c\x74\x58\xdd\x00\xbf\x2f\
+\xc2\x2b\x2b\xdd\x51\x9c\x00\xf4\x4a\x2c\x6b\xea\xf8\xf9\x0e\xd6\
+\xda\x2b\xec\x5a\x9a\x53\x70\x1d\xd6\xfd\xa7\xec\xaf\x6f\xb1\xfb\
+\xd6\x9f\x53\xcf\x2e\xaa\x4b\x88\x8c\x0e\xd5\xca\xc2\xdf\x0a\x95\
+\x19\x8b\x39\x7d\x5f\xd7\xc9\xc2\xa8\x22\x21\x23\xa4\x0b\x2d\xed\
+\x47\x96\x5e\x09\xaa\xe2\x3d\xfa\xeb\xe9\x13\xb6\x4c\xa4\x2e\x9b\
+\xcb\x44\xf4\x00\x33\xec\x01\x75\xc2\x4e\x87\xe5\x66\x4d\x65\xb9\
+\xd5\xea\x0d\x5e\xb0\xa6\x39\xc2\xdb\x8f\x42\x0a\xbd\x26\xbb\xad\
+\x53\x7a\x4e\x51\x7d\xae\x6e\xc0\x0d\xfd\xa9\x27\xc2\x1a\xd8\x6a\
+\xa1\xc8\xdf\xa4\x8f\xba\x2d\x58\x25\x7a\xc0\x5b\x3b\x27\x98\x4f\
+\x3e\x24\x72\x2b\x2c\x55\x44\x7f\xb2\xf5\x7b\x5f\x64\xf3\xde\x06\
+\x5f\x78\x61\x93\x93\x70\x0d\xcb\x14\x44\xf3\xf0\xfd\xf3\x99\x2b\
+\xca\x75\x41\xa3\x79\x72\x4b\x5e\xb9\xe8\xcd\x46\x36\x0b\x56\x89\
+\x11\xce\xcc\xfe\x05\xab\x94\x18\xb2\xa3\x37\x57\xd4\xf7\xd5\xff\
+\xa6\x0c\x9b\x97\xca\x62\xd0\x7a\x37\x80\x9d\xfd\x3e\x2f\x5e\x5e\
+\xd0\xb8\xb5\xc5\x62\x63\x13\xd8\x4b\xba\xd9\xfc\x23\x05\xe4\xbe\
+\x51\x50\x19\x8b\x1e\x57\x71\xe3\xca\x0a\xbd\xc8\xc3\x2a\x7a\xf8\
+\x72\x1c\xb2\x4d\x0e\x8a\x5a\x32\x45\x25\xbe\xd4\x55\x2a\xac\x02\
+\x36\x01\x1e\x19\xc2\x41\x48\x18\xe7\x57\xc8\x3c\x8b\x28\x06\xfa\
+\xf2\xc2\x57\xc8\x58\x1f\xb2\xf3\xb4\x09\x5d\xe1\x10\x97\xda\x78\
+\x52\xb1\xe8\x10\x51\x37\xab\x74\x88\x34\x46\xf6\x67\xee\xa7\xa5\
+\x86\xce\x64\xf2\x80\x4b\xb6\x4d\xb0\xb5\xe6\x52\x4b\xeb\x69\xdd\
+\x90\x93\x8f\x7b\x56\x19\x7c\x97\xaa\xef\x08\x30\x03\x8b\x66\x85\
+\x16\x90\xcb\xad\xd1\x73\x44\x7e\x44\xed\x4e\x43\x25\xb9\xef\xfa\
+\x03\xc2\xa3\x0d\xfa\x85\x77\x39\xd9\x1b\x27\xb4\xa8\x34\xe0\x74\
+\x06\x4e\xe8\xd3\xd8\xaf\x9d\xce\x8e\x2b\x55\xb3\x4c\x0c\x8b\x7a\
+\xd7\xa4\x64\xe6\xa0\x5e\xa7\xb9\x04\x9f\x7a\xe5\x05\x3e\xf1\xa9\
+\x17\x09\xef\x3c\xc3\xdc\x3b\xe5\x1b\xe7\x13\x16\x6c\x9f\xab\x27\
+\x87\xbc\xf1\xfe\x5f\x31\x39\x3f\x52\x75\xea\xfa\x15\x4e\xff\x3e\
+\xf2\x6f\xa6\x01\xac\xa2\x9a\xbd\x59\x90\x0e\x7d\x97\x51\xdb\x21\
+\xaa\x18\x62\xa1\xa7\x5e\x5b\x26\xa2\xe7\x94\x67\xe4\x42\x9a\xcd\
+\xe5\xdf\xc9\x84\x2d\x4a\xd5\xc6\x34\x5a\xd9\x11\x39\x14\xa3\xa3\
+\x0e\xd1\xfa\x39\xb9\x8d\x06\x37\x3e\x56\xe5\x3b\x1f\xc4\x55\x1c\
+\xbe\xf0\x50\xa8\x4e\x9b\x8e\xc8\x58\x3c\x1e\x5a\xdc\x02\xaa\x46\
+\xc8\x80\x3e\x90\x4c\x1d\xb0\x3c\xc6\xe4\x0b\x21\xa3\xa1\x39\xb3\
+\x55\x65\x4b\xe4\xe2\x39\x83\x7a\xf5\xab\x07\x95\x05\xb2\xb4\xa8\
+\x34\x96\xf9\xdb\x1b\x77\xf9\xb3\x3f\x3a\x10\xe1\x51\x3f\x62\xc9\
+\xb2\x55\x75\x82\x14\xfb\x75\xb3\x4a\x27\x8e\xf5\xcb\xe8\x92\x9e\
+\xb4\xa2\x07\x23\x54\x07\xf6\x5e\x88\x15\x9f\xb1\x82\x55\x52\x5e\
+\x06\xc9\x76\x09\x66\xd1\xa4\x83\x7c\x6f\xda\x9f\x2c\x13\x78\x86\
+\x18\x0a\xcc\xca\xa0\x89\x43\xca\x3d\xab\x4c\x50\x6f\xb0\x12\x37\
+\xaa\xde\xf5\x07\x2c\x9d\xd8\x7c\xe7\xe4\x31\x7d\xa7\x41\xcf\xe9\
+\xcf\x8d\x06\x8e\xc7\x27\xe4\x58\x9b\x0b\x64\xfd\x52\xde\x2d\x8a\
+\xc8\x9b\xeb\x4c\xc8\x02\xae\x29\x82\x2b\x5b\xa6\x41\xf1\xbe\x17\
+\x03\x58\x5c\x52\x9f\x9e\x4f\x78\xfd\xf7\xdf\x10\x9d\x7f\x34\xf7\
+\x98\xee\x49\xd1\x43\xe9\xba\x27\x64\x9e\x4e\x4f\x3f\x97\x5e\xf0\
+\x51\x3c\xd4\xe5\x42\x73\x02\x0c\xf5\x63\x74\x8d\x7c\x49\x2f\x08\
+\x19\xe4\xd0\x23\x7f\xd4\xc5\x39\xea\x55\x2e\x31\x96\x97\xb1\xa9\
+\xf0\xc9\xdb\x9f\xe1\x83\xca\x43\xe1\x75\xf1\x87\x98\x75\x5b\x25\
+\xc8\xcb\x71\x63\x2a\xd0\x61\x87\xf8\x03\x8b\xaa\x11\xd2\x1b\x78\
+\x58\x45\x5b\x34\x14\xb4\xc9\x61\x0e\x23\x6c\x02\xcc\x61\x3c\x93\
+\x21\xde\xe6\x0b\x61\xfc\x21\xde\x14\xb8\x6a\x2b\x9e\xb7\xb1\xf1\
+\xdb\x67\xd8\x35\x9f\x9f\xfa\x99\x2f\x51\x5f\x7c\x85\xa3\xab\x2b\
+\x2e\x02\x4f\x95\x85\x4b\x4f\x85\x9e\xef\x2a\x19\x44\x4f\xc8\x49\
+\x07\x19\x74\x9d\xab\x07\x44\xae\xab\x8f\xd3\x25\x84\xae\x9d\x75\
+\x00\x5b\x55\x53\x49\x89\x79\x9a\xb0\x67\x95\xa9\x96\x07\xdc\x6b\
+\x8a\xa6\x27\x17\x6b\x1e\x4b\x27\x36\x8f\xfd\x67\xa2\x61\x75\x47\
+\x00\xd8\x0c\x7b\x33\x97\xe1\x5c\x6e\x6d\xae\xaf\x3b\xed\x03\xd7\
+\x7f\x8f\xdc\x2f\xdb\xf7\x69\x05\x70\xf6\xa4\xc1\xd7\x77\xf6\xf8\
+\xf3\x3f\x3d\xe4\x4f\x7f\x79\x9b\x3f\xfc\xfd\xaf\xb1\xb3\xbb\xaf\
+\x0a\x5f\xe7\x75\x2c\x92\xbf\x4d\x97\x4e\xba\x36\x9f\xe7\xb9\x19\
+\xfa\xae\xea\xe1\x5c\xb0\x4a\x18\xfd\x88\x65\xa6\xc6\x53\x54\x31\
+\xbe\xa7\xec\x3e\xdd\x08\xd4\x8f\xa5\xde\x6d\xbf\x63\x88\x3e\x75\
+\x74\x42\x0e\x23\x31\xfd\xaa\x7d\xb0\xc3\x78\x78\x45\x34\x39\xa6\
+\x7a\x73\x43\x94\x2a\xf5\x0c\xfa\xc3\x35\xd5\xa4\xb0\xef\x14\x68\
+\x85\x1e\x6e\x5c\xde\x24\x3d\x13\x03\x3b\xc4\x88\xfd\x76\x71\x65\
+\x87\x97\x64\x57\x5d\x64\x0f\x0b\x78\xaa\xf1\xc6\x75\x40\x06\x8f\
+\x0c\xfe\xf1\x29\x9b\xf7\xef\xf3\x77\xff\xa3\x2f\xb2\x79\xf3\x87\
+\x45\x3a\x60\xa7\x4f\xa7\xd3\xa7\x51\x31\x67\xaa\x14\xd2\xae\x35\
+\xc9\xc6\x3a\xa8\x25\xf8\xfc\xa2\x37\xd7\xeb\x20\x73\x85\x75\xb6\
+\x9d\x77\x40\x75\x40\xeb\xde\x82\x74\xd8\xbb\xea\x3b\x54\xcb\x03\
+\x6a\xf5\x1a\xc3\xe5\x16\x17\x6b\x9e\x0a\x27\x9f\x3d\x69\x24\x72\
+\x7f\x43\xb3\x3a\xa3\x27\xa5\x6e\xd7\x7f\x83\xee\x19\xf0\x8b\xc2\
+\xaf\x2b\xaf\x4c\x52\xfb\x27\x4a\x8d\x3a\x7d\xfe\xe4\x37\xff\x8c\
+\xd7\x5e\x7b\x97\x6f\xfe\xe5\x43\x26\xad\x11\xcd\x5a\x93\x4c\xa3\
+\x96\x30\x98\x66\x02\x42\x73\xb4\x70\x9a\x69\xd3\xc7\xd0\xce\x64\
+\xd4\x6b\x51\xc5\x48\x64\x9b\x49\x80\x7b\x41\xa0\xfe\xeb\xbf\x51\
+\xff\xdb\xf3\x58\x58\x5d\x2d\xc2\x1e\xf5\xc8\x20\xca\x54\xb8\x0c\
+\xfb\x42\x1e\xc4\x6d\x78\x33\x83\x0c\x4e\x2f\x69\x34\xcb\x86\x3b\
+\x6a\x94\xc2\x9c\x61\xb0\xfe\xc0\x22\xa2\x05\xf4\xa7\x7e\x62\xfd\
+\x66\x93\xc3\x63\xac\x6d\x03\xf5\x8a\xbe\xd7\x8c\x21\xd1\xee\xe0\
+\x84\x7d\x7e\xe0\x2b\x3f\xcc\x7f\xf6\xdf\xff\x34\x5f\xfe\x47\xff\
+\x82\x8d\x57\xff\x21\xed\x51\x0f\x6b\x90\x57\x6d\xa5\x9e\x5b\xb3\
+\x15\x03\x59\x4f\x85\xd4\x99\x38\x11\x42\xd6\xc0\x9b\x8e\xc8\xa5\
+\xc1\xec\x05\xc1\x5c\xd9\x31\xb3\x30\xea\x26\xb5\x7a\x8d\xe2\xaa\
+\xc7\x0b\xd6\x4d\xda\x87\x2d\xfc\xed\x02\x1f\xb4\x3a\x84\xfe\x19\
+\xe7\x9d\x48\x81\xc4\x0c\x7b\xea\x04\xea\x27\x54\x46\xc8\xa2\x4c\
+\x25\xb9\xc8\xa4\x8f\x36\x9e\x24\xaa\x03\x41\x56\x54\xeb\x9f\xa3\
+\xb2\xcf\xcc\x31\x9d\x5a\x98\x58\xe0\xba\x54\x4a\xbf\x4f\x6f\x18\
+\x93\xf0\xfa\xa4\xae\x46\x33\xe9\xb7\xfd\x28\xc1\xbe\x12\xe0\xe9\
+\xed\xf3\x5c\x74\xf2\xb1\x5e\x64\xaa\x8f\x06\xce\xe5\xd6\xa6\x87\
+\xba\x50\x26\x73\xcb\xa4\xb1\x24\xbe\xcb\xad\xaa\x43\x76\xf9\x81\
+\xea\xdb\xa7\x7c\xce\x41\x57\xb5\x6a\x98\xbd\x55\x24\x13\xdb\x0a\
+\x98\x1e\x19\x60\xda\x0d\x5e\x00\xd8\x4e\x30\xee\x3c\x36\xb6\xc9\
+\xe1\xd9\x25\xec\xf6\x19\xe5\x41\xc8\xe6\xfd\xfb\x7c\xf9\x67\x5e\
+\xe4\x9f\xff\xcb\x1f\xe3\xe5\xcf\xfd\x24\x9d\x4e\x5f\xc9\x0b\x29\
+\x27\xae\x3a\x1d\xd5\xb3\x21\x68\x77\x71\x2e\x5b\x04\xed\x6e\xe2\
+\xc4\xea\x27\xbb\x69\x46\x89\xcb\xa5\x7e\x72\xd2\x60\xd4\x41\xdf\
+\x1e\xf5\x68\x68\x03\xaf\xf5\x13\x19\x76\x3a\x0a\x84\x4d\x33\x4a\
+\x00\xf8\xb1\xff\x8c\xca\xf0\x06\x67\x9d\x36\x51\x6f\x9a\xe4\x22\
+\x59\x47\x67\x62\x9d\x89\xa4\x91\xaa\x03\x53\xff\xbe\xf3\x6a\xd6\
+\x9e\x97\xa4\xaf\x2f\x6c\x3d\x99\x67\x1e\xdb\xa6\x0d\xdb\xb4\x4f\
+\x5d\x2e\x3a\xf9\xf7\x24\xbb\xea\xf2\xc1\x48\xcd\xe7\xf6\x82\x20\
+\x01\x60\x3d\xb2\x9a\x06\xb2\xdc\x66\xc2\x56\x02\xc8\xba\xcd\xd0\
+\x0a\x45\xbd\x5d\x67\xe8\x60\x3a\x19\x36\x1b\x9b\xd4\x3f\xb6\x7e\
+\xed\xef\xaf\x65\x6a\x2c\x74\xfa\x8c\x2e\xc7\xca\xc5\x66\x15\x7d\
+\x15\xf0\x50\x33\x3b\x04\x1c\x05\xeb\xba\x03\x83\x52\x31\x96\x11\
+\xde\x50\x03\xab\x27\x0c\x3c\x6f\xa8\xc0\xec\x69\xd3\x73\x04\x73\
+\x67\x70\x46\x2d\x9c\xab\xef\xb2\x10\xc2\xda\xcd\x02\x3f\xf5\x33\
+\x5f\x62\xe3\xd5\x7f\x48\xb6\xef\xb3\x7b\xf6\x8c\xa3\xab\x2b\x8e\
+\xae\xae\xf0\x82\x80\xd2\xfa\x02\x77\xee\xbf\xc4\xbd\xef\xfb\x24\
+\xeb\x77\x37\x71\xfb\x22\x09\xbc\xdf\x9e\xa8\xd2\x22\x79\x70\x64\
+\xbe\xb0\xae\x8b\xd3\x72\x61\x1e\x2b\xd8\x99\x4c\xe2\x79\x9d\x89\
+\xc3\x38\x09\x5e\x3e\x27\xcb\x87\x54\x75\x75\xa7\x1d\xfb\x82\x27\
+\x73\x3d\x1e\x73\xfd\xd5\x73\xca\xfd\xf5\xe8\xa0\x7e\xa5\xf9\x5e\
+\x92\xf8\xf5\x54\xcd\x79\x85\x04\x69\x37\xe2\x75\x36\x42\x3a\xfa\
+\x79\xdd\x4d\x67\x63\xa3\x1f\xcd\x00\xf8\xba\x9b\xfc\xfd\x32\x17\
+\x5c\x8f\xe2\x49\xe9\x98\xcb\xad\xd1\xed\x74\x39\x88\x26\x71\xbd\
+\xdd\x25\xad\xb0\xcb\x6a\x7d\xda\x11\x68\x5e\x4f\x8b\xc3\x28\xcb\
+\xbd\xdb\x59\x0d\xbc\xe2\xd8\x55\x8d\x30\xce\x01\xf7\xda\x60\x17\
+\x94\x7c\x28\x15\x03\xdc\xc1\x90\x52\xb1\x00\xb6\x94\x14\x36\xee\
+\x60\x88\x59\x1c\x63\xdb\x0d\x6c\xaf\x0d\x76\x43\xe4\x73\xe2\x29\
+\x30\xdb\x71\x02\x87\x07\x74\xdb\x5d\x6c\xc6\xbc\xd0\x28\xf1\xcf\
+\xff\xe5\x8f\xf1\xdd\x77\x6f\x71\xb5\x67\xe1\xf0\x88\x9b\x96\x85\
+\xb5\xbe\xc9\x67\x3f\xb1\x8e\x99\x29\x31\xa0\x8a\x37\xec\xf0\xe4\
+\xc3\x6d\xf6\xf7\xb6\xd9\x7b\xfc\x01\xbb\x3b\x07\xb4\x2f\x5b\x84\
+\x03\x71\x50\x6f\x7d\xf2\x8e\xb8\xbc\x1e\x5d\x25\x4f\x60\x2f\x19\
+\xd8\x90\xec\x5b\x69\x64\x67\x2e\xb9\x72\xff\x74\x35\x87\x9c\x66\
+\x34\x5c\x6e\x51\x19\xde\xa0\x5f\x38\x56\x35\x7d\x22\x78\x33\x99\
+\x3d\x61\xd7\xe4\x6c\xe8\x41\x81\x04\xd8\x52\xa9\xa1\xba\x57\x26\
+\xed\x39\x98\xe7\xf9\x98\x97\x0b\x3d\xcf\x38\xd5\x17\xb8\xf4\x5f\
+\x17\x72\x6b\x33\x57\x8d\x79\x0c\x9b\x96\x14\xcf\x33\xee\xae\x5b\
+\x78\xfa\x77\xd7\x93\xe4\xeb\x55\xa0\x9c\x85\x4e\xc8\xce\xf6\x19\
+\xfc\x28\x84\x3d\xb0\xcc\x88\xe5\xf6\xd4\xc5\x9b\x2d\x7c\x1c\xfc\
+\xa3\x69\x92\x7c\xec\x21\x79\xb2\x3f\x41\x14\x8f\x57\xa8\x1a\x2e\
+\x66\xad\xa1\x65\xb1\xd9\x0d\x3c\xc6\x84\x83\x21\xa5\x62\x14\x33\
+\x71\x14\x3f\x17\x0a\x30\x7b\x6d\x4a\xc5\x06\x78\x6d\x3c\x1b\xc2\
+\xc8\xa6\xa4\x71\xb0\x8d\x87\x3b\x30\xa0\x88\x02\xbd\x40\xf3\x90\
+\xb6\x9d\x61\xed\x66\x85\xd5\xfa\x97\xe1\x8b\x7d\x9a\x93\x2f\xd1\
+\x0f\xce\xc0\x8e\x2d\xea\xa1\x41\x35\x9f\x63\x62\x98\x6c\xae\x7e\
+\x19\x7e\xe4\xcb\x9c\x76\xae\x28\x5c\x79\x9c\x5e\x5e\x71\x38\x14\
+\xb5\x56\x9b\xeb\x65\x7e\xe9\x17\xdf\xe7\xe8\xe9\x2f\x51\x5e\x6c\
+\x52\xe8\x97\x12\x8c\xa3\x4b\x0a\x3b\x93\xc1\xef\x85\xea\x44\xa5\
+\xfd\xc4\x89\xbc\x64\x50\x32\xa2\x70\xde\xa4\xbf\x3c\x05\xf0\xe1\
+\xd1\x64\xd6\xf7\x0a\xd3\x54\xd0\x54\xb4\x4a\x82\x37\x51\xb0\x3a\
+\x27\x62\x26\xdf\x2b\x7d\xbb\xe9\xab\xc8\x3c\x00\x4f\xa5\x85\x3d\
+\x03\xd8\xeb\x8c\xbb\xa1\xef\xce\x05\xf0\xf3\x58\x38\x0d\x64\xf9\
+\xf8\xa3\xde\x3b\x6f\x11\x59\x55\x93\x9a\x53\x9b\xe6\x5b\x68\x79\
+\x14\x17\xdd\x27\x74\xbd\x4d\x8a\x1b\x4d\xce\xdb\x65\x95\xcd\x76\
+\xf8\x9d\xdf\x84\x7a\x45\x25\x01\xb5\x3a\x43\xa2\xf1\x25\x3b\x3b\
+\x5f\xe3\xac\x73\x9f\xd0\x5e\x65\x3d\x3a\x22\xb8\xb8\x43\x36\xb3\
+\x22\x98\x38\xe7\x0d\x71\x23\x62\xe0\x66\x00\xe1\x56\x93\xa0\x06\
+\x31\x39\xc9\x64\x0c\x76\x89\x9a\x17\x32\x2e\x16\x14\x5b\x0b\xd0\
+\xa2\xee\xd7\xbc\x90\x76\x24\x24\x89\x1b\x89\xa1\x20\xfd\xf6\x1e\
+\x50\xc6\x26\x47\xbf\xd0\x87\xe1\x90\xf6\x50\x04\x50\xcc\xa2\x09\
+\x23\xd1\x7f\x78\xc4\x3e\xe5\x7c\x93\xb5\x9b\x05\xa2\x46\x8e\xca\
+\x46\x86\xef\x2f\x2c\xd1\x8b\x2a\x74\xfc\x08\x78\x7f\x06\x54\x32\
+\x32\x96\x0e\x47\x5b\x55\x13\xbb\x97\xd4\x89\xfa\x89\x58\x26\x02\
+\x33\xa2\xa6\x55\x66\x65\xab\x05\x5a\xa7\x36\xa1\x53\xa5\xef\x1f\
+\xe2\x17\x0d\xf5\xb9\x7a\x16\x5a\x9a\x19\x25\xcb\xce\x1b\x1b\x76\
+\x2d\x60\x32\x15\xfc\x62\x7f\xc6\x68\xbd\x8e\x85\x75\x69\x31\x6f\
+\xdf\xeb\xd8\x3c\x0d\x60\xb9\xbd\x4e\x26\xa4\xd9\x57\x02\x7b\x58\
+\x71\x3f\x52\xfa\xa4\x33\xe2\x7c\x3c\x55\x3c\xaa\x1b\xcf\x27\x4e\
+\x84\x73\x1a\xc1\x4b\x50\x2a\xd6\xb9\x5d\x0b\xf9\xa3\x85\xe9\x24\
+\x57\xd5\x7d\xde\x11\x81\xb3\x13\x27\x62\x0b\x18\x74\x02\xe8\x3c\
+\xe3\xcf\xc7\x11\x6b\xb9\x7d\x8a\xf5\xb8\x5f\x45\x5b\x03\xb0\x60\
+\xde\x08\xbc\x36\x66\xd1\x14\xec\x8a\x18\xc2\x68\x93\xc3\xf6\x5c\
+\xc6\x76\x21\x96\x1d\x05\xc5\xd6\x60\x83\xd7\x26\x1c\x84\x8c\xed\
+\x82\x00\xf0\x60\x48\xc3\x40\x19\x89\xe0\xe0\xd1\xa2\xdf\x3e\xe6\
+\x6a\x60\x88\xbf\xa5\x0d\x77\xb4\x3c\x0f\xbf\xdf\xa7\x73\xb9\x4f\
+\xfb\x60\x97\x5e\xfb\x12\x77\x30\xe4\xe0\xa2\x45\xd6\xe8\xd3\xbe\
+\x10\x6e\x99\x46\xbe\x4a\xb6\xef\x27\x12\x80\xfc\x5e\x48\xa6\x51\
+\x4b\xe8\xbd\xb4\x81\x93\x28\x1f\xf3\x1d\xe1\x89\x88\x4b\x87\xa4\
+\x16\x96\xed\x00\x3a\x7e\x8f\x80\x5a\xc2\x80\x92\x4c\x28\x8b\x35\
+\x96\x90\x1f\x66\x00\x00\x19\x9b\x49\x44\x41\x54\xe7\xb9\x08\xe7\
+\x25\xc4\x3c\x4f\xeb\x5e\x67\x20\x3d\xef\x52\x7d\x1d\xeb\x5d\x07\
+\xfc\x8f\x62\xe0\xb4\x21\xa7\x3f\x27\xb7\x12\xd8\xba\xee\x7d\xde\
+\xad\xea\x3b\x33\xae\x38\x55\x84\xea\x14\x55\x4f\x89\xce\xd0\x81\
+\x81\x60\x1a\x99\xcd\xe6\x3a\x13\x5c\x6b\x3d\x31\x7b\x6f\xd2\x1b\
+\xb2\xbb\x1f\xcc\x0c\x14\x1a\x74\x82\x69\x8d\x1d\xde\x90\x30\xb2\
+\x63\xe0\xc6\xa0\x8c\x41\xe6\x61\x12\x46\x36\x0c\x86\x94\x8a\x0d\
+\xdc\x81\xec\x86\x28\xb6\x42\x82\x88\xd7\x4a\x5e\x1b\x77\x20\x58\
+\x19\x40\x2e\x10\x77\x50\xc4\x2c\x9a\x84\x83\x90\x6c\xd1\x66\x3c\
+\x20\x66\xf9\x82\x08\x67\x07\x11\x54\x6c\xcc\x81\x18\x76\x03\x65\
+\x6c\xcf\x8d\x47\x90\x4d\x6f\xfb\x95\x09\x81\x66\xad\xeb\xae\x23\
+\xe9\xd9\x98\x77\xc2\x66\x0c\xbf\x38\x72\xd4\xac\xd9\x0c\x97\x5b\
+\xb4\x4e\x81\xd3\xe9\xd8\x58\x59\xf9\xa0\x97\xb9\x8b\xf1\x60\x36\
+\xa8\xd6\xae\x3c\xb7\x4e\xf0\x3a\x69\x90\x0e\x76\xcc\x2b\xa3\x9a\
+\xc7\xa6\x32\xd7\xa1\xea\x3b\x60\x25\x93\x73\x9e\xc7\xb8\xd7\x45\
+\xe6\xa4\x67\xc2\xae\x64\x66\xa4\x83\x64\xdf\x8f\x5a\x44\xd7\xdd\
+\xf4\x48\x68\x42\x1b\xc7\x00\x6f\x75\xb3\x6c\x1f\xef\xb2\x79\x79\
+\x9f\x71\xe3\x52\xb5\x42\x00\xa8\x2f\xbe\x42\xc9\x3f\xc2\x25\x1e\
+\x96\x33\xc8\x89\xb9\x1e\xbb\x01\xd9\xd6\x9b\xec\xda\xa2\x11\xe1\
+\x51\x3c\x13\xda\x35\xc7\x98\x25\xc3\xc3\xb3\x93\x07\x52\x32\xa4\
+\x1b\xd9\x53\x76\x8e\x3d\x18\xf2\x35\x09\x54\x8f\x0c\x0d\x03\xdc\
+\xc1\x50\x0d\x6c\x74\x07\x43\x4a\x86\x17\x33\xb2\x91\x60\x64\xc9\
+\xee\xf2\x7e\xc3\x40\xcc\xc9\x1b\x08\x17\x56\x38\x28\xe2\xf7\xfb\
+\x49\x00\x7b\x31\xe8\x1e\x1d\x26\x00\x3c\x4f\x1b\xea\x27\x49\xfa\
+\x88\xf5\xe7\x97\xeb\xa2\x7f\xb0\x64\xe1\xc1\xa9\xad\x98\xb8\x1d\
+\x1a\x89\x80\x86\x3e\x3a\x37\xca\x54\x54\x85\x8a\x2c\xed\x7f\x5e\
+\x33\xc2\xeb\x4e\xb6\xfe\x9e\x66\x2f\x98\x49\x50\xba\xee\xf3\xf4\
+\xae\x45\x32\x8f\x61\xde\x71\x78\x1e\x80\x13\xf1\x80\x4c\x86\xe2\
+\xc0\x9c\x6b\xd4\x49\x00\xe7\x1b\xe5\x6b\x3d\x10\xcf\x5b\xb4\x55\
+\xdf\x99\xd9\x47\x36\x9f\x39\xc7\x80\x0a\xdc\xc8\xdc\xe2\xa2\xfb\
+\x84\xbd\xfd\x0e\xbd\x6e\x3c\x7f\x7a\xe5\x65\x2e\x46\x0f\xd5\xb0\
+\xc6\x86\x99\x5c\x48\xa6\x3d\xed\xa4\xe9\xec\x1e\x72\x7a\xf2\x50\
+\x04\x3b\xdc\xc8\xc6\xf6\xc4\x0f\x95\xdb\x34\x03\xba\x03\x43\x4d\
+\x13\x75\x23\x7b\xca\xbe\x31\xa0\xc7\x78\x94\x8a\x51\xac\x83\x05\
+\xa3\x7b\x76\x09\x3c\xf1\xe5\xc6\x76\x21\x01\x7c\x01\x74\x61\x40\
+\xb6\x23\x68\x18\xc9\xc5\x63\x66\x4a\x94\x46\xf1\xb0\x14\x3f\xcb\
+\x85\x35\x4d\xb6\xb9\x6a\xf7\xa7\x8d\xb2\xb5\x88\x5e\xfa\xe0\xea\
+\x4e\xfa\x99\x83\x5f\x11\xff\x5b\xa1\x47\x71\x75\xda\x1b\xc2\xec\
+\x75\x12\x1d\x20\x65\xc8\x54\xef\x9c\x23\x9d\xf7\x69\x00\xeb\x3e\
+\xdc\xeb\xf2\x79\xd3\xcf\x5d\x35\xea\xcf\xcd\x6b\xd0\xfd\xbb\xe9\
+\x08\x9d\x04\xf3\x3c\x59\x91\xce\xd8\xfb\x28\xe0\x49\x00\x4b\xf0\
+\x0e\x8a\x21\x51\xc5\x60\xd4\x76\xe6\x12\xc4\xbc\x85\xa1\x7f\x87\
+\x73\x66\xbd\x1a\x7a\xc2\x14\x7d\x31\xf9\xaa\xda\x5f\xa4\x13\x05\
+\xf8\x57\x1d\x98\x1c\xe2\xf0\x88\xa5\xfc\x4b\x94\xfc\xa3\x78\xe4\
+\x6e\x35\x96\x7b\x43\xd5\xe3\x2f\x6b\xdf\x10\xf2\xe3\xc5\x35\xf2\
+\xcd\x57\x66\x99\x58\x6e\x15\xdb\x1a\x1e\x66\xd1\x14\xa0\x8b\xc1\
+\x39\x05\x60\x41\x81\xdd\x8d\x6c\xc1\xb0\xb1\x96\x0e\x07\x21\x36\
+\x39\xf5\x1e\x25\x41\xe4\x56\xbe\x2f\x66\xe5\x31\xde\xdc\xc5\x03\
+\xe0\xe6\x73\x54\x02\x97\xd1\xbe\x33\x17\x30\xb2\x7a\xe3\x3a\x37\
+\x93\xbc\x2d\x13\xcd\xb4\xa2\x6a\x9a\xb6\xf2\x44\xb4\x3a\x71\xc5\
+\x45\x2f\xbc\x36\x39\x7e\x12\x57\x15\xfb\x45\xef\xb9\x1d\x23\x75\
+\xc0\xe9\x06\x67\xda\xaf\x7d\x9d\x7b\x6d\x1e\xe8\x54\x37\xcf\x54\
+\x07\xcf\xe7\xb1\xb8\xd1\x8f\x54\x15\x87\x7e\x2c\xe6\x49\x85\x74\
+\xb8\x59\x6a\xe1\x51\xdb\xf9\x6b\xc9\xa5\xe7\x2d\x98\x8e\x21\xf2\
+\x33\x64\x14\xee\xbc\xd1\x20\xec\xb6\xe9\x76\x32\xaa\xcc\x2d\x51\
+\xd9\x11\xdf\x5a\x61\x41\xb1\xf0\x02\xc7\x0a\xc8\xf2\x78\x98\xe2\
+\x12\x2e\xf4\x6f\x9a\x89\xa5\x9c\xf0\xec\x52\x82\x89\xcd\xa2\xa9\
+\x58\x56\x86\xa5\x25\xa8\xed\xd4\x84\x4a\x7b\xce\xc4\x4a\x7d\x91\
+\xc8\xbf\xa3\xd8\x38\x66\x60\x37\x9f\x53\xf7\x3d\xc6\xec\xd6\x44\
+\xe6\xff\x42\xa3\x32\xc3\x70\x69\x97\xd9\xbc\xa0\x87\x3c\x99\xb5\
+\x7a\x4d\x3b\x38\x9e\x92\x11\x19\xba\x09\x43\x4e\xea\xe1\x79\x7d\
+\x81\xf5\x46\x83\xf3\x2a\x52\x94\xd7\x42\x0b\x80\xa4\x81\x36\xa9\
+\x58\xcf\xf5\x0f\xa7\x75\x6c\xba\xb4\xe8\xa3\x64\x83\xcc\x87\x98\
+\xb7\x28\x74\x57\x5a\x7a\x2b\xaf\x5e\x12\xcc\xd7\xf9\x8a\xd3\xdf\
+\xf3\xa3\x8c\xd2\xb9\x8d\xcf\x8f\x1e\xd3\x8b\xe2\xcc\x36\xd9\xf9\
+\xc0\xdf\xa1\x53\x4e\x8e\x2e\x6b\x9a\xc3\x04\x0b\x37\xf2\x3e\xed\
+\x91\xc5\x02\xc7\x04\xf5\x86\x90\x13\x20\xc6\x79\xa5\xb5\x31\xa0\
+\x98\x55\xc8\x88\x82\x02\xae\x7c\x2c\xa5\x86\x64\x59\xe1\x53\x2e\
+\xcc\xb0\xaf\xee\x89\x50\xab\x2d\xd6\xd0\xd2\x08\xd4\x6f\xe9\xf6\
+\x5a\xd6\xd9\x1b\x62\xbf\x51\x4f\x85\x6e\xf5\x26\x29\xcf\x0b\xdf\
+\xce\x63\xe1\x04\x43\x74\xba\x2a\xa7\x61\xe8\xbb\xc9\x71\xb7\x1a\
+\xf3\xcb\x06\x7e\xb2\x86\xec\xa3\x52\x2e\xe7\x45\x14\x25\xb8\xf5\
+\xa6\xdd\xd7\xe5\xe3\xea\xb5\x85\xf3\xa2\x92\x69\x00\xeb\x3a\xf9\
+\xa3\x02\x13\x12\x9c\x69\x20\xeb\x00\x46\x15\x0b\x7c\xf4\xe7\xc9\
+\x4c\xb8\xf4\x3e\x7e\xd1\x53\x19\x6d\xd9\xbe\xaf\x16\xa1\x7b\x76\
+\xc4\xf1\xd0\xc2\xe3\x0a\xa7\x7d\x39\x53\xa6\x24\x01\x6c\x96\x7b\
+\x6a\x98\xfd\x02\xc7\x84\xf9\x65\xda\x23\x8b\x46\xde\x27\xcc\x2f\
+\x4f\x3b\xc5\x9b\x45\x13\x33\x33\xdf\xb8\xd3\x5d\x61\x52\x07\xeb\
+\xc0\x35\x8b\xa6\x02\xa3\xbc\xaf\x22\x7e\x29\xb6\xd5\xc1\x3b\x0f\
+\xc8\x92\x81\xa5\x2e\x96\xf7\xfd\x8c\x88\xce\x5c\x8c\x1e\x62\x67\
+\x32\x89\xde\x63\x7a\xd2\xcb\x75\x01\x83\x56\x35\x33\xc3\xc2\xea\
+\xb5\xce\x34\x2f\x43\x26\xec\xa4\xdb\x94\xca\x7e\x65\x52\x0f\xeb\
+\x35\x72\xe9\x44\xfe\x79\x57\x89\x79\x85\xab\xf3\xea\x04\xe7\xb1\
+\x9d\x9e\x4e\xfa\xbc\x80\x48\xc1\x2a\x71\x8e\xf1\x91\x9e\x83\x79\
+\x6e\xb4\xa8\x62\x60\x86\x3d\x06\xc5\x10\x33\xec\x29\x7b\xc2\x0b\
+\x02\x42\xb3\xfa\x91\x52\xc2\xe8\x47\x8a\xf9\xd3\x0b\x2c\x3d\xcd\
+\x55\xbf\xdd\x28\xf8\x6a\xac\x86\xaa\x7a\xf6\x77\xd4\xd4\x2d\x39\
+\x57\x0f\x44\xa5\x4b\x98\x5f\xa6\x5c\xec\x61\xac\x64\x69\x8f\x2c\
+\x95\xf2\x99\x70\xa0\x4a\x0f\x82\xd4\xc0\xf3\x40\xa7\xd8\x3a\x36\
+\xd6\xa4\x04\xf1\xec\xd2\xf4\xfd\xb1\xe1\x97\xd8\xff\x1a\x49\x91\
+\xfe\x7c\x9d\x81\xe5\x7d\xb3\x7f\xc5\xd5\x9e\xa5\x0e\x9c\xbc\xbc\
+\xcf\x6b\xa4\x9d\xbe\xcc\x59\x55\x53\xa5\x3f\xa6\x6f\x7d\xa7\x80\
+\xeb\x4c\x12\x46\x87\x04\x64\xba\x87\x82\x64\x4e\xe9\xad\x78\x9e\
+\xd7\x21\xed\x5f\x4e\x97\x52\xcd\x73\x8b\xa5\xa3\x6f\x33\x69\x94\
+\xa9\x36\x5e\x69\x40\xcb\x1c\xe7\xef\xc5\x90\x9b\xc7\xc8\xa1\x59\
+\xc5\xce\x64\x12\xa0\x95\x60\xfe\x28\x36\x5e\xaa\x3c\x5f\x13\xcf\
+\x1b\x95\x06\x60\xad\xbf\xc0\xa7\x6f\xaf\x50\xb9\x5b\xa7\x76\xe5\
+\x2b\x26\x96\x03\x1e\xd5\x64\xa7\xbe\x90\xae\xe5\x4f\x94\x60\x6b\
+\x8d\xdb\x77\xee\xf3\xd9\xcd\x12\xa5\xc5\xca\xb4\x53\xfc\x34\x20\
+\xc1\xb5\x06\x56\x1a\xe8\xd2\x28\x93\xfb\xea\x9f\xa1\xbb\xd1\xd2\
+\x9f\xad\x33\xf3\x3c\x89\x61\x66\x4a\x53\xf0\x66\x4a\x94\x8a\x05\
+\x5a\x65\xe3\xda\xa4\x98\x8f\xd2\x63\x12\xc0\xf3\x58\x78\xe2\x0f\
+\x67\xda\x01\xe8\x80\xd4\x2b\x7c\xd3\x63\x76\xe7\x31\x70\x5a\x23\
+\x26\x7a\x65\x68\xef\xb9\xce\x00\x4d\x4b\x88\x99\x56\x05\xda\x02\
+\x48\xef\x2f\x13\x6c\xce\x31\x54\xc5\xf2\xf3\x58\x78\x50\x0c\x31\
+\xfa\x11\x46\x3f\xc2\x0b\x82\x84\x14\xf8\xeb\x24\xfe\x48\x9d\x2e\
+\x17\xe2\x75\x6e\x3d\x69\x5f\xe8\xb2\xce\x3f\x7a\x8c\x1b\x8c\x58\
+\x08\x97\xa8\xde\x14\xd3\xa6\x26\xc3\xf7\x13\xb3\x0f\x27\xfe\x90\
+\xee\x55\x9b\x17\x4b\x0d\xbe\xb8\xf5\x80\x2f\x6e\x3d\x60\x73\xbd\
+\x4c\xf9\xd3\x2f\xf1\x23\x0f\x3e\x2f\x70\x62\x16\xcd\x84\xfe\xd5\
+\x19\x30\x6d\x80\x5d\xf7\xdc\x75\x9a\xf7\x3a\xf0\xce\x63\xfb\x34\
+\x90\x81\xff\xaf\xb3\xab\xeb\x71\x1c\x4b\xcb\x8f\x3f\x52\x89\xed\
+\x38\x76\x52\x55\xdd\xd5\xbd\xdd\x3d\x3d\xd5\x3b\x2b\xcd\xdc\xec\
+\x0a\x84\x84\xd0\x08\x81\x10\xdc\x00\x17\x08\xc1\x25\xab\x15\x3f\
+\x8a\x0b\x7e\x01\x3f\x61\xaf\xd1\x0a\xd0\x22\x56\xa3\xd5\xd0\x30\
+\x3d\xd3\xd3\x1f\xc5\x54\x77\x57\x25\x71\xe2\xd8\x49\x2a\x8e\xcd\
+\x85\xfd\x9e\xbc\xe7\xe4\x1c\x27\xbd\x96\x4a\x49\x1c\x97\x93\xd8\
+\x8f\x1f\x3f\xef\x37\xc6\xab\xa6\x4d\xd6\xed\x16\x0b\x3c\x97\xc0\
+\xcb\x0d\x23\xe9\xea\x66\xd1\x39\x77\x60\xd7\x43\x06\x07\xfb\x5d\
+\x3f\x67\x49\xdd\x15\x5d\xe7\x9e\x6a\x9b\xa8\xa4\xba\xd7\xa2\x96\
+\xdb\xad\x64\x74\x2a\xd5\x29\x3a\x26\xd5\xbd\x56\x93\xfb\xdb\x3e\
+\xe7\xee\xee\x1a\xf7\x50\xe1\x26\x05\x4e\xed\x61\xab\x3b\xcd\xcf\
+\x6d\xe1\x4a\xf3\x73\x5b\xf2\x11\xab\xc1\x0e\x93\xa4\x20\x1d\x4c\
+\x1e\x0c\xd3\x9d\x45\x92\x6f\xa5\x05\x34\x4d\x51\xfa\x17\x16\xa6\
+\xd3\x04\x63\xfb\x46\xe4\xc8\x74\x7a\x5f\x88\x9c\xe2\x00\x27\x82\
+\x8d\xdf\x9c\x2c\xf1\x38\xa8\x30\x18\x0d\xf0\x69\xff\x1c\xbf\xef\
+\x04\x88\x7e\x14\x34\x77\x0a\xca\x5f\x60\xac\x49\x20\xca\x2a\x0f\
+\xe5\x36\xd3\x4a\x0b\x0e\x46\x13\x7b\x9b\x24\x03\xdf\x77\xdb\x32\
+\xec\x2c\xd1\xeb\x55\xb0\xe3\x33\xbc\x7e\xd1\x95\xd8\xb0\x93\x16\
+\x72\xbe\xac\x26\x49\x9e\x32\xd4\x86\x1a\x39\xc1\x07\x0f\x9a\xdc\
+\x59\x6d\xc1\x0c\x5d\x7f\x85\xb6\x5c\x02\xae\x89\x75\x40\x36\x25\
+\xd3\xa8\x91\xb9\x36\x6f\x46\x69\x0f\x30\x77\xfb\xe8\x0e\xfb\x18\
+\x97\xd3\x83\x49\x3e\x7e\x6e\x4b\x46\x9c\xc9\xf5\x66\xb3\x8b\x9d\
+\x3f\xae\xa7\x0b\x8c\xa2\x91\xf0\x82\x1c\x23\x61\x22\x7b\x20\x6c\
+\x94\xc5\xbb\x0a\xb1\x95\xe0\xb4\x3c\xc7\xe3\x5e\x9d\x30\x9f\xdc\
+\x7e\xa5\x77\x71\xbe\xbf\xc2\xcd\xec\x5b\x54\x2b\x0b\x3d\x58\xc8\
+\xbd\xa0\x69\xba\x0d\xbd\x9c\x90\x4e\x68\x18\x1e\x05\x4e\x1d\x5b\
+\xb7\xc9\x12\x21\x17\x0c\x0c\x4e\xeb\x57\x2b\x0b\xdd\x55\x61\x4c\
+\x7b\x54\xcb\x8e\xf8\x42\x29\x96\x3a\x16\xe6\xe5\xe6\x87\xa2\x5b\
+\x5c\x4e\xb4\x01\xfc\x90\x05\xaf\xf6\x66\x30\xb5\xa0\x6d\x03\x83\
+\x29\xe0\xc0\xc1\x7c\x48\x4a\x70\x20\x7b\x8e\x23\x5e\xe7\x7e\xa9\
+\xdd\x9e\x17\x00\xf0\x7d\xd3\xc5\x62\xa5\x15\x4e\xed\xa1\xd6\x87\
+\x2d\xce\x67\x79\x02\xcc\x6b\x77\xe5\x68\xbe\xbb\x70\xd6\xf1\x05\
+\x56\x41\x0a\x6c\xde\x8a\xb0\xb3\xd4\xb8\x1b\x27\x98\x0c\x9c\x5d\
+\xd2\x10\x80\xfe\xd2\x97\x71\x74\xe8\x44\x50\x1f\x0a\x2e\x33\x38\
+\x38\xdb\xbc\x0f\x6d\x12\x43\x27\x2f\x74\xeb\x9d\x6e\xff\xa3\x4f\
+\x28\x19\x73\xe5\x20\xde\xab\xd1\x22\x6b\x57\xa7\xa5\xdb\xc0\xc3\
+\x5d\x62\xba\xd0\xb2\x09\x54\x26\x69\xa0\x93\x1c\x3a\x3d\x7d\x28\
+\xc0\x70\xcc\x05\xa8\x33\xe4\x48\x13\xab\x12\x43\xf5\x19\x5b\x41\
+\x6a\xbc\xc0\x28\xa2\x57\x85\x16\xc6\xe5\x54\x44\xea\xb4\x9a\xb8\
+\xe9\x9a\x19\x57\x16\x6e\xcb\x54\x14\x1e\x58\x8b\x0a\xae\x7d\x01\
+\x74\x1e\x0b\x26\x56\x67\x4a\x47\xf6\x00\xef\x93\x29\x7e\x58\xd5\
+\x44\xb2\xf0\x72\xf4\x4f\x4e\x76\xe3\x0e\x4c\x7e\x59\x93\xa1\xc5\
+\xb7\xe5\x52\xc3\xe4\x07\x36\x01\xd8\x24\x47\xf8\x7a\xfa\xbc\xe5\
+\x2a\x41\x55\x7d\x85\xc5\xed\x44\x5b\x11\xa1\xde\xea\x46\x76\x85\
+\x2d\x22\x0c\xed\x4a\xf4\x09\x16\xbf\xb3\x78\x2f\x9a\x9e\x1c\xcb\
+\xa0\x1c\xb8\xbc\x01\xe2\x31\xc1\x0a\x9d\x34\x30\x19\x83\xba\x10\
+\xef\xa1\x7c\x08\xca\x55\x38\xd6\xad\x46\x86\x1c\x01\x3a\x4b\x4b\
+\x01\xdc\x05\xaa\x3d\x4d\xac\x2b\xc3\x22\x29\x41\x5d\x82\xb8\x0c\
+\xe1\x79\x13\xf4\x3b\x85\x6b\x6d\x6e\x69\x35\x76\x95\xbe\x16\x9a\
+\x38\x3e\xfb\xe9\x3e\x81\xb8\x3d\xcc\x5e\x4d\x61\xe3\x05\xfc\xa5\
+\x5d\x8f\x3e\xb0\x73\xb1\x4f\x5b\x07\x56\x93\xa1\xa5\xbe\xe6\x72\
+\xc0\xe4\x6d\x38\xa4\x8f\x4d\x40\x27\xcd\xbc\x5d\xdf\xe0\x7f\x92\
+\x7b\x62\x06\xb0\xc9\x88\x53\xd7\x39\x4d\x37\x64\x92\x13\xb3\x64\
+\x86\x69\x69\xed\x0d\xe1\x3e\x74\xfb\xe7\xc0\x55\xf5\xb0\x4e\x27\
+\x9a\x7c\xb9\x52\x89\x94\xc6\x43\xa1\x0b\x39\x1f\xca\x0f\xa6\x85\
+\x3c\x12\x26\x39\xa2\xa6\x54\xf2\x10\x73\x1f\x96\xa4\x8b\x89\xa1\
+\x4d\x99\x6c\x5c\x4a\x10\x80\xb9\x51\xc8\x7d\xd5\x54\xc9\x2d\xec\
+\x86\x66\x56\x34\xff\xae\xf5\x50\x19\x08\x4d\x4c\x8d\x05\x33\xdc\
+\x21\x73\x1f\x89\x74\xcc\xe8\x74\x88\x45\x72\x89\x13\x7f\x52\xf7\
+\x27\x5e\xb9\x40\xaf\xd8\x97\x13\x2a\x58\x0f\x81\x51\x35\xd0\xd2\
+\xc2\xac\xad\x0f\x19\x7e\xba\x0b\x20\x74\x6d\x2c\xe1\x88\x68\xdd\
+\xa1\x88\x11\xdd\x7a\xa2\x38\x92\xc0\x4b\x60\xb6\xe7\x89\xdc\xb1\
+\x11\xfa\xea\x08\xde\x9c\xf0\x90\xc1\x67\xca\xf1\x35\x05\x2e\x78\
+\xd4\x4e\xa7\xc7\x8f\xc9\x44\xe3\xeb\x88\xf9\x78\xd2\x8d\x29\x3a\
+\xc7\x75\x30\xf9\x81\xe9\xf5\x02\x15\x82\xd0\x86\x9f\xdb\x22\x7b\
+\x4d\x05\x3d\x81\x76\x3d\x5d\xec\x35\x5b\xa1\xe7\x04\x50\x5e\x38\
+\x1b\xf4\x3b\x52\xab\xd7\xb9\xdb\x17\x9d\x7d\xd2\x7c\x86\xc5\xdd\
+\x9d\xd0\xc4\x70\x2f\x77\x43\xd5\x8b\x97\x08\x58\xda\x42\x55\xbe\
+\x44\x52\xc5\x20\x8d\xd8\x2f\xfd\xda\x4f\xcc\xa5\x81\xca\xc4\x3a\
+\x66\xe6\xa0\xa5\xff\x21\x16\xe7\x6c\xae\xfb\x5f\x75\x5d\x1b\x23\
+\x93\xe4\x28\x9c\x21\xc6\xaf\x5c\xdc\xac\xbf\x16\x09\xf1\x04\x34\
+\x35\xb9\x66\xd0\xcf\x05\x03\x73\xf0\x4e\x4b\x0b\xd3\xd2\x92\x58\
+\xd0\x94\xa3\xa0\x1a\x89\x26\xd9\xa1\x36\x25\x31\xe5\x2f\xe8\xa4\
+\x0f\xaf\x34\x69\xd3\xf9\xc7\x48\x14\x62\xbe\x7b\xa8\x8e\xce\x54\
+\xb3\xd2\x4a\xd4\x2e\x02\x40\xd6\x0c\x55\xcc\xd2\x12\xb9\x5f\x4a\
+\x12\x41\x65\xe3\x2a\xb4\xf6\x52\x34\xf9\x42\x17\x13\x97\x4d\x62\
+\x74\xef\xa0\x42\x1c\x87\x75\xdf\x3a\x40\x8c\x32\xd8\xe6\x1e\xe6\
+\x1f\x80\x37\xf3\x7a\xbf\x34\x8f\x5a\x32\xc6\xc7\x53\x56\xba\x5f\
+\xdf\x95\xcb\x6a\xb1\x1f\xb1\xe3\x4c\x5c\x6e\x33\xac\x9c\x07\xe2\
+\x39\x25\xe3\x98\x34\xb3\xee\x71\x2f\xf2\xe6\x1c\x17\x45\x22\x56\
+\x0f\xfc\x1e\xec\x74\xbc\xe7\x21\x20\xa0\xf1\x6e\x36\xc4\x00\x94\
+\x27\xcc\xbd\x12\xd5\xbc\x12\x65\xf7\xc7\x30\x27\x67\x60\xb5\x5a\
+\x58\xcd\xef\xd5\xb9\xcb\xa6\xeb\xb9\x36\x02\xa7\x7e\xd6\xa1\xd4\
+\x46\x1d\x90\x4d\xf2\xa3\x2d\xe4\xcc\x75\x2f\x31\x67\x1f\xb5\x1e\
+\x26\x90\xda\x7e\x65\xcc\xad\x38\x74\x17\x54\x2f\x16\x0a\xb6\xf0\
+\x1e\xcf\xd4\x5d\x7e\x53\xac\x44\xff\x89\x34\x7a\x03\x0f\xa7\x70\
+\x46\x29\x06\xf7\xea\xde\x13\x9b\x0f\xcf\x45\x90\x83\xe7\x50\x44\
+\xa7\x43\x3c\xb9\xf3\x90\xe6\x33\xf8\x4d\x94\x38\xdf\xd4\x43\x1f\
+\x6d\x1d\x5b\x12\x08\x7b\xdb\xeb\xbd\x9c\x86\x43\x40\x56\xf5\xb5\
+\x0a\xe8\x63\x16\xce\xd8\x39\x06\x58\xe0\xf9\x5e\xa4\x8e\x17\x86\
+\xf6\xdc\x40\x54\x6b\x88\x26\xe2\xe9\x8e\x8d\x3f\xc6\x0d\x26\xf9\
+\x9a\x59\x36\x9a\xc8\xd3\x50\xf4\x2c\x15\xa0\xf2\xfc\x8d\x61\x77\
+\xd0\x9a\xa8\xa3\x03\xe4\xb1\x9e\x97\x63\xa2\x94\x7b\xb2\x2d\xb4\
+\xb5\xd9\x6a\x41\x68\x0b\x19\xc1\x81\x6c\x62\x61\xdd\xf7\xe5\x7a\
+\x1a\x00\x46\xd1\x68\x3f\x9f\x98\x9a\x72\x37\x15\x1c\xd4\x7f\x22\
+\x9c\x3d\xc1\x12\xe3\x5a\xdf\x36\xde\x89\xce\xbd\xcf\xb5\x61\xfd\
+\xd9\x76\x86\xbb\x7b\x75\x7b\x57\xca\x7c\x13\x86\x9d\x0a\x3c\xdb\
+\x09\x5a\x59\x15\xa8\x13\xd5\xf9\x63\x9b\xf1\xf7\x31\x80\xe5\xa0\
+\xa7\x7d\x2f\x57\x09\x5e\xbf\xe8\x4a\x4c\xcc\x7b\xad\xf1\xdb\x96\
+\xea\x13\x8e\xe2\x08\xe9\xa2\xb7\x37\xb3\x58\x3d\x31\x6a\x6e\x00\
+\x35\x64\x59\x15\x19\x2a\x27\x6c\xad\x6d\xa3\xfe\x13\x62\xe2\x53\
+\xc3\xc4\xea\xc9\xd5\xb5\x5a\x35\x19\x74\x2a\x60\x8e\xc9\x37\x6e\
+\xf3\x31\x9b\xd2\x2e\xad\xb4\x12\x00\x0f\xac\x4c\xfc\x71\xe3\x8e\
+\xf6\x69\x0a\x65\xf3\xf0\xb4\x95\x56\x7b\x41\x96\x41\xb1\xa8\xbb\
+\xcd\xb3\xa0\x50\x69\x0f\x44\x62\x7c\xe8\x47\xf0\x86\xf5\x7b\xd6\
+\xfd\x8e\xf0\x29\xd3\xa8\x31\x00\xb0\xab\x39\x22\x27\xc2\x03\xab\
+\x80\x87\xd3\xba\x91\x20\x73\xdd\xd9\x6d\x40\xe2\x8f\x92\x5b\xad\
+\x61\xe5\x36\x76\x3e\x96\x85\x4d\xe0\x4f\xdd\xfa\x87\x79\xbd\x58\
+\x62\x61\x5d\x57\x47\xea\xde\x23\x5f\x69\x35\x1b\x17\xfe\x5a\x78\
+\x24\x4c\xc5\x97\xaa\xcb\x27\x9d\xee\x32\xd5\xac\x6d\x6a\x94\x01\
+\xc4\xda\xab\x22\x83\x33\x8c\x04\x83\xf7\xcf\x46\xe2\xe4\xea\x12\
+\x7e\xd4\x0b\xc1\xf4\x5c\x17\xbc\x38\x54\x1c\xba\xd7\xe1\xbd\x69\
+\x98\xcd\x41\x29\xb4\x71\x90\x0a\xb6\xcd\xaa\x00\x0b\x00\x55\x16\
+\x0a\x83\x8f\xef\x53\xf5\x80\x50\x24\xaf\xcd\xfb\xc1\xf3\xb8\xd5\
+\x0c\xb6\x51\x54\x03\x31\xb6\x12\x5c\xc4\x0f\x1b\x89\x53\x4f\x26\
+\xe8\x8c\xba\x3b\xe3\xae\xd1\xc3\x3f\xfb\x7c\x84\xde\x27\xcf\xe4\
+\xa8\x6b\xd3\xe3\xc3\x2e\xb7\x19\xa6\x9b\xa6\xc6\x6c\xe3\xed\x19\
+\x66\x5c\xcf\x92\x4e\x56\x0d\x3b\xf5\xaf\x8d\x6d\xdb\x0c\x3f\x75\
+\x7d\xea\x04\x48\xfe\xf7\x4a\xb0\x9b\xe9\x24\xaa\x00\x9e\x25\x33\
+\x31\x8a\xcb\x9e\x27\xda\x72\xa2\xb6\x25\x1c\x76\x44\xe1\x69\xe5\
+\x84\x98\xae\xe7\xa8\x9c\x50\xea\xe9\xa6\xea\x67\x5e\xa8\xba\xb8\
+\x9d\xec\x49\x13\xf5\xf6\x7f\x6c\x95\xb3\xca\xde\x26\xa3\xd4\xc4\
+\xcc\x54\x9d\x41\xc0\xa5\x3b\xc4\x02\x75\x24\x6e\x01\x26\x2f\xb2\
+\x50\x44\xed\x74\xee\x35\x1e\xcc\xa0\x48\x9e\x49\x37\xab\x44\x43\
+\x4c\xdc\x71\x7b\xe8\xb9\x01\xbe\x7f\xf9\xc3\xee\x77\x01\xf8\x9c\
+\x0d\x02\x4d\x92\x54\xcc\x09\x21\x36\x0e\xee\x3f\x42\xf7\xec\x44\
+\x74\x01\x02\x00\xa7\xc9\x36\xb4\x6d\x27\xc0\x13\xab\x40\xb9\xcd\
+\x30\xec\xd4\x01\x06\x02\x35\x67\x47\x4a\xc6\xf1\x31\x17\x60\xa7\
+\x6d\x49\x82\x70\x29\x62\x02\xb0\xca\xbc\x6d\xbe\xe9\x55\xba\xc1\
+\xdb\xd5\x35\xd2\xab\x97\xc2\x33\xc1\xbd\x02\x34\x89\x48\xa6\xd1\
+\x06\xd4\xe1\x2e\x47\x42\x57\xe7\xd6\x6a\x54\x4e\x37\x12\x38\x3d\
+\xc7\xc1\x76\x3a\x43\xff\x6c\x64\xd4\xcf\x1c\x58\xbc\xf7\x9b\x8e\
+\x41\x75\xfe\xed\x36\xcd\xae\x6e\xdf\x16\x1c\x31\x7d\x2e\x67\xe2\
+\xe5\x76\x0b\xdb\xaf\xa4\x47\x8a\xd6\x95\xb9\xa5\xf5\x13\x93\x57\
+\xc3\xc4\xba\x26\xf0\xaa\x9d\xe3\x37\x93\xb5\x08\xce\x90\xb7\xe1\
+\x7c\xd4\x81\xfb\xf0\x3e\x2e\x43\x16\x6e\xe6\x29\xaf\xb1\x8d\xcb\
+\xa7\x4f\x11\xfa\x35\x59\xd1\xd0\x19\xda\xa7\x5d\x6e\x33\xbc\xa9\
+\x5c\x09\x54\x34\x8c\xdc\xe4\x5d\xa0\xf7\xc7\xab\x12\xa7\x3d\x5b\
+\xcb\xae\xe3\x55\x89\xb0\xe8\x68\xe5\x84\x6e\x7b\x95\xf1\x29\x29\
+\xe9\xd5\x7f\xfc\x37\x92\xdb\xaf\x76\x1d\x21\x99\xf6\x34\xc9\x08\
+\x62\x62\x0a\x7a\xb4\xb1\x30\x6f\x61\x4a\x07\xdc\x73\x1c\x09\xc8\
+\xa2\x69\x34\x63\x5b\x1d\x38\x4d\xef\xa9\xcc\xad\x26\xc6\xb7\xe9\
+\x5a\x3e\x35\x95\xeb\xec\x63\x42\xcd\x94\xac\xce\x41\xe7\x39\x8e\
+\xa4\x63\xcb\x7c\xe7\x27\x26\xaf\x05\x07\x28\xff\xcc\xee\xb0\x2f\
+\x12\xe7\x4d\xe0\x35\x1d\x17\xd2\xaf\x99\x7d\x87\xb9\xdb\xc7\x74\
+\x36\x13\x49\x3d\x6f\x5f\xbe\x07\x92\x7a\x9f\xe1\xa3\xcb\xfa\x5c\
+\xcf\x2d\xc9\x1b\x95\x4d\x5e\x20\xcd\xeb\xe3\xef\xfa\x1e\xb6\x6c\
+\xfc\xaf\x7c\x89\x27\xbb\x94\x45\xce\xc6\xd3\x8d\x27\x01\x97\xc0\
+\x36\xec\x2c\xf7\xf4\xf3\x78\x55\x8a\xf7\x52\x77\x63\xf4\x1f\x9b\
+\xc0\x4d\xfb\x2f\x9c\x21\x7e\xfb\xd5\xaf\xa5\xf9\x14\x1c\xc8\xa6\
+\x89\xf2\xb3\xa4\x4e\xfa\x99\x34\xc7\x7e\x52\xb6\x57\x3b\x70\xc7\
+\x3f\xf5\x28\xa3\x5e\xc0\xe9\x74\x23\xf5\x2e\xd3\x55\x90\xe8\xc0\
+\xcb\x53\x13\xb9\xe1\xa8\x1a\x80\x87\x5c\x6f\x9c\xe9\x8b\x79\xa9\
+\xcd\xf1\x6d\xbb\x68\x54\x23\x8e\x83\x92\xfc\xc4\xc4\xc4\x7d\xec\
+\xb6\x25\xd7\x1b\xe5\x53\xa8\xbf\xab\xca\x42\x2d\x78\x75\xe7\xc4\
+\x24\x73\x86\x51\x84\x37\x3f\x2c\xf1\xcd\x2b\x07\xd3\x69\x82\x22\
+\x5f\x8a\xea\x8e\x7a\x0e\x78\x25\x6a\x1a\x89\xb5\xd7\xb7\x77\x28\
+\x72\x17\x45\xbe\x84\x43\x21\x6d\xf2\x13\x13\x40\xa7\xc1\x4e\x4c\
+\x8b\x75\x0a\x80\x9f\x58\xc5\x4e\x3b\x37\xa0\x27\xe0\x11\x8b\x1b\
+\x83\x26\x49\xbc\x97\x2b\xac\x3e\x17\x92\xe6\xe6\x46\x04\x39\xc8\
+\x33\xc1\xdb\x38\x71\x16\x1e\xd9\x9e\x08\x66\x94\x83\x18\xb3\x64\
+\x06\x07\xcd\x4c\xe5\x23\xb4\x30\xf7\x04\x78\x8e\x83\xc5\xed\x04\
+\x9e\xe3\x48\xae\x32\xea\xef\xa6\x7a\x1b\x54\xef\x01\xe5\x14\xd0\
+\xfe\xee\xee\xae\x85\x5f\xd4\x54\x2f\xf7\x31\x52\x47\xc7\xc2\x6a\
+\x6f\x0d\x2e\x21\xd4\xe8\x1b\x4f\xbf\x24\x16\xa6\x8b\x83\x00\x4c\
+\x2e\xb7\xe5\x76\x2b\x19\x81\x3c\xeb\x4d\x07\x50\xb5\x7b\x3c\xfd\
+\x51\x47\x20\x7e\xec\x6e\xcb\x14\x9d\x41\x0f\x0f\x7b\x05\xfc\x4e\
+\x17\xae\xef\x89\xea\x8e\x4d\xe8\x8a\x2a\x90\x4d\xe8\x8a\xfc\xe3\
+\x9a\x85\x8b\x66\x9e\xdd\x52\x61\xe2\x44\x49\x1a\x67\xaf\x87\x9d\
+\xa5\xc4\xca\xa9\xbb\xc1\x30\xeb\x4a\xa0\xa7\x6d\xc2\xa2\x23\x19\
+\x89\x7c\x5f\xd3\x8d\x07\xc4\x89\x00\x2c\xdf\xaf\x90\x2f\xcd\xb6\
+\x54\x9f\xf7\xf5\x8b\x97\xcd\x60\xee\x70\x2f\x5a\xc6\x17\x5e\xb5\
+\x6c\xcf\x13\x91\x04\xcf\x7b\x1a\xb7\x2d\x9c\x39\x97\xdb\x2d\x86\
+\xdd\x81\x30\xe2\x74\x8d\xab\xd5\xb4\x47\xee\xfe\xe2\x21\x5e\xd5\
+\xc3\xa0\xba\xca\x78\x9e\x6e\x9b\xdc\xd1\x31\x35\xff\x0e\x04\x42\
+\xd5\xe8\x35\x95\xdc\x7b\x8e\x03\xdb\xaf\xa4\x80\x07\xb9\xd5\x82\
+\xd0\x16\xc1\x11\x62\xe1\x2a\xb4\xe0\xa4\xb2\x8c\x30\x75\x16\xd2\
+\x1d\x6f\x6e\x10\xf2\xf7\x29\xf4\x3c\x9f\x6d\xb1\xcd\x3d\x89\x89\
+\xa9\x8e\x52\xf5\x19\xd7\x4c\xec\xa2\xf0\x7b\x58\xa1\xaa\x99\x98\
+\xc0\x35\xdd\x78\x78\x68\x25\xe0\xaf\x09\x58\xc3\xce\x52\x7a\x44\
+\x5c\x77\xc9\x89\xf3\x44\xda\x86\xdc\x62\x61\xd1\xc1\xb0\xb3\xac\
+\x7d\xbd\xcd\xb6\xc4\xb0\x62\x7d\x12\xe3\xb4\x67\xcb\xc0\x0f\xd6\
+\xe2\xf9\xfa\xf5\x02\xe9\xd5\x4b\x6c\x42\xb7\x9e\x13\xcd\x0e\x1e\
+\x6f\x88\x0d\xd4\x15\x0c\x43\xbb\xc2\x30\x6b\xa2\x4f\x4d\x17\x9f\
+\x0f\x49\x75\xf0\xd6\x46\x27\x9b\x9f\x60\x95\xd1\x78\x78\x5b\x6d\
+\x72\xa2\x73\xfc\x4f\xd7\x73\xb1\x4f\x62\x61\x9d\xaf\xf7\xa4\xe9\
+\x58\xa9\xfa\x94\x55\xc0\x91\x67\x86\x03\xfa\x90\x71\xa7\xcb\x6d\
+\xa0\xd7\x64\xc8\x91\x06\xe6\x79\x14\xdc\x77\x4c\xdb\x02\xc0\x26\
+\x8a\x85\x37\x42\x0d\x7a\x98\xc2\xee\xf7\xb0\x33\x04\x79\x5e\x8a\
+\x64\xc0\xe3\x05\x96\x18\xa3\xc2\x04\xd1\xb8\xc0\x93\xc1\x02\x71\
+\x1c\xd6\x4c\x3c\xdf\x7d\xf7\x7c\xba\x82\xb3\x7a\x25\xd8\xb8\xd3\
+\x74\x8c\x92\x34\xf1\xb0\xb3\xc4\x0f\x55\x2c\x58\x31\xce\x77\x80\
+\xae\x57\xb0\xc7\x86\x31\x13\x3f\x16\xeb\x38\xab\xbe\xa9\x5c\x20\
+\x89\x05\xa8\xa7\x1b\x0f\x48\x62\x90\x3b\x2f\xeb\x9e\x88\xfd\xa5\
+\x8b\x40\x7c\xe6\xb0\xb3\xac\x2f\x06\x27\xd8\x95\xab\xa4\x85\xf9\
+\xb6\xfa\x61\x04\x60\x2a\x45\x75\x48\x62\xf0\x4e\x3e\xba\xe2\x51\
+\xf5\x64\xab\xc6\x0a\x9f\x67\xa1\x03\xa0\x3a\x70\x85\x77\xa4\xe7\
+\xda\xd5\x94\x3e\xc9\x3f\xbb\xad\x9e\x8d\xbe\xab\x3b\xb0\xb5\x17\
+\x98\x2e\x24\xdd\xa6\x45\xa9\x7e\x8e\x7a\xae\x99\x32\xdd\x4c\x59\
+\x6c\xc7\x32\x30\x65\xb4\xd1\xfe\x74\xc3\x1a\x01\x20\x9d\x00\xeb\
+\xdb\x3b\x3c\xff\xb0\x5b\x77\xb3\x5d\xd6\xe3\x31\x06\x95\xe8\x38\
+\x5f\xdd\xdd\x4a\x6c\x4c\xe7\x37\x28\x4f\x60\x13\x58\xab\xd9\x5a\
+\x32\xe4\xac\xea\x3e\x86\x9d\x65\xbd\x3e\x89\xa5\x6d\xb8\x8c\xa8\
+\x66\x6b\xa1\x9b\xf9\x73\xa1\xaf\x1b\x96\xe6\xff\x43\x7a\xba\xdc\
+\x66\x98\x06\xeb\x5a\x27\x33\xd9\xb1\x4a\x37\x42\x0f\xab\xbd\x1f\
+\x82\x7e\x47\x00\x75\x75\x6f\xe7\x8f\xa5\x64\x77\x0a\x35\xeb\xe6\
+\x7c\xa8\xc6\x12\x3f\xe0\x6a\xc0\xc3\x04\x5c\x93\x1b\x8c\x33\xa6\
+\xee\x7d\xce\xda\xc7\x74\xb1\xe4\xdf\x55\xd5\xe3\x6d\x81\x91\x43\
+\x2e\xb7\xdc\x2f\xf7\x0a\x43\xb9\xeb\x4d\x8d\xf2\x05\x96\x5c\x37\
+\xa7\x76\xea\xa7\x7e\x77\x6a\xdf\x09\x7e\x81\xa8\x13\xaf\x7a\x6e\
+\x80\xb3\x51\x84\xce\xa0\x07\xcb\xbe\xc4\xf5\xba\x10\x59\x6c\x6f\
+\xe6\x7d\x9c\x3b\x1e\x36\x93\xb5\x48\x8e\x9f\xbb\x7d\x5c\x2f\x2a\
+\x91\x14\x0f\x00\x61\x3f\x93\x99\x78\xd8\x59\x0a\x56\x15\x60\x66\
+\x8c\x8b\x38\x91\xb6\x91\xc0\x1e\x75\x85\xac\x48\xfc\x58\x68\x5d\
+\xa1\x79\xe3\x64\xef\x7f\x54\x23\xb2\xdc\x66\x62\xbb\xd3\x9e\x8d\
+\xe5\x2a\x11\x7a\x58\x5d\x28\x4b\x0d\x80\x68\x41\x35\x2d\x2d\x94\
+\xc5\x7b\x6d\x29\xd2\xa1\x72\x1d\xdd\x49\xe4\x27\xf3\x10\xe0\x38\
+\x33\xf2\x7e\x0d\xa6\x6d\x0f\x75\x83\xd7\x7d\x66\xdb\x76\x1f\xb3\
+\x88\x64\xf8\x06\x98\xdc\x73\x91\xfb\x25\xfc\xdc\xde\x63\xe4\xa1\
+\xfb\xc9\x9e\xf1\xa6\x16\x26\x70\x03\xd8\x14\x45\xa4\xa1\x3c\x6e\
+\xee\xe1\xee\xee\x1a\x5b\x44\x78\x38\xaa\x5b\x53\x3d\xe8\xd6\xb9\
+\x13\xe3\xe5\x5b\x3c\xe8\x7c\x03\xb8\x97\x75\xd4\xae\x09\x74\x6c\
+\xc7\xff\xb7\xb7\x4f\x92\x13\x41\x79\x02\xdb\x8a\xba\x98\x6e\x3c\
+\xc4\x79\xb2\x0f\xe6\x38\x01\xbd\x2f\x69\x60\x0e\x76\x26\x2b\x88\
+\xd5\x25\x0d\xdd\x6c\xab\xfa\x9e\xd5\x85\x1b\x8f\xdb\xec\x7a\xcf\
+\x23\x41\x57\x31\x01\x95\x06\x25\x72\x0d\x4c\x2c\xbc\x45\xf4\xd1\
+\x27\x98\x37\x0d\x51\x83\x15\x6d\xfd\x21\xda\xc0\xac\xbb\x05\x9b\
+\x52\x37\x75\xb9\x16\x6d\x6e\xbc\x63\xbd\x18\x5a\x49\x51\x05\x70\
+\xcb\x99\x30\xe6\x72\x7f\xe7\xbe\xb3\x82\x54\x7c\x9f\x2c\x2d\x31\
+\x99\x4d\x8c\x95\xd3\x04\x4c\x7a\xce\xbd\x32\xfc\x58\xf1\xc1\xf0\
+\x94\x3b\x31\x72\x00\x7f\xd8\x83\x1f\x37\xc7\xaa\x61\xe2\xeb\xcd\
+\x4f\x10\x14\x57\x52\xd8\x79\xd3\x74\x42\x27\xfd\x4c\x72\xd1\xcd\
+\x57\x75\x16\x1b\x81\x31\xf1\x63\x09\x98\x56\xd4\x05\x92\x58\x0b\
+\x56\xf1\x3e\x03\x28\x67\x65\x6e\x1c\x56\xb3\xb5\xb4\x6f\xba\x10\
+\x54\xc6\xa6\xf5\x81\xdf\xc3\x8b\xcd\x4f\x91\x5e\xbd\x14\x09\xd5\
+\xf4\xe3\x79\x13\x14\x6a\x88\x4d\xae\x35\xce\xc2\x6a\x05\xf2\x31\
+\x27\x5f\x95\x13\x3a\xad\xa9\xb2\x3a\x4f\xb9\x34\x4d\x33\x32\x25\
+\xfb\xa8\x6c\x7b\xc8\x07\x7c\x28\xa0\xa2\x3e\xaa\x1d\x83\xd4\x8b\
+\x64\x13\xc5\x52\xa9\x3e\x00\xb8\xe5\x0c\xcf\xce\x9f\xe0\xcf\xfe\
+\xe6\x8f\xf1\x57\x7f\xfe\xb7\x78\xf6\xd9\x97\x58\xa0\xc2\x64\x36\
+\x91\x59\xb0\x39\x2f\x9b\x66\x3a\xec\x26\x74\xb5\xd3\x92\xd4\x7e\
+\x74\x52\x0e\x45\x08\x5c\x3e\x7d\x8a\xfb\x71\x1d\x4e\x06\x80\x59\
+\xf1\x19\x46\xe3\xe7\xc8\x70\x87\xce\xa8\xdb\x64\x10\xb1\xd6\x01\
+\xf8\x0c\x1e\x4e\x51\xf8\x3d\x0c\xed\xb1\x38\xd7\x76\xe2\xc7\x12\
+\xc3\x72\x46\xad\xac\xf7\x42\x22\x70\x30\x73\xff\xb1\xca\xc2\x56\
+\xd4\x15\x4c\xfc\xc4\x2a\x60\x45\x5d\xf1\xa8\x03\x3f\xbf\x28\xaa\
+\xd9\x1a\xa9\x13\xe0\xd3\xd9\x4b\xc1\xc4\xbc\x13\x4f\x14\x47\xa2\
+\x97\x30\x67\x61\xf2\x0d\xeb\x0e\xde\xa1\x5b\xab\x89\x05\x8f\xd1\
+\xc2\xdc\xd0\x3a\xc4\xfc\x87\x7a\x4d\xa8\xdf\xe1\x50\x51\xa9\xe9\
+\xbb\xea\xa6\x37\xa9\xfb\x26\xd9\xc0\x8d\x37\x4a\x8c\xbf\xff\x78\
+\x88\xbf\xff\xbd\x2f\xf1\x77\xff\xf8\x17\xf8\xcb\x5f\xfc\x09\x7e\
+\xf6\xa7\xff\x00\xfb\x49\x2c\x7d\x26\x75\xf3\x21\x37\x58\x5c\xd5\
+\xf3\x38\xa8\x6b\xa8\xea\x37\xe6\xcf\xe9\x7c\xde\x8f\x87\xb0\x51\
+\x4f\x0a\x0d\x47\x17\xf5\x36\xc9\x7f\xe1\xf5\xb2\xbb\xbb\x58\x9a\
+\x69\xb4\x3c\xf1\x68\x89\x31\xdc\x7c\x85\x69\xb9\xcb\x66\xb3\xe3\
+\x3c\x41\xe2\xc7\xd8\x66\xd7\x20\x40\xab\x8f\xfc\x56\xcf\x19\x95\
+\x18\x94\xc0\x4b\x86\xdc\x6d\x92\xe0\xdd\xed\x18\xf3\x6c\x81\xb0\
+\xe8\xe0\xa4\x77\x82\x6a\xb6\xc6\xbb\xe7\xaf\x50\xcd\xd6\x38\xef\
+\x9f\xc1\x19\x8d\xa4\x30\x36\xff\x0c\xee\x99\xa0\x36\xaa\xd6\xc0\
+\x92\x7c\xc2\x94\x27\x51\x0e\x62\xa9\x31\xb6\xea\x4b\xd6\x25\xed\
+\x10\x00\x45\xb7\x74\xc7\x39\xe8\xb3\x35\xe9\x5c\x75\x3d\x1f\x35\
+\xdb\xa6\x5f\x0f\x31\xf1\x31\x3d\x29\xd4\x46\x31\x3c\x22\x48\x39\
+\x17\x6d\xee\x3b\x49\x62\x04\xb5\x3f\xf9\xe1\xe8\x1c\xdd\x2f\xde\
+\x62\xf4\x49\x81\x3f\xf8\xf2\x8f\xf0\xf3\x5f\x7c\x81\xcb\x67\x7f\
+\x2d\xa2\x98\xab\x22\xdb\xeb\x16\x9a\x58\x95\x54\xa1\x4c\x2c\xad\
+\x66\xaf\xd1\x7a\xf2\x04\x95\xf8\xac\x66\xe0\xef\xd6\x78\xbb\x75\
+\x45\x7f\x35\xee\x52\xe5\x7e\x66\x11\x17\xa8\x0a\x8c\xec\x4a\xcc\
+\xb1\x73\x09\xa8\x63\xc3\x8f\x13\xc6\x9a\x06\xe0\xdb\xec\x1a\x56\
+\x1c\x23\x9e\x25\xb8\xad\x96\x38\x8b\x81\x69\x00\xfc\xe7\x2f\x57\
+\xf8\xfa\xdf\xfe\x19\x0f\x1e\xd4\xc2\xbd\x73\xd1\xc3\xe6\xdd\xae\
+\x3d\xe7\xa3\x1f\x79\xf8\xf4\x93\x3a\x09\xda\x7d\x10\xe3\xd3\xfe\
+\x39\x42\xab\x40\x1a\x75\x11\xbb\x8a\x5f\xd3\x09\x81\x0a\xda\x06\
+\x28\xa9\xd5\x83\x3d\x7f\x2f\xaa\x39\x26\xdb\x9d\xe1\xc7\xa7\x27\
+\x1d\x0a\x39\x93\x9c\xd0\x59\xfc\xe4\x3e\x53\xf7\x43\xfb\x56\xd7\
+\x07\x56\x86\x12\x83\xdf\xc9\xe8\x52\x0d\xa4\x43\xcf\x79\xe4\x8f\
+\x86\xb5\x8b\x01\x39\xa0\xca\x8a\x8d\xf4\x7b\xd5\x32\x25\x71\x9c\
+\xb3\x3e\x86\x91\x05\x7f\xd8\x03\x3e\x3c\x83\x5b\x14\xf0\x56\x2f\
+\xf0\xfd\xd5\x02\xb8\xfd\x55\x3d\x30\xb3\xf9\xcd\xab\x22\x03\x16\
+\x01\x3a\x00\xd0\x54\x6d\x6c\x8a\x15\x62\x58\x02\xcc\x71\xb1\xaa\
+\x47\x7e\x35\xc6\x17\xc9\x82\x78\x66\xc3\x19\x45\x78\xd0\xb4\x26\
+\xeb\x3d\x39\x87\x0b\x1f\xd1\xaf\x6a\xc9\x78\xb3\xfe\x5a\x9a\x3e\
+\x1b\x57\x96\x16\x9b\x1b\x3f\x87\x9b\x03\x98\x5b\x70\xd7\xaf\x17\
+\x18\x9f\x2d\x85\x41\x35\x06\x80\x6c\x29\x1e\x01\xe0\xdd\x6d\x08\
+\xf7\xcc\xf0\xde\xb7\x5b\xb8\xcd\xff\xdf\x26\x09\xbe\xbf\xba\xc2\
+\xbf\xfe\xcb\x3f\xc9\x9f\x78\x0d\x54\xa7\x7d\x5c\x6c\x17\x58\x2f\
+\x6f\xf0\xdd\x04\xf8\xee\xb7\xff\x2e\xde\xfe\xf1\xb3\xc7\x78\xfa\
+\xf9\x1f\xe2\xfe\xc3\x07\x58\x84\x13\x49\x73\xf6\xc3\x11\x46\x0d\
+\x4e\x46\xb6\x27\x98\x38\x5d\xf4\x10\x56\x2b\xc0\x89\x30\x99\x5a\
+\x70\x06\x89\x18\x0d\xe9\xe6\x1e\x0a\xec\x2a\x2c\x3e\x66\x0c\x80\
+\xae\x2f\x9a\xee\x42\xe0\x51\x32\xbe\xaf\xf2\x40\x5b\x2b\xb3\xc6\
+\xcd\x8c\xc6\x5c\x5b\x11\x29\x00\x9c\xc6\x31\x12\xab\xc2\x69\x15\
+\x8b\xdb\xfc\xc6\x8a\x80\xb4\x10\xc0\xad\x13\x78\x02\xac\xb1\xd8\
+\xab\x50\xf6\x1c\xa7\xc9\xfa\xab\xf0\xfc\x37\x2f\x90\x4f\x57\x78\
+\xb7\x04\xae\xaf\x6f\x90\x2e\x96\x78\xff\xfd\x35\x2c\x00\xc3\xa1\
+\xdc\x44\xe5\x34\x8e\xa5\xe4\xf5\xd8\x1d\xd4\x53\x8f\x00\xc4\x8b\
+\x7a\x02\x52\xbc\x00\xb2\xd1\x9d\x28\xf8\xcc\x46\x77\x08\xfb\x11\
+\x82\xfb\x8f\x50\x7a\x17\xb8\xd7\xe9\x22\x0f\xa2\xba\x17\xdb\xb7\
+\xdf\xd4\xd2\xc4\xbd\xc4\xa6\x77\x85\x78\x01\xc0\x3d\x81\x13\xcf\
+\xf0\x70\x74\x8e\xd2\xbb\x80\x87\x53\x78\x16\x50\x34\x8c\x8c\x41\
+\x85\xff\x07\x5b\x53\xe4\xea\xf5\xd8\xe3\x94\x00\x00\x00\x00\x49\
+\x45\x4e\x44\xae\x42\x60\x82\
+"""
+
+qt_resource_name = b"""\
+\x00\x09\
+\x06\xa8\xaa\x74\
+\x00\x71\
+\x00\x75\x00\x6f\x00\x74\x00\x65\x00\x2e\x00\x74\x00\x78\x00\x74\
+\x00\x0a\
+\x07\x2b\x67\xc7\
+\x00\x73\
+\x00\x61\x00\x6d\x00\x70\x00\x6c\x00\x65\x00\x2e\x00\x70\x00\x6e\x00\x67\
+"""
+
+qt_resource_struct = b"""\
+\x00\x00\x00\x00\x00\x02\x00\x00\x00\x02\x00\x00\x00\x01\
+\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\x00\x00\x00\x00\
+\x00\x00\x00\x18\x00\x00\x00\x00\x00\x01\x00\x00\x00\x39\
+"""
+
+def qInitResources():
+    QtCore.qRegisterResourceData(0x01, qt_resource_struct, qt_resource_name, qt_resource_data)
+
+def qCleanupResources():
+    QtCore.qUnregisterResourceData(0x01, qt_resource_struct, qt_resource_name, qt_resource_data)
+
+qInitResources()
diff --git a/tests/qtgui/sample.png b/tests/QtCore/sample.png
similarity index 100%
rename from tests/qtgui/sample.png
rename to tests/QtCore/sample.png
diff --git a/tests/QtCore/setprop_on_ctor_test.py b/tests/QtCore/setprop_on_ctor_test.py
new file mode 100644
index 0000000..bd4426c
--- /dev/null
+++ b/tests/QtCore/setprop_on_ctor_test.py
@@ -0,0 +1,12 @@
+#!/usr/bin/python
+import unittest
+from PySide.QtCore import *
+
+
+class SetPropOnCtorTest(unittest.TestCase):
+    def testIt(self):
+        obj = QEventTransition(targetStates = [QState()])
+        self.assertEqual(len(obj.targetStates()), 1);
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/tests/QtCore/staticMetaObject_test.py b/tests/QtCore/staticMetaObject_test.py
new file mode 100644
index 0000000..f80872c
--- /dev/null
+++ b/tests/QtCore/staticMetaObject_test.py
@@ -0,0 +1,23 @@
+import unittest
+
+from PySide.QtCore import QObject, Slot, QMetaObject
+
+class MyObject(QObject):
+    @Slot(int, str)
+    def slot1(self, a, b):
+        pass
+
+class testAttribute(unittest.TestCase):
+    def testBug896(self):
+        mo = MyObject.staticMetaObject
+        self.assertTrue(isinstance(mo, QMetaObject))
+        self.assertEqual(mo.className(), 'MyObject')
+        self.assertTrue(mo.indexOfSlot('slot1(int,QString)') > -1)
+
+    def testDuplicateSlot(self):
+        mo = MyObject.staticMetaObject
+        self.assertEqual(mo.indexOfSignal('destroyed(void)'), -1)
+        self.assertTrue(mo.indexOfSignal('destroyed()') > -1)
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/tests/qtcore/static_method_test.py b/tests/QtCore/static_method_test.py
old mode 100755
new mode 100644
similarity index 100%
rename from tests/qtcore/static_method_test.py
rename to tests/QtCore/static_method_test.py
diff --git a/tests/qtcore/static_protected_methods_test.py b/tests/QtCore/static_protected_methods_test.py
similarity index 100%
rename from tests/qtcore/static_protected_methods_test.py
rename to tests/QtCore/static_protected_methods_test.py
diff --git a/tests/qtcore/thread_signals.py b/tests/QtCore/thread_signals_test.py
similarity index 70%
rename from tests/qtcore/thread_signals.py
rename to tests/QtCore/thread_signals_test.py
index e2b6673..1d2f750 100644
--- a/tests/qtcore/thread_signals.py
+++ b/tests/QtCore/thread_signals_test.py
@@ -5,14 +5,13 @@ import unittest
 import os
 from tempfile import mkstemp
 
-from PySide.QtCore import QObject, SIGNAL, QFile, QThread, QTimer
+from PySide.QtCore import QObject, SIGNAL, QFile, QThread, QTimer, Qt
 from helper import UsesQCoreApplication
 
 class MyThread(QThread):
 
     def run(self):
-        self.emit(SIGNAL("test(const QString&)"),
-                  "INdT - PySide");
+        self.emit(SIGNAL("test(const QString&)"), "INdT - PySide");
 
 class TestThreadSignal(UsesQCoreApplication):
 
@@ -20,19 +19,15 @@ class TestThreadSignal(UsesQCoreApplication):
     def _callback(self, msg):
         self.assertEqual(msg, "INdT - PySide")
         self.__called__ = True
-        self._quit()
-
-    def _quit(self):
         self.app.quit()
 
     def testThread(self):
         t = MyThread()
-        QObject.connect(t, SIGNAL("test(const QString&)"),
-                        self._callback);
-
+        QObject.connect(t, SIGNAL("test(const QString&)"), self._callback);
         t.start()
-        QTimer.singleShot(100, self._quit)
+
         self.app.exec_()
+        t.wait()
         self.assert_(self.__called__);
 
 if __name__ == '__main__':
diff --git a/tests/QtCore/tr_noop_test.py b/tests/QtCore/tr_noop_test.py
new file mode 100644
index 0000000..92029e0
--- /dev/null
+++ b/tests/QtCore/tr_noop_test.py
@@ -0,0 +1,48 @@
+import unittest
+
+import sys
+from PySide.QtCore import QT_TR_NOOP, QT_TR_NOOP_UTF8
+from PySide.QtCore import QT_TRANSLATE_NOOP, QT_TRANSLATE_NOOP3, QT_TRANSLATE_NOOP_UTF8
+
+class QtTrNoopTest(unittest.TestCase):
+
+    def setUp(self):
+        self.txt = 'Cthulhu fhtag!'
+
+    def tearDown(self):
+        del self.txt
+
+    def testQtTrNoop(self):
+        refcnt = sys.getrefcount(self.txt)
+        result = QT_TR_NOOP(self.txt)
+        self.assertEqual(result, self.txt)
+        self.assertEqual(sys.getrefcount(result), refcnt + 1)
+
+    def testQtTrNoopUtf8(self):
+        refcnt = sys.getrefcount(self.txt)
+        result = QT_TR_NOOP_UTF8(self.txt)
+        self.assertEqual(result, self.txt)
+        self.assertEqual(sys.getrefcount(result), refcnt + 1)
+
+    def testQtTranslateNoop(self):
+        refcnt = sys.getrefcount(self.txt)
+        result = QT_TRANSLATE_NOOP(None, self.txt)
+        self.assertEqual(result, self.txt)
+        self.assertEqual(sys.getrefcount(result), refcnt + 1)
+
+    def testQtTranslateNoopUtf8(self):
+        refcnt = sys.getrefcount(self.txt)
+        result = QT_TRANSLATE_NOOP_UTF8(self.txt)
+        self.assertEqual(result, self.txt)
+        self.assertEqual(sys.getrefcount(result), refcnt + 1)
+
+    def testQtTranslateNoop3(self):
+        refcnt = sys.getrefcount(self.txt)
+        result = QT_TRANSLATE_NOOP3(None, self.txt, None)
+        self.assertEqual(result, self.txt)
+        self.assertEqual(sys.getrefcount(result), refcnt + 1)
+
+
+if __name__ == '__main__':
+    unittest.main()
+
diff --git a/tests/qtcore/translation_test.py b/tests/QtCore/translation_test.py
similarity index 75%
rename from tests/qtcore/translation_test.py
rename to tests/QtCore/translation_test.py
index 870c8c5..adf830c 100644
--- a/tests/qtcore/translation_test.py
+++ b/tests/QtCore/translation_test.py
@@ -5,7 +5,8 @@
 
 import os
 import unittest
-from PySide.QtCore import QObject, QTranslator, QCoreApplication, QString
+import py3kcompat as py3k
+from PySide.QtCore import QObject, QTranslator, QCoreApplication
 
 from helper import UsesQCoreApplication
 
@@ -15,12 +16,6 @@ class TranslationTest(UsesQCoreApplication):
     def setUp(self):
         super(TranslationTest, self).setUp()
         self.trdir = os.path.join(os.path.dirname(__file__), 'translations')
-        # os.system is probably not the best way to do it
-        os.system('lrelease %s/*.ts > /dev/null' % self.trdir)
-
-    def tearDown(self):
-        os.system('rm %s/*.qm > /dev/null' % self.trdir)
-        super(TranslationTest, self).tearDown()
 
     def testLatin(self):
         #Set string value to Latin
@@ -30,7 +25,7 @@ class TranslationTest(UsesQCoreApplication):
 
         obj = QObject()
         obj.setObjectName(obj.tr('Hello World!'))
-        self.assertEqual(obj.objectName(), u'Orbis, te saluto!')
+        self.assertEqual(obj.objectName(), py3k.unicode_('Orbis, te saluto!'))
 
     def testRussian(self):
         #Set string value to Russian
@@ -40,7 +35,7 @@ class TranslationTest(UsesQCoreApplication):
 
         obj = QObject()
         obj.setObjectName(obj.tr('Hello World!'))
-        self.assertEqual(obj.objectName(), u'привет мир!')
+        self.assertEqual(obj.objectName(), py3k.unicode_('привет мир!'))
 
     def testUtf8(self):
         translator = QTranslator()
@@ -49,12 +44,12 @@ class TranslationTest(UsesQCoreApplication):
 
         obj = QObject()
         obj.setObjectName(obj.trUtf8('Hello World!'))
-        self.assertEqual(obj.objectName(), u'привет мир!')
+        self.assertEqual(obj.objectName(), py3k.unicode_('привет мир!'))
 
     def testTranslateWithNoneDisambiguation(self):
         value = 'String here'
         obj = QCoreApplication.translate('context', value, None, QCoreApplication.UnicodeUTF8)
-        self.assert_(isinstance(obj, QString))
+        self.assertTrue(isinstance(obj, py3k.unicode))
         self.assertEqual(obj, value)
 
 if __name__ == '__main__':
diff --git a/tests/QtCore/translations/trans_latin.qm b/tests/QtCore/translations/trans_latin.qm
new file mode 100644
index 0000000..efdbee8
Binary files /dev/null and b/tests/QtCore/translations/trans_latin.qm differ
diff --git a/tests/qtcore/translations/trans_latin.ts b/tests/QtCore/translations/trans_latin.ts
similarity index 100%
rename from tests/qtcore/translations/trans_latin.ts
rename to tests/QtCore/translations/trans_latin.ts
diff --git a/tests/QtCore/translations/trans_russian.qm b/tests/QtCore/translations/trans_russian.qm
new file mode 100644
index 0000000..5f16552
Binary files /dev/null and b/tests/QtCore/translations/trans_russian.qm differ
diff --git a/tests/qtcore/translations/trans_russian.ts b/tests/QtCore/translations/trans_russian.ts
similarity index 100%
rename from tests/qtcore/translations/trans_russian.ts
rename to tests/QtCore/translations/trans_russian.ts
diff --git a/tests/qtcore/unaryoperator_test.py b/tests/QtCore/unaryoperator_test.py
old mode 100755
new mode 100644
similarity index 100%
rename from tests/qtcore/unaryoperator_test.py
rename to tests/QtCore/unaryoperator_test.py
diff --git a/tests/qtcore/unicode_test.py b/tests/QtCore/unicode_test.py
similarity index 76%
rename from tests/qtcore/unicode_test.py
rename to tests/QtCore/unicode_test.py
index f0bb883..ccc4997 100644
--- a/tests/qtcore/unicode_test.py
+++ b/tests/QtCore/unicode_test.py
@@ -4,6 +4,7 @@
 '''Unit tests for QString conversion to/from Python Unicode'''
 
 import unittest
+import py3kcompat as py3k
 
 from PySide.QtCore import QObject
 
@@ -20,13 +21,13 @@ class UnicodeConversion(unittest.TestCase):
         #Set regular Python string retrieve unicode
         obj = QObject()
         obj.setObjectName('test')
-        self.assertEqual(obj.objectName(), u'test')
+        self.assertEqual(obj.objectName(), py3k.unicode_('test'))
 
     def testSetUnicodeRetrieveUnicode(self):
         #Set Python unicode string and retrieve unicode
         obj = QObject()
-        obj.setObjectName(u'ümlaut')
-        self.assertEqual(obj.objectName(), u'ümlaut')
+        obj.setObjectName(py3k.unicode_('ümlaut'))
+        self.assertEqual(obj.objectName(), py3k.unicode_('ümlaut'))
 
 if __name__ == '__main__':
     unittest.main()
diff --git a/tests/QtCore/versioninfo_test.py b/tests/QtCore/versioninfo_test.py
new file mode 100644
index 0000000..094d637
--- /dev/null
+++ b/tests/QtCore/versioninfo_test.py
@@ -0,0 +1,20 @@
+import unittest
+import PySide
+
+class TestVersionInfo(unittest.TestCase):
+    def testIt(self):
+
+        v = PySide.__version_info__
+        self.assertEqual(type(v), tuple)
+        self.assertEqual(len(v), 5)
+        self.assertEqual(type(v[0]), int)
+        self.assertEqual(type(v[1]), int)
+        self.assertEqual(type(v[2]), int)
+        self.assertEqual(type(v[3]), str)
+        self.assertEqual(type(v[4]), int)
+
+        self.assertEqual(type(PySide.__version__), str)
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/tests/QtDeclarative/CMakeLists.txt b/tests/QtDeclarative/CMakeLists.txt
new file mode 100644
index 0000000..2c842d3
--- /dev/null
+++ b/tests/QtDeclarative/CMakeLists.txt
@@ -0,0 +1,17 @@
+PYSIDE_TEST(bug_451.py)
+PYSIDE_TEST(bug_456.py)
+PYSIDE_TEST(bug_557.py)
+PYSIDE_TEST(bug_726.py)
+PYSIDE_TEST(bug_814.py)
+PYSIDE_TEST(bug_825.py)
+PYSIDE_TEST(bug_847.py)
+PYSIDE_TEST(bug_915.py)
+PYSIDE_TEST(bug_926.py)
+PYSIDE_TEST(bug_951.py)
+PYSIDE_TEST(bug_995.py)
+PYSIDE_TEST(bug_997.py)
+PYSIDE_TEST(bug_1029.py)
+PYSIDE_TEST(qdeclarativenetwork_test.py)
+PYSIDE_TEST(qdeclarativeview_test.py)
+PYSIDE_TEST(connect_python_qml.py)
+PYSIDE_TEST(registertype.py)
diff --git a/tests/QtDeclarative/bug_1029.py b/tests/QtDeclarative/bug_1029.py
new file mode 100644
index 0000000..3cc343f
--- /dev/null
+++ b/tests/QtDeclarative/bug_1029.py
@@ -0,0 +1,29 @@
+from PySide.QtCore import *
+from PySide.QtGui import *
+from PySide.QtDeclarative import *
+
+import sys
+import gc
+
+def register_qml_types():
+    class TestClass(QDeclarativeItem):
+        def __init__(self, parent = None):
+            QDeclarativeItem.__init__(self, parent)
+
+    qmlRegisterType(TestClass, "UserTypes", 1, 0, "TestClass")
+
+def main():
+    app = QApplication([])
+
+    # reg qml types here
+    register_qml_types()
+
+    # force gc to run
+    gc.collect()
+
+    view = QDeclarativeView()
+    url = QUrl(__file__.replace(".py", ".qml"))
+    view.setSource(url)
+
+if __name__ == "__main__":
+    main()
diff --git a/tests/QtDeclarative/bug_1029.qml b/tests/QtDeclarative/bug_1029.qml
new file mode 100644
index 0000000..a9c0aea
--- /dev/null
+++ b/tests/QtDeclarative/bug_1029.qml
@@ -0,0 +1,15 @@
+import QtQuick 1.0
+import UserTypes 1.0
+
+Rectangle
+{
+    width: 200
+    height: 200
+
+    color: "#ff0000"
+
+    TestClass
+    {
+
+    }
+}
diff --git a/tests/QtDeclarative/bug_451.py b/tests/QtDeclarative/bug_451.py
new file mode 100644
index 0000000..c75eaa7
--- /dev/null
+++ b/tests/QtDeclarative/bug_451.py
@@ -0,0 +1,65 @@
+''' Test bug 451: http://bugs.openbossa.org/show_bug.cgi?id=451'''
+
+from PySide import QtCore, QtGui, QtDeclarative
+from helper import adjust_filename
+import sys
+import unittest
+
+class PythonObject(QtCore.QObject):
+    def __init__(self):
+        QtCore.QObject.__init__(self, None)
+        self._called = ""
+        self._arg1 = None
+        self._arg2 = None
+
+    def setCalled(self, v):
+        self._called = v
+
+    def setArg1(self, v):
+        self._arg1 = v
+
+    def setArg2(self, v):
+        self._arg2 = v
+
+    def getCalled(self):
+        return self._called
+
+    def getArg1(self):
+        return self._arg1
+
+    def getArg2(self):
+        return self._arg2
+
+    called = QtCore.Property(str, getCalled, setCalled)
+    arg1 = QtCore.Property(int, getArg1, setArg1)
+    arg2 = QtCore.Property('QVariant', getArg2, setArg2)
+
+class TestBug(unittest.TestCase):
+    def testQMLFunctionCall(self):
+        app = QtGui.QApplication(sys.argv)
+        view = QtDeclarative.QDeclarativeView()
+
+        obj = PythonObject()
+        context = view.rootContext()
+        context.setContextProperty("python", obj)
+        view.setSource(QtCore.QUrl.fromLocalFile(adjust_filename('bug_451.qml', __file__)))
+        root = view.rootObject()
+        root.simpleFunction()
+        self.assertEqual(obj.called, "simpleFunction")
+
+        root.oneArgFunction(42)
+        self.assertEqual(obj.called, "oneArgFunction")
+        self.assertEqual(obj.arg1, 42)
+
+        root.twoArgFunction(10, app)
+        self.assertEqual(obj.called, "twoArgFunction")
+        self.assertEqual(obj.arg1, 10)
+        self.assertEqual(obj.arg2, app)
+
+        rvalue = root.returnFunction()
+        self.assertEqual(obj.called, "returnFunction")
+        self.assertEqual(rvalue, 42)
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/tests/QtDeclarative/bug_451.qml b/tests/QtDeclarative/bug_451.qml
new file mode 100644
index 0000000..fea8108
--- /dev/null
+++ b/tests/QtDeclarative/bug_451.qml
@@ -0,0 +1,26 @@
+import Qt 4.7
+
+Rectangle {
+    id: page
+
+    function simpleFunction() {
+        python.called = "simpleFunction"
+    }
+
+    function oneArgFunction(x) {
+        python.called = "oneArgFunction"
+        python.arg1 = x
+    }
+
+    function twoArgFunction(x, y) {
+        python.called = "twoArgFunction"
+        python.arg1 = x
+        python.arg2 = y
+    }
+
+    function returnFunction() {
+        python.called = "returnFunction"
+        return 42
+    }
+
+}
diff --git a/tests/QtDeclarative/bug_456.py b/tests/QtDeclarative/bug_456.py
new file mode 100644
index 0000000..9ed70c8
--- /dev/null
+++ b/tests/QtDeclarative/bug_456.py
@@ -0,0 +1,40 @@
+from PySide import QtCore, QtGui, QtDeclarative
+from helper import adjust_filename, TimedQApplication
+import unittest
+
+class RotateValue(QtCore.QObject):
+    def __init__(self):
+        super(RotateValue,self).__init__()
+
+    @QtCore.Slot(result=int)
+    def val(self):
+        return 100
+
+    def setRotation(self, v):
+        self._rotation = v
+
+    def getRotation(self):
+        return self._rotation
+
+    rotation = QtCore.Property(int, getRotation, setRotation)
+
+class TestConnectionWithInvalidSignature(TimedQApplication):
+
+    def testSlotRetur(self):
+        view = QtDeclarative.QDeclarativeView()
+        rotatevalue = RotateValue()
+
+        timer = QtCore.QTimer()
+        timer.start(2000)
+
+        context = view.rootContext()
+        context.setContextProperty("rotatevalue", rotatevalue)
+        view.setSource(QtCore.QUrl.fromLocalFile(adjust_filename('bug_456.qml', __file__)))
+        root = view.rootObject()
+        button = root.findChild(QtCore.QObject, "buttonMouseArea")
+        view.show()
+        button.entered.emit()
+        self.assertEqual(rotatevalue.rotation, 100)
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/tests/QtDeclarative/bug_456.qml b/tests/QtDeclarative/bug_456.qml
new file mode 100644
index 0000000..e8b220e
--- /dev/null
+++ b/tests/QtDeclarative/bug_456.qml
@@ -0,0 +1,71 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: PySide Team (pyside@openbossa.org)
+**
+** This file is part of the examples of PySide: Python for Qt.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import Qt 4.7
+
+Rectangle {
+    id: page
+
+    width: 500; height: 200
+    color: "lightgray"
+
+    Rectangle {
+        id: button
+        width: 150; height: 40
+        color: "darkgray"
+        anchors.horizontalCenter: page.horizontalCenter
+        y: 120
+        MouseArea {
+            id: buttonMouseArea
+            objectName: "buttonMouseArea"
+            anchors.fill: parent
+            onEntered: {
+                    rotatevalue.rotation = rotatevalue.val()
+            }
+        }
+        Text {
+            id: buttonText
+                text: "Press me!"
+            anchors.horizontalCenter: button.horizontalCenter
+            anchors.verticalCenter: button.verticalCenter
+            font.pointSize: 16;
+        }
+    }
+}
diff --git a/tests/QtDeclarative/bug_557.py b/tests/QtDeclarative/bug_557.py
new file mode 100644
index 0000000..c78aaf1
--- /dev/null
+++ b/tests/QtDeclarative/bug_557.py
@@ -0,0 +1,14 @@
+from PySide.QtCore import *
+from PySide.QtGui import *
+from PySide.QtDeclarative import *
+
+import sys
+
+app = QApplication(sys.argv)
+
+engine = QDeclarativeEngine()
+component = QDeclarativeComponent(engine)
+
+# This should segfault if the QDeclarativeComponent has not QDeclarativeEngine
+component.loadUrl(QUrl.fromLocalFile('foo.qml'))
+
diff --git a/tests/QtDeclarative/bug_726.py b/tests/QtDeclarative/bug_726.py
new file mode 100644
index 0000000..fa18aac
--- /dev/null
+++ b/tests/QtDeclarative/bug_726.py
@@ -0,0 +1,41 @@
+from PySide import QtCore, QtGui, QtDeclarative
+from helper import adjust_filename, TimedQApplication
+import unittest
+
+class ProxyObject(QtCore.QObject):
+    def __init__(self):
+        super(ProxyObject,self).__init__()
+        self._o = None
+        self._receivedName = ""
+
+    @QtCore.Slot(result='QObject*')
+    def getObject(self):
+        if self._o:
+            return self._o
+
+        self._o = QtCore.QObject()
+        self._o.setObjectName("PySideObject")
+        return self._o
+
+    @QtCore.Slot(str)
+    def receivedObject(self, name):
+        self._receivedName = name
+ 
+
+class TestConnectionWithInvalidSignature(TimedQApplication):
+
+    def testSlotRetur(self):
+        view = QtDeclarative.QDeclarativeView()
+        proxy = ProxyObject()
+
+        context = view.rootContext()
+        context.setContextProperty("proxy", proxy)
+        view.setSource(QtCore.QUrl.fromLocalFile(adjust_filename('bug_726.qml', __file__)))
+        root = view.rootObject()
+        button = root.findChild(QtCore.QObject, "buttonMouseArea")
+        view.show()
+        button.entered.emit()
+        self.assertEqual(proxy._receivedName, "PySideObject")
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/tests/QtDeclarative/bug_726.qml b/tests/QtDeclarative/bug_726.qml
new file mode 100644
index 0000000..27cf59f
--- /dev/null
+++ b/tests/QtDeclarative/bug_726.qml
@@ -0,0 +1,71 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: PySide Team (pyside@openbossa.org)
+**
+** This file is part of the examples of PySide: Python for Qt.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import Qt 4.7
+
+Rectangle {
+    id: page
+
+    width: 500; height: 200
+    color: "lightgray"
+
+    Rectangle {
+        id: button
+        width: 150; height: 40
+        color: "darkgray"
+        anchors.horizontalCenter: page.horizontalCenter
+        y: 120
+        MouseArea {
+            id: buttonMouseArea
+            objectName: "buttonMouseArea"
+            anchors.fill: parent
+            onEntered: {
+                    proxy.receivedObject(proxy.getObject().objectName)
+            }
+        }
+        Text {
+            id: buttonText
+                text: "Press me!"
+            anchors.horizontalCenter: button.horizontalCenter
+            anchors.verticalCenter: button.verticalCenter
+            font.pointSize: 16;
+        }
+    }
+}
diff --git a/tests/QtDeclarative/bug_814.py b/tests/QtDeclarative/bug_814.py
new file mode 100644
index 0000000..e2bfc36
--- /dev/null
+++ b/tests/QtDeclarative/bug_814.py
@@ -0,0 +1,39 @@
+#!/usr/bin/python
+# -*- coding: utf-8 -*-
+
+# Test case for PySide bug 814
+# http://bugs.pyside.org/show_bug.cgi?id=814
+# 2011-04-08 Thomas Perl <m@thp.io>
+# Released under the same terms as PySide itself
+
+from PySide.QtCore import QUrl, QAbstractListModel, QModelIndex
+from PySide.QtDeclarative import QDeclarativeView
+
+from helper import adjust_filename, TimedQApplication
+import unittest
+
+class ListModel(QAbstractListModel):
+    def __init__(self):
+        QAbstractListModel.__init__(self)
+        self.setRoleNames({0: 'pysideModelData'})
+
+    def rowCount(self, parent=QModelIndex()):
+        return 3
+
+    def data(self, index, role):
+        if index.isValid() and role == 0:
+            return 'blubb'
+        return None
+
+class TestBug814(TimedQApplication):
+    def testAbstractItemModelTransferToQML(self):
+        view = QDeclarativeView()
+        view.setSource(QUrl.fromLocalFile(adjust_filename('bug_814.qml', __file__)))
+        root = view.rootObject()
+        model = ListModel()
+        root.setProperty('model', model)
+        view.show()
+
+if __name__ == '__main__':
+    unittest.main()
+
diff --git a/tests/QtDeclarative/bug_814.qml b/tests/QtDeclarative/bug_814.qml
new file mode 100644
index 0000000..3296c07
--- /dev/null
+++ b/tests/QtDeclarative/bug_814.qml
@@ -0,0 +1,9 @@
+
+import Qt 4.7
+
+ListView {
+    width: 300; height: 300
+    delegate: Text { text: pysideModelData }
+    model: 3
+}
+
diff --git a/tests/QtDeclarative/bug_825.py b/tests/QtDeclarative/bug_825.py
new file mode 100644
index 0000000..d3c5519
--- /dev/null
+++ b/tests/QtDeclarative/bug_825.py
@@ -0,0 +1,55 @@
+from PySide.QtCore import *
+from PySide.QtGui import *
+from PySide.QtDeclarative import *
+
+from helper import adjust_filename
+import unittest
+
+paintCalled = False
+
+class MetaA(type):
+    pass
+
+class A(object):
+    __metaclass__ = MetaA
+
+MetaB = type(QDeclarativeItem)
+B = QDeclarativeItem
+
+class MetaC(MetaA, MetaB):
+    pass
+
+class C(A, B):
+    __metaclass__ = MetaC
+
+class Bug825 (C):
+
+    def __init__(self, parent = None):
+        QDeclarativeItem.__init__(self, parent)
+        # need to disable this flag to draw inside a QDeclarativeItem
+        self.setFlag(QGraphicsItem.ItemHasNoContents, False)
+
+    def paint(self, painter, options, widget):
+        global paintCalled
+        pen = QPen(Qt.black, 2)
+        painter.setPen(pen);
+        painter.drawPie(self.boundingRect(), 0, 128);
+        paintCalled = True
+
+class TestBug825 (unittest.TestCase):
+    def testIt(self):
+        global paintCalled
+        app = QApplication([])
+        qmlRegisterType(Bug825, 'bugs', 1, 0, 'Bug825')
+        self.assertRaises(TypeError, qmlRegisterType, A, 'bugs', 1, 0, 'A')
+
+        view = QDeclarativeView()
+        view.setSource(QUrl.fromLocalFile(adjust_filename('bug_825.qml', __file__)))
+        view.show()
+        QTimer.singleShot(250, view.close)
+        app.exec_()
+        self.assertTrue(paintCalled)
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/tests/QtDeclarative/bug_825.qml b/tests/QtDeclarative/bug_825.qml
new file mode 100644
index 0000000..dc1c450
--- /dev/null
+++ b/tests/QtDeclarative/bug_825.qml
@@ -0,0 +1,10 @@
+import Qt 4.7
+import bugs 1.0
+
+Item {
+    width: 300; height: 200
+
+    Bug825 {
+
+    }
+}
diff --git a/tests/QtDeclarative/bug_847.py b/tests/QtDeclarative/bug_847.py
new file mode 100644
index 0000000..91619c8
--- /dev/null
+++ b/tests/QtDeclarative/bug_847.py
@@ -0,0 +1,42 @@
+#!/usr/bin/python
+# -*- coding: utf-8 -*-
+# Testcase for PySide bug 847
+# Released under the same terms as PySide itself
+# 2011-05-04 Thomas Perl <m@thp.io>
+
+import unittest
+
+from PySide.QtCore import Slot, Signal, QUrl
+from PySide.QtDeclarative import QDeclarativeView
+
+from helper import adjust_filename, UsesQApplication
+
+class View(QDeclarativeView):
+    def __init__(self):
+        QDeclarativeView.__init__(self)
+        self.setSource(QUrl.fromLocalFile(adjust_filename('bug_847.qml', __file__)))
+        self.rootObject().setProperty('pythonObject', self)
+
+    @Slot(int, int)
+    def blubb(self, x, y):
+        self.called.emit(x, y)
+
+    called = Signal(int, int)
+
+
+class TestQML(UsesQApplication):
+    def done(self, x, y):
+        self._sucess = True
+        self.app.quit()
+
+    def testPythonSlot(self):
+        self._sucess = False
+        view = View()
+        view.called.connect(self.done)
+        view.show()
+        self.app.exec_()
+        self.assertTrue(self._sucess)
+
+if __name__ == '__main__':
+    unittest.main()
+
diff --git a/tests/QtDeclarative/bug_847.qml b/tests/QtDeclarative/bug_847.qml
new file mode 100644
index 0000000..1cb40fa
--- /dev/null
+++ b/tests/QtDeclarative/bug_847.qml
@@ -0,0 +1,26 @@
+
+import Qt 4.7
+
+Rectangle {
+    width: 500
+    height: 500
+    color: 'red'
+
+    property variant pythonObject: undefined
+
+    Text {
+        anchors.centerIn: parent
+        text: 'click me'
+        color: 'white'
+    }
+
+    Timer {
+        interval: 100; running: true;
+        onTriggered: {
+            if (pythonObject != undefined) {
+                pythonObject.blubb(42, 84)
+            }
+        }
+    }
+}
+
diff --git a/tests/QtDeclarative/bug_915.py b/tests/QtDeclarative/bug_915.py
new file mode 100644
index 0000000..1936682
--- /dev/null
+++ b/tests/QtDeclarative/bug_915.py
@@ -0,0 +1,28 @@
+#!/usr/bin/python
+# -*- coding: utf-8 -*-
+import unittest
+
+from PySide.QtDeclarative import QDeclarativeView, QDeclarativeItem
+from helper import TimedQApplication
+
+class TestBug915(TimedQApplication):
+    def testReturnPolicy(self):
+        view = QDeclarativeView()
+
+        item1 = QDeclarativeItem()
+        item1.setObjectName("Item1")
+        view.scene().addItem(item1)
+        self.assertEqual(item1.objectName(), "Item1") # check if the item still valid
+
+        item2 = QDeclarativeItem()
+        item2.setObjectName("Item2")
+        item1.scene().addItem(item2)
+        item1 = None
+        self.assertEqual(item2.objectName(), "Item2") # check if the item still valid
+
+        view = None
+
+if __name__ == '__main__':
+    unittest.main()
+
+
diff --git a/tests/QtDeclarative/bug_926.py b/tests/QtDeclarative/bug_926.py
new file mode 100644
index 0000000..54b6590
--- /dev/null
+++ b/tests/QtDeclarative/bug_926.py
@@ -0,0 +1,38 @@
+import sys
+import unittest
+from helper import adjust_filename
+from PySide.QtCore import *
+from PySide.QtGui import *
+from PySide.QtDeclarative import *
+
+class MyClass (QObject):
+
+    def __init__(self):
+        super(MyClass,self).__init__()
+        self.__url = QUrl()
+
+    def getUrl(self):
+        return self.__url
+
+    def setUrl(self,value):
+        newUrl = QUrl(value)
+        if (newUrl != self.__url):
+            self.__url = newUrl
+            self.urlChanged.emit()
+
+    urlChanged = Signal()
+    urla = Property(QUrl, getUrl, setUrl, notify = urlChanged)
+
+class TestBug926 (unittest.TestCase):
+    def testIt(self):
+        app = QApplication([])
+        qmlRegisterType(MyClass,'Example',1,0,'MyClass')
+        view = QDeclarativeView()
+        view.setSource(QUrl.fromLocalFile(adjust_filename('bug_926.qml', __file__)))
+        self.assertEqual(len(view.errors()), 0)
+        view.show()
+        QTimer.singleShot(0, app.quit)
+        app.exec_()
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/tests/QtDeclarative/bug_926.qml b/tests/QtDeclarative/bug_926.qml
new file mode 100644
index 0000000..50895db
--- /dev/null
+++ b/tests/QtDeclarative/bug_926.qml
@@ -0,0 +1,17 @@
+import Qt 4.7
+import Example 1.0
+
+Rectangle {
+    width: 100
+    height: 62
+
+    MyClass {
+        id: myClass
+        urla: "http://www.pyside.org"
+    }
+
+    Text {
+        id: name
+        text: myClass.urla
+    }
+}
diff --git a/tests/QtDeclarative/bug_951.py b/tests/QtDeclarative/bug_951.py
new file mode 100644
index 0000000..0cd8953
--- /dev/null
+++ b/tests/QtDeclarative/bug_951.py
@@ -0,0 +1,31 @@
+from PySide.QtDeclarative import QDeclarativeItem, qmlRegisterType, QDeclarativeView
+from PySide.QtCore import QUrl
+
+from helper import adjust_filename, TimedQApplication
+import unittest
+
+class MyItem(QDeclarativeItem):
+    COMPONENT_COMPLETE_CALLED = False
+    def __init__(self,parent=None):
+        super(MyItem, self).__init__(parent)
+        self.setObjectName("myitem")
+
+    def componentComplete(self):
+        MyItem.COMPONENT_COMPLETE_CALLED = True
+        super(MyItem, self).componentComplete()
+
+class TestRegisterQMLType(TimedQApplication):
+    def setup(self):
+        TimedQApplication.setup(self, 100 * 3) # 3s
+
+    def testSignalEmission(self):
+        qmlRegisterType(MyItem, "my.item", 1, 0, "MyItem")
+
+        view = QDeclarativeView()
+        view.setSource(QUrl.fromLocalFile(adjust_filename('bug_951.qml', __file__)))
+
+        self.app.exec_()
+        self.assertTrue(MyItem.COMPONENT_COMPLETE_CALLED)
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/tests/QtDeclarative/bug_951.qml b/tests/QtDeclarative/bug_951.qml
new file mode 100644
index 0000000..dd0a560
--- /dev/null
+++ b/tests/QtDeclarative/bug_951.qml
@@ -0,0 +1,7 @@
+import Qt 4.7
+import my.item 1.0
+Rectangle{
+    width:10
+    height:10
+    MyItem{ }
+}
diff --git a/tests/QtDeclarative/bug_995.py b/tests/QtDeclarative/bug_995.py
new file mode 100644
index 0000000..e44f50e
--- /dev/null
+++ b/tests/QtDeclarative/bug_995.py
@@ -0,0 +1,13 @@
+from PySide.QtGui import *
+from PySide.QtDeclarative import *
+from helper import adjust_filename, UsesQApplication
+
+app = QApplication([])
+view = QDeclarativeView(adjust_filename('bug_995.qml', __file__))
+view.show()
+view.resize(200, 200)
+item = view.itemAt(100, 100)
+
+# it CAN NOT crash here
+print(item)
+
diff --git a/tests/QtDeclarative/bug_995.qml b/tests/QtDeclarative/bug_995.qml
new file mode 100644
index 0000000..7603700
--- /dev/null
+++ b/tests/QtDeclarative/bug_995.qml
@@ -0,0 +1,12 @@
+import Qt 4.7
+
+Rectangle {
+    width: 100
+    height: 100
+    color: "red"
+
+    Text {
+        text: "Hello World"
+        anchors.centerIn: parent
+    }
+}
diff --git a/tests/QtDeclarative/bug_997.py b/tests/QtDeclarative/bug_997.py
new file mode 100644
index 0000000..6c3587a
--- /dev/null
+++ b/tests/QtDeclarative/bug_997.py
@@ -0,0 +1,24 @@
+from PySide import QtCore, QtDeclarative
+
+import unittest
+from helper import adjust_filename, UsesQApplication
+
+
+class TestBug(UsesQApplication):
+    def testQMLFunctionCall(self):
+        ownerData = QtDeclarative.QDeclarativePropertyMap()
+        ownerData.insert('name', 'John Smith')
+        ownerData.insert('phone', '555-5555')
+        ownerData.insert('newValue', '')
+
+        view = QtDeclarative.QDeclarativeView()
+        ctxt = view.rootContext()
+        ctxt.setContextProperty('owner', ownerData)
+        view.setSource(QtCore.QUrl.fromLocalFile(adjust_filename('bug_997.qml', __file__)))
+        view.show()
+        QtCore.QTimer.singleShot(1000, self.app.quit)
+        self.app.exec_()
+        self.assertEqual(ownerData.value('newName'), ownerData.value('name'))
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/tests/QtDeclarative/bug_997.qml b/tests/QtDeclarative/bug_997.qml
new file mode 100644
index 0000000..43449bf
--- /dev/null
+++ b/tests/QtDeclarative/bug_997.qml
@@ -0,0 +1,6 @@
+import Qt 4.7
+
+Text {
+    text: owner.name + " " + owner.phone 
+    Component.onCompleted: { owner.newName = owner.name }
+}
diff --git a/tests/QtDeclarative/connect_python_qml.py b/tests/QtDeclarative/connect_python_qml.py
new file mode 100644
index 0000000..669eec6
--- /dev/null
+++ b/tests/QtDeclarative/connect_python_qml.py
@@ -0,0 +1,30 @@
+'''Test case for bug #442'''
+
+from PySide import QtCore, QtGui, QtDeclarative
+from helper import adjust_filename, TimedQApplication
+import unittest
+
+class TestConnectionWithInvalidSignature(TimedQApplication):
+    def onButtonClicked(self):
+        self.buttonClicked = True
+        self.app.quit()
+
+    def onButtonFailClicked(self):
+        pass
+
+    def testFailConnection(self):
+        self.buttonClicked = False
+        self.buttonFailClicked = False
+        view = QtDeclarative.QDeclarativeView()
+        view.setSource(QtCore.QUrl.fromLocalFile(adjust_filename('connect_python_qml.qml', __file__)))
+        root = view.rootObject()
+        button = root.findChild(QtCore.QObject, "buttonMouseArea")
+        self.assertRaises(TypeError, QtCore.QObject.connect, [button,QtCore.SIGNAL('entered()'), self.onButtonFailClicked])
+        button.entered.connect(self.onButtonClicked)
+        button.entered.emit()
+        view.show()
+        self.app.exec_()
+        self.assert_(self.buttonClicked)
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/tests/QtDeclarative/connect_python_qml.qml b/tests/QtDeclarative/connect_python_qml.qml
new file mode 100644
index 0000000..df55e1b
--- /dev/null
+++ b/tests/QtDeclarative/connect_python_qml.qml
@@ -0,0 +1,20 @@
+import Qt 4.7
+
+Rectangle {
+    id: page
+    width: 500; height: 200
+    color: "lightgray"
+
+    Rectangle {
+        id: button
+        width: 150; height: 40
+        color: "darkgray"
+        anchors.horizontalCenter: page.horizontalCenter
+        y: 150
+        MouseArea {
+            id: buttonMouseArea
+            objectName: "buttonMouseArea"
+            anchors.fill: parent
+        }
+    }
+}
diff --git a/tests/QtDeclarative/hw.qml b/tests/QtDeclarative/hw.qml
new file mode 100644
index 0000000..78c68ac
--- /dev/null
+++ b/tests/QtDeclarative/hw.qml
@@ -0,0 +1,55 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import Qt 4.7
+
+Rectangle {
+     id: page
+     width: 500; height: 200
+     color: "lightgray"
+
+     Text {
+         id: helloText
+         text: "Hello world!"
+         y: 30
+         anchors.horizontalCenter: page.horizontalCenter
+         font.pointSize: 24; font.bold: true
+     }
+}
diff --git a/tests/qtdeclarative/qdeclarativenetwork_test.py b/tests/QtDeclarative/qdeclarativenetwork_test.py
similarity index 67%
rename from tests/qtdeclarative/qdeclarativenetwork_test.py
rename to tests/QtDeclarative/qdeclarativenetwork_test.py
index a03a484..459c422 100644
--- a/tests/qtdeclarative/qdeclarativenetwork_test.py
+++ b/tests/QtDeclarative/qdeclarativenetwork_test.py
@@ -8,11 +8,6 @@ from PySide.QtNetwork import QNetworkAccessManager
 
 from helper import adjust_filename, TimedQApplication
 
-class MyNetworkAccessManagerFactory(QDeclarativeNetworkAccessManagerFactory):
-    def create(self, parent):
-        nam = QNetworkAccessManager(parent)
-        return nam
-
 class TestQDeclarativeNetworkFactory(TimedQApplication):
 
     def setUp(self):
@@ -21,9 +16,8 @@ class TestQDeclarativeNetworkFactory(TimedQApplication):
     def testQDeclarativeNetworkFactory(self):
         view = QDeclarativeView()
 
-        url = QUrl.fromLocalFile(adjust_filename('network.qml', __file__))
+        url = QUrl.fromLocalFile(adjust_filename('hw.qml', __file__))
 
-        view.engine().setNetworkAccessManagerFactory(MyNetworkAccessManagerFactory())
         view.setSource(url)
         view.show()
 
diff --git a/tests/QtDeclarative/qdeclarativeview_test.py b/tests/QtDeclarative/qdeclarativeview_test.py
new file mode 100644
index 0000000..468de97
--- /dev/null
+++ b/tests/QtDeclarative/qdeclarativeview_test.py
@@ -0,0 +1,58 @@
+'''Test cases for QDeclarativeView'''
+
+import unittest
+
+from PySide.QtCore import QUrl, QObject, Property, Slot
+from PySide.QtDeclarative import QDeclarativeView
+
+from helper import adjust_filename, TimedQApplication
+
+class MyObject(QObject):
+    def __init__(self, text, parent=None):
+        QObject.__init__(self, parent)
+        self._text = text
+
+    def getText(self):
+        return self._text
+
+
+    @Slot(str)
+    def qmlText(self, text):
+        self._qmlText = text
+
+    title = Property(str, getText)
+
+
+class TestQDeclarativeView(TimedQApplication):
+
+    def testQDeclarativeViewList(self):
+        view = QDeclarativeView()
+
+        dataList = ["Item 1", "Item 2", "Item 3", "Item 4"]
+
+        ctxt = view.rootContext()
+        ctxt.setContextProperty("myModel", dataList)
+
+        url = QUrl.fromLocalFile(adjust_filename('view.qml', __file__))
+        view.setSource(url)
+        view.show()
+
+        self.assertEqual(view.status(), QDeclarativeView.Ready)
+
+
+    def testModelExport(self):
+        view = QDeclarativeView()
+        dataList = [MyObject("Item 1"), MyObject("Item 2"), MyObject("Item 3"), MyObject("Item 4")]
+
+        ctxt = view.rootContext()
+        ctxt.setContextProperty("myModel", dataList)
+
+        url = QUrl.fromLocalFile(adjust_filename('viewmodel.qml', __file__))
+        view.setSource(url)
+        view.show()
+
+        self.assertEqual(view.status(), QDeclarativeView.Ready)
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/tests/QtDeclarative/registertype.py b/tests/QtDeclarative/registertype.py
new file mode 100644
index 0000000..c752ebf
--- /dev/null
+++ b/tests/QtDeclarative/registertype.py
@@ -0,0 +1,92 @@
+
+import sys
+import unittest
+import helper
+from PySide.QtCore import *
+from PySide.QtGui import *
+from PySide.QtDeclarative import *
+
+class PieSlice (QDeclarativeItem):
+
+    def __init__(self, parent = None):
+        QDeclarativeItem.__init__(self, parent)
+        # need to disable this flag to draw inside a QDeclarativeItem
+        self.setFlag(QGraphicsItem.ItemHasNoContents, False)
+        self._color = QColor()
+        self._fromAngle = 0
+        self._angleSpan = 0
+
+    def getColor(self):
+        return self._color
+
+    def setColor(self, value):
+        self._color = value
+
+    def getFromAngle(self):
+        return self._angle
+
+    def setFromAngle(self, value):
+        self._fromAngle = value
+
+    def getAngleSpan(self):
+        return self._angleSpan
+
+    def setAngleSpan(self, value):
+        self._angleSpan = value
+
+    color = Property(QColor, getColor, setColor)
+    fromAngle = Property(int, getFromAngle, setFromAngle)
+    angleSpan = Property(int, getAngleSpan, setAngleSpan)
+
+    def paint(self, painter, options, widget):
+        global paintCalled
+        pen = QPen(self._color, 2)
+        painter.setPen(pen);
+        painter.setRenderHints(QPainter.Antialiasing, True);
+        painter.drawPie(self.boundingRect(), self._fromAngle * 16, self._angleSpan * 16);
+        paintCalled = True
+
+class PieChart (QDeclarativeItem):
+
+    def __init__(self, parent = None):
+        QDeclarativeItem.__init__(self, parent)
+        self._name = ''
+        self._slices = []
+
+    def getName(self):
+        return self._name
+
+    def setName(self, value):
+        self._name = value
+
+    name = Property(str, getName, setName)
+
+    def appendSlice(self, _slice):
+        global appendCalled
+        _slice.setParentItem(self)
+        self._slices.append(_slice)
+        appendCalled = True
+
+    slices = ListProperty(PieSlice, append=appendSlice)
+
+appendCalled = False
+paintCalled = False
+
+class TestQmlSupport(unittest.TestCase):
+
+    def testIt(self):
+        app = QApplication([])
+
+        qmlRegisterType(PieChart, 'Charts', 1, 0, 'PieChart');
+        qmlRegisterType(PieSlice, "Charts", 1, 0, "PieSlice");
+
+        view = QDeclarativeView()
+        view.setSource(QUrl.fromLocalFile(helper.adjust_filename('registertype.qml', __file__)))
+        view.show()
+        QTimer.singleShot(250, view.close)
+        app.exec_()
+        self.assertTrue(appendCalled)
+        self.assertTrue(paintCalled)
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/tests/QtDeclarative/registertype.qml b/tests/QtDeclarative/registertype.qml
new file mode 100644
index 0000000..7815623
--- /dev/null
+++ b/tests/QtDeclarative/registertype.qml
@@ -0,0 +1,29 @@
+import Qt 4.7
+import Charts 1.0
+
+Item {
+    width: 300; height: 200
+
+    PieChart {
+        anchors.centerIn: parent
+        width: 100; height: 100
+
+        slices: [
+            PieSlice {
+                anchors.fill: parent
+                color: "red"
+                fromAngle: 0; angleSpan: 110
+            },
+            PieSlice {
+                anchors.fill: parent
+                color: "black"
+                fromAngle: 110; angleSpan: 50
+            },
+            PieSlice {
+                anchors.fill: parent
+                color: "blue"
+                fromAngle: 160; angleSpan: 100
+            }
+        ]
+    }
+}
diff --git a/tests/qtdeclarative/view.qml b/tests/QtDeclarative/view.qml
similarity index 100%
rename from tests/qtdeclarative/view.qml
rename to tests/QtDeclarative/view.qml
diff --git a/tests/QtDeclarative/viewmodel.qml b/tests/QtDeclarative/viewmodel.qml
new file mode 100644
index 0000000..badce7d
--- /dev/null
+++ b/tests/QtDeclarative/viewmodel.qml
@@ -0,0 +1,14 @@
+import Qt 4.7
+
+ListView {
+    width: 100; height: 100
+    anchors.fill: parent
+
+    model: myModel
+    delegate: Rectangle {
+        height: 25
+        width: 100
+        Text { text: title }
+    }
+}
+
diff --git a/tests/QtGui/CMakeLists.txt b/tests/QtGui/CMakeLists.txt
new file mode 100644
index 0000000..9bac913
--- /dev/null
+++ b/tests/QtGui/CMakeLists.txt
@@ -0,0 +1,173 @@
+#Keep this in alphabetical sort
+
+PYSIDE_TEST(action_clear.py)
+PYSIDE_TEST(api2_test.py)
+PYSIDE_TEST(add_action_test.py)
+PYSIDE_TEST(bug_172.py)
+PYSIDE_TEST(bug_243.py)
+PYSIDE_TEST(bug_300_test.py)
+PYSIDE_TEST(bug_307.py)
+PYSIDE_TEST(bug_324.py)
+PYSIDE_TEST(bug_338.py)
+PYSIDE_TEST(bug_363.py)
+PYSIDE_TEST(bug_367.py)
+PYSIDE_TEST(bug_389.py)
+PYSIDE_TEST(bug_400.py)
+PYSIDE_TEST(bug_416.py)
+PYSIDE_TEST(bug_429.py)
+PYSIDE_TEST(bug_430.py)
+PYSIDE_TEST(bug_433.py)
+PYSIDE_TEST(bug_467.py)
+PYSIDE_TEST(bug_480.py)
+PYSIDE_TEST(bug_493.py)
+PYSIDE_TEST(bug_500.py)
+PYSIDE_TEST(bug_512.py)
+PYSIDE_TEST(bug_525.py)
+PYSIDE_TEST(bug_546.py)
+PYSIDE_TEST(bug_547.py)
+PYSIDE_TEST(bug_549.py)
+PYSIDE_TEST(bug_569.py)
+PYSIDE_TEST(bug_575.py)
+PYSIDE_TEST(bug_576.py)
+PYSIDE_TEST(bug_585.py)
+PYSIDE_TEST(bug_589.py)
+PYSIDE_TEST(bug_606.py)
+PYSIDE_TEST(bug_617.py)
+PYSIDE_TEST(bug_635.py)
+PYSIDE_TEST(bug_640.py)
+PYSIDE_TEST(bug_652.py)
+PYSIDE_TEST(bug_653.py)
+PYSIDE_TEST(bug_660.py)
+PYSIDE_TEST(bug_662.py)
+PYSIDE_TEST(bug_667.py)
+PYSIDE_TEST(bug_668.py)
+PYSIDE_TEST(bug_674.py)
+PYSIDE_TEST(bug_675.py)
+PYSIDE_TEST(bug_688.py)
+PYSIDE_TEST(bug_696.py)
+PYSIDE_TEST(bug_693.py)
+PYSIDE_TEST(bug_714.py)
+PYSIDE_TEST(bug_716.py)
+PYSIDE_TEST(bug_722.py)
+PYSIDE_TEST(bug_728.py)
+PYSIDE_TEST(bug_736.py)
+PYSIDE_TEST(bug_740.py)
+PYSIDE_TEST(bug_743.py)
+PYSIDE_TEST(bug_750.py)
+PYSIDE_TEST(bug_778.py)
+PYSIDE_TEST(bug_785.py)
+PYSIDE_TEST(bug_793.py)
+PYSIDE_TEST(bug_811.py)
+PYSIDE_TEST(bug_834.py)
+PYSIDE_TEST(bug_836.py)
+PYSIDE_TEST(bug_844.py)
+PYSIDE_TEST(bug_854.py)
+PYSIDE_TEST(bug_860.py)
+PYSIDE_TEST(bug_862.py)
+PYSIDE_TEST(bug_871.py)
+PYSIDE_TEST(bug_879.py)
+PYSIDE_TEST(bug_882.py)
+PYSIDE_TEST(bug_919.py)
+PYSIDE_TEST(bug_921.py)
+PYSIDE_TEST(bug_941.py)
+PYSIDE_TEST(bug_964.py)
+PYSIDE_TEST(bug_967.py)
+PYSIDE_TEST(bug_972.py)
+PYSIDE_TEST(bug_979.py)
+PYSIDE_TEST(bug_988.py)
+PYSIDE_TEST(bug_991.py)
+PYSIDE_TEST(bug_998.py)
+PYSIDE_TEST(bug_1002.py)
+PYSIDE_TEST(bug_1006.py)
+PYSIDE_TEST(bug_1048.py)
+PYSIDE_TEST(bug_1077.py)
+PYSIDE_TEST(customproxywidget_test.py)
+PYSIDE_TEST(deepcopy_test.py)
+PYSIDE_TEST(event_filter_test.py)
+PYSIDE_TEST(float_to_int_implicit_conversion_test.py)
+PYSIDE_TEST(grandparent_method_test.py)
+PYSIDE_TEST(hashabletype_test.py)
+PYSIDE_TEST(keep_reference_test.py)
+PYSIDE_TEST(missing_symbols_test.py)
+PYSIDE_TEST(paint_event_test.py)
+PYSIDE_TEST(parent_method_test.py)
+PYSIDE_TEST(pyside_reload_test.py)
+PYSIDE_TEST(python_properties_test.py)
+PYSIDE_TEST(qabstracttextdocumentlayout_test.py)
+PYSIDE_TEST(qapplication_exit_segfault_test.py)
+PYSIDE_TEST(qapplication_singleton_test.py)
+PYSIDE_TEST(qapp_test.py)
+PYSIDE_TEST(qbrush_test.py)
+PYSIDE_TEST(qcolor_test.py)
+PYSIDE_TEST(qcolor_reduce_test.py)
+PYSIDE_TEST(qcursor_test.py)
+PYSIDE_TEST(qaction_test.py)
+PYSIDE_TEST(qdatastream_gui_operators_test.py)
+PYSIDE_TEST(qdynamic_signal.py)
+PYSIDE_TEST(qfontdialog_test.py)
+PYSIDE_TEST(qfontmetrics_test.py)
+PYSIDE_TEST(qformlayout_test.py)
+PYSIDE_TEST(qgraphicsitem_isblocked_test.py)
+PYSIDE_TEST(qgraphicsitem_test.py)
+PYSIDE_TEST(qgraphicsproxywidget_test.py)
+PYSIDE_TEST(qgraphicsscene_test.py)
+PYSIDE_TEST(qicon_test.py)
+PYSIDE_TEST(qimage_test.py)
+PYSIDE_TEST(qinputcontext_test.py)
+PYSIDE_TEST(qinputdialog_get_test.py)
+PYSIDE_TEST(qitemselection_test.py)
+PYSIDE_TEST(qlayout_ref_test.py)
+PYSIDE_TEST(qlayout_test.py)
+PYSIDE_TEST(qlcdnumber_test.py)
+PYSIDE_TEST(qlistwidget_test.py)
+PYSIDE_TEST(qlistwidgetitem_test.py)
+PYSIDE_TEST(qmainwindow_test.py)
+PYSIDE_TEST(qmatrix_test.py)
+PYSIDE_TEST(qmenuadd_test.py)
+PYSIDE_TEST(qmenu_test.py)
+PYSIDE_TEST(qobject_mi_test.py)
+PYSIDE_TEST(qpainter_test.py)
+PYSIDE_TEST(qpen_test.py)
+PYSIDE_TEST(qpicture_test.py)
+PYSIDE_TEST(qpixmap_test.py)
+PYSIDE_TEST(qpixmap_constructor.py)
+PYSIDE_TEST(qpixmapcache_test.py)
+PYSIDE_TEST(qpolygonf_test.py)
+PYSIDE_TEST(qpushbutton_test.py)
+PYSIDE_TEST(qkeysequence_test.py)
+PYSIDE_TEST(qradialgradient_test.py)
+PYSIDE_TEST(qregion_test.py)
+PYSIDE_TEST(qshortcut_test.py)
+PYSIDE_TEST(qsplitter_test.py)
+PYSIDE_TEST(qstandarditemmodel_test.py)
+PYSIDE_TEST(qstring_qkeysequence_test.py)
+PYSIDE_TEST(qstyle_test.py)
+PYSIDE_TEST(qtableview_test.py)
+PYSIDE_TEST(qtabwidget_test.py)
+PYSIDE_TEST(qtextdocument_undoredo_test.py)
+PYSIDE_TEST(qtextedit_test.py)
+PYSIDE_TEST(qtextedit_signal_test.py)
+PYSIDE_TEST(qtextline_test.py)
+PYSIDE_TEST(qtoolbar_test.py)
+PYSIDE_TEST(qtoolbox_test.py)
+PYSIDE_TEST(qtransform_test.py)
+PYSIDE_TEST(qvariant_test.py)
+PYSIDE_TEST(qvalidator_test.py)
+PYSIDE_TEST(qwidget_setlayout_test.py)
+PYSIDE_TEST(qwidget_test.py)
+PYSIDE_TEST(reference_count_test.py)
+PYSIDE_TEST(repr_test.py)
+PYSIDE_TEST(returnquadruplesofnumbers_test.py)
+PYSIDE_TEST(standardpixmap_test.py)
+PYSIDE_TEST(timed_app_test.py)
+PYSIDE_TEST(virtual_protected_inheritance_test.py)
+PYSIDE_TEST(virtual_pure_override_test.py)
+PYSIDE_TEST(wrong_return_test.py)
+
+if (${QTVERSION} VERSION_GREATER 4.6.9)
+    PYSIDE_TEST(bug_1091.py)
+endif()
+
+if(Q_WS_X11)
+    PYSIDE_TEST(x11_symbols_test.py)
+endif()
diff --git a/tests/QtGui/action_clear.py b/tests/QtGui/action_clear.py
new file mode 100644
index 0000000..54d5e93
--- /dev/null
+++ b/tests/QtGui/action_clear.py
@@ -0,0 +1,46 @@
+from PySide.QtGui import QMenu, QWidget, QMenuBar, QToolBar
+import weakref
+
+import unittest
+from helper import UsesQApplication
+
+
+class TestQActionLifeCycle(UsesQApplication):
+    def actionDestroyed(self, act):
+        self._actionDestroyed = True
+
+    def testMenu(self):
+        self._actionDestroyed = False
+        w = QWidget()
+        menu = QMenu(w)
+        act = menu.addAction("MENU")
+        _ref = weakref.ref(act, self.actionDestroyed)
+        act = None
+        self.assertFalse(self._actionDestroyed)
+        menu.clear()
+        self.assertTrue(self._actionDestroyed)
+
+    def testMenuBar(self):
+        self._actionDestroyed = False
+        w = QWidget()
+        menuBar = QMenuBar(w)
+        act = menuBar.addAction("MENU")
+        _ref = weakref.ref(act, self.actionDestroyed)
+        act = None
+        self.assertFalse(self._actionDestroyed)
+        menuBar.clear()
+        self.assertTrue(self._actionDestroyed)
+
+    def testToolBar(self):
+        self._actionDestroyed = False
+        w = QWidget()
+        toolBar = QToolBar(w)
+        act = toolBar.addAction("MENU")
+        _ref = weakref.ref(act, self.actionDestroyed)
+        act = None
+        self.assertFalse(self._actionDestroyed)
+        toolBar.clear()
+        self.assertTrue(self._actionDestroyed)
+
+if __name__ == "__main__":
+    unittest.main()
diff --git a/tests/qtgui/add_action_test.py b/tests/QtGui/add_action_test.py
similarity index 100%
rename from tests/qtgui/add_action_test.py
rename to tests/QtGui/add_action_test.py
diff --git a/tests/QtGui/api2_test.py b/tests/QtGui/api2_test.py
new file mode 100644
index 0000000..f7295ea
--- /dev/null
+++ b/tests/QtGui/api2_test.py
@@ -0,0 +1,58 @@
+'''Test cases for PySide API2 support'''
+
+
+import unittest
+import sys
+
+from PySide.QtGui import QWidget, QIntValidator, QSpinBox, QValidator, QApplication
+
+from helper import UsesQApplication
+
+class WidgetValidatorQInt(QWidget, QIntValidator):
+    def __init__(self, parent=None):
+        QWidget.__init__(self, parent)
+        QIntValidator.__init__(self, parent)
+
+class WidgetValidatorQSpinBox(QSpinBox):
+    def __init__(self, parent=None):
+        QSpinBox.__init__(self, parent)
+
+    def fixup(self, text):
+        print("It was called!")
+
+class DoubleQObjectInheritanceTest(UsesQApplication):
+
+    def testDouble(self):
+        '''Double inheritance from QObject classes'''
+
+        obj = WidgetValidatorQInt()
+
+        #QIntValidator methods
+        state, string, number = obj.validate('Test', 0)
+        self.assertEqual(state, QValidator.Invalid)
+        state, string, number = obj.validate('33', 0)
+        self.assertEqual(state, QValidator.Acceptable)
+
+    def testQSpinBox(self):
+        obj = WidgetValidatorQSpinBox()
+
+        obj.setRange(1, 10)
+        obj.setValue(0)
+        self.assertEqual(obj.value(), 1)
+
+class QClipboardTest(UsesQApplication):
+
+    def testQClipboard(self):
+        #skip this test on MacOS because the clipboard is not available during the ssh session
+        #this cause problems in the buildbot
+        if sys.platform == 'darwin':
+            return
+        clip = QApplication.clipboard()
+        clip.setText("Testing this thing!")
+
+        text, subtype = clip.text("")
+        self.assertEqual(subtype, "plain")
+        self.assertEqual(text, "Testing this thing!")
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/tests/QtGui/bug_1002.py b/tests/QtGui/bug_1002.py
new file mode 100644
index 0000000..9fc9df5
--- /dev/null
+++ b/tests/QtGui/bug_1002.py
@@ -0,0 +1,19 @@
+import unittest
+import sys
+from PySide.QtGui import QWidget, QPushButton
+
+from helper import UsesQApplication
+
+class TestBug1002 (UsesQApplication):
+    def testReturnWindow(self):
+        widget = QWidget()
+        button = QPushButton(widget)
+        self.assertEqual(sys.getrefcount(widget), 2)
+        window = button.window()
+        self.assertEqual(sys.getrefcount(widget), 3)
+        self.assertEqual(sys.getrefcount(window), 3)
+
+        del widget
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/tests/QtGui/bug_1006.py b/tests/QtGui/bug_1006.py
new file mode 100644
index 0000000..bb08bbf
--- /dev/null
+++ b/tests/QtGui/bug_1006.py
@@ -0,0 +1,83 @@
+import unittest
+import weakref
+import sys
+
+from PySide.QtCore import Qt
+from PySide.QtGui import QDialog, QLabel, QGridLayout, QHBoxLayout, QWidget
+
+from helper import TimedQApplication
+
+class LabelWindow(QDialog):
+    def __init__(self, parent):
+        super(LabelWindow, self).__init__(parent)
+
+        self.test_layout = QGridLayout()
+        label = QLabel("Label")
+        self.test_layout.addWidget(label, 0, 0)
+        self.setLayout(self.test_layout)
+        self._destroyCalled = False
+
+
+    def replace(self, unit):
+        old_item = self.test_layout.itemAtPosition(0, 0)
+        old_label = old_item.widget()
+        ref = weakref.ref(old_item, self._destroyed)
+
+        self.test_layout.removeWidget(old_label)
+        unit.assertRaises(RuntimeError, old_item.widget)
+        del old_item
+
+        label = QLabel("Label New")
+        old_label.deleteLater()
+        label.setAlignment(Qt.AlignCenter)
+        self.test_layout.addWidget(label, 0, 0)
+
+    def _destroyed(self, obj):
+        self._destroyCalled = True
+
+class TestBug1006 (TimedQApplication):
+
+    def testLayoutItemLifeTime(self):
+        window = LabelWindow(None)
+        window.replace(self)
+        self.assertTrue(window._destroyCalled)
+        self.app.exec_()
+
+    def testParentLayout(self):
+        def createLayout():
+            label = QLabel()
+            layout = QHBoxLayout()
+            layout.addWidget(label)
+
+            widget = QWidget()
+            widget.setLayout(layout)
+            return (layout, widget)
+        (layout, widget) = createLayout()
+        item = layout.itemAt(0)
+        self.assertTrue(isinstance(item.widget(), QWidget))
+
+    def testRemoveOrphanWidget(self):
+        widget = QLabel()
+        layout = QHBoxLayout()
+        layout.addWidget(widget)
+        self.assertEqual(sys.getrefcount(widget), 3)
+
+        layout.removeWidget(widget)
+        widget.setObjectName("MyWidget")
+        self.assertEqual(sys.getrefcount(widget), 2)
+
+    def testRemoveChildWidget(self):
+        parent = QLabel()
+        widget = QLabel(parent)
+        self.assertEqual(sys.getrefcount(widget), 3)
+
+        layout = QHBoxLayout()
+        layout.addWidget(widget)
+        self.assertEqual(sys.getrefcount(widget), 3)
+
+        layout.removeWidget(widget)
+        widget.setObjectName("MyWidget")
+        self.assertEqual(sys.getrefcount(widget), 3)
+
+if __name__ == "__main__":
+    unittest.main()
diff --git a/tests/QtGui/bug_1048.py b/tests/QtGui/bug_1048.py
new file mode 100644
index 0000000..222c3a6
--- /dev/null
+++ b/tests/QtGui/bug_1048.py
@@ -0,0 +1,8 @@
+from PySide import QtGui
+
+a = QtGui.QApplication([])
+
+w = QtGui.QWidget()
+l = QtGui.QGridLayout(w)
+
+l.itemAtPosition(0, 0)
diff --git a/tests/QtGui/bug_1077.py b/tests/QtGui/bug_1077.py
new file mode 100644
index 0000000..231ce1e
--- /dev/null
+++ b/tests/QtGui/bug_1077.py
@@ -0,0 +1,17 @@
+''' unit test for BUG #1077 '''
+
+from PySide import QtCore, QtGui
+import time
+
+class Highlighter(QtGui.QSyntaxHighlighter):
+    def __init__(self, parent, mode):
+        QtGui.QSyntaxHighlighter.__init__(self, parent)
+        self.tstamp = time.time()
+
+if __name__ == "__main__":
+    app = QtGui.QApplication([])
+    python = QtGui.QTextEdit()
+    python.setWindowTitle("python")
+    hl = Highlighter(python.document(), "python")
+    python.show()
+    text = hl.document()
diff --git a/tests/QtGui/bug_1091.py b/tests/QtGui/bug_1091.py
new file mode 100644
index 0000000..b58d26f
--- /dev/null
+++ b/tests/QtGui/bug_1091.py
@@ -0,0 +1,12 @@
+''' unit test for BUG #1091 '''
+
+import unittest
+from PySide import QtGui
+
+class QPainterTestCase(unittest.TestCase):
+    def testIt(self):
+        self.assertTrue("PixmapFragment" in dir(QtGui.QPainter))
+        self.assertTrue("drawPixmapFragments" in dir(QtGui.QPainter))
+
+if __name__ == "__main__":
+    unittest.main()
diff --git a/tests/QtGui/bug_172.py b/tests/QtGui/bug_172.py
new file mode 100644
index 0000000..d14c94c
--- /dev/null
+++ b/tests/QtGui/bug_172.py
@@ -0,0 +1,13 @@
+from PySide.QtGui import *
+
+if __name__ == '__main__':
+    app = QApplication([])
+
+    wdg = QWidget()
+
+    hbox = QHBoxLayout()
+
+    vbox = QVBoxLayout()
+    vbox.addLayout(hbox)
+
+    wdg.setLayout(vbox)
diff --git a/tests/QtGui/bug_243.py b/tests/QtGui/bug_243.py
new file mode 100644
index 0000000..eb9f9d6
--- /dev/null
+++ b/tests/QtGui/bug_243.py
@@ -0,0 +1,18 @@
+
+''' Test bug 243: http://bugs.openbossa.org/show_bug.cgi?id=243'''
+
+import unittest
+import sys
+
+from PySide.QtGui import QApplication, QMainWindow, QLayout
+
+class QAppPresence(unittest.TestCase):
+
+    def testBug(self):
+        app = QApplication(sys.argv)
+        window = QMainWindow()
+        l = window.layout()
+        self.assert_(isinstance(l, QLayout))
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/tests/QtGui/bug_300_test.py b/tests/QtGui/bug_300_test.py
new file mode 100644
index 0000000..ec02cdf
--- /dev/null
+++ b/tests/QtGui/bug_300_test.py
@@ -0,0 +1,17 @@
+from PySide.QtGui import QStringListModel
+from PySide.QtCore import QModelIndex
+import unittest
+
+class TestQAbstractItemModelSignals(unittest.TestCase):
+    def sigCallback(self, index, r, c):
+        self._called = True
+
+    def testSignals(self):
+        self._called = False
+        m = QStringListModel()
+        m.rowsAboutToBeInserted[QModelIndex,int,int].connect(self.sigCallback)
+        m.insertRows(0, 3)
+        self.assert_(self._called)
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/tests/QtGui/bug_307.py b/tests/QtGui/bug_307.py
new file mode 100644
index 0000000..1a4446b
--- /dev/null
+++ b/tests/QtGui/bug_307.py
@@ -0,0 +1,27 @@
+
+import unittest
+import colorsys
+
+from PySide.QtCore import SIGNAL
+from PySide.QtGui import QPushButton, QApplication
+
+
+class Test (QApplication) :
+    def __init__(self, argv) :
+        super(Test, self).__init__(argv)
+        self._called = False
+        
+    def called(self):
+        self._called = True        
+
+
+class QApplicationSignalsTest(unittest.TestCase):
+    def testQuit(self):
+        app = Test([])
+        button = QPushButton("BUTTON")
+        app.connect(button, SIGNAL("clicked()"), app.called)
+        button.click()
+        self.assert_(app._called)
+        
+if __name__ == '__main__':
+    unittest.main()
diff --git a/tests/QtGui/bug_324.py b/tests/QtGui/bug_324.py
new file mode 100644
index 0000000..9777b73
--- /dev/null
+++ b/tests/QtGui/bug_324.py
@@ -0,0 +1,32 @@
+''' Test bug 324: http://bugs.openbossa.org/show_bug.cgi?id=324'''
+
+import unittest
+import sys
+import signal
+from PySide.QtCore import *
+from PySide.QtGui import *
+
+class QBug( QObject ):
+    def __init__(self, parent = None):
+        QObject.__init__(self, parent)
+
+    def check(self):
+        self.done.emit("abc")
+
+    done = Signal(str)
+
+class Bug324(unittest.TestCase):
+
+    def on_done(self, val):
+        self.value = val
+
+    def testBug(self):
+        app = QApplication([])
+        bug = QBug()
+        self.value = ''
+        bug.done.connect(self.on_done)
+        bug.check()
+        self.assertEqual(self.value, 'abc')
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/tests/QtGui/bug_338.py b/tests/QtGui/bug_338.py
new file mode 100644
index 0000000..a419fdb
--- /dev/null
+++ b/tests/QtGui/bug_338.py
@@ -0,0 +1,24 @@
+''' Test bug 338: http://bugs.openbossa.org/show_bug.cgi?id=338'''
+
+import sys
+import unittest
+from PySide import QtCore,QtGui
+
+class DiagramItem(QtGui.QGraphicsPolygonItem):
+    def __init__(self, parent=None, scene=None):
+        super(DiagramItem, self).__init__(parent, scene)
+
+    def itemChange(self, change, value):
+        return value
+
+
+class BugTest(unittest.TestCase):
+    def test(self):
+        app = QtGui.QApplication(sys.argv)
+        scene = QtGui.QGraphicsScene()
+        item = DiagramItem()
+        item2 = DiagramItem()
+        #this cause segfault 
+        scene.addItem(item)
+        scene.addItem(item2)
+  
diff --git a/tests/QtGui/bug_363.py b/tests/QtGui/bug_363.py
new file mode 100644
index 0000000..5ba5dee
--- /dev/null
+++ b/tests/QtGui/bug_363.py
@@ -0,0 +1,25 @@
+''' Test bug 363: http://bugs.openbossa.org/show_bug.cgi?id=363'''
+
+import sys
+import unittest
+from helper import UsesQApplication
+from PySide import QtCore,QtGui
+
+# Check for desktop object lifetime
+class BugTest(UsesQApplication):
+    def mySlot(self):
+        pass
+
+    # test if it is possible to connect with a desktop object after storing that on an auxiliar variable
+    def testCase1(self):
+        desktop = QtGui.QApplication.desktop()
+        desktop.resized[int].connect(self.mySlot)
+        self.assert_(True)
+
+    # test if it is possible to connect with a desktop object without storing that on an auxiliar variable
+    def testCase2(self):
+        QtGui.QApplication.desktop().resized[int].connect(self.mySlot)
+        self.assert_(True)
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/tests/QtGui/bug_367.py b/tests/QtGui/bug_367.py
new file mode 100644
index 0000000..b27a552
--- /dev/null
+++ b/tests/QtGui/bug_367.py
@@ -0,0 +1,22 @@
+''' Test bug 367: http://bugs.openbossa.org/show_bug.cgi?id=367'''
+
+import sys
+import unittest
+from helper import UsesQApplication
+from PySide import QtCore,QtGui
+
+class BugTest(UsesQApplication):
+    def testCase(self):
+        model = QtGui.QStandardItemModel()
+        parentItem = model.invisibleRootItem()
+        for i in range(10):
+            item = QtGui.QStandardItem()
+            rcount =  sys.getrefcount(item)
+            parentItem.appendRow(item)
+            self.assertEqual(rcount+1, sys.getrefcount(item))
+            parentItem = item
+
+        self.assert_(True)
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/tests/QtGui/bug_389.py b/tests/QtGui/bug_389.py
new file mode 100644
index 0000000..b01019a
--- /dev/null
+++ b/tests/QtGui/bug_389.py
@@ -0,0 +1,15 @@
+''' Test bug 389: http://bugs.openbossa.org/show_bug.cgi?id=389'''
+
+import sys
+import unittest
+from helper import UsesQApplication
+from PySide import QtCore,QtGui
+
+class BugTest(UsesQApplication):
+    def testCase(self):
+        s = QtGui.QWidget().style()
+        i = s.standardIcon(QtGui.QStyle.SP_TitleBarMinButton)
+        self.assertEqual(type(i), QtGui.QIcon)
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/tests/QtGui/bug_400.py b/tests/QtGui/bug_400.py
new file mode 100644
index 0000000..1039797
--- /dev/null
+++ b/tests/QtGui/bug_400.py
@@ -0,0 +1,26 @@
+''' Test bug 400: http://bugs.openbossa.org/show_bug.cgi?id=400'''
+
+import unittest
+from helper import UsesQApplication
+from PySide.QtGui import QTreeWidgetItemIterator, QTreeWidgetItem, QTreeWidget
+
+class BugTest(UsesQApplication):
+    def testCase(self):
+        treeWidget = QTreeWidget()
+        treeWidget.setColumnCount(1)
+        items = []
+        for i in range(10):
+            items.append(QTreeWidgetItem(None, ["item: %i" % i]))
+
+        treeWidget.insertTopLevelItems(0, items);
+        _iter = QTreeWidgetItemIterator(treeWidget)
+        index = 0
+        while(_iter.value()):
+            item = _iter.value()
+            self.assert_(item is items[index])
+            index += 1
+            _iter += 1
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/tests/QtGui/bug_416.py b/tests/QtGui/bug_416.py
new file mode 100644
index 0000000..20b8d0c
--- /dev/null
+++ b/tests/QtGui/bug_416.py
@@ -0,0 +1,43 @@
+#!/usr/bin/python
+
+import unittest
+from helper import TimedQApplication
+from PySide.QtCore import QSignalTransition, QState, Qt, QStateMachine
+from PySide.QtGui import QCheckBox
+
+class CheckedTransition(QSignalTransition):
+    def __init__(self, check):
+        QSignalTransition.__init__(self, check.stateChanged[int])
+        self.eventTested = False
+
+    def eventTest(self, event):
+        self.eventTested = True
+        if not QSignalTransition.eventTest(self, event):
+            return False
+        return event.arguments()[0] == Qt.Checked
+
+class TestBug(TimedQApplication):
+    def testCase(self):
+        check = QCheckBox()
+        check.setTristate(True)
+
+        s1 = QState()
+        s2 = QState()
+
+        t1 = CheckedTransition(check)
+        t1.setTargetState(s2)
+        s1.addTransition(t1)
+
+        machine = QStateMachine()
+        machine.addState(s1)
+        machine.addState(s2)
+        machine.setInitialState(s1)
+        machine.start()
+
+        check.stateChanged[int].emit(1)
+        check.show()
+        self.app.exec_()
+        self.assert_(t1.eventTested)
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/tests/QtGui/bug_429.py b/tests/QtGui/bug_429.py
new file mode 100644
index 0000000..f49d244
--- /dev/null
+++ b/tests/QtGui/bug_429.py
@@ -0,0 +1,10 @@
+from PySide.QtCore import *
+from PySide.QtGui import *
+import sys
+
+app = QApplication(sys.argv)
+scene = QGraphicsScene()
+label = QLabel("hello world")
+label.show()
+QTimer.singleShot(0, label.close)
+exit(app.exec_())
diff --git a/tests/QtGui/bug_430.py b/tests/QtGui/bug_430.py
new file mode 100644
index 0000000..8baa7c1
--- /dev/null
+++ b/tests/QtGui/bug_430.py
@@ -0,0 +1,14 @@
+import sys
+from PySide.QtCore import *
+from PySide.QtGui import *
+
+class ListModel(QAbstractListModel):
+    def rowCount(self, parent = QModelIndex()):
+        return 0
+
+app = QApplication([])
+model = ListModel()
+v = QListView()
+v.setModel(model)
+QTimer.singleShot(0, v.close)
+app.exec_()
diff --git a/tests/QtGui/bug_433.py b/tests/QtGui/bug_433.py
new file mode 100644
index 0000000..97d897e
--- /dev/null
+++ b/tests/QtGui/bug_433.py
@@ -0,0 +1,14 @@
+from PySide import QtCore, QtGui
+import sys
+
+class Test(QtGui.QGraphicsView):
+    def __init__(self, parent=None):
+        super(Test, self).__init__(parent)
+        self.s = QtGui.QGraphicsScene()
+        self.setScene(self.s)
+
+a = QtGui.QApplication(sys.argv)
+t = Test()
+t.show()
+QtCore.QTimer.singleShot(0, t.close)
+sys.exit(a.exec_())
diff --git a/tests/QtGui/bug_467.py b/tests/QtGui/bug_467.py
new file mode 100644
index 0000000..5c5af4b
--- /dev/null
+++ b/tests/QtGui/bug_467.py
@@ -0,0 +1,19 @@
+''' Test bug 367: http://bugs.openbossa.org/show_bug.cgi?id=467'''
+
+import unittest
+from helper import UsesQApplication
+from PySide.QtGui import QMainWindow, QApplication
+
+class MyWidget(QMainWindow):
+    def __init__(self, parent = None):
+        QMainWindow.__init__(self, parent)
+
+
+class BugTest(UsesQApplication):
+    def testCase(self):
+        w = MyWidget()
+        widgets = QApplication.allWidgets()
+        self.assert_(w in widgets)
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/tests/QtGui/bug_480.py b/tests/QtGui/bug_480.py
new file mode 100644
index 0000000..bb28f36
--- /dev/null
+++ b/tests/QtGui/bug_480.py
@@ -0,0 +1,25 @@
+import unittest
+
+from PySide import QtGui
+
+class BuggyWidget(QtGui.QWidget):
+    def setup(self):
+        self.verticalLayout = QtGui.QVBoxLayout(self)
+        self.gridLayout = QtGui.QGridLayout()
+        self.lbl = QtGui.QLabel(self)
+        self.gridLayout.addWidget(self.lbl, 0, 1, 1, 1)
+
+        # this cause a segfault during the ownership transfer
+        self.verticalLayout.addLayout(self.gridLayout)
+
+class LayoutTransferOwnerShip(unittest.TestCase):
+    def testBug(self):
+        app = QtGui.QApplication([])
+        w = BuggyWidget()
+        w.setup()
+        w.show()
+        self.assert_(True)
+
+if __name__ == '__main__':
+    unittest.main()
+
diff --git a/tests/QtGui/bug_493.py b/tests/QtGui/bug_493.py
new file mode 100644
index 0000000..ba68175
--- /dev/null
+++ b/tests/QtGui/bug_493.py
@@ -0,0 +1,22 @@
+from PySide.QtCore import Qt, QEvent
+from PySide.QtGui import QApplication, QKeyEvent, QKeySequence
+import unittest
+
+
+class TestBug569(unittest.TestCase):
+
+    def testIt(self):
+        # We need a qapp otherwise Qt will crash when trying to detect the
+        # current platform
+        app = QApplication([])
+        ev1 = QKeyEvent(QEvent.KeyRelease, Qt.Key_Delete, Qt.NoModifier)
+        ev2 = QKeyEvent(QEvent.KeyRelease, Qt.Key_Copy, Qt.NoModifier)
+        ks = QKeySequence.Delete
+
+        self.assertEqual(ev1, ks)
+        self.assertEqual(ks, ev1)
+        self.assertNotEqual(ev2, ks)
+        self.assertNotEqual(ks, ev2)
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/tests/QtGui/bug_500.py b/tests/QtGui/bug_500.py
new file mode 100644
index 0000000..8611495
--- /dev/null
+++ b/tests/QtGui/bug_500.py
@@ -0,0 +1,15 @@
+#!/usr/bin/python
+
+import unittest
+
+from PySide.QtCore import *
+from PySide.QtGui import *
+from helper import UsesQApplication
+
+class NeverDiesTest(UsesQApplication):
+
+    def testIt(self):
+        QPrintDialog()
+
+if __name__ == "__main__":
+    unittest.main()
diff --git a/tests/QtGui/bug_512.py b/tests/QtGui/bug_512.py
new file mode 100644
index 0000000..386a7f9
--- /dev/null
+++ b/tests/QtGui/bug_512.py
@@ -0,0 +1,22 @@
+''' Test bug 512: http://bugs.openbossa.org/show_bug.cgi?id=512'''
+
+import unittest
+from helper import UsesQApplication
+from PySide.QtCore import *
+from PySide.QtGui import *
+
+class BugTest(UsesQApplication):
+    def testCase(self):
+        w = QWidget(None)
+        lbl = QLabel("Hello", w);
+        g = QGridLayout()
+        g.addWidget(lbl, 0, 0)
+        w.setLayout(g)
+        w.show()
+
+        t = g.getItemPosition(0)
+        self.assertEqual(type(t), tuple)
+        self.assertEqual(t, (0,0,1,1))
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/tests/QtGui/bug_525.py b/tests/QtGui/bug_525.py
new file mode 100644
index 0000000..5e146eb
--- /dev/null
+++ b/tests/QtGui/bug_525.py
@@ -0,0 +1,21 @@
+import unittest
+from PySide.QtGui import QApplication
+from PySide.QtGui import QMenu
+
+class M2(QMenu):
+    def __init__(self,parent=None):
+        super(M2,self).__init__(parent)
+        self.setTitle(self.tr("M2"))
+
+class TestMenuDerivedClass(unittest.TestCase):
+    def aboutToShowHandler(self):
+        pass
+
+    def testConnectSignal(self):
+        app = QApplication([])
+        m2 = M2()
+        # Test if the aboutToShow signal was translated to correct type
+        m2.aboutToShow.connect(self.aboutToShowHandler)
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/tests/QtGui/bug_546.py b/tests/QtGui/bug_546.py
new file mode 100644
index 0000000..845b64e
--- /dev/null
+++ b/tests/QtGui/bug_546.py
@@ -0,0 +1,14 @@
+import unittest
+from PySide.QtGui import *
+
+class TestBug546(unittest.TestCase):
+
+    """Test to check a crash at exit"""
+    def testIt(self):
+        app = QApplication([])
+        textEdit = QPlainTextEdit()
+        completer = QCompleter(("foo", "bar"), textEdit)
+        completer.setWidget(textEdit)
+
+if __name__=='__main__':
+    unittest.main()
diff --git a/tests/QtGui/bug_547.py b/tests/QtGui/bug_547.py
new file mode 100644
index 0000000..6b65254
--- /dev/null
+++ b/tests/QtGui/bug_547.py
@@ -0,0 +1,56 @@
+""" Unittest for bug #547 """
+""" http://bugs.openbossa.org/show_bug.cgi?id=547 """
+
+from PySide import QtGui
+import sys
+import unittest
+
+class MyMainWindow(unittest.TestCase):
+    app = QtGui.QApplication(sys.argv)
+    def testCase1(self):
+        self._tree = QtGui.QTreeWidget()
+        self._tree.setColumnCount(2)
+        self._i1 = None
+        self._i11 = None
+
+        self._updateTree()
+        self.assertEqual(sys.getrefcount(self._i1), 3)
+        self.assertEqual(sys.getrefcount(self._i11), 3)
+
+        self._i11.parent().setExpanded(True)
+        self._i11.setExpanded(True)
+
+        self._updateTree()
+        self.assertEqual(sys.getrefcount(self._i1), 3)
+        self.assertEqual(sys.getrefcount(self._i11), 3)
+
+    def testCase2(self):
+        self._tree = QtGui.QTreeWidget()
+        self._tree.setColumnCount(2)
+        self._i1 = None
+        self._i11 = None
+
+        self._updateTree()
+        self.assertEqual(sys.getrefcount(self._i1), 3)
+        self.assertEqual(sys.getrefcount(self._i11), 3)
+
+        self._i11.parent().setExpanded(True)
+        self._i11.setExpanded(True)
+
+        self.assertEqual(sys.getrefcount(self._i1), 3)
+        self.assertEqual(sys.getrefcount(self._i11), 3)
+
+    def _updateTree(self):
+        self._tree.clear()
+        if self._i1 and self._i11:
+            self.assertEqual(sys.getrefcount(self._i1), 2)
+            self.assertEqual(sys.getrefcount(self._i11), 2)
+
+        self._i1 = QtGui.QTreeWidgetItem(self._tree, ['1', ])
+        self.assertEqual(sys.getrefcount(self._i1), 3)
+        self._i11 = QtGui.QTreeWidgetItem(self._i1, ['11', ])
+        self.assertEqual(sys.getrefcount(self._i11), 3)
+
+if __name__ == '__main__':
+    unittest.main()
+
diff --git a/tests/QtGui/bug_549.py b/tests/QtGui/bug_549.py
new file mode 100644
index 0000000..6d07899
--- /dev/null
+++ b/tests/QtGui/bug_549.py
@@ -0,0 +1,16 @@
+import unittest
+
+from PySide.QtGui import *
+
+class TestBug549(unittest.TestCase):
+    def testBug(self):
+        app = QApplication([])
+        w = QGraphicsWidget()
+        w.setContentsMargins(1, 2, 3, 4)
+        self.assertEquals(w.getContentsMargins(), (1, 2, 3, 4))
+        w.setWindowFrameMargins(5, 6, 7, 8)
+        self.assertEquals(w.getWindowFrameMargins(), (5, 6, 7, 8))
+
+if __name__ == '__main__':
+    unittest.main()
+
diff --git a/tests/QtGui/bug_569.py b/tests/QtGui/bug_569.py
new file mode 100644
index 0000000..c31a4ca
--- /dev/null
+++ b/tests/QtGui/bug_569.py
@@ -0,0 +1,19 @@
+from PySide.QtCore import *
+from PySide.QtGui import *
+import unittest
+
+
+class TestBug569(unittest.TestCase):
+
+    def testIt(self):
+        types = (QTableWidgetItem, QListWidgetItem, QTreeWidgetItem)
+        for t in types:
+            a = t()
+            a.__lt__ = lambda other : True
+            b = t()
+            b.__lt__ = lambda other : False
+            self.assertTrue(a < b)
+            self.assertFalse(b < a)
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/tests/QtGui/bug_575.py b/tests/QtGui/bug_575.py
new file mode 100644
index 0000000..e5d34d7
--- /dev/null
+++ b/tests/QtGui/bug_575.py
@@ -0,0 +1,20 @@
+""" Unittest for bug #575 """
+""" http://bugs.openbossa.org/show_bug.cgi?id=575 """
+
+from PySide.QtGui import QApplication, QPlainTextEdit, QTextEdit
+import sys
+import unittest
+
+class Bug575(unittest.TestCase):
+    def testPropertyValues(self):
+        app = QApplication(sys.argv)
+        textEdit = QPlainTextEdit()
+        textEdit.insertPlainText("PySide INdT")
+        selection = QTextEdit.ExtraSelection()
+        selection.cursor = textEdit.textCursor()
+        selection.cursor.setPosition(2)
+        self.assertEqual(selection.cursor.position(), 2)
+
+if __name__ == '__main__':
+    unittest.main()
+
diff --git a/tests/QtGui/bug_576.py b/tests/QtGui/bug_576.py
new file mode 100644
index 0000000..e66e109
--- /dev/null
+++ b/tests/QtGui/bug_576.py
@@ -0,0 +1,33 @@
+""" Unittest for bug #576 """
+""" http://bugs.openbossa.org/show_bug.cgi?id=576 """
+
+from PySide import QtGui, QtCore
+import sys
+import unittest
+
+class Bug576(unittest.TestCase):
+    def onButtonDestroyed(self, button):
+        self._destroyed = True
+        self.assert_(isinstance(button, QtGui.QPushButton))
+
+    def testWidgetParent(self):
+        self._destroyed = False
+        app = QtGui.QApplication(sys.argv)
+        w = QtGui.QWidget()
+
+        b = QtGui.QPushButton("test")
+        b.destroyed[QtCore.QObject].connect(self.onButtonDestroyed)
+        self.assertEqual(sys.getrefcount(b), 2)
+        b.setParent(w)
+        self.assertEqual(sys.getrefcount(b), 3)
+        b.parent()
+        self.assertEqual(sys.getrefcount(b), 3)
+        b.setParent(None)
+        self.assertEqual(sys.getrefcount(b), 2)
+        del b
+        self.assert_(self._destroyed)
+
+
+if __name__ == '__main__':
+    unittest.main()
+
diff --git a/tests/QtGui/bug_585.py b/tests/QtGui/bug_585.py
new file mode 100644
index 0000000..7c37150
--- /dev/null
+++ b/tests/QtGui/bug_585.py
@@ -0,0 +1,26 @@
+'''Test bug 585: http://bugs.openbossa.org/show_bug.cgi?id=585'''
+
+from PySide import QtCore ,QtGui
+import sys
+import unittest
+
+
+class Bug585(unittest.TestCase):
+    def testCase(self):
+        app = QtGui.QApplication([])
+        self._tree = QtGui.QTreeWidget()
+        self._tree.setColumnCount(2)
+        i1 = QtGui.QTreeWidgetItem(self._tree, ['1', ])
+        i2 = QtGui.QTreeWidgetItem(self._tree, ['2', ])
+        refCount = sys.getrefcount(i1)
+
+        # this function return None
+        # because the topLevelItem does not has a parent item
+        # but still have a TreeWidget as a parent
+        self._tree.topLevelItem(0).parent()
+
+        self.assertEqual(refCount, sys.getrefcount(i1))
+
+if __name__ == '__main__':
+    unittest.main()
+
diff --git a/tests/QtGui/bug_589.py b/tests/QtGui/bug_589.py
new file mode 100644
index 0000000..0c7cdec
--- /dev/null
+++ b/tests/QtGui/bug_589.py
@@ -0,0 +1,19 @@
+# trimmed down diagramscene.py to demonstrate crash in sizeHint()
+
+import sys
+from PySide import QtCore, QtGui
+import unittest
+
+class CustomWidget(QtGui.QGraphicsProxyWidget):
+   def itemChange(self, eventType, value):
+      QtGui.QGraphicsProxyWidget.itemChange(self, eventType, value)
+
+class Bug589(unittest.TestCase):
+   def testCase(self):
+      widget = QtGui.QGraphicsProxyWidget()
+      custom = CustomWidget()
+      custom.setParentItem(widget)
+
+if __name__ == "__main__":
+   app = QtGui.QApplication(sys.argv)
+   unittest.main()
diff --git a/tests/QtGui/bug_606.py b/tests/QtGui/bug_606.py
new file mode 100644
index 0000000..0fe1bde
--- /dev/null
+++ b/tests/QtGui/bug_606.py
@@ -0,0 +1,26 @@
+import unittest
+
+import PySide
+from PySide.QtGui import QVector2D, QVector3D, QVector4D
+from PySide.QtGui import QColor
+
+class testCases(unittest.TestCase):
+    def testQVector2DToTuple(self):
+        vec = QVector2D(1, 2)
+        self.assertEqual((1, 2), vec.toTuple())
+
+    def testQVector3DToTuple(self):
+        vec = QVector3D(1, 2, 3)
+        self.assertEqual((1, 2, 3), vec.toTuple())
+
+    def testQVector4DToTuple(self):
+        vec = QVector4D(1, 2, 3, 4)
+        self.assertEqual((1, 2, 3, 4), vec.toTuple())
+
+    def testQColorToTuple(self):
+        c = QColor(0, 0, 255)
+        c.setRgb(1, 2, 3)
+        self.assertEqual((1, 2, 3, 255), c.toTuple())
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/tests/QtGui/bug_617.py b/tests/QtGui/bug_617.py
new file mode 100644
index 0000000..fc8952f
--- /dev/null
+++ b/tests/QtGui/bug_617.py
@@ -0,0 +1,21 @@
+from PySide.QtCore import QEvent
+from PySide.QtGui import QColor
+import unittest
+
+class MyEvent(QEvent):
+    def __init__(self):
+        QEvent.__init__(self, QEvent.Type(999))
+
+
+class Bug617(unittest.TestCase):
+    def testRepr(self):
+        c = QColor.fromRgb(1, 2, 3, 4)
+        s = c.spec()
+        self.assertEqual(repr(s), repr(QColor.Rgb))
+
+    def testOutOfBounds(self):
+        e = MyEvent()
+        self.assertEqual(repr(e.type()), 'PySide.QtCore.QEvent.Type(999)')
+
+if __name__ == "__main__":
+   unittest.main()
diff --git a/tests/QtGui/bug_632.py b/tests/QtGui/bug_632.py
new file mode 100644
index 0000000..e189393
--- /dev/null
+++ b/tests/QtGui/bug_632.py
@@ -0,0 +1,20 @@
+import sys
+from PySide.QtGui import QLineEdit, QApplication
+import unittest
+
+
+class Bug589(unittest.TestCase):
+    def testWrongSignature(self):
+        text = QLineEdit("PySide bug 632")
+        a = b = c = d = 0
+        self.assertRaises(TypeError, text.getTextMargins, (a, b, c, d))
+
+    def testTupleReturn(self):
+        text = QLineEdit("PySide bug 632")
+        text.setTextMargins(10, 20, 30, 40)
+        (a, b, c, d) = text.getTextMargins()
+        self.assert_((a, b, c, d), (10, 20, 30, 40))
+
+if __name__ == "__main__":
+   app = QApplication(sys.argv)
+   unittest.main()
diff --git a/tests/QtGui/bug_635.py b/tests/QtGui/bug_635.py
new file mode 100644
index 0000000..5f483e5
--- /dev/null
+++ b/tests/QtGui/bug_635.py
@@ -0,0 +1,28 @@
+''' Test bug 635: http://bugs.openbossa.org/show_bug.cgi?id=635'''
+
+import unittest
+from PySide.QtGui import QApplication, QToolBar, QIcon
+import sys
+
+class testQToolBar(unittest.TestCase):
+    def callback(self):
+        self._called = True
+
+    def testAddAction(self):
+        bar = QToolBar()
+        self._called = False
+        a = bar.addAction("act1", self.callback)
+        a.trigger()
+        self.assert_(self._called)
+
+    def testAddActionWithIcon(self):
+        bar = QToolBar()
+        self._called = False
+        icon = QIcon()
+        a = bar.addAction(icon, "act1", self.callback)
+        a.trigger()
+        self.assert_(self._called)
+
+if __name__ == '__main__':
+    app = QApplication(sys.argv)
+    unittest.main()
diff --git a/tests/QtGui/bug_640.py b/tests/QtGui/bug_640.py
new file mode 100644
index 0000000..4b19bb4
--- /dev/null
+++ b/tests/QtGui/bug_640.py
@@ -0,0 +1,11 @@
+import sys
+from PySide.QtGui import *
+import unittest
+
+class Bug640(unittest.TestCase):
+    def testIt(self):
+        option = QStyleOptionGraphicsItem()
+        a = option.state # crash!?
+
+if __name__ == "__main__":
+   unittest.main()
diff --git a/tests/QtGui/bug_652.py b/tests/QtGui/bug_652.py
new file mode 100644
index 0000000..438fdbd
--- /dev/null
+++ b/tests/QtGui/bug_652.py
@@ -0,0 +1,30 @@
+import unittest
+from PySide.QtGui import *
+
+class MyData(QTextBlockUserData):
+    def __init__(self, data):
+        QTextBlockUserData.__init__(self)
+        self.data = data
+
+    def getMyNiceData(self):
+        return self.data
+
+class TestBug652(unittest.TestCase):
+    """Segfault when using QTextBlock::setUserData due to missing ownership transfer"""
+    def testIt(self):
+        td = QTextDocument()
+        tc = QTextCursor(td)
+        tc.insertText("Hello world")
+        heyHo = "hey ho!"
+        tc.block().setUserData(MyData(heyHo))
+        self.assertEqual(type(tc.block().userData()), MyData)
+        self.assertEqual(tc.block().userData().getMyNiceData(), heyHo)
+
+        del tc
+        tc = QTextCursor(td)
+        blk = tc.block()
+        self.assertEqual(type(blk.userData()), MyData)
+        self.assertEqual(blk.userData().getMyNiceData(), heyHo)
+
+if __name__ == "__main__":
+    unittest.main()
\ No newline at end of file
diff --git a/tests/QtGui/bug_653.py b/tests/QtGui/bug_653.py
new file mode 100644
index 0000000..fdca31a
--- /dev/null
+++ b/tests/QtGui/bug_653.py
@@ -0,0 +1,17 @@
+import unittest
+from PySide.QtCore import *
+from PySide.QtGui import *
+
+class TestBug653(unittest.TestCase):
+    """Crash after calling QWizardPage.wizard()"""
+    def testIt(self):
+        app = QApplication([])
+
+        wizard = QWizard()
+        page = QWizardPage()
+        wizard.addPage(page)
+        page.wizard() # crash here if the bug still exists due to a circular dependency
+        wizard.show()
+
+if __name__ == "__main__":
+    unittest.main()
\ No newline at end of file
diff --git a/tests/QtGui/bug_660.py b/tests/QtGui/bug_660.py
new file mode 100644
index 0000000..b97217f
--- /dev/null
+++ b/tests/QtGui/bug_660.py
@@ -0,0 +1,27 @@
+import unittest
+import py3kcompat as py3k
+from PySide.QtGui import QStandardItemModel, QStandardItem
+
+class MyItemModel(QStandardItemModel):
+    def __init__(self,parent=None):
+        super(MyItemModel,self).__init__(parent)
+        self.appendRow([QStandardItem('Item 1'),])
+
+    def mimeTypes(self):
+        mtypes = super(MyItemModel,self).mimeTypes()
+        mtypes.append(py3k.unicode_('application/my-form'))
+        return mtypes
+
+    def mimeData(self,indexes):
+        self.__mimedata = super(MyItemModel,self).mimeData(indexes)
+        self.__mimedata.setData(py3k.unicode_('application/my-form'), 'hi')
+        return self.__mimedata
+
+class TestBug660(unittest.TestCase):
+    '''QMimeData type deleted prematurely when overriding mime-type in QStandardItemModel drag and drop'''
+    def testIt(self):
+        model = MyItemModel()
+        model.mimeData([model.index(0, 0)]) # if it doesn't raise an exception it's all right!
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/tests/QtGui/bug_662.py b/tests/QtGui/bug_662.py
new file mode 100644
index 0000000..0b2c1fe
--- /dev/null
+++ b/tests/QtGui/bug_662.py
@@ -0,0 +1,28 @@
+''' Test bug 662: http://bugs.openbossa.org/show_bug.cgi?id=662'''
+
+import unittest
+from PySide.QtGui import QTextEdit, QApplication, QTextCharFormat
+import sys
+
+class testQTextBlock(unittest.TestCase):
+    def tesIterator(self):
+        edit = QTextEdit()
+        cursor = edit.textCursor()
+        fmt = QTextCharFormat()
+        frags = []
+        for i in range(10):
+            fmt.setFontPointSize(i+10)
+            frags.append("block%d"%i)
+            cursor.insertText(frags[i], fmt)
+
+        doc = edit.document()
+        block = doc.begin()
+
+        index = 0
+        for i in block:
+            self.assertEqual(i.fragment().text(), frags[index])
+            index += 1
+
+if __name__ == '__main__':
+    app = QApplication(sys.argv)
+    unittest.main()
diff --git a/tests/QtGui/bug_667.py b/tests/QtGui/bug_667.py
new file mode 100644
index 0000000..40c8d64
--- /dev/null
+++ b/tests/QtGui/bug_667.py
@@ -0,0 +1,24 @@
+from   PySide.QtCore import *
+from   PySide.QtGui  import *
+
+class Ball(QGraphicsEllipseItem):
+    def __init__(self, d, parent=None):
+        super(Ball, self).__init__(0, 0, d, d, parent)
+        self.vel = QPointF(0,0)   #commenting this out prevents the crash
+
+class Foo(QGraphicsView):
+    def __init__(self):
+        super(Foo, self).__init__(None)
+        self.scene = QGraphicsScene(self.rect())
+        self.setScene(self.scene)
+        self.scene.addItem(Ball(10))
+
+
+if __name__ == "__main__":
+    import sys
+    app = QApplication(sys.argv)
+    w = Foo()
+    w.show()
+    w.raise_()
+    QTimer.singleShot(0, w.close)
+    sys.exit(app.exec_())
diff --git a/tests/QtGui/bug_668.py b/tests/QtGui/bug_668.py
new file mode 100644
index 0000000..924ff19
--- /dev/null
+++ b/tests/QtGui/bug_668.py
@@ -0,0 +1,21 @@
+# coding: utf-8
+from PySide.QtCore import *
+from PySide.QtGui  import *
+
+import sys
+
+class A(QMainWindow):
+    def __init__(self, parent=None):
+        super(A, self).__init__(parent)
+        a = QFileSystemModel(self)
+        a.setRootPath(QDir.homePath())
+
+        v = QTreeView(self)
+        v.setModel(a)
+        self.setCentralWidget(v)
+
+app = QApplication([])
+m = A()
+m.show()
+QTimer.singleShot(0, m.close)
+app.exec_()
diff --git a/tests/QtGui/bug_674.py b/tests/QtGui/bug_674.py
new file mode 100644
index 0000000..4d015b5
--- /dev/null
+++ b/tests/QtGui/bug_674.py
@@ -0,0 +1,23 @@
+from PySide.QtCore import *
+from PySide.QtGui import *
+import unittest
+import sys
+
+class TestBug679(unittest.TestCase):
+    '''QGraphicsScene::clear() is missing'''
+    def testIt(self):
+        app = QApplication([])
+
+        scene = QGraphicsScene()
+        hello = scene.addText("Hello")
+        scene.addText("World")
+
+        self.assertEqual(sys.getrefcount(hello), 3)
+        scene.clear()
+        self.assertEqual(sys.getrefcount(hello), 2)
+        self.assertEqual(len(scene.items()), 0)
+        self.assertRaises(RuntimeError, hello.isVisible) # the C++ object was deleted
+
+if __name__ == '__main__':
+    unittest.main()
+
diff --git a/tests/QtGui/bug_675.py b/tests/QtGui/bug_675.py
new file mode 100644
index 0000000..d490f0f
--- /dev/null
+++ b/tests/QtGui/bug_675.py
@@ -0,0 +1,15 @@
+from PySide.QtCore import *
+from PySide.QtGui import *
+
+app = QApplication([])
+
+scene = QGraphicsScene()
+
+# don't segfault due to lack of keepReferenceCall
+textEdit = scene.addWidget(QTextEdit())
+
+layout = QGraphicsLinearLayout()
+layout.addItem(textEdit)
+
+view = QGraphicsView(scene)
+view.show()
diff --git a/tests/QtGui/bug_688.py b/tests/QtGui/bug_688.py
new file mode 100644
index 0000000..bcf7fd8
--- /dev/null
+++ b/tests/QtGui/bug_688.py
@@ -0,0 +1,87 @@
+''' Test bug 688: http://bugs.openbossa.org/show_bug.cgi?id=688'''
+
+import unittest
+from helper import UsesQApplication
+from PySide.QtGui import QTextFrame, QTextEdit, QTextCursor, QTextCharFormat, QFont, QTextFrameFormat
+
+class BugTest(UsesQApplication):
+    def testCase(self):
+        editor = QTextEdit()
+        cursor = QTextCursor(editor.textCursor())
+        cursor.movePosition(QTextCursor.Start)
+   
+        mainFrame = cursor.currentFrame()
+        
+        plainCharFormat = QTextCharFormat()
+        boldCharFormat = QTextCharFormat()
+        boldCharFormat.setFontWeight(QFont.Bold);
+        cursor.insertText("""
+                          Text documents are represented by the 
+                          QTextDocument class, rather than by QString objects. 
+                          Each QTextDocument object contains information about 
+                          the document's internal representation, its structure, 
+                          and keeps track of modifications to provide undo/redo 
+                          facilities. This approach allows features such as the 
+                          layout management to be delegated to specialized 
+                          classes, but also provides a focus for the framework.""",
+                          plainCharFormat)
+
+        frameFormat = QTextFrameFormat()
+        frameFormat.setMargin(32)
+        frameFormat.setPadding(8)
+        frameFormat.setBorder(4)
+        cursor.insertFrame(frameFormat)
+
+        cursor.insertText("""
+                          Documents are either converted from external sources 
+                          or created from scratch using Qt. The creation process 
+                          can done by an editor widget, such as QTextEdit, or by 
+                          explicit calls to the Scribe API.""",
+                          boldCharFormat)
+
+        cursor = mainFrame.lastCursorPosition()
+        cursor.insertText("""
+                          There are two complementary ways to visualize the 
+                          contents of a document: as a linear buffer that is 
+                          used by editors to modify the contents, and as an 
+                          object hierarchy containing structural information 
+                          that is useful to layout engines. In the hierarchical 
+                          model, the objects generally correspond to visual 
+                          elements such as frames, tables, and lists. At a lower 
+                          level, these elements describe properties such as the 
+                          style of text used and its alignment. The linear 
+                          representation of the document is used for editing and 
+                          manipulation of the document's contents.""",
+                          plainCharFormat)
+
+        
+        frame = cursor.currentFrame()
+
+        items = []
+
+        #test iterator
+        for i in frame:
+            items.append(i)
+
+        #test __iadd__
+        b = frame.begin()
+        i = 0
+        while not b.atEnd():
+            self.assertEqual(b, items[i])
+            self.assert_(b.parentFrame(), items[i].parentFrame())
+            b.__iadd__(1)
+            i += 1
+
+        #test __isub__
+        b = frame.end()
+        i = 0
+        while i > 0:
+            self.assertEqual(b, items[i])
+            self.assert_(b.parentFrame(), items[i].parentFrame())
+            b.__isub__(1)
+            i -= 1
+
+        
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/tests/QtGui/bug_693.py b/tests/QtGui/bug_693.py
new file mode 100644
index 0000000..4bfbe7c
--- /dev/null
+++ b/tests/QtGui/bug_693.py
@@ -0,0 +1,31 @@
+
+from PySide.QtCore import *
+from PySide.QtGui import *
+import unittest
+
+class MyModel (QAbstractListModel):
+
+    stupidLine = QLine(0, 0, 10, 10)
+
+    def rowCount(self, parent):
+        return 1
+
+    def data(self, index, role):
+        return self.stupidLine
+
+class TestBug693(unittest.TestCase):
+    def testIt(self):
+        app = QApplication([])
+        model = MyModel()
+        view = QListView()
+        view.setModel(model)
+        view.show()
+
+        # This must NOT throw the exception:
+        # RuntimeError: Internal C++ object (PySide.QtCore.QLine) already deleted.
+        MyModel.stupidLine.isNull()
+
+
+
+if __name__ == "__main__":
+    unittest.main()
diff --git a/tests/QtGui/bug_696.py b/tests/QtGui/bug_696.py
new file mode 100644
index 0000000..ff62e7a
--- /dev/null
+++ b/tests/QtGui/bug_696.py
@@ -0,0 +1,51 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+#
+# This file is part of the Shiboken Python Bindings Generator project.
+#
+# Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+#
+# Contact: PySide team <contact@pyside.org>
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public License
+# version 2.1 as published by the Free Software Foundation. Please
+# review the following information to ensure the GNU Lesser General
+# Public License version 2.1 requirements will be met:
+# http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+# #
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+# 02110-1301 USA
+
+import sys
+import unittest
+
+from helper import UsesQApplication
+from PySide.QtGui import QMainWindow, QMenu, QApplication
+
+class MainWindow(QMainWindow):
+    def __init__(self, *args):
+        self._menu = QMenu(self.dontexist) # attribute called with invalid C++ object
+
+class MainWindow2(QMainWindow):
+    def __init__(self):
+        self.show()
+
+class Bug696(UsesQApplication):
+    def testContructorInitialization(self):
+        self.assertRaises(AttributeError, MainWindow)
+
+    def testContructorInitializationAndCPPFunction(self):
+        self.assertRaises(RuntimeError, MainWindow2)
+
+
+if __name__ == '__main__':
+    unittest.main()
+
diff --git a/tests/QtGui/bug_711.py b/tests/QtGui/bug_711.py
new file mode 100644
index 0000000..10e5702
--- /dev/null
+++ b/tests/QtGui/bug_711.py
@@ -0,0 +1,20 @@
+import unittest
+from PySide.QtGui import QToolBar, QApplication, QAction, QToolButton
+
+class TestLabelPixmap(unittest.TestCase):
+    def testReference(self):
+        toolbar = QToolBar()
+
+        for i in xrange(20):
+            toolbar.addAction(QAction("Action %d" % i, None))
+
+        buttons = toolbar.findChildren(QToolButton, "")
+        toolbar.clear()
+
+        for b in buttons:
+            self.assertRaises(RuntimeError, b.objectName)
+
+if __name__ == '__main__':
+    app = QApplication([])
+    unittest.main()
+
diff --git a/tests/QtGui/bug_714.py b/tests/QtGui/bug_714.py
new file mode 100644
index 0000000..937ff82
--- /dev/null
+++ b/tests/QtGui/bug_714.py
@@ -0,0 +1,21 @@
+import unittest
+import sys
+from PySide.QtGui import QLabel, QApplication, QPixmap
+
+class TestLabelPixmap(unittest.TestCase):
+    def testReference(self):
+        l = QLabel()
+        p = QPixmap()
+        l.setPixmap(p) # doesn't increment pixmap ref because this makes a copy
+        self.assertEqual(sys.getrefcount(p), 2)
+
+        p = l.pixmap() # this increment the reference because this is an internal pointer
+        self.assertEqual(sys.getrefcount(p), 3)
+
+        p2 = l.pixmap()
+        self.assertEqual(p, p2)
+
+if __name__ == '__main__':
+    app = QApplication([])
+    unittest.main()
+
diff --git a/tests/QtGui/bug_716.py b/tests/QtGui/bug_716.py
new file mode 100644
index 0000000..fe5315e
--- /dev/null
+++ b/tests/QtGui/bug_716.py
@@ -0,0 +1,9 @@
+from PySide.QtCore import Qt, QPersistentModelIndex
+from PySide.QtGui import QStringListModel
+
+if __name__ == '__main__':
+    stringListModel = QStringListModel(['one', 'two'])
+    idx = stringListModel.index(1, 0)
+    persistentModelIndex = QPersistentModelIndex(idx)
+    stringListModel.data(persistentModelIndex, Qt.DisplayRole)
+
diff --git a/tests/QtGui/bug_722.py b/tests/QtGui/bug_722.py
new file mode 100644
index 0000000..fddee39
--- /dev/null
+++ b/tests/QtGui/bug_722.py
@@ -0,0 +1,24 @@
+import unittest
+
+from helper import UsesQApplication
+
+from PySide.QtGui import QDoubleSpinBox, QGraphicsBlurEffect
+
+class TestSignalConnection(UsesQApplication):
+    def testFloatSignal(self):
+        foo1 = QDoubleSpinBox()
+        foo2 = QDoubleSpinBox()
+        foo1.valueChanged[float].connect(foo2.setValue)
+        foo2.valueChanged[float].connect(foo1.setValue)
+        foo1.setValue(0.42)
+        self.assertEqual(foo1.value(), foo2.value())
+
+    def testQRealSignal(self):
+        foo1 = QDoubleSpinBox()
+        effect = QGraphicsBlurEffect()
+        effect.blurRadiusChanged['qreal'].connect(foo1.setValue) # check if qreal is a valid type
+        effect.setBlurRadius(0.42)
+        self.assertAlmostEqual(foo1.value(), effect.blurRadius())
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/tests/QtGui/bug_728.py b/tests/QtGui/bug_728.py
new file mode 100644
index 0000000..b95e1b3
--- /dev/null
+++ b/tests/QtGui/bug_728.py
@@ -0,0 +1,8 @@
+from PySide.QtGui import *
+from PySide.QtCore import *
+
+app = QApplication([])
+QTimer.singleShot(200, app.quit)
+
+# This test for a dead lock in QFileDialog.getOpenFileNames, the test fail with a timeout if the dead lock exists.
+QFileDialog.getOpenFileNames(None, "caption", QDir.homePath(), None, "", QFileDialog.DontUseNativeDialog)
diff --git a/tests/QtGui/bug_736.py b/tests/QtGui/bug_736.py
new file mode 100644
index 0000000..49a954c
--- /dev/null
+++ b/tests/QtGui/bug_736.py
@@ -0,0 +1,19 @@
+import unittest
+from PySide.QtCore import *
+from PySide.QtGui import *
+
+class TestBug736 (unittest.TestCase):
+
+    def testIt(self):
+        app = QApplication([])
+        slider = QSlider(Qt.Horizontal)
+        slider2 = QSlider(Qt.Horizontal)
+
+        slider2.setMaximum(10)
+        slider.valueChanged[int].connect(slider2.setMaximum)
+        slider.valueChanged[int].emit(100)
+        self.assertEqual(slider2.maximum(), 100)
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/tests/QtGui/bug_740.py b/tests/QtGui/bug_740.py
new file mode 100644
index 0000000..302a1a1
--- /dev/null
+++ b/tests/QtGui/bug_740.py
@@ -0,0 +1,13 @@
+import unittest
+import py3kcompat as py3k
+from helper import UsesQApplication
+from PySide.QtCore import QSize
+from PySide.QtGui import QBitmap, QImage
+
+class TestQBitmap(UsesQApplication):
+    def testFromDataMethod(self):
+        dataBits = py3k.b('\x38\x28\x38\x10\x10\x10\x10\x10\x10\x10\x10\x10\x10\x10\x10\x10\x10\x10\x10\x10\x10\x10\x10\x10\x10\x10\x10\x10\x10\x10\x10\x10\x10\x10\x10\x10\x10\x10\x10\x10\xfe\xfe\x7c\x7c\x38\x38\x10\x10')
+        bim = QBitmap.fromData(QSize(8, 48), dataBits, QImage.Format_Mono) # missing function
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/tests/QtGui/bug_743.py b/tests/QtGui/bug_743.py
new file mode 100644
index 0000000..0957fcc
--- /dev/null
+++ b/tests/QtGui/bug_743.py
@@ -0,0 +1,15 @@
+import unittest
+
+from PySide.QtGui import QMatrix4x4
+
+class TestQMatrix(unittest.TestCase):
+    def testOperator(self):
+        m = QMatrix4x4(1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16)
+        v = 1
+        for x in range(4):
+            for y in range(4):
+                self.assertEqual(m[x,y], v)
+                v += 1
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/tests/QtGui/bug_750.py b/tests/QtGui/bug_750.py
new file mode 100644
index 0000000..902a655
--- /dev/null
+++ b/tests/QtGui/bug_750.py
@@ -0,0 +1,25 @@
+import unittest
+
+from helper import UsesQApplication
+
+from PySide.QtCore import QTimer
+from PySide.QtGui import QPainter, QFont, QFontInfo, QWidget, qApp
+
+class MyWidget(QWidget):
+    def paintEvent(self, e):
+        p = QPainter(self)
+        self._info = p.fontInfo()
+        self._app.quit()
+
+
+class TestQPainter(UsesQApplication):
+    def testFontInfo(self):
+        w = MyWidget()
+        w._app = self.app
+        w._info = None
+        QTimer.singleShot(300, w.show)
+        self.app.exec_()
+        self.assert_(w._info)
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/tests/QtGui/bug_778.py b/tests/QtGui/bug_778.py
new file mode 100644
index 0000000..b42540f
--- /dev/null
+++ b/tests/QtGui/bug_778.py
@@ -0,0 +1,22 @@
+import unittest
+
+from helper import UsesQApplication
+
+from PySide.QtGui import QTreeWidget, QTreeWidgetItem, QTreeWidgetItemIterator
+
+class QTreeWidgetItemIteratorTest(UsesQApplication):
+    def testWidgetIterator(self):
+        treeWidget = QTreeWidget()
+        treeWidget.setColumnCount(1)
+        items = []
+        for i in range(10):
+            items.append(QTreeWidgetItem(None, ['item: %d' % i]))
+        treeWidget.insertTopLevelItems(0, items)
+
+        index = 0
+        for it in QTreeWidgetItemIterator(treeWidget):
+            self.assertEqual(it.value().text(0), 'item: %d' % index)
+            index += 1
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/tests/QtGui/bug_785.py b/tests/QtGui/bug_785.py
new file mode 100644
index 0000000..905119c
--- /dev/null
+++ b/tests/QtGui/bug_785.py
@@ -0,0 +1,29 @@
+import sys
+
+import unittest
+from PySide.QtGui import QApplication, QStandardItemModel, QStandardItem, QItemSelection
+
+class Bug324(unittest.TestCase):
+    def testOperators(self):
+        model = QStandardItemModel()
+        for i in range(100):
+            model.appendRow(QStandardItem("Item: %d"%i))
+
+        first = model.index(0, 0)
+        second = model.index(10, 0)
+        third = model.index(20, 0)
+        fourth = model.index(30, 0)
+
+        sel = QItemSelection(first, second)
+        sel2 = QItemSelection()
+        sel2.select(third, fourth)
+
+        sel3 = sel + sel2 #check operator +
+        self.assertEqual(len(sel3), 2)
+        sel4 = sel
+        sel4 += sel2 #check operator +=
+        self.assertEqual(len(sel4), 2)
+        self.assertEqual(sel4, sel3)
+
+if __name__ == "__main__":
+    unittest.main()
diff --git a/tests/QtGui/bug_793.py b/tests/QtGui/bug_793.py
new file mode 100644
index 0000000..4fea833
--- /dev/null
+++ b/tests/QtGui/bug_793.py
@@ -0,0 +1,30 @@
+import unittest
+import sys
+from PySide.QtCore import QTimer
+from PySide.QtGui import QWidget, QApplication
+
+class TestW1(QWidget):
+    def __init__(self, parent = None):
+        super(TestW1, self).__init__(parent)
+        TestW2(parent, self)
+
+class TestW2(QWidget):
+    def __init__(self, ancestor, parent = None):
+        super(TestW2, self).__init__(parent)
+        self.ancestor_ref = ancestor
+
+class Test(QWidget):
+    def __init__(self):
+        super(Test, self).__init__()
+        TestW1(self)
+
+class TestQApplicationDestrcutor(unittest.TestCase):
+    def testDestructor(self):
+        w = Test()
+        w.show()
+        QTimer.singleShot(0, w.close)
+
+if __name__ == '__main__':
+    app = QApplication(sys.argv)
+    unittest.main()
+    sys.exit(app.exec_())
diff --git a/tests/QtGui/bug_811.py b/tests/QtGui/bug_811.py
new file mode 100644
index 0000000..af693bd
--- /dev/null
+++ b/tests/QtGui/bug_811.py
@@ -0,0 +1,32 @@
+import unittest
+import sys
+import weakref
+
+from helper import UsesQApplication
+
+from PySide.QtGui import QTextBlockUserData, QTextEdit, QTextCursor
+
+class TestUserData(QTextBlockUserData):
+    def __init__(self, data):
+        super(TestUserData, self).__init__()
+        self.data = data
+
+class TestUserDataRefCount(UsesQApplication):
+    def testRefcount(self):
+        textedit = QTextEdit()
+        textedit.setReadOnly(True)
+        doc = textedit.document()
+        cursor = QTextCursor(doc)
+        cursor.insertText("PySide Rocks")
+        ud = TestUserData({"Life": 42})
+        self.assertEqual(sys.getrefcount(ud), 2)
+        cursor.block().setUserData(ud)
+        self.assertEqual(sys.getrefcount(ud), 3)
+        ud2 = cursor.block().userData()
+        self.assertEqual(sys.getrefcount(ud), 4)
+        self.udata = weakref.ref(ud, None)
+        del ud, ud2
+        self.assertEqual(sys.getrefcount(self.udata()), 2)
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/tests/QtGui/bug_834.py b/tests/QtGui/bug_834.py
new file mode 100644
index 0000000..efb0cdf
--- /dev/null
+++ b/tests/QtGui/bug_834.py
@@ -0,0 +1,18 @@
+from PySide import QtCore, QtGui
+
+class Window(QtGui.QMainWindow):
+    def childEvent(self, event):
+        super(Window, self).childEvent(event)
+
+app = QtGui.QApplication([])
+window = Window()
+
+dock1 = QtGui.QDockWidget()
+dock2 = QtGui.QDockWidget()
+window.addDockWidget(QtCore.Qt.LeftDockWidgetArea, dock1)
+window.addDockWidget(QtCore.Qt.LeftDockWidgetArea, dock2)
+window.tabifyDockWidget(dock1, dock2)
+
+window.show()
+QtCore.QTimer.singleShot(0, window.close)
+app.exec_()
diff --git a/tests/QtGui/bug_836.py b/tests/QtGui/bug_836.py
new file mode 100644
index 0000000..b7d0645
--- /dev/null
+++ b/tests/QtGui/bug_836.py
@@ -0,0 +1,28 @@
+from PySide.QtCore import *
+from PySide.QtGui import *
+
+class Mixin1(object):
+    pass
+
+class Mixin2(object):
+    pass
+
+class Mixin3(object):
+    pass
+
+class MainWindow(Mixin1, Mixin2, Mixin3, QFrame):
+    def __init__(self):
+        super(MainWindow, self).__init__()
+
+def main():
+    app = QApplication([])
+    # if it doesn't crash it should pass
+    w = MainWindow()
+    w.show()
+    QTimer.singleShot(0, w.close)
+    app.exec_()
+
+if __name__ == "__main__":
+    main()
+
+
diff --git a/tests/QtGui/bug_844.py b/tests/QtGui/bug_844.py
new file mode 100644
index 0000000..8c4cd90
--- /dev/null
+++ b/tests/QtGui/bug_844.py
@@ -0,0 +1,18 @@
+from PySide.QtGui import *
+from PySide.QtCore import *
+
+class QtKeyPressListener(QObject):
+    def __init__(self, obj):
+        QObject.__init__(self)
+        obj.installEventFilter(self)
+
+    def eventFilter(self, obj, event):
+        # This used to crash here due to a misbehaviour of type discovery!
+        return QObject.eventFilter(self, obj, event)
+
+app = QApplication([])
+key_listener = QtKeyPressListener(app)
+w = QLabel('Hello')
+w.show()
+QTimer.singleShot(0, w.close)
+app.exec_()
diff --git a/tests/QtGui/bug_854.py b/tests/QtGui/bug_854.py
new file mode 100644
index 0000000..35a092a
--- /dev/null
+++ b/tests/QtGui/bug_854.py
@@ -0,0 +1,40 @@
+from PySide.QtGui import QTableView, QVBoxLayout, QApplication
+from PySide.QtCore import QAbstractItemModel
+
+from helper import UsesQApplication
+import unittest
+
+
+class VirtualList(QAbstractItemModel):
+    def __getitem__(self, index):
+        self._getItemCalled = True
+        pass
+
+    def rowCount(self, parent):
+        return 5000
+
+    def columnCount(self, parent):
+        return 3
+
+    def index(self, row, column, parent):
+        return self.createIndex(row, column)
+
+    def parent(self, index):
+         return QModelIndex()
+
+    def data(self, index, role):
+        return "(%i, %i)" % (index.row(), index.column())
+
+
+class TestQAbstractItemModel(UsesQApplication):
+    def testSetModel(self):
+        model = VirtualList()
+        model._getItemCalled = False
+        table = QTableView()
+        table.setModel(model)
+        table.show()
+        self.assertFalse(model._getItemCalled)
+
+if __name__ == "__main__":
+    unittest.main()
+
diff --git a/tests/QtGui/bug_860.py b/tests/QtGui/bug_860.py
new file mode 100644
index 0000000..f161e96
--- /dev/null
+++ b/tests/QtGui/bug_860.py
@@ -0,0 +1,36 @@
+
+import sys
+import unittest
+
+from PySide.QtCore import QSignalMapper
+from PySide.QtGui import QCheckBox
+
+from helper import UsesQApplication
+
+class MultipleSlotTest(UsesQApplication):
+    def cb_changed(self, i):
+        self._changed = True
+
+    def cb_changedVoid(self):
+        self._changed = True
+
+    def testSignalMapper(self):
+        checkboxMapper = QSignalMapper()
+        box = QCheckBox('check me')
+        box.stateChanged.connect(checkboxMapper.map)
+
+        checkboxMapper.setMapping(box, box.text())
+        checkboxMapper.mapped[str].connect(self.cb_changed)
+        self._changed = False
+        box.setChecked(True)
+        self.assert_(self._changed)
+
+    def testSimpleSignal(self):
+        box = QCheckBox('check me')
+        box.stateChanged[int].connect(self.cb_changedVoid)
+        self._changed = False
+        box.setChecked(True)
+        self.assert_(self._changed)
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/tests/QtGui/bug_862.py b/tests/QtGui/bug_862.py
new file mode 100644
index 0000000..b817913
--- /dev/null
+++ b/tests/QtGui/bug_862.py
@@ -0,0 +1,40 @@
+
+from PySide.QtCore import QObject
+from PySide.QtGui import *
+import PySide.QtCore
+import unittest
+
+class MyQObject(QObject):
+    def __init__(self):
+        QObject.__init__(self)
+
+class MyQWidget(QWidget):
+    def __init__(self):
+        QWidget.__init__(self)
+
+class MyQGraphicsObject(QGraphicsObject):
+    def __init__(self):
+        QGraphicsObject.__init__(self)
+
+class MyQGraphicsItem(QGraphicsItem):
+    def __init__(self):
+        QGraphicsItem.__init__(self)
+
+class TestRepr (unittest.TestCase):
+
+    def testIt(self):
+
+        app = QApplication([])
+
+        self.assertEqual("<__main__.MyQObject object at ", repr(MyQObject())[:30])
+        self.assertEqual("<__main__.MyQWidget object at ", repr(MyQWidget())[:30])
+        self.assertEqual("<__main__.MyQGraphicsObject(this = 0x", repr(MyQGraphicsObject())[:37])
+        self.assertEqual("<__main__.MyQGraphicsItem(this = 0x", repr(MyQGraphicsItem())[:35])
+
+        self.assertEqual("<PySide.QtCore.QObject object at ", repr(QObject())[:33])
+        self.assertEqual("<PySide.QtCore.QObject object at ", repr(PySide.QtCore.QObject())[:33])
+        self.assertEqual("<PySide.QtGui.QWidget object at ", repr(QWidget())[:32])
+        self.assertEqual("<PySide.QtGui.QGraphicsWidget(this = 0x", repr(QGraphicsWidget())[:39])
+
+if __name__ == "__main__":
+    unittest.main()
diff --git a/tests/QtGui/bug_871.py b/tests/QtGui/bug_871.py
new file mode 100644
index 0000000..a4fdbbf
--- /dev/null
+++ b/tests/QtGui/bug_871.py
@@ -0,0 +1,41 @@
+import unittest
+from helper import UsesQApplication
+from PySide.QtGui import QLineEdit, QValidator, QIntValidator
+
+'''Bug #871 - http://bugs.pyside.org/show_bug.cgi?id=871'''
+
+
+class BlankIntValidator(QIntValidator):
+    def validate(self,input,pos):
+        if input == '':
+            return QValidator.Acceptable, input, pos
+        else:
+            return QIntValidator.validate(self,input,pos)
+
+
+class Bug871Test(UsesQApplication):
+    def testWithoutValidator(self):
+        edit = QLineEdit()
+        self.assertEqual(edit.text(), '')
+        edit.insert('1')
+        self.assertEqual(edit.text(), '1')
+        edit.insert('a')
+        self.assertEqual(edit.text(), '1a')
+        edit.insert('2')
+        self.assertEqual(edit.text(), '1a2')
+
+    def testWithIntValidator(self):
+        edit = QLineEdit()
+        edit.setValidator(BlankIntValidator(edit))
+        self.assertEqual(edit.text(), '')
+        edit.insert('1')
+        self.assertEqual(edit.text(), '1')
+        edit.insert('a')
+        self.assertEqual(edit.text(), '1')
+        edit.insert('2')
+        self.assertEqual(edit.text(), '12')
+
+
+if __name__ == "__main__":
+   unittest.main()
+
diff --git a/tests/QtGui/bug_879.py b/tests/QtGui/bug_879.py
new file mode 100644
index 0000000..6261ead
--- /dev/null
+++ b/tests/QtGui/bug_879.py
@@ -0,0 +1,28 @@
+import unittest
+from PySide.QtCore import *
+from PySide.QtGui import *
+
+class MySpinBox(QSpinBox):
+
+    def validate(self,text,pos):
+        return QSpinBox.validate(self,text,pos)
+
+class TestBug879 (unittest.TestCase):
+
+    def testIt(self):
+        app = QApplication([])
+        self.box = MySpinBox()
+        self.box.show()
+
+        QTimer.singleShot(0, self.sendKbdEvent)
+        QTimer.singleShot(100, app.quit)
+        app.exec_()
+
+        self.assertEqual(self.box.text(), '0')
+
+    def sendKbdEvent(self):
+        ev = QKeyEvent(QEvent.KeyPress, Qt.Key_A, Qt.NoModifier, 'a')
+        QCoreApplication.sendEvent(self.box, ev)
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/tests/QtGui/bug_882.py b/tests/QtGui/bug_882.py
new file mode 100644
index 0000000..88f769c
--- /dev/null
+++ b/tests/QtGui/bug_882.py
@@ -0,0 +1,13 @@
+from PySide.QtGui import *
+from PySide.QtCore import *
+import os
+
+if "DISPLAY" in os.environ:
+    del os.environ["DISPLAY"]
+
+app = QApplication([], False)
+QTimer.singleShot(0, app.quit)
+app.exec_()
+
+
+
diff --git a/tests/QtGui/bug_919.py b/tests/QtGui/bug_919.py
new file mode 100644
index 0000000..dd883ce
--- /dev/null
+++ b/tests/QtGui/bug_919.py
@@ -0,0 +1,27 @@
+import unittest
+
+from helper import TimedQApplication
+from PySide.QtGui import QPainter, QPushButton, QStyleOptionButton, QApplication, QStyle
+
+class MyWidget(QPushButton):
+    def __init__(self, parent = None):
+        QPushButton.__init__(self, parent)
+        self._painted = False
+
+    def paintEvent(self, e):
+        p = QPainter(self)
+        style = QApplication.style()
+        option = QStyleOptionButton()
+        style.drawControl(QStyle.CE_PushButton, option, p)
+        self._painted = True
+
+
+class TestBug919(TimedQApplication):
+    def testFontInfo(self):
+        w = MyWidget()
+        w.show()
+        self.app.exec_()
+        self.assert_(w._painted)
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/tests/QtGui/bug_921.py b/tests/QtGui/bug_921.py
new file mode 100644
index 0000000..b43f5b3
--- /dev/null
+++ b/tests/QtGui/bug_921.py
@@ -0,0 +1,52 @@
+#!/usr/bin/env python
+
+import unittest
+
+import PySide.QtCore as QtCore
+import PySide.QtGui as QtGui
+
+from helper import TimedQApplication
+
+class Signaller(QtCore.QObject):
+    s1 = QtCore.Signal()
+    s2 = QtCore.Signal()
+    s3 = QtCore.Signal()
+
+class Window(object):
+
+    def __init__(self, s):
+        self._window = QtGui.QMainWindow()
+        self._window.setAttribute(QtCore.Qt.WA_DeleteOnClose, True)
+        self._window.setWindowTitle("Demo!")
+
+        self._s = s
+        self._s.s1.connect(self._on_signal)
+        self._s.s2.connect(self._on_signal)
+
+    def show(self):
+        self._window.show()
+
+    def _on_signal(self):
+        self._window.setWindowTitle("Signaled!")
+
+class TestTimedApp(TimedQApplication):
+    def testSignals(self):
+        s = Signaller()
+        w = Window(s)
+        w.show()
+
+        def midleFunction():
+            def internalFunction():
+                pass
+            s.s3.connect(internalFunction)
+
+        midleFunction()
+        self.app.exec_()
+        del w
+
+        s.s1.emit()
+        s.s2.emit()
+        s.s3.emit()
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/tests/QtGui/bug_941.py b/tests/QtGui/bug_941.py
new file mode 100644
index 0000000..cdf1190
--- /dev/null
+++ b/tests/QtGui/bug_941.py
@@ -0,0 +1,17 @@
+import unittest
+from PySide.QtCore import *
+from PySide.QtGui import *
+
+def foo(a, b):
+    pass
+
+class TestBug941 (unittest.TestCase):
+
+    def testIt(self):
+        app = QApplication([])
+        view = QHeaderView(Qt.Horizontal)
+        self.assertTrue(view.sortIndicatorChanged.connect(foo))
+        view.sortIndicatorChanged.emit(0, Qt.Vertical) # this can't raise an exception!
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/tests/QtGui/bug_964.py b/tests/QtGui/bug_964.py
new file mode 100644
index 0000000..61fecba
--- /dev/null
+++ b/tests/QtGui/bug_964.py
@@ -0,0 +1,18 @@
+import unittest
+from PySide.QtCore import *
+from PySide.QtGui import *
+
+class TestBug964 (unittest.TestCase):
+
+    def testIt(self):
+        app = QApplication([])
+        model = QStringListModel(["1", "2"])
+        view = QListView()
+        view.setModel(model)
+        view.setCurrentIndex(model.index(0,0))
+        newCursor = view.moveCursor(QAbstractItemView.MoveDown, Qt.NoModifier)
+        self.assertEqual(newCursor.row(), 1)
+        self.assertEqual(newCursor.column(), 0)
+
+if __name__ == "__main__":
+    unittest.main()
diff --git a/tests/QtGui/bug_967.py b/tests/QtGui/bug_967.py
new file mode 100644
index 0000000..41faf2f
--- /dev/null
+++ b/tests/QtGui/bug_967.py
@@ -0,0 +1,18 @@
+import unittest
+from PySide.QtGui import *
+
+class TestBug967 (unittest.TestCase):
+
+    def callback(self, arg):
+        self.arg = arg
+
+    def testIt(self):
+        self.arg = None
+        app = QApplication([])
+        obj = QComboBox()
+        obj.currentIndexChanged.connect(self.callback)
+        obj.currentIndexChanged.emit(5)
+        self.assertEqual(self.arg, 5)
+
+if __name__ == "__main__":
+    unittest.main()
diff --git a/tests/QtGui/bug_972.py b/tests/QtGui/bug_972.py
new file mode 100644
index 0000000..f3ecf32
--- /dev/null
+++ b/tests/QtGui/bug_972.py
@@ -0,0 +1,39 @@
+import unittest
+from PySide.QtCore import QSizeF
+from PySide.QtGui import QGraphicsProxyWidget, QSizePolicy, QPushButton, QGraphicsScene, QGraphicsView
+
+from helper import TimedQApplication
+
+def createItem(minimum, preferred, maximum, name):
+    w = QGraphicsProxyWidget()
+
+    w.setWidget(QPushButton(name))
+    w.setMinimumSize(minimum)
+    w.setPreferredSize(preferred)
+    w.setMaximumSize(maximum)
+    w.setSizePolicy(QSizePolicy.Preferred, QSizePolicy.Preferred)
+
+    return w
+
+class TestBug972 (TimedQApplication):
+
+    # Test if the function QGraphicsProxyWidget.setWidget have the correct behavior
+    def testIt(self):
+        scene = QGraphicsScene()
+
+        minSize = QSizeF(30, 100)
+        prefSize = QSizeF(210, 100)
+        maxSize = QSizeF(300, 100)
+
+        a = createItem(minSize, prefSize, maxSize, "A")
+        b = createItem(minSize, prefSize, maxSize, "B")
+        c = createItem(minSize, prefSize, maxSize, "C")
+        d = createItem(minSize, prefSize, maxSize, "D")
+
+        view = QGraphicsView(scene)
+        view.show()
+        self.app.exec_()
+
+
+if __name__ == "__main__":
+    unittest.main()
diff --git a/tests/QtGui/bug_979.py b/tests/QtGui/bug_979.py
new file mode 100644
index 0000000..b780d35
--- /dev/null
+++ b/tests/QtGui/bug_979.py
@@ -0,0 +1,9 @@
+from PySide.QtGui import QDialog
+from import_test import PysideImportTest2
+
+class PysideImportTest1(QDialog, PysideImportTest2):
+       pass
+
+if __name__ == '__main__':
+    quit()
+
diff --git a/tests/QtGui/bug_988.py b/tests/QtGui/bug_988.py
new file mode 100644
index 0000000..12e2155
--- /dev/null
+++ b/tests/QtGui/bug_988.py
@@ -0,0 +1,18 @@
+import unittest
+from PySide.QtGui import *
+
+class TestBug988 (unittest.TestCase):
+
+    def callback(self, arg):
+        self.arg = arg
+
+    def testIt(self):
+        self.arg = None
+        app = QApplication([])
+        obj = QTabWidget()
+        obj.currentChanged.connect(self.callback)
+        obj.currentChanged.emit(5)
+        self.assertEqual(self.arg, 5)
+
+if __name__ == "__main__":
+    unittest.main()
diff --git a/tests/QtGui/bug_991.py b/tests/QtGui/bug_991.py
new file mode 100644
index 0000000..55ff81d
--- /dev/null
+++ b/tests/QtGui/bug_991.py
@@ -0,0 +1,15 @@
+import unittest
+from PySide.QtCore import QObject
+from PySide.QtGui import QPen, QBrush
+
+class TestBug991 (unittest.TestCase):
+    def testReprFunction(self):
+        reprPen = repr(QPen())
+        self.assertTrue(reprPen.startswith("<PySide.QtGui.QPen"))
+        reprBrush = repr(QBrush())
+        self.assertTrue(reprBrush.startswith("<PySide.QtGui.QBrush"))
+        reprObject = repr(QObject())
+        self.assertTrue(reprObject.startswith("<PySide.QtCore.QObject"))
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/tests/QtGui/bug_998.py b/tests/QtGui/bug_998.py
new file mode 100644
index 0000000..d5ea3b2
--- /dev/null
+++ b/tests/QtGui/bug_998.py
@@ -0,0 +1,10 @@
+import unittest
+from PySide.QtGui import QApplication
+
+class TestBug998 (unittest.TestCase):
+    def testNoFocusWindow(self):
+        widget = QApplication.focusWidget()
+        self.assertTrue(widget == None)
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/tests/qtgui/customproxywidget_test.py b/tests/QtGui/customproxywidget_test.py
old mode 100755
new mode 100644
similarity index 100%
rename from tests/qtgui/customproxywidget_test.py
rename to tests/QtGui/customproxywidget_test.py
diff --git a/tests/QtGui/deepcopy_test.py b/tests/QtGui/deepcopy_test.py
new file mode 100644
index 0000000..1f53d45
--- /dev/null
+++ b/tests/QtGui/deepcopy_test.py
@@ -0,0 +1,123 @@
+
+import unittest
+from copy import deepcopy
+
+from PySide.QtCore import QPoint
+from PySide.QtGui import QMatrix
+from PySide.QtGui import QMatrix2x2, QMatrix2x3, QMatrix2x4
+from PySide.QtGui import QMatrix3x2, QMatrix3x3, QMatrix3x4
+from PySide.QtGui import QMatrix4x2, QMatrix4x3, QMatrix4x4
+from PySide.QtGui import QVector2D, QVector3D, QVector4D
+from PySide.QtGui import QColor, QTransform, QKeySequence, QQuaternion
+from PySide.QtGui import QPolygon
+
+class DeepCopyHelper:
+    def testCopy(self):
+        copy = deepcopy([self.original])[0]
+        self.assert_(copy is not self.original)
+        self.assertEqual(copy, self.original)
+
+class DeepCopyColorHelperF:
+    def testCopy(self):
+        copy = deepcopy([self.original])[0]
+        self.assert_(copy is not self.original)
+        self.assertEqual(copy.spec(), self.original.spec())
+        # impossible to compare float point
+        # self.assertEqual(copy, self.original)
+
+
+class QColorDeepCopy(DeepCopyHelper, unittest.TestCase):
+    def setUp(self):
+        self.original = QColor("red")
+
+class QColorRGBDeepCopy(DeepCopyColorHelperF, unittest.TestCase):
+    def setUp(self):
+        self.original = QColor.fromRgbF(0.2, 0.3, 0.4, 0.5)
+
+class QColorHSLDeepCopy(DeepCopyColorHelperF, unittest.TestCase):
+    def setUp(self):
+        self.original = QColor.fromHslF(0.2, 0.3, 0.4, 0.5)
+
+class QColorHSVDeepCopy(DeepCopyColorHelperF, unittest.TestCase):
+    def setUp(self):
+        self.original = QColor.fromHsvF(0.2, 0.3, 0.4, 0.5)
+
+class QColorCMYKDeepCopy(DeepCopyColorHelperF, unittest.TestCase):
+    def setUp(self):
+        self.original = QColor.fromCmykF(0.2, 0.3, 0.4, 0.5, 0.6)
+
+class QTransformDeepCopy(DeepCopyHelper, unittest.TestCase):
+    def setUp(self):
+        self.original = QTransform(1, 2, 3, 4, 5, 6, 7, 8)
+
+class QKeySequenceDeepCopy(DeepCopyHelper, unittest.TestCase):
+    def setUp(self):
+        self.original = QKeySequence("Ctrl+P")
+
+class QQuaternionDeepCopy(DeepCopyHelper, unittest.TestCase):
+    def setUp(self):
+        self.original = QQuaternion(1, 2, 3, 4)
+
+class QVector2DDeepCopy(DeepCopyHelper, unittest.TestCase):
+    def setUp(self):
+        self.original = QVector2D(1, 2)
+
+class QVector3DDeepCopy(DeepCopyHelper, unittest.TestCase):
+    def setUp(self):
+        self.original = QVector3D(1, 2, 3)
+
+class QVector4DDeepCopy(DeepCopyHelper, unittest.TestCase):
+    def setUp(self):
+        self.original = QVector4D(1, 2, 3, 4)
+
+class QPolygonDeepCopy(DeepCopyHelper, unittest.TestCase):
+    def setUp(self):
+        self.original = QPolygon([QPoint(1, 2), QPoint(3, 4), QPoint(5, 6)])
+
+class QMatrixDeepCopy(DeepCopyHelper, unittest.TestCase):
+    def setUp(self):
+        self.original = QMatrix(1, 2, 3, 4, 5, 6)
+
+
+# Avoid these tests until get gcc fixed
+# Related bug: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=43247
+"""
+class QMatrix2x2DeepCopy(DeepCopyHelper, unittest.TestCase):
+    def setUp(self):
+        self.original = QMatrix2x2([1, 2, 3, 4])
+
+class QMatrix2x3DeepCopy(DeepCopyHelper, unittest.TestCase):
+    def setUp(self):
+        self.original = QMatrix2x3([1, 2, 3, 4, 5, 6])
+
+class QMatrix2x4DeepCopy(DeepCopyHelper, unittest.TestCase):
+    def setUp(self):
+        self.original = QMatrix2x4([1, 2, 3, 4, 5, 6, 7, 8])
+
+class QMatrix3x2DeepCopy(DeepCopyHelper, unittest.TestCase):
+    def setUp(self):
+        self.original = QMatrix3x2([1, 2, 3, 4, 5, 6])
+
+class QMatrix3x3DeepCopy(DeepCopyHelper, unittest.TestCase):
+    def setUp(self):
+        self.original = QMatrix3x3([1, 2, 3, 4, 5, 6, 7, 8, 9])
+
+class QMatrix3x4DeepCopy(DeepCopyHelper, unittest.TestCase):
+    def setUp(self):
+        self.original = QMatrix3x4([1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12])
+
+class QMatrix4x2DeepCopy(DeepCopyHelper, unittest.TestCase):
+    def setUp(self):
+        self.original = QMatrix4x2([1, 2, 3, 4, 5, 6, 7, 8])
+
+class QMatrix4x3DeepCopy(DeepCopyHelper, unittest.TestCase):
+    def setUp(self):
+        self.original = QMatrix4x3([1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12])
+
+class QMatrix4x4DeepCopy(DeepCopyHelper, unittest.TestCase):
+    def setUp(self):
+        self.original = QMatrix4x4([1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16])
+"""
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/tests/QtGui/event_filter_test.py b/tests/QtGui/event_filter_test.py
new file mode 100644
index 0000000..ec82515
--- /dev/null
+++ b/tests/QtGui/event_filter_test.py
@@ -0,0 +1,39 @@
+import unittest
+import sys
+
+from helper import UsesQApplication
+from PySide.QtCore import QObject, QEvent
+from PySide.QtGui import QWidget
+
+class MyFilter(QObject):
+  def eventFilter(self, obj, event):
+    if event.type() == QEvent.KeyPress:
+      pass
+    return QObject.eventFilter(self, obj, event)
+
+
+class EventFilter(UsesQApplication):
+    def testRefCount(self):
+        o = QObject()
+        filt = MyFilter()
+        o.installEventFilter(filt)
+        self.assertEqual(sys.getrefcount(o), 2)
+
+        o.installEventFilter(filt)
+        self.assertEqual(sys.getrefcount(o), 2)
+
+        o.removeEventFilter(filt)
+        self.assertEqual(sys.getrefcount(o), 2)
+
+    def testObjectDestructorOrder(self):
+        w = QWidget()
+        filt = MyFilter()
+        filt.app = self.app
+        w.installEventFilter(filt)
+        w.show()
+        w.close()
+        w = None
+        self.assert_(True)
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/tests/qtgui/float_to_int_implicit_conversion_test.py b/tests/QtGui/float_to_int_implicit_conversion_test.py
similarity index 100%
rename from tests/qtgui/float_to_int_implicit_conversion_test.py
rename to tests/QtGui/float_to_int_implicit_conversion_test.py
diff --git a/tests/qtgui/grandparent_method_test.py b/tests/QtGui/grandparent_method_test.py
similarity index 100%
rename from tests/qtgui/grandparent_method_test.py
rename to tests/QtGui/grandparent_method_test.py
diff --git a/tests/qtgui/hashabletype_test.py b/tests/QtGui/hashabletype_test.py
similarity index 100%
rename from tests/qtgui/hashabletype_test.py
rename to tests/QtGui/hashabletype_test.py
diff --git a/tests/QtGui/import_test.py b/tests/QtGui/import_test.py
new file mode 100644
index 0000000..0b60241
--- /dev/null
+++ b/tests/QtGui/import_test.py
@@ -0,0 +1,2 @@
+class PysideImportTest2(object):
+    pass
diff --git a/tests/qtgui/keep_reference_test.py b/tests/QtGui/keep_reference_test.py
old mode 100755
new mode 100644
similarity index 95%
rename from tests/qtgui/keep_reference_test.py
rename to tests/QtGui/keep_reference_test.py
index d0962d5..47c7a59
--- a/tests/qtgui/keep_reference_test.py
+++ b/tests/QtGui/keep_reference_test.py
@@ -4,7 +4,7 @@ import unittest
 
 from sys import getrefcount
 from helper import UsesQApplication
-from PySide.QtCore import QAbstractTableModel, QVariant
+from PySide.QtCore import *
 from PySide.QtGui import QTableView
 
 class TestModel(QAbstractTableModel):
@@ -15,7 +15,7 @@ class TestModel(QAbstractTableModel):
     def columnCount(self, parent):
         return 0
     def data(self, index, role):
-        return QVariant()
+        return None
 
 class KeepReferenceTest(UsesQApplication):
 
@@ -28,7 +28,7 @@ class KeepReferenceTest(UsesQApplication):
 
     def testModelWithParent(self):
         view = QTableView()
-        model = TestModel(self.app)
+        model = TestModel(None)
         view.setModel(model)
         samemodel = view.model()
         self.assertEqual(model, samemodel)
diff --git a/tests/qtgui/missing_symbols_test.py b/tests/QtGui/missing_symbols_test.py
similarity index 100%
rename from tests/qtgui/missing_symbols_test.py
rename to tests/QtGui/missing_symbols_test.py
diff --git a/tests/qtgui/paint_event_test.py b/tests/QtGui/paint_event_test.py
similarity index 100%
rename from tests/qtgui/paint_event_test.py
rename to tests/QtGui/paint_event_test.py
diff --git a/tests/qtgui/parent_method_test.py b/tests/QtGui/parent_method_test.py
similarity index 100%
rename from tests/qtgui/parent_method_test.py
rename to tests/QtGui/parent_method_test.py
diff --git a/tests/QtGui/pyside_reload_test.py b/tests/QtGui/pyside_reload_test.py
new file mode 100644
index 0000000..3fd593c
--- /dev/null
+++ b/tests/QtGui/pyside_reload_test.py
@@ -0,0 +1,56 @@
+import os
+import sys
+import shutil
+import unittest
+import py3kcompat as py3k
+
+orig_path = os.path.join(os.path.dirname(__file__))
+workdir = os.getcwd()
+src = os.path.join(orig_path, 'test_module_template.py')
+dst = os.path.join(workdir, 'test_module.py')
+shutil.copyfile(src, dst)
+sys.path.append(workdir)
+
+def reload_module(moduleName):
+    if py3k.IS_PY3K:
+        import imp
+        imp.reload(moduleName)
+    else:
+        reload(moduleName)
+
+def increment_module_value():
+    modfile = open(dst, 'a')
+    modfile.write('Sentinel.value += 1' + os.linesep)
+    modfile.flush()
+    modfile.close()
+    if py3k.IS_PY3K:
+        import imp
+        cacheFile = imp.cache_from_source(dst)
+    else:
+        cacheFile = dst + 'c'
+
+    os.remove(cacheFile)
+
+class TestModuleReloading(unittest.TestCase):
+
+    def testModuleReloading(self):
+        '''Test module reloading with on-the-fly modifications.'''
+
+        import test_module
+        self.assertEqual(test_module.Sentinel.value, 10)
+
+        increment_module_value()
+        reload_module(sys.modules['test_module'])
+        self.assertEqual(test_module.Sentinel.value, 11)
+
+        reload_module(sys.modules['test_module'])
+        self.assertEqual(test_module.Sentinel.value, 11)
+
+        increment_module_value()
+        reload_module(sys.modules['test_module'])
+        self.assertEqual(test_module.Sentinel.value, 12)
+
+if __name__ == "__main__":
+    unittest.main()
+
+
diff --git a/tests/qtgui/python_properties_test.py b/tests/QtGui/python_properties_test.py
similarity index 100%
rename from tests/qtgui/python_properties_test.py
rename to tests/QtGui/python_properties_test.py
diff --git a/tests/QtGui/qabstracttextdocumentlayout_test.py b/tests/QtGui/qabstracttextdocumentlayout_test.py
new file mode 100644
index 0000000..8a8a0c7
--- /dev/null
+++ b/tests/QtGui/qabstracttextdocumentlayout_test.py
@@ -0,0 +1,46 @@
+import unittest
+import py3kcompat as py3k
+
+from PySide.QtCore import QSizeF, QTimer
+from PySide.QtGui import QTextFormat, QTextCharFormat, QTextEdit, QPyTextObject
+from helper import UsesQApplication
+
+class Foo(QPyTextObject):
+    called = False
+
+    def intrinsicSize(self, doc, posInDocument, format):
+        Foo.called = True
+        return QSizeF(10, 10)
+
+    def drawObject(self, painter, rect, doc, posInDocument, format):
+        pass
+
+class QAbstractTextDocumentLayoutTest(UsesQApplication):
+
+    objectType = QTextFormat.UserObject + 1
+
+    def foo(self):
+        fmt = QTextCharFormat()
+        fmt.setObjectType(QAbstractTextDocumentLayoutTest.objectType)
+
+        cursor = self.textEdit.textCursor()
+        cursor.insertText(py3k.unichr(0xfffc), fmt)
+        self.textEdit.setTextCursor(cursor)
+        self.textEdit.close()
+
+    def testIt(self):
+
+        self.textEdit = QTextEdit()
+        self.textEdit.show()
+
+        interface = Foo()
+        self.textEdit.document().documentLayout().registerHandler(QAbstractTextDocumentLayoutTest.objectType, interface)
+
+        QTimer.singleShot(0, self.foo)
+        self.app.exec_()
+
+        self.assertTrue(Foo.called)
+
+if __name__ == "__main__":
+    unittest.main()
+
diff --git a/tests/QtGui/qaction_test.py b/tests/QtGui/qaction_test.py
new file mode 100644
index 0000000..b6a45d1
--- /dev/null
+++ b/tests/QtGui/qaction_test.py
@@ -0,0 +1,41 @@
+import unittest
+
+from PySide.QtGui import QAction, QWidget
+from helper import UsesQApplication
+
+class QPainterDrawText(UsesQApplication):
+
+    def _cb(self):
+        self._called = True
+
+    def testSignal(self):
+        o = QWidget()
+        act = QAction(o)
+        self._called = False
+        act.triggered.connect(self._cb)
+        act.trigger()
+        self.assert_(self._called)
+
+    def testNewCtor(self):
+        o = QWidget()
+        self._called = False
+        myAction = QAction("&Quit", o, triggered=self._cb)
+        myAction.trigger()
+        self.assert_(self._called)
+
+
+class SetShortcutTest(UsesQApplication):
+
+    def testSetShortcut(self):
+        # Somehow an exception was leaking from the constructor
+        # and appearing in setShortcut.
+        o = QWidget()
+        action = QAction('aaaa', o)
+        shortcut = 'Ctrl+N'
+        action.setShortcut(shortcut)
+        s2 = action.shortcut()
+        self.assertEqual(s2, shortcut)
+
+if __name__ == '__main__':
+    unittest.main()
+
diff --git a/tests/qtgui/qapp_test.py b/tests/QtGui/qapp_test.py
similarity index 63%
rename from tests/qtgui/qapp_test.py
rename to tests/QtGui/qapp_test.py
index c371492..fd1d60f 100644
--- a/tests/qtgui/qapp_test.py
+++ b/tests/QtGui/qapp_test.py
@@ -3,15 +3,17 @@
 
 import unittest
 
-from PySide import QtGui
+from PySide.QtGui import *
 
 class QAppPresence(unittest.TestCase):
 
     def testQApp(self):
         #QtGui.qApp variable is instance of QApplication
-        self.assert_(isinstance(QtGui.qApp, QtGui.QApplication))
+        self.assert_(isinstance(qApp, QApplication))
 
+def main():
+    app = QApplication([])
+    unittest.main()
 
 if __name__ == '__main__':
-    app = QtGui.QApplication([])
-    unittest.main()
+    main()
diff --git a/tests/qtgui/qapplication_exit_segfault_test.py b/tests/QtGui/qapplication_exit_segfault_test.py
similarity index 100%
rename from tests/qtgui/qapplication_exit_segfault_test.py
rename to tests/QtGui/qapplication_exit_segfault_test.py
diff --git a/tests/qtgui/qapplication_singleton_test.py b/tests/QtGui/qapplication_singleton_test.py
similarity index 100%
rename from tests/qtgui/qapplication_singleton_test.py
rename to tests/QtGui/qapplication_singleton_test.py
diff --git a/tests/qtgui/qbrush_test.py b/tests/QtGui/qbrush_test.py
similarity index 100%
rename from tests/qtgui/qbrush_test.py
rename to tests/QtGui/qbrush_test.py
diff --git a/tests/QtGui/qcolor_reduce_test.py b/tests/QtGui/qcolor_reduce_test.py
new file mode 100644
index 0000000..c846ae3
--- /dev/null
+++ b/tests/QtGui/qcolor_reduce_test.py
@@ -0,0 +1,31 @@
+import unittest
+import pickle
+from PySide.QtGui import QColor
+
+class TestQColor (unittest.TestCase):
+    def reduceColor(self, c):
+        p = pickle.dumps(c)
+        c2 = pickle.loads(p)
+        self.assertEqual(c.spec(), c2.spec())
+        self.assertEqual(c, c2)
+
+    def testReduceEmpty(self):
+        self.reduceColor(QColor())
+
+    def testReduceString(self):
+        self.reduceColor(QColor('gray'))
+
+    def testReduceRGB(self):
+        self.reduceColor(QColor.fromRgbF(0.1, 0.2, 0.3, 0.4))
+
+    def testReduceCMYK(self):
+        self.reduceColor(QColor.fromCmykF(0.1, 0.2, 0.3, 0.4, 0.5))
+
+    def testReduceHsl(self):
+        self.reduceColor(QColor.fromHslF(0.1, 0.2, 0.3, 0.4))
+
+    def testReduceHsv(self):
+        self.reduceColor(QColor.fromHsvF(0.1, 0.2, 0.3, 0.4))
+
+if __name__ == "__main__":
+    unittest.main()
diff --git a/tests/qtgui/qcolor_test.py b/tests/QtGui/qcolor_test.py
similarity index 64%
rename from tests/qtgui/qcolor_test.py
rename to tests/QtGui/qcolor_test.py
index 3c2f11b..26f3f4c 100644
--- a/tests/qtgui/qcolor_test.py
+++ b/tests/QtGui/qcolor_test.py
@@ -1,6 +1,7 @@
 
 import unittest
 import colorsys
+import PySide
 
 from PySide.QtCore import Qt
 from PySide.QtGui import QColor
@@ -14,12 +15,6 @@ class QColorGetTest(unittest.TestCase):
     def testGetRgb(self):
         self.assertEqual(self.color.getRgb(), (20, 40, 60, 80))
 
-    def testGetRgbF(self):
-        self.assertEqual(self.color.getRgbF(), (20.0/255, 40.0/255, 60.0/255, 80.0/255))
-
-    def testGetHsl(self):
-        self.assertEqual(self.color.getHsl(), (210, 128, 40, self.color.alpha()))
-
     def testGetHslF(self):
         hls = colorsys.rgb_to_hls(20.0/255, 40.0/255, 60.0/255)
         hsla = hls[0], hls[2], hls[1], self.color.alphaF()
@@ -31,11 +26,6 @@ class QColorGetTest(unittest.TestCase):
         hsva = int(hsv[0]*360.0), int(hsv[1]*255), int(hsv[2]*256), self.color.alpha()
         self.assertEqual(self.color.getHsv(), hsva)
 
-    def testGetHsvF(self):
-        hsv = colorsys.rgb_to_hsv(20.0/255, 40.0/255, 60.0/255)
-        hsva = hsv[0], hsv[1], hsv[2], self.color.alphaF()
-        self.assertEqual(self.color.getHsvF(), hsva)
-
     def testGetCmyk(self): # not supported by colorsys
         self.assertEqual(self.color.getCmyk(), (170, 85, 0, 195, 80))
 
@@ -64,5 +54,42 @@ class QColorEqualGlobalColor(unittest.TestCase):
         self.assertEqual(QColor(255, 0, 0), Qt.red)
 
 
+class QColorCopy(unittest.TestCase):
+
+    def testDeepCopy(self):
+        '''QColor deepcopy'''
+
+        from copy import deepcopy
+
+        original = QColor(0, 0, 255)
+        copy = deepcopy([original])[0]
+
+        self.assert_(original is not copy)
+        self.assertEqual(original, copy)
+        del original
+        self.assertEqual(copy, QColor(0, 0, 255))
+
+    def testEmptyCopy(self):
+        from copy import deepcopy
+
+        original = QColor()
+        copy = deepcopy([original])[0]
+        self.assert_(original is not copy)
+        self.assertEqual(original, copy)
+        del original
+        self.assertEqual(copy, QColor())
+
+
+class QColorRepr(unittest.TestCase):
+    def testReprFunction(self):
+        c = QColor(100, 120, 200)
+        c2 = eval(c.__repr__())
+        self.assertEqual(c, c2)
+
+    def testStrFunction(self):
+        c = QColor('red')
+        c2 = eval(c.__str__())
+        self.assertEqual(c, c2)
+
 if __name__ == '__main__':
     unittest.main()
diff --git a/tests/QtGui/qcursor_test.py b/tests/QtGui/qcursor_test.py
new file mode 100644
index 0000000..ec758d4
--- /dev/null
+++ b/tests/QtGui/qcursor_test.py
@@ -0,0 +1,16 @@
+'''Test for Bug 630 - Fails to resolve overload for QCursor(QBitmap, QBitmap, int, int)
+http://bugs.openbossa.org/show_bug.cgi?id=630
+'''
+
+import unittest
+from PySide.QtGui import QBitmap, QCursor, QPixmap
+from helper import UsesQApplication
+
+class TestQCursor(UsesQApplication):
+    def testQCursorConstructor(self):
+        bmp = QBitmap(16, 16)
+        cursor = QCursor(bmp, bmp, 16, 16)
+
+if __name__ == '__main__':
+    unittest.main()
+
diff --git a/tests/qtgui/qdatastream_gui_operators_test.py b/tests/QtGui/qdatastream_gui_operators_test.py
similarity index 100%
rename from tests/qtgui/qdatastream_gui_operators_test.py
rename to tests/QtGui/qdatastream_gui_operators_test.py
diff --git a/tests/QtGui/qdynamic_signal.py b/tests/QtGui/qdynamic_signal.py
new file mode 100644
index 0000000..0eecb7d
--- /dev/null
+++ b/tests/QtGui/qdynamic_signal.py
@@ -0,0 +1,28 @@
+
+import unittest
+
+from PySide.QtCore import QObject
+from PySide.QtGui import QInputDialog
+
+from helper import UsesQApplication
+
+class DynamicSignalTest(UsesQApplication):
+
+    def cb(self, obj):
+        self._called = True
+
+    def testQDialog(self):
+        dlg = QInputDialog()
+        dlg.setInputMode(QInputDialog.TextInput)
+        lst = dlg.children()
+        self.assert_(len(lst))
+        obj = lst[0]
+        self._called = False
+        obj.destroyed[QObject].connect(self.cb)
+        obj = None
+        del dlg
+        self.assert_(self._called)
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/tests/qtgui/qfontdialog_test.py b/tests/QtGui/qfontdialog_test.py
similarity index 100%
rename from tests/qtgui/qfontdialog_test.py
rename to tests/QtGui/qfontdialog_test.py
diff --git a/tests/qtgui/qfontmetrics_test.py b/tests/QtGui/qfontmetrics_test.py
similarity index 87%
rename from tests/qtgui/qfontmetrics_test.py
rename to tests/QtGui/qfontmetrics_test.py
index 7964d91..59f01f9 100644
--- a/tests/qtgui/qfontmetrics_test.py
+++ b/tests/QtGui/qfontmetrics_test.py
@@ -30,21 +30,21 @@ class BoundingRectTest(QFontMetricsTest):
         rect = self.metrics.boundingRect(0, 0, 0, 0,
                                          Qt.TextExpandTabs | Qt.AlignLeft,
                                          'PySide by INdT')
-        self.assert_(isinstance(rect, QRect))
+        self.assertTrue(isinstance(rect, QRect))
 
     def testIntWithArg(self):
         '''QFontMetrics.boundingRect(int, int, int, int, ...) - single arg'''
         rect = self.metrics.boundingRect(0, 0, 0, 0,
                                          Qt.TextExpandTabs | Qt.AlignLeft,
                                          'PySide by INdT', 2)
-        self.assert_(isinstance(rect, QRect))
+        self.assertTrue(isinstance(rect, QRect))
 
     def testIntWithFull(self):
         '''QFontMetrics.boundingRect(int, int, int, int, ...) - all argss'''
         rect = self.metrics.boundingRect(0, 0, 0, 0,
                                          Qt.TextExpandTabs | Qt.AlignLeft,
                                          'PySide by INdT', 20, [1, 2, 3, 4, 5])
-        self.assert_(isinstance(rect, QRect))
+        self.assertTrue(isinstance(rect, QRect))
 
     def testIntTypeError(self):
         '''QFontMetrics.boundingRect(int, int, int, int, ...) - type error'''
@@ -57,14 +57,14 @@ class BoundingRectTest(QFontMetricsTest):
         arg = QRect(0, 0, 100, 200)
         rect = self.metrics.boundingRect(arg, Qt.TextExpandTabs | Qt.AlignLeft,
                                          'PySide by INdT')
-        self.assert_(isinstance(rect, QRect))
+        self.assertTrue(isinstance(rect, QRect))
 
     def testQRectWithArg(self):
         '''QFontMetrics.boundingRect(QRect, ...) - only tabstops'''
         arg = QRect(0, 0, 100, 200)
         rect = self.metrics.boundingRect(arg, Qt.TextExpandTabs | Qt.AlignLeft,
                                          'PySide by INdT', 2)
-        self.assert_(isinstance(rect, QRect))
+        self.assertTrue(isinstance(rect, QRect))
 
     def testQRectWithFull(self):
         '''QFontMetrics.boundingRect(QRect, ...) - all arguments'''
@@ -72,7 +72,7 @@ class BoundingRectTest(QFontMetricsTest):
         rect = self.metrics.boundingRect(arg, Qt.TextExpandTabs | Qt.AlignLeft,
                                          'PySide by INdT', 20,
                                          [1, 2, 3, 4, 5])
-        self.assert_(isinstance(rect, QRect))
+        self.assertTrue(isinstance(rect, QRect))
 
     def testQRectTypeError(self):
         '''QFontMetrics.boundingRect(QRect, ...) - type error'''
@@ -89,19 +89,19 @@ class SizeTest(QFontMetricsTest):
         '''QFontMetrics.size - default arguments'''
         size = self.metrics.size(Qt.TextExpandTabs | Qt.TextSingleLine,
                                  'PySide by INdT')
-        self.assert_(isinstance(size, QSize))
+        self.assertTrue(isinstance(size, QSize))
 
     def testWithTabStops(self):
         '''QFontMetrics.size - only tabstops'''
         size = self.metrics.size(Qt.TextExpandTabs | Qt.TextSingleLine,
                                  'PySide by INdT', 2)
-        self.assert_(isinstance(size, QSize))
+        self.assertTrue(isinstance(size, QSize))
 
     def testFull(self):
         '''QFontMetrics.size - all arguments'''
         size = self.metrics.size(Qt.TextExpandTabs | Qt.TextSingleLine,
                                  'PySide by INdT', 2, [1, 2, 3, 4])
-        self.assert_(isinstance(size, QSize))
+        self.assertTrue(isinstance(size, QSize))
 
     def testTypeError(self):
         '''QFontMetrics.size - type error'''
@@ -132,14 +132,14 @@ class FBoundingRectTest(QFontMetricsFTest):
         arg = QRectF(0, 0, 100, 200)
         rect = self.metrics.boundingRect(arg, Qt.TextExpandTabs | Qt.AlignLeft,
                                          'PySide by INdT')
-        self.assert_(isinstance(rect, QRectF))
+        self.assertTrue(isinstance(rect, QRectF))
 
     def testQRectWithArg(self):
         '''QFontMetricsF.boundingRect(QRectF, ...) - only tabstops'''
         arg = QRectF(0, 0, 100, 200)
         rect = self.metrics.boundingRect(arg, Qt.TextExpandTabs | Qt.AlignLeft,
                                          'PySide by INdT', 2)
-        self.assert_(isinstance(rect, QRectF))
+        self.assertTrue(isinstance(rect, QRectF))
 
     def testQRectWithFull(self):
         '''QFontMetricsF.boundingRect(QRectF, ...) - all arguments'''
@@ -147,7 +147,7 @@ class FBoundingRectTest(QFontMetricsFTest):
         rect = self.metrics.boundingRect(arg, Qt.TextExpandTabs | Qt.AlignLeft,
                                          'PySide by INdT', 20,
                                          [1, 2, 3, 4, 5])
-        self.assert_(isinstance(rect, QRectF))
+        self.assertTrue(isinstance(rect, QRectF))
 
     def testQRectTypeError(self):
         '''QFontMetricsF.boundingRect(QRectF, ...) - type error'''
@@ -164,19 +164,19 @@ class FSizeTest(QFontMetricsFTest):
         '''QFontMetricsF.size - default arguments'''
         size = self.metrics.size(Qt.TextExpandTabs | Qt.TextSingleLine,
                                  'PySide by INdT')
-        self.assert_(isinstance(size, QSizeF))
+        self.assertTrue(isinstance(size, QSizeF))
 
     def testWithTabStops(self):
         '''QFontMetricsF.size - only tabstops'''
         size = self.metrics.size(Qt.TextExpandTabs | Qt.TextSingleLine,
                                  'PySide by INdT', 2)
-        self.assert_(isinstance(size, QSizeF))
+        self.assertTrue(isinstance(size, QSizeF))
 
     def testFull(self):
         '''QFontMetricsF.size - all arguments'''
         size = self.metrics.size(Qt.TextExpandTabs | Qt.TextSingleLine,
                                  'PySide by INdT', 2, [1, 2, 3, 4])
-        self.assert_(isinstance(size, QSizeF))
+        self.assertTrue(isinstance(size, QSizeF))
 
     def testTypeError(self):
         '''QFontMetricsF.size - type error'''
@@ -185,5 +185,15 @@ class FSizeTest(QFontMetricsFTest):
                                          'PySide by INdT', 20, ['aaaa', 'ase'])
 
 
+class QCharTest(QFontMetricsFTest):
+
+    def testBoundingRect(self):
+        retCh = self.metrics.boundingRectChar('a')
+        self.assertEqual(type(retCh), QRectF)
+
+    def testWith(self):
+        retCh = self.metrics.widthChar('a')
+        self.assertTrue(retCh > 0)
+
 if __name__ == '__main__':
     unittest.main()
diff --git a/tests/QtGui/qformlayout_test.py b/tests/QtGui/qformlayout_test.py
new file mode 100644
index 0000000..b9bf3bf
--- /dev/null
+++ b/tests/QtGui/qformlayout_test.py
@@ -0,0 +1,56 @@
+import unittest
+from PySide.QtGui import QFormLayout, QWidget
+
+from helper import UsesQApplication
+
+class QFormLayoutTest(UsesQApplication):
+
+    def testGetItemPosition(self):
+        formlayout = QFormLayout()
+        row, role = formlayout.getItemPosition(0)
+        self.assert_(isinstance(row, int))
+        self.assert_(isinstance(role, QFormLayout.ItemRole))
+        self.assertEqual(row, -1)
+
+        widget = QWidget()
+        formlayout.addRow(widget)
+        row, role = formlayout.getItemPosition(0)
+        self.assert_(isinstance(row, int))
+        self.assert_(isinstance(role, QFormLayout.ItemRole))
+        self.assertEqual(row, 0)
+        self.assertEqual(role, QFormLayout.SpanningRole)
+
+    def testGetWidgetPosition(self):
+        formlayout = QFormLayout()
+        widget = QWidget()
+        row, role = formlayout.getWidgetPosition(widget)
+        self.assert_(isinstance(row, int))
+        self.assert_(isinstance(role, QFormLayout.ItemRole))
+        self.assertEqual(row, -1)
+
+        formlayout.addRow(widget)
+        row, role = formlayout.getWidgetPosition(widget)
+        self.assert_(isinstance(row, int))
+        self.assert_(isinstance(role, QFormLayout.ItemRole))
+        self.assertEqual(row, 0)
+        self.assertEqual(role, QFormLayout.SpanningRole)
+
+    def testGetLayoutPosition(self):
+        formlayout = QFormLayout()
+        layout = QFormLayout()
+        row, role = formlayout.getLayoutPosition(layout)
+        self.assert_(isinstance(row, int))
+        self.assert_(isinstance(role, QFormLayout.ItemRole))
+        self.assertEqual(row, -1)
+
+        formlayout.addRow(layout)
+        row, role = formlayout.getLayoutPosition(layout)
+        self.assert_(isinstance(row, int))
+        self.assert_(isinstance(role, QFormLayout.ItemRole))
+        self.assertEqual(row, 0)
+        self.assertEqual(role, QFormLayout.SpanningRole)
+
+
+if __name__ == "__main__":
+   unittest.main()
+
diff --git a/tests/qtgui/qgraphicsitem_isblocked_test.py b/tests/QtGui/qgraphicsitem_isblocked_test.py
old mode 100755
new mode 100644
similarity index 100%
rename from tests/qtgui/qgraphicsitem_isblocked_test.py
rename to tests/QtGui/qgraphicsitem_isblocked_test.py
diff --git a/tests/qtgui/qgraphicsitem_test.py b/tests/QtGui/qgraphicsitem_test.py
similarity index 100%
rename from tests/qtgui/qgraphicsitem_test.py
rename to tests/QtGui/qgraphicsitem_test.py
diff --git a/tests/qtgui/qgraphicsproxywidget_test.py b/tests/QtGui/qgraphicsproxywidget_test.py
old mode 100755
new mode 100644
similarity index 100%
rename from tests/qtgui/qgraphicsproxywidget_test.py
rename to tests/QtGui/qgraphicsproxywidget_test.py
diff --git a/tests/qtgui/qgraphicsscene_test.py b/tests/QtGui/qgraphicsscene_test.py
similarity index 77%
rename from tests/qtgui/qgraphicsscene_test.py
rename to tests/QtGui/qgraphicsscene_test.py
index 98177e7..b8fffc6 100644
--- a/tests/qtgui/qgraphicsscene_test.py
+++ b/tests/QtGui/qgraphicsscene_test.py
@@ -21,7 +21,7 @@ class Constructor(unittest.TestCase):
     def testConstructor(self):
         #QGraphicsScene constructor
         obj = QGraphicsScene()
-        self.assert_(isinstance(obj, QGraphicsScene))
+        self.assertTrue(isinstance(obj, QGraphicsScene))
 
 
 class ConstructorWithRect(unittest.TestCase):
@@ -65,49 +65,49 @@ class AddItem(UsesQApplication):
     def testEllipse(self):
         #QGraphicsScene.addEllipse
         item = self.scene.addEllipse(100, 100, 100, 100)
-        self.assert_(isinstance(item, QGraphicsEllipseItem))
+        self.assertTrue(isinstance(item, QGraphicsEllipseItem))
 
     def testLine(self):
         #QGraphicsScene.addLine
         item = self.scene.addLine(100, 100, 200, 200)
-        self.assert_(isinstance(item, QGraphicsLineItem))
+        self.assertTrue(isinstance(item, QGraphicsLineItem))
 
     def testPath(self):
         #QGraphicsScene.addPath
         item = self.scene.addPath(QPainterPath())
-        self.assert_(isinstance(item, QGraphicsPathItem))
+        self.assertTrue(isinstance(item, QGraphicsPathItem))
 
     def testPixmap(self):
         #QGraphicsScene.addPixmap
         item = self.scene.addPixmap(QPixmap())
-        self.assert_(isinstance(item, QGraphicsPixmapItem))
+        self.assertTrue(isinstance(item, QGraphicsPixmapItem))
 
     def testPolygon(self):
         #QGraphicsScene.addPolygon
         points = [QPointF(0, 0), QPointF(100, 100), QPointF(0, 100)]
         item = self.scene.addPolygon(QPolygonF(points))
-        self.assert_(isinstance(item, QGraphicsPolygonItem))
+        self.assertTrue(isinstance(item, QGraphicsPolygonItem))
 
     def testRect(self):
         #QGraphicsScene.addRect
         item = self.scene.addRect(100, 100, 100, 100)
-        self.assert_(isinstance(item, QGraphicsRectItem))
+        self.assertTrue(isinstance(item, QGraphicsRectItem))
 
     def testSimpleText(self):
         #QGraphicsScene.addSimpleText
         item = self.scene.addSimpleText('Monty Python 42')
-        self.assert_(isinstance(item, QGraphicsSimpleTextItem))
+        self.assertTrue(isinstance(item, QGraphicsSimpleTextItem))
 
     def testText(self):
         #QGraphicsScene.addText
         item = self.scene.addText('Monty Python 42')
-        self.assert_(isinstance(item, QGraphicsTextItem))
+        self.assertTrue(isinstance(item, QGraphicsTextItem))
 
     def testWidget(self):
         #QGraphicsScene.addWidget
         # XXX: printing some X11 error when using under PyQt4
         item = self.scene.addWidget(QPushButton())
-        self.assert_(isinstance(item, QGraphicsProxyWidget))
+        self.assertTrue(isinstance(item, QGraphicsProxyWidget))
 
 
 class ItemRetrieve(UsesQApplication):
@@ -139,7 +139,8 @@ class ItemRetrieve(UsesQApplication):
     def testItems(self):
         #QGraphicsScene.items()
         items = self.scene.items()
-        self.assertEqual(items.sort(), self.items.sort())
+        for i in items:
+            self.assertTrue(i in self.items)
 
     def testItemAt(self):
         #QGraphicsScene.itemAt()
@@ -148,5 +149,21 @@ class ItemRetrieve(UsesQApplication):
         self.assertEqual(self.scene.itemAt(50, 150), self.bottomleft)
         self.assertEqual(self.scene.itemAt(150, 150), self.bottomright)
 
+class TestGraphicsGroup(UsesQApplication):
+    def testIt(self):
+        scene = QGraphicsScene()
+        i1 = QGraphicsRectItem()
+        scene.addItem(i1)
+        i2 = QGraphicsRectItem(i1)
+        i3 = QGraphicsRectItem()
+        i4 = QGraphicsRectItem()
+        group = scene.createItemGroup((i2, i3, i4))
+        scene.removeItem(i1)
+        del i1 # this shouldn't delete i2
+        self.assertEqual(i2.scene(), scene)
+        scene.destroyItemGroup(group)
+        self.assertRaises(RuntimeError, group.type)
+
+
 if __name__ == '__main__':
     unittest.main()
diff --git a/tests/QtGui/qicon_test.py b/tests/QtGui/qicon_test.py
new file mode 100644
index 0000000..738e72c
--- /dev/null
+++ b/tests/QtGui/qicon_test.py
@@ -0,0 +1,17 @@
+
+import unittest
+
+from helper import TimedQApplication
+from PySide.QtGui import QIcon
+
+
+class QIconCtorWithNoneTest(TimedQApplication):
+    '''Test made by seblin, see Bug #944: http://bugs.pyside.org/show_bug.cgi?id=944'''
+
+    def testQIconCtorWithNone(self):
+        icon = QIcon(None)
+        pixmap = icon.pixmap(48, 48)
+        self.app.exec_()
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/tests/QtGui/qimage_test.py b/tests/QtGui/qimage_test.py
new file mode 100644
index 0000000..bf73355
--- /dev/null
+++ b/tests/QtGui/qimage_test.py
@@ -0,0 +1,280 @@
+
+'''Test cases for QImage'''
+
+import unittest
+import py3kcompat as py3k
+from PySide.QtGui import *
+from helper import UsesQApplication, adjust_filename
+
+xpm = [
+    "27 22 206 2",
+    "   c None",
+    ".  c #FEFEFE",
+    "+  c #FFFFFF",
+    "@  c #F9F9F9",
+    "#  c #ECECEC",
+    "$  c #D5D5D5",
+    "%  c #A0A0A0",
+    "&  c #767676",
+    "*  c #525252",
+    "=  c #484848",
+    "-  c #4E4E4E",
+    ";  c #555555",
+    ">  c #545454",
+    ",  c #5A5A5A",
+    "'  c #4B4B4B",
+    ")  c #4A4A4A",
+    "!  c #4F4F4F",
+    "~  c #585858",
+    "{  c #515151",
+    "]  c #4C4C4C",
+    "^  c #B1B1B1",
+    "/  c #FCFCFC",
+    "(  c #FDFDFD",
+    "_  c #C1C1C1",
+    ":  c #848484",
+    "<  c #616161",
+    "[  c #5E5E5E",
+    "}  c #CECECE",
+    "|  c #E2E2E2",
+    "1  c #E4E4E4",
+    "2  c #DFDFDF",
+    "3  c #D2D2D2",
+    "4  c #D8D8D8",
+    "5  c #D4D4D4",
+    "6  c #E6E6E6",
+    "7  c #F1F1F1",
+    "8  c #838383",
+    "9  c #8E8E8E",
+    "0  c #8F8F8F",
+    "a  c #CBCBCB",
+    "b  c #CCCCCC",
+    "c  c #E9E9E9",
+    "d  c #F2F2F2",
+    "e  c #EDEDED",
+    "f  c #B5B5B5",
+    "g  c #A6A6A6",
+    "h  c #ABABAB",
+    "i  c #BBBBBB",
+    "j  c #B0B0B0",
+    "k  c #EAEAEA",
+    "l  c #6C6C6C",
+    "m  c #BCBCBC",
+    "n  c #F5F5F5",
+    "o  c #FAFAFA",
+    "p  c #B6B6B6",
+    "q  c #F3F3F3",
+    "r  c #CFCFCF",
+    "s  c #FBFBFB",
+    "t  c #CDCDCD",
+    "u  c #DDDDDD",
+    "v  c #999999",
+    "w  c #F0F0F0",
+    "x  c #2B2B2B",
+    "y  c #C3C3C3",
+    "z  c #A4A4A4",
+    "A  c #D7D7D7",
+    "B  c #E7E7E7",
+    "C  c #6E6E6E",
+    "D  c #9D9D9D",
+    "E  c #BABABA",
+    "F  c #AEAEAE",
+    "G  c #898989",
+    "H  c #646464",
+    "I  c #BDBDBD",
+    "J  c #CACACA",
+    "K  c #2A2A2A",
+    "L  c #212121",
+    "M  c #B7B7B7",
+    "N  c #F4F4F4",
+    "O  c #737373",
+    "P  c #828282",
+    "Q  c #4D4D4D",
+    "R  c #000000",
+    "S  c #151515",
+    "T  c #B2B2B2",
+    "U  c #D6D6D6",
+    "V  c #D3D3D3",
+    "W  c #2F2F2F",
+    "X  c #636363",
+    "Y  c #A1A1A1",
+    "Z  c #BFBFBF",
+    "`  c #E0E0E0",
+    " . c #6A6A6A",
+    ".. c #050505",
+    "+. c #A3A3A3",
+    "@. c #202020",
+    "#. c #5F5F5F",
+    "$. c #B9B9B9",
+    "%. c #C7C7C7",
+    "&. c #D0D0D0",
+    "*. c #3E3E3E",
+    "=. c #666666",
+    "-. c #DBDBDB",
+    ";. c #424242",
+    ">. c #C2C2C2",
+    ",. c #1A1A1A",
+    "'. c #2C2C2C",
+    "). c #F6F6F6",
+    "!. c #AAAAAA",
+    "~. c #DCDCDC",
+    "{. c #2D2D2D",
+    "]. c #2E2E2E",
+    "^. c #A7A7A7",
+    "/. c #656565",
+    "(. c #333333",
+    "_. c #464646",
+    ":. c #C4C4C4",
+    "<. c #B8B8B8",
+    "[. c #292929",
+    "}. c #979797",
+    "|. c #EFEFEF",
+    "1. c #909090",
+    "2. c #8A8A8A",
+    "3. c #575757",
+    "4. c #676767",
+    "5. c #C5C5C5",
+    "6. c #7A7A7A",
+    "7. c #797979",
+    "8. c #989898",
+    "9. c #EEEEEE",
+    "0. c #707070",
+    "a. c #C8C8C8",
+    "b. c #111111",
+    "c. c #AFAFAF",
+    "d. c #474747",
+    "e. c #565656",
+    "f. c #E3E3E3",
+    "g. c #494949",
+    "h. c #5B5B5B",
+    "i. c #222222",
+    "j. c #353535",
+    "k. c #D9D9D9",
+    "l. c #0A0A0A",
+    "m. c #858585",
+    "n. c #E5E5E5",
+    "o. c #0E0E0E",
+    "p. c #9A9A9A",
+    "q. c #6F6F6F",
+    "r. c #868686",
+    "s. c #060606",
+    "t. c #1E1E1E",
+    "u. c #E8E8E8",
+    "v. c #A5A5A5",
+    "w. c #0D0D0D",
+    "x. c #030303",
+    "y. c #272727",
+    "z. c #131313",
+    "A. c #1F1F1F",
+    "B. c #757575",
+    "C. c #F7F7F7",
+    "D. c #414141",
+    "E. c #080808",
+    "F. c #6B6B6B",
+    "G. c #313131",
+    "H. c #C0C0C0",
+    "I. c #C9C9C9",
+    "J. c #0B0B0B",
+    "K. c #232323",
+    "L. c #434343",
+    "M. c #3D3D3D",
+    "N. c #282828",
+    "O. c #7C7C7C",
+    "P. c #252525",
+    "Q. c #3A3A3A",
+    "R. c #F8F8F8",
+    "S. c #1B1B1B",
+    "T. c #949494",
+    "U. c #3B3B3B",
+    "V. c #242424",
+    "W. c #383838",
+    "X. c #6D6D6D",
+    "Y. c #818181",
+    "Z. c #939393",
+    "`. c #9E9E9E",
+    " + c #929292",
+    ".+ c #7D7D7D",
+    "++ c #ADADAD",
+    "@+ c #DADADA",
+    "#+ c #919191",
+    "$+ c #E1E1E1",
+    "%+ c #BEBEBE",
+    "&+ c #ACACAC",
+    "*+ c #9C9C9C",
+    "=+ c #B3B3B3",
+    "-+ c #808080",
+    ";+ c #A8A8A8",
+    ">+ c #393939",
+    ",+ c #747474",
+    "'+ c #7F7F7F",
+    ")+ c #D1D1D1",
+    "!+ c #606060",
+    "~+ c #5C5C5C",
+    "{+ c #686868",
+    "]+ c #7E7E7E",
+    "^+ c #787878",
+    "/+ c #595959",
+    ". . . + @ # $ % & * = - ; > , ' ) ! ~ { ] ^ / . . + + ",
+    ". ( + _ : < [ & } | 1 2 $ 3 4 5 3 6 7 + + 8 9 + . + . ",
+    ". + 0 9 a ( 3 a b c d e c f g h i g j $ k + l m + . + ",
+    "+ 2 8 n o p | ( q r s . # t + + + u ^ v e w + x + + + ",
+    "+ y z . @ A k B 7 n + ( s | p 8 C D 2 E 4 + + F G + . ",
+    "# H I $ J G K L - M N . 2 O P Q R R S T U s s V W j + ",
+    "X Y Z @ o ` _ g  ...+.( 4 @.#.m G $.%.7 &.X *.=.-.;.&.",
+    "Q >.C ,.'.} e + ).!.k + . + + . ~.{.> ].x f 7 ^./.k (.",
+    "_.:.4 @ <.[.}.|.1.2.+ + + >.} 4 B + ( @ _ 3.4.5.6.r 7.",
+    "3.8.9.~ 0.+ a.Q b.+ + c.d.#.=.$ |.b #.e.z ^ ; ^. .f.g.",
+    "-.h.+ i.S M + # p j.% n 9.5.k.H l.m.V ^.n.o.M + M p.q.",
+    "7 r.N s.1.R t.<.|.| u.v.~ w.x.E + s y.z.A.B.C.+ 5 D.q ",
+    ").p.2 E.0.9 F.%.O {._ @.+ + i { [ i.G.H.P I.+ s q.} + ",
+    ").p.6 J.R b.K.L.M.A.! b.g.K [.R M k + N.I + + >.O.+ . ",
+    ").8.9.N.P...R R R R E.t.W n.+ Q.R.6 @.| + . + S.+ + . ",
+    "n }.w T.U.B.<.i.@ Y + + U.+ c u V.= B B 7 u.W.c + . + ",
+    "N T.# + }.X.Y.,.8.F.8 Z.[.`. +.+}.4 ++@+O.< ~.+ ( . + ",
+    "d #+1 + _ ~.u.$+b $.y @+| $+%+I.&+k.h W +.9.+ ( . + . ",
+    "w 0 |.*+. >.<.=+++++p a.p -+;+5.k.>+,+@ + . . + . + + ",
+    "q '+9.R.^ I.t b %.I.)+4 $+n.I.,+ .|.+ . . . + . + + + ",
+    ". p !+( + + + + + + E 0. .-+8.f.+ + . . + + . + + + + ",
+    ". ( A ~+{+]+^+l > /+D f.c q . + . . + + . + + + + + + "
+]
+
+class QImageTest(UsesQApplication):
+    '''Test case for calling setPixel with float as argument'''
+
+    def testQImageStringBuffer(self):
+        '''Test if the QImage signatures receiving string buffers exist.'''
+        img0 = QImage(adjust_filename('sample.png', __file__))
+
+        # btw let's test the bits() method
+        img1 = QImage(img0.bits(), img0.width(), img0.height(), img0.format())
+        self.assertEqual(img0, img1)
+        img2 = QImage(img0.bits(), img0.width(), img0.height(), img0.bytesPerLine(), img0.format())
+        self.assertEqual(img0, img2)
+
+        ## test scanLine method
+        data1 = img0.scanLine(0)
+        data2 = img1.scanLine(0)
+        self.assertEqual(data1, data2)
+
+        # PySide python 3.x does not support slice yet
+        if not py3k.IS_PY3K:
+            buff = py3k.buffer(img0.bits()[:img0.bytesPerLine()])
+            self.assertEqual(data1, buff)
+            self.assertEqual(data2, buff)
+
+    def testEmptyBuffer(self):
+        img = QImage(py3k.buffer(''), 100, 100, QImage.Format_ARGB32)
+
+    def testEmptyStringAsBuffer(self):
+        img = QImage(py3k.b(''), 100, 100, QImage.Format_ARGB32)
+
+    def testXpmConstructor(self):
+        label = QLabel()
+        img = QImage(xpm)
+        self.assertFalse(img.isNull())
+        self.assertEqual(img.width(), 27)
+        self.assertEqual(img.height(), 22)
+
+if __name__ == '__main__':
+    unittest.main()
+
diff --git a/tests/QtGui/qinputcontext_test.py b/tests/QtGui/qinputcontext_test.py
new file mode 100644
index 0000000..1dc3e12
--- /dev/null
+++ b/tests/QtGui/qinputcontext_test.py
@@ -0,0 +1,26 @@
+
+import unittest
+
+from PySide.QtCore import Qt
+from PySide.QtGui import QPushButton
+from helper import UsesQApplication
+
+class QInputContextTest(UsesQApplication):
+
+    def testSetFocusWidget(self):
+        widget = QPushButton()
+        widget.show()
+
+        context = self.app.inputContext()
+        self.assertEqual(context.focusWidget(), None)
+
+        if not widget.testAttribute(Qt.WA_InputMethodEnabled):
+            widget.setAttribute(Qt.WA_InputMethodEnabled)
+
+        context.setFocusWidget(widget)
+        self.assertEqual(context.focusWidget(), widget)
+
+
+if __name__ == '__main__':
+    unittest.main()
+
diff --git a/tests/qtgui/qinputdialog_get_test.py b/tests/QtGui/qinputdialog_get_test.py
similarity index 94%
rename from tests/qtgui/qinputdialog_get_test.py
rename to tests/QtGui/qinputdialog_get_test.py
index c75f712..ce3a60d 100644
--- a/tests/qtgui/qinputdialog_get_test.py
+++ b/tests/QtGui/qinputdialog_get_test.py
@@ -15,7 +15,7 @@ class TestInputDialog(TimedQApplication):
         self.assertEquals(QtGui.QInputDialog.getInteger(None, "title", "label"), (0, False))
 
     def testGetItem(self):
-        (item, bool) = QtGui.QInputDialog.getItem(None, "title", "label", QtCore.QStringList(["1", "2", "3"]))
+        (item, bool) = QtGui.QInputDialog.getItem(None, "title", "label", ["1", "2", "3"])
         self.assertEquals(str(item), "1")
 
     def testGetText(self):
diff --git a/tests/qtgui/qitemselection_test.py b/tests/QtGui/qitemselection_test.py
similarity index 100%
rename from tests/qtgui/qitemselection_test.py
rename to tests/QtGui/qitemselection_test.py
diff --git a/tests/QtGui/qkeysequence_test.py b/tests/QtGui/qkeysequence_test.py
new file mode 100644
index 0000000..8a5c3a4
--- /dev/null
+++ b/tests/QtGui/qkeysequence_test.py
@@ -0,0 +1,20 @@
+import unittest
+
+from PySide.QtCore import Qt
+from PySide.QtGui import QKeySequence
+
+from helper import UsesQApplication
+
+class QKeySequenceTest(UsesQApplication):
+
+    def testGetItemOperator(self):
+        # bug #774
+        ks = QKeySequence(Qt.SHIFT, Qt.CTRL, Qt.Key_P, Qt.Key_R)
+        self.assertEqual(ks[0], Qt.SHIFT)
+        self.assertEqual(ks[1], Qt.CTRL)
+        self.assertEqual(ks[2], Qt.Key_P)
+        self.assertEqual(ks[3], Qt.Key_R)
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/tests/qtgui/qlayout_ref_test.py b/tests/QtGui/qlayout_ref_test.py
similarity index 76%
rename from tests/qtgui/qlayout_ref_test.py
rename to tests/QtGui/qlayout_ref_test.py
index a634271..695e2f1 100644
--- a/tests/qtgui/qlayout_ref_test.py
+++ b/tests/QtGui/qlayout_ref_test.py
@@ -46,7 +46,7 @@ class SaveReference(UsesQApplication):
         l = QHBoxLayout()
         self.assertEqual(getrefcount(self.widget1), 2)
         l.addWidget(self.widget1)
-        self.assertEqual(getrefcount(self.widget1), 2)
+        self.assertEqual(getrefcount(self.widget1), 3)
 
         w = QWidget()
         w.setLayout(l)
@@ -108,5 +108,45 @@ class MultipleAdd(UsesQApplication):
         self.layout.addWidget(self.widget)
         self.assertEqual(getrefcount(self.widget), 3)
 
+class InternalAdd(UsesQApplication):
+    def testInternalRef(self):
+        mw = QWidget()
+        w = QWidget()
+        ow = QWidget()
+
+        topLayout = QGridLayout()
+
+        # unique reference
+        self.assertEqual(getrefcount(w), 2)
+        self.assertEqual(getrefcount(ow), 2)
+
+        topLayout.addWidget(w, 0, 0)
+        topLayout.addWidget(ow, 1, 0)
+
+        # layout keep the referemce
+        self.assertEqual(getrefcount(w), 3)
+        self.assertEqual(getrefcount(ow), 3)
+
+        mainLayout = QGridLayout()
+
+        mainLayout.addLayout(topLayout, 1, 0, 1, 4)
+
+        # the same reference
+        self.assertEqual(getrefcount(w), 3)
+        self.assertEqual(getrefcount(ow), 3)
+
+        mw.setLayout(mainLayout)
+
+        # now trasfer the ownership to mw
+        self.assertEqual(getrefcount(w), 3)
+        self.assertEqual(getrefcount(ow), 3)
+
+        del mw
+
+        # remove the ref and invalidate the widget
+        self.assertEqual(getrefcount(w), 2)
+        self.assertEqual(getrefcount(ow), 2)
+
+
 if __name__ == '__main__':
     unittest.main()
diff --git a/tests/QtGui/qlayout_test.py b/tests/QtGui/qlayout_test.py
new file mode 100644
index 0000000..999e4c9
--- /dev/null
+++ b/tests/QtGui/qlayout_test.py
@@ -0,0 +1,112 @@
+import unittest
+import sys
+
+from helper import UsesQApplication
+from PySide.QtCore import *
+from PySide.QtGui import *
+
+class MyLayout(QLayout):
+    def __init__(self, parent=None):
+        QLayout.__init__(self, parent)
+        self._list = []
+
+    def addItem(self, item):
+        self.add(item)
+
+    def addWidget(self, widget):
+        self.add(QWidgetItem(widget))
+
+    def itemAt(self, index):
+        if index < len(self._list):
+            return self._list[index]
+
+        return None
+
+    def count(self):
+        return len(self._list)
+
+    def add(self, item):
+        self._list.append(item)
+
+class MissingItemAtLayout(QLayout):
+    def __init__(self, parent=None):
+        QLayout.__init__(self, parent)
+        self._list = []
+
+    def addItem(self, item):
+        self.add(item)
+
+    def addWidget(self, widget):
+        self.add(QWidgetItem(widget))
+
+    def count(self):
+        return len(self._list)
+
+    def add(self, item):
+        self._list.append(item)
+
+#Test if a layout implemented in python, the QWidget.setLayout works
+#fine because this implement som layout functions used in glue code of
+#QWidget, then in c++ when call a virtual function this need call the QLayout
+#function implemented in python
+
+class QLayoutTest(UsesQApplication):
+    def testOwnershipTransfer(self):
+        b = QPushButton("teste")
+        l = MyLayout()
+
+        l.addWidget(b)
+
+        self.assertEqual(sys.getrefcount(b), 2)
+
+        w = QWidget()
+
+        #transfer ref
+        w.setLayout(l)
+
+        self.assertEqual(sys.getrefcount(b), 3)
+
+
+    def testReferenceTransfer(self):
+        b = QPushButton("teste")
+        l = QHBoxLayout()
+
+        # keep ref
+        l.addWidget(b)
+        self.assertEqual(sys.getrefcount(b), 3)
+
+        w = QWidget()
+
+        # transfer ref
+        w.setLayout(l)
+
+        self.assertEqual(sys.getrefcount(b), 3)
+
+        # release ref
+        del w
+
+        self.assertEqual(sys.getrefcount(b), 2)
+
+    def testMissingFunctions(self):
+        w = QWidget()
+        b = QPushButton("test")
+        l = MissingItemAtLayout()
+
+        l.addWidget(b)
+
+        self.assertRaises(RuntimeError, w.setLayout, l)
+
+    def testQFormLayout(self):
+        w = QWidget()
+        formLayout = QFormLayout()
+        spacer = QSpacerItem(100, 30)
+        formLayout.setItem(0, QFormLayout.SpanningRole, spacer)
+        w.setLayout(formLayout)
+        w.show()
+        QTimer.singleShot(10, w.close)
+        self.app.exec_()
+        del w
+        self.assertRaises(RuntimeError, spacer.isEmpty)
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/tests/qtgui/qlcdnumber_test.py b/tests/QtGui/qlcdnumber_test.py
similarity index 100%
rename from tests/qtgui/qlcdnumber_test.py
rename to tests/QtGui/qlcdnumber_test.py
diff --git a/tests/QtGui/qlistwidget_test.py b/tests/QtGui/qlistwidget_test.py
new file mode 100644
index 0000000..16c919b
--- /dev/null
+++ b/tests/QtGui/qlistwidget_test.py
@@ -0,0 +1,55 @@
+
+import unittest
+
+import sys
+from PySide import QtGui, QtCore
+from helper import UsesQApplication
+
+class QListWidgetTest(UsesQApplication):
+
+    def populateList(self, lst):
+        o = QtCore.QObject()
+        o.setObjectName("obj")
+
+        item = QtGui.QListWidgetItem("item0")
+        item.setData(QtCore.Qt.UserRole, o)
+        #item._data = o
+        self.assert_(sys.getrefcount(o), 3)
+        self.assert_(sys.getrefcount(item), 2)
+        lst.addItem(item)
+        self.assert_(sys.getrefcount(item), 3)
+
+    def checkCurrentItem(self, lst):
+        item = lst.currentItem()
+        self.assert_(sys.getrefcount(item), 3)
+
+    def checkItemData(self, lst):
+        item = lst.currentItem()
+        o = item.data(QtCore.Qt.UserRole)
+        self.assert_(sys.getrefcount(o), 4)
+        self.assertEqual(o, item._data)
+        self.assert_(sys.getrefcount(o), 2)
+
+    def testConstructorWithParent(self):
+        lst = QtGui.QListWidget()
+        self.populateList(lst)
+        self.checkCurrentItem(lst)
+        i = lst.item(0)
+        self.assert_(sys.getrefcount(i), 3)
+
+        del lst
+        self.assert_(sys.getrefcount(i), 2)
+        del i
+
+    def testIt(self):
+        lst = QtGui.QListWidget()
+        lst.show()
+        slot = lambda : lst.removeItemWidget(lst.currentItem())
+        lst.addItem(QtGui.QListWidgetItem("foo"))
+        QtCore.QTimer.singleShot(0, slot)
+        QtCore.QTimer.singleShot(0, lst.close)
+        self.app.exec_()
+        self.assertEqual(lst.count(), 1)
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/tests/qtgui/qlistwidgetitem_test.py b/tests/QtGui/qlistwidgetitem_test.py
similarity index 80%
rename from tests/qtgui/qlistwidgetitem_test.py
rename to tests/QtGui/qlistwidgetitem_test.py
index 8f96c51..e41dfc4 100644
--- a/tests/qtgui/qlistwidgetitem_test.py
+++ b/tests/QtGui/qlistwidgetitem_test.py
@@ -21,5 +21,9 @@ class QListWidgetItemConstructor(UsesQApplication):
         item = self.widgetList.item(0)
         self.assertEqual(item.listWidget(), self.widgetList)
 
+    def testConstructorWithNone(self):
+        # Bug 452 - QListWidgetItem() not casting NoneType to null correctly.
+        item = QtGui.QListWidgetItem(None, 123)
+
 if __name__ == '__main__':
     unittest.main()
diff --git a/tests/QtGui/qmainwindow_test.py b/tests/QtGui/qmainwindow_test.py
new file mode 100644
index 0000000..6ea84ab
--- /dev/null
+++ b/tests/QtGui/qmainwindow_test.py
@@ -0,0 +1,85 @@
+import unittest
+import sys
+import weakref
+
+from PySide import QtGui
+from PySide import QtCore
+
+from helper import UsesQApplication
+
+class MainWindow(QtGui.QMainWindow):
+    def __init__(self):
+        QtGui.QMainWindow.__init__(self)
+
+        self.createToolbar()
+
+    def createToolbar(self):
+        pointerButton = QtGui.QToolButton()
+        pointerToolbar = self.addToolBar("Pointer type")
+        pointerToolbar.addWidget(pointerButton)
+
+class MyButton(QtGui.QPushButton):
+    def __init__(self, parent=None):
+        QtGui.QPushButton.__init__(self)
+        self._called = False
+
+    def myCallback(self):
+        self._called = True
+
+
+class TestMainWindow(UsesQApplication):
+
+    def testCreateToolbar(self):
+        w = MainWindow()
+        w.show()
+        QtCore.QTimer.singleShot(1000, self.app.quit)
+        self.app.exec_()
+
+    def objDel(self, obj):
+        self.app.quit()
+
+    def testRefCountToNull(self):
+        w = QtGui.QMainWindow()
+        c = QtGui.QWidget()
+        self.assertEqual(sys.getrefcount(c), 2)
+        w.setCentralWidget(c)
+        self.assertEqual(sys.getrefcount(c), 3)
+        wr = weakref.ref(c, self.objDel)
+        w.setCentralWidget(None)
+        c = None
+        self.app.exec_()
+
+    def testRefCountToAnother(self):
+        w = QtGui.QMainWindow()
+        c = QtGui.QWidget()
+        self.assertEqual(sys.getrefcount(c), 2)
+        w.setCentralWidget(c)
+        self.assertEqual(sys.getrefcount(c), 3)
+
+        c2 = QtGui.QWidget()
+        w.setCentralWidget(c2)
+        self.assertEqual(sys.getrefcount(c2), 3)
+
+        wr = weakref.ref(c, self.objDel)
+        w.setCentralWidget(None)
+        c = None
+
+        self.app.exec_()
+
+    def testSignalDisconect(self):
+        w = QtGui.QMainWindow()
+        b = MyButton("button")
+        b.clicked.connect(b.myCallback)
+        w.setCentralWidget(b)
+
+        b = MyButton("button")
+        b.clicked.connect(b.myCallback)
+        w.setCentralWidget(b)
+
+        b.click()
+        self.assertEqual(b._called, True)
+
+
+if __name__ == '__main__':
+    unittest.main()
+
diff --git a/tests/qtgui/qmatrix_test.py b/tests/QtGui/qmatrix_test.py
similarity index 80%
rename from tests/qtgui/qmatrix_test.py
rename to tests/QtGui/qmatrix_test.py
index 7c87e23..d1fa91e 100644
--- a/tests/qtgui/qmatrix_test.py
+++ b/tests/QtGui/qmatrix_test.py
@@ -44,6 +44,15 @@ class QMatrixTest(unittest.TestCase):
         d = m.copyDataTo()
         self.assert_(my_data == list(d))
 
+    def testMatrixMapping(self):
+        m = QMatrix(1.0, 2.0, 1.0, 3.0, 100.0, 200.0)
+        res = m.map(5, 5)
+        self.assertAlmostEqual(res[0], 5 * 1.0 + 5 * 1.0 + 100.0)
+        self.assertAlmostEqual(res[1], 5 * 2.0 + 5 * 3.0 + 200.0)
+        res = m.map(5.0, 5.0)
+        self.assertAlmostEqual(res[0], 5.0 * 1.0 + 5.0 * 1.0 + 100.0)
+        self.assertAlmostEqual(res[1], 5.0 * 2.0 + 5.0 * 3.0 + 200.0)
+
 if __name__ == '__main__':
     unittest.main()
 
diff --git a/tests/qtgui/qmenu_test.py b/tests/QtGui/qmenu_test.py
similarity index 100%
rename from tests/qtgui/qmenu_test.py
rename to tests/QtGui/qmenu_test.py
diff --git a/tests/qtgui/qmenuadd_test.py b/tests/QtGui/qmenuadd_test.py
similarity index 100%
rename from tests/qtgui/qmenuadd_test.py
rename to tests/QtGui/qmenuadd_test.py
diff --git a/tests/qtgui/qobject_mi_test.py b/tests/QtGui/qobject_mi_test.py
similarity index 78%
rename from tests/qtgui/qobject_mi_test.py
rename to tests/QtGui/qobject_mi_test.py
index 8ccc1d3..28b3cbd 100644
--- a/tests/qtgui/qobject_mi_test.py
+++ b/tests/QtGui/qobject_mi_test.py
@@ -29,8 +29,10 @@ class DoubleQObjectInheritanceTest(UsesQApplication):
         self.assertFalse(obj.isVisible())
 
         #QIntValidator methods
-        self.assertEqual(obj.validate('aaaa', 0), QValidator.Invalid)
-        self.assertEqual(obj.validate('33', 0), QValidator.Acceptable)
+        state, string, number = obj.validate('aaaa', 0)
+        self.assertEqual(state, QValidator.Invalid)
+        state, string, number = obj.validate('33', 0)
+        self.assertEqual(state, QValidator.Acceptable)
 
 
 if __name__ == '__main__':
diff --git a/tests/QtGui/qpainter_test.py b/tests/QtGui/qpainter_test.py
new file mode 100644
index 0000000..f86718e
--- /dev/null
+++ b/tests/QtGui/qpainter_test.py
@@ -0,0 +1,83 @@
+import unittest
+
+from PySide.QtGui import QPainter, QLinearGradient
+from PySide.QtCore import QLine, QLineF, QPoint, QPointF, QRect, QRectF, Qt
+
+class QPainterDrawText(unittest.TestCase):
+
+    def setUp(self):
+        self.painter = QPainter()
+        self.text = 'teste!'
+
+    def tearDown(self):
+        del self.text
+        del self.painter
+
+    def testDrawText(self):
+        # bug #254
+        rect = self.painter.drawText(100, 100, 100, 100,
+                                     Qt.AlignCenter | Qt.TextWordWrap,
+                                     self.text)
+        self.assert_(isinstance(rect, QRect))
+
+    def testDrawTextWithRect(self):
+        # bug #225
+        rect = QRect(100, 100, 100, 100)
+        newRect = self.painter.drawText(rect, Qt.AlignCenter | Qt.TextWordWrap,
+                                        self.text)
+
+        self.assert_(isinstance(newRect, QRect))
+
+    def testDrawTextWithRectF(self):
+        '''QPainter.drawText(QRectF, ... ,QRectF*) inject code'''
+        rect = QRectF(100, 52.3, 100, 100)
+        newRect = self.painter.drawText(rect, Qt.AlignCenter | Qt.TextWordWrap,
+                                        self.text)
+
+        self.assert_(isinstance(newRect, QRectF))
+
+    def testDrawOverloads(self):
+        '''Calls QPainter.drawLines overloads, if something is
+           wrong Exception and chaos ensues. Bug #395'''
+        self.painter.drawLines([QLine(QPoint(0,0), QPoint(1,1))])
+        self.painter.drawLines([QPoint(0,0), QPoint(1,1)])
+        self.painter.drawLines([QPointF(0,0), QPointF(1,1)])
+        self.painter.drawLines([QLineF(QPointF(0,0), QPointF(1,1))])
+        self.painter.drawPoints([QPoint(0,0), QPoint(1,1)])
+        self.painter.drawPoints([QPointF(0,0), QPointF(1,1)])
+        self.painter.drawConvexPolygon([QPointF(10.0, 80.0),
+                                        QPointF(20.0, 10.0),
+                                        QPointF(80.0, 30.0),
+                                        QPointF(90.0, 70.0)])
+        self.painter.drawConvexPolygon([QPoint(10.0, 80.0),
+                                        QPoint(20.0, 10.0),
+                                        QPoint(80.0, 30.0),
+                                        QPoint(90.0, 70.0)])
+        self.painter.drawPolygon([QPointF(10.0, 80.0),
+                                  QPointF(20.0, 10.0),
+                                  QPointF(80.0, 30.0),
+                                  QPointF(90.0, 70.0)])
+        self.painter.drawPolygon([QPoint(10.0, 80.0),
+                                  QPoint(20.0, 10.0),
+                                  QPoint(80.0, 30.0),
+                                  QPoint(90.0, 70.0)])
+        self.painter.drawPolyline([QPointF(10.0, 80.0),
+                                   QPointF(20.0, 10.0),
+                                   QPointF(80.0, 30.0),
+                                   QPointF(90.0, 70.0)])
+        self.painter.drawPolyline([QPoint(10.0, 80.0),
+                                   QPoint(20.0, 10.0),
+                                   QPoint(80.0, 30.0),
+                                   QPoint(90.0, 70.0)])
+
+class SetBrushWithOtherArgs(unittest.TestCase):
+    '''Using qpainter.setBrush with args other than QBrush'''
+
+    def testSetBrushGradient(self):
+        painter = QPainter()
+        gradient = QLinearGradient(0, 0, 0, 0)
+        painter.setBrush(gradient)
+
+if __name__ == '__main__':
+    unittest.main()
+
diff --git a/tests/QtGui/qpen_test.py b/tests/QtGui/qpen_test.py
new file mode 100644
index 0000000..b1e0b7a
--- /dev/null
+++ b/tests/QtGui/qpen_test.py
@@ -0,0 +1,44 @@
+
+import unittest
+from helper import UsesQApplication
+
+from PySide.QtCore import Qt, QTimer
+from PySide.QtGui import QPen, QPainter, QWidget
+
+class Painting(QWidget):
+    def __init__(self):
+        QWidget.__init__(self)
+        self.penFromEnum = None
+        self.penFromInteger = None
+
+    def paintEvent(self, event):
+        painter = QPainter(self)
+        painter.setPen(Qt.NoPen)
+        self.penFromEnum = painter.pen()
+        painter.setPen(int(Qt.NoPen))
+        self.penFromInteger = painter.pen()
+
+
+class QPenTest(UsesQApplication):
+
+    def testCtorWithCreatedEnums(self):
+        '''A simple case of QPen creation using created enums.'''
+        width = 0
+        style = Qt.PenStyle(0)
+        cap = Qt.PenCapStyle(0)
+        join = Qt.PenJoinStyle(0)
+        pen = QPen(Qt.blue, width, style, cap, join)
+
+    def testSetPenWithPenStyleEnum(self):
+        '''Calls QPainter.setPen with both enum and integer. Bug #511.'''
+        w = Painting()
+        w.show()
+        QTimer.singleShot(1000, self.app.quit)
+        self.app.exec_()
+        self.assertEqual(w.penFromEnum.style(), Qt.NoPen)
+        self.assertEqual(w.penFromInteger.style(), Qt.SolidLine)
+
+
+if __name__ == '__main__':
+    unittest.main()
+
diff --git a/tests/QtGui/qpicture_test.py b/tests/QtGui/qpicture_test.py
new file mode 100644
index 0000000..3cc2489
--- /dev/null
+++ b/tests/QtGui/qpicture_test.py
@@ -0,0 +1,37 @@
+import unittest
+
+import os
+from helper import UsesQApplication
+from PySide.QtCore import QTimer
+from PySide.QtGui import QPicture, QPainter, QWidget
+
+class MyWidget(QWidget):
+    def paintEvent(self, e):
+        p = QPainter(self)
+        p.drawPicture(0, 0, self._picture)
+        self._app.quit()
+
+class QPictureTest(UsesQApplication):
+    def testFromData(self):
+        picture = QPicture()
+        painter = QPainter()
+        painter.begin(picture)
+        painter.drawEllipse(10,20, 80,70)
+        painter.end()
+
+        data = picture.data()
+        picture2 = QPicture()
+        picture2.setData(data)
+
+        self.assertEqual(picture2.data(), picture.data())
+
+        w = MyWidget()
+        w._picture = picture2
+        w._app = self.app
+
+        QTimer.singleShot(300, w.show)
+        self.app.exec_()
+
+if __name__ == '__main__':
+    unittest.main()
+
diff --git a/tests/QtGui/qpixmap_constructor.py b/tests/QtGui/qpixmap_constructor.py
new file mode 100644
index 0000000..6ad6dbe
--- /dev/null
+++ b/tests/QtGui/qpixmap_constructor.py
@@ -0,0 +1,250 @@
+#!/usr/bin/python
+
+import unittest
+
+from PySide.QtGui import QLabel, QPixmap
+
+from helper import UsesQApplication
+
+xpm = [
+    "27 22 206 2",
+    "  	c None",
+    ". 	c #FEFEFE",
+    "+ 	c #FFFFFF",
+    "@ 	c #F9F9F9",
+    "# 	c #ECECEC",
+    "$ 	c #D5D5D5",
+    "% 	c #A0A0A0",
+    "& 	c #767676",
+    "* 	c #525252",
+    "= 	c #484848",
+    "- 	c #4E4E4E",
+    "; 	c #555555",
+    "> 	c #545454",
+    ", 	c #5A5A5A",
+    "' 	c #4B4B4B",
+    ") 	c #4A4A4A",
+    "! 	c #4F4F4F",
+    "~ 	c #585858",
+    "{ 	c #515151",
+    "] 	c #4C4C4C",
+    "^ 	c #B1B1B1",
+    "/ 	c #FCFCFC",
+    "( 	c #FDFDFD",
+    "_ 	c #C1C1C1",
+    ": 	c #848484",
+    "< 	c #616161",
+    "[ 	c #5E5E5E",
+    "} 	c #CECECE",
+    "| 	c #E2E2E2",
+    "1 	c #E4E4E4",
+    "2 	c #DFDFDF",
+    "3 	c #D2D2D2",
+    "4 	c #D8D8D8",
+    "5 	c #D4D4D4",
+    "6 	c #E6E6E6",
+    "7 	c #F1F1F1",
+    "8 	c #838383",
+    "9 	c #8E8E8E",
+    "0 	c #8F8F8F",
+    "a 	c #CBCBCB",
+    "b 	c #CCCCCC",
+    "c 	c #E9E9E9",
+    "d 	c #F2F2F2",
+    "e 	c #EDEDED",
+    "f 	c #B5B5B5",
+    "g 	c #A6A6A6",
+    "h 	c #ABABAB",
+    "i 	c #BBBBBB",
+    "j 	c #B0B0B0",
+    "k 	c #EAEAEA",
+    "l 	c #6C6C6C",
+    "m 	c #BCBCBC",
+    "n 	c #F5F5F5",
+    "o 	c #FAFAFA",
+    "p 	c #B6B6B6",
+    "q 	c #F3F3F3",
+    "r 	c #CFCFCF",
+    "s 	c #FBFBFB",
+    "t 	c #CDCDCD",
+    "u 	c #DDDDDD",
+    "v 	c #999999",
+    "w 	c #F0F0F0",
+    "x 	c #2B2B2B",
+    "y 	c #C3C3C3",
+    "z 	c #A4A4A4",
+    "A 	c #D7D7D7",
+    "B 	c #E7E7E7",
+    "C 	c #6E6E6E",
+    "D 	c #9D9D9D",
+    "E 	c #BABABA",
+    "F 	c #AEAEAE",
+    "G 	c #898989",
+    "H 	c #646464",
+    "I 	c #BDBDBD",
+    "J 	c #CACACA",
+    "K 	c #2A2A2A",
+    "L 	c #212121",
+    "M 	c #B7B7B7",
+    "N 	c #F4F4F4",
+    "O 	c #737373",
+    "P 	c #828282",
+    "Q 	c #4D4D4D",
+    "R 	c #000000",
+    "S 	c #151515",
+    "T 	c #B2B2B2",
+    "U 	c #D6D6D6",
+    "V 	c #D3D3D3",
+    "W 	c #2F2F2F",
+    "X 	c #636363",
+    "Y 	c #A1A1A1",
+    "Z 	c #BFBFBF",
+    "` 	c #E0E0E0",
+    " .	c #6A6A6A",
+    "..	c #050505",
+    "+.	c #A3A3A3",
+    "@.	c #202020",
+    "#.	c #5F5F5F",
+    "$.	c #B9B9B9",
+    "%.	c #C7C7C7",
+    "&.	c #D0D0D0",
+    "*.	c #3E3E3E",
+    "=.	c #666666",
+    "-.	c #DBDBDB",
+    ";.	c #424242",
+    ">.	c #C2C2C2",
+    ",.	c #1A1A1A",
+    "'.	c #2C2C2C",
+    ").	c #F6F6F6",
+    "!.	c #AAAAAA",
+    "~.	c #DCDCDC",
+    "{.	c #2D2D2D",
+    "].	c #2E2E2E",
+    "^.	c #A7A7A7",
+    "/.	c #656565",
+    "(.	c #333333",
+    "_.	c #464646",
+    ":.	c #C4C4C4",
+    "<.	c #B8B8B8",
+    "[.	c #292929",
+    "}.	c #979797",
+    "|.	c #EFEFEF",
+    "1.	c #909090",
+    "2.	c #8A8A8A",
+    "3.	c #575757",
+    "4.	c #676767",
+    "5.	c #C5C5C5",
+    "6.	c #7A7A7A",
+    "7.	c #797979",
+    "8.	c #989898",
+    "9.	c #EEEEEE",
+    "0.	c #707070",
+    "a.	c #C8C8C8",
+    "b.	c #111111",
+    "c.	c #AFAFAF",
+    "d.	c #474747",
+    "e.	c #565656",
+    "f.	c #E3E3E3",
+    "g.	c #494949",
+    "h.	c #5B5B5B",
+    "i.	c #222222",
+    "j.	c #353535",
+    "k.	c #D9D9D9",
+    "l.	c #0A0A0A",
+    "m.	c #858585",
+    "n.	c #E5E5E5",
+    "o.	c #0E0E0E",
+    "p.	c #9A9A9A",
+    "q.	c #6F6F6F",
+    "r.	c #868686",
+    "s.	c #060606",
+    "t.	c #1E1E1E",
+    "u.	c #E8E8E8",
+    "v.	c #A5A5A5",
+    "w.	c #0D0D0D",
+    "x.	c #030303",
+    "y.	c #272727",
+    "z.	c #131313",
+    "A.	c #1F1F1F",
+    "B.	c #757575",
+    "C.	c #F7F7F7",
+    "D.	c #414141",
+    "E.	c #080808",
+    "F.	c #6B6B6B",
+    "G.	c #313131",
+    "H.	c #C0C0C0",
+    "I.	c #C9C9C9",
+    "J.	c #0B0B0B",
+    "K.	c #232323",
+    "L.	c #434343",
+    "M.	c #3D3D3D",
+    "N.	c #282828",
+    "O.	c #7C7C7C",
+    "P.	c #252525",
+    "Q.	c #3A3A3A",
+    "R.	c #F8F8F8",
+    "S.	c #1B1B1B",
+    "T.	c #949494",
+    "U.	c #3B3B3B",
+    "V.	c #242424",
+    "W.	c #383838",
+    "X.	c #6D6D6D",
+    "Y.	c #818181",
+    "Z.	c #939393",
+    "`.	c #9E9E9E",
+    " +	c #929292",
+    ".+	c #7D7D7D",
+    "++	c #ADADAD",
+    "@+	c #DADADA",
+    "#+	c #919191",
+    "$+	c #E1E1E1",
+    "%+	c #BEBEBE",
+    "&+	c #ACACAC",
+    "*+	c #9C9C9C",
+    "=+	c #B3B3B3",
+    "-+	c #808080",
+    ";+	c #A8A8A8",
+    ">+	c #393939",
+    ",+	c #747474",
+    "'+	c #7F7F7F",
+    ")+	c #D1D1D1",
+    "!+	c #606060",
+    "~+	c #5C5C5C",
+    "{+	c #686868",
+    "]+	c #7E7E7E",
+    "^+	c #787878",
+    "/+	c #595959",
+    ". . . + @ # $ % & * = - ; > , ' ) ! ~ { ] ^ / . . + + ",
+    ". ( + _ : < [ & } | 1 2 $ 3 4 5 3 6 7 + + 8 9 + . + . ",
+    ". + 0 9 a ( 3 a b c d e c f g h i g j $ k + l m + . + ",
+    "+ 2 8 n o p | ( q r s . # t + + + u ^ v e w + x + + + ",
+    "+ y z . @ A k B 7 n + ( s | p 8 C D 2 E 4 + + F G + . ",
+    "# H I $ J G K L - M N . 2 O P Q R R S T U s s V W j + ",
+    "X Y Z @ o ` _ g  ...+.( 4 @.#.m G $.%.7 &.X *.=.-.;.&.",
+    "Q >.C ,.'.} e + ).!.k + . + + . ~.{.> ].x f 7 ^./.k (.",
+    "_.:.4 @ <.[.}.|.1.2.+ + + >.} 4 B + ( @ _ 3.4.5.6.r 7.",
+    "3.8.9.~ 0.+ a.Q b.+ + c.d.#.=.$ |.b #.e.z ^ ; ^. .f.g.",
+    "-.h.+ i.S M + # p j.% n 9.5.k.H l.m.V ^.n.o.M + M p.q.",
+    "7 r.N s.1.R t.<.|.| u.v.~ w.x.E + s y.z.A.B.C.+ 5 D.q ",
+    ").p.2 E.0.9 F.%.O {._ @.+ + i { [ i.G.H.P I.+ s q.} + ",
+    ").p.6 J.R b.K.L.M.A.! b.g.K [.R M k + N.I + + >.O.+ . ",
+    ").8.9.N.P...R R R R E.t.W n.+ Q.R.6 @.| + . + S.+ + . ",
+    "n }.w T.U.B.<.i.@ Y + + U.+ c u V.= B B 7 u.W.c + . + ",
+    "N T.# + }.X.Y.,.8.F.8 Z.[.`. +.+}.4 ++@+O.< ~.+ ( . + ",
+    "d #+1 + _ ~.u.$+b $.y @+| $+%+I.&+k.h W +.9.+ ( . + . ",
+    "w 0 |.*+. >.<.=+++++p a.p -+;+5.k.>+,+@ + . . + . + + ",
+    "q '+9.R.^ I.t b %.I.)+4 $+n.I.,+ .|.+ . . . + . + + + ",
+    ". p !+( + + + + + + E 0. .-+8.f.+ + . . + + . + + + + ",
+    ". ( A ~+{+]+^+l > /+D f.c q . + . . + + . + + + + + + "
+]
+
+class QStringSequenceTest(UsesQApplication):
+    def testQPixmapConstructor(self):
+        label = QLabel()
+        pixmap1 = QPixmap(xpm)
+        self.assertFalse(pixmap1.isNull())
+        self.assertEqual(pixmap1.width(), 27)
+        self.assertEqual(pixmap1.height(), 22)
+
+if __name__ == "__main__":
+    unittest.main()
diff --git a/tests/qtgui/qpixmap_test.py b/tests/QtGui/qpixmap_test.py
similarity index 84%
rename from tests/qtgui/qpixmap_test.py
rename to tests/QtGui/qpixmap_test.py
index 4814094..1a0339f 100644
--- a/tests/qtgui/qpixmap_test.py
+++ b/tests/QtGui/qpixmap_test.py
@@ -7,22 +7,17 @@ from PySide.QtCore import *
 
 class QPixmapTest(UsesQApplication):
     def testQVariantConstructor(self):
+        obj = QObject()
         pixmap = QPixmap()
-        v = QVariant(pixmap)
-        pixmap_copy = QPixmap(v)
+        obj.setProperty('foo', pixmap)
+        self.assertEqual(type(obj.property('foo')), QPixmap)
 
     def testQSizeConstructor(self):
         pixmap = QPixmap(QSize(10,20))
         self.assert_(pixmap.size().height(), 20)
 
     def testQStringConstructor(self):
-        pixmap = QPixmap(QString("Testing!"))
-
-    def testQVariantConstructor2(self):
-        v = QVariant(QPixmap())
-        pixmap2 = QPixmap(v)
-        v = QVariant(QImage())
-        pixmap2 = QPixmap(v)
+        pixmap = QPixmap("Testing!")
 
     def testQPixmapLoadFromDataWithQFile(self):
         f = QFile(os.path.join(os.path.dirname(__file__), 'sample.png'))
diff --git a/tests/QtGui/qpixmapcache_test.py b/tests/QtGui/qpixmapcache_test.py
new file mode 100644
index 0000000..7795b5d
--- /dev/null
+++ b/tests/QtGui/qpixmapcache_test.py
@@ -0,0 +1,44 @@
+import unittest
+from helper import UsesQApplication
+from PySide.QtGui import QPixmapCache, QPixmap
+
+
+class QPixmapCacheTest(UsesQApplication):
+
+    def testWithString(self):
+        pm1 = QPixmap()
+        ok = QPixmapCache.find('img', pm1)
+        self.assertFalse(ok)
+
+        self.assertEqual(QPixmapCache.find('img'), None)
+
+        pm2 = QPixmap()
+        ok = QPixmapCache.insert('img', pm2)
+        self.assertTrue(ok)
+
+        pm3 = QPixmap()
+        ok = QPixmapCache.find('img', pm3)
+        self.assertTrue(ok)
+        b1 = QPixmapCache.find('img').toImage().bits()
+        b2 = pm3.toImage().bits()
+        self.assertEqual(QPixmapCache.find('img').toImage().bits(), pm3.toImage().bits())
+
+    def testWithKey(self):
+        pm1 = QPixmap()
+        ok = QPixmapCache.find(QPixmapCache.Key(), pm1)
+        self.assertFalse(ok)
+
+        self.assertEqual(QPixmapCache.find(QPixmapCache.Key()), None)
+
+        pm2 = QPixmap()
+        key = QPixmapCache.insert(pm2)
+
+        pm3 = QPixmap()
+        ok = QPixmapCache.find(key, pm3)
+        self.assertTrue(ok)
+
+        self.assertEqual(QPixmapCache.find(key).toImage().bits(), pm3.toImage().bits())
+
+if __name__ == '__main__':
+    unittest.main()
+
diff --git a/tests/QtGui/qpolygonf_test.py b/tests/QtGui/qpolygonf_test.py
new file mode 100644
index 0000000..f842eb4
--- /dev/null
+++ b/tests/QtGui/qpolygonf_test.py
@@ -0,0 +1,28 @@
+
+import unittest
+from PySide.QtCore import *
+from PySide.QtGui import *
+
+class QPolygonFNotIterableTest(unittest.TestCase):
+    """Test if a QPolygonF is iterable"""
+    def testIt(self):
+        p = QPolygonF(4)
+        self.assertEqual(len(p), 4)
+
+        for i in range(0, 4):
+            p[i] = QPointF(float(i), float(i))
+
+        i = 0
+        for point in p:
+            self.assertEqual(int(point.x()), i)
+            self.assertEqual(int(point.y()), i)
+            i += 1;
+
+    def testPolygonShiftOperators(self):
+        p = QPolygon()
+        self.assertEqual(len(p), 0)
+        p << QPoint(10, 20) << QPoint(20, 30) << [QPoint(20, 30), QPoint(40, 50)]
+        self.assertEqual(len(p), 4)
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/tests/qtgui/qpushbutton_test.py b/tests/QtGui/qpushbutton_test.py
similarity index 68%
rename from tests/qtgui/qpushbutton_test.py
rename to tests/QtGui/qpushbutton_test.py
index 9849608..e7f81e6 100644
--- a/tests/qtgui/qpushbutton_test.py
+++ b/tests/QtGui/qpushbutton_test.py
@@ -25,6 +25,17 @@ class QPushButtonTest(UsesQApplication):
         timer = QTimer.singleShot(100, self.app.quit)
         self.app.exec_()
 
+    def buttonCb(self, checked):
+        self._clicked = True
+
+    def testBoolinSignal(self):
+        b = QPushButton()
+        b.setCheckable(True)
+        self._clicked = False
+        b.toggled[bool].connect(self.buttonCb)
+        b.toggle()
+        self.assert_(self._clicked)
+
 if __name__ == '__main__':
     unittest.main()
 
diff --git a/tests/qtgui/qradialgradient_test.py b/tests/QtGui/qradialgradient_test.py
similarity index 100%
rename from tests/qtgui/qradialgradient_test.py
rename to tests/QtGui/qradialgradient_test.py
diff --git a/tests/qtgui/qregion_test.py b/tests/QtGui/qregion_test.py
similarity index 100%
rename from tests/qtgui/qregion_test.py
rename to tests/QtGui/qregion_test.py
diff --git a/tests/qtgui/qshortcut_test.py b/tests/QtGui/qshortcut_test.py
similarity index 100%
rename from tests/qtgui/qshortcut_test.py
rename to tests/QtGui/qshortcut_test.py
diff --git a/tests/QtGui/qsplitter_test.py b/tests/QtGui/qsplitter_test.py
new file mode 100644
index 0000000..a438b69
--- /dev/null
+++ b/tests/QtGui/qsplitter_test.py
@@ -0,0 +1,16 @@
+import unittest
+from PySide.QtGui import QSplitter
+
+from helper import UsesQApplication
+
+class QSplitterTest(UsesQApplication):
+
+    def testGetRange(self):
+        splitter = QSplitter()
+        _min, _max = splitter.getRange(0)
+        self.assert_(isinstance(_min, int))
+        self.assert_(isinstance(_max, int))
+
+if __name__ == "__main__":
+   unittest.main()
+
diff --git a/tests/QtGui/qstandarditemmodel_test.py b/tests/QtGui/qstandarditemmodel_test.py
new file mode 100644
index 0000000..6ab86dd
--- /dev/null
+++ b/tests/QtGui/qstandarditemmodel_test.py
@@ -0,0 +1,63 @@
+import unittest
+import sys
+
+from PySide.QtGui import QStandardItemModel, QWidget, QStandardItem
+
+from helper import UsesQApplication
+
+class QStandardItemModelTest(UsesQApplication):
+
+    def setUp(self):
+       super(QStandardItemModelTest, self).setUp()
+       self.window = QWidget()
+       self.model = QStandardItemModel(0, 3, self.window)
+
+    def tearDown(self):
+       del self.window
+       del self.model
+       super(QStandardItemModelTest, self).tearDown()
+
+    def testInsertRow(self):
+        # bug #227
+        self.model.insertRow(0)
+
+
+class QStandardItemModelRef(UsesQApplication):
+    def testRefCount(self):
+        model = QStandardItemModel(5, 5)
+        items = []
+        for r in range(5):
+            row = []
+            for c in range(5):
+                row.append(QStandardItem("%d,%d" % (r,c)) )
+                self.assertEqual(sys.getrefcount(row[c]), 2)
+
+            model.insertRow(r, row)
+
+            for c in range(5):
+                ref_after = sys.getrefcount(row[c])
+                # check if the ref count was incremented after insertRow
+                self.assertEqual(ref_after, 3)
+
+            items.append(row)
+            row = None
+
+        for r in range(3):
+            my_row = model.takeRow(0)
+            my_row = None
+            for c in range(5):
+                # only rest 1 reference
+                self.assertEqual(sys.getrefcount(items[r][c]), 2)
+
+        my_i = model.item(0,0)
+        # ref(my_i) + parent_ref + items list ref
+        self.assertEqual(sys.getrefcount(my_i), 4)
+
+        model.clear()
+        # ref(my_i)
+        self.assertEqual(sys.getrefcount(my_i), 3)
+
+
+if __name__ == '__main__':
+    unittest.main()
+
diff --git a/tests/qtgui/qstring_qkeysequence_test.py b/tests/QtGui/qstring_qkeysequence_test.py
similarity index 65%
rename from tests/qtgui/qstring_qkeysequence_test.py
rename to tests/QtGui/qstring_qkeysequence_test.py
index 1f435e6..e8e307d 100644
--- a/tests/qtgui/qstring_qkeysequence_test.py
+++ b/tests/QtGui/qstring_qkeysequence_test.py
@@ -3,9 +3,9 @@
 '''Tests conversions of QString to and from QKeySequence.'''
 
 import unittest
+import py3kcompat as py3k
 from helper import UsesQApplication
 
-from PySide.QtCore import QString
 from PySide.QtGui import QKeySequence, QAction
 
 class QStringQKeySequenceTest(UsesQApplication):
@@ -14,21 +14,12 @@ class QStringQKeySequenceTest(UsesQApplication):
     def testQStringFromQKeySequence(self):
         '''Creates a QString from a QKeySequence.'''
         keyseq = 'Ctrl+A'
-        a = QString(QKeySequence(keyseq))
+        a = QKeySequence(keyseq)
         self.assertEqual(a, keyseq)
 
-    def testQStringAsQKeySequence(self):
-        '''Passes a QString to an argument expecting a QKeySequence.'''
-        keyseq = QString('Ctrl+A')
-        action = QAction(None)
-        action.setShortcut(keyseq)
-        shortcut = action.shortcut()
-        self.assert_(isinstance(shortcut, QKeySequence))
-        self.assertEqual(shortcut.toString(), keyseq)
-
     def testPythonStringAsQKeySequence(self):
         '''Passes a Python string to an argument expecting a QKeySequence.'''
-        keyseq = 'Ctrl+A'
+        keyseq = py3k.unicode_('Ctrl+A')
         action = QAction(None)
         action.setShortcut(keyseq)
         shortcut = action.shortcut()
diff --git a/tests/qtgui/qstyle_test.py b/tests/QtGui/qstyle_test.py
old mode 100755
new mode 100644
similarity index 100%
rename from tests/qtgui/qstyle_test.py
rename to tests/QtGui/qstyle_test.py
diff --git a/tests/qtgui/qtableview_test.py b/tests/QtGui/qtableview_test.py
similarity index 100%
rename from tests/qtgui/qtableview_test.py
rename to tests/QtGui/qtableview_test.py
diff --git a/tests/qtgui/qtabwidget_test.py b/tests/QtGui/qtabwidget_test.py
similarity index 65%
rename from tests/qtgui/qtabwidget_test.py
rename to tests/QtGui/qtabwidget_test.py
index 143f99c..421d02f 100644
--- a/tests/qtgui/qtabwidget_test.py
+++ b/tests/QtGui/qtabwidget_test.py
@@ -1,9 +1,13 @@
 
 import unittest
 
-from PySide.QtGui import QTabWidget
+from PySide.QtGui import *
 from helper import TimedQApplication
 
+def makeBug643(tab):
+    button = QPushButton('Foo')
+    tab.insertTab(0, button, 'Foo')
+
 class RemoveTabMethod(TimedQApplication):
     def setUp(self):
         TimedQApplication.setUp(self)
@@ -17,5 +21,9 @@ class RemoveTabMethod(TimedQApplication):
     def testRemoveTabPresence(self):
         self.assert_(getattr(self.tab, 'removeTab'))
 
+    def testInsertTab(self):
+        makeBug643(self.tab)
+        self.assertEqual(self.tab.count(), 1)
+
 if __name__ == '__main__':
     unittest.main()
diff --git a/tests/QtGui/qtextdocument_undoredo_test.py b/tests/QtGui/qtextdocument_undoredo_test.py
new file mode 100644
index 0000000..6943cea
--- /dev/null
+++ b/tests/QtGui/qtextdocument_undoredo_test.py
@@ -0,0 +1,31 @@
+
+import unittest
+
+from PySide.QtGui import QTextDocument, QTextCursor
+
+class QTextDocumentTest(unittest.TestCase):
+
+    def testUndoRedo(self):
+        text = 'foobar'
+        doc = QTextDocument(text)
+
+        self.assertFalse(doc.isRedoAvailable())
+        self.assertTrue(doc.isUndoAvailable())
+        self.assertEqual(doc.toPlainText(), text)
+
+        cursor = QTextCursor(doc)
+        doc.undo(cursor)
+
+        self.assertTrue(doc.isRedoAvailable())
+        self.assertFalse(doc.isUndoAvailable())
+        self.assertEqual(doc.toPlainText(), '')
+
+        doc.redo(cursor)
+
+        self.assertFalse(doc.isRedoAvailable())
+        self.assertTrue(doc.isUndoAvailable())
+        self.assertEqual(doc.toPlainText(), text)
+
+if __name__ == '__main__':
+    unittest.main()
+
diff --git a/tests/QtGui/qtextedit_signal_test.py b/tests/QtGui/qtextedit_signal_test.py
new file mode 100644
index 0000000..3195e0e
--- /dev/null
+++ b/tests/QtGui/qtextedit_signal_test.py
@@ -0,0 +1,37 @@
+from PySide import QtGui, QtCore
+from helper import UsesQApplication
+
+import unittest
+
+class MyWindow(QtGui.QMainWindow):
+    appendText = QtCore.Signal(str)
+
+    @QtCore.Slot()
+    def onButtonPressed(self):
+        self.appendText.emit("PySide")
+
+    def __init__(self, parent=None):
+        super(MyWindow, self).__init__(parent)
+
+        self.textEdit = QtGui.QTextEdit()
+        self.btn = QtGui.QPushButton("ClickMe")
+        self.btn.clicked.connect(self.onButtonPressed)
+        self.appendText.connect(self.textEdit.append)
+
+    def start(self):
+        self.btn.click()
+
+    def text(self):
+        return self.textEdit.toPlainText()
+
+
+class testSignalWithCPPSlot(UsesQApplication):
+
+    def testEmission(self):
+        w = MyWindow()
+        w.start()
+        self.assertEqual(w.text(), "PySide")
+
+if __name__ == '__main__':
+    unittest.main()
+
diff --git a/tests/qtgui/qtextedit_test.py b/tests/QtGui/qtextedit_test.py
similarity index 100%
rename from tests/qtgui/qtextedit_test.py
rename to tests/QtGui/qtextedit_test.py
diff --git a/tests/QtGui/qtextline_test.py b/tests/QtGui/qtextline_test.py
new file mode 100644
index 0000000..76a711e
--- /dev/null
+++ b/tests/QtGui/qtextline_test.py
@@ -0,0 +1,23 @@
+
+import unittest
+
+from PySide.QtGui import QTextLayout
+from helper import UsesQApplication
+
+class QTextLineTest(UsesQApplication):
+
+    def testCursorToX(self):
+        textLayout = QTextLayout()
+        textLayout.beginLayout()
+        line = textLayout.createLine()
+        self.assert_(line.isValid())
+        x, cursorPos = line.cursorToX(0)
+        self.assertEqual(type(x), float)
+        self.assertEqual(type(cursorPos), int)
+        x, cursorPos = line.cursorToX(1)
+        self.assertEqual(type(x), float)
+        self.assertEqual(type(cursorPos), int)
+
+if __name__ == '__main__':
+    unittest.main()
+
diff --git a/tests/qtgui/qtoolbar_test.py b/tests/QtGui/qtoolbar_test.py
similarity index 100%
rename from tests/qtgui/qtoolbar_test.py
rename to tests/QtGui/qtoolbar_test.py
diff --git a/tests/qtgui/qtoolbox_test.py b/tests/QtGui/qtoolbox_test.py
similarity index 100%
rename from tests/qtgui/qtoolbox_test.py
rename to tests/QtGui/qtoolbox_test.py
diff --git a/tests/QtGui/qtransform_test.py b/tests/QtGui/qtransform_test.py
new file mode 100644
index 0000000..8cac927
--- /dev/null
+++ b/tests/QtGui/qtransform_test.py
@@ -0,0 +1,73 @@
+import unittest
+from PySide.QtCore import QPointF
+from PySide.QtGui import QTransform, QPolygonF, QPolygonF
+
+class QTransformTest(unittest.TestCase):
+
+    def testMap(self):
+        transform = QTransform()
+        values = (10.0, 20.0)
+        tx, ty = transform.map(*values)
+        self.assert_(isinstance(tx, float))
+        self.assert_(isinstance(ty, float))
+        self.assertEqual((tx, ty), values)
+
+    def testquadToQuad(self):
+        q1 = QPolygonF()
+        q1.append(QPointF(10.0, 10.0))
+        q1.append(QPointF(20.0, 10.0))
+        q1.append(QPointF(10.0, -10.0))
+        q1.append(QPointF(20.0, -10.0))
+
+        q2 = QPolygonF()
+        q2.append(QPointF(20.0, 20.0))
+        q2.append(QPointF(30.0, 20.0))
+        q2.append(QPointF(20.0, -20.0))
+        q2.append(QPointF(30.0, -20.0))
+
+        t1 = QTransform()
+        r1 = QTransform.quadToQuad(q1, q2, t1)
+        r2 = QTransform.quadToQuad(q1, q2)
+
+        self.assertTrue(r1)
+        self.assert_(r2)
+
+        self.assertEqual(t1, r2)
+
+    def testquadToSquare(self):
+        q1 = QPolygonF()
+        q1.append(QPointF(10.0, 10.0))
+        q1.append(QPointF(20.0, 10.0))
+        q1.append(QPointF(10.0, -10.0))
+        q1.append(QPointF(20.0, -10.0))
+
+        t1 = QTransform()
+        r1 = QTransform.quadToSquare(q1, t1)
+        r2 = QTransform.quadToSquare(q1)
+
+        self.assertTrue(r1)
+        self.assert_(r2)
+
+        self.assertEqual(t1, r2)
+
+
+    def testsquareToQuad(self):
+        q1 = QPolygonF()
+        q1.append(QPointF(10.0, 10.0))
+        q1.append(QPointF(20.0, 10.0))
+        q1.append(QPointF(10.0, -10.0))
+        q1.append(QPointF(20.0, -10.0))
+
+        t1 = QTransform()
+        r1 = QTransform.squareToQuad(q1, t1)
+        r2 = QTransform.squareToQuad(q1)
+
+        self.assertTrue(r1)
+        self.assert_(r2)
+
+        self.assertEqual(t1, r2)
+
+
+if __name__ == "__main__":
+   unittest.main()
+
diff --git a/tests/QtGui/qvalidator_test.py b/tests/QtGui/qvalidator_test.py
new file mode 100644
index 0000000..52dbc8b
--- /dev/null
+++ b/tests/QtGui/qvalidator_test.py
@@ -0,0 +1,85 @@
+from PySide.QtCore import *
+from PySide.QtGui import *
+
+import unittest
+from helper import UsesQApplication
+
+class MyValidator1(QValidator):
+    def fixUp(self, input):
+        return "fixed"
+
+    def validate(self, input, pos):
+        return (QValidator.Acceptable, "fixed", 1)
+
+class MyValidator2(QValidator):
+    def fixUp(self, input):
+        return "fixed"
+
+    def validate(self, input, pos):
+        return (QValidator.Acceptable, "fixed")
+
+class MyValidator3(QValidator):
+    def fixUp(self, input):
+        return "fixed"
+
+    def validate(self, input, pos):
+        return (QValidator.Acceptable,)
+
+class MyValidator4(QValidator):
+    def fixUp(self, input):
+        return "fixed"
+
+    def validate(self, input, pos):
+        return QValidator.Acceptable
+
+class QValidatorTest(UsesQApplication):
+    def testValidator1(self):
+        line = QLineEdit()
+        line.setValidator(MyValidator1())
+        line.show()
+        line.setText("foo")
+
+        QTimer.singleShot(0, line.close)
+        self.app.exec_()
+
+        self.assertEqual(line.text(), "fixed")
+        self.assertEqual(line.cursorPosition(), 1)
+
+    def testValidator2(self):
+        line = QLineEdit()
+        line.setValidator(MyValidator2())
+        line.show()
+        line.setText("foo")
+
+        QTimer.singleShot(0, line.close)
+        self.app.exec_()
+
+        self.assertEqual(line.text(), "fixed")
+        self.assertEqual(line.cursorPosition(), 3)
+
+    def testValidator3(self):
+        line = QLineEdit()
+        line.setValidator(MyValidator3())
+        line.show()
+        line.setText("foo")
+
+        QTimer.singleShot(0, line.close)
+        self.app.exec_()
+
+        self.assertEqual(line.text(), "foo")
+        self.assertEqual(line.cursorPosition(), 3)
+
+    def testValidator4(self):
+        line = QLineEdit()
+        line.setValidator(MyValidator4())
+        line.show()
+        line.setText("foo")
+
+        QTimer.singleShot(0, line.close)
+        self.app.exec_()
+
+        self.assertEqual(line.text(), "foo")
+        self.assertEqual(line.cursorPosition(), 3)
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/tests/QtGui/qvariant_test.py b/tests/QtGui/qvariant_test.py
new file mode 100644
index 0000000..faa755a
--- /dev/null
+++ b/tests/QtGui/qvariant_test.py
@@ -0,0 +1,23 @@
+
+import unittest
+from PySide.QtCore import *
+from PySide.QtGui import *
+
+class MyDiagram(QGraphicsScene):
+    pass
+
+class MyItem(QGraphicsRectItem):
+    def itemChange(self, change, value):
+        return value;
+
+class QGraphicsSceneOnQVariantTest(unittest.TestCase):
+    """Test storage ot QGraphicsScene into QVariants"""
+    def testIt(self):
+        app = QApplication([])
+        s = MyDiagram()
+        i = MyItem()
+        s.addItem(i)
+        self.assertEqual(len(s.items()), 1)
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/tests/qtgui/qwidget_setlayout_test.py b/tests/QtGui/qwidget_setlayout_test.py
similarity index 100%
rename from tests/qtgui/qwidget_setlayout_test.py
rename to tests/QtGui/qwidget_setlayout_test.py
diff --git a/tests/qtgui/qwidget_test.py b/tests/QtGui/qwidget_test.py
similarity index 78%
rename from tests/qtgui/qwidget_test.py
rename to tests/QtGui/qwidget_test.py
index a14311c..70271a0 100644
--- a/tests/qtgui/qwidget_test.py
+++ b/tests/QtGui/qwidget_test.py
@@ -11,10 +11,7 @@ class QWidgetInherit(QMainWindow):
 class QWidgetTest(UsesQApplication):
 
     def testInheritance(self):
-        newobj = QWidgetInherit()
-        widget = QWidget()
-        newobj.setCentralWidget(widget)
-        self.assertEqual(widget, newobj.centralWidget())
+        self.assertRaises(TypeError, QWidgetInherit)
 
 class QWidgetVisible(UsesQApplication):
 
diff --git a/tests/qtgui/reference_count_test.py b/tests/QtGui/reference_count_test.py
similarity index 100%
rename from tests/qtgui/reference_count_test.py
rename to tests/QtGui/reference_count_test.py
diff --git a/tests/QtGui/repr_test.py b/tests/QtGui/repr_test.py
new file mode 100644
index 0000000..3dbe879
--- /dev/null
+++ b/tests/QtGui/repr_test.py
@@ -0,0 +1,90 @@
+
+import unittest
+
+import PySide
+from PySide.QtCore import QPoint
+from PySide.QtGui import QMatrix
+from PySide.QtGui import QMatrix2x2, QMatrix2x3, QMatrix2x4
+from PySide.QtGui import QMatrix3x2, QMatrix3x3, QMatrix3x4
+from PySide.QtGui import QMatrix4x2, QMatrix4x3, QMatrix4x4
+from PySide.QtGui import QVector2D, QVector3D, QVector4D
+from PySide.QtGui import QColor, QTransform, QKeySequence, QQuaternion
+from PySide.QtGui import QPolygon
+
+class ReprCopyHelper:
+    def testCopy(self):
+        copy = eval(self.original.__repr__())
+        self.assert_(copy is not self.original)
+        self.assertEqual(copy, self.original)
+
+class QTransformReprCopy(ReprCopyHelper, unittest.TestCase):
+    def setUp(self):
+        self.original = QTransform(1, 2, 3, 4, 5, 6, 7, 8)
+
+class QKeySequenceReprCopy(ReprCopyHelper, unittest.TestCase):
+    def setUp(self):
+        self.original = QKeySequence("Ctrl+P")
+
+class QQuaternionReprCopy(ReprCopyHelper, unittest.TestCase):
+    def setUp(self):
+        self.original = QQuaternion(1, 2, 3, 4)
+
+class QVector2DReprCopy(ReprCopyHelper, unittest.TestCase):
+    def setUp(self):
+        self.original = QVector2D(1, 2)
+
+class QVector3DReprCopy(ReprCopyHelper, unittest.TestCase):
+    def setUp(self):
+        self.original = QVector3D(1, 2, 3)
+
+class QVector4DReprCopy(ReprCopyHelper, unittest.TestCase):
+    def setUp(self):
+        self.original = QVector4D(1, 2, 3, 4)
+
+class QMatrixReprCopy(ReprCopyHelper, unittest.TestCase):
+    def setUp(self):
+        self.original = QMatrix(1, 2, 3, 4, 5, 6)
+
+
+# Avoid these tests until get gcc fixed
+# Related bug: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=43247
+"""
+class QMatrix2x2ReprCopy(ReprCopyHelper, unittest.TestCase):
+    def setUp(self):
+        self.original = QMatrix2x2([1, 2, 3, 4])
+
+class QMatrix2x3ReprCopy(ReprCopyHelper, unittest.TestCase):
+    def setUp(self):
+        self.original = QMatrix2x3([1, 2, 3, 4, 5, 6])
+
+class QMatrix2x4ReprCopy(ReprCopyHelper, unittest.TestCase):
+    def setUp(self):
+        self.original = QMatrix2x4([1, 2, 3, 4, 5, 6, 7, 8])
+
+class QMatrix3x2ReprCopy(ReprCopyHelper, unittest.TestCase):
+    def setUp(self):
+        self.original = QMatrix3x2([1, 2, 3, 4, 5, 6])
+
+class QMatrix3x3ReprCopy(ReprCopyHelper, unittest.TestCase):
+    def setUp(self):
+        self.original = QMatrix3x3([1, 2, 3, 4, 5, 6, 7, 8, 9])
+
+class QMatrix3x4ReprCopy(ReprCopyHelper, unittest.TestCase):
+    def setUp(self):
+        self.original = QMatrix3x4([1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12])
+
+class QMatrix4x2ReprCopy(ReprCopyHelper, unittest.TestCase):
+    def setUp(self):
+        self.original = QMatrix4x2([1, 2, 3, 4, 5, 6, 7, 8])
+
+class QMatrix4x3ReprCopy(ReprCopyHelper, unittest.TestCase):
+    def setUp(self):
+        self.original = QMatrix4x3([1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12])
+
+class QMatrix4x4ReprCopy(ReprCopyHelper, unittest.TestCase):
+    def setUp(self):
+        self.original = QMatrix4x4([1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16])
+"""
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/tests/QtGui/returnquadruplesofnumbers_test.py b/tests/QtGui/returnquadruplesofnumbers_test.py
new file mode 100644
index 0000000..a1b446e
--- /dev/null
+++ b/tests/QtGui/returnquadruplesofnumbers_test.py
@@ -0,0 +1,60 @@
+import unittest
+from PySide.QtGui import QLayout, QWidget, QGraphicsLayout, QGraphicsLayoutItem, QTextCursor, QPrinter
+
+from helper import UsesQApplication
+
+class Layout(QLayout):
+    def __init__(self):
+        QLayout.__init__(self)
+
+class GraphicsLayout(QGraphicsLayout):
+    def __init__(self):
+        QGraphicsLayout.__init__(self)
+
+class GraphicsLayoutItem(QGraphicsLayoutItem):
+    def __init__(self):
+        QGraphicsLayoutItem.__init__(self)
+
+class ReturnsQuadruplesOfNumbers(UsesQApplication):
+    def compareTuples(self, ta, tb):
+        for va,vb in zip(ta, tb):
+            if round(va) != round(vb):
+                return False
+        return True
+
+    def testQGraphicsLayoutGetContentsMargins(self):
+        obj = GraphicsLayout()
+        values = (10.0, 20.0, 30.0, 40.0)
+        obj.setContentsMargins(*values)
+        self.assert_(self.compareTuples(obj.getContentsMargins(), values))
+
+    def testQGraphicsLayoutItemGetContentsMargins(self):
+        obj = GraphicsLayoutItem()
+        self.assert_(self.compareTuples(obj.getContentsMargins(), (0.0, 0.0, 0.0, 0.0)))
+
+    def testQWidgetGetContentsMargins(self):
+        obj = QWidget()
+        values = (10, 20, 30, 40)
+        obj.setContentsMargins(*values)
+        self.assert_(self.compareTuples(obj.getContentsMargins(), values))
+
+    def testQLayoutGetContentsMargins(self):
+        obj = Layout()
+        values = (10, 20, 30, 40)
+        obj.setContentsMargins(*values)
+        self.assert_(self.compareTuples(obj.getContentsMargins(), values))
+
+    def testQTextCursorSelectedTableCells(self):
+        obj = QTextCursor()
+        self.assertEquals(obj.selectedTableCells(), (-1, -1, -1, -1))
+
+    def testQPrinterGetPageMargins(self):
+        # Bug #742
+        obj = QPrinter()
+        values = (10.0, 20.0, 30.0, 40.0, QPrinter.Point)
+        obj.setPageMargins(*values)
+        self.assert_(self.compareTuples(obj.getPageMargins(QPrinter.Point), values[:-1]))
+
+if __name__ == "__main__":
+   unittest.main()
+
diff --git a/tests/QtGui/sample.png b/tests/QtGui/sample.png
new file mode 100644
index 0000000..60450f0
Binary files /dev/null and b/tests/QtGui/sample.png differ
diff --git a/tests/qtgui/standardpixmap_test.py b/tests/QtGui/standardpixmap_test.py
similarity index 100%
rename from tests/qtgui/standardpixmap_test.py
rename to tests/QtGui/standardpixmap_test.py
diff --git a/tests/QtGui/test_module_template.py b/tests/QtGui/test_module_template.py
new file mode 100644
index 0000000..f1e3010
--- /dev/null
+++ b/tests/QtGui/test_module_template.py
@@ -0,0 +1,12 @@
+from PySide.QtGui import QWidget
+from PySide.QtCore import QObject
+
+class MyQObject(QObject):
+    pass
+
+class MyQWidget(QWidget):
+    pass
+
+class Sentinel():
+    value = 10
+
diff --git a/tests/qtgui/timed_app_test.py b/tests/QtGui/timed_app_test.py
similarity index 100%
rename from tests/qtgui/timed_app_test.py
rename to tests/QtGui/timed_app_test.py
diff --git a/tests/qtgui/virtual_protected_inheritance_test.py b/tests/QtGui/virtual_protected_inheritance_test.py
similarity index 96%
rename from tests/qtgui/virtual_protected_inheritance_test.py
rename to tests/QtGui/virtual_protected_inheritance_test.py
index 15de37d..be19952 100644
--- a/tests/qtgui/virtual_protected_inheritance_test.py
+++ b/tests/QtGui/virtual_protected_inheritance_test.py
@@ -57,7 +57,7 @@ class TimerEventTest(UsesQApplication):
 
         self.widget.killTimer(timer_id)
 
-        self.assertEqual(self.widget.runs, 5)
+        self.assert_(self.widget.runs >= self.widget.max_runs)
 
 
 if __name__ == '__main__':
diff --git a/tests/qtgui/virtual_pure_override.py b/tests/QtGui/virtual_pure_override_test.py
similarity index 100%
rename from tests/qtgui/virtual_pure_override.py
rename to tests/QtGui/virtual_pure_override_test.py
diff --git a/tests/qtgui/wrong_return_test.py b/tests/QtGui/wrong_return_test.py
similarity index 62%
rename from tests/qtgui/wrong_return_test.py
rename to tests/QtGui/wrong_return_test.py
index d14ac9e..8394f6e 100644
--- a/tests/qtgui/wrong_return_test.py
+++ b/tests/QtGui/wrong_return_test.py
@@ -1,11 +1,14 @@
 '''Test cases for Virtual functions with wrong return type'''
 
 import unittest
-
-from PySide import QtCore, QtGui
-
+import py3kcompat as py3k
+from PySide import QtGui
 from helper import UsesQApplication
 
+import warnings
+warnings.simplefilter('error')
+
+
 class MyWidget(QtGui.QWidget):
     def __init__(self, parent=None):
         super(MyWidget, self).__init__(parent)
@@ -17,7 +20,11 @@ class testCase(UsesQApplication):
 
     def testVirtualReturn(self):
         w = MyWidget()
-        self.assertRaises(TypeError, w.show)
+        if py3k.IS_PY3K:
+            self.assertWarns(RuntimeWarning, w.show)
+        else:
+            self.assertRaises(RuntimeWarning, w.show)
+
 
 if __name__ == '__main__':
     unittest.main()
diff --git a/tests/QtGui/x11_symbols_test.py b/tests/QtGui/x11_symbols_test.py
new file mode 100644
index 0000000..6a38eed
--- /dev/null
+++ b/tests/QtGui/x11_symbols_test.py
@@ -0,0 +1,24 @@
+
+''' Test the presence of X11 symbols in QtGui'''
+
+import unittest
+
+from PySide.QtGui import *
+
+class X11Test(unittest.TestCase):
+
+    def test(self):
+        qpixmapFuncs = dir(QPixmap)
+        self.assert_('handle' in qpixmapFuncs)
+        self.assert_('x11Info' in qpixmapFuncs)
+        self.assert_('x11PictureHandle' in qpixmapFuncs)
+        self.assert_('x11SetDefaultScreen' in qpixmapFuncs)
+
+    def testX11Functions(self):
+        qx11infoFuncs = dir(QX11Info)
+        self.assert_('display' in qx11infoFuncs)
+        self.assert_('appVisual' in qx11infoFuncs)
+        self.assert_('visual' in qx11infoFuncs)
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/tests/QtHelp/CMakeLists.txt b/tests/QtHelp/CMakeLists.txt
new file mode 100644
index 0000000..d0ba2d8
--- /dev/null
+++ b/tests/QtHelp/CMakeLists.txt
@@ -0,0 +1 @@
+PYSIDE_TEST(help_test.py)
diff --git a/tests/qthelp/help_test.py b/tests/QtHelp/help_test.py
similarity index 100%
rename from tests/qthelp/help_test.py
rename to tests/QtHelp/help_test.py
diff --git a/tests/QtMaemo5/CMakeLists.txt b/tests/QtMaemo5/CMakeLists.txt
new file mode 100644
index 0000000..73bb316
--- /dev/null
+++ b/tests/QtMaemo5/CMakeLists.txt
@@ -0,0 +1,2 @@
+PYSIDE_TEST(pickselector_test.py)
+PYSIDE_TEST(qmaemo5import_test.py)
diff --git a/tests/qtmaemo5/pickselector_test.py b/tests/QtMaemo5/pickselector_test.py
similarity index 100%
rename from tests/qtmaemo5/pickselector_test.py
rename to tests/QtMaemo5/pickselector_test.py
diff --git a/tests/qtmaemo5/qmaemo5import_test.py b/tests/QtMaemo5/qmaemo5import_test.py
similarity index 100%
rename from tests/qtmaemo5/qmaemo5import_test.py
rename to tests/QtMaemo5/qmaemo5import_test.py
diff --git a/tests/QtMultimedia/CMakeLists.txt b/tests/QtMultimedia/CMakeLists.txt
new file mode 100644
index 0000000..62150eb
--- /dev/null
+++ b/tests/QtMultimedia/CMakeLists.txt
@@ -0,0 +1 @@
+PYSIDE_TEST(audio_test.py)
diff --git a/tests/qtmultimedia/audio_test.py b/tests/QtMultimedia/audio_test.py
similarity index 72%
rename from tests/qtmultimedia/audio_test.py
rename to tests/QtMultimedia/audio_test.py
index 04d0a1e..773524e 100644
--- a/tests/qtmultimedia/audio_test.py
+++ b/tests/QtMultimedia/audio_test.py
@@ -9,7 +9,19 @@ from PySide.QtMultimedia import *
 class testAudioDevices(unittest.TestCase):
 
     def testListDevices(self):
-        for devInfo in QAudioDeviceInfo.availableDevices(QAudio.AudioOutput):
+        valid = False
+        devices = QAudioDeviceInfo.availableDevices(QAudio.AudioOutput)
+        if not len(devices):
+            return
+
+        valid = True
+        for devInfo in devices:
+            if devInfo.deviceName() == 'null':
+                # skip the test if the only device found is a invalid device
+                if len(devices) == 1:
+                    return
+                else:
+                    continue
             fmt = QAudioFormat()
             for codec in devInfo.supportedCodecs():
                 fmt.setCodec(codec)
diff --git a/tests/QtNetwork/CMakeLists.txt b/tests/QtNetwork/CMakeLists.txt
new file mode 100644
index 0000000..7476f91
--- /dev/null
+++ b/tests/QtNetwork/CMakeLists.txt
@@ -0,0 +1,8 @@
+PYSIDE_TEST(bug_446.py)
+PYSIDE_TEST(bug_1084.py)
+PYSIDE_TEST(basic_auth_test.py)
+PYSIDE_TEST(accessManager_test.py)
+PYSIDE_TEST(http_test.py)
+PYSIDE_TEST(tcpserver_test.py)
+PYSIDE_TEST(udpsocket_test.py)
+PYSIDE_TEST(qipv6address_test.py)
diff --git a/tests/QtNetwork/accessManager_test.py b/tests/QtNetwork/accessManager_test.py
new file mode 100644
index 0000000..65a8480
--- /dev/null
+++ b/tests/QtNetwork/accessManager_test.py
@@ -0,0 +1,44 @@
+
+'''Test cases for QHttp'''
+
+import unittest
+
+from PySide.QtCore import *
+from PySide.QtNetwork import *
+
+from helper import UsesQCoreApplication
+from httpd import TestServer
+
+class AccessManagerCase(UsesQCoreApplication):
+
+    def setUp(self):
+        super(AccessManagerCase, self).setUp()
+        self.httpd = TestServer()
+        self.httpd.start()
+        self.called = False
+
+    def tearDown(self):
+        super(AccessManagerCase, self).tearDown()
+        if self.httpd:
+            self.httpd.shutdown()
+            self.httpd = None
+
+    def goAway(self):
+        self.httpd.shutdown()
+        self.app.quit()
+        self.httpd = None
+
+    def slot_replyFinished(self, reply):
+        self.assertEqual(type(reply), QNetworkReply)
+        self.called = True
+        self.goAway()
+
+    def testNetworkRequest(self):
+        manager = QNetworkAccessManager()
+        manager.finished.connect(self.slot_replyFinished)
+        manager.get(QNetworkRequest(QUrl("http://127.0.0.1:%s" % self.httpd.port())))
+        self.app.exec_()
+        self.assert_(self.called)
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/tests/QtNetwork/basic_auth_test.py b/tests/QtNetwork/basic_auth_test.py
new file mode 100644
index 0000000..3a78e9a
--- /dev/null
+++ b/tests/QtNetwork/basic_auth_test.py
@@ -0,0 +1,51 @@
+import unittest
+
+from PySide.QtCore import *
+from PySide.QtNetwork import *
+
+from helper import UsesQCoreApplication
+from httpd import TestServer
+
+class testAuthenticationSignal(UsesQCoreApplication):
+
+    def setUp(self):
+        super(testAuthenticationSignal, self).setUp()
+        self.httpd = TestServer(secure=True)
+        self.httpd.start()
+        self._resultOk = False
+
+    def tearDown(self):
+        if self.httpd:
+            self.httpd.shutdown()
+            del self.httpd
+        super(testAuthenticationSignal, self).tearDown()
+
+    def goAway(self):
+        self.httpd.shutdown()
+        self.app.quit()
+        self.httpd = None
+
+    def onAuthRequest(self, hostname, port, auth):
+        self.assertTrue(isinstance(auth, QAuthenticator))
+        self._resultOk = True
+        self.goAway()
+
+    def testwaitSignal(self):
+        http = QHttp('127.0.0.1', self.httpd.port())
+        http.connect(SIGNAL("authenticationRequired(const QString&, quint16, QAuthenticator*)"), self.onAuthRequest)
+        path = QUrl.toPercentEncoding("/index.html", "!$&'()*+,;=:@/")
+        data = http.get(str(path))
+        self.app.exec_()
+        self.assertTrue(self._resultOk)
+
+    def testwaitSignal2(self):
+        http = QHttp('127.0.0.1', self.httpd.port())
+        # Using new signal slot syntax causes a segfault
+        http.authenticationRequired.connect(self.onAuthRequest)
+        path = QUrl.toPercentEncoding("/index.html", "!$&'()*+,;=:@/")
+        data = http.get(str(path))
+        self.app.exec_()
+        self.assertTrue(self._resultOk)
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/tests/QtNetwork/bug_1084.py b/tests/QtNetwork/bug_1084.py
new file mode 100644
index 0000000..9d8471c
--- /dev/null
+++ b/tests/QtNetwork/bug_1084.py
@@ -0,0 +1,16 @@
+''' unit test for BUG #1084 '''
+
+import unittest
+from PySide import QtNetwork
+import py3kcompat as py3k
+
+class QTcpSocketTestCase(unittest.TestCase):
+    def setUp(self):
+        self.sock = QtNetwork.QTcpSocket()
+        self.sock.connectToHost('127.0.0.1', 25)
+
+    def testIt(self):
+        self.sock.write(py3k.unicode_('quit'))
+
+if __name__ == "__main__":
+    unittest.main()
diff --git a/tests/QtNetwork/bug_446.py b/tests/QtNetwork/bug_446.py
new file mode 100644
index 0000000..d3a9d09
--- /dev/null
+++ b/tests/QtNetwork/bug_446.py
@@ -0,0 +1,48 @@
+import unittest
+
+from PySide.QtCore import *
+from PySide.QtNetwork import *
+
+from helper import UsesQCoreApplication
+
+class HttpSignalsCase(UsesQCoreApplication):
+    '''Test case for launching QHttp signals'''
+    DATA = "PySide rocks"
+
+    def onError(self):
+        self.assert_(False)
+
+    def onNewConnection(self):
+        self.serverConnection = self.server.nextPendingConnection()
+        self.serverConnection.error.connect(self.onError)
+        self.serverConnection.write(HttpSignalsCase.DATA)
+        self.server.close()
+
+    def onReadReady(self):
+        data = self.client.read(100)
+        self.assertEqual(data.size(), len(HttpSignalsCase.DATA))
+        self.assertEqual(data, HttpSignalsCase.DATA)
+        self.done()
+
+    def onClientConnect(self):
+        self.client.readyRead.connect(self.onReadReady)
+
+    def initServer(self):
+        self.server = QTcpServer()
+        self.server.newConnection.connect(self.onNewConnection)
+        self.assert_(self.server.listen())
+        self.client = QTcpSocket()
+        self.client.connected.connect(self.onClientConnect)
+        self.client.connectToHost(QHostAddress(QHostAddress.LocalHost), self.server.serverPort())
+
+    def done(self):
+        self.serverConnection.close()
+        self.client.close()
+        self.app.quit()
+
+    def testRun(self):
+        self.initServer()
+        self.app.exec_()
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/tests/QtNetwork/http_test.py b/tests/QtNetwork/http_test.py
new file mode 100644
index 0000000..b6bfea5
--- /dev/null
+++ b/tests/QtNetwork/http_test.py
@@ -0,0 +1,47 @@
+
+'''Test cases for QHttp'''
+
+import unittest
+
+from PySide.QtCore import *
+from PySide.QtNetwork import *
+
+from helper import UsesQCoreApplication
+from httpd import TestServer
+
+class HttpSignalsCase(UsesQCoreApplication):
+    '''Test case for launching QHttp signals'''
+
+    def setUp(self):
+        super(HttpSignalsCase, self).setUp()
+        self.httpd = TestServer()
+        self.httpd.start()
+        self.http = QHttp("127.0.0.1" , self.httpd.port())
+        self.called = False
+
+    def tearDown(self):
+        if self.httpd:
+            self.httpd.shutdown()
+            del self.httpd
+        self.http = None
+        self.httpd = None
+        super(HttpSignalsCase, self).tearDown()
+
+    def goAway(self):
+        self.httpd.shutdown()
+        self.app.quit()
+
+    def callback(self, ident):
+        self.called = True
+        self.goAway()
+
+    def testDefaultArgs(self):
+        #QHttp signal requestStarted signal
+        # @bug 114
+        self.http.requestStarted.connect(self.callback)
+        self.http.get("index.html")
+        self.app.exec_()
+        self.assert_(self.called)
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/tests/QtNetwork/qipv6address_test.py b/tests/QtNetwork/qipv6address_test.py
new file mode 100644
index 0000000..eeb4c61
--- /dev/null
+++ b/tests/QtNetwork/qipv6address_test.py
@@ -0,0 +1,22 @@
+'''Test cases for QIPv6Address'''
+
+import unittest
+
+from PySide.QtNetwork import *
+
+class QIPv6AddressGetItemTest(unittest.TestCase):
+    def testLength(self):
+        ip = QIPv6Address()
+        self.assertEqual(len(ip), 16)
+
+    def testSetItemNegativeIndex(self):
+        ip = QIPv6Address()
+        ip[-1] = 8
+        self.assertEqual(ip[-1], 8)
+
+    def testSetItemLargeIndex(self):
+        ip = QIPv6Address()
+        self.assertRaises(IndexError, ip.__setitem__, 32, 16)
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/tests/qtnetwork/tcpserver_test.py b/tests/QtNetwork/tcpserver_test.py
similarity index 100%
rename from tests/qtnetwork/tcpserver_test.py
rename to tests/QtNetwork/tcpserver_test.py
diff --git a/tests/qtnetwork/udpsocket_test.py b/tests/QtNetwork/udpsocket_test.py
similarity index 59%
rename from tests/qtnetwork/udpsocket_test.py
rename to tests/QtNetwork/udpsocket_test.py
index 26cff7f..66f8920 100644
--- a/tests/qtnetwork/udpsocket_test.py
+++ b/tests/QtNetwork/udpsocket_test.py
@@ -14,16 +14,13 @@ class HttpSignalsCase(unittest.TestCase):
 
     def setUp(self):
         #Acquire resources
+        self.called = False
         self.app = QCoreApplication([])
+
         self.socket = QUdpSocket()
-        self.socket.bind(45454)
+
         self.server = QUdpSocket()
-        self.timer = QTimer.singleShot(1000, self.app.quit)
-        self.a = QTimer.singleShot(100, self.broadcast)
-        #self.a = QTimer()
-        #self.a.setInterval(100)
-        #QObject.connect(self.a, SIGNAL('timeout()'), self.broadcast)
-        #self.a.start()
+        self.server.bind(QHostAddress(QHostAddress.LocalHost), 45454)
 
     def tearDown(self):
         #Release resources
@@ -31,21 +28,21 @@ class HttpSignalsCase(unittest.TestCase):
         del self.server
         del self.app
 
-    def broadcast(self):
-        addr = QHostAddress(QHostAddress.Broadcast)
-        self.server.writeDatagram('datagram', addr, 45454)
+    def sendPackage(self):
+        addr = QHostAddress(QHostAddress.LocalHost)
+        self.socket.writeDatagram('datagram', addr, 45454)
 
     def callback(self):
-        while self.socket.hasPendingDatagrams():
-            datagram, host, port = self.socket.readDatagram(
-                        self.socket.pendingDatagramSize())
+        while self.server.hasPendingDatagrams():
+            datagram, host, port = self.server.readDatagram(self.server.pendingDatagramSize())
             self.called = True
             self.app.quit()
 
     def testDefaultArgs(self):
         #QUdpSocket.readDatagram pythonic return
         # @bug 124
-        QObject.connect(self.socket, SIGNAL('readyRead()'), self.callback)
+        QObject.connect(self.server, SIGNAL('readyRead()'), self.callback)
+        self.sendPackage()
         self.app.exec_()
 
         self.assert_(self.called)
diff --git a/tests/QtOpenGL/CMakeLists.txt b/tests/QtOpenGL/CMakeLists.txt
new file mode 100644
index 0000000..7c70985
--- /dev/null
+++ b/tests/QtOpenGL/CMakeLists.txt
@@ -0,0 +1,4 @@
+if(${QTVERSION} VERSION_GREATER 4.6.9)
+    PYSIDE_TEST(qglbuffer_test.py)
+endif()
+PYSIDE_TEST(qglwidget_test.py)
diff --git a/tests/QtOpenGL/qglbuffer_test.py b/tests/QtOpenGL/qglbuffer_test.py
new file mode 100644
index 0000000..8d6d503
--- /dev/null
+++ b/tests/QtOpenGL/qglbuffer_test.py
@@ -0,0 +1,43 @@
+#!/usr/bin/python
+'''Unit tests for QGLBuffer'''
+
+import unittest
+
+from PySide.QtCore import QByteArray
+from PySide.QtOpenGL import QGLBuffer, QGLWidget
+import py3kcompat as py3k
+from helper import UsesQApplication
+
+class QGLBufferTest(UsesQApplication):
+    def testIt(self):
+        w = QGLWidget()
+        w.makeCurrent()
+
+        b = QGLBuffer()
+        b.setUsagePattern(QGLBuffer.DynamicDraw)
+
+        self.assertTrue(b.create())
+        self.assertTrue(b.bufferId() != 0)
+        self.assertTrue(b.bind())
+
+        data = QByteArray("12345")
+        b.allocate(data)
+        self.assertEqual(b.size(), data.size())
+
+        m = b.map(QGLBuffer.ReadOnly)
+        if m:
+            self.assertEqual(m, py3k.buffer(py3k.b(data.data())))
+            b.unmap()
+
+            m = b.map(QGLBuffer.ReadWrite)
+            m[3] = py3k.b('A')
+            b.unmap()
+            result, rdata = b.read(3, 1)
+            self.assertTrue(result)
+            self.assertEqual(py3k.b('A'), rdata.data())
+        else:
+            print(" memory mapping is not possible in this OpenGL implementation.")
+        b.release()
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/tests/QtOpenGL/qglwidget_test.py b/tests/QtOpenGL/qglwidget_test.py
new file mode 100644
index 0000000..515b8f5
--- /dev/null
+++ b/tests/QtOpenGL/qglwidget_test.py
@@ -0,0 +1,18 @@
+import unittest
+from PySide.QtGui import *
+from PySide.QtOpenGL import *
+
+class TestQGLWidget (unittest.TestCase):
+    def testIt(self):
+        """Just test if the bindTexture(*, GLenum, GLint) methods overloads exists"""
+        app = QApplication([])
+        img = QImage()
+        w = QGLWidget()
+        a = w.bindTexture(img, 0, 0) # ok if it throws nothing.. :-)
+
+
+
+
+
+if __name__ == "__main__":
+    unittest.main()
diff --git a/tests/QtScript/CMakeLists.txt b/tests/QtScript/CMakeLists.txt
new file mode 100644
index 0000000..dfea68d
--- /dev/null
+++ b/tests/QtScript/CMakeLists.txt
@@ -0,0 +1,5 @@
+PYSIDE_TEST(base_test.py)
+PYSIDE_TEST(bug_1022.py)
+PYSIDE_TEST(engine_test.py)
+PYSIDE_TEST(property_test.py)
+PYSIDE_TEST(qscriptvalue_test.py)
diff --git a/tests/qtscript/base_test.py b/tests/QtScript/base_test.py
similarity index 100%
rename from tests/qtscript/base_test.py
rename to tests/QtScript/base_test.py
diff --git a/tests/QtScript/bug_1022.py b/tests/QtScript/bug_1022.py
new file mode 100644
index 0000000..3a24614
--- /dev/null
+++ b/tests/QtScript/bug_1022.py
@@ -0,0 +1,13 @@
+import unittest
+
+from PySide.QtCore import *
+from PySide.QtScript import *
+
+class QScriptValueTest(unittest.TestCase):
+    def testQScriptValue(self): 
+        app = QCoreApplication([])
+        engine = QScriptEngine()
+        repr(engine.evaluate('1 + 1'))
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/tests/qtscript/engine_test.py b/tests/QtScript/engine_test.py
similarity index 100%
rename from tests/qtscript/engine_test.py
rename to tests/QtScript/engine_test.py
diff --git a/tests/QtScript/property_test.py b/tests/QtScript/property_test.py
new file mode 100644
index 0000000..52c01f7
--- /dev/null
+++ b/tests/QtScript/property_test.py
@@ -0,0 +1,62 @@
+import unittest
+
+from PySide.QtCore import QObject, Property, QCoreApplication
+from PySide.QtScript import  QScriptEngine
+
+class MyObject(QObject):
+    def __init__(self, parent = None):
+        QObject.__init__(self, parent)
+        self._p = 100
+
+    def setX(self, value):
+        self._p = value
+
+    def getX(self):
+        return self._p
+
+    def resetX(self):
+        self._p = 100
+
+    def delX(self):
+        self._p = 0
+
+    x = Property(int, getX, setX, resetX, delX)
+
+
+class QPropertyTest(unittest.TestCase):
+
+    def testSimple(self):
+        o = MyObject()
+        self.assertEqual(o.x, 100)
+        o.x = 42
+        self.assertEqual(o.x, 42)
+
+    def testHasProperty(self):
+        o = MyObject()
+        o.setProperty("x", 10)
+        self.assertEqual(o.x, 10)
+        self.assertEqual(o.property("x"), 10)
+
+    def testMetaProperty(self):
+        o = MyObject()
+        m = o.metaObject()
+        found = False
+        for i in range(m.propertyCount()):
+            mp = m.property(i)
+            if mp.name() == "x":
+                found = True
+                break
+        self.assert_(found)
+
+    def testScriptQProperty(self):
+        qapp = QCoreApplication([])
+        myEngine = QScriptEngine()
+        obj = MyObject()
+        scriptObj = myEngine.newQObject(obj)
+        myEngine.globalObject().setProperty("obj", scriptObj)
+        myEngine.evaluate("obj.x = 42")
+        self.assertEqual(scriptObj.property("x").toInt32(), 42)
+        self.assertEqual(obj.property("x"), 42)
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/tests/QtScript/qscriptvalue_test.py b/tests/QtScript/qscriptvalue_test.py
new file mode 100644
index 0000000..e5b6a63
--- /dev/null
+++ b/tests/QtScript/qscriptvalue_test.py
@@ -0,0 +1,38 @@
+import unittest
+import PySide
+from PySide.QtScript import *
+
+from helper import UsesQApplication
+
+class TestQScriptValue (UsesQApplication):
+
+    def testOperator(self):
+        engine = QScriptEngine()
+        value = engine.evaluate('x = {"a": 1, "b":2}')
+        self.assertEqual(value['a'], 1)
+        self.assertRaises(KeyError, value.__getitem__, 'c')
+        value = engine.evaluate('x = ["x", "y", "z"]')
+        self.assertEqual(value[2], 'z')
+        self.assertRaises(IndexError, value.__getitem__, 23)
+
+    def testRepr(self):
+        value = QScriptValue("somePerson = { firstName: 'John', lastName: 'Doe' }")
+        value2 = eval(repr(value))
+        self.assertEqual(value.toString(), value2.toString())
+        self.assertEqual(value.toVariant(), value2.toVariant())
+
+    def testIteratorProtocol(self):
+        engine = QScriptEngine()
+        value = engine.evaluate('x = {"a": 1, "b":2}')
+        d = {}
+        for k, v in QScriptValueIterator(value):
+            d[k] = v
+        self.assertEqual(d, {'a': 1, 'b': 2})
+
+        d = {}
+        for k, v in value:
+            d[k] = v
+        self.assertEqual(d, {'a': 1, 'b': 2})
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/tests/QtScriptTools/CMakeLists.txt b/tests/QtScriptTools/CMakeLists.txt
new file mode 100644
index 0000000..ee22737
--- /dev/null
+++ b/tests/QtScriptTools/CMakeLists.txt
@@ -0,0 +1 @@
+PYSIDE_TEST(debugger_test.py)
diff --git a/tests/qtscripttools/debugger_test.py b/tests/QtScriptTools/debugger_test.py
similarity index 58%
rename from tests/qtscripttools/debugger_test.py
rename to tests/QtScriptTools/debugger_test.py
index e525361..8805018 100644
--- a/tests/qtscripttools/debugger_test.py
+++ b/tests/QtScriptTools/debugger_test.py
@@ -1,7 +1,7 @@
 
 import unittest
 
-from PySide.QtCore import SIGNAL
+from PySide.QtCore import SIGNAL, QTimer
 from PySide.QtScript import QScriptEngine
 from PySide.QtScriptTools import QScriptEngineDebugger
 
@@ -13,29 +13,32 @@ class DebuggerTest(UsesQApplication):
         UsesQApplication.setUp(self)
         self.engine = QScriptEngine()
         self.debugger = QScriptEngineDebugger()
-        self.has_suspended = False
-        self.has_resumed = False
+        self.has_suspended = 0
+        self.has_resumed = 0
+        self.count = 3
 
     def suspended(self):
-        self.has_suspended = True
-        self.debugger.action(QScriptEngineDebugger.ContinueAction).trigger()
+        self.has_suspended += 1
+        # Will emit evaluationResumed until there are more instructions to be run
+        QTimer.singleShot(100, self.debugger.action(QScriptEngineDebugger.StepIntoAction).trigger)
 
     def resumed(self):
-        self.has_resumed = True
+        # Will be called when debugger.state() change from Suspended to Running
+        # except for the first time.
+        self.has_resumed += 1
 
     def testBasic(self):
         '''Interrupt and resume evaluation with QScriptEngineDebugger'''
+
         self.debugger.attachTo(self.engine)
         self.debugger.setAutoShowStandardWindow(False)
         self.debugger.connect(SIGNAL('evaluationSuspended()'), self.suspended)
         self.debugger.connect(SIGNAL('evaluationResumed()'), self.resumed)
 
         self.debugger.action(QScriptEngineDebugger.InterruptAction).trigger()
-        self.engine.evaluate("3+4")
-        self.debugger.action(QScriptEngineDebugger.ContinueAction).trigger()
-        self.assert_(self.has_resumed)
-        self.assert_(self.has_suspended)
-
+        self.engine.evaluate("3+4\n2+1\n5+1")
+        self.assert_(self.has_resumed >= 1)
+        self.assert_(self.has_suspended >= 1)
 
 if __name__ == '__main__':
     unittest.main()
diff --git a/tests/QtSql/CMakeLists.txt b/tests/QtSql/CMakeLists.txt
new file mode 100644
index 0000000..8db3a98
--- /dev/null
+++ b/tests/QtSql/CMakeLists.txt
@@ -0,0 +1,3 @@
+PYSIDE_TEST(bug_1013.py)
+PYSIDE_TEST(qsqldatabaseandqueries_test.py)
+PYSIDE_TEST(qvarianttype_test.py)
diff --git a/tests/QtSql/bug_1013.py b/tests/QtSql/bug_1013.py
new file mode 100644
index 0000000..f0cee70
--- /dev/null
+++ b/tests/QtSql/bug_1013.py
@@ -0,0 +1,30 @@
+from PySide.QtCore import *
+from PySide.QtSql import *
+import unittest
+
+class TestBug1013 (unittest.TestCase):
+
+    def someSlot(self, row, record):
+        record.setValue(0, 2)
+        self._wasCalled = True
+
+    def testIt(self):
+        app = QCoreApplication([])
+        db = QSqlDatabase.addDatabase('QSQLITE')
+        db.setDatabaseName(':memory:')
+        db.open()
+        query = QSqlQuery()
+        query.exec_('CREATE TABLE "foo" (id INT);')
+        model = QSqlTableModel()
+        model.setTable('foo')
+
+        self._wasCalled = False
+        model.primeInsert.connect(self.someSlot)
+        model.select()
+        QTimer.singleShot(0,lambda: model.insertRow(0) and app.quit())
+        app.exec_()
+        self.assertTrue(self._wasCalled)
+        self.assertEqual(model.data(model.index(0, 0)), 2)
+
+if __name__ == "__main__":
+    unittest.main()
diff --git a/tests/qtsql/qsqldatabaseandqueries_test.py b/tests/QtSql/qsqldatabaseandqueries_test.py
old mode 100755
new mode 100644
similarity index 75%
rename from tests/qtsql/qsqldatabaseandqueries_test.py
rename to tests/QtSql/qsqldatabaseandqueries_test.py
index 49f2209..41daccc
--- a/tests/qtsql/qsqldatabaseandqueries_test.py
+++ b/tests/QtSql/qsqldatabaseandqueries_test.py
@@ -5,14 +5,20 @@ import sys
 import unittest
 
 from PySide import QtSql
-from PySide.QtCore import QVariant, QString
+from PySide.QtCore import *
+from PySide.QtGui import *
+
+class Foo(QWidget):
+    def __init__(self):
+        QWidget.__init__(self)
+        self.model = QtSql.QSqlTableModel()
 
 class SqlDatabaseCreationDestructionAndQueries(unittest.TestCase):
     '''Test cases for QtSql database creation, destruction and queries'''
 
     def setUp(self):
         #Acquire resources
-        self.assertFalse(QtSql.QSqlDatabase.drivers().isEmpty(), "installed Qt has no DB drivers")
+        self.assertFalse(not QtSql.QSqlDatabase.drivers(), "installed Qt has no DB drivers")
         self.assertTrue("QSQLITE" in QtSql.QSqlDatabase.drivers(), "\"QSQLITE\" driver not available in this Qt version")
         self.db = QtSql.QSqlDatabase.addDatabase("QSQLITE")
         self.db.setDatabaseName(":memory:")
@@ -39,18 +45,26 @@ class SqlDatabaseCreationDestructionAndQueries(unittest.TestCase):
         query.exec_("INSERT INTO person VALUES(101, 'George', 'Harrison')")
         query.prepare("INSERT INTO person (id, firstname, lastname) "
                       "VALUES (:id, :firstname, :lastname)")
-        query.bindValue(":id", QVariant(102))
-        query.bindValue(":firstname", QVariant("John"))
-        query.bindValue(":lastname", QVariant("Lennon"))
+        query.bindValue(":id", 102)
+        query.bindValue(":firstname", "John")
+        query.bindValue(":lastname", "Lennon")
         query.exec_()
 
         lastname = ''
         query.exec_("SELECT lastname FROM person where id=101")
         self.assertTrue(query.isActive())
         query.next()
-        lastname = query.value(0).toString()
+        lastname = query.value(0)
         self.assertEqual(lastname, 'Harrison')
 
+    def testTableModelDeletion(self):
+        app = QApplication([])
+
+        bar = Foo()
+        model = bar.model
+        del bar
+        del app
+
 if __name__ == '__main__':
     unittest.main()
 
diff --git a/tests/QtSql/qvarianttype_test.py b/tests/QtSql/qvarianttype_test.py
new file mode 100644
index 0000000..5612f89
--- /dev/null
+++ b/tests/QtSql/qvarianttype_test.py
@@ -0,0 +1,34 @@
+'''Test cases for QVariant::Type converter'''
+import unittest
+import py3kcompat as py3k
+from PySide.QtSql import QSqlField
+
+class QVariantTypeTest(unittest.TestCase):
+    def testQVariantType(self):
+        f = QSqlField("name", str)
+        self.assertEqual(f.type(), py3k.unicode)
+
+        f = QSqlField("name", "QString")
+        self.assertEqual(f.type(),  py3k.unicode)
+
+        f = QSqlField("name", "double")
+        self.assertEqual(f.type(), float)
+
+        f = QSqlField("name", float)
+        self.assertEqual(f.type(), float)
+
+        f = QSqlField("name", int)
+        self.assertEqual(f.type(), int)
+
+        if not py3k.IS_PY3K:
+            f = QSqlField("name", long)
+            self.assertEqual(f.type(), int) # long isn't registered in QVariant:Type, just in QMetaType::Type
+
+        #f = QSqlField("name", QObject)
+        #self.assertEqual(f.type(), None)
+
+        f = QSqlField("name", None)
+        self.assertEqual(f.type(), None)
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/tests/QtSvg/CMakeLists.txt b/tests/QtSvg/CMakeLists.txt
new file mode 100644
index 0000000..4f5e280
--- /dev/null
+++ b/tests/QtSvg/CMakeLists.txt
@@ -0,0 +1,3 @@
+PYSIDE_TEST(qsvggenerator_test.py)
+PYSIDE_TEST(qsvgrenderer_test.py)
+PYSIDE_TEST(qsvgwidget_test.py)
diff --git a/tests/qtsvg/qsvggenerator_test.py b/tests/QtSvg/qsvggenerator_test.py
similarity index 100%
rename from tests/qtsvg/qsvggenerator_test.py
rename to tests/QtSvg/qsvggenerator_test.py
diff --git a/tests/QtSvg/qsvgrenderer_test.py b/tests/QtSvg/qsvgrenderer_test.py
new file mode 100644
index 0000000..b2c9653
--- /dev/null
+++ b/tests/QtSvg/qsvgrenderer_test.py
@@ -0,0 +1,24 @@
+#!/usr/bin/python
+import unittest, os
+from PySide.QtCore import *
+from PySide.QtGui import *
+from PySide.QtSvg import *
+
+class QSvgRendererTest(unittest.TestCase):
+
+    def testLoad(self):
+        tigerPath = os.path.join(os.path.dirname(__file__), 'tiger.svg')
+        app = QApplication([])
+
+        fromFile = QSvgRenderer(tigerPath)
+        self.assertTrue(fromFile.isValid())
+
+        tigerFile = QFile(tigerPath)
+        tigerFile.open(QFile.ReadOnly)
+        tigerData = tigerFile.readAll()
+        fromContents = QSvgRenderer(tigerData)
+        self.assertTrue(fromContents.isValid())
+
+if __name__ == '__main__':
+    unittest.main()
+
diff --git a/tests/QtSvg/qsvgwidget_test.py b/tests/QtSvg/qsvgwidget_test.py
new file mode 100644
index 0000000..4afbce9
--- /dev/null
+++ b/tests/QtSvg/qsvgwidget_test.py
@@ -0,0 +1,26 @@
+#!/usr/bin/python
+import unittest, os
+from PySide.QtCore import *
+from PySide.QtGui import *
+from PySide.QtSvg import *
+
+class QSvgWidgetTest(unittest.TestCase):
+
+    def testLoad(self):
+        tigerPath = os.path.join(os.path.dirname(__file__), 'tiger.svg')
+
+        app = QApplication([])
+        fromFile = QSvgWidget()
+        fromFile.load(tigerPath)
+        self.assertTrue(fromFile.renderer().isValid())
+
+        tigerFile = QFile(tigerPath)
+        tigerFile.open(QFile.ReadOnly)
+        tigerData = tigerFile.readAll()
+        fromContents = QSvgWidget()
+        fromContents.load(tigerData)
+        self.assertTrue(fromContents.renderer().isValid())
+
+if __name__ == '__main__':
+    unittest.main()
+
diff --git a/tests/QtSvg/tiger.svg b/tests/QtSvg/tiger.svg
new file mode 100644
index 0000000..983e570
--- /dev/null
+++ b/tests/QtSvg/tiger.svg
@@ -0,0 +1,730 @@
+<?xml version="1.0"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" 
+         "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg xmlns="http://www.w3.org/2000/svg"
+     xmlns:xlink="http://www.w3.org/1999/xlink"
+     height="800">
+ <g transform="translate(200,200)" style="fill-opacity:1; fill:none;">
+ <g style="fill: #ffffff; stroke:#000000; stroke-width:0.172">
+  <path d="M-122.304 84.285C-122.304 84.285 -122.203 86.179 -123.027 86.16C-123.851 86.141 -140.305 38.066 -160.833 40.309C-160.833 40.309 -143.05 32.956 -122.304 84.285z"/>
+ </g>
+ <g style="fill: #ffffff; stroke:#000000; stroke-width:0.172">
+  <path d="M-118.774 81.262C-118.774 81.262 -119.323 83.078 -120.092 82.779C-120.86 82.481 -119.977 31.675 -140.043 26.801C-140.043 26.801 -120.82 25.937 -118.774 81.262z"/>
+ </g>
+ <g style="fill: #ffffff; stroke:#000000; stroke-width:0.172">
+  <path d="M-91.284 123.59C-91.284 123.59 -89.648 124.55 -90.118 125.227C-90.589 125.904 -139.763 113.102 -149.218 131.459C-149.218 131.459 -145.539 112.572 -91.284 123.59z"/>
+ </g>
+ <g style="fill: #ffffff; stroke:#000000; stroke-width:0.172">
+  <path d="M-94.093 133.801C-94.093 133.801 -92.237 134.197 -92.471 134.988C-92.704 135.779 -143.407 139.121 -146.597 159.522C-146.597 159.522 -149.055 140.437 -94.093 133.801z"/>
+ </g>
+ <g style="fill: #ffffff; stroke:#000000; stroke-width:0.172">
+  <path d="M-98.304 128.276C-98.304 128.276 -96.526 128.939 -96.872 129.687C-97.218 130.435 -147.866 126.346 -153.998 146.064C-153.998 146.064 -153.646 126.825 -98.304 128.276z"/>
+ </g>
+ <g style="fill: #ffffff; stroke:#000000; stroke-width:0.172">
+  <path d="M-109.009 110.072C-109.009 110.072 -107.701 111.446 -108.34 111.967C-108.979 112.488 -152.722 86.634 -166.869 101.676C-166.869 101.676 -158.128 84.533 -109.009 110.072z"/>
+ </g>
+ <g style="fill: #ffffff; stroke:#000000; stroke-width:0.172">
+  <path d="M-116.554 114.263C-116.554 114.263 -115.098 115.48 -115.674 116.071C-116.25 116.661 -162.638 95.922 -174.992 112.469C-174.992 112.469 -168.247 94.447 -116.554 114.263z"/>
+ </g>
+ <g style="fill: #ffffff; stroke:#000000; stroke-width:0.172">
+  <path d="M-119.154 118.335C-119.154 118.335 -117.546 119.343 -118.036 120.006C-118.526 120.669 -167.308 106.446 -177.291 124.522C-177.291 124.522 -173.066 105.749 -119.154 118.335z"/>
+ </g>
+ <g style="fill: #ffffff; stroke:#000000; stroke-width:0.172">
+  <path d="M-108.42 118.949C-108.42 118.949 -107.298 120.48 -107.999 120.915C-108.7 121.35 -148.769 90.102 -164.727 103.207C-164.727 103.207 -153.862 87.326 -108.42 118.949z"/>
+ </g>
+ <g style="fill: #ffffff; stroke:#000000; stroke-width:0.172">
+  <path d="M-128.2 90C-128.2 90 -127.6 91.8 -128.4 92C-129.2 92.2 -157.8 50.2 -177.001 57.8C-177.001 57.8 -161.8 46 -128.2 90z"/>
+ </g>
+ <g style="fill: #ffffff; stroke:#000000; stroke-width:0.172">
+  <path d="M-127.505 96.979C-127.505 96.979 -126.53 98.608 -127.269 98.975C-128.007 99.343 -164.992 64.499 -182.101 76.061C-182.101 76.061 -169.804 61.261 -127.505 96.979z"/>
+ </g>
+ <g style="fill: #ffffff; stroke:#000000; stroke-width:0.172">
+  <path d="M-127.62 101.349C-127.62 101.349 -126.498 102.88 -127.199 103.315C-127.9 103.749 -167.969 72.502 -183.927 85.607C-183.927 85.607 -173.062 69.726 -127.62 101.349z"/>
+ </g>
+ <g style="fill: #ffffff; stroke:#000000">
+  <path d="M-129.83 103.065C-129.327 109.113 -128.339 115.682 -126.6 118.801C-126.6 118.801 -130.2 131.201 -121.4 144.401C-121.4 144.401 -121.8 151.601 -120.2 154.801C-120.2 154.801 -116.2 163.201 -111.4 164.001C-107.516 164.648 -98.793 167.717 -88.932 169.121C-88.932 169.121 -71.8 183.201 -75 196.001C-75 196.001 -75.4 212.401 -79 214.001C-79 214.001 -67.4 202.801 -77 219.601L-81.4 238.401C-81.4 238.401 -55.8 216.801 -71.4 235.201L-81.4 261.201C-81.4 261.201 -61.8 242.801 -69 251.201L-72.2 260.001C-72.2 260.001 -29 232.801 -59.8 262.401C-59.8 262.401 -51.8 258.801 -47.4 261.601C-47.4 261.601 -40.6 260.401 -41.4 262.001C-41.4 262.001 -62.2 272.401 -65.8 290.801C-65.8 290.801 -57.4 280.801 -60.6 291.601L-60.2 303.201C-60.2 303.201 -56.2 281.601 -56.6 319.201C-56.6 319.201 -37.4 301.201 -49 322.001L-49 338.801C-49 338.801 -33.8 322.401 -40.2 335.201C-40.2 335.201 -30.2 326.401 -34.2 341.601C-34.2 341.601 -35 352.001 -30.6 340.801C-30.6 340.801 -14.6 310.201 -20.6 336.401C-20.6 336.401 -21.4 355.601 -16.6 340.801C-16.6 340.801 -16.2 351.201 -7 358.401C-7 358.401 -8.2 307.601 4.6 343.601L8.6 360.001C8.6 360.001 11.4 350.801 11 345.601C11 345.601 25.8 329.201 19 353.601C19 353.601 34.2 330.801 31 344.001C31 344.001 23.4 360.001 25 364.801C25 364.801 41.8 330.001 43 328.401C43 328.401 41 370.802 51.8 334.801C51.8 334.801 57.4 346.801 54.6 351.201C54.6 351.201 62.6 343.201 61.8 340.001C61.8 340.001 66.4 331.801 69.2 345.401C69.2 345.401 71 354.801 72.6 351.601C72.6 351.601 76.6 375.602 77.8 352.801C77.8 352.801 79.4 339.201 72.2 327.601C72.2 327.601 73 324.401 70.2 320.401C70.2 320.401 83.8 342.001 76.6 313.201C76.6 313.201 87.801 321.201 89.001 321.201C89.001 321.201 75.4 298.001 84.2 302.801C84.2 302.801 79 292.401 97.001 304.401C97.001 304.401 81 288.401 98.601 298.001C98.601 298.001 106.601 304.401 99.001 294.401C99.001 294.401 84.6 278.401 106.601 296.401C106.601 296.401 118.201 312.801 119.001 315.601C119.001 315.601 109.001 286.401 104.601 283.601C104.601 283.601 113.001 247.201 154.201 262.801C154.201 262.801 161.001 280.001 165.401 261.601C165.401 261.601 178.201 255.201 189.401 282.801C189.401 282.801 193.401 269.201 192.601 266.401C192.601 266.401 199.401 267.601 198.601 266.401C198.601 266.401 211.801 270.801 213.001 270.001C213.001 270.001 219.801 276.801 220.201 273.201C220.201 273.201 229.401 276.001 227.401 272.401C227.401 272.401 236.201 288.001 236.601 291.601L239.001 277.601L241.001 280.401C241.001 280.401 242.601 272.801 241.801 271.601C241.001 270.401 261.801 278.401 266.601 299.201L268.601 307.601C268.601 307.601 274.601 292.801 273.001 288.801C273.001 288.801 278.201 289.601 278.601 294.001C278.601 294.001 282.601 270.801 277.801 264.801C277.801 264.801 282.201 264.001 283.401 267.601L283.401 260.401C283.401 260.401 290.601 261.201 290.601 258.801C290.601 258.801 295.001 254.801 297.001 259.601C297.001 259.601 284.601 224.401 303.001 243.601C303.001 243.601 310.201 254.401 306.601 235.601C303.001 216.801 299.001 215.201 303.801 214.801C303.801 214.801 304.601 211.201 302.601 209.601C300.601 208.001 303.801 209.601 303.801 209.601C303.801 209.601 308.601 213.601 303.401 191.601C303.401 191.601 309.801 193.201 297.801 164.001C297.801 164.001 300.601 161.601 296.601 153.201C296.601 153.201 304.601 157.601 307.401 156.001C307.401 156.001 307.001 154.401 303.801 150.401C303.801 150.401 282.201 95.6 302.601 117.601C302.601 117.601 314.451 131.151 308.051 108.351C308.051 108.351 298.94 84.341 299.717 80.045L-129.83 103.065z"/>
+ </g>
+ <g style="fill: #cc7226; stroke:#000000">
+  <path d="M299.717 80.245C300.345 80.426 302.551 81.55 303.801 83.2C303.801 83.2 310.601 94 305.401 75.6C305.401 75.6 296.201 46.8 305.001 58C305.001 58 311.001 65.2 307.801 51.6C303.936 35.173 301.401 28.8 301.401 28.8C301.401 28.8 313.001 33.6 286.201 -6L295.001 -2.4C295.001 -2.4 275.401 -42 253.801 -47.2L245.801 -53.2C245.801 -53.2 284.201 -91.2 271.401 -128C271.401 -128 264.601 -133.2 255.001 -124C255.001 -124 248.601 -119.2 242.601 -120.8C242.601 -120.8 211.801 -119.6 209.801 -119.6C207.801 -119.6 173.001 -156.8 107.401 -139.2C107.401 -139.2 102.201 -137.2 97.801 -138.4C97.801 -138.4 79.4 -154.4 30.6 -131.6C30.6 -131.6 20.6 -129.6 19 -129.6C17.4 -129.6 14.6 -129.6 6.6 -123.2C-1.4 -116.8 -1.8 -116 -3.8 -114.4C-3.8 -114.4 -20.2 -103.2 -25 -102.4C-25 -102.4 -36.6 -96 -41 -86L-44.6 -84.8C-44.6 -84.8 -46.2 -77.6 -46.6 -76.4C-46.6 -76.4 -51.4 -72.8 -52.2 -67.2C-52.2 -67.2 -61 -61.2 -60.6 -56.8C-60.6 -56.8 -62.2 -51.6 -63 -46.8C-63 -46.8 -70.2 -42 -69.4 -39.2C-69.4 -39.2 -77 -25.2 -75.8 -18.4C-75.8 -18.4 -82.2 -18.8 -85 -16.4C-85 -16.4 -85.8 -11.6 -87.4 -11.2C-87.4 -11.2 -90.2 -10 -87.8 -6C-87.8 -6 -89.4 -3.2 -89.8 -1.6C-89.8 -1.6 -89 1.2 -93.4 6.8C-93.4 6.8 -99.8 25.6 -97.8 30.8C-97.8 30.8 -97.4 35.6 -100.2 37.2C-100.2 37.2 -103.8 36.8 -95.4 48.8C-95.4 48.8 -94.6 50 -97.8 52.4C-97.8 52.4 -115 56 -117.4 72.4C-117.4 72.4 -131 87.2 -131 92.4C-131 94.705 -130.729 97.852 -130.03 102.465C-130.03 102.465 -130.6 110.801 -103 111.601C-75.4 112.401 299.717 80.245 299.717 80.245z"/>
+ </g>
+ <g style="fill: #cc7226">
+  <path d="M-115.6 102.6C-140.6 63.2 -126.2 119.601 -126.2 119.601C-117.4 154.001 12.2 116.401 12.2 116.401C12.2 116.401 181.001 86 192.201 82C203.401 78 298.601 84.4 298.601 84.4L293.001 67.6C228.201 21.2 209.001 44.4 195.401 40.4C181.801 36.4 184.201 46 181.001 46.8C177.801 47.6 138.601 22.8 132.201 23.6C125.801 24.4 100.459 0.649 115.401 32.4C131.401 66.4 57 71.6 40.2 60.4C23.4 49.2 47.4 78.8 47.4 78.8C65.8 98.8 31.4 82 31.4 82C-3 69.2 -27 94.8 -30.2 95.6C-33.4 96.4 -38.2 99.6 -39 93.2C-39.8 86.8 -47.31 70.099 -79 96.4C-99 113.001 -112.8 91 -112.8 91L-115.6 102.6z"/>
+ </g>
+ <g style="fill: #e87f3a">
+  <path d="M133.51 25.346C127.11 26.146 101.743 2.407 116.71 34.146C133.31 69.346 58.31 73.346 41.51 62.146C24.709 50.946 48.71 80.546 48.71 80.546C67.11 100.546 32.709 83.746 32.709 83.746C-1.691 70.946 -25.691 96.546 -28.891 97.346C-32.091 98.146 -36.891 101.346 -37.691 94.946C-38.491 88.546 -45.87 72.012 -77.691 98.146C-98.927 115.492 -112.418 94.037 -112.418 94.037L-115.618 104.146C-140.618 64.346 -125.546 122.655 -125.546 122.655C-116.745 157.056 13.509 118.146 13.509 118.146C13.509 118.146 182.31 87.746 193.51 83.746C204.71 79.746 299.038 86.073 299.038 86.073L293.51 68.764C228.71 22.364 210.31 46.146 196.71 42.146C183.11 38.146 185.51 47.746 182.31 48.546C179.11 49.346 139.91 24.546 133.51 25.346z"/>
+ </g>
+ <g style="fill: #ea8c4d">
+  <path d="M134.819 27.091C128.419 27.891 103.685 3.862 118.019 35.891C134.219 72.092 59.619 75.092 42.819 63.892C26.019 52.692 50.019 82.292 50.019 82.292C68.419 102.292 34.019 85.492 34.019 85.492C-0.381 72.692 -24.382 98.292 -27.582 99.092C-30.782 99.892 -35.582 103.092 -36.382 96.692C-37.182 90.292 -44.43 73.925 -76.382 99.892C-98.855 117.983 -112.036 97.074 -112.036 97.074L-115.636 105.692C-139.436 66.692 -124.891 125.71 -124.891 125.71C-116.091 160.11 14.819 119.892 14.819 119.892C14.819 119.892 183.619 89.492 194.819 85.492C206.019 81.492 299.474 87.746 299.474 87.746L294.02 69.928C229.219 23.528 211.619 47.891 198.019 43.891C184.419 39.891 186.819 49.491 183.619 50.292C180.419 51.092 141.219 26.291 134.819 27.091z"/>
+ </g>
+ <g style="fill: #ec9961">
+  <path d="M136.128 28.837C129.728 29.637 104.999 5.605 119.328 37.637C136.128 75.193 60.394 76.482 44.128 65.637C27.328 54.437 51.328 84.037 51.328 84.037C69.728 104.037 35.328 87.237 35.328 87.237C0.928 74.437 -23.072 100.037 -26.272 100.837C-29.472 101.637 -34.272 104.837 -35.072 98.437C-35.872 92.037 -42.989 75.839 -75.073 101.637C-98.782 120.474 -111.655 100.11 -111.655 100.11L-115.655 107.237C-137.455 70.437 -124.236 128.765 -124.236 128.765C-115.436 163.165 16.128 121.637 16.128 121.637C16.128 121.637 184.928 91.237 196.129 87.237C207.329 83.237 299.911 89.419 299.911 89.419L294.529 71.092C229.729 24.691 212.929 49.637 199.329 45.637C185.728 41.637 188.128 51.237 184.928 52.037C181.728 52.837 142.528 28.037 136.128 28.837z"/>
+ </g>
+ <g style="fill: #eea575">
+  <path d="M137.438 30.583C131.037 31.383 106.814 7.129 120.637 39.383C137.438 78.583 62.237 78.583 45.437 67.383C28.637 56.183 52.637 85.783 52.637 85.783C71.037 105.783 36.637 88.983 36.637 88.983C2.237 76.183 -21.763 101.783 -24.963 102.583C-28.163 103.383 -32.963 106.583 -33.763 100.183C-34.563 93.783 -41.548 77.752 -73.763 103.383C-98.709 122.965 -111.273 103.146 -111.273 103.146L-115.673 108.783C-135.473 73.982 -123.582 131.819 -123.582 131.819C-114.782 166.22 17.437 123.383 17.437 123.383C17.437 123.383 186.238 92.983 197.438 88.983C208.638 84.983 300.347 91.092 300.347 91.092L295.038 72.255C230.238 25.855 214.238 51.383 200.638 47.383C187.038 43.383 189.438 52.983 186.238 53.783C183.038 54.583 143.838 29.783 137.438 30.583z"/>
+ </g>
+ <g style="fill: #f1b288">
+  <path d="M138.747 32.328C132.347 33.128 106.383 9.677 121.947 41.128C141.147 79.928 63.546 80.328 46.746 69.128C29.946 57.928 53.946 87.528 53.946 87.528C72.346 107.528 37.946 90.728 37.946 90.728C3.546 77.928 -20.454 103.528 -23.654 104.328C-26.854 105.128 -31.654 108.328 -32.454 101.928C-33.254 95.528 -40.108 79.665 -72.454 105.128C-98.636 125.456 -110.891 106.183 -110.891 106.183L-115.691 110.328C-133.691 77.128 -122.927 134.874 -122.927 134.874C-114.127 169.274 18.746 125.128 18.746 125.128C18.746 125.128 187.547 94.728 198.747 90.728C209.947 86.728 300.783 92.764 300.783 92.764L295.547 73.419C230.747 27.019 215.547 53.128 201.947 49.128C188.347 45.128 190.747 54.728 187.547 55.528C184.347 56.328 145.147 31.528 138.747 32.328z"/>
+ </g>
+ <g style="fill: #f3bf9c">
+  <path d="M140.056 34.073C133.655 34.873 107.313 11.613 123.255 42.873C143.656 82.874 64.855 82.074 48.055 70.874C31.255 59.674 55.255 89.274 55.255 89.274C73.655 109.274 39.255 92.474 39.255 92.474C4.855 79.674 -19.145 105.274 -22.345 106.074C-25.545 106.874 -30.345 110.074 -31.145 103.674C-31.945 97.274 -38.668 81.578 -71.145 106.874C-98.564 127.947 -110.509 109.219 -110.509 109.219L-115.709 111.874C-131.709 81.674 -122.273 137.929 -122.273 137.929C-113.473 172.329 20.055 126.874 20.055 126.874C20.055 126.874 188.856 96.474 200.056 92.474C211.256 88.474 301.22 94.437 301.22 94.437L296.056 74.583C231.256 28.183 216.856 54.874 203.256 50.874C189.656 46.873 192.056 56.474 188.856 57.274C185.656 58.074 146.456 33.273 140.056 34.073z"/>
+ </g>
+ <g style="fill: #f5ccb0">
+  <path d="M141.365 35.819C134.965 36.619 107.523 13.944 124.565 44.619C146.565 84.219 66.164 83.819 49.364 72.619C32.564 61.419 56.564 91.019 56.564 91.019C74.964 111.019 40.564 94.219 40.564 94.219C6.164 81.419 -17.836 107.019 -21.036 107.819C-24.236 108.619 -29.036 111.819 -29.836 105.419C-30.636 99.019 -37.227 83.492 -69.836 108.619C-98.491 130.438 -110.127 112.256 -110.127 112.256L-115.727 113.419C-130.128 85.019 -121.618 140.983 -121.618 140.983C-112.818 175.384 21.364 128.619 21.364 128.619C21.364 128.619 190.165 98.219 201.365 94.219C212.565 90.219 301.656 96.11 301.656 96.11L296.565 75.746C231.765 29.346 218.165 56.619 204.565 52.619C190.965 48.619 193.365 58.219 190.165 59.019C186.965 59.819 147.765 35.019 141.365 35.819z"/>
+ </g>
+ <g style="fill: #f8d8c4">
+  <path d="M142.674 37.565C136.274 38.365 108.832 15.689 125.874 46.365C147.874 85.965 67.474 85.565 50.674 74.365C33.874 63.165 57.874 92.765 57.874 92.765C76.274 112.765 41.874 95.965 41.874 95.965C7.473 83.165 -16.527 108.765 -19.727 109.565C-22.927 110.365 -27.727 113.565 -28.527 107.165C-29.327 100.765 -35.786 85.405 -68.527 110.365C-98.418 132.929 -109.745 115.293 -109.745 115.293L-115.745 114.965C-129.346 88.564 -120.963 144.038 -120.963 144.038C-112.163 178.438 22.673 130.365 22.673 130.365C22.673 130.365 191.474 99.965 202.674 95.965C213.874 91.965 302.093 97.783 302.093 97.783L297.075 76.91C232.274 30.51 219.474 58.365 205.874 54.365C192.274 50.365 194.674 59.965 191.474 60.765C188.274 61.565 149.074 36.765 142.674 37.565z"/>
+ </g>
+ <g style="fill: #fae5d7">
+  <path d="M143.983 39.31C137.583 40.11 110.529 17.223 127.183 48.11C149.183 88.91 68.783 87.31 51.983 76.11C35.183 64.91 59.183 94.51 59.183 94.51C77.583 114.51 43.183 97.71 43.183 97.71C8.783 84.91 -15.217 110.51 -18.417 111.31C-21.618 112.11 -26.418 115.31 -27.218 108.91C-28.018 102.51 -34.346 87.318 -67.218 112.11C-98.345 135.42 -109.363 118.329 -109.363 118.329L-115.764 116.51C-128.764 92.51 -120.309 147.093 -120.309 147.093C-111.509 181.493 23.983 132.11 23.983 132.11C23.983 132.11 192.783 101.71 203.983 97.71C215.183 93.71 302.529 99.456 302.529 99.456L297.583 78.074C232.783 31.673 220.783 60.11 207.183 56.11C193.583 52.11 195.983 61.71 192.783 62.51C189.583 63.31 150.383 38.51 143.983 39.31z"/>
+ </g>
+ <g style="fill: #fcf2eb">
+  <path d="M145.292 41.055C138.892 41.855 112.917 18.411 128.492 49.855C149.692 92.656 70.092 89.056 53.292 77.856C36.492 66.656 60.492 96.256 60.492 96.256C78.892 116.256 44.492 99.456 44.492 99.456C10.092 86.656 -13.908 112.256 -17.108 113.056C-20.308 113.856 -25.108 117.056 -25.908 110.656C-26.708 104.256 -32.905 89.232 -65.908 113.856C-98.273 137.911 -108.982 121.365 -108.982 121.365L-115.782 118.056C-128.582 94.856 -119.654 150.147 -119.654 150.147C-110.854 184.547 25.292 133.856 25.292 133.856C25.292 133.856 194.093 103.456 205.293 99.456C216.493 95.456 302.965 101.128 302.965 101.128L298.093 79.237C233.292 32.837 222.093 61.856 208.493 57.856C194.893 53.855 197.293 63.456 194.093 64.256C190.892 65.056 151.692 40.255 145.292 41.055z"/>
+ </g>
+ <g style="fill: #ffffff">
+  <path d="M-115.8 119.601C-128.6 97.6 -119 153.201 -119 153.201C-110.2 187.601 26.6 135.601 26.6 135.601C26.6 135.601 195.401 105.2 206.601 101.2C217.801 97.2 303.401 102.8 303.401 102.8L298.601 80.4C233.801 34 223.401 63.6 209.801 59.6C196.201 55.6 198.601 65.2 195.401 66C192.201 66.8 153.001 42 146.601 42.8C140.201 43.6 114.981 19.793 129.801 51.6C152.028 99.307 69.041 89.227 54.6 79.6C37.8 68.4 61.8 98 61.8 98C80.2 118.001 45.8 101.2 45.8 101.2C11.4 88.4 -12.6 114.001 -15.8 114.801C-19 115.601 -23.8 118.801 -24.6 112.401C-25.4 106 -31.465 91.144 -64.6 115.601C-98.2 140.401 -108.6 124.401 -108.6 124.401L-115.8 119.601z"/>
+ </g>
+ <g style="fill: #000000">
+  <path d="M-74.2 149.601C-74.2 149.601 -81.4 161.201 -60.6 174.401C-60.6 174.401 -59.2 175.801 -77.2 171.601C-77.2 171.601 -83.4 169.601 -85 159.201C-85 159.201 -89.8 154.801 -94.6 149.201C-99.4 143.601 -74.2 149.601 -74.2 149.601z"/>
+ </g>
+ <g style="fill: #cccccc">
+  <path d="M65.8 102C65.8 102 83.498 128.821 82.9 133.601C81.6 144.001 81.4 153.601 84.6 157.601C87.801 161.601 96.601 194.801 96.601 194.801C96.601 194.801 96.201 196.001 108.601 158.001C108.601 158.001 120.201 142.001 100.201 123.601C100.201 123.601 65 94.8 65.8 102z"/>
+ </g>
+ <g style="fill: #000000">
+  <path d="M-54.2 176.401C-54.2 176.401 -43 183.601 -57.4 214.801L-51 212.401C-51 212.401 -51.8 223.601 -55 226.001L-47.8 222.801C-47.8 222.801 -43 230.801 -47 235.601C-47 235.601 -30.2 243.601 -31 250.001C-31 250.001 -24.6 242.001 -28.6 235.601C-32.6 229.201 -39.8 233.201 -39 214.801L-47.8 218.001C-47.8 218.001 -42.2 209.201 -42.2 202.801L-50.2 205.201C-50.2 205.201 -34.731 178.623 -45.4 177.201C-51.4 176.401 -54.2 176.401 -54.2 176.401z"/>
+ </g>
+ <g style="fill: #cccccc">
+  <path d="M-21.8 193.201C-21.8 193.201 -19 188.801 -21.8 189.601C-24.6 190.401 -55.8 205.201 -61.8 214.801C-61.8 214.801 -27.4 190.401 -21.8 193.201z"/>
+ </g>
+ <g style="fill: #cccccc">
+  <path d="M-11.4 201.201C-11.4 201.201 -8.6 196.801 -11.4 197.601C-14.2 198.401 -45.4 213.201 -51.4 222.801C-51.4 222.801 -17 198.401 -11.4 201.201z"/>
+ </g>
+ <g style="fill: #cccccc">
+  <path d="M1.8 186.001C1.8 186.001 4.6 181.601 1.8 182.401C-1 183.201 -32.2 198.001 -38.2 207.601C-38.2 207.601 -3.8 183.201 1.8 186.001z"/>
+ </g>
+ <g style="fill: #cccccc">
+  <path d="M-21.4 229.601C-21.4 229.601 -21.4 223.601 -24.2 224.401C-27 225.201 -63 242.801 -69 252.401C-69 252.401 -27 226.801 -21.4 229.601z"/>
+ </g>
+ <g style="fill: #cccccc">
+  <path d="M-20.2 218.801C-20.2 218.801 -19 214.001 -21.8 214.801C-23.8 214.801 -50.2 226.401 -56.2 236.001C-56.2 236.001 -26.6 214.401 -20.2 218.801z"/>
+ </g>
+ <g style="fill: #cccccc">
+  <path d="M-34.6 266.401L-44.6 274.001C-44.6 274.001 -34.2 266.401 -30.6 267.601C-30.6 267.601 -37.4 278.801 -38.2 284.001C-38.2 284.001 -27.8 271.201 -22.2 271.601C-22.2 271.601 -14.6 272.001 -14.6 282.801C-14.6 282.801 -9 272.401 -5.8 272.801C-5.8 272.801 -4.6 279.201 -5.8 286.001C-5.8 286.001 -1.8 278.401 2.2 280.001C2.2 280.001 8.6 278.001 7.8 289.601C7.8 289.601 7.8 300.001 7 302.801C7 302.801 12.6 276.401 15 276.001C15 276.001 23 274.801 27.8 283.601C27.8 283.601 23.8 276.001 28.6 278.001C28.6 278.001 39.4 279.601 42.6 286.401C42.6 286.401 35.8 274.401 41.4 277.601C41.4 277.601 48.2 277.601 49.4 284.001C49.4 284.001 57.8 305.201 59.8 306.801C59.8 306.801 52.2 285.201 53.8 285.201C53.8 285.201 51.8 273.201 57 288.001C57 288.001 53.8 274.001 59.4 274.801C65 275.601 69.4 285.601 77.8 283.201C77.8 283.201 87.401 288.801 89.401 219.601L-34.6 266.401z"/>
+ </g>
+ <g style="fill: #000000">
+  <path d="M-29.8 173.601C-29.8 173.601 -15 167.601 25 173.601C25 173.601 32.2 174.001 39 165.201C45.8 156.401 72.6 149.201 79 151.201L88.601 157.601L89.401 158.801C89.401 158.801 101.801 169.201 102.201 176.801C102.601 184.401 87.801 232.401 78.2 248.401C68.6 264.401 59 276.801 39.8 274.401C39.8 274.401 19 270.401 -6.6 274.401C-6.6 274.401 -35.8 272.801 -38.6 264.801C-41.4 256.801 -27.4 241.601 -27.4 241.601C-27.4 241.601 -23 233.201 -24.2 218.801C-25.4 204.401 -25 176.401 -29.8 173.601z"/>
+ </g>
+ <g style="fill: #e5668c">
+  <path d="M-7.8 175.601C0.6 194.001 -29 259.201 -29 259.201C-31 260.801 -16.34 266.846 -6.2 264.401C4.746 261.763 45 266.001 45 266.001C68.6 250.401 81.4 206.001 81.4 206.001C81.4 206.001 91.801 182.001 74.2 178.801C56.6 175.601 -7.8 175.601 -7.8 175.601z"/>
+ </g>
+ <g style="fill: #b23259">
+  <path d="M-9.831 206.497C-6.505 193.707 -4.921 181.906 -7.8 175.601C-7.8 175.601 54.6 182.001 65.8 161.201C70.041 153.326 84.801 184.001 84.4 193.601C84.4 193.601 21.4 208.001 6.6 196.801L-9.831 206.497z"/>
+ </g>
+ <g style="fill: #a5264c">
+  <path d="M-5.4 222.801C-5.4 222.801 -3.4 230.001 -5.8 234.001C-5.8 234.001 -7.4 234.801 -8.6 235.201C-8.6 235.201 -7.4 238.801 -1.4 240.401C-1.4 240.401 0.6 244.801 3 245.201C5.4 245.601 10.2 251.201 14.2 250.001C18.2 248.801 29.4 244.801 29.4 244.801C29.4 244.801 35 241.601 43.8 245.201C43.8 245.201 46.175 244.399 46.6 240.401C47.1 235.701 50.2 232.001 52.2 230.001C54.2 228.001 63.8 215.201 62.6 214.801C61.4 214.401 -5.4 222.801 -5.4 222.801z"/>
+ </g>
+ <g style="fill: #ff727f; stroke:#000000">
+  <path d="M-9.8 174.401C-9.8 174.401 -12.6 196.801 -9.4 205.201C-6.2 213.601 -7 215.601 -7.8 219.601C-8.6 223.601 -4.2 233.601 1.4 239.601L13.4 241.201C13.4 241.201 28.6 237.601 37.8 240.401C37.8 240.401 46.794 241.744 50.2 226.801C50.2 226.801 55 220.401 62.2 217.601C69.4 214.801 76.6 173.201 72.6 165.201C68.6 157.201 54.2 152.801 38.2 168.401C22.2 184.001 20.2 167.201 -9.8 174.401z"/>
+ </g>
+ <g style="fill: #ffffcc; stroke:#000000; stroke-width:0.5">
+  <path d="M-8.2 249.201C-8.2 249.201 -9 247.201 -13.4 246.801C-13.4 246.801 -35.8 243.201 -44.2 230.801C-44.2 230.801 -51 225.201 -46.6 236.801C-46.6 236.801 -36.2 257.201 -29.4 260.001C-29.4 260.001 -13 264.001 -8.2 249.201z"/>
+ </g>
+ <g style="fill: #cc3f4c">
+  <path d="M71.742 185.229C72.401 177.323 74.354 168.709 72.6 165.201C66.154 152.307 49.181 157.695 38.2 168.401C22.2 184.001 20.2 167.201 -9.8 174.401C-9.8 174.401 -11.545 188.364 -10.705 198.376C-10.705 198.376 26.6 186.801 27.4 192.401C27.4 192.401 29 189.201 38.2 189.201C47.4 189.201 70.142 188.029 71.742 185.229z"/>
+ </g>
+ <g style="stroke:#a51926; stroke-width:2">
+  <path d="M28.6 175.201C28.6 175.201 33.4 180.001 29.8 189.601C29.8 189.601 15.4 205.601 17.4 219.601"/>
+ </g>
+ <g style="fill: #ffffcc; stroke:#000000; stroke-width:0.5">
+  <path d="M-19.4 260.001C-19.4 260.001 -23.8 247.201 -15 254.001C-15 254.001 -10.2 256.001 -11.4 257.601C-12.6 259.201 -18.2 263.201 -19.4 260.001z"/>
+ </g>
+ <g style="fill: #ffffcc; stroke:#000000; stroke-width:0.5">
+  <path d="M-14.36 261.201C-14.36 261.201 -17.88 250.961 -10.84 256.401C-10.84 256.401 -6.419 258.849 -7.96 259.281C-12.52 260.561 -7.96 263.121 -14.36 261.201z"/>
+ </g>
+ <g style="fill: #ffffcc; stroke:#000000; stroke-width:0.5">
+  <path d="M-9.56 261.201C-9.56 261.201 -13.08 250.961 -6.04 256.401C-6.04 256.401 -1.665 258.711 -3.16 259.281C-6.52 260.561 -3.16 263.121 -9.56 261.201z"/>
+ </g>
+ <g style="fill: #ffffcc; stroke:#000000; stroke-width:0.5">
+  <path d="M-2.96 261.401C-2.96 261.401 -6.48 251.161 0.56 256.601C0.56 256.601 4.943 258.933 3.441 259.481C0.48 260.561 3.441 263.321 -2.96 261.401z"/>
+ </g>
+ <g style="fill: #ffffcc; stroke:#000000; stroke-width:0.5">
+  <path d="M3.52 261.321C3.52 261.321 0 251.081 7.041 256.521C7.041 256.521 10.881 258.121 9.921 259.401C8.961 260.681 9.921 263.241 3.52 261.321z"/>
+ </g>
+ <g style="fill: #ffffcc; stroke:#000000; stroke-width:0.5">
+  <path d="M10.2 262.001C10.2 262.001 5.4 249.601 14.6 256.001C14.6 256.001 19.4 258.001 18.2 259.601C17 261.201 18.2 264.401 10.2 262.001z"/>
+ </g>
+ <g style="stroke:#a5264c; stroke-width:2">
+  <path d="M-18.2 244.801C-18.2 244.801 -5 242.001 1 245.201C1 245.201 7 246.401 8.2 246.001C9.4 245.601 12.6 245.201 12.6 245.201"/>
+ </g>
+ <g style="stroke:#a5264c; stroke-width:2">
+  <path d="M15.8 253.601C15.8 253.601 27.8 240.001 39.8 244.401C46.816 246.974 45.8 243.601 46.6 240.801C47.4 238.001 47.6 233.801 52.6 230.801"/>
+ </g>
+ <g style="fill: #ffffcc; stroke:#000000; stroke-width:0.5">
+  <path d="M33 237.601C33 237.601 29 226.801 26.2 239.601C23.4 252.401 20.2 256.001 18.6 258.801C18.6 258.801 18.6 264.001 27 263.601C27 263.601 37.8 263.201 38.2 260.401C38.6 257.601 37 246.001 33 237.601z"/>
+ </g>
+ <g style="stroke:#a5264c; stroke-width:2">
+  <path d="M47 244.801C47 244.801 50.6 242.401 53 243.601"/>
+ </g>
+ <g style="stroke:#a5264c; stroke-width:2">
+  <path d="M53.5 228.401C53.5 228.401 56.4 223.501 61.2 222.701"/>
+ </g>
+ <g style="fill: #b2b2b2">
+  <path d="M-25.8 265.201C-25.8 265.201 -7.8 268.401 -3.4 266.801C-3.4 266.801 5.4 266.801 -3 268.801C-3 268.801 -15.8 268.801 -23.8 267.601C-23.8 267.601 -35.4 262.001 -25.8 265.201z"/>
+ </g>
+ <g style="fill: #ffffcc; stroke:#000000; stroke-width:0.5">
+  <path d="M-11.8 172.001C-11.8 172.001 5.8 172.001 7.8 172.801C7.8 172.801 15 203.601 11.4 211.201C11.4 211.201 10.2 214.001 7.4 208.401C7.4 208.401 -11 175.601 -14.2 173.601C-17.4 171.601 -13 172.001 -11.8 172.001z"/>
+ </g>
+ <g style="fill: #ffffcc; stroke:#000000; stroke-width:0.5">
+  <path d="M-88.9 169.301C-88.9 169.301 -80 171.001 -67.4 173.601C-67.4 173.601 -62.6 196.001 -59.4 200.801C-56.2 205.601 -59.8 205.601 -63.4 202.801C-67 200.001 -81.8 186.001 -83.8 181.601C-85.8 177.201 -88.9 169.301 -88.9 169.301z"/>
+ </g>
+ <g style="fill: #ffffcc; stroke:#000000; stroke-width:0.5">
+  <path d="M-67.039 173.818C-67.039 173.818 -61.239 175.366 -60.23 177.581C-59.222 179.795 -61.432 183.092 -61.432 183.092C-61.432 183.092 -62.432 186.397 -63.634 184.235C-64.836 182.072 -67.708 174.412 -67.039 173.818z"/>
+ </g>
+ <g style="fill: #000000">
+  <path d="M-67 173.601C-67 173.601 -63.4 178.801 -59.8 178.801C-56.2 178.801 -55.818 178.388 -53 179.001C-48.4 180.001 -48.8 178.001 -42.2 179.201C-39.56 179.681 -37 178.801 -34.2 180.001C-31.4 181.201 -28.2 180.401 -27 178.401C-25.8 176.401 -21 172.201 -21 172.201C-21 172.201 -33.8 174.001 -36.6 174.801C-36.6 174.801 -59 176.001 -67 173.601z"/>
+ </g>
+ <g style="fill: #ffffcc; stroke:#000000; stroke-width:0.5">
+  <path d="M-22.4 173.801C-22.4 173.801 -28.85 177.301 -29.25 179.701C-29.65 182.101 -24 185.801 -24 185.801C-24 185.801 -21.25 190.401 -20.65 188.001C-20.05 185.601 -21.6 174.201 -22.4 173.801z"/>
+ </g>
+ <g style="fill: #ffffcc; stroke:#000000; stroke-width:0.5">
+  <path d="M-59.885 179.265C-59.885 179.265 -52.878 190.453 -52.661 179.242C-52.661 179.242 -52.104 177.984 -53.864 177.962C-59.939 177.886 -58.418 173.784 -59.885 179.265z"/>
+ </g>
+ <g style="fill: #ffffcc; stroke:#000000; stroke-width:0.5">
+  <path d="M-52.707 179.514C-52.707 179.514 -44.786 190.701 -45.422 179.421C-45.422 179.421 -45.415 179.089 -47.168 178.936C-51.915 178.522 -51.57 174.004 -52.707 179.514z"/>
+ </g>
+ <g style="fill: #ffffcc; stroke:#000000; stroke-width:0.5">
+  <path d="M-45.494 179.522C-45.494 179.522 -37.534 190.15 -38.203 180.484C-38.203 180.484 -38.084 179.251 -39.738 178.95C-43.63 178.244 -43.841 174.995 -45.494 179.522z"/>
+ </g>
+ <g style="fill: #ffffcc; stroke:#000000; stroke-width:0.5">
+  <path d="M-38.618 179.602C-38.618 179.602 -30.718 191.163 -30.37 181.382C-30.37 181.382 -28.726 180.004 -30.472 179.782C-36.29 179.042 -35.492 174.588 -38.618 179.602z"/>
+ </g>
+ <g style="fill: #e5e5b2">
+  <path d="M-74.792 183.132L-82.45 181.601C-85.05 176.601 -87.15 170.451 -87.15 170.451C-87.15 170.451 -80.8 171.451 -68.3 174.251C-68.3 174.251 -67.424 177.569 -65.952 183.364L-74.792 183.132z"/>
+ </g>
+ <g style="fill: #e5e5b2">
+  <path d="M-9.724 178.47C-11.39 175.964 -12.707 174.206 -13.357 173.8C-16.37 171.917 -12.227 172.294 -11.098 172.294C-11.098 172.294 5.473 172.294 7.356 173.047C7.356 173.047 7.88 175.289 8.564 178.68C8.564 178.68 -1.524 176.67 -9.724 178.47z"/>
+ </g>
+ <g style="fill: #cc7226">
+  <path d="M43.88 40.321C71.601 44.281 97.121 8.641 98.881 -1.04C100.641 -10.72 90.521 -22.6 90.521 -22.6C91.841 -25.68 87.001 -39.76 81.721 -49C76.441 -58.24 60.54 -57.266 43 -58.24C27.16 -59.12 8.68 -35.8 7.36 -34.04C6.04 -32.28 12.2 6.001 13.52 11.721C14.84 17.441 12.2 43.841 12.2 43.841C46.44 34.741 16.16 36.361 43.88 40.321z"/>
+ </g>
+ <g style="fill: #ea8e51">
+  <path d="M8.088 -33.392C6.792 -31.664 12.84 5.921 14.136 11.537C15.432 17.153 12.84 43.073 12.84 43.073C45.512 34.193 16.728 35.729 43.944 39.617C71.161 43.505 96.217 8.513 97.945 -0.992C99.673 -10.496 89.737 -22.16 89.737 -22.16C91.033 -25.184 86.281 -39.008 81.097 -48.08C75.913 -57.152 60.302 -56.195 43.08 -57.152C27.528 -58.016 9.384 -35.12 8.088 -33.392z"/>
+ </g>
+ <g style="fill: #efaa7c">
+  <path d="M8.816 -32.744C7.544 -31.048 13.48 5.841 14.752 11.353C16.024 16.865 13.48 42.305 13.48 42.305C44.884 33.145 17.296 35.097 44.008 38.913C70.721 42.729 95.313 8.385 97.009 -0.944C98.705 -10.272 88.953 -21.72 88.953 -21.72C90.225 -24.688 85.561 -38.256 80.473 -47.16C75.385 -56.064 60.063 -55.125 43.16 -56.064C27.896 -56.912 10.088 -34.44 8.816 -32.744z"/>
+ </g>
+ <g style="fill: #f4c6a8">
+  <path d="M9.544 -32.096C8.296 -30.432 14.12 5.761 15.368 11.169C16.616 16.577 14.12 41.537 14.12 41.537C43.556 32.497 17.864 34.465 44.072 38.209C70.281 41.953 94.409 8.257 96.073 -0.895C97.737 -10.048 88.169 -21.28 88.169 -21.28C89.417 -24.192 84.841 -37.504 79.849 -46.24C74.857 -54.976 59.824 -54.055 43.24 -54.976C28.264 -55.808 10.792 -33.76 9.544 -32.096z"/>
+ </g>
+ <g style="fill: #f9e2d3">
+  <path d="M10.272 -31.448C9.048 -29.816 14.76 5.681 15.984 10.985C17.208 16.289 14.76 40.769 14.76 40.769C42.628 31.849 18.432 33.833 44.136 37.505C69.841 41.177 93.505 8.129 95.137 -0.848C96.769 -9.824 87.385 -20.84 87.385 -20.84C88.609 -23.696 84.121 -36.752 79.225 -45.32C74.329 -53.888 59.585 -52.985 43.32 -53.888C28.632 -54.704 11.496 -33.08 10.272 -31.448z"/>
+ </g>
+ <g style="fill: #ffffff">
+  <path d="M44.2 36.8C69.4 40.4 92.601 8 94.201 -0.8C95.801 -9.6 86.601 -20.4 86.601 -20.4C87.801 -23.2 83.4 -36 78.6 -44.4C73.8 -52.8 59.346 -51.914 43.4 -52.8C29 -53.6 12.2 -32.4 11 -30.8C9.8 -29.2 15.4 5.6 16.6 10.8C17.8 16 15.4 40 15.4 40C40.9 31.4 19 33.2 44.2 36.8z"/>
+ </g>
+ <g style="fill: #cccccc">
+  <path d="M90.601 2.8C90.601 2.8 62.8 10.4 51.2 8.8C51.2 8.8 35.4 2.2 26.6 24C26.6 24 23 31.2 21 33.2C19 35.2 90.601 2.8 90.601 2.8z"/>
+ </g>
+ <g style="fill: #000000">
+  <path d="M94.401 0.6C94.401 0.6 65.4 12.8 55.4 12.4C55.4 12.4 39 7.8 30.6 22.4C30.6 22.4 22.2 31.6 19 33.2C19 33.2 18.6 34.8 25 30.8L35.4 36C35.4 36 50.2 45.6 59.8 29.6C59.8 29.6 63.8 18.4 63.8 16.4C63.8 14.4 85 8.8 86.601 8.4C88.201 8 94.801 3.8 94.401 0.6z"/>
+ </g>
+ <g style="fill: #99cc32">
+  <path d="M47 36.514C40.128 36.514 31.755 32.649 31.755 26.4C31.755 20.152 40.128 13.887 47 13.887C53.874 13.887 59.446 18.952 59.446 25.2C59.446 31.449 53.874 36.514 47 36.514z"/>
+ </g>
+ <g style="fill: #659900">
+  <path d="M43.377 19.83C38.531 20.552 33.442 22.055 33.514 21.839C35.054 17.22 41.415 13.887 47 13.887C51.296 13.887 55.084 15.865 57.32 18.875C57.32 18.875 52.004 18.545 43.377 19.83z"/>
+ </g>
+ <g style="fill: #ffffff">
+  <path d="M55.4 19.6C55.4 19.6 51 16.4 51 18.6C51 18.6 54.6 23 55.4 19.6z"/>
+ </g>
+ <g style="fill: #000000">
+  <path d="M45.4 27.726C42.901 27.726 40.875 25.7 40.875 23.2C40.875 20.701 42.901 18.675 45.4 18.675C47.9 18.675 49.926 20.701 49.926 23.2C49.926 25.7 47.9 27.726 45.4 27.726z"/>
+ </g>
+ <g style="fill: #cc7226">
+  <path d="M-58.6 14.4C-58.6 14.4 -61.8 -6.8 -59.4 -11.2C-59.4 -11.2 -48.6 -21.2 -49 -24.8C-49 -24.8 -49.4 -42.8 -50.6 -43.6C-51.8 -44.4 -59.4 -50.4 -65.4 -44C-65.4 -44 -75.8 -26 -75 -19.6L-75 -17.6C-75 -17.6 -82.6 -18 -84.2 -16C-84.2 -16 -85.4 -10.8 -86.6 -10.4C-86.6 -10.4 -89.4 -8 -87.4 -5.2C-87.4 -5.2 -89.4 -2.8 -89 1.2L-81.4 5.2C-81.4 5.2 -79.4 19.6 -68.6 24.8C-63.764 27.129 -60.6 20.4 -58.6 14.4z"/>
+ </g>
+ <g style="fill: #ffffff">
+  <path d="M-59.6 12.56C-59.6 12.56 -62.48 -6.52 -60.32 -10.48C-60.32 -10.48 -50.6 -19.48 -50.96 -22.72C-50.96 -22.72 -51.32 -38.92 -52.4 -39.64C-53.48 -40.36 -60.32 -45.76 -65.72 -40C-65.72 -40 -75.08 -23.8 -74.36 -18.04L-74.36 -16.24C-74.36 -16.24 -81.2 -16.6 -82.64 -14.8C-82.64 -14.8 -83.72 -10.12 -84.8 -9.76C-84.8 -9.76 -87.32 -7.6 -85.52 -5.08C-85.52 -5.08 -87.32 -2.92 -86.96 0.68L-80.12 4.28C-80.12 4.28 -78.32 17.24 -68.6 21.92C-64.248 24.015 -61.4 17.96 -59.6 12.56z"/>
+ </g>
+ <g style="fill: #eb955c">
+  <path d="M-51.05 -42.61C-52.14 -43.47 -59.63 -49.24 -65.48 -43C-65.48 -43 -75.62 -25.45 -74.84 -19.21L-74.84 -17.26C-74.84 -17.26 -82.25 -17.65 -83.81 -15.7C-83.81 -15.7 -84.98 -10.63 -86.15 -10.24C-86.15 -10.24 -88.88 -7.9 -86.93 -5.17C-86.93 -5.17 -88.88 -2.83 -88.49 1.07L-81.08 4.97C-81.08 4.97 -79.13 19.01 -68.6 24.08C-63.886 26.35 -60.8 19.79 -58.85 13.94C-58.85 13.94 -61.97 -6.73 -59.63 -11.02C-59.63 -11.02 -49.1 -20.77 -49.49 -24.28C-49.49 -24.28 -49.88 -41.83 -51.05 -42.61z"/>
+ </g>
+ <g style="fill: #f2b892">
+  <path d="M-51.5 -41.62C-52.48 -42.54 -59.86 -48.08 -65.56 -42C-65.56 -42 -75.44 -24.9 -74.68 -18.82L-74.68 -16.92C-74.68 -16.92 -81.9 -17.3 -83.42 -15.4C-83.42 -15.4 -84.56 -10.46 -85.7 -10.08C-85.7 -10.08 -88.36 -7.8 -86.46 -5.14C-86.46 -5.14 -88.36 -2.86 -87.98 0.94L-80.76 4.74C-80.76 4.74 -78.86 18.42 -68.6 23.36C-64.006 25.572 -61 19.18 -59.1 13.48C-59.1 13.48 -62.14 -6.66 -59.86 -10.84C-59.86 -10.84 -49.6 -20.34 -49.98 -23.76C-49.98 -23.76 -50.36 -40.86 -51.5 -41.62z"/>
+ </g>
+ <g style="fill: #f8dcc8">
+  <path d="M-51.95 -40.63C-52.82 -41.61 -60.09 -46.92 -65.64 -41C-65.64 -41 -75.26 -24.35 -74.52 -18.43L-74.52 -16.58C-74.52 -16.58 -81.55 -16.95 -83.03 -15.1C-83.03 -15.1 -84.14 -10.29 -85.25 -9.92C-85.25 -9.92 -87.84 -7.7 -85.99 -5.11C-85.99 -5.11 -87.84 -2.89 -87.47 0.81L-80.44 4.51C-80.44 4.51 -78.59 17.83 -68.6 22.64C-64.127 24.794 -61.2 18.57 -59.35 13.02C-59.35 13.02 -62.31 -6.59 -60.09 -10.66C-60.09 -10.66 -50.1 -19.91 -50.47 -23.24C-50.47 -23.24 -50.84 -39.89 -51.95 -40.63z"/>
+ </g>
+ <g style="fill: #ffffff">
+  <path d="M-59.6 12.46C-59.6 12.46 -62.48 -6.52 -60.32 -10.48C-60.32 -10.48 -50.6 -19.48 -50.96 -22.72C-50.96 -22.72 -51.32 -38.92 -52.4 -39.64C-53.16 -40.68 -60.32 -45.76 -65.72 -40C-65.72 -40 -75.08 -23.8 -74.36 -18.04L-74.36 -16.24C-74.36 -16.24 -81.2 -16.6 -82.64 -14.8C-82.64 -14.8 -83.72 -10.12 -84.8 -9.76C-84.8 -9.76 -87.32 -7.6 -85.52 -5.08C-85.52 -5.08 -87.32 -2.92 -86.96 0.68L-80.12 4.28C-80.12 4.28 -78.32 17.24 -68.6 21.92C-64.248 24.015 -61.4 17.86 -59.6 12.46z"/>
+ </g>
+ <g style="fill: #cccccc">
+  <path d="M-62.7 6.2C-62.7 6.2 -84.3 -4 -85.2 -4.8C-85.2 -4.8 -76.1 3.4 -75.3 3.4C-74.5 3.4 -62.7 6.2 -62.7 6.2z"/>
+ </g>
+ <g style="fill: #000000">
+  <path d="M-79.8 0C-79.8 0 -61.4 3.6 -61.4 8C-61.4 10.912 -61.643 24.331 -67 22.8C-75.4 20.4 -71.8 6 -79.8 0z"/>
+ </g>
+ <g style="fill: #99cc32">
+  <path d="M-71.4 3.8C-71.4 3.8 -62.422 5.274 -61.4 8C-60.8 9.6 -60.137 17.908 -65.6 19C-70.152 19.911 -72.382 9.69 -71.4 3.8z"/>
+ </g>
+ <g style="fill: #000000">
+  <path d="M14.595 46.349C14.098 44.607 15.409 44.738 17.2 44.2C19.2 43.6 31.4 39.8 32.2 37.2C33 34.6 46.2 39 46.2 39C48 39.8 52.4 42.4 52.4 42.4C57.2 43.6 63.8 44 63.8 44C66.2 45 69.6 47.8 69.6 47.8C84.2 58 96.601 50.8 96.601 50.8C116.601 44.2 110.601 27 110.601 27C107.601 18 110.801 14.6 110.801 14.6C111.001 10.8 118.201 17.2 118.201 17.2C120.801 21.4 121.601 26.4 121.601 26.4C129.601 37.6 126.201 19.8 126.201 19.8C126.401 18.8 123.601 15.2 123.601 14C123.601 12.8 121.801 9.4 121.801 9.4C118.801 6 121.201 -1 121.201 -1C123.001 -14.8 120.801 -13 120.801 -13C119.601 -14.8 110.401 -4.8 110.401 -4.8C108.201 -1.4 102.201 0.2 102.201 0.2C99.401 2 96.001 0.6 96.001 0.6C93.401 0.2 87.801 7.2 87.801 7.2C90.601 7 93.001 11.4 95.401 11.6C97.801 11.8 99.601 9.2 101.201 8.6C102.801 8 105.601 13.8 105.601 13.8C106.001 16.4 100.401 21.2 100.401 21.2C100.001 25.8 98.401 24.2 98.401 24.2C95.401 23.6 94.201 27.4 93.201 32C92.201 36.6 88.001 37 88.001 37C86.401 44.4 85.2 41.4 85.2 41.4C85 35.8 79 41.6 79 41.6C77.8 43.6 73.2 41.4 73.2 41.4C66.4 39.4 68.8 37.4 68.8 37.4C70.6 35.2 81.8 37.4 81.8 37.4C84 35.8 76 31.8 76 31.8C75.4 30 76.4 25.6 76.4 25.6C77.6 22.4 84.4 16.8 84.4 16.8C93.801 15.6 91.001 14 91.001 14C84.801 8.8 79 16.4 79 16.4C76.8 22.6 59.4 37.6 59.4 37.6C54.6 41 57.2 34.2 53.2 37.6C49.2 41 28.6 32 28.6 32C17.038 30.807 14.306 46.549 10.777 43.429C10.777 43.429 16.195 51.949 14.595 46.349z"/>
+ </g>
+ <g style="fill: #000000">
+  <path d="M209.401 -120C209.401 -120 183.801 -112 181.001 -93.2C181.001 -93.2 178.601 -70.4 199.001 -52.8C199.001 -52.8 199.401 -46.4 201.401 -43.2C201.401 -43.2 199.801 -38.4 218.601 -46L245.801 -54.4C245.801 -54.4 252.201 -56.8 257.401 -65.6C262.601 -74.4 277.801 -93.2 274.201 -118.4C274.201 -118.4 275.401 -129.6 269.401 -130C269.401 -130 261.001 -131.6 253.801 -124C253.801 -124 247.001 -120.8 244.601 -121.2L209.401 -120z"/>
+ </g>
+ <g style="fill: #000000">
+  <path d="M264.022 -120.99C264.022 -120.99 266.122 -129.92 261.282 -125.08C261.282 -125.08 254.242 -119.36 246.761 -119.36C246.761 -119.36 232.241 -117.16 227.841 -103.96C227.841 -103.96 223.881 -77.12 231.801 -71.4C231.801 -71.4 236.641 -63.92 243.681 -70.52C250.722 -77.12 266.222 -107.35 264.022 -120.99z"/>
+ </g>
+ <g style="fill: #323232">
+  <path d="M263.648 -120.632C263.648 -120.632 265.738 -129.376 260.986 -124.624C260.986 -124.624 254.074 -119.008 246.729 -119.008C246.729 -119.008 232.473 -116.848 228.153 -103.888C228.153 -103.888 224.265 -77.536 232.041 -71.92C232.041 -71.92 236.793 -64.576 243.705 -71.056C250.618 -77.536 265.808 -107.24 263.648 -120.632z"/>
+ </g>
+ <g style="fill: #666666">
+  <path d="M263.274 -120.274C263.274 -120.274 265.354 -128.832 260.69 -124.168C260.69 -124.168 253.906 -118.656 246.697 -118.656C246.697 -118.656 232.705 -116.536 228.465 -103.816C228.465 -103.816 224.649 -77.952 232.281 -72.44C232.281 -72.44 236.945 -65.232 243.729 -71.592C250.514 -77.952 265.394 -107.13 263.274 -120.274z"/>
+ </g>
+ <g style="fill: #999999">
+  <path d="M262.9 -119.916C262.9 -119.916 264.97 -128.288 260.394 -123.712C260.394 -123.712 253.738 -118.304 246.665 -118.304C246.665 -118.304 232.937 -116.224 228.777 -103.744C228.777 -103.744 225.033 -78.368 232.521 -72.96C232.521 -72.96 237.097 -65.888 243.753 -72.128C250.41 -78.368 264.98 -107.02 262.9 -119.916z"/>
+ </g>
+ <g style="fill: #cccccc">
+  <path d="M262.526 -119.558C262.526 -119.558 264.586 -127.744 260.098 -123.256C260.098 -123.256 253.569 -117.952 246.633 -117.952C246.633 -117.952 233.169 -115.912 229.089 -103.672C229.089 -103.672 225.417 -78.784 232.761 -73.48C232.761 -73.48 237.249 -66.544 243.777 -72.664C250.305 -78.784 264.566 -106.91 262.526 -119.558z"/>
+ </g>
+ <g style="fill: #ffffff">
+  <path d="M262.151 -119.2C262.151 -119.2 264.201 -127.2 259.801 -122.8C259.801 -122.8 253.401 -117.6 246.601 -117.6C246.601 -117.6 233.401 -115.6 229.401 -103.6C229.401 -103.6 225.801 -79.2 233.001 -74C233.001 -74 237.401 -67.2 243.801 -73.2C250.201 -79.2 264.151 -106.8 262.151 -119.2z"/>
+ </g>
+ <g style="fill: #992600">
+  <path d="M50.6 84C50.6 84 30.2 64.8 22.2 64C22.2 64 -12.2 60 -27 78C-27 78 -9.4 57.6 18.2 63.2C18.2 63.2 -3.4 58.8 -15.8 62C-15.8 62 -32.6 62 -42.2 76L-45 80.8C-45 80.8 -41 66 -22.6 60C-22.6 60 0.2 55.2 11 60C11 60 -10.6 53.2 -20.6 55.2C-20.6 55.2 -51 52.8 -63.8 79.2C-63.8 79.2 -59.8 64.8 -45 57.6C-45 57.6 -31.4 48.8 -11 51.6C-11 51.6 3.4 54.8 8.6 57.2C13.8 59.6 12.6 56.8 4.2 52C4.2 52 -1.4 42 -15.4 42.4C-15.4 42.4 -58.2 46 -68.6 58C-68.6 58 -55 46.8 -44.6 44C-44.6 44 -22.2 36 -13.8 36.8C-13.8 36.8 11 37.8 18.6 33.8C18.6 33.8 7.4 38.8 10.6 42C13.8 45.2 20.6 52.8 20.6 54C20.6 55.2 44.8 77.3 48.4 81.7L50.6 84z"/>
+ </g>
+ <g style="fill: #cccccc">
+  <path d="M189 278C189 278 173.5 241.5 161 232C161 232 187 248 190.5 266C190.5 266 190.5 276 189 278z"/>
+ </g>
+ <g style="fill: #cccccc">
+  <path d="M236 285.5C236 285.5 209.5 230.5 191 206.5C191 206.5 234.5 244 239.5 270.5L240 276L237 273.5C237 273.5 236.5 282.5 236 285.5z"/>
+ </g>
+ <g style="fill: #cccccc">
+  <path d="M292.5 237C292.5 237 230 177.5 228.5 175C228.5 175 289 241 292 248.5C292 248.5 290 239.5 292.5 237z"/>
+ </g>
+ <g style="fill: #cccccc">
+  <path d="M104 280.5C104 280.5 123.5 228.5 142.5 251C142.5 251 157.5 261 157 264C157 264 153 257.5 135 258C135 258 116 255 104 280.5z"/>
+ </g>
+ <g style="fill: #cccccc">
+  <path d="M294.5 153C294.5 153 249.5 124.5 242 123C230.193 120.639 291.5 152 296.5 162.5C296.5 162.5 298.5 160 294.5 153z"/>
+ </g>
+ <g style="fill: #000000">
+  <path d="M143.801 259.601C143.801 259.601 164.201 257.601 171.001 250.801L175.401 254.401L193.001 216.001L196.601 221.201C196.601 221.201 211.001 206.401 210.201 198.401C209.401 190.401 223.001 204.401 223.001 204.401C223.001 204.401 222.201 192.801 229.401 199.601C229.401 199.601 227.001 184.001 235.401 192.001C235.401 192.001 224.864 161.844 247.401 187.601C253.001 194.001 248.601 187.201 248.601 187.201C248.601 187.201 222.601 139.201 244.201 153.601C244.201 153.601 246.201 130.801 245.001 126.401C243.801 122.001 241.801 99.6 237.001 94.4C232.201 89.2 237.401 87.6 243.001 92.8C243.001 92.8 231.801 68.8 245.001 80.8C245.001 80.8 241.401 65.6 237.001 62.8C237.001 62.8 231.401 45.6 246.601 56.4C246.601 56.4 242.201 44 239.001 40.8C239.001 40.8 227.401 13.2 234.601 18L239.001 21.6C239.001 21.6 232.201 7.6 238.601 12C245.001 16.4 245.001 16 245.001 16C245.001 16 223.801 -17.2 244.201 0.4C244.201 0.4 236.042 -13.518 232.601 -20.4C232.601 -20.4 213.801 -40.8 228.201 -34.4L233.001 -32.8C233.001 -32.8 224.201 -42.8 216.201 -44.4C208.201 -46 218.601 -52.4 225.001 -50.4C231.401 -48.4 247.001 -40.8 247.001 -40.8C247.001 -40.8 259.801 -22 263.801 -21.6C263.801 -21.6 243.801 -29.2 249.801 -21.2C249.801 -21.2 264.201 -7.2 257.001 -7.6C257.001 -7.6 251.001 -0.4 255.801 8.4C255.801 8.4 237.342 -9.991 252.201 15.6L259.001 32C259.001 32 234.601 7.2 245.801 29.2C245.801 29.2 263.001 52.8 265.001 53.2C267.001 53.6 271.401 62.4 271.401 62.4L267.001 60.4L272.201 69.2C272.201 69.2 261.001 57.2 267.001 70.4L272.601 84.8C272.601 84.8 252.201 62.8 265.801 92.4C265.801 92.4 249.401 87.2 258.201 104.4C258.201 104.4 256.601 120.401 257.001 125.601C257.401 130.801 258.601 159.201 254.201 167.201C249.801 175.201 260.201 194.401 262.201 198.401C264.201 202.401 267.801 213.201 259.001 204.001C250.201 194.801 254.601 200.401 256.601 209.201C258.601 218.001 264.601 233.601 263.801 239.201C263.801 239.201 262.601 240.401 259.401 236.801C259.401 236.801 244.601 214.001 246.201 228.401C246.201 228.401 245.001 236.401 241.801 245.201C241.801 245.201 238.601 256.001 238.601 247.201C238.601 247.201 235.401 230.401 232.601 238.001C229.801 245.601 226.201 251.601 223.401 254.001C220.601 256.401 215.401 233.601 214.201 244.001C214.201 244.001 202.201 231.601 197.401 248.001L185.801 264.401C185.801 264.401 185.401 252.001 184.201 258.001C184.201 258.001 154.201 264.001 143.801 259.601z"/>
+ </g>
+ <g style="fill: #000000">
+  <path d="M109.401 -97.2C109.401 -97.2 97.801 -105.2 93.801 -104.8C89.801 -104.4 121.401 -113.6 162.601 -86C162.601 -86 167.401 -83.2 171.001 -83.6C171.001 -83.6 174.201 -81.2 171.401 -77.6C171.401 -77.6 162.601 -68 173.801 -56.8C173.801 -56.8 192.201 -50 186.601 -58.8C186.601 -58.8 197.401 -54.8 199.801 -50.8C202.201 -46.8 201.001 -50.8 201.001 -50.8C201.001 -50.8 194.601 -58 188.601 -63.2C188.601 -63.2 183.401 -65.2 180.601 -73.6C177.801 -82 175.401 -92 179.801 -95.2C179.801 -95.2 175.801 -90.8 176.601 -94.8C177.401 -98.8 181.001 -102.4 182.601 -102.8C184.201 -103.2 200.601 -119 207.401 -119.4C207.401 -119.4 198.201 -118 195.201 -119C192.201 -120 165.601 -131.4 159.601 -132.6C159.601 -132.6 142.801 -139.2 154.801 -137.2C154.801 -137.2 190.601 -133.4 208.801 -120.2C208.801 -120.2 201.601 -128.6 183.201 -135.6C183.201 -135.6 161.001 -148.2 125.801 -143.2C125.801 -143.2 108.001 -140 100.201 -138.2C100.201 -138.2 97.601 -138.8 97.001 -139.2C96.401 -139.6 84.6 -148.6 57 -141.6C57 -141.6 40 -137 31.4 -132.2C31.4 -132.2 16.2 -131 12.6 -127.8C12.6 -127.8 -6 -113.2 -8 -112.4C-10 -111.6 -21.4 -104 -22.2 -103.6C-22.2 -103.6 2.4 -110.2 4.8 -112.6C7.2 -115 24.6 -117.6 27 -116.2C29.4 -114.8 37.8 -115.4 28.2 -114.8C28.2 -114.8 103.801 -100 104.601 -98C105.401 -96 109.401 -97.2 109.401 -97.2z"/>
+ </g>
+ <g style="fill: #cc7226">
+  <path d="M180.801 -106.4C180.801 -106.4 170.601 -113.8 168.601 -113.8C166.601 -113.8 154.201 -124 150.001 -123.6C145.801 -123.2 133.601 -133.2 106.201 -125C106.201 -125 105.601 -127 109.201 -127.8C109.201 -127.8 115.601 -130 116.001 -130.6C116.001 -130.6 136.201 -134.8 143.401 -131.2C143.401 -131.2 152.601 -128.6 158.801 -122.4C158.801 -122.4 170.001 -119.2 173.201 -120.2C173.201 -120.2 182.001 -118 182.401 -116.2C182.401 -116.2 188.201 -113.2 186.401 -110.6C186.401 -110.6 186.801 -109 180.801 -106.4z"/>
+ </g>
+ <g style="fill: #cc7226">
+  <path d="M168.33 -108.509C169.137 -107.877 170.156 -107.779 170.761 -106.97C170.995 -106.656 170.706 -106.33 170.391 -106.233C169.348 -105.916 168.292 -106.486 167.15 -105.898C166.748 -105.691 166.106 -105.873 165.553 -106.022C163.921 -106.463 162.092 -106.488 160.401 -105.8C158.416 -106.929 156.056 -106.345 153.975 -107.346C153.917 -107.373 153.695 -107.027 153.621 -107.054C150.575 -108.199 146.832 -107.916 144.401 -110.2C141.973 -110.612 139.616 -111.074 137.188 -111.754C135.37 -112.263 133.961 -113.252 132.341 -114.084C130.964 -114.792 129.507 -115.314 127.973 -115.686C126.11 -116.138 124.279 -116.026 122.386 -116.546C122.293 -116.571 122.101 -116.227 122.019 -116.254C121.695 -116.362 121.405 -116.945 121.234 -116.892C119.553 -116.37 118.065 -117.342 116.401 -117C115.223 -118.224 113.495 -117.979 111.949 -118.421C108.985 -119.269 105.831 -117.999 102.801 -119C106.914 -120.842 111.601 -119.61 115.663 -121.679C117.991 -122.865 120.653 -121.763 123.223 -122.523C123.71 -122.667 124.401 -122.869 124.801 -122.2C124.935 -122.335 125.117 -122.574 125.175 -122.546C127.625 -121.389 129.94 -120.115 132.422 -119.049C132.763 -118.903 133.295 -119.135 133.547 -118.933C135.067 -117.717 137.01 -117.82 138.401 -116.6C140.099 -117.102 141.892 -116.722 143.621 -117.346C143.698 -117.373 143.932 -117.032 143.965 -117.054C145.095 -117.802 146.25 -117.531 147.142 -117.227C147.48 -117.112 148.143 -116.865 148.448 -116.791C149.574 -116.515 150.43 -116.035 151.609 -115.852C151.723 -115.834 151.908 -116.174 151.98 -116.146C153.103 -115.708 154.145 -115.764 154.801 -114.6C154.936 -114.735 155.101 -114.973 155.183 -114.946C156.21 -114.608 156.859 -113.853 157.96 -113.612C158.445 -113.506 159.057 -112.88 159.633 -112.704C162.025 -111.973 163.868 -110.444 166.062 -109.549C166.821 -109.239 167.697 -109.005 168.33 -108.509z"/>
+ </g>
+ <g style="fill: #cc7226">
+  <path d="M91.696 -122.739C89.178 -124.464 86.81 -125.57 84.368 -127.356C84.187 -127.489 83.827 -127.319 83.625 -127.441C82.618 -128.05 81.73 -128.631 80.748 -129.327C80.209 -129.709 79.388 -129.698 78.88 -129.956C76.336 -131.248 73.707 -131.806 71.2 -133C71.882 -133.638 73.004 -133.394 73.6 -134.2C73.795 -133.92 74.033 -133.636 74.386 -133.827C76.064 -134.731 77.914 -134.884 79.59 -134.794C81.294 -134.702 83.014 -134.397 84.789 -134.125C85.096 -134.078 85.295 -133.555 85.618 -133.458C87.846 -132.795 90.235 -133.32 92.354 -132.482C93.945 -131.853 95.515 -131.03 96.754 -129.755C97.006 -129.495 96.681 -129.194 96.401 -129C96.789 -129.109 97.062 -128.903 97.173 -128.59C97.257 -128.351 97.257 -128.049 97.173 -127.81C97.061 -127.498 96.782 -127.397 96.408 -127.346C95.001 -127.156 96.773 -128.536 96.073 -128.088C94.8 -127.274 95.546 -125.868 94.801 -124.6C94.521 -124.794 94.291 -125.012 94.401 -125.4C94.635 -124.878 94.033 -124.588 93.865 -124.272C93.48 -123.547 92.581 -122.132 91.696 -122.739z"/>
+ </g>
+ <g style="fill: #cc7226">
+  <path d="M59.198 -115.391C56.044 -116.185 52.994 -116.07 49.978 -117.346C49.911 -117.374 49.688 -117.027 49.624 -117.054C48.258 -117.648 47.34 -118.614 46.264 -119.66C45.351 -120.548 43.693 -120.161 42.419 -120.648C42.095 -120.772 41.892 -121.284 41.591 -121.323C40.372 -121.48 39.445 -122.429 38.4 -123C40.736 -123.795 43.147 -123.764 45.609 -124.148C45.722 -124.166 45.867 -123.845 46 -123.845C46.136 -123.845 46.266 -124.066 46.4 -124.2C46.595 -123.92 46.897 -123.594 47.154 -123.848C47.702 -124.388 48.258 -124.198 48.798 -124.158C48.942 -124.148 49.067 -123.845 49.2 -123.845C49.336 -123.845 49.467 -124.156 49.6 -124.156C49.736 -124.155 49.867 -123.845 50 -123.845C50.136 -123.845 50.266 -124.066 50.4 -124.2C51.092 -123.418 51.977 -123.972 52.799 -123.793C53.837 -123.566 54.104 -122.418 55.178 -122.12C59.893 -120.816 64.03 -118.671 68.393 -116.584C68.7 -116.437 68.91 -116.189 68.8 -115.8C69.067 -115.8 69.38 -115.888 69.57 -115.756C70.628 -115.024 71.669 -114.476 72.366 -113.378C72.582 -113.039 72.253 -112.632 72.02 -112.684C67.591 -113.679 63.585 -114.287 59.198 -115.391z"/>
+ </g>
+ <g style="fill: #cc7226">
+  <path d="M45.338 -71.179C43.746 -72.398 43.162 -74.429 42.034 -76.221C41.82 -76.561 42.094 -76.875 42.411 -76.964C42.971 -77.123 43.514 -76.645 43.923 -76.443C45.668 -75.581 47.203 -74.339 49.2 -74.2C51.19 -71.966 55.45 -71.581 55.457 -68.2C55.458 -67.341 54.03 -68.259 53.6 -67.4C51.149 -68.403 48.76 -68.3 46.38 -69.767C45.763 -70.148 46.093 -70.601 45.338 -71.179z"/>
+ </g>
+ <g style="fill: #cc7226">
+  <path d="M17.8 -123.756C17.935 -123.755 24.966 -123.522 24.949 -123.408C24.904 -123.099 17.174 -122.05 16.81 -122.22C16.646 -122.296 9.134 -119.866 9 -120C9.268 -120.135 17.534 -123.756 17.8 -123.756z"/>
+ </g>
+ <g style="fill: #000000">
+  <path d="M33.2 -114C33.2 -114 18.4 -112.2 14 -111C9.6 -109.8 -9 -102.2 -12 -100.2C-12 -100.2 -25.4 -94.8 -42.4 -74.8C-42.4 -74.8 -34.8 -78.2 -32.6 -81C-32.6 -81 -19 -93.6 -19.2 -91C-19.2 -91 -7 -99.6 -7.6 -97.4C-7.6 -97.4 16.8 -108.6 14.8 -105.4C14.8 -105.4 36.4 -110 35.4 -108C35.4 -108 54.2 -103.6 51.4 -103.4C51.4 -103.4 45.6 -102.2 52 -98.6C52 -98.6 48.6 -94.2 43.2 -98.2C37.8 -102.2 40.8 -100 35.8 -99C35.8 -99 33.2 -98.2 28.6 -102.2C28.6 -102.2 23 -106.8 14.2 -103.2C14.2 -103.2 -16.4 -90.6 -18.4 -90C-18.4 -90 -22 -87.2 -24.4 -83.6C-24.4 -83.6 -30.2 -79.2 -33.2 -77.8C-33.2 -77.8 -46 -66.2 -47.2 -64.8C-47.2 -64.8 -50.6 -59.6 -51.4 -59.2C-51.4 -59.2 -45 -63 -43 -65C-43 -65 -29 -75 -23.6 -75.8C-23.6 -75.8 -19.2 -78.8 -18.4 -80.2C-18.4 -80.2 -4 -89.4 0.2 -89.4C0.2 -89.4 9.4 -84.2 11.8 -91.2C11.8 -91.2 17.6 -93 23.2 -91.8C23.2 -91.8 26.4 -94.4 25.6 -96.6C25.6 -96.6 27.2 -98.4 28.2 -94.6C28.2 -94.6 31.6 -91 36.4 -93C36.4 -93 40.4 -93.2 38.4 -90.8C38.4 -90.8 34 -87 22.2 -86.8C22.2 -86.8 9.8 -86.2 -6.6 -78.6C-6.6 -78.6 -36.4 -68.2 -45.6 -57.8C-45.6 -57.8 -52 -49 -57.4 -47.8C-57.4 -47.8 -63.2 -47 -69.2 -39.6C-69.2 -39.6 -59.4 -45.4 -50.4 -45.4C-50.4 -45.4 -46.4 -47.8 -50.2 -44.2C-50.2 -44.2 -53.8 -36.6 -52.2 -31.2C-52.2 -31.2 -52.8 -26 -53.6 -24.4C-53.6 -24.4 -61.4 -11.6 -61.4 -9.2C-61.4 -6.8 -60.2 3 -59.8 3.6C-59.4 4.2 -60.8 2 -57 4.4C-53.2 6.8 -50.4 8.4 -49.6 11.2C-48.8 14 -51.6 5.8 -51.8 4C-52 2.2 -56.2 -5 -55.4 -7.4C-55.4 -7.4 -54.4 -6.4 -53.6 -5C-53.6 -5 -54.2 -5.6 -53.6 -9.2C-53.6 -9.2 -52.8 -14.4 -51.4 -17.6C-50 -20.8 -48 -24.6 -47.6 -25.4C-47.2 -26.2 -47.2 -32 -45.8 -29.4L-42.4 -26.8C-42.4 -26.8 -45.2 -29.4 -43 -31.6C-43 -31.6 -44 -37.2 -42.2 -39.8C-42.2 -39.8 -35.2 -48.2 -33.6 -49.2C-32 -50.2 -33.4 -49.8 -33.4 -49.8C-33.4 -49.8 -27.4 -54 -33.2 -52.4C-33.2 -52.4 -37.2 -50.8 -40.2 -50.8C-40.2 -50.8 -47.8 -48.8 -43.8 -53C-39.8 -57.2 -29.8 -62.6 -26 -62.4L-25.2 -60.8L-14 -63.2L-15.2 -62.4C-15.2 -62.4 -15.4 -62.6 -11.2 -63C-7 -63.4 -1.2 -62 0.2 -63.8C1.6 -65.6 5 -66.6 4.6 -65.2C4.2 -63.8 4 -61.8 4 -61.8C4 -61.8 9 -67.6 8.4 -65.4C7.8 -63.2 -0.4 -58 -1.8 -51.8L8.6 -60L12.2 -63C12.2 -63 15.8 -60.8 16 -62.4C16.2 -64 20.8 -69.8 22 -69.6C23.2 -69.4 25.2 -72.2 25 -69.6C24.8 -67 32.4 -61.6 32.4 -61.6C32.4 -61.6 35.6 -63.4 37 -62C38.4 -60.6 42.6 -81.8 42.6 -81.8L67.6 -92.4L111.201 -95.8L94.201 -102.6L33.2 -114z"/>
+ </g>
+ <g style="stroke:#4c0000; stroke-width:2">
+  <path d="M51.4 85C51.4 85 36.4 68.2 28 65.6C28 65.6 14.6 58.8 -10 66.6"/>
+ </g>
+ <g style="stroke:#4c0000; stroke-width:2">
+  <path d="M24.8 64.2C24.8 64.2 -0.4 56.2 -15.8 60.4C-15.8 60.4 -34.2 62.4 -42.6 76.2"/>
+ </g>
+ <g style="stroke:#4c0000; stroke-width:2">
+  <path d="M21.2 63C21.2 63 4.2 55.8 -10.6 53.6C-10.6 53.6 -27.2 51 -43.8 58.2C-43.8 58.2 -56 64.2 -61.4 74.4"/>
+ </g>
+ <g style="stroke:#4c0000; stroke-width:2">
+  <path d="M22.2 63.4C22.2 63.4 6.8 52.4 5.8 51C5.8 51 -1.2 40 -14.2 39.6C-14.2 39.6 -35.6 40.4 -52.8 48.4"/>
+ </g>
+ <g style="fill: #000000">
+  <path d="M20.895 54.407C22.437 55.87 49.4 84.8 49.4 84.8C84.6 121.401 56.6 87.2 56.6 87.2C49 82.4 39.8 63.6 39.8 63.6C38.6 60.8 53.8 70.8 53.8 70.8C57.8 71.6 71.4 90.8 71.4 90.8C64.6 88.4 69.4 95.6 69.4 95.6C72.2 97.6 92.601 113.201 92.601 113.201C96.201 117.201 100.201 118.801 100.201 118.801C114.201 113.601 107.801 126.801 107.801 126.801C110.201 133.601 115.801 122.001 115.801 122.001C127.001 105.2 110.601 107.601 110.601 107.601C80.6 110.401 73.8 94.4 73.8 94.4C71.4 92 80.2 94.4 80.2 94.4C88.601 96.4 73 82 73 82C75.4 82 84.6 88.8 84.6 88.8C95.001 98 97.001 96 97.001 96C115.001 87.2 125.401 94.8 125.401 94.8C127.401 96.4 121.801 103.2 123.401 108.401C125.001 113.601 129.801 126.001 129.801 126.001C127.401 127.601 127.801 138.401 127.801 138.401C144.601 161.601 135.001 159.601 135.001 159.601C119.401 159.201 134.201 166.801 134.201 166.801C137.401 168.801 146.201 176.001 146.201 176.001C143.401 174.801 141.801 180.001 141.801 180.001C146.601 184.001 143.801 188.801 143.801 188.801C137.801 190.001 136.601 194.001 136.601 194.001C143.401 202.001 133.401 202.401 133.401 202.401C137.001 206.801 132.201 218.801 132.201 218.801C127.401 218.801 121.001 224.401 121.001 224.401C123.401 229.201 113.001 234.801 113.001 234.801C104.601 236.401 107.401 243.201 107.401 243.201C99.401 249.201 97.001 265.201 97.001 265.201C96.201 275.601 93.801 278.801 99.001 276.801C104.201 274.801 103.401 262.401 103.401 262.401C98.601 246.801 141.401 230.801 141.401 230.801C145.401 229.201 146.201 224.001 146.201 224.001C148.201 224.401 157.001 232.001 157.001 232.001C164.601 243.201 165.001 234.001 165.001 234.001C166.201 230.401 164.601 224.401 164.601 224.401C170.601 202.801 156.601 196.401 156.601 196.401C146.601 162.801 160.601 171.201 160.601 171.201C163.401 176.801 174.201 182.001 174.201 182.001L177.801 179.601C176.201 174.801 184.601 168.801 184.601 168.801C187.401 175.201 193.401 167.201 193.401 167.201C197.001 142.801 209.401 157.201 209.401 157.201C213.401 158.401 214.601 151.601 214.601 151.601C218.201 141.201 214.601 127.601 214.601 127.601C218.201 127.201 227.801 133.201 227.801 133.201C230.601 129.601 221.401 112.801 225.401 115.201C229.401 117.601 233.801 119.201 233.801 119.201C234.601 117.201 224.601 104.801 224.601 104.801C220.201 102 215.001 81.6 215.001 81.6C222.201 85.2 212.201 70 212.201 70C212.201 66.8 218.201 55.6 218.201 55.6C217.401 48.8 218.201 49.2 218.201 49.2C221.001 50.4 229.001 52 222.201 45.6C215.401 39.2 223.001 34.4 223.001 34.4C227.401 31.6 213.801 32 213.801 32C208.601 27.6 209.001 23.6 209.001 23.6C217.001 25.6 202.601 11.2 200.201 7.6C197.801 4 207.401 -1.2 207.401 -1.2C220.601 -4.8 209.001 -8 209.001 -8C189.401 -7.6 200.201 -18.4 200.201 -18.4C206.201 -18 204.601 -20.4 204.601 -20.4C199.401 -21.6 189.801 -28 189.801 -28C185.801 -31.6 189.401 -30.8 189.401 -30.8C206.201 -29.6 177.401 -40.8 177.401 -40.8C185.401 -40.8 167.401 -51.2 167.401 -51.2C165.401 -52.8 162.201 -60.4 162.201 -60.4C156.201 -65.6 151.401 -72.4 151.401 -72.4C151.001 -76.8 146.201 -81.6 146.201 -81.6C134.601 -95.2 129.001 -94.8 129.001 -94.8C114.201 -98.4 109.001 -97.6 109.001 -97.6L56.2 -93.2C29.8 -80.4 37.6 -59.4 37.6 -59.4C44 -51 53.2 -54.8 53.2 -54.8C57.8 -61 69.4 -58.8 69.4 -58.8C89.801 -55.6 87.201 -59.2 87.201 -59.2C84.801 -63.8 68.6 -70 68.4 -70.6C68.2 -71.2 59.4 -74.6 59.4 -74.6C56.4 -75.8 52 -85 52 -85C48.8 -88.4 64.6 -82.6 64.6 -82.6C63.4 -81.6 70.8 -77.6 70.8 -77.6C88.201 -78.6 98.801 -67.8 98.801 -67.8C109.601 -51.2 109.801 -59.4 109.801 -59.4C112.601 -68.8 100.801 -90 100.801 -90C101.201 -92 109.401 -85.4 109.401 -85.4C110.801 -87.4 111.601 -81.6 111.601 -81.6C111.801 -79.2 115.601 -71.2 115.601 -71.2C118.401 -58.2 122.001 -65.6 122.001 -65.6L126.601 -56.2C128.001 -53.6 122.001 -46 122.001 -46C121.801 -43.2 122.601 -43.4 117.001 -35.8C111.401 -28.2 114.801 -23.8 114.801 -23.8C113.401 -17.2 122.201 -17.6 122.201 -17.6C124.801 -15.4 128.201 -15.4 128.201 -15.4C130.001 -13.4 132.401 -14 132.401 -14C134.001 -17.8 140.201 -15.8 140.201 -15.8C141.601 -18.2 149.801 -18.6 149.801 -18.6C150.801 -21.2 151.201 -22.8 154.601 -23.4C158.001 -24 133.401 -67 133.401 -67C139.801 -67.8 131.601 -80.2 131.601 -80.2C129.401 -86.8 140.801 -72.2 143.001 -70.8C145.201 -69.4 146.201 -67.2 144.601 -67.4C143.001 -67.6 141.201 -65.4 142.601 -65.2C144.001 -65 157.001 -50 160.401 -39.8C163.801 -29.6 169.801 -25.6 176.001 -19.6C182.201 -13.6 181.401 10.6 181.401 10.6C181.001 19.4 187.001 30 187.001 30C189.001 33.8 184.801 52 184.801 52C182.801 54.2 184.201 55 184.201 55C185.201 56.2 192.001 69.4 192.001 69.4C190.201 69.2 193.801 72.8 193.801 72.8C199.001 78.8 192.601 75.8 192.601 75.8C186.601 74.2 193.601 84 193.601 84C194.801 85.8 185.801 81.2 185.801 81.2C176.601 80.6 188.201 87.8 188.201 87.8C196.801 95 185.401 90.6 185.401 90.6C180.801 88.8 184.001 95.6 184.001 95.6C187.201 97.2 204.401 104.2 204.401 104.2C204.801 108.001 201.801 113.001 201.801 113.001C202.201 117.001 200.001 120.401 200.001 120.401C198.801 128.601 198.201 129.401 198.201 129.401C194.001 129.601 186.601 143.401 186.601 143.401C184.801 146.001 174.601 158.001 174.601 158.001C172.601 165.001 154.601 157.801 154.601 157.801C148.001 161.201 150.001 157.801 150.001 157.801C149.601 155.601 154.401 149.601 154.401 149.601C161.401 147.001 158.801 136.201 158.801 136.201C162.801 134.801 151.601 132.001 151.801 130.801C152.001 129.601 157.801 128.201 157.801 128.201C165.801 126.201 161.401 123.801 161.401 123.801C160.801 119.801 163.801 114.201 163.801 114.201C175.401 113.401 163.801 97.2 163.801 97.2C153.001 89.6 152.001 83.8 152.001 83.8C164.601 75.6 156.401 63.2 156.601 59.6C156.801 56 158.001 34.4 158.001 34.4C156.001 28.2 153.001 14.6 153.001 14.6C155.201 9.4 162.601 -3.2 162.601 -3.2C165.401 -7.4 174.201 -12.2 172.001 -15.2C169.801 -18.2 162.001 -16.4 162.001 -16.4C154.201 -17.8 154.801 -12.6 154.801 -12.6C153.201 -11.6 152.401 -6.6 152.401 -6.6C151.68 1.333 142.801 7.6 142.801 7.6C131.601 13.8 140.801 17.8 140.801 17.8C146.801 24.4 137.001 24.6 137.001 24.6C126.001 22.8 134.201 33 134.201 33C145.001 45.8 142.001 48.6 142.001 48.6C131.801 49.6 144.401 58.8 144.401 58.8C144.401 58.8 143.601 56.8 143.801 58.6C144.001 60.4 147.001 64.6 147.801 66.6C148.601 68.6 144.601 68.8 144.601 68.8C145.201 78.4 129.801 74.2 129.801 74.2C129.801 74.2 129.801 74.2 128.201 74.4C126.601 74.6 115.401 73.8 109.601 71.6C103.801 69.4 97.001 69.4 97.001 69.4C97.001 69.4 93.001 71.2 85.4 71C77.8 70.8 69.8 73.6 69.8 73.6C65.4 73.2 74 68.8 74.2 69C74.4 69.2 80 63.6 72 64.2C50.203 65.835 39.4 55.6 39.4 55.6C37.4 54.2 34.8 51.4 34.8 51.4C24.8 49.4 36.2 63.8 36.2 63.8C37.4 65.2 36 66.2 36 66.2C35.2 64.6 27.4 59.2 27.4 59.2C24.589 58.227 23.226 56.893 20.895 54.407z"/>
+ </g>
+ <g style="fill: #4c0000">
+  <path d="M-3 42.8C-3 42.8 8.6 48.4 11.2 51.2C13.8 54 27.8 65.4 27.8 65.4C27.8 65.4 22.4 63.4 19.8 61.6C17.2 59.8 6.4 51.6 6.4 51.6C6.4 51.6 2.6 45.6 -3 42.8z"/>
+ </g>
+ <g style="fill: #99cc32">
+  <path d="M-61.009 11.603C-60.672 11.455 -61.196 8.743 -61.4 8.2C-62.422 5.474 -71.4 4 -71.4 4C-71.627 5.365 -71.682 6.961 -71.576 8.599C-71.576 8.599 -66.708 14.118 -61.009 11.603z"/>
+ </g>
+ <g style="fill: #659900">
+  <path d="M-61.009 11.403C-61.458 11.561 -61.024 8.669 -61.2 8.2C-62.222 5.474 -71.4 3.9 -71.4 3.9C-71.627 5.265 -71.682 6.861 -71.576 8.499C-71.576 8.499 -67.308 13.618 -61.009 11.403z"/>
+ </g>
+ <g style="fill: #000000">
+  <path d="M-65.4 11.546C-66.025 11.546 -66.531 10.406 -66.531 9C-66.531 7.595 -66.025 6.455 -65.4 6.455C-64.775 6.455 -64.268 7.595 -64.268 9C-64.268 10.406 -64.775 11.546 -65.4 11.546z"/>
+ </g>
+ <g style="fill: #000000">
+  <path d="M-65.4 9z"/>
+ </g>
+ <g style="fill: #000000">
+  <path d="M-111 109.601C-111 109.601 -116.6 119.601 -91.8 113.601C-91.8 113.601 -77.8 112.401 -75.4 110.001C-74.2 110.801 -65.834 113.734 -63 114.401C-56.2 116.001 -47.8 106 -47.8 106C-47.8 106 -43.2 95.5 -40.4 95.5C-37.6 95.5 -40.8 97.1 -40.8 97.1C-40.8 97.1 -47.4 107.201 -47 108.801C-47 108.801 -52.2 128.801 -68.2 129.601C-68.2 129.601 -84.35 130.551 -83 136.401C-83 136.401 -74.2 134.001 -71.8 136.401C-71.8 136.401 -61 136.001 -69 142.401L-75.8 154.001C-75.8 154.001 -75.66 157.919 -85.8 154.401C-95.6 151.001 -105.9 138.101 -105.9 138.101C-105.9 138.101 -121.85 123.551 -111 109.601z"/>
+ </g>
+ <g style="fill: #e59999">
+  <path d="M-112.2 113.601C-112.2 113.601 -114.2 123.201 -77.4 112.801C-77.4 112.801 -73 112.801 -70.6 113.601C-68.2 114.401 -56.2 117.201 -54.2 116.001C-54.2 116.001 -61.4 129.601 -73 128.001C-73 128.001 -86.2 129.601 -85.8 134.401C-85.8 134.401 -81.8 141.601 -77 144.001C-77 144.001 -74.2 146.401 -74.6 149.601C-75 152.801 -77.8 154.401 -79.8 155.201C-81.8 156.001 -85 152.801 -86.6 152.801C-88.2 152.801 -96.6 146.401 -101 141.601C-105.4 136.801 -113.8 124.801 -113.4 122.001C-113 119.201 -112.2 113.601 -112.2 113.601z"/>
+ </g>
+ <g style="fill: #b26565">
+  <path d="M-109 131.051C-106.4 135.001 -103.2 139.201 -101 141.601C-96.6 146.401 -88.2 152.801 -86.6 152.801C-85 152.801 -81.8 156.001 -79.8 155.201C-77.8 154.401 -75 152.801 -74.6 149.601C-74.2 146.401 -77 144.001 -77 144.001C-80.066 142.468 -82.806 138.976 -84.385 136.653C-84.385 136.653 -84.2 139.201 -89.4 138.401C-94.6 137.601 -99.8 134.801 -101.4 131.601C-103 128.401 -105.4 126.001 -103.8 129.601C-102.2 133.201 -99.8 136.801 -98.2 137.201C-96.6 137.601 -97 138.801 -99.4 138.401C-101.8 138.001 -104.6 137.601 -109 132.401z"/>
+ </g>
+ <g style="fill: #992600">
+  <path d="M-111.6 110.001C-111.6 110.001 -109.8 96.4 -108.6 92.4C-108.6 92.4 -109.4 85.6 -107 81.4C-104.6 77.2 -102.6 71 -99.6 65.6C-96.6 60.2 -96.4 56.2 -92.4 54.6C-88.4 53 -82.4 44.4 -79.6 43.4C-76.8 42.4 -77 43.2 -77 43.2C-77 43.2 -70.2 28.4 -56.6 32.4C-56.6 32.4 -72.8 29.6 -57 20.2C-57 20.2 -61.8 21.3 -58.5 14.3C-56.299 9.632 -56.8 16.4 -67.8 28.2C-67.8 28.2 -72.8 36.8 -78 39.8C-83.2 42.8 -95.2 49.8 -96.4 53.6C-97.6 57.4 -100.8 63.2 -102.8 64.8C-104.8 66.4 -107.6 70.6 -108 74C-108 74 -109.2 78 -110.6 79.2C-112 80.4 -112.2 83.6 -112.2 85.6C-112.2 87.6 -114.2 90.4 -114 92.8C-114 92.8 -113.2 111.801 -113.6 113.801L-111.6 110.001z"/>
+ </g>
+ <g style="fill: #ffffff">
+  <path d="M-120.2 114.601C-120.2 114.601 -122.2 113.201 -126.6 119.201C-126.6 119.201 -119.3 152.201 -119.3 153.601C-119.3 153.601 -118.2 151.501 -119.5 144.301C-120.8 137.101 -121.7 124.401 -121.7 124.401L-120.2 114.601z"/>
+ </g>
+ <g style="fill: #992600">
+  <path d="M-98.6 54C-98.6 54 -116.2 57.2 -115.8 86.4L-116.6 111.201C-116.6 111.201 -117.8 85.6 -119 84C-120.2 82.4 -116.2 71.2 -119.4 77.2C-119.4 77.2 -133.4 91.2 -125.4 112.401C-125.4 112.401 -123.9 115.701 -126.9 111.101C-126.9 111.101 -131.5 98.5 -130.4 92.1C-130.4 92.1 -130.2 89.9 -128.3 87.1C-128.3 87.1 -119.7 75.4 -117 73.1C-117 73.1 -115.2 58.7 -99.8 53.5C-99.8 53.5 -94.1 51.2 -98.6 54z"/>
+ </g>
+ <g style="fill: #000000">
+  <path d="M40.8 -12.2C41.46 -12.554 41.451 -13.524 42.031 -13.697C43.18 -14.041 43.344 -15.108 43.862 -15.892C44.735 -17.211 44.928 -18.744 45.51 -20.235C45.782 -20.935 45.809 -21.89 45.496 -22.55C44.322 -25.031 43.62 -27.48 42.178 -29.906C41.91 -30.356 41.648 -31.15 41.447 -31.748C40.984 -33.132 39.727 -34.123 38.867 -35.443C38.579 -35.884 39.104 -36.809 38.388 -36.893C37.491 -36.998 36.042 -37.578 35.809 -36.552C35.221 -33.965 36.232 -31.442 37.2 -29C36.418 -28.308 36.752 -27.387 36.904 -26.62C37.614 -23.014 36.416 -19.662 35.655 -16.188C35.632 -16.084 35.974 -15.886 35.946 -15.824C34.724 -13.138 33.272 -10.693 31.453 -8.312C30.695 -7.32 29.823 -6.404 29.326 -5.341C28.958 -4.554 28.55 -3.588 28.8 -2.6C25.365 0.18 23.115 4.025 20.504 7.871C20.042 8.551 20.333 9.76 20.884 10.029C21.697 10.427 22.653 9.403 23.123 8.557C23.512 7.859 23.865 7.209 24.356 6.566C24.489 6.391 24.31 5.972 24.445 5.851C27.078 3.504 28.747 0.568 31.2 -1.8C33.15 -2.129 34.687 -3.127 36.435 -4.14C36.743 -4.319 37.267 -4.07 37.557 -4.265C39.31 -5.442 39.308 -7.478 39.414 -9.388C39.464 -10.272 39.66 -11.589 40.8 -12.2z"/>
+ </g>
+ <g style="fill: #000000">
+  <path d="M31.959 -16.666C32.083 -16.743 31.928 -17.166 32.037 -17.382C32.199 -17.706 32.602 -17.894 32.764 -18.218C32.873 -18.434 32.71 -18.814 32.846 -18.956C35.179 -21.403 35.436 -24.427 34.4 -27.4C35.424 -28.02 35.485 -29.282 35.06 -30.129C34.207 -31.829 34.014 -33.755 33.039 -35.298C32.237 -36.567 30.659 -37.811 29.288 -36.508C28.867 -36.108 28.546 -35.321 28.824 -34.609C28.888 -34.446 29.173 -34.3 29.146 -34.218C29.039 -33.894 28.493 -33.67 28.487 -33.398C28.457 -31.902 27.503 -30.391 28.133 -29.062C28.905 -27.433 29.724 -25.576 30.4 -23.8C29.166 -21.684 30.199 -19.235 28.446 -17.358C28.31 -17.212 28.319 -16.826 28.441 -16.624C28.733 -16.138 29.139 -15.732 29.625 -15.44C29.827 -15.319 30.175 -15.317 30.375 -15.441C30.953 -15.803 31.351 -16.29 31.959 -16.666z"/>
+ </g>
+ <g style="fill: #000000">
+  <path d="M94.771 -26.977C96.16 -25.185 96.45 -22.39 94.401 -21C94.951 -17.691 98.302 -19.67 100.401 -20.2C100.292 -20.588 100.519 -20.932 100.802 -20.937C101.859 -20.952 102.539 -21.984 103.601 -21.8C104.035 -23.357 105.673 -24.059 106.317 -25.439C108.043 -29.134 107.452 -33.407 104.868 -36.653C104.666 -36.907 104.883 -37.424 104.759 -37.786C104.003 -39.997 101.935 -40.312 100.001 -41C98.824 -44.875 98.163 -48.906 96.401 -52.6C94.787 -52.85 94.089 -54.589 92.752 -55.309C91.419 -56.028 90.851 -54.449 90.892 -53.403C90.899 -53.198 91.351 -52.974 91.181 -52.609C91.105 -52.445 90.845 -52.334 90.845 -52.2C90.846 -52.065 91.067 -51.934 91.201 -51.8C90.283 -50.98 88.86 -50.503 88.565 -49.358C87.611 -45.648 90.184 -42.523 91.852 -39.322C92.443 -38.187 91.707 -36.916 90.947 -35.708C90.509 -35.013 90.617 -33.886 90.893 -33.03C91.645 -30.699 93.236 -28.96 94.771 -26.977z"/>
+ </g>
+ <g style="fill: #000000">
+  <path d="M57.611 -8.591C56.124 -6.74 52.712 -4.171 55.629 -2.243C55.823 -2.114 56.193 -2.11 56.366 -2.244C58.387 -3.809 60.39 -4.712 62.826 -5.294C62.95 -5.323 63.224 -4.856 63.593 -5.017C65.206 -5.72 67.216 -5.662 68.4 -7C72.167 -6.776 75.732 -7.892 79.123 -9.2C80.284 -9.648 81.554 -10.207 82.755 -10.709C84.131 -11.285 85.335 -12.213 86.447 -13.354C86.58 -13.49 86.934 -13.4 87.201 -13.4C87.161 -14.263 88.123 -14.39 88.37 -15.012C88.462 -15.244 88.312 -15.64 88.445 -15.742C90.583 -17.372 91.503 -19.39 90.334 -21.767C90.049 -22.345 89.8 -22.963 89.234 -23.439C88.149 -24.35 87.047 -23.496 86 -23.8C85.841 -23.172 85.112 -23.344 84.726 -23.146C83.867 -22.707 82.534 -23.292 81.675 -22.854C80.313 -22.159 79.072 -21.99 77.65 -21.613C77.338 -21.531 76.56 -21.627 76.4 -21C76.266 -21.134 76.118 -21.368 76.012 -21.346C74.104 -20.95 72.844 -20.736 71.543 -19.044C71.44 -18.911 70.998 -19.09 70.839 -18.955C69.882 -18.147 69.477 -16.913 68.376 -16.241C68.175 -16.118 67.823 -16.286 67.629 -16.157C66.983 -15.726 66.616 -15.085 65.974 -14.638C65.645 -14.409 65.245 -14.734 65.277 -14.99C65.522 -16.937 66.175 -18.724 65.6 -20.6C67.677 -23.12 70.194 -25.069 72 -27.8C72.015 -29.966 72.707 -32.112 72.594 -34.189C72.584 -34.382 72.296 -35.115 72.17 -35.462C71.858 -36.316 72.764 -37.382 71.92 -38.106C70.516 -39.309 69.224 -38.433 68.4 -37C66.562 -36.61 64.496 -35.917 62.918 -37.151C61.911 -37.938 61.333 -38.844 60.534 -39.9C59.549 -41.202 59.884 -42.638 59.954 -44.202C59.96 -44.33 59.645 -44.466 59.645 -44.6C59.646 -44.735 59.866 -44.866 60 -45C59.294 -45.626 59.019 -46.684 58 -47C58.305 -48.092 57.629 -48.976 56.758 -49.278C54.763 -49.969 53.086 -48.057 51.194 -47.984C50.68 -47.965 50.213 -49.003 49.564 -49.328C49.132 -49.544 48.428 -49.577 48.066 -49.311C47.378 -48.807 46.789 -48.693 46.031 -48.488C44.414 -48.052 43.136 -46.958 41.656 -46.103C40.171 -45.246 39.216 -43.809 38.136 -42.489C37.195 -41.337 37.059 -38.923 38.479 -38.423C40.322 -37.773 41.626 -40.476 43.592 -40.15C43.904 -40.099 44.11 -39.788 44 -39.4C44.389 -39.291 44.607 -39.52 44.8 -39.8C45.658 -38.781 46.822 -38.444 47.76 -37.571C48.73 -36.667 50.476 -37.085 51.491 -36.088C53.02 -34.586 52.461 -31.905 54.4 -30.6C53.814 -29.287 53.207 -28.01 52.872 -26.583C52.59 -25.377 53.584 -24.18 54.795 -24.271C56.053 -24.365 56.315 -25.124 56.8 -26.2C57.067 -25.933 57.536 -25.636 57.495 -25.42C57.038 -23.033 56.011 -21.04 55.553 -18.609C55.494 -18.292 55.189 -18.09 54.8 -18.2C54.332 -14.051 50.28 -11.657 47.735 -8.492C47.332 -7.99 47.328 -6.741 47.737 -6.338C49.14 -4.951 51.1 -6.497 52.8 -7C53.013 -8.206 53.872 -9.148 55.204 -9.092C55.46 -9.082 55.695 -9.624 56.019 -9.754C56.367 -9.892 56.869 -9.668 57.155 -9.866C58.884 -11.061 60.292 -12.167 62.03 -13.356C62.222 -13.487 62.566 -13.328 62.782 -13.436C63.107 -13.598 63.294 -13.985 63.617 -14.17C63.965 -14.37 64.207 -14.08 64.4 -13.8C63.754 -13.451 63.75 -12.494 63.168 -12.292C62.393 -12.024 61.832 -11.511 61.158 -11.064C60.866 -10.871 60.207 -11.119 60.103 -10.94C59.505 -9.912 58.321 -9.474 57.611 -8.591z"/>
+ </g>
+ <g style="fill: #000000">
+  <path d="M2.2 -58C2.2 -58 -7.038 -60.872 -18.2 -35.2C-18.2 -35.2 -20.6 -30 -23 -28C-25.4 -26 -36.6 -22.4 -38.6 -18.4L-49 -2.4C-49 -2.4 -34.2 -18.4 -31 -20.8C-31 -20.8 -23 -29.2 -26.2 -22.4C-26.2 -22.4 -40.2 -11.6 -39 -2.4C-39 -2.4 -44.6 12 -45.4 14C-45.4 14 -29.4 -18 -27 -19.2C-24.6 -20.4 -23.4 -20.4 -24.6 -16.8C-25.8 -13.2 -26.2 3.2 -29 5.2C-29 5.2 -21 -15.2 -21.8 -18.4C-21.8 -18.4 -18.6 -22 -16.2 -16.8L-17.4 -0.8L-13 11.2C-13 11.2 -15.4 0 -13.8 -15.6C-13.8 -15.6 -15.8 -26 -11.8 -20.4C-7.8 -14.8 1.8 -8.8 1.8 -4C1.8 -4 -3.4 -21.6 -12.6 -26.4L-16.6 -20.4L-17.8 -22.4C-17.8 -22.4 -21.4 -23.2 -17 -30C-12.6 -36.8 -13 -37.6 -13 -37.6C-13 -37.6 -6.6 -30.4 -5 -30.4C-5 -30.4 8.2 -38 9.4 -13.6C9.4 -13.6 16.2 -28 7 -34.8C7 -34.8 -7.8 -36.8 -6.6 -42L0.6 -54.4C4.2 -59.6 2.6 -56.8 2.6 -56.8z"/>
+ </g>
+ <g style="fill: #000000">
+  <path d="M-17.8 -41.6C-17.8 -41.6 -30.6 -41.6 -33.8 -36.4L-41 -26.8C-41 -26.8 -23.8 -36.8 -19.8 -38C-15.8 -39.2 -17.8 -41.6 -17.8 -41.6z"/>
+ </g>
+ <g style="fill: #000000">
+  <path d="M-57.8 -35.2C-57.8 -35.2 -59.8 -34 -60.2 -31.2C-60.6 -28.4 -63 -28 -62.2 -25.2C-61.4 -22.4 -59.4 -20 -59.4 -24C-59.4 -28 -57.8 -30 -57 -31.2C-56.2 -32.4 -54.6 -36.8 -57.8 -35.2z"/>
+ </g>
+ <g style="fill: #000000">
+  <path d="M-66.6 26C-66.6 26 -75 22 -78.2 18.4C-81.4 14.8 -80.948 19.966 -85.8 19.6C-91.647 19.159 -90.6 3.2 -90.6 3.2L-94.6 10.8C-94.6 10.8 -95.8 25.2 -87.8 22.8C-83.893 21.628 -82.6 23.2 -84.2 24C-85.8 24.8 -78.6 25.2 -81.4 26.8C-84.2 28.4 -69.8 23.2 -72.2 33.6L-66.6 26z"/>
+ </g>
+ <g style="fill: #000000">
+  <path d="M-79.2 40.4C-79.2 40.4 -94.6 44.8 -98.2 35.2C-98.2 35.2 -103 37.6 -100.8 40.6C-98.6 43.6 -97.4 44 -97.4 44C-97.4 44 -92 45.2 -92.6 46C-93.2 46.8 -95.6 50.2 -95.6 50.2C-95.6 50.2 -85.4 44.2 -79.2 40.4z"/>
+ </g>
+ <g style="fill: #ffffff">
+  <path d="M149.201 118.601C148.774 120.735 147.103 121.536 145.201 122.201C143.284 121.243 140.686 118.137 138.801 120.201C138.327 119.721 137.548 119.661 137.204 118.999C136.739 118.101 137.011 117.055 136.669 116.257C136.124 114.985 135.415 113.619 135.601 112.201C137.407 111.489 138.002 109.583 137.528 107.82C137.459 107.563 137.03 107.366 137.23 107.017C137.416 106.694 137.734 106.467 138.001 106.2C137.866 106.335 137.721 106.568 137.61 106.548C137 106.442 137.124 105.805 137.254 105.418C137.839 103.672 139.853 103.408 141.201 104.6C141.457 104.035 141.966 104.229 142.401 104.2C142.351 103.621 142.759 103.094 142.957 102.674C143.475 101.576 145.104 102.682 145.901 102.07C146.977 101.245 148.04 100.546 149.118 101.149C150.927 102.162 152.636 103.374 153.835 105.115C154.41 105.949 154.65 107.23 154.592 108.188C154.554 108.835 153.173 108.483 152.83 109.412C152.185 111.16 154.016 111.679 154.772 113.017C154.97 113.366 154.706 113.67 154.391 113.768C153.98 113.896 153.196 113.707 153.334 114.16C154.306 117.353 151.55 118.031 149.201 118.601z"/>
+ </g>
+ <g style="fill: #ffffff">
+  <path d="M139.6 138.201C139.593 136.463 137.992 134.707 139.201 133.001C139.336 133.135 139.467 133.356 139.601 133.356C139.736 133.356 139.867 133.135 140.001 133.001C141.496 135.217 145.148 136.145 145.006 138.991C144.984 139.438 143.897 140.356 144.801 141.001C142.988 142.349 142.933 144.719 142.001 146.601C140.763 146.315 139.551 145.952 138.401 145.401C138.753 143.915 138.636 142.231 139.456 140.911C139.89 140.213 139.603 139.134 139.6 138.201z"/>
+ </g>
+ <g style="fill: #cccccc">
+  <path d="M-26.6 129.201C-26.6 129.201 -43.458 139.337 -29.4 124.001C-20.6 114.401 -10.6 108.801 -10.6 108.801C-10.6 108.801 -0.2 104.4 3.4 103.2C7 102 22.2 96.8 25.4 96.4C28.6 96 38.2 92 45 96C51.8 100 59.8 104.4 59.8 104.4C59.8 104.4 43.4 96 39.8 98.4C36.2 100.8 29 100.4 23 103.6C23 103.6 8.2 108.001 5 110.001C1.8 112.001 -8.6 123.601 -10.2 122.801C-11.8 122.001 -9.8 121.601 -8.6 118.801C-7.4 116.001 -9.4 114.401 -17.4 120.801C-25.4 127.201 -26.6 129.201 -26.6 129.201z"/>
+ </g>
+ <g style="fill: #000000">
+  <path d="M-19.195 123.234C-19.195 123.234 -17.785 110.194 -9.307 111.859C-9.307 111.859 -1.081 107.689 1.641 105.721C1.641 105.721 9.78 104.019 11.09 103.402C29.569 94.702 44.288 99.221 44.835 98.101C45.381 96.982 65.006 104.099 68.615 108.185C69.006 108.628 58.384 102.588 48.686 100.697C40.413 99.083 18.811 100.944 7.905 106.48C4.932 107.989 -4.013 113.773 -6.544 113.662C-9.075 113.55 -19.195 123.234 -19.195 123.234z"/>
+ </g>
+ <g style="fill: #cccccc">
+  <path d="M-23 148.801C-23 148.801 -38.2 146.401 -21.4 144.801C-21.4 144.801 -3.4 142.801 0.6 137.601C0.6 137.601 14.2 128.401 17 128.001C19.8 127.601 49.8 120.401 50.2 118.001C50.6 115.601 56.2 115.601 57.8 116.401C59.4 117.201 58.6 118.401 55.8 119.201C53 120.001 21.8 136.401 15.4 137.601C9 138.801 -2.6 146.401 -7.4 147.601C-12.2 148.801 -23 148.801 -23 148.801z"/>
+ </g>
+ <g style="fill: #000000">
+  <path d="M-3.48 141.403C-3.48 141.403 -12.062 140.574 -3.461 139.755C-3.461 139.755 5.355 136.331 7.403 133.668C7.403 133.668 14.367 128.957 15.8 128.753C17.234 128.548 31.194 124.861 31.399 123.633C31.604 122.404 65.67 109.823 70.09 113.013C73.001 115.114 63.1 113.437 53.466 117.847C52.111 118.467 18.258 133.054 14.981 133.668C11.704 134.283 5.765 138.174 3.307 138.788C0.85 139.403 -3.48 141.403 -3.48 141.403z"/>
+ </g>
+ <g style="fill: #000000">
+  <path d="M-11.4 143.601C-11.4 143.601 -6.2 143.201 -7.4 144.801C-8.6 146.401 -11 145.601 -11 145.601L-11.4 143.601z"/>
+ </g>
+ <g style="fill: #000000">
+  <path d="M-18.6 145.201C-18.6 145.201 -13.4 144.801 -14.6 146.401C-15.8 148.001 -18.2 147.201 -18.2 147.201L-18.6 145.201z"/>
+ </g>
+ <g style="fill: #000000">
+  <path d="M-29 146.801C-29 146.801 -23.8 146.401 -25 148.001C-26.2 149.601 -28.6 148.801 -28.6 148.801L-29 146.801z"/>
+ </g>
+ <g style="fill: #000000">
+  <path d="M-36.6 147.601C-36.6 147.601 -31.4 147.201 -32.6 148.801C-33.8 150.401 -36.2 149.601 -36.2 149.601L-36.6 147.601z"/>
+ </g>
+ <g style="fill: #000000">
+  <path d="M1.8 108.001C1.8 108.001 6.2 108.001 5 109.601C3.8 111.201 0.6 110.801 0.6 110.801L1.8 108.001z"/>
+ </g>
+ <g style="fill: #000000">
+  <path d="M-8.2 113.601C-8.2 113.601 -1.694 111.46 -4.2 114.801C-5.4 116.401 -7.8 115.601 -7.8 115.601L-8.2 113.601z"/>
+ </g>
+ <g style="fill: #000000">
+  <path d="M-19.4 118.401C-19.4 118.401 -14.2 118.001 -15.4 119.601C-16.6 121.201 -19 120.401 -19 120.401L-19.4 118.401z"/>
+ </g>
+ <g style="fill: #000000">
+  <path d="M-27 124.401C-27 124.401 -21.8 124.001 -23 125.601C-24.2 127.201 -26.6 126.401 -26.6 126.401L-27 124.401z"/>
+ </g>
+ <g style="fill: #000000">
+  <path d="M-33.8 129.201C-33.8 129.201 -28.6 128.801 -29.8 130.401C-31 132.001 -33.4 131.201 -33.4 131.201L-33.8 129.201z"/>
+ </g>
+ <g style="fill: #000000">
+  <path d="M5.282 135.598C5.282 135.598 12.203 135.066 10.606 137.195C9.009 139.325 5.814 138.26 5.814 138.26L5.282 135.598z"/>
+ </g>
+ <g style="fill: #000000">
+  <path d="M15.682 130.798C15.682 130.798 22.603 130.266 21.006 132.395C19.409 134.525 16.214 133.46 16.214 133.46L15.682 130.798z"/>
+ </g>
+ <g style="fill: #000000">
+  <path d="M26.482 126.398C26.482 126.398 33.403 125.866 31.806 127.995C30.209 130.125 27.014 129.06 27.014 129.06L26.482 126.398z"/>
+ </g>
+ <g style="fill: #000000">
+  <path d="M36.882 121.598C36.882 121.598 43.803 121.066 42.206 123.195C40.609 125.325 37.414 124.26 37.414 124.26L36.882 121.598z"/>
+ </g>
+ <g style="fill: #000000">
+  <path d="M9.282 103.598C9.282 103.598 16.203 103.066 14.606 105.195C13.009 107.325 9.014 107.06 9.014 107.06L9.282 103.598z"/>
+ </g>
+ <g style="fill: #000000">
+  <path d="M19.282 100.398C19.282 100.398 26.203 99.866 24.606 101.995C23.009 104.125 18.614 103.86 18.614 103.86L19.282 100.398z"/>
+ </g>
+ <g style="fill: #000000">
+  <path d="M-3.4 140.401C-3.4 140.401 1.8 140.001 0.6 141.601C-0.6 143.201 -3 142.401 -3 142.401L-3.4 140.401z"/>
+ </g>
+ <g style="fill: #992600">
+  <path d="M-76.6 41.2C-76.6 41.2 -81 50 -81.4 53.2C-81.4 53.2 -80.6 44.4 -79.4 42.4C-78.2 40.4 -76.6 41.2 -76.6 41.2z"/>
+ </g>
+ <g style="fill: #992600">
+  <path d="M-95 55.2C-95 55.2 -98.2 69.6 -97.8 72.4C-97.8 72.4 -99 60.8 -98.6 59.6C-98.2 58.4 -95 55.2 -95 55.2z"/>
+ </g>
+ <g style="fill: #cccccc">
+  <path d="M-74.2 -19.4L-74.4 -16.2L-76.6 -16C-76.6 -16 -62.4 -3.4 -61.8 4.2C-61.8 4.2 -61 -4 -74.2 -19.4z"/>
+ </g>
+ <g style="fill: #000000">
+  <path d="M-70.216 -18.135C-70.647 -18.551 -70.428 -19.296 -70.836 -19.556C-71.645 -20.072 -69.538 -20.129 -69.766 -20.845C-70.149 -22.051 -69.962 -22.072 -70.084 -23.348C-70.141 -23.946 -69.553 -25.486 -69.168 -25.926C-67.722 -27.578 -69.046 -30.51 -67.406 -32.061C-67.102 -32.35 -66.726 -32.902 -66.441 -33.32C-65.782 -34.283 -64.598 -34.771 -63.648 -35.599C-63.33 -35.875 -63.531 -36.702 -62.962 -36.61C-62.248 -36.495 -61.007 -36.625 -61.052 -35.784C-61.165 -33.664 -62.494 -31.944 -63.774 -30.276C-63.323 -29.572 -63.781 -28.937 -64.065 -28.38C-65.4 -25.76 -65.211 -22.919 -65.385 -20.079C-65.39 -19.994 -65.697 -19.916 -65.689 -19.863C-65.336 -17.528 -64.752 -15.329 -63.873 -13.1C-63.507 -12.17 -63.036 -11.275 -62.886 -10.348C-62.775 -9.662 -62.672 -8.829 -63.08 -8.124C-61.045 -5.234 -62.354 -2.583 -61.185 0.948C-60.978 1.573 -59.286 3.487 -59.749 3.326C-62.262 2.455 -62.374 2.057 -62.551 1.304C-62.697 0.681 -63.027 -0.696 -63.264 -1.298C-63.328 -1.462 -63.499 -3.346 -63.577 -3.468C-65.09 -5.85 -63.732 -5.674 -65.102 -8.032C-66.53 -8.712 -67.496 -9.816 -68.619 -10.978C-68.817 -11.182 -67.674 -11.906 -67.855 -12.119C-68.947 -13.408 -70.1 -14.175 -69.764 -15.668C-69.609 -16.358 -69.472 -17.415 -70.216 -18.135z"/>
+ </g>
+ <g style="fill: #000000">
+  <path d="M-73.8 -16.4C-73.8 -16.4 -73.4 -9.6 -71 -8C-68.6 -6.4 -69.8 -7.2 -73 -8.4C-76.2 -9.6 -75 -10.4 -75 -10.4C-75 -10.4 -77.8 -10 -75.4 -8C-73 -6 -69.4 -3.6 -71 -3.6C-72.6 -3.6 -80.2 -7.6 -80.2 -10.4C-80.2 -13.2 -81.2 -17.3 -81.2 -17.3C-81.2 -17.3 -80.1 -18.1 -75.3 -18C-75.3 -18 -73.9 -17.3 -73.8 -16.4z"/>
+ </g>
+ <g style="fill: #ffffff; stroke:#000000; stroke-width:0.1">
+  <path d="M-74.6 2.2C-74.6 2.2 -83.12 -0.591 -101.6 2.8C-101.6 2.8 -92.569 0.722 -73.8 3C-63.5 4.25 -74.6 2.2 -74.6 2.2z"/>
+ </g>
+ <g style="fill: #ffffff; stroke:#000000; stroke-width:0.1">
+  <path d="M-72.502 2.129C-72.502 2.129 -80.748 -1.389 -99.453 0.392C-99.453 0.392 -90.275 -0.897 -71.774 2.995C-61.62 5.131 -72.502 2.129 -72.502 2.129z"/>
+ </g>
+ <g style="fill: #ffffff; stroke:#000000; stroke-width:0.1">
+  <path d="M-70.714 2.222C-70.714 2.222 -78.676 -1.899 -97.461 -1.514C-97.461 -1.514 -88.213 -2.118 -70.052 3.14C-60.086 6.025 -70.714 2.222 -70.714 2.222z"/>
+ </g>
+ <g style="fill: #ffffff; stroke:#000000; stroke-width:0.1">
+  <path d="M-69.444 2.445C-69.444 2.445 -76.268 -1.862 -93.142 -2.96C-93.142 -2.96 -84.803 -2.79 -68.922 3.319C-60.206 6.672 -69.444 2.445 -69.444 2.445z"/>
+ </g>
+ <g style="fill: #ffffff; stroke:#000000; stroke-width:0.1">
+  <path d="M45.84 12.961C45.84 12.961 44.91 13.605 45.124 12.424C45.339 11.243 73.547 -1.927 77.161 -1.677C77.161 -1.677 46.913 11.529 45.84 12.961z"/>
+ </g>
+ <g style="fill: #ffffff; stroke:#000000; stroke-width:0.1">
+  <path d="M42.446 13.6C42.446 13.6 41.57 14.315 41.691 13.121C41.812 11.927 68.899 -3.418 72.521 -3.452C72.521 -3.452 43.404 12.089 42.446 13.6z"/>
+ </g>
+ <g style="fill: #ffffff; stroke:#000000; stroke-width:0.1">
+  <path d="M39.16 14.975C39.16 14.975 38.332 15.747 38.374 14.547C38.416 13.348 58.233 -2.149 68.045 -4.023C68.045 -4.023 50.015 4.104 39.16 14.975z"/>
+ </g>
+ <g style="fill: #ffffff; stroke:#000000; stroke-width:0.1">
+  <path d="M36.284 16.838C36.284 16.838 35.539 17.532 35.577 16.453C35.615 15.373 53.449 1.426 62.28 -0.26C62.28 -0.26 46.054 7.054 36.284 16.838z"/>
+ </g>
+ <g style="fill: #cccccc">
+  <path d="M4.6 164.801C4.6 164.801 -10.6 162.401 6.2 160.801C6.2 160.801 24.2 158.801 28.2 153.601C28.2 153.601 41.8 144.401 44.6 144.001C47.4 143.601 63.8 140.001 64.2 137.601C64.6 135.201 70.6 132.801 72.2 133.601C73.8 134.401 73.8 143.601 71 144.401C68.2 145.201 49.4 152.401 43 153.601C36.6 154.801 25 162.401 20.2 163.601C15.4 164.801 4.6 164.801 4.6 164.801z"/>
+ </g>
+ <g style="fill: #000000">
+  <path d="M77.6 127.401C77.6 127.401 74.6 129.001 73.4 131.601C73.4 131.601 67 142.201 52.8 145.401C52.8 145.401 29.8 154.401 22 156.401C22 156.401 8.6 161.401 1.2 160.601C1.2 160.601 -5.8 160.801 0.4 162.401C0.4 162.401 20.6 160.401 24 158.601C24 158.601 39.6 153.401 42.6 150.801C45.6 148.201 63.8 143.201 66 141.201C68.2 139.201 78 130.801 77.6 127.401z"/>
+ </g>
+ <g style="fill: #000000">
+  <path d="M18.882 158.911C18.882 158.911 24.111 158.685 22.958 160.234C21.805 161.784 19.357 160.91 19.357 160.91L18.882 158.911z"/>
+ </g>
+ <g style="fill: #000000">
+  <path d="M11.68 160.263C11.68 160.263 16.908 160.037 15.756 161.586C14.603 163.136 12.155 162.263 12.155 162.263L11.68 160.263z"/>
+ </g>
+ <g style="fill: #000000">
+  <path d="M1.251 161.511C1.251 161.511 6.48 161.284 5.327 162.834C4.174 164.383 1.726 163.51 1.726 163.51L1.251 161.511z"/>
+ </g>
+ <g style="fill: #000000">
+  <path d="M-6.383 162.055C-6.383 162.055 -1.154 161.829 -2.307 163.378C-3.46 164.928 -5.908 164.054 -5.908 164.054L-6.383 162.055z"/>
+ </g>
+ <g style="fill: #000000">
+  <path d="M35.415 151.513C35.415 151.513 42.375 151.212 40.84 153.274C39.306 155.336 36.047 154.174 36.047 154.174L35.415 151.513z"/>
+ </g>
+ <g style="fill: #000000">
+  <path d="M45.73 147.088C45.73 147.088 51.689 143.787 51.155 148.849C50.885 151.405 46.362 149.749 46.362 149.749L45.73 147.088z"/>
+ </g>
+ <g style="fill: #000000">
+  <path d="M54.862 144.274C54.862 144.274 62.021 140.573 60.287 146.035C59.509 148.485 55.493 146.935 55.493 146.935L54.862 144.274z"/>
+ </g>
+ <g style="fill: #000000">
+  <path d="M64.376 139.449C64.376 139.449 68.735 134.548 69.801 141.21C70.207 143.748 65.008 142.11 65.008 142.11L64.376 139.449z"/>
+ </g>
+ <g style="fill: #000000">
+  <path d="M26.834 155.997C26.834 155.997 32.062 155.77 30.91 157.32C29.757 158.869 27.308 157.996 27.308 157.996L26.834 155.997z"/>
+ </g>
+ <g style="fill: #ffffff; stroke:#000000; stroke-width:0.1">
+  <path d="M62.434 34.603C62.434 34.603 61.708 35.268 61.707 34.197C61.707 33.127 79.191 19.863 88.034 18.479C88.034 18.479 71.935 25.208 62.434 34.603z"/>
+ </g>
+ <g style="fill: #000000">
+  <path d="M65.4 98.4C65.4 98.4 87.401 120.801 96.601 124.401C96.601 124.401 105.801 135.601 101.801 161.601C101.801 161.601 98.601 169.201 95.401 148.401C95.401 148.401 98.601 123.201 87.401 139.201C87.401 139.201 79 129.301 85.4 129.601C85.4 129.601 88.601 131.601 89.001 130.001C89.401 128.401 81.4 114.801 64.2 100.4C47 86 65.4 98.4 65.4 98.4z"/>
+ </g>
+ <g style="fill: #ffffff; stroke:#000000; stroke-width:0.1">
+  <path d="M7 137.201C7 137.201 6.8 135.401 8.6 136.201C10.4 137.001 104.601 143.201 136.201 167.201C136.201 167.201 91.001 144.001 7 137.201z"/>
+ </g>
+ <g style="fill: #ffffff; stroke:#000000; stroke-width:0.1">
+  <path d="M17.4 132.801C17.4 132.801 17.2 131.001 19 131.801C20.8 132.601 157.401 131.601 181.001 164.001C181.001 164.001 159.001 138.801 17.4 132.801z"/>
+ </g>
+ <g style="fill: #ffffff; stroke:#000000; stroke-width:0.1">
+  <path d="M29 128.801C29 128.801 28.8 127.001 30.6 127.801C32.4 128.601 205.801 115.601 229.401 148.001C229.401 148.001 219.801 122.401 29 128.801z"/>
+ </g>
+ <g style="fill: #ffffff; stroke:#000000; stroke-width:0.1">
+  <path d="M39 124.001C39 124.001 38.8 122.201 40.6 123.001C42.4 123.801 164.601 85.2 188.201 117.601C188.201 117.601 174.801 93 39 124.001z"/>
+ </g>
+ <g style="fill: #ffffff; stroke:#000000; stroke-width:0.1">
+  <path d="M-19 146.801C-19 146.801 -19.2 145.001 -17.4 145.801C-15.6 146.601 2.2 148.801 4.2 187.601C4.2 187.601 -3 145.601 -19 146.801z"/>
+ </g>
+ <g style="fill: #ffffff; stroke:#000000; stroke-width:0.1">
+  <path d="M-27.8 148.401C-27.8 148.401 -28 146.601 -26.2 147.401C-24.4 148.201 -10.2 143.601 -13 182.401C-13 182.401 -11.8 147.201 -27.8 148.401z"/>
+ </g>
+ <g style="fill: #ffffff; stroke:#000000; stroke-width:0.1">
+  <path d="M-35.8 148.801C-35.8 148.801 -36 147.001 -34.2 147.801C-32.4 148.601 -17 149.201 -29.4 171.601C-29.4 171.601 -19.8 147.601 -35.8 148.801z"/>
+ </g>
+ <g style="fill: #ffffff; stroke:#000000; stroke-width:0.1">
+  <path d="M11.526 104.465C11.526 104.465 11.082 106.464 12.631 105.247C28.699 92.622 61.141 33.72 116.826 28.086C116.826 28.086 78.518 15.976 11.526 104.465z"/>
+ </g>
+ <g style="fill: #ffffff; stroke:#000000; stroke-width:0.1">
+  <path d="M22.726 102.665C22.726 102.665 21.363 101.472 23.231 100.847C25.099 100.222 137.541 27.72 176.826 35.686C176.826 35.686 149.719 28.176 22.726 102.665z"/>
+ </g>
+ <g style="fill: #ffffff; stroke:#000000; stroke-width:0.1">
+  <path d="M1.885 108.767C1.885 108.767 1.376 110.366 3.087 109.39C12.062 104.27 15.677 47.059 59.254 45.804C59.254 45.804 26.843 31.09 1.885 108.767z"/>
+ </g>
+ <g style="fill: #ffffff; stroke:#000000; stroke-width:0.1">
+  <path d="M-18.038 119.793C-18.038 119.793 -19.115 121.079 -17.162 120.825C-6.916 119.493 14.489 78.222 58.928 83.301C58.928 83.301 26.962 68.955 -18.038 119.793z"/>
+ </g>
+ <g style="fill: #ffffff; stroke:#000000; stroke-width:0.1">
+  <path d="M-6.8 113.667C-6.8 113.667 -7.611 115.136 -5.742 114.511C4.057 111.237 17.141 66.625 61.729 63.078C61.729 63.078 27.603 55.135 -6.8 113.667z"/>
+ </g>
+ <g style="fill: #ffffff; stroke:#000000; stroke-width:0.1">
+  <path d="M-25.078 124.912C-25.078 124.912 -25.951 125.954 -24.369 125.748C-16.07 124.669 1.268 91.24 37.264 95.354C37.264 95.354 11.371 83.734 -25.078 124.912z"/>
+ </g>
+ <g style="fill: #ffffff; stroke:#000000; stroke-width:0.1">
+  <path d="M-32.677 130.821C-32.677 130.821 -33.682 131.866 -32.091 131.748C-27.923 131.439 2.715 98.36 21.183 113.862C21.183 113.862 9.168 95.139 -32.677 130.821z"/>
+ </g>
+ <g style="fill: #ffffff; stroke:#000000; stroke-width:0.1">
+  <path d="M36.855 98.898C36.855 98.898 35.654 97.543 37.586 97.158C39.518 96.774 160.221 39.061 198.184 51.927C198.184 51.927 172.243 41.053 36.855 98.898z"/>
+ </g>
+ <g style="fill: #ffffff; stroke:#000000; stroke-width:0.1">
+  <path d="M3.4 163.201C3.4 163.201 3.2 161.401 5 162.201C6.8 163.001 22.2 163.601 9.8 186.001C9.8 186.001 19.4 162.001 3.4 163.201z"/>
+ </g>
+ <g style="fill: #ffffff; stroke:#000000; stroke-width:0.1">
+  <path d="M13.8 161.601C13.8 161.601 13.6 159.801 15.4 160.601C17.2 161.401 35 163.601 37 202.401C37 202.401 29.8 160.401 13.8 161.601z"/>
+ </g>
+ <g style="fill: #ffffff; stroke:#000000; stroke-width:0.1">
+  <path d="M20.6 160.001C20.6 160.001 20.4 158.201 22.2 159.001C24 159.801 48.6 163.201 72.2 195.601C72.2 195.601 36.6 158.801 20.6 160.001z"/>
+ </g>
+ <g style="fill: #ffffff; stroke:#000000; stroke-width:0.1">
+  <path d="M28.225 157.972C28.225 157.972 27.788 156.214 29.678 156.768C31.568 157.322 52.002 155.423 90.099 189.599C90.099 189.599 43.924 154.656 28.225 157.972z"/>
+ </g>
+ <g style="fill: #ffffff; stroke:#000000; stroke-width:0.1">
+  <path d="M38.625 153.572C38.625 153.572 38.188 151.814 40.078 152.368C41.968 152.922 76.802 157.423 128.499 192.399C128.499 192.399 54.324 150.256 38.625 153.572z"/>
+ </g>
+ <g style="fill: #ffffff; stroke:#000000; stroke-width:0.1">
+  <path d="M-1.8 142.001C-1.8 142.001 -2 140.201 -0.2 141.001C1.6 141.801 55 144.401 85.4 171.201C85.4 171.201 50.499 146.426 -1.8 142.001z"/>
+ </g>
+ <g style="fill: #ffffff; stroke:#000000; stroke-width:0.1">
+  <path d="M-11.8 146.001C-11.8 146.001 -12 144.201 -10.2 145.001C-8.4 145.801 16.2 149.201 39.8 181.601C39.8 181.601 4.2 144.801 -11.8 146.001z"/>
+ </g>
+ <g style="fill: #ffffff; stroke:#000000; stroke-width:0.1">
+  <path d="M49.503 148.962C49.503 148.962 48.938 147.241 50.864 147.655C52.79 148.068 87.86 150.004 141.981 181.098C141.981 181.098 64.317 146.704 49.503 148.962z"/>
+ </g>
+ <g style="fill: #ffffff; stroke:#000000; stroke-width:0.1">
+  <path d="M57.903 146.562C57.903 146.562 57.338 144.841 59.264 145.255C61.19 145.668 96.26 147.604 150.381 178.698C150.381 178.698 73.317 143.904 57.903 146.562z"/>
+ </g>
+ <g style="fill: #ffffff; stroke:#000000; stroke-width:0.1">
+  <path d="M67.503 141.562C67.503 141.562 66.938 139.841 68.864 140.255C70.79 140.668 113.86 145.004 203.582 179.298C203.582 179.298 82.917 138.904 67.503 141.562z"/>
+ </g>
+ <g style="fill: #000000">
+  <path d="M-43.8 148.401C-43.8 148.401 -38.6 148.001 -39.8 149.601C-41 151.201 -43.4 150.401 -43.4 150.401L-43.8 148.401z"/>
+ </g>
+ <g style="fill: #000000">
+  <path d="M-13 162.401C-13 162.401 -7.8 162.001 -9 163.601C-10.2 165.201 -12.6 164.401 -12.6 164.401L-13 162.401z"/>
+ </g>
+ <g style="fill: #000000">
+  <path d="M-21.8 162.001C-21.8 162.001 -16.6 161.601 -17.8 163.201C-19 164.801 -21.4 164.001 -21.4 164.001L-21.8 162.001z"/>
+ </g>
+ <g style="fill: #000000">
+  <path d="M-117.169 150.182C-117.169 150.182 -112.124 151.505 -113.782 152.624C-115.439 153.744 -117.446 152.202 -117.446 152.202L-117.169 150.182z"/>
+ </g>
+ <g style="fill: #000000">
+  <path d="M-115.169 140.582C-115.169 140.582 -110.124 141.905 -111.782 143.024C-113.439 144.144 -115.446 142.602 -115.446 142.602L-115.169 140.582z"/>
+ </g>
+ <g style="fill: #000000">
+  <path d="M-122.369 136.182C-122.369 136.182 -117.324 137.505 -118.982 138.624C-120.639 139.744 -122.646 138.202 -122.646 138.202L-122.369 136.182z"/>
+ </g>
+ <g style="fill: #cccccc">
+  <path d="M-42.6 211.201C-42.6 211.201 -44.2 211.201 -48.2 213.201C-50.2 213.201 -61.4 216.801 -67 226.801C-67 226.801 -54.6 217.201 -42.6 211.201z"/>
+ </g>
+ <g style="fill: #cccccc">
+  <path d="M45.116 303.847C45.257 304.105 45.312 304.525 45.604 304.542C46.262 304.582 47.495 304.883 47.37 304.247C46.522 299.941 45.648 295.004 41.515 293.197C40.876 292.918 39.434 293.331 39.36 294.215C39.233 295.739 39.116 297.088 39.425 298.554C39.725 299.975 41.883 299.985 42.8 298.601C43.736 300.273 44.168 302.116 45.116 303.847z"/>
+ </g>
+ <g style="fill: #cccccc">
+  <path d="M34.038 308.581C34.786 309.994 34.659 311.853 36.074 312.416C36.814 312.71 38.664 311.735 38.246 310.661C37.444 308.6 37.056 306.361 35.667 304.55C35.467 304.288 35.707 303.755 35.547 303.427C34.953 302.207 33.808 301.472 32.4 301.801C31.285 304.004 32.433 306.133 33.955 307.842C34.091 307.994 33.925 308.37 34.038 308.581z"/>
+ </g>
+ <g style="fill: #cccccc">
+  <path d="M-5.564 303.391C-5.672 303.014 -5.71 302.551 -5.545 302.23C-5.014 301.197 -4.221 300.075 -4.558 299.053C-4.906 297.997 -6.022 298.179 -6.672 298.748C-7.807 299.742 -7.856 301.568 -8.547 302.927C-8.743 303.313 -8.692 303.886 -9.133 304.277C-9.607 304.698 -10.047 306.222 -9.951 306.793C-9.898 307.106 -10.081 317.014 -9.859 316.751C-9.24 316.018 -6.19 306.284 -6.121 305.392C-6.064 304.661 -5.332 304.196 -5.564 303.391z"/>
+ </g>
+ <g style="fill: #cccccc">
+  <path d="M-31.202 296.599C-28.568 294.1 -25.778 291.139 -26.22 287.427C-26.336 286.451 -28.111 286.978 -28.298 287.824C-29.1 291.449 -31.139 294.11 -33.707 296.502C-35.903 298.549 -37.765 304.893 -38 305.401C-34.303 300.145 -32.046 297.399 -31.202 296.599z"/>
+ </g>
+ <g style="fill: #cccccc">
+  <path d="M-44.776 290.635C-44.253 290.265 -44.555 289.774 -44.338 289.442C-43.385 287.984 -42.084 286.738 -42.066 285C-42.063 284.723 -42.441 284.414 -42.776 284.638C-43.053 284.822 -43.395 284.952 -43.503 285.082C-45.533 287.531 -46.933 290.202 -48.376 293.014C-48.559 293.371 -49.703 297.862 -49.39 297.973C-49.151 298.058 -47.431 293.877 -47.221 293.763C-45.958 293.077 -45.946 291.462 -44.776 290.635z"/>
+ </g>
+ <g style="fill: #cccccc">
+  <path d="M-28.043 310.179C-27.599 309.31 -26.023 308.108 -26.136 307.219C-26.254 306.291 -25.786 304.848 -26.698 305.536C-27.955 306.484 -31.404 307.833 -31.674 313.641C-31.7 314.212 -28.726 311.519 -28.043 310.179z"/>
+ </g>
+ <g style="fill: #cccccc">
+  <path d="M-13.6 293.001C-13.2 292.333 -12.492 292.806 -12.033 292.543C-11.385 292.171 -10.774 291.613 -10.482 290.964C-9.512 288.815 -7.743 286.995 -7.6 284.601C-9.091 283.196 -9.77 285.236 -10.4 286.201C-11.723 284.554 -12.722 286.428 -14.022 286.947C-14.092 286.975 -14.305 286.628 -14.38 286.655C-15.557 287.095 -16.237 288.176 -17.235 288.957C-17.406 289.091 -17.811 288.911 -17.958 289.047C-18.61 289.65 -19.583 289.975 -19.863 290.657C-20.973 293.364 -24.113 295.459 -26 303.001C-25.619 303.91 -21.488 296.359 -21.001 295.661C-20.165 294.465 -20.047 297.322 -18.771 296.656C-18.72 296.629 -18.534 296.867 -18.4 297.001C-18.206 296.721 -17.988 296.492 -17.6 296.601C-17.6 296.201 -17.734 295.645 -17.533 295.486C-16.296 294.509 -16.38 293.441 -15.6 292.201C-15.142 292.99 -14.081 292.271 -13.6 293.001z"/>
+ </g>
+ <g style="fill: #cccccc">
+  <path d="M46.2 347.401C46.2 347.401 53.6 327.001 49.2 315.801C49.2 315.801 60.6 337.401 56 348.601C56 348.601 55.6 338.201 51.6 333.201C51.6 333.201 47.6 346.001 46.2 347.401z"/>
+ </g>
+ <g style="fill: #cccccc">
+  <path d="M31.4 344.801C31.4 344.801 36.8 336.001 28.8 317.601C28.8 317.601 28 338.001 21.2 349.001C21.2 349.001 35.4 328.801 31.4 344.801z"/>
+ </g>
+ <g style="fill: #cccccc">
+  <path d="M21.4 342.801C21.4 342.801 21.2 322.801 21.6 319.801C21.6 319.801 17.8 336.401 7.6 346.001C7.6 346.001 22 334.001 21.4 342.801z"/>
+ </g>
+ <g style="fill: #cccccc">
+  <path d="M11.8 310.801C11.8 310.801 17.8 324.401 7.8 342.801C7.8 342.801 14.2 330.601 9.4 323.601C9.4 323.601 12 320.201 11.8 310.801z"/>
+ </g>
+ <g style="fill: #cccccc">
+  <path d="M-7.4 342.401C-7.4 342.401 -8.4 326.801 -6.6 324.601C-6.6 324.601 -6.4 318.201 -6.8 317.201C-6.8 317.201 -2.8 311.001 -2.6 318.401C-2.6 318.401 -1.2 326.201 1.6 330.801C1.6 330.801 5.2 336.201 5 342.601C5 342.601 -5 312.401 -7.4 342.401z"/>
+ </g>
+ <g style="fill: #cccccc">
+  <path d="M-11 314.801C-11 314.801 -17.6 325.601 -19.4 344.601C-19.4 344.601 -20.8 338.401 -17 324.001C-17 324.001 -12.8 308.601 -11 314.801z"/>
+ </g>
+ <g style="fill: #cccccc">
+  <path d="M-32.8 334.601C-32.8 334.601 -27.8 329.201 -26.4 324.201C-26.4 324.201 -22.8 308.401 -29.2 317.001C-29.2 317.001 -29 325.001 -37.2 332.401C-37.2 332.401 -32.4 330.001 -32.8 334.601z"/>
+ </g>
+ <g style="fill: #cccccc">
+  <path d="M-38.6 329.601C-38.6 329.601 -35.2 312.201 -34.4 311.401C-34.4 311.401 -32.6 308.001 -35.4 311.201C-35.4 311.201 -44.2 330.401 -48.2 337.001C-48.2 337.001 -40.2 327.801 -38.6 329.601z"/>
+ </g>
+ <g style="fill: #cccccc">
+  <path d="M-44.4 313.001C-44.4 313.001 -32.8 290.601 -54.6 316.401C-54.6 316.401 -43.6 306.601 -44.4 313.001z"/>
+ </g>
+ <g style="fill: #cccccc">
+  <path d="M-59.8 298.401C-59.8 298.401 -55 279.601 -52.4 279.801C-52.4 279.801 -44.2 270.801 -50.8 281.401C-50.8 281.401 -56.8 291.001 -56.2 300.801C-56.2 300.801 -56.8 291.201 -59.8 298.401z"/>
+ </g>
+ <g style="fill: #cccccc">
+  <path d="M270.5 287C270.5 287 258.5 277 256 273.5C256 273.5 269.5 292 269.5 299C269.5 299 272 291.5 270.5 287z"/>
+ </g>
+ <g style="fill: #cccccc">
+  <path d="M276 265C276 265 255 250 251.5 242.5C251.5 242.5 278 272 278 276.5C278 276.5 278.5 267.5 276 265z"/>
+ </g>
+ <g style="fill: #cccccc">
+  <path d="M293 111C293 111 281 103 279.5 105C279.5 105 290 111.5 292.5 120C292.5 120 291 111 293 111z"/>
+ </g>
+ <g style="fill: #cccccc">
+  <path d="M301.5 191.5L284 179.5C284 179.5 303 196.5 303.5 200.5L301.5 191.5z"/>
+ </g>
+ <g style="stroke:#000000">
+  <path d="M-89.25 169L-67.25 173.75"/>
+ </g>
+ <g style="stroke:#000000">
+  <path d="M-39 331C-39 331 -39.5 327.5 -48.5 338"/>
+ </g>
+ <g style="stroke:#000000">
+  <path d="M-33.5 336C-33.5 336 -31.5 329.5 -38 334"/>
+ </g>
+ <g style="stroke:#000000">
+  <path d="M20.5 344.5C20.5 344.5 22 333.5 10.5 346.5"/>
+ </g>
+</g>
+</svg>
+
diff --git a/tests/QtTest/CMakeLists.txt b/tests/QtTest/CMakeLists.txt
new file mode 100644
index 0000000..9d1e9db
--- /dev/null
+++ b/tests/QtTest/CMakeLists.txt
@@ -0,0 +1,3 @@
+PYSIDE_TEST(click_test.py)
+PYSIDE_TEST(eventfilter_test.py)
+PYSIDE_TEST(touchevent_test.py)
diff --git a/tests/qttest/click_test.py b/tests/QtTest/click_test.py
similarity index 100%
rename from tests/qttest/click_test.py
rename to tests/QtTest/click_test.py
diff --git a/tests/qttest/eventfilter_test.py b/tests/QtTest/eventfilter_test.py
similarity index 100%
rename from tests/qttest/eventfilter_test.py
rename to tests/QtTest/eventfilter_test.py
diff --git a/tests/QtTest/touchevent_test.py b/tests/QtTest/touchevent_test.py
new file mode 100644
index 0000000..2db4e8b
--- /dev/null
+++ b/tests/QtTest/touchevent_test.py
@@ -0,0 +1,46 @@
+from PySide.QtGui import QWidget
+from PySide.QtCore import QPoint, QTimer, Qt, QEvent
+from PySide.QtTest import QTest
+
+import unittest
+
+from helper import UsesQApplication
+
+class MyWidget(QWidget):
+    def __init__(self, parent = None):
+        QWidget.__init__(self, parent)
+        self._sequence = []
+        self.setAttribute(Qt.WA_AcceptTouchEvents)
+        QTimer.singleShot(200, self.generateEvent)
+
+    def event(self, e):
+        self._sequence.append(e.type())
+        return QWidget.event(self, e)
+
+    def generateEvent(self):
+        o = QTest.touchEvent(self)
+        o.press(0, QPoint(10, 10))
+        o.commit()
+        del o
+
+        QTest.touchEvent(self).press(0, QPoint(10, 10))
+        QTest.touchEvent(self).stationary(0).press(1, QPoint(40, 10))
+        QTest.touchEvent(self).move(0, QPoint(12, 12)).move(1, QPoint(45, 5))
+        QTest.touchEvent(self).release(0, QPoint(12, 12)).release(1, QPoint(45, 5))
+
+        QTimer.singleShot(200, self.deleteLater)
+
+
+class TouchEventTest(UsesQApplication):
+    def testCreateEvent(self):
+        w = MyWidget()
+        w.show()
+        self.app.exec_()
+        # same values as C++
+        self.assertEqual(w._sequence.count(QEvent.Type.TouchBegin), 2)
+        self.assertEqual(w._sequence.count(QEvent.Type.TouchUpdate), 2)
+        self.assertEqual(w._sequence.count(QEvent.Type.TouchEnd), 1)
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/tests/QtUiTools/CMakeLists.txt b/tests/QtUiTools/CMakeLists.txt
new file mode 100644
index 0000000..68ed7f1
--- /dev/null
+++ b/tests/QtUiTools/CMakeLists.txt
@@ -0,0 +1,13 @@
+PYSIDE_TEST(bug_360.py)
+PYSIDE_TEST(bug_376.py)
+PYSIDE_TEST(bug_392.py)
+PYSIDE_TEST(bug_426.py)
+PYSIDE_TEST(bug_552.py)
+PYSIDE_TEST(bug_797.py)
+PYSIDE_TEST(bug_909.py)
+PYSIDE_TEST(bug_913.py)
+PYSIDE_TEST(bug_958.py)
+PYSIDE_TEST(bug_965.py)
+PYSIDE_TEST(bug_1060.py)
+PYSIDE_TEST(uiloader_test.py)
+PYSIDE_TEST(ui_test.py)
diff --git a/tests/QtUiTools/action.ui b/tests/QtUiTools/action.ui
new file mode 100644
index 0000000..9eda559
--- /dev/null
+++ b/tests/QtUiTools/action.ui
@@ -0,0 +1,16 @@
+<ui version="4.0">
+    <class>main_window</class>
+    <widget class="QMainWindow" name="main_window">
+      <widget class="QWidget" name="centralwidget"/>
+      <widget class="QMenuBar" name="menubar"/>
+      <widget class="QStatusBar" name="statusbar">
+        <action name="actionFoo">
+          <property name="text">
+            <string>foo</string>
+          </property>
+        </action>
+      </widget>
+    </widget>
+    <resources/>
+    <connections/>
+</ui>
diff --git a/tests/QtUiTools/bug_1060.py b/tests/QtUiTools/bug_1060.py
new file mode 100644
index 0000000..8b51501
--- /dev/null
+++ b/tests/QtUiTools/bug_1060.py
@@ -0,0 +1,18 @@
+''' unit test for BUG #1060 '''
+
+from PySide.QtGui import QApplication
+from PySide.QtUiTools import QUiLoader
+from helper import adjust_filename
+
+class MyQUiLoader(QUiLoader):
+    def __init__(self):
+        super(MyQUiLoader, self).__init__()
+
+    def createWidget(self, *args):
+        return super(MyQUiLoader, self).createWidget(*args)
+
+if __name__ == "__main__":
+    app = QApplication([])
+
+    ui = MyQUiLoader().load(adjust_filename("bug_1060.ui", __file__))
+    ui.show()
diff --git a/tests/QtUiTools/bug_1060.ui b/tests/QtUiTools/bug_1060.ui
new file mode 100644
index 0000000..f4044a8
--- /dev/null
+++ b/tests/QtUiTools/bug_1060.ui
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>Dialog</class>
+ <widget class="QDialog" name="Dialog">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>100</width>
+    <height>100</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Dialog</string>
+  </property>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/tests/QtUiTools/bug_360.py b/tests/QtUiTools/bug_360.py
new file mode 100644
index 0000000..aefc422
--- /dev/null
+++ b/tests/QtUiTools/bug_360.py
@@ -0,0 +1,36 @@
+import unittest
+import os
+from helper import UsesQApplication
+
+from PySide import QtCore, QtGui
+from PySide.QtUiTools import QUiLoader
+
+class MyQUiLoader(QUiLoader):
+    def __init__(self, baseinstance):
+        QUiLoader.__init__(self)
+        self.baseinstance = baseinstance
+        self._widgets = []
+
+    def createWidget(self, className, parent=None, name=""):
+        widget = QUiLoader.createWidget(self, className, parent, name)
+        self._widgets.append(widget)
+        if parent is None:
+            return self.baseinstance
+        else:
+            setattr(self.baseinstance, name, widget)
+            return widget
+
+class ButTest(UsesQApplication):
+    def testCase(self):
+        w = QtGui.QWidget()
+        loader = MyQUiLoader(w)
+
+        filePath = os.path.join(os.path.dirname(__file__), 'minimal.ui')
+        ui = loader.load(filePath)
+
+        self.assertEqual(len(loader._widgets), 1)
+        self.assertEqual(type(loader._widgets[0]), QtGui.QFrame)
+
+if __name__ == '__main__':
+    unittest.main()
+
diff --git a/tests/QtUiTools/bug_376.py b/tests/QtUiTools/bug_376.py
new file mode 100644
index 0000000..054a020
--- /dev/null
+++ b/tests/QtUiTools/bug_376.py
@@ -0,0 +1,19 @@
+import unittest
+import os
+from helper import UsesQApplication
+
+from PySide import QtCore, QtGui
+from PySide.QtUiTools import QUiLoader
+
+class BugTest(UsesQApplication):
+    def testCase(self):
+        w = QtGui.QWidget()
+        loader = QUiLoader()
+
+        filePath = os.path.join(os.path.dirname(__file__), 'test.ui')
+        result = loader.load(filePath, w)
+        self.assert_(isinstance(result.child_object, QtGui.QFrame))
+
+if __name__ == '__main__':
+    unittest.main()
+
diff --git a/tests/QtUiTools/bug_392.py b/tests/QtUiTools/bug_392.py
new file mode 100644
index 0000000..c6e751f
--- /dev/null
+++ b/tests/QtUiTools/bug_392.py
@@ -0,0 +1,47 @@
+import unittest
+import os
+from helper import UsesQApplication
+
+from PySide import QtGui
+from PySide.QtUiTools import QUiLoader
+
+class MyWidget(QtGui.QComboBox):
+    def __init__(self, parent=None):
+        QtGui.QComboBox.__init__(self, parent)
+
+    def isPython(self):
+        return True
+
+class BugTest(UsesQApplication):
+    def testCase(self):
+        w = QtGui.QWidget()
+        loader = QUiLoader()
+
+        filePath = os.path.join(os.path.dirname(__file__), 'action.ui')
+        result = loader.load(filePath, w)
+        self.assert_(isinstance(result.actionFoo, QtGui.QAction))
+
+    def testPythonCustomWidgets(self):
+        w = QtGui.QWidget()
+        loader = QUiLoader()
+        loader.registerCustomWidget(MyWidget)
+
+        filePath = os.path.join(os.path.dirname(__file__), 'pycustomwidget.ui')
+        result = loader.load(filePath, w)
+        self.assert_(isinstance(result.custom, MyWidget))
+        self.assert_(result.custom.isPython())
+
+    def testPythonCustomWidgetsTwice(self):
+        w = QtGui.QWidget()
+        loader = QUiLoader()
+        loader.registerCustomWidget(MyWidget)
+
+        filePath = os.path.join(os.path.dirname(__file__), 'pycustomwidget2.ui')
+        result = loader.load(filePath, w)
+        self.assert_(isinstance(result.custom, MyWidget))
+        self.assert_(isinstance(result.custom2, MyWidget))
+        self.assert_(result.custom.isPython())
+
+if __name__ == '__main__':
+    unittest.main()
+
diff --git a/tests/QtUiTools/bug_426.py b/tests/QtUiTools/bug_426.py
new file mode 100644
index 0000000..11e2631
--- /dev/null
+++ b/tests/QtUiTools/bug_426.py
@@ -0,0 +1,18 @@
+import sys
+import os
+from PySide import QtCore, QtGui
+from PySide.QtUiTools import QUiLoader
+
+class Window(object):
+    def __init__(self):
+        loader = QUiLoader()
+        filePath = os.path.join(os.path.dirname(__file__), 'bug_426.ui')
+        self.widget = loader.load(filePath)
+        self.group = QtGui.QActionGroup(self.widget)
+        self.widget.show()
+        QtCore.QTimer.singleShot(0, self.widget.close)
+
+if __name__ == "__main__":
+    app = QtGui.QApplication(sys.argv)
+    win = Window()
+    sys.exit(app.exec_())
diff --git a/tests/QtUiTools/bug_426.ui b/tests/QtUiTools/bug_426.ui
new file mode 100644
index 0000000..99353cd
--- /dev/null
+++ b/tests/QtUiTools/bug_426.ui
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>Form</class>
+ <widget class="QWidget" name="Form">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>400</width>
+    <height>300</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Form</string>
+  </property>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/tests/QtUiTools/bug_552.py b/tests/QtUiTools/bug_552.py
new file mode 100644
index 0000000..6a93040
--- /dev/null
+++ b/tests/QtUiTools/bug_552.py
@@ -0,0 +1,21 @@
+from helper import adjust_filename
+from PySide import QtGui, QtCore
+from PySide.QtUiTools import QUiLoader
+
+class View_1(QtGui.QWidget):
+
+    def __init__(self):
+        QtGui.QWidget.__init__(self)
+        loader = QUiLoader()
+        widget = loader.load(adjust_filename('bug_552.ui', __file__), self)
+        self.children = []
+        for child in widget.findChildren(QtCore.QObject, None):
+            self.children.append(child)
+        self.t = widget.tabWidget
+        self.t.removeTab(0)
+
+app = QtGui.QApplication([])
+window = View_1()
+window.show()
+
+# If it doesn't crash it works :-)
diff --git a/tests/QtUiTools/bug_552.ui b/tests/QtUiTools/bug_552.ui
new file mode 100644
index 0000000..f98da44
--- /dev/null
+++ b/tests/QtUiTools/bug_552.ui
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>Form</class>
+ <widget class="QWidget" name="Form">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>400</width>
+    <height>300</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Form</string>
+  </property>
+  <widget class="QTabWidget" name="tabWidget">
+   <property name="geometry">
+    <rect>
+     <x>130</x>
+     <y>80</y>
+     <width>139</width>
+     <height>80</height>
+    </rect>
+   </property>
+   <property name="currentIndex">
+    <number>0</number>
+   </property>
+   <widget class="QWidget" name="tab">
+    <attribute name="title">
+     <string>Tab 1</string>
+    </attribute>
+   </widget>
+   <widget class="QWidget" name="tab_2">
+    <attribute name="title">
+     <string>Tab 2</string>
+    </attribute>
+   </widget>
+  </widget>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/tests/QtUiTools/bug_797.py b/tests/QtUiTools/bug_797.py
new file mode 100644
index 0000000..f61a22f
--- /dev/null
+++ b/tests/QtUiTools/bug_797.py
@@ -0,0 +1,11 @@
+from PySide import QtUiTools
+from PySide import QtCore
+from PySide import QtGui
+from helper import adjust_filename
+
+app = QtGui.QApplication([])
+loader = QtUiTools.QUiLoader()
+file = QtCore.QFile(adjust_filename('bug_552.ui', __file__))
+w = QtGui.QWidget()
+# An exception can't be thrown
+mainWindow = loader.load(file, w)
diff --git a/tests/QtUiTools/bug_909.py b/tests/QtUiTools/bug_909.py
new file mode 100644
index 0000000..18df7b3
--- /dev/null
+++ b/tests/QtUiTools/bug_909.py
@@ -0,0 +1,24 @@
+import sys
+import unittest
+
+from PySide.QtCore import QFile
+from PySide.QtGui import QTabWidget
+from PySide.QtUiTools import QUiLoader
+
+from helper import UsesQApplication
+from helper import adjust_filename
+
+class TestDestruction(UsesQApplication):
+    def testBug909(self):
+        fileName = QFile(adjust_filename('bug_909.ui', __file__))
+        loader = QUiLoader()
+        main_win = loader.load(fileName)
+        self.assertEqual(sys.getrefcount(main_win), 2)
+        fileName.close()
+
+        tw = QTabWidget(main_win)
+        main_win.setCentralWidget(tw)
+        main_win.show()
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/tests/QtUiTools/bug_909.ui b/tests/QtUiTools/bug_909.ui
new file mode 100644
index 0000000..b07f62d
--- /dev/null
+++ b/tests/QtUiTools/bug_909.ui
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>MainWindow</class>
+ <widget class="QMainWindow" name="MainWindow">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>800</width>
+    <height>600</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>MainWindow</string>
+  </property>
+  <widget class="QWidget" name="centralwidget"/>
+  <widget class="QMenuBar" name="menubar">
+   <property name="geometry">
+    <rect>
+     <x>0</x>
+     <y>0</y>
+     <width>800</width>
+     <height>25</height>
+    </rect>
+   </property>
+  </widget>
+  <widget class="QStatusBar" name="statusbar"/>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/tests/QtUiTools/bug_913.py b/tests/QtUiTools/bug_913.py
new file mode 100644
index 0000000..f42ce4a
--- /dev/null
+++ b/tests/QtUiTools/bug_913.py
@@ -0,0 +1,23 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+import sys
+import unittest
+from helper import adjust_filename
+
+from PySide.QtCore import *
+from PySide.QtGui import *
+from PySide.QtUiTools import *
+
+class TestBug913 (unittest.TestCase):
+
+    def testIt(self):
+        app = QApplication([])
+
+        loader = QUiLoader()
+        widget = loader.load(adjust_filename('bug_913.ui', __file__))
+        widget.tabWidget.currentIndex() # direct child is available as member
+        widget.le_first.setText('foo') # child of QTabWidget must also be available!
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/tests/QtUiTools/bug_913.ui b/tests/QtUiTools/bug_913.ui
new file mode 100644
index 0000000..0fc95fd
--- /dev/null
+++ b/tests/QtUiTools/bug_913.ui
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>Form</class>
+ <widget class="QWidget" name="Form">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>400</width>
+    <height>300</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Form</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <item>
+    <widget class="QTabWidget" name="tabWidget">
+     <widget class="QWidget" name="tab">
+      <attribute name="title">
+       <string>Tab 1</string>
+      </attribute>
+      <layout class="QFormLayout" name="formLayout">
+       <item row="0" column="0">
+        <widget class="QLabel" name="label">
+         <property name="text">
+          <string>First name:</string>
+         </property>
+        </widget>
+       </item>
+       <item row="0" column="1">
+        <widget class="QLineEdit" name="le_first"/>
+       </item>
+       <item row="1" column="0">
+        <widget class="QLabel" name="label_2">
+         <property name="text">
+          <string>Last name:</string>
+         </property>
+        </widget>
+       </item>
+       <item row="1" column="1">
+        <widget class="QLineEdit" name="le_last"/>
+       </item>
+      </layout>
+     </widget>
+     <widget class="QWidget" name="tab_2">
+      <attribute name="title">
+       <string>Tab 2</string>
+      </attribute>
+     </widget>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/tests/QtUiTools/bug_958.py b/tests/QtUiTools/bug_958.py
new file mode 100644
index 0000000..07ca8b4
--- /dev/null
+++ b/tests/QtUiTools/bug_958.py
@@ -0,0 +1,24 @@
+import unittest
+from PySide import QtGui, QtUiTools
+from helper import adjust_filename
+from helper import TimedQApplication
+
+class Gui_Qt(QtGui.QMainWindow):
+    def __init__(self, parent=None):
+        super(Gui_Qt, self).__init__(parent)
+
+        lLoader = QtUiTools.QUiLoader()
+
+        # this used to cause a segfault because the old inject code used to destroy the parent layout
+        self._cw = lLoader.load(adjust_filename('bug_958.ui', __file__),  self)
+
+        self.setCentralWidget(self._cw)
+
+class BugTest(TimedQApplication):
+    def testCase(self):
+        lMain = Gui_Qt()
+        lMain.show()
+        self.app.exec_()
+
+if __name__ == "__main__":
+    unittest.main()
diff --git a/tests/QtUiTools/bug_958.ui b/tests/QtUiTools/bug_958.ui
new file mode 100644
index 0000000..57cdbdd
--- /dev/null
+++ b/tests/QtUiTools/bug_958.ui
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>customWidget</class>
+ <widget class="QWidget" name="customWidget">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>626</width>
+    <height>578</height>
+   </rect>
+  </property>
+  <property name="minimumSize">
+   <size>
+    <width>500</width>
+    <height>0</height>
+   </size>
+  </property>
+  <property name="windowTitle">
+   <string>Form</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <item>
+    <widget class="QTableWidget" name="resultTable"/>
+   </item>
+   <item>
+    <widget class="QProgressBar" name="progressBar">
+     <property name="value">
+      <number>0</number>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <layout class="QHBoxLayout" name="actionLayout">
+     <item>
+      <widget class="QPushButton" name="processButton">
+       <property name="text">
+        <string>&amp;Berechnen</string>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/tests/QtUiTools/bug_965.py b/tests/QtUiTools/bug_965.py
new file mode 100644
index 0000000..4dbd281
--- /dev/null
+++ b/tests/QtUiTools/bug_965.py
@@ -0,0 +1,20 @@
+from PySide.QtUiTools import QUiLoader
+import unittest
+
+from helper import UsesQApplication
+from helper import adjust_filename
+
+class MyQUiLoader(QUiLoader):
+    def __init__(self):
+        super(MyQUiLoader, self).__init__()
+
+    def createWidget(self, className, parent=None, name=""):
+        return None
+
+class BugTest(UsesQApplication):
+    def testCase(self):
+        loader = MyQUiLoader()
+        self.assertRaises(RuntimeError, loader.load, adjust_filename('bug_965.ui', __file__))
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/tests/QtUiTools/bug_965.ui b/tests/QtUiTools/bug_965.ui
new file mode 100644
index 0000000..e324db8
--- /dev/null
+++ b/tests/QtUiTools/bug_965.ui
@@ -0,0 +1,27 @@
+<ui version="4.0" >
+ <author></author>
+ <comment></comment>
+ <exportmacro></exportmacro>
+ <class>MainWindow</class>
+ <widget class="QMainWindow" name="MainWindow" >
+  <property name="objectName" >
+   <string notr="true" >MainWindow</string>
+  </property>
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>800</width>
+    <height>600</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string>MainWindow</string>
+  </property>
+  <widget class="QMenuBar" name="menubar" />
+  <widget class="QWidget" name="centralwidget" />
+  <widget class="QStatusBar" name="statusbar" />
+ </widget>
+ <pixmapfunction></pixmapfunction>
+ <connections/>
+</ui>
diff --git a/tests/QtUiTools/minimal.ui b/tests/QtUiTools/minimal.ui
new file mode 100644
index 0000000..c6bb70c
--- /dev/null
+++ b/tests/QtUiTools/minimal.ui
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>Form</class>
+ <widget class="QFrame" name="Form">
+ </widget>
+</ui>
diff --git a/tests/QtUiTools/pycustomwidget.ui b/tests/QtUiTools/pycustomwidget.ui
new file mode 100644
index 0000000..c066153
--- /dev/null
+++ b/tests/QtUiTools/pycustomwidget.ui
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>qwidget</class>
+ <widget class="QWidget" name="qwidget">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>400</width>
+    <height>300</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string/>
+  </property>
+  <widget class="MyWidget" name="custom">
+   <property name="geometry">
+    <rect>
+     <x>10</x>
+     <y>10</y>
+     <width>79</width>
+     <height>23</height>
+    </rect>
+   </property>
+  </widget>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>MyWidget</class>
+   <extends>QComboBox</extends>
+   <header>customwidget</header>
+  </customwidget>
+ </customwidgets>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/tests/QtUiTools/pycustomwidget2.ui b/tests/QtUiTools/pycustomwidget2.ui
new file mode 100644
index 0000000..8826ac1
--- /dev/null
+++ b/tests/QtUiTools/pycustomwidget2.ui
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>qwidget</class>
+ <widget class="QWidget" name="qwidget">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>400</width>
+    <height>300</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string/>
+  </property>
+
+  <widget class="MyWidget" name="custom">
+   <property name="geometry">
+    <rect>
+     <x>10</x>
+     <y>10</y>
+     <width>79</width>
+     <height>23</height>
+    </rect>
+   </property>
+  </widget>
+
+ <widget class="MyWidget" name="custom2">
+   <property name="geometry">
+    <rect>
+     <x>10</x>
+     <y>10</y>
+     <width>79</width>
+     <height>23</height>
+    </rect>
+   </property>
+ </widget>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>MyWidget</class>
+   <extends>QComboBox</extends>
+   <header>customwidget</header>
+  </customwidget>
+ </customwidgets>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/tests/qtuitools/test.ui b/tests/QtUiTools/test.ui
similarity index 100%
rename from tests/qtuitools/test.ui
rename to tests/QtUiTools/test.ui
diff --git a/tests/qtuitools/ui_test.py b/tests/QtUiTools/ui_test.py
similarity index 100%
rename from tests/qtuitools/ui_test.py
rename to tests/QtUiTools/ui_test.py
diff --git a/tests/qtuitools/uiloader_test.py b/tests/QtUiTools/uiloader_test.py
similarity index 56%
rename from tests/qtuitools/uiloader_test.py
rename to tests/QtUiTools/uiloader_test.py
index fe3725b..09bc5bd 100644
--- a/tests/qtuitools/uiloader_test.py
+++ b/tests/QtUiTools/uiloader_test.py
@@ -2,8 +2,8 @@ import unittest
 import os
 from helper import UsesQApplication
 
-from PySide.QtGui import *
-from PySide.QtUiTools import *
+from PySide.QtGui import QWidget
+from PySide.QtUiTools import QUiLoader
 
 def get_file_path():
     for path in file_path:
@@ -25,6 +25,19 @@ class QUioaderTeste(UsesQApplication):
         self.assertNotEqual(child, None)
         self.assertEqual(w.findChild(QWidget, "grandson_object"), child.findChild(QWidget, "grandson_object"))
 
+    def testLoadFileUnicodeFilePath(self):
+        filePath = str(os.path.join(os.path.dirname(__file__), 'test.ui'))
+        loader = QUiLoader()
+        parent = QWidget()
+        w = loader.load(filePath, parent)
+        self.assertNotEqual(w, None)
+
+        self.assertEqual(len(parent.children()), 1)
+
+        child = w.findChild(QWidget, "child_object")
+        self.assertNotEqual(child, None)
+        self.assertEqual(w.findChild(QWidget, "grandson_object"), child.findChild(QWidget, "grandson_object"))
+
 if __name__ == '__main__':
     unittest.main()
 
diff --git a/tests/QtWebKit/CMakeLists.txt b/tests/QtWebKit/CMakeLists.txt
new file mode 100644
index 0000000..7fab647
--- /dev/null
+++ b/tests/QtWebKit/CMakeLists.txt
@@ -0,0 +1,11 @@
+PYSIDE_TEST(bug_448.py)
+PYSIDE_TEST(bug_694.py)
+PYSIDE_TEST(bug_803.py)
+PYSIDE_TEST(bug_899.py)
+PYSIDE_TEST(bug_959.py)
+PYSIDE_TEST(qvariantlist_property_test.py)
+PYSIDE_TEST(qml_plugin_test.py)
+PYSIDE_TEST(shouldInterruptjavascript_test.py)
+PYSIDE_TEST(webpage_test.py)
+PYSIDE_TEST(webview_test.py)
+PYSIDE_TEST(webframe_test.py)
diff --git a/tests/QtWebKit/bug_448.py b/tests/QtWebKit/bug_448.py
new file mode 100644
index 0000000..10780ce
--- /dev/null
+++ b/tests/QtWebKit/bug_448.py
@@ -0,0 +1,20 @@
+
+'''Test cases for bug: http://bugs.openbossa.org/show_bug.cgi?id=448'''
+
+import unittest
+import sys
+
+from PySide.QtGui import QApplication
+from PySide.QtWebKit import QWebView
+
+class Bug448(unittest.TestCase):
+    def onError(self, erros):
+        pass
+
+    def testReturnOwnership(self):
+        app = QApplication(sys.argv)
+        webview = QWebView()
+        webview.page().networkAccessManager().sslErrors.connect(self.onError)
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/tests/QtWebKit/bug_694.py b/tests/QtWebKit/bug_694.py
new file mode 100644
index 0000000..f4e0e0c
--- /dev/null
+++ b/tests/QtWebKit/bug_694.py
@@ -0,0 +1,50 @@
+import sys
+import unittest
+from PySide.QtCore import *
+from PySide.QtGui import *
+from PySide.QtWebKit import *
+
+class ErrorPage (QWebPage):
+
+    def __init__(self):
+        QWebPage.__init__(self)
+        self.rcv_extension = None
+        self.rcv_url = None
+        self.rcv_url_copy = None
+        self.rcv_option_type = None
+        self.rcv_output_type = None
+
+
+    def supportsExtension(self, extension):
+        return extension == QWebPage.ErrorPageExtension
+
+    def extension(self, extension, option, output):
+        self.rcv_extension = extension
+        self.rcv_url = option.url
+        self.rcv_url_copy = QUrl(option.url)
+        self.rcv_option_type = type(option)
+        self.rcv_output_type = type(output)
+        return True
+
+class TestWebPageExtension(unittest.TestCase):
+    def testIt(self):
+        app = QApplication([])
+        ep = ErrorPage()
+        view = QWebView()
+        view.setPage(ep)
+        view.load("foo://bar") # Some malformmed url
+        view.show()
+
+        # If the timeout is 0 the webpage isn't even loaded on Qt4.6-i386, so we use 100 :-)
+        QTimer.singleShot(100, app.quit)
+        app.exec_()
+
+        self.assertEqual(ep.rcv_extension, QWebPage.ErrorPageExtension)
+        self.assertRaises(RuntimeError, ep.rcv_url.__str__)
+
+        self.assertEqual(ep.rcv_url_copy, "foo://bar")
+        self.assertEqual(ep.rcv_option_type, QWebPage.ErrorPageExtensionOption)
+        self.assertEqual(ep.rcv_output_type, QWebPage.ErrorPageExtensionReturn)
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/tests/QtWebKit/bug_803.py b/tests/QtWebKit/bug_803.py
new file mode 100644
index 0000000..95fd546
--- /dev/null
+++ b/tests/QtWebKit/bug_803.py
@@ -0,0 +1,18 @@
+import unittest
+from PySide.QtGui import *
+from PySide.QtWebKit import *
+
+class TestBug803 (unittest.TestCase):
+
+    def testIt(self):
+        app = QApplication([])
+        page = QWebPage()
+        frame = page.mainFrame()
+        frame.setHtml("<html><head></head><body><p>1</p><p>2</p></body></html>")
+        elems = frame.findAllElements("p")
+        self.assertEqual(len(elems), 2)
+        self.assertEqual(elems[0].toPlainText(), "1")
+        self.assertEqual(elems[1].toPlainText(), "2")
+
+if __name__ == "__main__":
+    unittest.main()
diff --git a/tests/QtWebKit/bug_899.py b/tests/QtWebKit/bug_899.py
new file mode 100644
index 0000000..f4daaab
--- /dev/null
+++ b/tests/QtWebKit/bug_899.py
@@ -0,0 +1,36 @@
+import unittest
+from PySide.QtCore import Property, QObject
+from PySide.QtWebKit import QWebView
+from helper import TimedQApplication
+
+class TestLambdaPropery(TimedQApplication):
+
+    def testBug899(self):
+        html = '''
+        <html><body>
+        <script type="text/javascript">
+        document.write("<p>"+py_obj.list1+"</p>")
+        document.write("<p>"+py_obj.list2+"</p>")
+        </script>
+        </body></html>
+        '''
+
+        class Obj(object):
+            list1 = ['foo', 'bar', 'baz']
+            list2 = ['fi', 'fo', 'fum']
+
+        obj = Obj()
+
+        wrapper_dict = {}
+        for name in ('list1', 'list2'):
+            getter = lambda arg=None, name=name: getattr(obj, name)
+            wrapper_dict[name] = Property('QVariantList', getter)
+        wrapper = type('PyObj', (QObject,), wrapper_dict)
+
+        view = QWebView()
+        view.page().mainFrame().addToJavaScriptWindowObject('py_obj', wrapper())
+        view.setHtml(html)
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/tests/QtWebKit/bug_959.py b/tests/QtWebKit/bug_959.py
new file mode 100644
index 0000000..e3cc36c
--- /dev/null
+++ b/tests/QtWebKit/bug_959.py
@@ -0,0 +1,90 @@
+from PySide.QtCore import QObject, Slot, QTimer
+from PySide.QtWebKit import QWebView
+
+import unittest
+from helper import UsesQApplication
+
+functionID = -1
+
+class JSFuncs(QObject):
+    @Slot(str,result=str)
+    def slot_str_str(self, x):
+        global functionID
+        functionID = 0
+        return x.upper()
+
+    @Slot(str,result='QVariant')
+    def slot_str_list(self, x):
+        global functionID
+        functionID = 1
+        return [x, x]
+
+    @Slot('QStringList',result=str)
+    def slot_strlist_str(self, x):
+        global functionID
+        functionID = 2
+        return x[-1]
+
+    @Slot('QVariant',result=str)
+    def slot_variant_str(self, x):
+        global functionID
+        functionID = 3
+        return str(x)
+
+    @Slot('QVariantList',result=str)
+    def slot_variantlist_str(self, x):
+        global functionID
+        functionID = 4
+        return str(x[-1])
+
+    @Slot('QVariantMap',result=str)
+    def slot_variantmap_str(self, x):
+        global functionID
+        functionID = 5
+        return str(x["foo"])
+
+
+
+PAGE_DATA = "data:text/html,<!doctype html><html><body onload='%s'></body></html>"
+FUNCTIONS_LIST = ['jsfuncs.slot_str_str("hello")',
+                  'jsfuncs.slot_str_list("hello")',
+                  'jsfuncs.slot_strlist_str(["hello","world"])',
+                  'jsfuncs.slot_variant_str("hello")',
+                  'jsfuncs.slot_variantlist_str(["hello","world"])',
+                  'jsfuncs.slot_variantmap_str({"foo": "bar"})']
+
+
+class TestJsCall(UsesQApplication):
+
+    @classmethod
+    def setUpClass(self):
+        super(TestJsCall, self).setUpClass()
+
+    def createInstance(self):
+        global functionID
+        self._view = QWebView()
+        self._jsfuncs = JSFuncs()
+        functionID = -1
+        self._view.page().mainFrame().addToJavaScriptWindowObject("jsfuncs", self._jsfuncs)
+        self._view.loadFinished[bool].connect(self.onLoadFinished)
+        self._view.load(PAGE_DATA % FUNCTIONS_LIST[self._functionID])
+        self._view.show()
+
+    def testJsCall(self):
+        self._functionID = 0
+        self.createInstance()
+        self.app.exec_()
+
+    def onLoadFinished(self, result):
+        global functionID
+        self.assertEqual(self._functionID, functionID)
+        if self._functionID == (len(FUNCTIONS_LIST) - 1):
+            QTimer.singleShot(300, self.app.quit)
+        else:
+            #new test
+            self._functionID += 1
+            self.createInstance()
+
+
+if __name__ == "__main__":
+    unittest.main()
diff --git a/tests/qtwebkit/fox.html b/tests/QtWebKit/fox.html
similarity index 66%
rename from tests/qtwebkit/fox.html
rename to tests/QtWebKit/fox.html
index e7691eb..da873b1 100644
--- a/tests/qtwebkit/fox.html
+++ b/tests/QtWebKit/fox.html
@@ -1,5 +1,6 @@
 <html>
 <title>Title</title>
+<meta name="description" content="PySide Test METADATA." />
 <body>
 <p>The quick <b>brown</b> fox <i>jumps</i> over the lazy dog.</p>
 </body>
diff --git a/tests/QtWebKit/qml_plugin_test.py b/tests/QtWebKit/qml_plugin_test.py
new file mode 100644
index 0000000..1a7b703
--- /dev/null
+++ b/tests/QtWebKit/qml_plugin_test.py
@@ -0,0 +1,61 @@
+
+import os
+import sys
+import unittest
+
+from PySide.QtCore import QUrl, QTimer
+from PySide.QtGui import QApplication, QLabel
+from PySide.QtWebKit import QWebPluginFactory, QWebView, QWebSettings
+
+from helper import UsesQApplication
+
+class PluginFactory(QWebPluginFactory):
+
+    def plugins(self):
+        plugins = []
+
+        mime = self.MimeType()
+        mime.name = 'DummyFile'
+        mime.fileExtensions = ['.pys']
+
+        plugin = self.Plugin()
+        plugin.name = 'DummyPlugin'
+        plugin.mimeTypes = [mime]
+
+        plugins.append(plugin)
+
+        return plugins
+
+    def create(self, mimeType, url, argumentNames, argumentValues):
+        if mimeType != 'application/x-dummy':
+            return None
+
+        for name, value in zip(argumentNames, argumentValues):
+            if name == 'text':
+                text = value
+        else:
+            text = "Webkit plugins!"
+
+        widget = QLabel(text)
+        return widget
+
+class TestPlugin(UsesQApplication):
+
+    def testPlugin(self):
+        view = QWebView()
+        fac = PluginFactory()
+        view.page().setPluginFactory(fac)
+        QWebSettings.globalSettings().setAttribute(QWebSettings.PluginsEnabled, True)
+
+        view.load(QUrl(os.path.join(os.path.abspath(os.path.dirname(__file__)), 'qmlplugin', 'index.html')))
+
+        view.resize(840, 600)
+        view.show()
+
+        QTimer.singleShot(500, self.app.quit)
+
+        self.app.exec_()
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/tests/QtWebKit/qmlplugin/dummy.pys b/tests/QtWebKit/qmlplugin/dummy.pys
new file mode 100644
index 0000000..0b7469d
--- /dev/null
+++ b/tests/QtWebKit/qmlplugin/dummy.pys
@@ -0,0 +1 @@
+Foobar!
diff --git a/tests/QtWebKit/qmlplugin/index.html b/tests/QtWebKit/qmlplugin/index.html
new file mode 100644
index 0000000..db0d6b5
--- /dev/null
+++ b/tests/QtWebKit/qmlplugin/index.html
@@ -0,0 +1,5 @@
+<html><body>
+    <h1>Custom Plugin</h1>
+    <object type="application/x-dummy" data="./dummy.pys" text="My text">
+    </object>
+</body></html>
diff --git a/tests/QtWebKit/qvariantlist_property_test.py b/tests/QtWebKit/qvariantlist_property_test.py
new file mode 100644
index 0000000..33ffc1d
--- /dev/null
+++ b/tests/QtWebKit/qvariantlist_property_test.py
@@ -0,0 +1,43 @@
+import unittest
+from PySide.QtCore import Property, QObject
+from PySide.QtWebKit import QWebView
+from helper import TimedQApplication
+
+class TestLoadFinished(TimedQApplication):
+
+    def setUp(self):
+        TimedQApplication.setUp(self, timeout=1000)
+
+    def tearDown(self):
+        TimedQApplication.tearDown(self)
+
+    def testQVariantListProperty(self):
+        class Obj(object):
+            list = ['foo', 'bar', 'baz']
+
+        obj = Obj()
+
+        wrapper_dict = {}
+        for name in ['list']:
+            getter = lambda arg=None, name=name: getattr(obj, name)
+            wrapper_dict[name] = Property('QVariantList', getter)
+        wrapper = type('PyObj', (QObject,), wrapper_dict)
+
+        view = QWebView()
+        frame = view.page().mainFrame()
+        frame.addToJavaScriptWindowObject('py_obj', wrapper())
+
+        html = '''
+        <html><body>
+        <script type="text/javascript">
+        document.write(py_obj.list)
+        </script>
+        </body></html>
+        '''
+        view.setHtml(html)
+        view.show()
+        self.app.exec_()
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/tests/QtWebKit/shouldInterruptjavascript_test.py b/tests/QtWebKit/shouldInterruptjavascript_test.py
new file mode 100644
index 0000000..b624220
--- /dev/null
+++ b/tests/QtWebKit/shouldInterruptjavascript_test.py
@@ -0,0 +1,28 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+import unittest
+from PySide import QtCore, QtWebKit
+
+from helper import UsesQApplication
+
+class QWebPageHeadless(QtWebKit.QWebPage):
+    # FIXME: This is not working, the slot is not overriden!
+    # http://doc.qt.nokia.com/4.7-snapshot/qwebpage.html#shouldInterruptJavaScript
+    @QtCore.Slot()
+    def shouldInterruptJavaScript(self):
+        self._interrupted = True
+        QtCore.QTimer.singleShot(300, self._app.quit)
+        return True
+
+class TestSlotOverride(UsesQApplication):
+    def testFunctionCall(self):
+        page = QWebPageHeadless()
+        page._interrupted = False
+        page._app = self.app
+        page.mainFrame().setHtml('<script>while(1);</script>')
+        self.app.exec_()
+        self.assertTrue(page._interrupted)
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/tests/QtWebKit/webframe_test.py b/tests/QtWebKit/webframe_test.py
new file mode 100644
index 0000000..596617d
--- /dev/null
+++ b/tests/QtWebKit/webframe_test.py
@@ -0,0 +1,34 @@
+import unittest
+import sys
+
+from PySide.QtCore import QObject, SIGNAL, QUrl
+from PySide.QtWebKit import *
+from PySide.QtNetwork import QNetworkRequest
+
+from helper import adjust_filename, UsesQApplication
+
+
+
+class TestWebFrame(UsesQApplication):
+    def load_finished(self, ok):
+        self.assert_(ok)
+        page = self.view.page()
+        self.assert_(page)
+        frame = page.mainFrame()
+        self.assert_(frame)
+        meta = frame.metaData()
+        self.assertEqual(meta['description'], ['PySide Test METADATA.'])
+        self.app.quit()
+
+    def testMetaData(self):
+        self.view = QWebView()
+        QObject.connect(self.view, SIGNAL('loadFinished(bool)'),
+                        self.load_finished)
+        url = QUrl.fromLocalFile(adjust_filename('fox.html', __file__))
+        self.view.setUrl(url)
+        self.app.exec_()
+
+
+if __name__ == '__main__':
+    unittest.main()
+
diff --git a/tests/qtwebkit/webpage_test.py b/tests/QtWebKit/webpage_test.py
similarity index 100%
rename from tests/qtwebkit/webpage_test.py
rename to tests/QtWebKit/webpage_test.py
diff --git a/tests/qtwebkit/webview_test.py b/tests/QtWebKit/webview_test.py
similarity index 57%
rename from tests/qtwebkit/webview_test.py
rename to tests/QtWebKit/webview_test.py
index c06e437..591d072 100644
--- a/tests/qtwebkit/webview_test.py
+++ b/tests/QtWebKit/webview_test.py
@@ -2,13 +2,20 @@
 '''Test cases for QWebView'''
 
 import unittest
+import py3kcompat as py3k
+import sys
 
 from PySide.QtCore import QObject, SIGNAL, QUrl
-from PySide.QtWebKit import QWebView
+from PySide.QtWebKit import QWebPage, QWebView
+from PySide.QtNetwork import QNetworkRequest
 
 from helper import adjust_filename, TimedQApplication
 
 
+class testWebPage(QWebPage):
+    def sayMyName(self):
+        return 'testWebPage'
+
 class TestLoadFinished(TimedQApplication):
     '''Test case for signal QWebView.loadFinished(bool)'''
 
@@ -33,6 +40,23 @@ class TestLoadFinished(TimedQApplication):
 
         self.assert_(self.called)
 
+    def testSetPageAndGetPage(self):
+        twp = testWebPage()
+        self.view.setPage(twp)
+        del twp
+        p = self.view.page()
+        self.assertEqual(p.sayMyName(), 'testWebPage')
+
+        # Setting the same webpage should not incref the python obj
+        refCount = sys.getrefcount(p)
+        self.view.setPage(p)
+        self.assertEquals(sys.getrefcount(p), refCount)
+
+        # Changing the webpage obj should decref the old one
+        twp2 = testWebPage()
+        self.view.setPage(twp2)
+        self.assertEquals(sys.getrefcount(p), refCount - 1)
+
     def load_finished(self, ok):
         #Callback to check if load was successful
         self.app.quit()
diff --git a/tests/QtXml/CMakeLists.txt b/tests/QtXml/CMakeLists.txt
new file mode 100644
index 0000000..2c21bf8
--- /dev/null
+++ b/tests/QtXml/CMakeLists.txt
@@ -0,0 +1,2 @@
+PYSIDE_TEST(qdomdocument_test.py)
+PYSIDE_TEST(qxmlsimplereader_test.py)
diff --git a/tests/qtxml/qdomdocument_test.py b/tests/QtXml/qdomdocument_test.py
similarity index 100%
rename from tests/qtxml/qdomdocument_test.py
rename to tests/QtXml/qdomdocument_test.py
diff --git a/tests/qtxml/qxmlsimplereader_test.py b/tests/QtXml/qxmlsimplereader_test.py
similarity index 96%
rename from tests/qtxml/qxmlsimplereader_test.py
rename to tests/QtXml/qxmlsimplereader_test.py
index 6c4d3f4..aaaf45a 100644
--- a/tests/qtxml/qxmlsimplereader_test.py
+++ b/tests/QtXml/qxmlsimplereader_test.py
@@ -28,6 +28,7 @@ class QXmlSimpleReaderTest(unittest.TestCase):
         reader = QXmlSimpleReader()
         prop, ok = reader.property('foo')
         self.assertEqual((prop, ok), (None, False))
+        reader.setProperty('foo', 'Something')
 
 if __name__ == '__main__':
     unittest.main()
diff --git a/tests/QtXmlPatterns/CMakeLists.txt b/tests/QtXmlPatterns/CMakeLists.txt
new file mode 100644
index 0000000..7f570f1
--- /dev/null
+++ b/tests/QtXmlPatterns/CMakeLists.txt
@@ -0,0 +1 @@
+PYSIDE_TEST(import_test.py)
diff --git a/tests/qtxmlpatterns/import_test.py b/tests/QtXmlPatterns/import_test.py
similarity index 100%
rename from tests/qtxmlpatterns/import_test.py
rename to tests/QtXmlPatterns/import_test.py
diff --git a/tests/mac/CMakeLists.txt b/tests/mac/CMakeLists.txt
new file mode 100644
index 0000000..e1eb1a2
--- /dev/null
+++ b/tests/mac/CMakeLists.txt
@@ -0,0 +1 @@
+PYSIDE_TEST(qmacstyle_test.py)
diff --git a/tests/mac/qmacstyle_test.py b/tests/mac/qmacstyle_test.py
new file mode 100644
index 0000000..34777d9
--- /dev/null
+++ b/tests/mac/qmacstyle_test.py
@@ -0,0 +1,14 @@
+from PySide.QtGui import QApplication, QLabel, QMacStyle
+from PySide.QtCore import QObject
+
+import unittest
+
+from helper import UsesQApplication
+
+class QMacStyleTest(UsesQApplication):
+    def testWidgetStyle(self):
+        w = QLabel('Hello')
+        self.assertTrue(isinstance(w.style(), QMacStyle))
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/tests/manually/README.txt b/tests/manually/README.txt
new file mode 100644
index 0000000..da20e38
--- /dev/null
+++ b/tests/manually/README.txt
@@ -0,0 +1,5 @@
+To run these tests is necessary some manuall input (most of then not supported by QTest[1]),
+because of that this is not part of automatic test context.
+
+
+[1]http://bugreports.qt.nokia.com/browse/QTBUG-13397
diff --git a/tests/manually/bug_841.py b/tests/manually/bug_841.py
new file mode 100644
index 0000000..08de09e
--- /dev/null
+++ b/tests/manually/bug_841.py
@@ -0,0 +1,48 @@
+import sys
+
+from PySide.QtGui import QStandardItem, QStandardItemModel, QMainWindow, QTreeView, QAbstractItemView, QApplication, QMessageBox
+
+class Item(QStandardItem):
+    def __init__(self, text):
+        super(Item, self).__init__()
+        self.setText(text)
+        self.setDragEnabled(True)
+        self.setDropEnabled(True)
+
+    def clone(self):
+        ret = Item(self.text())
+        return ret
+
+class Project(QStandardItemModel):
+    def __init__(self):
+        super(Project, self).__init__()
+        self.setItemPrototype(Item("Prototype"))
+        # add some items so we have stuff to move around
+        self.appendRow(Item("ABC"))
+        self.appendRow(Item("DEF"))
+        self.appendRow(Item("GHI"))
+
+class MainWindow(QMainWindow):
+    def __init__(self):
+        super(MainWindow, self).__init__()
+
+        self.model = Project()
+        self.view = QTreeView(self)
+        self.view.setModel(self.model)
+        self.view.setDragEnabled(True)
+        self.view.setDragDropMode(QAbstractItemView.InternalMove)
+        self.setCentralWidget(self.view)
+
+    def mousePressEvent(self, e):
+        print e.x(), e.y()
+        return QMainWindow.mousePressEvent(self, e)
+
+def main():
+    app = QApplication(sys.argv)
+    w = MainWindow()
+    w.show()
+    QMessageBox.information(None, "Info", "Just drag and drop the items.")
+    sys.exit(app.exec_())
+
+if __name__ == "__main__":
+    main()
diff --git a/tests/phonon/CMakeLists.txt b/tests/phonon/CMakeLists.txt
new file mode 100644
index 0000000..b325b59
--- /dev/null
+++ b/tests/phonon/CMakeLists.txt
@@ -0,0 +1,9 @@
+if (NOT WIN32 OR NOT ${QTVERSION} VERSION_EQUAL 4.7.1)
+    # Any usage of Phonon::createPath will fail on Win32 and Qt 4.7.1.
+    # Check: http://bugreports.qt.nokia.com/browse/QTBUG-13062
+    PYSIDE_TEST(basic_playing_test.py)
+endif()
+PYSIDE_TEST(bug_328.py)
+PYSIDE_TEST(bug_786.py)
+PYSIDE_TEST(capabilities_test.py)
+PYSIDE_TEST(qobjectdescription_test.py)
diff --git a/tests/phonon/basic_playing_test.py b/tests/phonon/basic_playing_test.py
old mode 100755
new mode 100644
index fe295e8..d766427
--- a/tests/phonon/basic_playing_test.py
+++ b/tests/phonon/basic_playing_test.py
@@ -1,34 +1,35 @@
 
 import os
 import unittest
-
-from PySide import QtCore
-from PySide import phonon
-
+from PySide.phonon import Phonon
 from helper import UsesQCoreApplication
 
-# XXX Hack to get the correct filename
-example_file = os.path.join(os.path.dirname(__file__),'tone.ogg')
+sample_file = os.path.join(os.path.dirname(__file__), 'tone.wav')
+
+def checkBackendCapabilities(func):
+    def function(self, *args, **kw):
+        if Phonon.BackendCapabilities.isMimeTypeAvailable('audio/x-wav'):
+            func(self, *args, **kw)
+        else:
+            print('Wav format not supported! Playback test skipped!')
+    return function
+
 
 class TestSimplePlaying(UsesQCoreApplication):
     def setUp(self):
         super(TestSimplePlaying, self).setUp()
         self.app.setApplicationName('Dummy')
-        self.source = phonon.Phonon.MediaSource(example_file)
-        self.media = phonon.Phonon.MediaObject()
+        self.source = Phonon.MediaSource(sample_file)
+        self.media = Phonon.MediaObject()
         self.media.setCurrentSource(self.source)
 
-        QtCore.QObject.connect(self.media,
-                QtCore.SIGNAL('finished()'),
-                self.app,
-                QtCore.SLOT('quit()'))
-
+        self.media.finished.connect(self.app.quit)
         self.called = False
 
         # prevent locking with:
         # request to play a stream, but no valid audio ...
-        self.output = phonon.Phonon.AudioOutput()
-        self.path = phonon.Phonon.createPath(self.media, self.output)
+        self.output = Phonon.AudioOutput()
+        self.path = Phonon.createPath(self.media, self.output)
 
     def tearDown(self):
         super(TestSimplePlaying, self).tearDown()
@@ -37,6 +38,7 @@ class TestSimplePlaying(UsesQCoreApplication):
         del self.media
         del self.source
 
+    @checkBackendCapabilities
     def testFinishedSignal(self):
         # Should pass if finished() is called
         self.media.play()
@@ -53,14 +55,14 @@ class TestSimplePlaying(UsesQCoreApplication):
     def state_cb(self, newState, OldState):
         self.called = True
 
+    @checkBackendCapabilities
     def testStateChanged(self):
-        QtCore.QObject.connect(self.media,
-                QtCore.SIGNAL('stateChanged(Phonon::State, Phonon::State)'),
-                self.state_cb)
-
+        self.media.stateChanged['Phonon::State', 'Phonon::State'].connect(self.state_cb)
         self.media.play()
         self.app.exec_()
-        self.assert_(self.called)
+        self.assertTrue(self.called)
+
 
 if __name__ == '__main__':
     unittest.main()
+
diff --git a/tests/phonon/bug_328.py b/tests/phonon/bug_328.py
new file mode 100644
index 0000000..4171b3f
--- /dev/null
+++ b/tests/phonon/bug_328.py
@@ -0,0 +1,18 @@
+#!/usr/bin/python
+
+from PySide import QtCore, QtGui
+from PySide.phonon import Phonon
+import unittest
+
+class TestBug(unittest.TestCase):
+    def myCB(self):
+        pass
+
+    def testForNotifierSignals(self):
+        # this test only check if the signals are present
+        notifier = Phonon.BackendCapabilities.Notifier()
+        notifier.capabilitiesChanged.connect(self.myCB)
+        notifier.availableAudioOutputDevicesChanged.connect(self.myCB)
+
+        self.assert_(True)
+
diff --git a/tests/phonon/bug_786.py b/tests/phonon/bug_786.py
new file mode 100644
index 0000000..217ffa7
--- /dev/null
+++ b/tests/phonon/bug_786.py
@@ -0,0 +1,23 @@
+import unittest
+from PySide.QtGui import *
+from PySide.phonon import *
+
+
+class TestBug786 (unittest.TestCase):
+
+    def testIt(self):
+        app = QApplication([])
+        app.setApplicationName("PySide Phonon Unit Test")
+        devices = Phonon.BackendCapabilities.availableAudioOutputDevices()
+        if len(devices) > 1:
+            if devices[0].index() != devices[0].index():
+                self.assertNotEqual(devices[0], devices[1])
+            self.assertEqual(devices[0], devices[0])
+
+        effects = Phonon.BackendCapabilities.availableAudioEffects()
+        if len(effects) > 1:
+            self.assertNotEqual(effects[0], effects[1])
+            self.assertEqual(effects[0], effects[0])
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/tests/phonon/capabilities_test.py b/tests/phonon/capabilities_test.py
index 5f4b7da..cc11a55 100644
--- a/tests/phonon/capabilities_test.py
+++ b/tests/phonon/capabilities_test.py
@@ -1,7 +1,7 @@
 
 import unittest
+import py3kcompat as py3k
 
-from PySide.QtCore import QString
 from PySide import phonon
 
 from helper import UsesQCoreApplication
@@ -16,33 +16,33 @@ class CapabilitiesTest(UsesQCoreApplication):
 
 
     def testExists(self):
-        self.assert_(phonon.Phonon.BackendCapabilities)
+        self.assertTrue(phonon.Phonon.BackendCapabilities)
 
     def testNotifierIdentity(self):
         # Notifier is a singleton
         self.assertEqual(phonon.Phonon.BackendCapabilities.notifier(),
                          phonon.Phonon.BackendCapabilities.notifier())
 
-        self.assert_(phonon.Phonon.BackendCapabilities.notifier() is
+        self.assertTrue(phonon.Phonon.BackendCapabilities.notifier() is
                      phonon.Phonon.BackendCapabilities.notifier())
 
     def testDevices(self):
         # TODO Improve this test
         devices = phonon.Phonon.BackendCapabilities.availableAudioOutputDevices()
         for device in devices:
-            self.assert_(isinstance(device, phonon.Phonon.AudioOutputDevice))
+            self.assertTrue(isinstance(device, phonon.Phonon.AudioOutputDevice))
 
     def testMimeTypes(self):
         # TODO Improve this test
         mimeTypes = phonon.Phonon.BackendCapabilities.availableMimeTypes()
         for mime in mimeTypes:
-            self.assert_(isinstance(mime, QString))
+            self.assertTrue(isinstance(mime, py3k.unicode))
 
     def testAudioEffects(self):
         # TODO Improve this test
         effects = phonon.Phonon.BackendCapabilities.availableAudioEffects()
         for effect in effects:
-            self.assert_(isinstance(effect, phonon.Phonon.EffectDescription))
+            self.assertTrue(isinstance(effect, phonon.Phonon.EffectDescription))
 
 if __name__ == '__main__':
     unittest.main()
diff --git a/tests/phonon/qobjectdescription_test.py b/tests/phonon/qobjectdescription_test.py
new file mode 100644
index 0000000..7312ee3
--- /dev/null
+++ b/tests/phonon/qobjectdescription_test.py
@@ -0,0 +1,18 @@
+import unittest
+
+from PySide.QtCore import *
+from PySide import phonon
+
+from helper import UsesQCoreApplication
+
+class CapabilitiesTest(UsesQCoreApplication):
+    def testFromIndex(self):
+        devices = phonon.Phonon.BackendCapabilities.availableAudioOutputDevices()
+        for device in devices:
+            self.assert_(isinstance(device, phonon.Phonon.AudioOutputDevice))
+            other = phonon.Phonon.AudioOutputDevice.fromIndex(device.index())
+            self.assertEqual(device.name(), other.name())
+            self.assertEqual(device.index(), other.index())
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/tests/phonon/tone.ogg b/tests/phonon/tone.ogg
deleted file mode 100644
index dc1a455..0000000
Binary files a/tests/phonon/tone.ogg and /dev/null differ
diff --git a/tests/phonon/tone.wav b/tests/phonon/tone.wav
new file mode 100644
index 0000000..2fa06a7
Binary files /dev/null and b/tests/phonon/tone.wav differ
diff --git a/tests/pysidetest/CMakeLists.txt b/tests/pysidetest/CMakeLists.txt
new file mode 100644
index 0000000..78c6f95
--- /dev/null
+++ b/tests/pysidetest/CMakeLists.txt
@@ -0,0 +1,91 @@
+project(pysidetest)
+project(testbinding)
+
+cmake_minimum_required(VERSION 2.6)
+
+set(QT_USE_QTCORE 1)
+include(${QT_USE_FILE})
+add_definitions(${QT_DEFINITIONS})
+add_definitions(-DQT_SHARED)
+add_definitions(-DRXX_ALLOCATOR_INIT_0)
+
+set(pysidetest_SRC
+testobject.cpp
+testview.cpp
+hiddenobject.cpp
+)
+
+set(pysidetest_MOC_HEADERS
+testobject.h
+testview.h
+hiddenobject.h
+)
+
+qt4_wrap_cpp(pysidetest_MOC_SRC ${pysidetest_MOC_HEADERS})
+
+set(testbinding_SRC
+${CMAKE_CURRENT_BINARY_DIR}/testbinding/testobject_wrapper.cpp
+${CMAKE_CURRENT_BINARY_DIR}/testbinding/intvalue_wrapper.cpp
+${CMAKE_CURRENT_BINARY_DIR}/testbinding/pysidecpp_wrapper.cpp
+${CMAKE_CURRENT_BINARY_DIR}/testbinding/pysidecpp_testobjectwithnamespace_wrapper.cpp
+${CMAKE_CURRENT_BINARY_DIR}/testbinding/pysidecpp2_testobjectwithoutnamespace_wrapper.cpp
+${CMAKE_CURRENT_BINARY_DIR}/testbinding/testview_wrapper.cpp
+${CMAKE_CURRENT_BINARY_DIR}/testbinding/testbinding_module_wrapper.cpp
+)
+
+add_custom_command(OUTPUT ${testbinding_SRC}
+COMMAND ${SHIBOKEN_BINARY} ${GENERATOR_EXTRA_FLAGS}
+        ${CMAKE_CURRENT_SOURCE_DIR}/pysidetest_global.h
+        --include-paths=${pyside_BINARY_DIR}${PATH_SEP}${CMAKE_CURRENT_SOURCE_DIR}${PATH_SEP}${QT_INCLUDE_DIR}${PATH_SEP}${QT_QTCORE_INCLUDE_DIR}${PATH_SEP}${QT_QTGUI_INCLUDE_DIR}
+        --typesystem-paths=${CMAKE_CURRENT_SOURCE_DIR}${PATH_SEP}${pyside_SOURCE_DIR}${PATH_SEP}${QtCore_SOURCE_DIR}${PATH_SEP}${QtCore_BINARY_DIR}${PATH_SEP}${QtGui_SOURCE_DIR}${PATH_SEP}${QtGui_BINARY_DIR}
+        --output-directory=${CMAKE_CURRENT_BINARY_DIR}
+        ${CMAKE_CURRENT_SOURCE_DIR}/typesystem_pysidetest.xml
+WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+COMMENT "Running generator for test binding..."
+)
+
+include_directories(${CMAKE_CURRENT_SOURCE_DIR}
+                    ${CMAKE_CURRENT_BINARY_DIR}
+                    ${QT_INCLUDE_DIR}
+                    ${QT_QTCORE_INCLUDE_DIR}
+                    ${QT_QTGUI_INCLUDE_DIR}
+                    ${SHIBOKEN_INCLUDE_DIR}
+                    ${pyside_SOURCE_DIR}
+                    ${QtCore_BINARY_DIR}/PySide/QtCore
+                    ${QtGui_BINARY_DIR}/PySide/QtGui
+                    ${libpyside_SOURCE_DIR}
+                    ${SHIBOKEN_PYTHON_INCLUDE_DIR})
+
+add_library(pysidetest SHARED ${pysidetest_SRC} ${pysidetest_MOC_SRC})
+target_link_libraries(pysidetest ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY})
+
+add_library(testbinding MODULE ${testbinding_SRC})
+set_property(TARGET testbinding PROPERTY PREFIX "")
+if(WIN32)
+    set_target_properties(testbinding PROPERTIES SUFFIX ".pyd")
+endif()
+target_link_libraries(testbinding
+                      pysidetest
+                      pyside
+                      ${PYTHON_LIBRARIES}
+                      ${SHIBOKEN_LIBRARY}
+                      ${QT_QTCORE_LIBRARY}
+                      ${QT_QTGUI_LIBRARY}
+                      ${SBK_PYTHON_LIBRARIES})
+
+add_dependencies(testbinding pyside QtCore QtGui libpyside pysidetest)
+
+PYSIDE_TEST(application_test.py)
+PYSIDE_TEST(decoratedslot_test.py)
+PYSIDE_TEST(delegatecreateseditor_test.py)
+PYSIDE_TEST(enum_test.py)
+PYSIDE_TEST(homonymoussignalandmethod_test.py)
+PYSIDE_TEST(list_signal_test.py)
+PYSIDE_TEST(modelview_test.py)
+PYSIDE_TEST(qvariant_test.py)
+PYSIDE_TEST(signalandnamespace_test.py)
+PYSIDE_TEST(signalwithdefaultvalue_test.py)
+PYSIDE_TEST(signalemissionfrompython_test.py)
+PYSIDE_TEST(version_test.py)
+PYSIDE_TEST(typedef_signal_test.py)
+PYSIDE_TEST(bug_1016.py)
diff --git a/tests/pysidetest/application_test.py b/tests/pysidetest/application_test.py
new file mode 100644
index 0000000..39a8283
--- /dev/null
+++ b/tests/pysidetest/application_test.py
@@ -0,0 +1,23 @@
+#!/usr/bin/python
+
+import unittest
+from testbinding import TestObject
+from PySide.QtGui import QApplication
+
+class QApplicationInstance(unittest.TestCase):
+
+    def appDestroyed(self):
+        sefl.assert_(False)
+
+    def testInstanceObject(self):
+        TestObject.createApp()
+        app1 = QApplication.instance()
+        app2 = QApplication.instance()
+        app1.setObjectName("MyApp")
+        self.assertEqual(app1, app2)
+        self.assertEqual(app2.objectName(), app1.objectName())
+        app1.destroyed.connect(self.appDestroyed)
+
+if __name__ == '__main__':
+    unittest.main()
+
diff --git a/tests/pysidetest/bug_1016.py b/tests/pysidetest/bug_1016.py
new file mode 100644
index 0000000..38432c6
--- /dev/null
+++ b/tests/pysidetest/bug_1016.py
@@ -0,0 +1,12 @@
+from testbinding import *
+import unittest
+
+class TestBug1016 (unittest.TestCase):
+
+    def testIt(self):
+        obj = getHiddenObject()
+        self.assertEqual(obj.callMe(), None)
+        self.assertTrue(obj.wasCalled())
+
+if __name__ == "__main__":
+    unittest.main()
diff --git a/tests/pysidetest/decoratedslot_test.py b/tests/pysidetest/decoratedslot_test.py
new file mode 100644
index 0000000..63a5be7
--- /dev/null
+++ b/tests/pysidetest/decoratedslot_test.py
@@ -0,0 +1,39 @@
+#!/usr/bin/python
+
+import unittest
+from PySide.QtCore import QObject
+from testbinding import TestObject
+
+class Receiver(QObject):
+    def __init__(self):
+        QObject.__init__(self)
+        self.called = False
+
+    def ReceiverDecorator(func):
+        def decoratedFunction(self, *args, **kw):
+            func(self, *args, **kw)
+        return decoratedFunction
+
+    # This method with the same name of the internal decorated function
+    # is here to test the binding capabilities.
+    def decoratedFunction(self):
+        pass
+
+    @ReceiverDecorator
+    def slot(self):
+        self.called = True
+
+
+class DecoratedSlotTest(unittest.TestCase):
+
+    def testCallingOfDecoratedSlot(self):
+        obj = TestObject(0)
+        receiver = Receiver()
+        obj.staticMethodDouble.connect(receiver.slot)
+        obj.emitStaticMethodDoubleSignal()
+        self.assert_(receiver.called)
+
+
+if __name__ == '__main__':
+    unittest.main()
+
diff --git a/tests/pysidetest/delegatecreateseditor_test.py b/tests/pysidetest/delegatecreateseditor_test.py
new file mode 100644
index 0000000..0054e79
--- /dev/null
+++ b/tests/pysidetest/delegatecreateseditor_test.py
@@ -0,0 +1,55 @@
+#!/usr/bin/python
+
+import unittest
+from helper import UsesQApplication
+
+from testbinding import TestView
+from PySide.QtCore import Qt
+from PySide.QtGui import QAbstractItemDelegate, QComboBox
+
+id_text = 'This is me'
+
+class DelegateDoesntKeepReferenceToEditor(QAbstractItemDelegate):
+    def createEditor(self, parent, option, index):
+        comboBox = QComboBox(parent)
+        comboBox.addItem(id_text)
+        return comboBox
+
+
+class DelegateKeepsReferenceToEditor(QAbstractItemDelegate):
+    def __init__(self, parent=None):
+        QAbstractItemDelegate.__init__(self, parent)
+        self.comboBox = QComboBox()
+        self.comboBox.addItem(id_text)
+
+    def createEditor(self, parent, option, index):
+        self.comboBox.setParent(parent)
+        return self.comboBox
+
+
+class EditorCreatedByDelegateTest(UsesQApplication):
+
+    def testDelegateDoesntKeepReferenceToEditor(self):
+        view = TestView(None)
+        delegate = DelegateDoesntKeepReferenceToEditor()
+        view.setItemDelegate(delegate)
+        editor = view.getEditorWidgetFromItemDelegate()
+        self.assertEqual(type(editor), QComboBox)
+        self.assertEqual(editor.count(), 1)
+        self.assertEqual(editor.itemData(0, Qt.DisplayRole), id_text)
+        editor.metaObject()
+
+    def testDelegateKeepsReferenceToEditor(self):
+        view = TestView(None)
+        delegate = DelegateKeepsReferenceToEditor()
+        view.setItemDelegate(delegate)
+        editor = view.getEditorWidgetFromItemDelegate()
+        self.assertEqual(type(editor), QComboBox)
+        self.assertEqual(editor.count(), 1)
+        self.assertEqual(editor.itemData(0, Qt.DisplayRole), id_text)
+        editor.metaObject()
+
+
+if __name__ == '__main__':
+    unittest.main()
+
diff --git a/tests/pysidetest/enum_test.py b/tests/pysidetest/enum_test.py
new file mode 100644
index 0000000..6733f2f
--- /dev/null
+++ b/tests/pysidetest/enum_test.py
@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+
+import unittest
+from testbinding import Enum1, TestObjectWithoutNamespace
+
+class ListConnectionTest(unittest.TestCase):
+
+    def testEnumVisibility(self):
+        self.assertEqual(Enum1.Option1, 1)
+        self.assertEqual(Enum1.Option2, 2)
+        self.assertEqual(TestObjectWithoutNamespace.Enum2.Option3, 3)
+        self.assertEqual(TestObjectWithoutNamespace.Enum2.Option4, 4)
+
+if __name__ == '__main__':
+    unittest.main()
+
diff --git a/tests/pysidetest/hiddenobject.cpp b/tests/pysidetest/hiddenobject.cpp
new file mode 100644
index 0000000..00c7bed
--- /dev/null
+++ b/tests/pysidetest/hiddenobject.cpp
@@ -0,0 +1,38 @@
+/*
+ * This file is part of the PySide project.
+ *
+ * Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+ *
+ * Contact: PySide team <contact@pyside.org>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+#include "hiddenobject.h"
+
+void HiddenObject::callMe()
+{
+    m_called = true;
+}
+
+bool HiddenObject::wasCalled()
+{
+    return m_called;
+}
+
+QObject* getHiddenObject()
+{
+    return new HiddenObject();
+}
diff --git a/tests/pysidetest/hiddenobject.h b/tests/pysidetest/hiddenobject.h
new file mode 100644
index 0000000..eb02d14
--- /dev/null
+++ b/tests/pysidetest/hiddenobject.h
@@ -0,0 +1,49 @@
+/*
+ * This file is part of the PySide project.
+ *
+ * Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+ *
+ * Contact: PySide team <contact@pyside.org>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+#ifndef HIDDENOBJECT_H
+#define HIDDENOBJECT_H
+
+#ifdef pysidetest_EXPORTS
+#define PYSIDE_EXPORTS 1
+#endif
+#include "pysidemacros.h"
+#include <QObject>
+
+// This class shouldn't be exported!
+class HiddenObject : public QObject
+{
+    Q_OBJECT
+public:
+    HiddenObject() : m_called(false) {}
+    Q_INVOKABLE void callMe();
+public slots:
+    bool wasCalled();
+private:
+    bool m_called;
+};
+
+// Return a instance of HiddenObject
+PYSIDE_API QObject* getHiddenObject();
+
+
+#endif
diff --git a/tests/pysidetest/homonymoussignalandmethod_test.py b/tests/pysidetest/homonymoussignalandmethod_test.py
new file mode 100644
index 0000000..4850c5b
--- /dev/null
+++ b/tests/pysidetest/homonymoussignalandmethod_test.py
@@ -0,0 +1,53 @@
+#!/usr/bin/python
+
+import unittest
+from testbinding import TestObject
+
+'''Tests the behaviour of homonymous signals and slots.'''
+
+class HomonymousSignalAndMethodTest(unittest.TestCase):
+
+    def setUp(self):
+        self.value = 123
+        self.called = False
+        self.obj = TestObject(self.value)
+
+    def tearDown(self):
+        del self.value
+        del self.called
+        del self.obj
+
+    def testIdValueSignalEmission(self):
+        def callback(idValue):
+            self.assertEqual(idValue, self.value)
+        self.obj.idValue.connect(callback)
+        self.obj.emitIdValueSignal()
+
+    def testStaticMethodDoubleSignalEmission(self):
+        def callback():
+            self.called = True
+        self.obj.staticMethodDouble.connect(callback)
+        self.obj.emitStaticMethodDoubleSignal()
+        self.assert_(self.called)
+
+    def testSignalNotCallable(self):
+        self.assertRaises(TypeError, self.obj.justASignal)
+
+    def testCallingInstanceMethodWithArguments(self):
+        self.assertRaises(TypeError, TestObject.idValue, 1)
+
+    def testCallingInstanceMethodWithoutArguments(self):
+        self.assertRaises(TypeError, TestObject.idValue)
+
+    def testHomonymousSignalAndMethod(self):
+        self.assertEqual(self.obj.idValue(), self.value)
+
+    def testHomonymousSignalAndStaticMethod(self):
+        self.assertEqual(TestObject.staticMethodDouble(3), 6)
+
+    def testHomonymousSignalAndStaticMethodFromInstance(self):
+        self.assertEqual(self.obj.staticMethodDouble(4), 8)
+
+if __name__ == '__main__':
+    unittest.main()
+
diff --git a/tests/pysidetest/list_signal_test.py b/tests/pysidetest/list_signal_test.py
new file mode 100644
index 0000000..36d3c21
--- /dev/null
+++ b/tests/pysidetest/list_signal_test.py
@@ -0,0 +1,23 @@
+# -*- coding: utf-8 -*-
+
+import unittest
+from testbinding import TestObject
+from PySide.QtCore import QObject
+
+class ListConnectionTest(unittest.TestCase):
+
+    def childrenChanged(self, children):
+        self._child = children[0]
+
+    def testConnection(self):
+        o = TestObject(0)
+        c = QObject()
+        c.setObjectName("child")
+        self._child = None
+        o.childrenChanged.connect(self.childrenChanged)
+        o.addChild(c)
+        self.assertEquals(self._child.objectName(), "child")
+
+if __name__ == '__main__':
+    unittest.main()
+
diff --git a/tests/pysidetest/modelview_test.py b/tests/pysidetest/modelview_test.py
new file mode 100644
index 0000000..f1cd8bb
--- /dev/null
+++ b/tests/pysidetest/modelview_test.py
@@ -0,0 +1,71 @@
+#!/usr/bin/python
+
+import unittest
+import py3kcompat as py3k
+from testbinding import TestView
+from PySide.QtCore import QAbstractListModel, QObject, QModelIndex
+
+'''Tests model/view relationship.'''
+
+object_name = 'test object'
+
+class MyObject(QObject):
+    pass
+
+class ListModelKeepsReference(QAbstractListModel):
+    def __init__(self, parent=None):
+        QAbstractListModel.__init__(self, parent)
+        self.obj = MyObject()
+        self.obj.setObjectName(object_name)
+
+    def rowCount(self, parent=QModelIndex()):
+        return 1
+
+    def data(self, index, role):
+        return self.obj
+
+class ListModelDoesntKeepsReference(QAbstractListModel):
+    def rowCount(self, parent=QModelIndex()):
+        return 1
+
+    def data(self, index, role):
+        obj = MyObject()
+        obj.setObjectName(object_name)
+        return obj
+
+class ListModelThatReturnsString(QAbstractListModel):
+    def rowCount(self, parent=QModelIndex()):
+        return 1
+
+    def data(self, index, role):
+        self.obj = 'string'
+        return self.obj
+
+
+class ModelViewTest(unittest.TestCase):
+
+    def testListModelDoesntKeepsReference(self):
+        model = ListModelDoesntKeepsReference()
+        view = TestView(model)
+        obj = view.getData()
+        self.assertEqual(type(obj), MyObject)
+        self.assertEqual(obj.objectName(), object_name)
+        obj.metaObject()
+
+    def testListModelKeepsReference(self):
+        model = ListModelKeepsReference()
+        view = TestView(model)
+        obj = view.getData()
+        self.assertEqual(type(obj), MyObject)
+        self.assertEqual(obj.objectName(), object_name)
+
+    def testListModelThatReturnsString(self):
+        model = ListModelThatReturnsString()
+        view = TestView(model)
+        obj = view.getData()
+        self.assertEqual(type(obj), py3k.unicode)
+        self.assertEqual(obj, 'string')
+
+if __name__ == '__main__':
+    unittest.main()
+
diff --git a/tests/pysidetest/pysidetest_global.h b/tests/pysidetest/pysidetest_global.h
new file mode 100644
index 0000000..bad6e8e
--- /dev/null
+++ b/tests/pysidetest/pysidetest_global.h
@@ -0,0 +1,6 @@
+// PySide global.h file
+#include "pyside_global.h"
+#include "testobject.h"
+#include "testview.h"
+#define PYSIDE_API
+#include "hiddenobject.h"
diff --git a/tests/pysidetest/qvariant_test.py b/tests/pysidetest/qvariant_test.py
new file mode 100644
index 0000000..d855e2b
--- /dev/null
+++ b/tests/pysidetest/qvariant_test.py
@@ -0,0 +1,17 @@
+import unittest
+
+from testbinding import TestObject
+from PySide.QtCore import Qt
+from PySide.QtGui import QKeySequence
+
+from helper import UsesQApplication
+
+class QVariantTest(UsesQApplication):
+
+    def testQKeySequenceQVariantOperator(self):
+        # bug #775
+        ks = QKeySequence(Qt.SHIFT, Qt.CTRL, Qt.Key_P, Qt.Key_R)
+        self.assertEqual(TestObject.checkType(ks), 76)
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/tests/pysidetest/signalandnamespace_test.py b/tests/pysidetest/signalandnamespace_test.py
new file mode 100644
index 0000000..ae93cf3
--- /dev/null
+++ b/tests/pysidetest/signalandnamespace_test.py
@@ -0,0 +1,92 @@
+#!/usr/bin/python
+
+import unittest
+from testbinding import PySideCPP, TestObjectWithoutNamespace
+
+class ModelViewTest(unittest.TestCase):
+
+    def callback(self, o):
+        self._called = o
+
+    def testWithoutNamespace(self):
+        self._called = None
+        o = PySideCPP.TestObjectWithNamespace(None)
+        o.emitSignal.connect(self.callback)
+        o.emitSignal.emit(o)
+        self.assert_(o == self._called)
+
+        self._called = None
+        o = PySideCPP.TestObjectWithNamespace(None)
+        o.emitSignal.connect(self.callback)
+        o.callSignal(o)
+        self.assert_(o == self._called)
+
+    def testWithNamespace(self):
+        self._called = None
+        o = PySideCPP.TestObjectWithNamespace(None)
+        o.emitSignalWithNamespace.connect(self.callback)
+        o.emitSignalWithNamespace.emit(o)
+        self.assert_(o == self._called)
+
+        self._called = None
+        o = PySideCPP.TestObjectWithNamespace(None)
+        o.emitSignalWithNamespace.connect(self.callback)
+        o.callSignalWithNamespace(o)
+        self.assert_(o == self._called)
+
+
+    def testWithoutNamespace1(self):
+        self._called = None
+        o = TestObjectWithoutNamespace(None)
+        o.emitSignal.connect(self.callback)
+        o.emitSignal.emit(o)
+        self.assert_(o == self._called)
+
+        self._called = None
+        o = TestObjectWithoutNamespace(None)
+        o.emitSignal.connect(self.callback)
+        o.callSignal(o)
+        self.assert_(o == self._called)
+
+    def testWithNamespace1(self):
+        self._called = None
+        o = TestObjectWithoutNamespace(None)
+        o.emitSignalWithNamespace.connect(self.callback)
+        o.emitSignalWithNamespace.emit(o)
+        self.assert_(o == self._called)
+
+        self._called = None
+        o = TestObjectWithoutNamespace(None)
+        o.emitSignalWithNamespace.connect(self.callback)
+        o.callSignalWithNamespace(o)
+        self.assert_(o == self._called)
+
+    def testTypedfWithouNamespace(self):
+        self._called = None
+        o = PySideCPP.TestObjectWithNamespace(None)
+        o.emitSignalWithTypedef.connect(self.callback)
+        o.emitSignalWithTypedef.emit(10)
+        self.assertEqual(10, self._called)
+
+        self._called = None
+        o = PySideCPP.TestObjectWithNamespace(None)
+        o.emitSignalWithTypedef.connect(self.callback)
+        o.callSignalWithTypedef(10)
+        self.assertEqual(10, self._called)
+
+    def testTypedefWithNamespace(self):
+        self._called = None
+        o = TestObjectWithoutNamespace(None)
+        o.emitSignalWithTypedef.connect(self.callback)
+        o.emitSignalWithTypedef.emit(10)
+        self.assertEqual(10, self._called)
+
+        self._called = None
+        o = TestObjectWithoutNamespace(None)
+        o.emitSignalWithTypedef.connect(self.callback)
+        o.callSignalWithTypedef(10)
+        self.assertEqual(10, self._called)
+
+if __name__ == '__main__':
+    unittest.main()
+
diff --git a/tests/pysidetest/signalemissionfrompython_test.py b/tests/pysidetest/signalemissionfrompython_test.py
new file mode 100644
index 0000000..9d130cb
--- /dev/null
+++ b/tests/pysidetest/signalemissionfrompython_test.py
@@ -0,0 +1,79 @@
+#!/usr/bin/python
+
+import unittest
+from testbinding import TestObject
+from PySide.QtCore import QObject, SIGNAL
+
+'''Tests the behaviour of signals with default values when emitted from Python.'''
+
+class SignalEmissionFromPython(unittest.TestCase):
+
+    def setUp(self):
+        self.obj1 = TestObject(0)
+        self.obj2 = TestObject(0)
+        self.one_called = 0
+        self.two_called = 0
+
+    def tearDown(self):
+        del self.obj1
+        del self.obj2
+        del self.one_called
+        del self.two_called
+
+    def testConnectNewStyleEmitVoidSignal(self):
+        def callbackOne():
+            self.one_called += 1
+            self.obj2.signalWithDefaultValue.emit()
+        def callbackTwo():
+            self.two_called += 1
+        self.obj1.signalWithDefaultValue.connect(callbackOne)
+        self.obj2.signalWithDefaultValue.connect(callbackTwo)
+        self.obj1.emitSignalWithDefaultValue_void()
+        self.obj2.emitSignalWithDefaultValue_void()
+        self.assertEqual(self.one_called, 1)
+        self.assertEqual(self.two_called, 2)
+
+    def testConnectOldStyleEmitVoidSignal(self):
+        def callbackOne():
+            self.one_called += 1
+            self.obj2.signalWithDefaultValue.emit()
+        def callbackTwo():
+            self.two_called += 1
+        QObject.connect(self.obj1, SIGNAL('signalWithDefaultValue()'), callbackOne)
+        QObject.connect(self.obj2, SIGNAL('signalWithDefaultValue()'), callbackTwo)
+        self.obj1.emitSignalWithDefaultValue_void()
+        self.obj2.emitSignalWithDefaultValue_void()
+        self.assertEqual(self.one_called, 1)
+        self.assertEqual(self.two_called, 2)
+
+    def testConnectNewStyleEmitBoolSignal(self):
+        def callbackOne():
+            self.one_called += 1
+            self.obj2.signalWithDefaultValue[bool].emit(True)
+        def callbackTwo():
+            self.two_called += 1
+        self.obj1.signalWithDefaultValue.connect(callbackOne)
+        self.obj2.signalWithDefaultValue.connect(callbackTwo)
+        self.obj1.emitSignalWithDefaultValue_void()
+        self.obj2.emitSignalWithDefaultValue_void()
+        self.assertEqual(self.one_called, 1)
+        self.assertEqual(self.two_called, 2)
+
+    def testConnectOldStyleEmitBoolSignal(self):
+        def callbackOne():
+            self.one_called += 1
+            self.obj2.signalWithDefaultValue[bool].emit(True)
+        def callbackTwo():
+            self.two_called += 1
+        QObject.connect(self.obj1, SIGNAL('signalWithDefaultValue()'), callbackOne)
+        QObject.connect(self.obj2, SIGNAL('signalWithDefaultValue()'), callbackTwo)
+        self.obj1.emitSignalWithDefaultValue_void()
+        self.obj2.emitSignalWithDefaultValue_void()
+        self.assertEqual(self.one_called, 1)
+        self.assertEqual(self.two_called, 2)
+
+
+
+if __name__ == '__main__':
+    unittest.main()
+
diff --git a/tests/pysidetest/signalwithdefaultvalue_test.py b/tests/pysidetest/signalwithdefaultvalue_test.py
new file mode 100644
index 0000000..3a18bb7
--- /dev/null
+++ b/tests/pysidetest/signalwithdefaultvalue_test.py
@@ -0,0 +1,67 @@
+#!/usr/bin/python
+
+import unittest
+from testbinding import TestObject
+from PySide.QtCore import QObject, SIGNAL
+
+'''Tests the behaviour of signals with default values.'''
+
+class SignalWithDefaultValueTest(unittest.TestCase):
+
+    def setUp(self):
+        self.obj = TestObject(0)
+        self.void_called = False
+        self.bool_called = False
+
+    def tearDown(self):
+        del self.obj
+        del self.void_called
+        del self.bool_called
+
+    def testConnectNewStyleEmitVoidSignal(self):
+        def callbackVoid():
+            self.void_called = True
+        def callbackBool(value):
+            self.bool_called = True
+        self.obj.signalWithDefaultValue.connect(callbackVoid)
+        self.obj.signalWithDefaultValue[bool].connect(callbackBool)
+        self.obj.emitSignalWithDefaultValue_void()
+        self.assert_(self.void_called)
+        self.assert_(self.bool_called)
+
+    def testConnectNewStyleEmitBoolSignal(self):
+        def callbackVoid():
+            self.void_called = True
+        def callbackBool(value):
+            self.bool_called = True
+        self.obj.signalWithDefaultValue.connect(callbackVoid)
+        self.obj.signalWithDefaultValue[bool].connect(callbackBool)
+        self.obj.emitSignalWithDefaultValue_bool()
+        self.assert_(self.void_called)
+        self.assert_(self.bool_called)
+
+    def testConnectOldStyleEmitVoidSignal(self):
+        def callbackVoid():
+            self.void_called = True
+        def callbackBool(value):
+            self.bool_called = True
+        QObject.connect(self.obj, SIGNAL('signalWithDefaultValue()'), callbackVoid)
+        QObject.connect(self.obj, SIGNAL('signalWithDefaultValue(bool)'), callbackBool)
+        self.obj.emitSignalWithDefaultValue_void()
+        self.assert_(self.void_called)
+        self.assert_(self.bool_called)
+
+    def testConnectOldStyleEmitBoolSignal(self):
+        def callbackVoid():
+            self.void_called = True
+        def callbackBool(value):
+            self.bool_called = True
+        QObject.connect(self.obj, SIGNAL('signalWithDefaultValue()'), callbackVoid)
+        QObject.connect(self.obj, SIGNAL('signalWithDefaultValue(bool)'), callbackBool)
+        self.obj.emitSignalWithDefaultValue_bool()
+        self.assert_(self.void_called)
+        self.assert_(self.bool_called)
+
+if __name__ == '__main__':
+    unittest.main()
+
diff --git a/tests/pysidetest/symbols.filter b/tests/pysidetest/symbols.filter
new file mode 100644
index 0000000..af6c744
--- /dev/null
+++ b/tests/pysidetest/symbols.filter
@@ -0,0 +1,7 @@
+{
+local:
+_ZSt*;
+_ZNSt*;
+_ZNSs*;
+_ZNKSt*;
+};
diff --git a/tests/pysidetest/testobject.cpp b/tests/pysidetest/testobject.cpp
new file mode 100644
index 0000000..0988901
--- /dev/null
+++ b/tests/pysidetest/testobject.cpp
@@ -0,0 +1,48 @@
+/*
+ * This file is part of the PySide project.
+ *
+ * Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+ *
+ * Contact: PySide team <contact@pyside.org>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+#include "testobject.h"
+
+void TestObject::emitIdValueSignal()
+{
+    emit idValue(m_idValue);
+}
+
+void TestObject::emitStaticMethodDoubleSignal()
+{
+    emit staticMethodDouble();
+}
+
+void TestObject::emitSignalWithDefaultValue_void()
+{
+    emit signalWithDefaultValue();
+}
+
+void TestObject::emitSignalWithDefaultValue_bool()
+{
+    emit signalWithDefaultValue(true);
+}
+
+void TestObject::emitSignalWithTypedefValue(int value)
+{
+    emit signalWithTypedefValue(TypedefValue(value));
+}
diff --git a/tests/pysidetest/testobject.h b/tests/pysidetest/testobject.h
new file mode 100644
index 0000000..71e3716
--- /dev/null
+++ b/tests/pysidetest/testobject.h
@@ -0,0 +1,134 @@
+/*
+ * This file is part of the PySide project.
+ *
+ * Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+ *
+ * Contact: PySide team <contact@pyside.org>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+#ifndef TESTOBJECT_H
+#define TESTOBJECT_H
+
+#include <QObject>
+#include <QApplication>
+#include <QMetaType>
+#include <QVariant>
+#ifdef pysidetest_EXPORTS
+#define PYSIDE_EXPORTS 1
+#endif
+#include "pysidemacros.h"
+
+class IntValue
+{
+public:
+
+    IntValue(int val): value(val){};
+    IntValue() : value(0) {};
+    int value;
+};
+
+typedef IntValue TypedefValue;
+
+class PYSIDE_API TestObject : public QObject
+{
+    Q_OBJECT
+public:
+    static void createApp() { int argc=0; new QApplication(argc, 0); };
+    static int checkType(const QVariant& var) { return (int)var.type(); }
+
+    TestObject(int idValue, QObject* parent = 0) : QObject(parent), m_idValue(idValue) {}
+    int idValue() const { return m_idValue; }
+    static int staticMethodDouble(int value) { return value * 2; }
+    void addChild(QObject* c) { m_children.append(c); emit childrenChanged(m_children); }
+
+    void emitIdValueSignal();
+    void emitStaticMethodDoubleSignal();
+
+    void emitSignalWithDefaultValue_void();
+    void emitSignalWithDefaultValue_bool();
+
+    void emitSignalWithTypedefValue(int value);
+
+signals:
+    void idValue(int newValue);
+    void justASignal();
+    void staticMethodDouble();
+    void childrenChanged(const QList<QObject*>&);
+    void signalWithDefaultValue(bool value = false);
+    void signalWithTypedefValue(TypedefValue value);
+
+private:
+    int m_idValue;
+    QList<QObject*> m_children;
+};
+
+
+typedef int PySideInt;
+
+
+namespace PySideCPP {
+
+class PYSIDE_API TestObjectWithNamespace :  public QObject
+{
+    Q_OBJECT
+public:
+    TestObjectWithNamespace(QObject* parent) : QObject(parent) {}
+    QString name() { return "TestObjectWithNamespace"; }
+
+    void callSignal(TestObjectWithNamespace* obj) { emitSignal(obj); }
+    void callSignalWithNamespace(TestObjectWithNamespace* obj) { emitSignalWithNamespace(obj); }
+    void callSignalWithTypedef(int val) { emitSignalWithTypedef(val); }
+
+signals:
+    void emitSignal(TestObjectWithNamespace* obj);
+    void emitSignalWithNamespace(PySideCPP::TestObjectWithNamespace* obj);
+    void emitSignalWithTypedef(PySideInt val);
+};
+
+
+} // Namespace PySideCPP
+
+namespace PySideCPP2 {
+
+enum Enum1 { Option1 = 1, Option2 = 2 };
+
+
+typedef long PySideLong;
+
+class PYSIDE_API TestObjectWithoutNamespace :  public QObject
+{
+    Q_OBJECT
+public:
+    enum Enum2 { Option3 = 3, Option4 =  4};
+    TestObjectWithoutNamespace(QObject* parent) : QObject(parent) {}
+    QString name() { return "TestObjectWithoutNamespace"; }
+
+    void callSignal(TestObjectWithoutNamespace* obj) { emitSignal(obj); }
+    void callSignalWithNamespace(TestObjectWithoutNamespace* obj) { emitSignalWithNamespace(obj); }
+    void callSignalWithTypedef(long val) { emitSignalWithTypedef(val); }
+
+signals:
+    void emitSignal(TestObjectWithoutNamespace* obj);
+    void emitSignalWithNamespace(PySideCPP2::TestObjectWithoutNamespace* obj);
+    void emitSignalWithTypedef(PySideLong val);
+};
+
+
+} // Namespace PySideCPP2
+
+#endif // TESTOBJECT_H
+
diff --git a/tests/pysidetest/testview.cpp b/tests/pysidetest/testview.cpp
new file mode 100644
index 0000000..6adfe69
--- /dev/null
+++ b/tests/pysidetest/testview.cpp
@@ -0,0 +1,24 @@
+#include "testview.h"
+
+#include <QDebug>
+#include <QWidget>
+#include <QAbstractListModel>
+#include <QAbstractItemDelegate>
+
+QVariant
+TestView::getData()
+{
+    QModelIndex index;
+    return m_model->data(index);
+}
+
+QWidget*
+TestView::getEditorWidgetFromItemDelegate() const
+{
+    if (!m_delegate)
+        return 0;
+
+    QModelIndex index;
+    QStyleOptionViewItem options;
+    return m_delegate->createEditor(0, options, index);
+}
diff --git a/tests/pysidetest/testview.h b/tests/pysidetest/testview.h
new file mode 100644
index 0000000..76a6f00
--- /dev/null
+++ b/tests/pysidetest/testview.h
@@ -0,0 +1,31 @@
+#ifndef TESTVIEW_H
+#define TESTVIEW_H
+
+#include <QObject>
+#ifdef pysidetest_EXPORTS
+#define PYSIDE_EXPORTS 1
+#endif
+#include "pysidemacros.h"
+
+class QWidget;
+class QAbstractListModel;
+class QAbstractItemDelegate;
+
+class PYSIDE_API TestView : public QObject
+{
+    Q_OBJECT
+public:
+    TestView(QAbstractListModel* model, QObject* parent = 0) : QObject(parent), m_model(model) {}
+    QAbstractListModel* model() { return m_model; }
+    QVariant getData();
+
+    void setItemDelegate(QAbstractItemDelegate* delegate) { m_delegate = delegate; }
+    QWidget* getEditorWidgetFromItemDelegate() const;
+
+private:
+    QAbstractListModel* m_model;
+    QAbstractItemDelegate* m_delegate;
+};
+
+#endif // TESTVIEW_H
+
diff --git a/tests/pysidetest/typedef_signal_test.py b/tests/pysidetest/typedef_signal_test.py
new file mode 100644
index 0000000..c2cdd12
--- /dev/null
+++ b/tests/pysidetest/typedef_signal_test.py
@@ -0,0 +1,27 @@
+
+import unittest
+
+from PySide.QtCore import QObject
+from testbinding import TestObject
+
+class Receiver(QObject):
+
+    def __init__(self):
+        QObject.__init__(self)
+        self.received = None
+
+    def slot(self, value):
+        self.received = value
+
+class TypedefSignal(unittest.TestCase):
+
+    def testTypedef(self):
+        obj = TestObject(0)
+        receiver = Receiver()
+
+        obj.signalWithTypedefValue.connect(receiver.slot)
+        obj.emitSignalWithTypedefValue(2)
+        self.assertEqual(receiver.received.value, 2)
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/tests/pysidetest/typesystem_pysidetest.xml b/tests/pysidetest/typesystem_pysidetest.xml
new file mode 100644
index 0000000..babb541
--- /dev/null
+++ b/tests/pysidetest/typesystem_pysidetest.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0"?>
+<typesystem package="testbinding">
+    <load-typesystem name="typesystem_core.xml" generate="no" />
+    <load-typesystem name="typesystem_gui.xml" generate="no"/>
+    <value-type name="IntValue"/>
+    <primitive-type name="TypedefValue">
+        <!--
+        A conversion rule is used here because ApiExtractor can't associate
+        a primitive typedef to a non-primitive type. That would be a good
+        improvement to ApiExtractor.
+        -->
+        <conversion-rule>
+            <native-to-target>
+            return %CONVERTTOPYTHON[IntValue](%in);
+            </native-to-target>
+            <target-to-native>
+                <add-conversion type="IntValue">
+                IntValue value = %CONVERTTOCPP[IntValue](%in);
+                %out = %OUTTYPE(value);
+                </add-conversion>
+            </target-to-native>
+        </conversion-rule>
+    </primitive-type>
+    <object-type name="TestObject" />
+
+    <primitive-type name="PySideInt"/>
+    <primitive-type name="PySideCPP2::PySideLong"/>
+    <!--<primitive-type name="PySideLong"/>-->
+
+    <function signature="getHiddenObject()" />
+
+    <inject-code position="end">
+    Shiboken::Conversions::registerConverterName(Shiboken::Conversions::PrimitiveTypeConverter&lt;long&gt;(), "PySideLong");
+    Shiboken::Conversions::registerConverterName(Shiboken::Conversions::PrimitiveTypeConverter&lt;long&gt;(), "PySideCPP2::PySideLong");
+    qRegisterMetaType&lt;PySideInt>("PySideInt");
+    qRegisterMetaType&lt;PySideCPP2::PySideLong>("PySideLong");
+    </inject-code>
+
+    <namespace-type name="PySideCPP">
+        <object-type name="TestObjectWithNamespace"/>
+    </namespace-type>
+
+    <namespace-type name="PySideCPP2" generate="no">
+        <enum-type name="Enum1" />
+        <object-type name="TestObjectWithoutNamespace">
+            <enum-type name="Enum2" />
+        </object-type>
+    </namespace-type>
+
+    <object-type name="TestView" >
+        <modify-function signature="TestView(QAbstractListModel*,QObject*)">
+            <modify-argument index="1">
+                <reference-count action="set"/>
+            </modify-argument>
+        </modify-function>
+    </object-type>
+</typesystem>
diff --git a/tests/pysidetest/version_test.py b/tests/pysidetest/version_test.py
new file mode 100644
index 0000000..cb2b399
--- /dev/null
+++ b/tests/pysidetest/version_test.py
@@ -0,0 +1,17 @@
+#!/usr/bin/python
+
+import unittest
+from PySide import __version_info__, __version__, QtCore
+
+class CheckForVariablesTest(unittest.TestCase):
+    def testVesions(self):
+        self.assert_(__version_info__ >= (1, 0, 0))
+        self.assert_(__version_info__ < (99, 99, 99))
+        self.assert_(__version__)
+
+        self.assert_(QtCore.__version_info__ >= (4, 5, 0))
+        self.assert_(QtCore.__version__)
+
+if __name__ == '__main__':
+    unittest.main()
+
diff --git a/tests/qtcore/buffer_test.py b/tests/qtcore/buffer_test.py
deleted file mode 100644
index 2917232..0000000
--- a/tests/qtcore/buffer_test.py
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/usr/bin/python
-
-import unittest
-from PySide.QtCore import QString
-
-class BufferTest(unittest.TestCase):
-    def testQByteArray(self):
-        data = buffer("PySide")
-        str = QString(data)
-        self.assertEqual(data, str)
-
-if __name__ == '__main__':
-    unittest.main()
diff --git a/tests/qtcore/qchar_test.py b/tests/qtcore/qchar_test.py
deleted file mode 100644
index a40724b..0000000
--- a/tests/qtcore/qchar_test.py
+++ /dev/null
@@ -1,59 +0,0 @@
-
-'''Test cases for QChar'''
-
-import unittest
-
-from PySide.QtCore import QString, QChar, QTextStream, QLatin1Char
-
-
-class EqualTest(unittest.TestCase):
-    '''Tests for '__equal__'''
-
-    def testEqualQChar(self):
-        '''QChar == QChar'''
-        self.assertEqual(QChar('a'), QChar('a'))
-
-    def testEqualPyString(self):
-        '''QChar == Python string'''
-        self.assertEqual(QChar('a'), 'a')
-
-
-class ImplicitConvQLatin1Char(unittest.TestCase):
-    '''Tests for implicit conversion from QLatin1Char to QChar'''
-
-    def testQLatin1CharToChar(self):
-        '''QLatin1Char implicitly convertible to QChar'''
-        stream = QTextStream()
-        stream.setPadChar(QLatin1Char('-'))
-        self.assertEqual(QChar('-'), stream.padChar())
-
-
-class QCharCtorBigNumber(unittest.TestCase):
-    '''QChar constructors receiving ints'''
-
-    def testInt(self):
-        '''QChar(int)'''
-        codepoint = 512
-        qchar = QChar(codepoint)
-        reference = unichr(codepoint)
-        self.assertEqual(qchar.unicode(), codepoint)
-
-
-class QCharCtorString(unittest.TestCase):
-    '''QChar constructor receiving strings'''
-
-    def testBasic(self):
-        '''QChar(char)'''
-        reference = 'a'
-        qchar = QChar(reference)
-        self.assertEqual(ord(reference), ord(qchar.toAscii()))
-
-    def testError(self):
-        '''QChar(char)'''
-        reference = 'aaaaaa'
-        self.assertRaises(TypeError, QChar, reference)
-
-
-if __name__ == '__main__':
-    unittest.main()
-
diff --git a/tests/qtcore/qflags_test.py b/tests/qtcore/qflags_test.py
deleted file mode 100644
index 1346c11..0000000
--- a/tests/qtcore/qflags_test.py
+++ /dev/null
@@ -1,56 +0,0 @@
-#!/usr/bin/python
-'''Test cases for QFlags'''
-
-import unittest
-from PySide.QtCore import QIODevice, Qt, QFile
-
-class QFlagTest(unittest.TestCase):
-    '''Test case for usage of flags'''
-
-    def testCallFunction(self):
-        f = QFile("/tmp/t0");
-        self.assertEqual(f.open(QIODevice.Truncate | QIODevice.Text | QIODevice.ReadWrite), True)
-        om = f.openMode()
-        self.assertEqual(om & QIODevice.Truncate, QIODevice.Truncate)
-        self.assertEqual(om & QIODevice.Text, QIODevice.Text)
-        self.assertEqual(om & QIODevice.ReadWrite, QIODevice.ReadWrite)
-        self.assert_(om == QIODevice.Truncate | QIODevice.Text | QIODevice.ReadWrite)
-        f.close()
-
-
-class QFlagOperatorTest(unittest.TestCase):
-    '''Test case for operators in QFlags'''
-
-    def testInvert(self):
-        '''QFlags ~ (invert) operator'''
-        self.assert_(isinstance(~QIODevice.ReadOnly, QIODevice.OpenMode))
-
-    def testOr(self):
-        '''QFlags | (or) operator'''
-        self.assert_(isinstance(QIODevice.ReadOnly | QIODevice.WriteOnly, QIODevice.OpenMode))
-
-    def testAnd(self):
-        '''QFlags & (and) operator'''
-        self.assert_(isinstance(QIODevice.ReadOnly & QIODevice.WriteOnly, QIODevice.OpenMode))
-
-    def testIOr(self):
-        '''QFlags |= (ior) operator'''
-        flag = Qt.WindowFlags()
-        self.assert_(flag & Qt.Widget == 0)
-        flag |= Qt.WindowMinimizeButtonHint
-        self.assert_(flag & Qt.WindowMinimizeButtonHint)
-
-    def testInvertOr(self):
-        '''QFlags ~ (invert) operator over the result of an | (or) operator'''
-        self.assert_(isinstance(~(Qt.ItemIsSelectable | Qt.ItemIsEditable), Qt.ItemFlags))
-
-    def testEqual(self):
-        '''QFlags == operator'''
-        flags = Qt.Window
-        flags |= Qt.WindowMinimizeButtonHint
-        flag_type = (flags & Qt.WindowType_Mask)
-        self.assertEqual(flag_type, Qt.Window)
-
-
-if __name__ == '__main__':
-    unittest.main()
diff --git a/tests/qtcore/qlatin1string_test.py b/tests/qtcore/qlatin1string_test.py
deleted file mode 100644
index fdcf6ec..0000000
--- a/tests/qtcore/qlatin1string_test.py
+++ /dev/null
@@ -1,21 +0,0 @@
-
-'''Test cases for QLatin1String'''
-
-import unittest
-
-from PySide.QtCore import QString, QLatin1String, QObject
-
-
-class ImplicitConvQLatin1String(unittest.TestCase):
-    '''Tests for implicit conversion from QLatin1String to QString'''
-
-    def testQLatin1String(self):
-        '''QString implicit convertion from QLatin1String'''
-        obj = QObject()
-        obj.setObjectName(QLatin1String('dummy'))
-
-        self.assertEqual(QString('dummy'), obj.objectName())
-
-if __name__ == '__main__':
-    unittest.main()
-
diff --git a/tests/qtcore/qobject_property_test.py b/tests/qtcore/qobject_property_test.py
deleted file mode 100644
index 33df2ac..0000000
--- a/tests/qtcore/qobject_property_test.py
+++ /dev/null
@@ -1,71 +0,0 @@
-
-'''Test cases for QObject property and setProperty'''
-
-import unittest
-
-from PySide.QtCore import QObject, QVariant, QString
-
-class PropertyCase(unittest.TestCase):
-    '''Test case for QObject properties'''
-
-    def testObjectNameProperty(self):
-        #QObject.setProperty() for existing C++ property
-        obj = QObject()
-        self.assert_(obj.setProperty('objectName', QVariant('dummy')))
-        self.assertEqual(obj.objectName(), 'dummy')
-
-        self.assert_(obj.setProperty('objectName', QVariant('foobar')))
-        self.assertEqual(obj.objectName(), 'foobar')
-
-    def testDynamicProperty(self):
-        #QObject.setProperty() for dynamic properties
-        obj = QObject()
-
-        # Should return false when creating a new dynamic property
-        self.assert_(not obj.setProperty('dummy', QVariant('mydata')))
-        prop = obj.property('dummy')
-        self.assert_(isinstance(prop, QVariant))
-        self.assert_(prop.isValid())
-        self.assertEqual(obj.property('dummy').toString(), 'mydata')
-
-        self.assert_(not obj.setProperty('dummy', QVariant('zigzag')))
-        prop = obj.property('dummy')
-        self.assert_(isinstance(prop, QVariant))
-        self.assert_(prop.isValid())
-        self.assertEqual(obj.property('dummy').toString(), 'zigzag')
-
-        self.assert_(not obj.setProperty('dummy', QVariant(42)))
-        prop = obj.property('dummy')
-        self.assert_(isinstance(prop, QVariant))
-        self.assert_(prop.isValid())
-        # QVariant.toInt has a bool* arg in C++, so returns a tuple
-        self.assertEqual(obj.property('dummy').toInt(), (42, True))
-
-    def testQStringProperty(self):
-        obj = QObject()
-        self.assert_(not obj.setProperty('dummy', QString('data')))
-        prop = obj.property('dummy')
-
-        self.assert_(isinstance(prop, QVariant))
-        self.assert_(prop.isValid())
-        self.assertEqual(obj.property('dummy').toString(), QString('data'))
-
-    def testImplicitQVariantProperty(self):
-        obj = QObject()
-        self.assert_(not obj.setProperty('dummy', 'data'))
-        prop = obj.property('dummy')
-
-        self.assert_(isinstance(prop, QVariant))
-        self.assert_(prop.isValid())
-        self.assertEqual(obj.property('dummy').toString(), 'data')
-
-    def testInvalidProperty(self):
-        #QObject.property() for invalid properties
-        obj = QObject()
-
-        prop = obj.property('dummy')
-        self.assert_(not prop.isValid())
-
-
-if __name__ == '__main__':
-    unittest.main()
diff --git a/tests/qtcore/qprocess_test.py b/tests/qtcore/qprocess_test.py
deleted file mode 100644
index b01c68b..0000000
--- a/tests/qtcore/qprocess_test.py
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/usr/bin/python
-'''Test cases for QProcess'''
-
-import unittest
-import os
-
-from PySide.QtCore import *
-
-class TestQProcess (unittest.TestCase):
-    def testStartDetached(self):
-        value, pid = QProcess.startDetached("dir", [], os.getcwd())
-        self.assert_(isinstance(value, bool))
-        self.assert_(isinstance(pid, long))
-
-if __name__ == '__main__':
-    unittest.main()
diff --git a/tests/qtcore/qresource_test.py b/tests/qtcore/qresource_test.py
deleted file mode 100644
index 8f3350a..0000000
--- a/tests/qtcore/qresource_test.py
+++ /dev/null
@@ -1,31 +0,0 @@
-# -*- coding: utf-8 -*-
-
-'''Test cases for QResource usage'''
-
-import unittest
-import os
-from PySide.QtCore import QFile, QIODevice
-import resources_mc
-
-class ResourcesUsage(unittest.TestCase):
-    '''Test case for resources usage'''
-
-    def setUp(self):
-        f = open(os.path.join(os.path.dirname(__file__), 'quoteEnUS.txt'))
-        self.text = f.read()
-        f.close()
-
-    def tearDown(self):
-        self.text = None
-
-    def testPhrase(self):
-        #Test loading of quote.txt resource
-        f = QFile(':/quote.txt')
-        f.open(QIODevice.ReadOnly|QIODevice.Text)
-        content = f.readAll()
-        f.close()
-        self.assertEqual(self.text, content)
-
-if __name__ == '__main__':
-    unittest.main()
-
diff --git a/tests/qtcore/qstring_buffer_protocol_test.py b/tests/qtcore/qstring_buffer_protocol_test.py
deleted file mode 100755
index f8475d0..0000000
--- a/tests/qtcore/qstring_buffer_protocol_test.py
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/usr/bin/python
-# -*- coding: utf-8 -*-
-'''Tests QString implementation of Python buffer protocol'''
-
-import unittest
-
-from os.path import isdir
-from PySide.QtCore import QString
-
-class QStringBufferProtocolTest(unittest.TestCase):
-    '''Tests QString implementation of Python buffer protocol'''
-
-    def testQStringBufferProtocol(self):
-        #Tests QString implementation of Python buffer protocol using the os.path.isdir
-        #function which an unicode object or other object implementing the Python buffer protocol
-        isdir(QString('/tmp'))
-
-if __name__ == '__main__':
-    unittest.main()
-
diff --git a/tests/qtcore/qstring_operator_test.py b/tests/qtcore/qstring_operator_test.py
deleted file mode 100644
index 6d7ae31..0000000
--- a/tests/qtcore/qstring_operator_test.py
+++ /dev/null
@@ -1,161 +0,0 @@
-#!/usr/bin/python
-# -*- coding: utf-8 -*-
-'''Test cases for QString operators'''
-
-import unittest
-
-from PySide.QtCore import QString, QByteArray
-
-class QStringOperatorEqual(unittest.TestCase):
-    '''TestCase for operator QString == QString'''
-
-    def testDefault(self):
-        #QString() == QString()
-        obj1 = QString()
-        obj2 = QString()
-        self.assertEqual(obj1, obj2)
-
-    def testSimple(self):
-        #QString(some_string) == QString(some_string)
-        string = 'egg snakes'
-        self.assertEqual(QString(string), QString(string))
-
-    def testUnicode(self):
-        #QString(unicode) == QString(unicode)
-        string = u'àâãá'
-        self.assertEqual(QString(string), QString(string))
-
-    def testPyString(self):
-        #QString(string) == string
-        string = 'my test string'
-        self.assertEqual(QString(string), string)
-        self.assertEqual(string, QString(string))
-
-    def testPyUnicodeString(self):
-        #QString(unicode) == unicode
-        string = u'àâãá'
-        self.assertEqual(QString(string), string)
-        self.assertEqual(string, unicode(QString(string)))
-
-    def testQByteArray(self):
-        #QString(string) == QByteArray(string)
-        string = 'another test string'
-        self.assertEqual(QString(string), QByteArray(string))
-
-
-class QStringOperatorAtSetter(unittest.TestCase):
-    '''Test case for operator QString[] - __setitem__'''
-
-    def testSetterString(self):
-        '''QString[x] = pythonstring'''
-        obj = QString('123456')
-        obj[1] = '0'
-        self.assertEqual(obj, QString('103456'))
-
-    def testSetterStringLarge(self):
-        '''QString[x] = pythonstring (larget than 1 char)'''
-        obj = QString('123456')
-        obj[3] = 'abba'
-        self.assertEqual(obj, QString('123abba56'))
-
-    def testSetterQString(self):
-        '''QString[x] = QString'''
-        obj = QString('123456')
-        obj[3] = QString('string')
-        self.assertEqual(obj, QString('123string56'))
-
-    def testSetterQByteArray(self):
-        '''QString[x] = qbytearray'''
-        obj = QString('123456')
-        obj[3] = QByteArray('array')
-        self.assertEqual(obj, QString('123array56'))
-
-
-class QStringOperatorAtSetterNegativeIndex(unittest.TestCase):
-    '''Test case for QString[] - __setitem__ - for negative index'''
-
-    def testSetterNegativeIndex(self):
-        '''QString[x] = string - negative index'''
-        obj = QString('123456')
-        obj[-3] = 'array'
-        self.assertEqual(obj, QString('123array56'))
-
-
-class QStringOperatorAtSetterLargeIndex(unittest.TestCase):
-    '''Test case for QString[] - __setitem__ - for 'overflown' index'''
-
-    def testSetterLargeIndexEmpty(self):
-        '''QString[x] = somestring - Overflow index on empty string'''
-        # should pad with spaces if the index is larger
-        obj = QString('')
-        obj[2] = 'a'
-        self.assertEqual(obj, QString('  a'))
-
-    def testSetterLargeIndexNormal(self):
-        '''QString[x] = somestring - Overflow index on normal string'''
-        # should pad with spaces if the index is larger
-        obj = QString('mystring')
-        obj[10] = 'normal'
-        self.assertEqual(obj, QString('mystring  normal'))
-
-
-class QStringOperatorAt(unittest.TestCase):
-    '''TestCase for operator QString[] - __getitem__'''
-
-    def testInRange(self):
-        #QString[x] where x is a valid index
-        string = 'abcdefgh'
-        obj = QString(string)
-
-        for i in range(len(string)):
-            self.assertEqual(obj[i], string[i])
-
-    def testInRangeReverse(self):
-        #QString[x] where x is a valid index (reverse order)
-        string = 'abcdefgh'
-        obj = QString(string)
-
-        for i in range(len(string)-1, 0, -1):
-            self.assertEqual(obj[i], string[i])
-
-
-    def testInRangeUnicode(self):
-        #QString[x] where x is a valid index (unicode)
-        string = u'àâãá'
-        obj = QString(string)
-
-        for i in range(len(string)):
-            self.assertEqual(obj[i], string[i])
-
-    def testInRangeUnicodeReverse(self):
-        #QString[x] where x is a valid index (unicode) (reverse order)
-        string = u'àâãá'
-        obj = QString(string)
-
-        for i in range(len(string)-1, 0, -1):
-            self.assertEqual(obj[i], string[i])
-
-    def testOutOfRange(self):
-        #QString[x] where x is out of index
-        string = '1234567'
-        obj = QString(string)
-        self.assertRaises(IndexError, lambda :obj[len(string)])
-
-    def testReturnQString(self):
-        #QString[x] must return a QString
-        string = QString('123456')
-        data = string[0]
-        self.assert_(isinstance(data, QString))
-
-class QStringOperatorAdd(unittest.TestCase):
-    '''TestCase for operator QString[]'''
-
-    def testOperatorAdd(self):
-        str1 = '123'
-        str2 = QString('456')
-        self.assertEquals('123456', str1 + str2)
-        self.assertEquals('456123', str2 + str1)
-
-
-if __name__ == '__main__':
-    unittest.main()
diff --git a/tests/qtcore/qstring_test.py b/tests/qtcore/qstring_test.py
deleted file mode 100644
index 3f0fb49..0000000
--- a/tests/qtcore/qstring_test.py
+++ /dev/null
@@ -1,192 +0,0 @@
-#!/usr/bin/python
-# -*- coding: utf-8 -*-
-'''Test cases for QString'''
-
-import unittest
-import ctypes
-import sys
-
-from PySide.QtCore import QString, QByteArray, QObject
-
-class QStringToNumber(unittest.TestCase):
-    def testReturnValueTypes(self):
-        obj = QString('37')
-        val, ok = obj.toInt()
-        self.assertEqual(type(val), int)
-        self.assertEqual(type(ok), bool)
-
-    def testToNumberInt(self):
-        obj = QString('37')
-        self.assertEqual((37, True), obj.toInt())
-
-    def testToNumberLong(self):
-        obj = QString('3700000')
-        self.assertEqual((3700000, True), obj.toInt())
-
-    def testToNumberShort(self):
-        obj = QString('33')
-        self.assertEqual((ctypes.c_short(33).value, True), obj.toShort())
-
-    def testToNumberShortNegative(self):
-        obj = QString('-4')
-        self.assertEqual((ctypes.c_short(-4).value, True), obj.toShort())
-
-    def testToNumberShortOverflow(self):
-        obj = QString('1000000')
-        self.assertEqual(False, obj.toShort()[1])
-
-    def testToNumberUInt(self):
-        obj = QString('33')
-        self.assertEqual((ctypes.c_uint(33).value, True), obj.toUInt())
-
-    def testToNumberUIntNegative(self):
-        obj = QString('-4')
-        self.assertEqual(False, obj.toUInt()[1])
-
-    def testToNumberUIntOverflow(self):
-        obj = QString('10000000000000')
-        self.assertEqual(False, obj.toUInt()[1])
-
-    def testToNumberULong(self):
-        obj = QString('33')
-        self.assertEqual((ctypes.c_ulong(33).value, True), obj.toULong())
-
-    def testToNumberULongNegative(self):
-        obj = QString('-4')
-        self.assertEqual(False, obj.toULong()[1])
-
-    def testToNumberUShort(self):
-        obj = QString('33')
-        self.assertEqual((ctypes.c_ushort(33).value, True), obj.toUShort())
-
-    def testToNumberUShortLarge(self):
-        obj = QString('128')
-        self.assertEqual((ctypes.c_ushort(128).value, True), obj.toUShort())
-
-    def testToNumberUShortOverflow(self):
-        obj = QString('205000')
-        self.assertEqual(False, obj.toUShort()[1])
-
-    def testToNumberUShortNegative(self):
-        obj = QString('-4')
-        self.assertEqual(False, obj.toUShort()[1])
-
-    def testToNumberIntUsingHex(self):
-        obj = QString('2A')
-        self.assertEquals((0, False), obj.toInt())
-        self.assertEqual((int(str(obj), 16), True), obj.toInt(16))
-
-    def testToNumberIntUsingHex(self):
-        obj = QString('101010')
-        self.assertEqual((int(str(obj), 2), True), obj.toInt(2))
-
-    def testToNumberFloat(self):
-        obj = QString('37.109')
-        self.assertEqual(ctypes.c_float(37.109).value,
-                         obj.toFloat()[0])
-
-    def testToNumberDouble(self):
-        obj = QString('37.109')
-        self.assertEqual(ctypes.c_double(37.109).value,
-                         obj.toDouble()[0])
-
-    def testToULongLong(self):
-        obj = QString('37109')
-        self.assertEqual(ctypes.c_ulong(37109).value,
-                        obj.toULongLong()[0])
-
-class QStringConstructor(unittest.TestCase):
-    '''Test case for QString constructors'''
-
-    def testQStringDefault(self):
-        #QString()
-        obj1 = QString()
-        obj2 = QString()
-
-        self.assertEqual(obj1, obj2)
-
-    def testNullQString(self):
-        s = QString(None)
-        self.assertTrue(s.isNull())
-
-    def testQStringFromPy(self):
-        #QString(const char*)
-        sample = 'a new string'
-        obj1 = QString(sample)
-        obj2 = QString(sample)
-        self.assertEqual(obj1, obj2)
-
-    def testQStringFromUnicode(self):
-        sample = u'áâãà'
-        obj1 = QString(sample)
-        obj2 = QString(sample)
-        self.assertEqual(obj1, obj2)
-        self.assertEqual(obj1, sample)
-        self.assertEqual(obj2, sample)
-
-    def testQStringFromByteArray(self):
-        # QByteArray(const char *) must be working
-        sample = QByteArray('foo')
-        obj1 = QString(sample)
-        obj2 = QString(sample)
-        self.assertEqual(obj1, obj2)
-
-    def testQStringArg(self):
-        a = QString("%1 %2 %3").arg(1).arg("two").arg(3.14)
-        self.assertEquals("1 two 3.14", str(a))
-
-    def testQStringArgNegative(self):
-        a = QString("%1").arg(-20)
-        self.assertEquals("-20", str(a))
-
-
-class QStringComparison(unittest.TestCase):
-    '''Test case for comparison to python strings'''
-
-    def testComparePyString(self):
-        #Compare QStrings and Python strings.
-        py = ''
-        qstr = QString()
-        self.assertEqual(py, qstr)
-
-        py = 'The quick brown fox jumps over the lazy dog'
-        qstr = QString(py)
-        self.assertEqual(py, qstr)
-
-class QStringRange(unittest.TestCase):
-    '''Test case for ranges in python strings'''
-
-    def testSimpleRange(self):
-        #Test open start and open end intervals
-        py = 'The quick brown fox jumps over the lazy dog'
-        qstr = QString(py)
-        self.assertEqual(py[5:], qstr[5:])
-        self.assertEqual(py[:7], qstr[:7])
-
-class QStringIndexOf(unittest.TestCase):
-    def testEmpty(self):
-        string = QString()
-        self.assertEqual(string.indexOf(QString("aaa")), -1)
-        self.assertEqual(string.indexOf(QString()), 0)
-
-    def testString(self):
-        string = QString("the quick brown fox")
-        self.assertEqual(string.indexOf("quick", 0), 4)
-
-
-class QStringImplicitConvertion(unittest.TestCase):
-    '''Implicit conversions for QString'''
-
-    def testQByteArray(self):
-        '''QString implicitly conversion: QByteArray'''
-        obj = QObject()
-        obj.setObjectName(QByteArray('foobar'))
-        self.assertEqual(obj.objectName(), QString('foobar'))
-
-class QStringHash(unittest.TestCase):
-    def testHash(self):
-        self.assertEqual(hash("key"), hash(QString("key")))
-        self.assertEqual(hash(u"aéióu"), hash(QString(u"aéióu")))
-
-if __name__ == '__main__':
-    unittest.main()
diff --git a/tests/qtcore/qstringlist_test.py b/tests/qtcore/qstringlist_test.py
deleted file mode 100644
index 0310516..0000000
--- a/tests/qtcore/qstringlist_test.py
+++ /dev/null
@@ -1,171 +0,0 @@
-
-# -*- coding: utf-8 -*-
-
-'''Test cases for QStringList'''
-
-import unittest
-from random import shuffle
-
-from PySide.QtCore import QStringList, QString
-
-from helper import random_string
-
-class UsesManyStrings(unittest.TestCase):
-    '''Helper class to setup a list of strings and QStrings'''
-    def setUp(self):
-        #Creates a list of strings and python strings
-        self.size = 10
-        # List of Python strings
-        self.samples = [random_string() for x in range(self.size)]
-        # List of QStrings
-        self.strings = map(QString, self.samples)
-
-        self.obj = QStringList(self.strings)
-
-
-class TestConstructorBasic(unittest.TestCase):
-    '''Basic constructor test'''
-
-    def testEmpty(self):
-        #QStringList() - default constructor
-        obj = QStringList()
-        self.assert_(isinstance(obj, QStringList))
-
-    def testQString(self):
-        #QStringList(QString)
-        qstr = QString('aaaa')
-        obj = QStringList(qstr)
-        self.assert_(isinstance(obj, QStringList))
-
-    def testPyString(self):
-        #QStringList(python_string) constructor
-        string = 'forty two'
-        obj = QStringList(string)
-        self.assert_(isinstance(obj, QStringList))
-
-    def testPyStringUnicode(self):
-        #QStringList(unicode python_string) constructor
-        string = 'Nação Zumbi'
-        obj = QStringList(string)
-        self.assert_(isinstance(obj, QStringList))
-
-
-class TestConstructorList(UsesManyStrings):
-    '''Test case for QStringList(List) constructor'''
-
-    def testListQString(self):
-        #QStringList([QString]) constructor
-        obj = QStringList(self.strings)
-        self.assert_(isinstance(obj, QStringList))
-
-    def testListPyString(self):
-        #QStringList([python_string]) constructor
-        obj = QStringList(self.samples)
-        self.assert_(isinstance(obj, QStringList))
-
-    def testListMixed(self):
-        #QStringList([python_string and QString]) mixed constructor
-        mixed = self.samples + self.strings
-        shuffle(mixed)
-        obj = QStringList(mixed)
-        self.assert_(isinstance(obj, QStringList))
-
-    def testCopyList(self):
-        #QStringList(QStringList(list)) - copy constructor
-        obj = QStringList(self.strings)
-        obj2 = QStringList(obj)
-        self.assert_(isinstance(obj2, QStringList))
-        self.assertEqual(obj, obj2)
-
-
-class TestComparison(unittest.TestCase):
-    '''Test case for comparison of QStringLists'''
-
-    def testEqual(self):
-        #QStringList == QStringList
-        string = QString('aaaabvbbcccedde')
-        obj1 = QStringList(string)
-        obj2 = QStringList(string)
-        self.assertEqual(obj1, obj2)
-
-
-class TestIndexing(unittest.TestCase):
-    '''Test case for indexing through []'''
-    def testInvalidIndexEmpty(self):
-        #QStringList[x] for empty list
-        obj = QStringList()
-        self.assertRaises(IndexError, lambda:obj[0])
-
-    def testInvalidIndexQString(self):
-        #QStringList[1] raising IndexError for QStringList(QString)
-        obj = QStringList(QString('aaaaa'))
-        self.assertRaises(IndexError, lambda:obj[1])
-
-    def testValidIndexQString(self):
-        #QStringList[0] not raising IndexError for QStringList(QString)
-        string = QString('abcdefg')
-        obj = QStringList(string)
-        self.assertEqual(obj[0], string)
-
-    def testNegativeIndexing(self):
-        #QStringList[-1] not raising IndexError for QStringList(QString)
-        string = QString('abcdefg')
-        obj = QStringList(string)
-        self.assertEqual(obj[-1], string)
-
-
-class TestListIndexing(UsesManyStrings):
-    '''Test case for indexing QStringList longer than 1 string'''
-
-    def testValid(self):
-        #QStringList[] for valid indexes
-        for i in range(self.size):
-            self.assertEqual(self.strings[i], self.obj[i])
-
-    def testNegativeValid(self):
-        #QStringList[] for valid indexes
-        for i in range(-1, -self.size, -1):
-            self.assertEqual(self.strings[i], self.obj[i])
-
-    def testInvalid(self):
-        #QStringList[] for invalid negative indexes
-        self.assertRaises(IndexError, lambda : self.obj[self.size])
-        self.assertRaises(IndexError, lambda : self.obj[-(self.size+1)])
-
-
-class TestSlicing(UsesManyStrings):
-    '''Test case for slicing a QStringList'''
-
-    def testSlicing(self):
-        #QStringList slicing
-        for i in range(self.size):
-            self.assertEqual(self.obj[i:], self.strings[i:])
-            self.assertEqual(self.obj[:i], self.strings[:i])
-            for j in range(i):
-                self.assertEqual(self.obj[j:i], self.strings[j:i])
-
-        for i in range(-1, -self.size, -1):
-            self.assertEqual(self.obj[:i], self.strings[:i])
-
-
-class TestShiftOperator(UsesManyStrings):
-    '''Test case for QStringList lshift operator'''
-
-    def testShiftOperator(self):
-        #QStringList lshift
-        a = QStringList()
-        a << "a" << "b" << "c";
-        self.assertEquals(3, a.count())
-        b = ["1", "2", "3"]
-        c = ["4", "5", "6"]
-        a << b << c
-        self.assertEquals(9, a.count())
-
-    def testShiftOperator(self):
-        #QStringList lshift
-        a = QStringList()
-        b = ["1", 2, "3"]
-        self.assertRaises(TypeError, a.__lshift__, b)
-
-if __name__ == '__main__':
-    unittest.main()
diff --git a/tests/qtcore/qvariant_pyobject_test.py b/tests/qtcore/qvariant_pyobject_test.py
deleted file mode 100644
index 82da555..0000000
--- a/tests/qtcore/qvariant_pyobject_test.py
+++ /dev/null
@@ -1,71 +0,0 @@
-
-'''QVariant handling of PyObjects, including pure-python or derived from Qt'''
-
-import unittest
-
-from PySide.QtCore import QSize, QVariant, QString
-
-
-class Dummy(object):
-    '''Pure python sample class'''
-    pass
-
-
-class MySize(QSize):
-    '''Extended class'''
-    pass
-
-
-class QVariantPurePython(unittest.TestCase):
-    '''QVariant + pure python classes'''
-
-    def testTypeNamePythonClasses(self):
-        '''QVariant of pure python classes'''
-        d = Dummy()
-        obj = QVariant(d)
-        # inherited type name from other binding
-        self.assertEqual('PyQt_PyObject', obj.typeName())
-
-
-class QVariantInheritedPython(unittest.TestCase):
-    '''QVariant + classes inherited from C++'''
-
-    # This works only on PyQt4 4.5.x, not on PyQt4 4.4.x or PySide
-    def testSubClassConvertion(self):
-        '''QVariant(QSize subclass) type is UserType and returns same object'''
-        mysize = MySize(0, 0)
-        variant = QVariant(mysize)
-
-        self.assertEqual(variant.type(), QVariant.UserType)
-        self.assertTrue(variant.toPyObject() is mysize)
-
-
-class QVariantToPyObject(unittest.TestCase):
-    '''QVariant.toPyObject tests'''
-
-    def testQVariantPyList(self):
-        '''QVariant(QVariantList).toPyObject() equals original list'''
-        obj = QVariant([1, 'two', 3])
-        self.assertEqual(obj.toPyObject(), [1, 'two', 3])
-
-    def testPyObject(self):
-        '''QVariant(pure PyObject).toPyObject should return the same object'''
-        d = Dummy()
-        obj = QVariant(d)
-        self.assert_(d is obj.toPyObject())
-
-    def testNoneToPyObject(self):
-        '''QVariant().toPyObject() should return None'''
-        obj = QVariant()
-        self.assertEqual(None, obj.toPyObject())
-
-    def testQStringToPyObject(self):
-        '''QVariant(python string).toPyObject() return an equal QString'''
-        d = 'abc'
-        obj = QVariant('abc')
-        self.assert_(isinstance(obj.toPyObject(), QString))
-        self.assertEqual(d, obj.toPyObject())
-
-
-if __name__ == '__main__':
-    unittest.main()
diff --git a/tests/qtcore/qvariant_test.py b/tests/qtcore/qvariant_test.py
deleted file mode 100644
index 5c23b40..0000000
--- a/tests/qtcore/qvariant_test.py
+++ /dev/null
@@ -1,141 +0,0 @@
-#!/usr/bin/python
-# -*- coding: utf-8 -*-
-'''Test cases for QVariant'''
-
-import unittest
-import sys
-
-from PySide.QtCore import QSize, QVariant, QByteArray, QStringList, QString
-
-
-class QVariantToNumber(unittest.TestCase):
-    '''QVariant of number types'''
-
-    def testToNumberInt(self):
-        '''QVariant(int).toInt()'''
-        obj = QVariant('37')
-        self.assertEqual((37, True), obj.toInt())
-
-    def testToNumberLongLong(self):
-        '''QVariant(int).toLongLong()'''
-        obj = QVariant('37')
-        self.assertEqual((37, True), obj.toLongLong())
-
-    def testToNumberUInt(self):
-        '''QVariant(int).toUInt()'''
-        obj = QVariant('37')
-        self.assertEqual((37, True), obj.toUInt())
-
-    def testToNumberUIntNegative(self):
-        '''QVariant(negative int).toUInt()'''
-        obj = QVariant('-37')
-        self.assert_(not obj.toUInt()[1])
-
-    def testToNumberULongLong(self):
-        '''QVariant(int).toULongLong()'''
-        obj = QVariant('37')
-        self.assertEqual((37, True), obj.toULongLong())
-
-    def testToNumberULongLongNegative(self):
-        '''QVariant(negative int).toULongLong()'''
-        obj = QVariant('-37')
-        self.assert_(not obj.toULongLong()[1])
-
-    def testToNumberFloat(self):
-        '''QVariant(double).toFloat()'''
-        obj = QVariant('37.109')
-        self.assertEqual((37.109, True), obj.toDouble())
-
-
-class QVariantTypeName(unittest.TestCase):
-    '''QVariant.typeName()'''
-
-    def testTypeNameQString(self):
-        '''QVariant(QString).typeName()'''
-        obj = QVariant(QString('aaaa'))
-        self.assertEqual('QString', obj.typeName())
-
-    def testTypeNameString(self):
-        '''QVariant(PyString).typeName()'''
-        obj = QVariant('aaaa')
-        self.assertEqual('QString', obj.typeName())
-
-    def testTypeNameInt(self):
-        '''QVariant(int).typeName()'''
-        obj = QVariant(34)
-        self.assertEqual('int', obj.typeName())
-
-    def testTypeNameDouble(self):
-        '''QVariant(double).typeName()'''
-        obj = QVariant(3.14)
-        self.assertEqual('double', obj.typeName())
-
-    def testTypeNameBool(self):
-        '''QVariant(bool).typeName()'''
-        obj = QVariant(True)
-        self.assertEqual('bool', obj.typeName())
-
-    def testTypeNameQByteArray(self):
-        '''QVariant(QByteArray).typeName()'''
-        obj = QVariant(QByteArray('aaaa'))
-        self.assertEqual('QByteArray', obj.typeName())
-
-    def testTypeNameNone(self):
-        '''QVariant().typeName()'''
-        obj = QVariant()
-        self.assertEqual(None, obj.typeName())
-
-    def testTypeNameQVariantList(self):
-        '''QVariant(QVariantList).typeName()'''
-        obj = QVariant([1, 2, 3, 4])
-        self.assertEqual('QVariantList', obj.typeName())
-
-        obj = QVariant([1.0, 2.2, 3.3, 4.2])
-        self.assertEqual('QVariantList', obj.typeName())
-
-        obj = QVariant(['aaa', 'bbb', 'ccc', 'dddd'])
-        self.assertEqual('QVariantList', obj.typeName())
-
-        obj = QVariant([QString('aaa'), QString('bbb'),
-                        QString('ccc'), QString('dddd')])
-        self.assertEqual('QVariantList', obj.typeName())
-
-    def testTypeNameQStringList(self):
-        '''QVariant(QStringList).typeName()'''
-        obj = QVariant(QStringList())
-        self.assertEqual('QStringList', obj.typeName())
-        obj = QVariant(QStringList(['aaa', 'bbb', 'ccc']))
-        self.assertEqual('QStringList', obj.typeName())
-
-
-class QVariantConstructor(unittest.TestCase):
-    '''More qvariant constructions'''
-
-    def testCopyConstructor(self):
-        '''QVariant copy constructor'''
-        obj = QVariant(1)
-        cpy = QVariant(obj)
-
-        self.assertEqual(obj.type(), cpy.type())
-
-    def testQStringConstructor(self):
-        '''QVariant(PyString).type == QVariant.string'''
-        obj = QVariant("PySide")
-        self.assertEqual(obj.type(), QVariant.String)
-
-    def testQSizeConstructor(self):
-        '''QVariant(QSize).type == QVariant.Size'''
-        mysize = QSize(0, 0)
-        variant = QVariant(mysize)
-
-        self.assertEqual(variant.type(), QVariant.Size)
-        self.assertEqual(variant.toSize(), mysize)
-
-    def testToList(self):
-        v = QVariant((1,2,3))
-        self.assertEqual(v.toList(), (1, 2, 3))
-        v = QVariant([0,1,2])
-        self.assertEqual(v.toList(), [0, 1, 2])
-
-if __name__ == '__main__':
-    unittest.main()
diff --git a/tests/qtcore/resources_mc.py b/tests/qtcore/resources_mc.py
deleted file mode 100644
index 132c8db..0000000
--- a/tests/qtcore/resources_mc.py
+++ /dev/null
@@ -1,39 +0,0 @@
-# -*- coding: utf-8 -*-
-
-# Resource object code
-#
-# Created: Thu Mar 26 11:08:45 2009
-#      by: The Resource Compiler for PyQt (Qt v4.5.0)
-#
-# WARNING! All changes made in this file will be lost!
-
-from PySide import QtCore
-
-qt_resource_data = "\
-\x00\x00\x00\x35\
-\x46\
-\x69\x6e\x65\x21\x20\x44\x69\x73\x68\x6f\x6e\x6f\x72\x21\x20\x44\
-\x69\x73\x68\x6f\x6e\x6f\x72\x20\x6f\x6e\x20\x79\x6f\x75\x2c\x20\
-\x64\x69\x73\x68\x6f\x6e\x6f\x72\x20\x6f\x6e\x20\x79\x61\x20\x63\
-\x6f\x77\x21\x0a\
-"
-
-qt_resource_name = "\
-\x00\x09\
-\x06\xa8\xaa\x74\
-\x00\x71\
-\x00\x75\x00\x6f\x00\x74\x00\x65\x00\x2e\x00\x74\x00\x78\x00\x74\
-"
-
-qt_resource_struct = "\
-\x00\x00\x00\x00\x00\x02\x00\x00\x00\x01\x00\x00\x00\x01\
-\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\x00\x00\x00\x00\
-"
-
-def qInitResources():
-    QtCore.qRegisterResourceData(0x01, qt_resource_struct, qt_resource_name, qt_resource_data)
-
-def qCleanupResources():
-    QtCore.qUnregisterResourceData(0x01, qt_resource_struct, qt_resource_name, qt_resource_data)
-
-qInitResources()
diff --git a/tests/qtdeclarative/qdeclarativeview_test.py b/tests/qtdeclarative/qdeclarativeview_test.py
deleted file mode 100644
index 8101c5f..0000000
--- a/tests/qtdeclarative/qdeclarativeview_test.py
+++ /dev/null
@@ -1,31 +0,0 @@
-'''Test cases for QDeclarativeView'''
-
-import unittest
-
-from PySide.QtCore import QUrl, QStringList, QVariant
-from PySide.QtGui import QPushButton
-from PySide.QtDeclarative import QDeclarativeView
-
-from helper import adjust_filename, TimedQApplication
-
-
-class TestQDeclarativeView(TimedQApplication):
-
-    def testQDeclarativeViewList(self):
-        view = QDeclarativeView()
-
-        dataList = QStringList(["Item 1", "Item 2", "Item 3", "Item 4"])
-
-        ctxt = view.rootContext()
-        ctxt.setContextProperty("myModel", dataList)
-
-        url = QUrl.fromLocalFile(adjust_filename('view.qml', __file__))
-        view.setSource(url)
-        view.show()
-
-        self.assertEqual(view.status(), QDeclarativeView.Ready)
-
-        self.app.exec_()
-
-if __name__ == '__main__':
-    unittest.main()
diff --git a/tests/qtgui/qlabel_pixmap_refcount.py b/tests/qtgui/qlabel_pixmap_refcount.py
deleted file mode 100644
index db8783e..0000000
--- a/tests/qtgui/qlabel_pixmap_refcount.py
+++ /dev/null
@@ -1,46 +0,0 @@
-
-'''Test cases for QLabel->pixmap refcount control'''
-
-import unittest
-import sys
-
-
-from helper import UsesQApplication
-from PySide.QtGui import QApplication, QLabel, QPixmap
-
-class QLabelTest(UsesQApplication):
-    '''Test case for constructor of QBrush'''
-
-    def testDestroyOwner(self):
-        p = QPixmap()
-        l = QLabel()
-        l.setPixmap(p)
-
-        del p
-
-        p1 = l.pixmap()
-        self.assertEqual(sys.getrefcount(p1), 2)
-        self.assertEqual(sys.getrefcount(l), 2)
-
-        del l
-        self.assertEqual(sys.getrefcount(p1), 2)
-
-
-    def testRefCount(self):
-        p = QPixmap()
-        l = QLabel()
-        l.setPixmap(p)
-
-        del p
-
-        p1 = l.pixmap()
-        self.assertEqual(sys.getrefcount(p1), 2)
-
-        p2 = l.pixmap()
-        self.assertEqual(sys.getrefcount(p2), 3)
-
-        p3 = l.pixmap()
-        self.assertEqual(sys.getrefcount(p3), 4)
-
-if __name__ == '__main__':
-    unittest.main()
diff --git a/tests/qtgui/qlayout_test.py b/tests/qtgui/qlayout_test.py
deleted file mode 100644
index ae773bb..0000000
--- a/tests/qtgui/qlayout_test.py
+++ /dev/null
@@ -1,52 +0,0 @@
-import unittest
-import sys
-
-from helper import UsesQApplication
-from PySide.QtGui import QLayout, QWidget, QPushButton, QWidgetItem
-
-class MyLayout(QLayout):
-    def __init__(self, parent=None):
-        QLayout.__init__(self, parent)
-        self._list = []
-
-    def addItem(self, item):
-        self.add(item)
-
-    def addWidget(self, widget):
-        self.add(QWidgetItem(widget))
-
-    def itemAt(self, index):
-        if index < len(self._list):
-            return self._list[index]
-
-        return None
-
-    def count(self):
-        return len(self._list)
-
-    def add(self, item):
-        self._list.append(item)
-
-
-
-#Test if a layout implemented in python, the QWidget.setLayout works 
-#fine because this implement som layout functions used in glue code of 
-#QWidget, then in c++ when call a virtual function this need call the QLayout
-#function implemented in python
-
-class QLayoutTest(UsesQApplication):
-
-    def testOwnershipTransfer(self):
-        b = QPushButton("teste")
-        l = MyLayout()
-        l.addWidget(b)
-
-        self.assertEqual(sys.getrefcount(b), 2)
-
-        w = QWidget()
-        w.setLayout(l)
-
-        self.assertEqual(sys.getrefcount(b), 3)
-
-if __name__ == '__main__':
-    unittest.main()
diff --git a/tests/qtgui/qmainwindow_test.py b/tests/qtgui/qmainwindow_test.py
deleted file mode 100644
index fce145d..0000000
--- a/tests/qtgui/qmainwindow_test.py
+++ /dev/null
@@ -1,32 +0,0 @@
-import unittest
-import sys
-
-from PySide import QtGui
-from PySide import QtCore
-
-from helper import UsesQApplication
-
-class MainWindow(QtGui.QMainWindow):
-    def __init__(self):
-        QtGui.QMainWindow.__init__(self)
-
-        self.createToolbar()
-
-    def createToolbar(self):
-        pointerButton = QtGui.QToolButton()
-        pointerToolbar = self.addToolBar("Pointer type")
-        pointerToolbar.addWidget(pointerButton)
-
-
-class TestMainWindow(UsesQApplication):
-
-    def testCreateToolbar(self):
-        w = MainWindow()
-        w.show()
-        QtCore.QTimer.singleShot(1000, self.app.quit)
-        self.app.exec_()
-
-
-if __name__ == '__main__':
-    unittest.main()
-
diff --git a/tests/qtgui/qpainter_test.py b/tests/qtgui/qpainter_test.py
deleted file mode 100644
index ad1d1e4..0000000
--- a/tests/qtgui/qpainter_test.py
+++ /dev/null
@@ -1,49 +0,0 @@
-import unittest
-
-from PySide.QtGui import QPainter, QBrush, QLinearGradient
-from PySide.QtCore import QRect, QRectF, Qt
-
-class QPainterDrawText(unittest.TestCase):
-
-    def setUp(self):
-        self.painter = QPainter()
-        self.text = 'teste!'
-
-    def tearDown(self):
-        del self.text
-        del self.painter
-
-    def testDrawText(self):
-        # bug #254
-        rect = self.painter.drawText(100, 100, 100, 100,
-                                    Qt.AlignCenter | Qt.TextWordWrap,
-                                    self.text)
-        self.assert_(isinstance(rect, QRect))
-
-    def testDrawTextWithRect(self):
-        # bug #225
-        rect = QRect(100, 100, 100, 100)
-        newRect = self.painter.drawText(rect, Qt.AlignCenter | Qt.TextWordWrap,
-                              self.text)
-
-        self.assert_(isinstance(newRect, QRect))
-
-    def testDrawTextWithRectF(self):
-        '''QPainter.drawText(QRectF, ... ,QRectF*) inject code'''
-        rect = QRectF(100, 52.3, 100, 100)
-        newRect = self.painter.drawText(rect, Qt.AlignCenter | Qt.TextWordWrap,
-                              self.text)
-
-        self.assert_(isinstance(newRect, QRectF))
-
-class SetBrushWithOtherArgs(unittest.TestCase):
-    '''Using qpainter.setBrush with args other than QBrush'''
-
-    def testSetBrushGradient(self):
-        painter = QPainter()
-        gradient = QLinearGradient(0, 0, 0, 0)
-        painter.setBrush(gradient)
-
-if __name__ == '__main__':
-    unittest.main()
-
diff --git a/tests/qtgui/qpen_test.py b/tests/qtgui/qpen_test.py
deleted file mode 100644
index f9e9b18..0000000
--- a/tests/qtgui/qpen_test.py
+++ /dev/null
@@ -1,20 +0,0 @@
-
-import unittest
-
-from PySide.QtCore import Qt
-from PySide.QtGui import QPen
-
-class QPenTest(unittest.TestCase):
-
-    def testCtorWithCreatedEnums(self):
-        '''A simple case of QPen creation using created enums.'''
-        width = 0
-        style = Qt.PenStyle(0)
-        cap = Qt.PenCapStyle(0)
-        join = Qt.PenJoinStyle(0)
-        pen = QPen(Qt.blue, width, style, cap, join)
-
-
-if __name__ == '__main__':
-    unittest.main()
-
diff --git a/tests/qtgui/qstandarditemmodel_test.py b/tests/qtgui/qstandarditemmodel_test.py
deleted file mode 100644
index d83d856..0000000
--- a/tests/qtgui/qstandarditemmodel_test.py
+++ /dev/null
@@ -1,26 +0,0 @@
-import unittest
-
-from PySide.QtGui import *
-from PySide.QtCore import *
-
-from helper import UsesQApplication
-
-class QStandardItemModelTest(UsesQApplication):
-
-    def setUp(self):
-       super(QStandardItemModelTest, self).setUp()
-       self.window = QWidget()
-       self.model = QStandardItemModel(0, 3, self.window)
-
-    def tearDown(self):
-       del self.window
-       del self.model
-       super(QStandardItemModelTest, self).tearDown()
-
-    def testInsertRow(self):
-        # bug #227
-        self.model.insertRow(0)
-
-if __name__ == '__main__':
-    unittest.main()
-
diff --git a/tests/qtgui/qvariant_test.py b/tests/qtgui/qvariant_test.py
deleted file mode 100644
index 138e432..0000000
--- a/tests/qtgui/qvariant_test.py
+++ /dev/null
@@ -1,85 +0,0 @@
-#!/usr/bin/python
-# -*- coding: utf-8 -*-
-'''Test cases for QVariant with QtGui types'''
-
-import unittest
-
-from PySide.QtCore import *
-from PySide.QtGui import *
-
-from helper import UsesQApplication
-
-class Dummy(object):
-    pass
-
-class QVariantTypeName(unittest.TestCase):
-    def testQPen(self):
-        obj = QVariant(QPen(Qt.red))
-        self.assertEqual('QPen', obj.typeName())
-
-    def testQColor(self):
-        obj = QVariant(QColor(Qt.red))
-        self.assertEqual('QColor', obj.typeName())
-
-    def testGlobalColor(self):
-        obj = QVariant(Qt.red)
-        # XXX: PyQt4 returns int instead of QColor like the C++ version
-        self.assertEqual('QColor', obj.typeName())
-
-    def testEnums(self):
-        obj = QVariant(Qt.SolidLine)
-        self.assertEqual('int', obj.typeName())
-
-class QVariantQColorImplicitlyConvertion(unittest.TestCase):
-    def testConversions(self):
-        c1 = QColor(0, 0, 0)
-        v = QVariant(c1)
-        c2 = QColor(v)
-        self.assertEqual(c1, c2)
-
-class QVariantQPixmap(UsesQApplication):
-    '''QVariant(QPixmap)'''
-
-    def testBasic(self):
-        '''QVariant(QPixmap)'''
-        pixmap = QPixmap(10,20)
-        pixmap.fill(Qt.blue)
-        variant = QVariant(pixmap)
-
-        self.assertEqual(variant.typeName(), "QPixmap")
-
-    def testQObject(self):
-        obj = QObject()
-        v = QVariant(obj)
-        self.assertEqual(v.typeName(), 'QObject*')
-
-    def testQWidget(self):
-        obj = QWidget()
-        v = QVariant(obj)
-        self.assertEqual(v.typeName(), 'QWidget*')
-
-class MyColor(QColor):
-    pass
-
-class MyPrimitive(int):
-    pass
-
-class QVariantMess(unittest.TestCase):
-    def testMyColor(self):
-        c1 = MyColor()
-        v = QVariant(c1)
-        self.assertEqual(type(v.toPyObject()), MyColor)
-
-    def testMyPrimitive(self):
-        p = MyPrimitive(3)
-        v = QVariant(p)
-        self.assertNotEqual(v.type(), QVariant.Int)
-        self.assertTrue(v.toPyObject() is p)
-
-    def testMatrix2x2(self):
-        m = QMatrix2x2()
-        v = QVariant(m)
-        self.assertEqual('QMatrix2x2', v.typeName())
-
-if __name__ == '__main__':
-    unittest.main()
diff --git a/tests/qtgui/x11_symbols.py b/tests/qtgui/x11_symbols.py
deleted file mode 100644
index 29cce15..0000000
--- a/tests/qtgui/x11_symbols.py
+++ /dev/null
@@ -1,17 +0,0 @@
-
-''' Test the presence of X11 symbols in QtGui'''
-
-import unittest
-
-from PySide.QtGui import QPixmap
-
-class X11Test(unittest.TestCase):
-
-    def test(self):
-        self.assert_('handle' in dir(QPixmap))
-        self.assert_('x11Info' in dir(QPixmap))
-        self.assert_('x11PictureHandle' in dir(QPixmap))
-        self.assert_('x11SetDefaultScreen' in dir(QPixmap))
-
-if __name__ == '__main__':
-    unittest.main()
diff --git a/tests/qtnetwork/accessManager_test.py b/tests/qtnetwork/accessManager_test.py
deleted file mode 100644
index 9a00e7e..0000000
--- a/tests/qtnetwork/accessManager_test.py
+++ /dev/null
@@ -1,23 +0,0 @@
-
-'''Test cases for QHttp'''
-
-import unittest
-
-from PySide.QtCore import *
-from PySide.QtNetwork import *
-
-from helper import UsesQApplication
-
-class AccessManagerCase(UsesQApplication):
-    def slot_replyFinished(self, reply):
-        self.assertEqual(type(reply), QNetworkReply)
-        self.app.quit()
-
-    def testNetworkRequest(self):
-        manager = QNetworkAccessManager()
-        manager.finished.connect(self.slot_replyFinished)
-        manager.get(QNetworkRequest(QUrl("http://qt.nokia.com")))
-        self.app.exec_()
-
-if __name__ == '__main__':
-    unittest.main()
diff --git a/tests/qtnetwork/http_test.py b/tests/qtnetwork/http_test.py
deleted file mode 100644
index 379ff5d..0000000
--- a/tests/qtnetwork/http_test.py
+++ /dev/null
@@ -1,67 +0,0 @@
-
-'''Test cases for QHttp'''
-
-import unittest
-
-from PySide.QtCore import *
-from PySide.QtNetwork import *
-
-from helper import UsesQApplication
-
-"""
-class HttpSignalsCase(UsesQApplication):
-    '''Test case for launching QHttp signals'''
-
-    def setUp(self):
-        super(HttpSignalsCase, self).setUp()
-
-        self.http = QHttp()
-        self.url = QUrl('http://www.google.com')
-        self.timer = QTimer.singleShot(250, self.app.quit)
-
-    def tearDown(self):
-        del self.http
-        super(HttpSignalsCase, self).tearDown()
-
-    def callback(self, ident):
-        self.called = True
-
-    def testDefaultArgs(self):
-        #QHttp signal requestStarted signal
-        # @bug 114
-        QObject.connect(self.http, SIGNAL('requestStarted(int)'), self.callback)
-        self.http.get(self.url.path())
-
-        self.app.exec_()
-        self.assert_(self.called)
-
-class testHttp(UsesQApplication):
-    def testRead(self):
-        header = QHttpRequestHeader("GET", QString(QUrl.toPercentEncoding("/index.html")))
-        header.setValue("Host", "qtsoftware.com");
-        http = QHttp()
-        http.setHost("qtsoftware.com")
-        http.request(header)
-        data = http.read(100)
-"""
-
-class testAuthenticationSignal(UsesQApplication):
-    def onAuthRequest(self, hostname, port, auth):
-        self.assert_(isinstance(auth, QAuthenticator))
-        print auth.realm()
-        self._resultOk = True
-        self.app.exit()
-
-    def testwaitSignal(self):
-        self._resultOk = False
-        http = QHttp()
-        http.setHost("projects.maemo.org", QHttp.ConnectionModeHttps, 0)
-        http.connect(SIGNAL("authenticationRequired(const QString&, quint16, QAuthenticator*)"), self.onAuthRequest)
-        path = QUrl.toPercentEncoding("/index.html", "!$&'()*+,;=:@/")
-        print http.get(path)
-        self.app.exec_()
-        self.assert_(self._resultOk)
-
-
-if __name__ == '__main__':
-    unittest.main()
diff --git a/tests/qtopengl/qglbuffer_test.py b/tests/qtopengl/qglbuffer_test.py
deleted file mode 100644
index ae23fbd..0000000
--- a/tests/qtopengl/qglbuffer_test.py
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/usr/bin/python
-'''Unit tests for QGLBuffer'''
-
-import unittest
-
-from PySide.QtCore import QByteArray
-from PySide.QtOpenGL import QGLBuffer, QGLWidget
-
-from helper import UsesQApplication
-
-class QGLBufferTest(UsesQApplication):
-    def usageCheck(self, t):
-        w = QGLWidget()
-        w.makeCurrent()
-
-        b = QGLBuffer(t)
-        self.assertEqual(b.usagePattern(), QGLBuffer.StaticDraw)
-        b.setUsagePattern(QGLBuffer.DynamicDraw)
-
-        self.assert_(b.create())
-        self.assert_(b.bufferId() != 0)
-        self.assert_(b.bind())
-
-        data = QByteArray("12345")
-        b.allocate(data)
-        self.assertEqual(b.size(), data.size())
-
-        m = b.map(QGLBuffer.ReadOnly)
-        self.assertEqual(m.data(), data.data())
-        b.unmap()
-
-        other_data = QByteArray("67")
-        b.write(0, other_data)
-        m = b.map(QGLBuffer.ReadOnly)
-        self.assertEqual(m.mid(0, other_data.size()).data(), other_data.data())
-        b.unmap()
-
-        result, rdata = b.read(0, other_data.size())
-        print result, rdata
-        self.assert_(result)
-        self.assertEqual(other_data.data(), rdata.data())
-
-        b.release()
-
-    def testUsage(self):
-        self.usageCheck(QGLBuffer.IndexBuffer)
-
-if __name__ == '__main__':
-    unittest.main()
diff --git a/tests/qtscript/test_base.py b/tests/qtscript/test_base.py
deleted file mode 100644
index 6ad27e0..0000000
--- a/tests/qtscript/test_base.py
+++ /dev/null
@@ -1,4 +0,0 @@
-from PySide import QtScript
-
-
-#only test if the module import works fine bug #278
diff --git a/tests/run_test.sh b/tests/run_test.sh
index 8671ce3..363fae5 100755
--- a/tests/run_test.sh
+++ b/tests/run_test.sh
@@ -1,13 +1,13 @@
-#!/usr/bin/python
+#!/bin/sh
 
 # This is a nasty workaround of a CTest limitation
 # of setting the environment variables for the test.
 
 # $1: LD_LIBRARY_PATH
-# $2: $PYTHON_PATH
+# $2: $PYTHONPATH
 # $3: python executable
 # $4: test file
 
-export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$1
-export PYTHONPATH=$PYTHONPATH:$2
+export LD_LIBRARY_PATH=$1:$LD_LIBRARY_PATH
+export PYTHONPATH=$2:$PYTHONPATH
 $3 $4
diff --git a/tests/signals/CMakeLists.txt b/tests/signals/CMakeLists.txt
new file mode 100644
index 0000000..7ac44b3
--- /dev/null
+++ b/tests/signals/CMakeLists.txt
@@ -0,0 +1,38 @@
+PYSIDE_TEST(args_dont_match_test.py)
+PYSIDE_TEST(bug_311.py)
+PYSIDE_TEST(bug_312.py)
+PYSIDE_TEST(bug_319.py)
+PYSIDE_TEST(decorators_test.py)
+PYSIDE_TEST(disconnect_test.py)
+PYSIDE_TEST(invalid_callback_test.py)
+PYSIDE_TEST(lambda_gui_test.py)
+PYSIDE_TEST(lambda_test.py)
+PYSIDE_TEST(leaking_signal_test.py)
+PYSIDE_TEST(multiple_connections_gui_test.py)
+PYSIDE_TEST(multiple_connections_test.py)
+PYSIDE_TEST(pysignal_test.py)
+PYSIDE_TEST(qobject_destroyed_test.py)
+PYSIDE_TEST(qobject_receivers_test.py)
+PYSIDE_TEST(qobject_sender_test.py)
+PYSIDE_TEST(ref01_test.py)
+PYSIDE_TEST(ref02_test.py)
+PYSIDE_TEST(ref03_test.py)
+PYSIDE_TEST(ref04_test.py)
+PYSIDE_TEST(ref05_test.py)
+PYSIDE_TEST(ref06_test.py)
+PYSIDE_TEST(segfault_proxyparent_test.py)
+PYSIDE_TEST(self_connect_test.py)
+PYSIDE_TEST(short_circuit_test.py)
+PYSIDE_TEST(signal2signal_connect_test.py)
+PYSIDE_TEST(signal_autoconnect_test.py)
+PYSIDE_TEST(signal_connectiontype_support_test.py)
+PYSIDE_TEST(signal_emission_gui_test.py)
+PYSIDE_TEST(signal_emission_test.py)
+PYSIDE_TEST(signal_func_test.py)
+PYSIDE_TEST(signal_manager_refcount_test.py)
+PYSIDE_TEST(signal_number_limit_test.py)
+PYSIDE_TEST(signal_object_test.py)
+PYSIDE_TEST(signal_signature_test.py)
+PYSIDE_TEST(signal_with_primitive_type_test.py)
+PYSIDE_TEST(slot_reference_count_test.py)
+PYSIDE_TEST(static_metaobject_test.py)
diff --git a/tests/signals/args_dont_match_test.py b/tests/signals/args_dont_match_test.py
index b81c568..2521167 100644
--- a/tests/signals/args_dont_match_test.py
+++ b/tests/signals/args_dont_match_test.py
@@ -1,3 +1,4 @@
+#!/usr/bin/env python
 
 import unittest
 from PySide.QtCore import *
diff --git a/tests/signals/bug_311.py b/tests/signals/bug_311.py
new file mode 100644
index 0000000..42ed5f3
--- /dev/null
+++ b/tests/signals/bug_311.py
@@ -0,0 +1,42 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+import unittest
+from PySide import QtCore
+from helper import UsesQCoreApplication
+
+class DerivedDate(QtCore.QDate):
+    def __init__(self,y,m,d):
+        super(DerivedDate,self).__init__(y,m,d)
+
+class Emitter(QtCore.QObject):
+    dateSignal1 = QtCore.Signal(QtCore.QDate)
+    dateSignal2 = QtCore.Signal(DerivedDate)
+    tupleSignal = QtCore.Signal(tuple)
+
+class SignaltoSignalTest(UsesQCoreApplication):
+    def myCb(self, dt):
+        self._dt = dt
+
+    def testBug(self):
+        e = Emitter()
+        d = DerivedDate(2010,8,24)
+        self._dt = None
+        e.dateSignal1.connect(self.myCb)
+        e.dateSignal1.emit(d)
+        self.assertEqual(self._dt, d)
+
+        self._dt = None
+        e.dateSignal2.connect(self.myCb)
+        e.dateSignal2.emit(d)
+        self.assertEqual(self._dt, d)
+
+        myTuple = (5, 6, 7)
+        self._dt = None
+        e.tupleSignal.connect(self.myCb)
+        e.tupleSignal.emit(myTuple)
+        self.assertEqual(myTuple, self._dt)
+
+if __name__ == '__main__':
+    unittest.main()
+
diff --git a/tests/signals/bug_312.py b/tests/signals/bug_312.py
new file mode 100644
index 0000000..3aa54ce
--- /dev/null
+++ b/tests/signals/bug_312.py
@@ -0,0 +1,51 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+import unittest
+import sys
+from PySide.QtCore import QObject, SIGNAL
+
+MAX_LOOPS = 5
+MAX_OBJECTS = 200
+
+class Dummy(object):
+    def __init__(self, parent):
+        self._parent = parent
+
+    def callback(self):
+        self._called = True
+
+class MultipleSlots(unittest.TestCase):
+    def myCB(self):
+        self._count += 1
+
+    """
+    def testUnboundSignal(self):
+        o = QObject()
+        self._count  = 0
+        for i in range(MAX_OBJECTS):
+            QObject.connect(o, SIGNAL("fire()"), lambda: self.myCB())
+
+        o.emit(SIGNAL("fire()"))
+        self.assertEqual(self._count, MAX_OBJECTS)
+
+    """
+    def testDisconnectCleanup(self):
+        for c in range(MAX_LOOPS):
+            self._count = 0
+            self._senders = []
+            for i in range(MAX_OBJECTS):
+                o = QObject()
+                QObject.connect(o, SIGNAL("fire()"), lambda: self.myCB())
+                self._senders.append(o)
+                o.emit(SIGNAL("fire()"))
+
+            self.assertEqual(self._count, MAX_OBJECTS)
+
+            #delete all senders will disconnect the signals
+            self._senders = []
+
+if __name__ == '__main__':
+    unittest.main()
+
+
diff --git a/tests/signals/bug_319.py b/tests/signals/bug_319.py
new file mode 100644
index 0000000..692b1bf
--- /dev/null
+++ b/tests/signals/bug_319.py
@@ -0,0 +1,35 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+import unittest
+from PySide import QtCore
+from helper import UsesQCoreApplication
+
+class Listener(QtCore.QObject):
+    def __init__(self):
+        QtCore.QObject.__init__(self, None)
+        self._phrase = []
+
+    @QtCore.Slot(tuple)
+    def listen(self, words):
+        for w in words:
+            self._phrase.append(w)
+
+class Communicate(QtCore.QObject):
+    # create a new signal on the fly and name it 'speak'
+    speak = QtCore.Signal(tuple)
+
+class SignaltoSignalTest(UsesQCoreApplication):
+    def testBug(self):
+        someone = Communicate()
+        someone2 = Listener()
+        # connect signal and slot
+        someone.speak.connect(someone2.listen)
+        # emit 'speak' signal
+        talk = ("one","two","three")
+        someone.speak.emit(talk)
+        self.assertEqual(someone2._phrase, list(talk))
+
+if __name__ == '__main__':
+    unittest.main()
+
diff --git a/tests/signals/decorators_test.py b/tests/signals/decorators_test.py
index db068d0..8ca614e 100644
--- a/tests/signals/decorators_test.py
+++ b/tests/signals/decorators_test.py
@@ -1,10 +1,8 @@
 #!/usr/bin/env python
 
-import sys
 import unittest
-import functools
 
-from PySide.QtCore import *
+from PySide.QtCore import QObject, Slot, SIGNAL, SLOT
 
 class MyObject(QObject):
     def __init__(self, parent=None):
@@ -24,7 +22,7 @@ class MyObject(QObject):
     def foo(self):
         self._slotCalledCount = self._slotCalledCount + 1
 
-    @Slot(QString, int)
+    @Slot(str, int)
     def mySlot4(self, a, b):
         self._slotCalledCount = self._slotCalledCount + 1
 
@@ -32,22 +30,26 @@ class MyObject(QObject):
     def mySlot5(self):
         self._slotCalledCount = self._slotCalledCount + 1
 
+    @Slot(result=QObject)
+    def mySlot6(self):
+        self._slotCalledCount = self._slotCalledCount + 1
+
 class StaticMetaObjectTest(unittest.TestCase):
 
     def testSignalPropagation(self):
         o = MyObject()
         m = o.metaObject()
-        self.assert_(m.indexOfSlot('mySlot()') > 0)
-        self.assert_(m.indexOfSlot('mySlot2(int)') > 0)
-        self.assert_(m.indexOfSlot('mySlot2(QString)') > 0)
-        self.assert_(m.indexOfSlot('mySlot3()') > 0)
-        self.assert_(m.indexOfSlot('mySlot4(QString,int)') > 0)
+        self.assertTrue(m.indexOfSlot('mySlot()') > 0)
+        self.assertTrue(m.indexOfSlot('mySlot2(int)') > 0)
+        self.assertTrue(m.indexOfSlot('mySlot2(QString)') > 0)
+        self.assertTrue(m.indexOfSlot('mySlot3()') > 0)
+        self.assertTrue(m.indexOfSlot('mySlot4(QString,int)') > 0)
 
     def testEmission(self):
         o = MyObject()
         o.connect(SIGNAL("mySignal()"), o, SLOT("mySlot()"))
         o.emit(SIGNAL("mySignal()"))
-        self.assert_(o._slotCalledCount == 1)
+        self.assertTrue(o._slotCalledCount == 1)
 
     def testResult(self):
         o = MyObject()
@@ -56,5 +58,20 @@ class StaticMetaObjectTest(unittest.TestCase):
         m = mo.method(i)
         self.assertEqual(m.typeName(), "int")
 
+    def testResultObject(self):
+        o = MyObject()
+        mo = o.metaObject()
+        i = mo.indexOfSlot('mySlot6()')
+        m = mo.method(i)
+        self.assertEqual(m.typeName(), "QObject*")
+
+class SlotWithoutArgs(unittest.TestCase):
+
+    def testError(self):
+        # It should be an error to call the slot without the
+        # arguments, as just @Slot would end up in a slot
+        # accepting argument functions
+        self.assertRaises(TypeError, Slot, lambda: 3)
+
 if __name__ == '__main__':
     unittest.main()
diff --git a/tests/signals/disconnect_test.py b/tests/signals/disconnect_test.py
new file mode 100644
index 0000000..cceaf87
--- /dev/null
+++ b/tests/signals/disconnect_test.py
@@ -0,0 +1,32 @@
+import unittest
+from PySide.QtCore import *
+
+class Foo(QObject):
+    bar = Signal()
+
+class TestDisconnect(unittest.TestCase):
+    def theSlot1(self):
+        self.called1 = True
+
+    def theSlot2(self):
+        self.called2 = True
+
+    def testIt(self):
+        self.called1 = False
+        self.called2 = False
+        f = Foo()
+        f.bar.connect(self.theSlot1)
+        f.bar.connect(self.theSlot2)
+        f.bar.emit()
+        self.assertTrue(self.called1)
+        self.assertTrue(self.called2)
+
+        self.called1 = False
+        self.called2 = False
+        f.bar.disconnect()
+        f.bar.emit()
+        self.assertFalse(self.called1)
+        self.assertFalse(self.called2)
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/tests/signals/lambda_gui_test.py b/tests/signals/lambda_gui_test.py
index e842ae2..ba10590 100644
--- a/tests/signals/lambda_gui_test.py
+++ b/tests/signals/lambda_gui_test.py
@@ -14,24 +14,33 @@ except ImportError:
 from helper import UsesQApplication
 
 if hasQtGui:
+    class Control:
+        def __init__(self):
+            self.arg = False
+
     class QtGuiSigLambda(UsesQApplication):
 
         def testButton(self):
             #Connecting a lambda to a QPushButton.clicked()
             obj = QPushButton('label')
-            QObject.connect(obj, SIGNAL('clicked()'),
-                            lambda: setattr(obj, 'called', True))
+            ctr = Control()
+            func = lambda: setattr(ctr, 'arg', True)
+            QObject.connect(obj, SIGNAL('clicked()'), func)
             obj.click()
-            self.assert_(obj.called)
+            self.assert_(ctr.arg)
+            QObject.disconnect(obj, SIGNAL('clicked()'), func)
+
 
         def testSpinButton(self):
             #Connecting a lambda to a QPushButton.clicked()
             obj = QSpinBox()
+            ctr = Control()
             arg = 444
-            QObject.connect(obj, SIGNAL('valueChanged(int)'),
-                            lambda x: setattr(obj, 'arg', 444))
+            func = lambda x: setattr(ctr, 'arg', 444)
+            QObject.connect(obj, SIGNAL('valueChanged(int)'), func)
             obj.setValue(444)
-            self.assertEqual(obj.arg, arg)
+            self.assertEqual(ctr.arg, arg)
+            QObject.disconnect(obj, SIGNAL('valueChanged(int)'), func)
 
 if __name__ == '__main__':
     unittest.main()
diff --git a/tests/signals/leaking_signal_test.py b/tests/signals/leaking_signal_test.py
new file mode 100644
index 0000000..984982d
--- /dev/null
+++ b/tests/signals/leaking_signal_test.py
@@ -0,0 +1,16 @@
+
+import unittest
+from PySide import QtCore
+import weakref
+
+class LeakingSignal(unittest.TestCase):
+
+    def testLeakingSignal(self):
+        # Was segfaulting when the signal was garbage collected.
+        class Emitter(QtCore.QObject):
+            my_signal = QtCore.Signal(object)
+
+        emitter = Emitter()
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/tests/signals/multiple_connections_gui_test.py b/tests/signals/multiple_connections_gui_test.py
index 72feac0..3bff7c3 100644
--- a/tests/signals/multiple_connections_gui_test.py
+++ b/tests/signals/multiple_connections_gui_test.py
@@ -12,11 +12,6 @@ except ImportError:
 
 from helper import BasicPySlotCase, UsesQApplication
 
-def random_gen(count=100, largest=99, lowest=0):
-    for i in range(count):
-        yield random.randint(lowest, largest)
-
-
 class MultipleSignalConnections(unittest.TestCase):
     '''Base class for multiple signal connection testing'''
 
@@ -55,12 +50,11 @@ if hasQtGui:
 
         def testSpinBoxValueChanged(self):
             """Multiple connections to QSpinBox.valueChanged(int)"""
-            for test in random_gen(10):
-                sender = QSpinBox()
-                #FIXME if number of receivers if higher than 50, segfaults
-                receivers = [BasicPySlotCase() for x in range(10)]
-                self.run_many(sender, 'valueChanged(int)', sender.setValue,
-                              receivers, (test,))
+            sender = QSpinBox()
+            #FIXME if number of receivers if higher than 50, segfaults
+            receivers = [BasicPySlotCase() for x in range(10)]
+            self.run_many(sender, 'valueChanged(int)', sender.setValue,
+                          receivers, (1,))
 
 if __name__ == '__main__':
     unittest.main()
diff --git a/tests/signals/multiple_connections_test.py b/tests/signals/multiple_connections_test.py
index 5daeaab..57ea898 100644
--- a/tests/signals/multiple_connections_test.py
+++ b/tests/signals/multiple_connections_test.py
@@ -1,7 +1,6 @@
 
 import sys
 import unittest
-import random
 from functools import partial
 
 from PySide.QtCore import QObject, SIGNAL, QProcess
@@ -9,11 +8,6 @@ from PySide.QtCore import QObject, SIGNAL, QProcess
 from helper import BasicPySlotCase, UsesQCoreApplication
 
 
-def random_gen(count=50, largest=49, lowest=0):
-    for i in range(count):
-        yield random.randint(lowest, largest)
-
-
 class MultipleSignalConnections(unittest.TestCase):
     '''Base class for multiple signal connection testing'''
 
@@ -28,10 +22,9 @@ class MultipleSignalConnections(unittest.TestCase):
 
         if args is None:
             args = tuple()
-
         for rec in receivers:
             rec.setUp()
-            QObject.connect(sender, SIGNAL(signal), rec.cb)
+            self.assert_(QObject.connect(sender, SIGNAL(signal), rec.cb))
             rec.args = tuple(args)
 
         emitter(*args)
@@ -49,11 +42,9 @@ class PythonMultipleSlots(UsesQCoreApplication, MultipleSignalConnections):
         class Dummy(QObject):
             pass
 
-        for test in random_gen(20):
-            sender = Dummy()
-            receivers = [BasicPySlotCase() for x in range(10)]
-            self.run_many(sender, 'foobar', partial(sender.emit,
-                          SIGNAL('foobar')), receivers, (test, ))
+        sender = Dummy()
+        receivers = [BasicPySlotCase() for x in range(10)]
+        self.run_many(sender, 'foobar', partial(sender.emit,SIGNAL('foobar')), receivers, (0, ))
 
 
 class QProcessMultipleSlots(UsesQCoreApplication, MultipleSignalConnections):
diff --git a/tests/signals/qobject_receivers_test.py b/tests/signals/qobject_receivers_test.py
index cb4c9ce..22ebb81 100644
--- a/tests/signals/qobject_receivers_test.py
+++ b/tests/signals/qobject_receivers_test.py
@@ -30,9 +30,9 @@ class TestQObjectReceivers(unittest.TestCase):
         sender = QObject()
         receiver = QObject()
         sender.connect(sender, SIGNAL("destroyed()"), cute_slot)
-        self.assertEqual(sender.receivers(SIGNAL("destroyed(  )")), 0)
+        self.assertEqual(sender.receivers(SIGNAL("destroyed( )")), 1)
         sender.connect(sender, SIGNAL("destroyed()"), receiver, SLOT("deleteLater()"))
-        self.assertEqual(sender.receivers(SIGNAL("destroyed()")), 1)
+        self.assertEqual(sender.receivers(SIGNAL("destroyed()")), 2)
         del sender
         del receiver
 
diff --git a/tests/signals/qobject_sender_test.py b/tests/signals/qobject_sender_test.py
old mode 100755
new mode 100644
diff --git a/tests/signals/ref01_test.py b/tests/signals/ref01_test.py
old mode 100755
new mode 100644
diff --git a/tests/signals/ref02_test.py b/tests/signals/ref02_test.py
old mode 100755
new mode 100644
diff --git a/tests/signals/ref03_test.py b/tests/signals/ref03_test.py
old mode 100755
new mode 100644
diff --git a/tests/signals/ref04_test.py b/tests/signals/ref04_test.py
old mode 100755
new mode 100644
diff --git a/tests/signals/ref05_test.py b/tests/signals/ref05_test.py
old mode 100755
new mode 100644
index 7c53300..90766aa
--- a/tests/signals/ref05_test.py
+++ b/tests/signals/ref05_test.py
@@ -38,7 +38,7 @@ class UserSlotTest(UsesQCoreApplication):
 
         self.app.exec_()
 
-        self.assertEqual(self.receiver.counter, 10)
+        self.assert_(self.receiver.counter > 1)
 
 
 if __name__ == '__main__':
diff --git a/tests/signals/ref06_test.py b/tests/signals/ref06_test.py
old mode 100755
new mode 100644
index 05712b3..ef7098d
--- a/tests/signals/ref06_test.py
+++ b/tests/signals/ref06_test.py
@@ -41,7 +41,7 @@ class SignaltoSignalTest(UsesQCoreApplication):
 
         self.app.exec_()
 
-        self.assertEqual(self.receiver.counter, 10)
+        self.assert_(self.receiver.counter > 1)
 
 
 if __name__ == '__main__':
diff --git a/tests/signals/segfault_proxyparent_test.py b/tests/signals/segfault_proxyparent_test.py
index 2b41f67..791e19c 100644
--- a/tests/signals/segfault_proxyparent_test.py
+++ b/tests/signals/segfault_proxyparent_test.py
@@ -54,20 +54,6 @@ class SegfaultCase(unittest.TestCase):
         self.assert_(self.called)
 
 
-    def testSameReference(self):
-        """Example of how sip(?) reuses memory positions"""
-        obj = Dummy()
-        s1 = str(obj)
-        del obj
-        obj = Dummy()
-        s2 = str(obj)
-        self.assertEqual(s1, s2)
-
-        obj2 = Dummy()
-        s3 = str(obj2)
-        self.assertNotEqual(s2, s3)
-
-
 if __name__ == '__main__':
     unittest.main()
 
diff --git a/tests/signals/signal_connectiontype_support.py b/tests/signals/signal_connectiontype_support_test.py
similarity index 100%
rename from tests/signals/signal_connectiontype_support.py
rename to tests/signals/signal_connectiontype_support_test.py
diff --git a/tests/signals/signal_emission_test.py b/tests/signals/signal_emission_test.py
index a8dd4fd..44bfd90 100644
--- a/tests/signals/signal_emission_test.py
+++ b/tests/signals/signal_emission_test.py
@@ -107,5 +107,18 @@ class EmitUnknownType(UsesQCoreApplication):
         a.connect(SIGNAL('foobar(Dummy)'), lambda x: 42) # Just connect with an unknown type
         self.assertRaises(TypeError, a.emit, SIGNAL('foobar(Dummy)'), 22)
 
+class EmitEnum(UsesQCoreApplication):
+    """Test emission of enum arguments"""
+
+    def slot(self, arg):
+        self.arg = arg
+
+    def testIt(self):
+        self.arg = None
+        p = QProcess()
+        p.stateChanged.connect(self.slot)
+        p.stateChanged.emit(QProcess.NotRunning)
+        self.assertEqual(self.arg, QProcess.NotRunning)
+
 if __name__ == '__main__':
     unittest.main()
diff --git a/tests/signals/signal_number_limit_test.py b/tests/signals/signal_number_limit_test.py
new file mode 100644
index 0000000..7226474
--- /dev/null
+++ b/tests/signals/signal_number_limit_test.py
@@ -0,0 +1,62 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+import unittest
+from PySide import QtCore
+
+class Emitter(QtCore.QObject):
+    s1 = QtCore.Signal()
+    s2 = QtCore.Signal()
+    s3 = QtCore.Signal()
+    s4 = QtCore.Signal()
+    s5 = QtCore.Signal()
+    s6 = QtCore.Signal()
+    s7 = QtCore.Signal()
+    s8 = QtCore.Signal()
+    s9 = QtCore.Signal()
+    s10 = QtCore.Signal()
+    s11 = QtCore.Signal()
+    s12 = QtCore.Signal()
+    s13 = QtCore.Signal()
+    s14 = QtCore.Signal()
+
+class SignalNumberLimitTest(unittest.TestCase):
+    def myCb(self):
+        self._count += 1
+
+    def testBug(self):
+        e = Emitter()
+        e.s1.connect(self.myCb)
+        e.s2.connect(self.myCb)
+        e.s3.connect(self.myCb)
+        e.s4.connect(self.myCb)
+        e.s5.connect(self.myCb)
+        e.s6.connect(self.myCb)
+        e.s7.connect(self.myCb)
+        e.s8.connect(self.myCb)
+        e.s9.connect(self.myCb)
+        e.s10.connect(self.myCb)
+        e.s11.connect(self.myCb)
+        e.s12.connect(self.myCb)
+        e.s13.connect(self.myCb)
+        e.s14.connect(self.myCb)
+
+        self._count = 0
+        e.s1.emit()
+        e.s2.emit()
+        e.s3.emit()
+        e.s4.emit()
+        e.s5.emit()
+        e.s6.emit()
+        e.s7.emit()
+        e.s8.emit()
+        e.s9.emit()
+        e.s10.emit()
+        e.s11.emit()
+        e.s12.emit()
+        e.s13.emit()
+        e.s14.emit()
+        self.assertEqual(self._count, 14)
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/tests/signals/signal_object_test.py b/tests/signals/signal_object_test.py
index 614c0e6..5c4e060 100644
--- a/tests/signals/signal_object_test.py
+++ b/tests/signals/signal_object_test.py
@@ -1,19 +1,17 @@
 #!/usr/bin/env python
 
-import sys
 import unittest
-import functools
 
-from PySide.QtCore import *
+from PySide.QtCore import QTimer, Signal, QObject, Slot, Qt
 from helper import UsesQCoreApplication
 
 class MyObject(QTimer):
     sig1 = Signal()
     sig2 = Signal(int, name='rangeChanged')
     sig3 = Signal(int)
-    sig4 = Signal((int,), (QString,))
-    sig5 = Signal((QString,), (int,))
-
+    sig4 = Signal((int,), (str,))
+    sig5 = Signal((str,), (int,))
+    sig6 = Signal(QObject)
 
     @Slot(int)
     def myRange(self, r):
@@ -25,6 +23,9 @@ class MyObject(QTimer):
     def slotString(self, s):
         self._s = s
 
+    def slotObject(self, o):
+        self._o = o
+
 
 class SignalObjectTest(UsesQCoreApplication):
     def cb(self):
@@ -35,7 +36,7 @@ class SignalObjectTest(UsesQCoreApplication):
         o = MyObject()
         o.sig1.connect(o.slot1)
         o.sig1.emit()
-        self.assert_(o._called)
+        self.assertTrue(o._called)
 
     def testSignalWithArgs(self):
         o = MyObject()
@@ -50,8 +51,8 @@ class SignalObjectTest(UsesQCoreApplication):
 
     def testDictOperator(self):
         o = MyObject()
-        o.sig4[QString].connect(o.slotString)
-        o.sig4[QString].emit("PySide")
+        o.sig4[str].connect(o.slotString)
+        o.sig4[str].emit("PySide")
         self.assertEqual(o._s, "PySide")
 
     def testGeneretedSignal(self):
@@ -59,24 +60,28 @@ class SignalObjectTest(UsesQCoreApplication):
         o.timeout.connect(self.cb)
         o.start(100)
         self.app.exec_()
-        self.assert_(self._cb_called)
+        self.assertTrue(self._cb_called)
 
     def testConnectionType(self):
         o = MyObject()
         o.timeout.connect(self.cb, type=Qt.DirectConnection)
         o.start(100)
         self.app.exec_()
-        self.assert_(self._cb_called)
+        self.assertTrue(self._cb_called)
 
     def testSignalWithSignal(self):
         o = MyObject()
         o.sig2.connect(o.myRange)
-        print "sig->sig", o.sig5.connect(o.sig2)
+        o.sig5.connect(o.sig2)
         o.sig5[int].emit(10)
         self.assertEqual(o._range, 10)
 
-
-
+    def testSignalWithObject(self):
+        o = MyObject()
+        o.sig6.connect(o.slotObject)
+        arg = QObject()
+        o.sig6.emit(arg)
+        self.assertEqual(arg, o._o)
 
 if __name__ == '__main__':
     unittest.main()
diff --git a/tests/signals/signal_signature_test.py b/tests/signals/signal_signature_test.py
new file mode 100644
index 0000000..001f7d6
--- /dev/null
+++ b/tests/signals/signal_signature_test.py
@@ -0,0 +1,45 @@
+# -*- coding: utf-8 -*-
+
+'''Test case for signal signature received by QObject::connectNotify().'''
+
+import unittest
+from PySide.QtCore import *
+from helper import UsesQCoreApplication
+
+class Obj(QObject):
+    def __init__(self):
+        QObject.__init__(self)
+        self.signal = ''
+
+    def connectNotify(self, signal):
+        self.signal = signal
+
+def callback(arg=None):
+    pass
+
+class TestConnectNotifyWithNewStyleSignals(UsesQCoreApplication):
+    '''Test case for signal signature received by QObject::connectNotify().'''
+
+    def testOldStyle(self):
+        sender = Obj()
+        receiver = QObject()
+        sender.connect(SIGNAL('destroyed()'), receiver, SLOT('deleteLater()'))
+        self.assertEqual(sender.signal, SIGNAL('destroyed()'))
+
+    def testOldStyleWithPythonCallback(self):
+        sender = Obj()
+        sender.connect(SIGNAL('destroyed()'), callback)
+        self.assertEqual(sender.signal, SIGNAL('destroyed()'))
+
+    def testNewStyle(self):
+        sender = Obj()
+
+        sender.destroyed.connect(callback)
+        self.assertEqual(sender.signal, SIGNAL('destroyed()'))
+
+        sender.destroyed[QObject].connect(callback)
+        self.assertEqual(sender.signal, SIGNAL('destroyed(QObject*)'))
+
+if __name__ == '__main__':
+    unittest.main()
+
diff --git a/tests/signals/static_metaobject_test.py b/tests/signals/static_metaobject_test.py
index bce711f..9d62bcd 100644
--- a/tests/signals/static_metaobject_test.py
+++ b/tests/signals/static_metaobject_test.py
@@ -2,12 +2,10 @@
 
 """Tests covering signal emission and receiving to python slots"""
 
-import sys
 import unittest
-import functools
 
-from PySide.QtCore import *
-from helper import BasicPySlotCase, UsesQCoreApplication
+from PySide.QtCore import QObject, SIGNAL
+from helper import UsesQCoreApplication
 
 class MyObject(QObject):
     def __init__(self, parent=None):
@@ -24,27 +22,21 @@ class StaticMetaObjectTest(UsesQCoreApplication):
         o = MyObject()
         o2 = MyObject()
 
-        m = o.metaObject()
         # SIGNAL foo not created yet
-        self.assertEqual(m.indexOfSignal("foo()"), -1)
+        self.assertEqual(o.metaObject().indexOfSignal("foo()"), -1)
 
         o.connect(SIGNAL("foo()"), o2.mySlot)
         # SIGNAL foo create after connect
-        self.assert_(m.indexOfSignal("foo()") > 0)
+        self.assert_(o.metaObject().indexOfSignal("foo()") > 0)
 
-        m = o2.metaObject()
-        # SIGNAL propagate to others objects of the same type
-        self.assert_(m.indexOfSignal("foo()") > 0)
+        # SIGNAL does not propagate to others objects of the same type
+        self.assertEqual(o2.metaObject().indexOfSignal("foo()"), -1)
 
         del o
-        # SIGNAL foo continues registered after deletion of original object
-        self.assert_(m.indexOfSignal("foo()") > 0)
-
         del o2
         o = MyObject()
-        m = o.metaObject()
-        # new objects still have the SIGNAL foo registered
-        self.assert_(m.indexOfSignal("foo()") > 0)
+        # The SIGNAL was destroyed with old objects
+        self.assertEqual(o.metaObject().indexOfSignal("foo()"), -1)
 
 
     def testSharedSignalEmission(self):
diff --git a/tests/signals/upstream_segfault_test.py b/tests/signals/upstream_segfault_test.py
deleted file mode 100644
index 793b04b..0000000
--- a/tests/signals/upstream_segfault_test.py
+++ /dev/null
@@ -1,64 +0,0 @@
-
-import unittest
-
-from PySide.QtCore import QObject, SIGNAL, SLOT
-
-# Upstream version of segfault_test
-
-class Dummy(QObject):
-    def __init__(self, parent=None):
-        QObject.__init__(self, parent)
-
-class Joe(QObject):
-    def __init__(self, parent=None):
-        QObject.__init__(self, parent)
-
-class SegfaultCase(unittest.TestCase):
-    """Test case for the segfault happening when parent() is called inside
-    ProxyObject"""
-
-    def setUp(self):
-        self.called = False
-
-    def tearDown(self):
-        try:
-            del self.args
-        except:
-            pass
-
-    def callback(self, *args):
-        if tuple(self.args) == args:
-            self.called = True
-
-    def testSegfault(self):
-        obj = Dummy()
-        QObject.connect(obj, SIGNAL('bar(int)'), self.callback)
-        self.args = (33,)
-        obj.emit(SIGNAL('bar(int)'), self.args[0])
-        self.assert_(self.called)
-
-        del obj
-        obj = Joe()
-        QObject.connect(obj, SIGNAL('bar(int)'), self.callback)
-        self.args = (33,)
-        obj.emit(SIGNAL('bar(int)'), self.args[0])
-        self.assert_(self.called)
-
-
-    def testSameReference(self):
-        """Example of how sip reuses an already used PyObject"""
-        obj = Dummy()
-        s1 = str(obj)
-        del obj
-        obj = Dummy()
-        s2 = str(obj)
-        self.assertEqual(s1, s2)
-
-        obj2 = Dummy()
-        s3 = str(obj2)
-        self.assertNotEqual(s2, s3)
-
-
-if __name__ == '__main__':
-    unittest.main()
-
diff --git a/tests/tools/list-class-hierarchy.py b/tests/tools/list-class-hierarchy.py
new file mode 100755
index 0000000..a4faf60
--- /dev/null
+++ b/tests/tools/list-class-hierarchy.py
@@ -0,0 +1,107 @@
+#!/usr/bin/python
+
+# This file is part of PySide: Python for Qt
+#
+# Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+#
+# Contact: PySide team <contact@pyside.org>
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# version 2 as published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+# 02110-1301 USA
+
+
+# This is a small script printing out Qt binding class hierarchies
+# for comparison purposes.
+#
+# Usage:
+#
+# ./list-class-hierarchy.py PySide > pyside.list
+# ./list-class-hierarchy.py PyQt4 > pyqt4.list
+#
+# meld pyside.list pyqt4.list
+
+import sys
+import pdb
+from inspect import isclass
+
+ignore = ["staticMetaObject",
+          "pyqtConfigure",
+          "registerUserData",
+          "thread",
+         ]
+
+def recurse_into(el,obj):
+    #s = el.split('.')[-1]
+    #pdb.set_trace()
+    symbols = []
+    for item in sorted(dir(obj)):
+        if item[0]=='_':
+            continue
+        mel = el + '.' + item
+        try:
+            mobj = eval(mel)
+        except Exception:
+            continue
+
+        if item in ignore:
+            continue
+        else:
+            symbols.append(mel)
+
+        if isclass(mobj):
+            symbols += recurse_into(mel,mobj)
+
+    return symbols
+
+if __name__=='__main__':
+    modules = [ 'QtCore',
+                'QtGui',
+                'QtHelp',
+               #'QtMultimedia',
+                'QtNetwork',
+                'QtOpenGL',
+                'QtScript',
+                'QtScriptTools',
+                'QtSql',
+                'QtSvg',
+                'QtTest',
+               #'QtUiTools',
+                'QtWebKit',
+                'QtXml',
+                'QtXmlPatterns' ]
+
+    libraries = ["PySide", "PyQt4"]
+    librarySymbols = {}
+    for l in libraries:
+        dictionary = []
+        if l =="PyQt4":
+            import sip
+            sip.setapi('QDate',2)
+            sip.setapi('QDateTime',2)
+            sip.setapi('QString',2)
+            sip.setapi('QTextStream',2)
+            sip.setapi('QTime',2)
+            sip.setapi('QUrl',2)
+            sip.setapi('QVariant',2)
+
+        for m in modules:
+            exec "from %s import %s" % (l,m) in globals(), locals()
+            dictionary += recurse_into(m, eval(m))
+        librarySymbols[l] = dictionary
+
+    print "PyQt4: ", len(librarySymbols["PyQt4"]), " PySide: ", len(librarySymbols["PySide"])
+
+    for symbol in librarySymbols["PyQt4"]:
+        if not (symbol in librarySymbols["PySide"]):
+            print "Symbol not found in PySide:", symbol
diff --git a/tests/util/helper/docmodifier.py b/tests/util/helper/docmodifier.py
index 6df8c11..4a3da2f 100644
--- a/tests/util/helper/docmodifier.py
+++ b/tests/util/helper/docmodifier.py
@@ -1,13 +1,13 @@
 
 '''Helper metaclass do 'decorate' docstrings from base test case classes'''
 
-import new
+import types
 
 
 def copy_func(func):
     '''Helper function to copy a function object (except docstring)'''
-    return new.function(func.func_code, func.func_globals, func.func_name,
-                        func.func_defaults, func.func_closure)
+    return types.FunctionType(func.func_code, func.func_globals, func.func_name,
+                              func.func_defaults, func.func_closure)
 
 
 class DocModifier(type):
diff --git a/tests/util/httpd.py b/tests/util/httpd.py
new file mode 100644
index 0000000..71ca59f
--- /dev/null
+++ b/tests/util/httpd.py
@@ -0,0 +1,149 @@
+import os
+import sys
+import threading
+import select
+import random
+import py3kcompat as py3k
+
+if py3k.IS_PY3K:
+    import socketserver as SocketServer
+    import http.server as BaseHTTPServer
+else:
+    import SocketServer
+    import BaseHTTPServer
+
+class TestHandler(BaseHTTPServer.BaseHTTPRequestHandler):
+    DATA = "PySide Server"
+    allow_reuse_address = True
+
+    def do_GET(self):
+        self.send_head()
+        self.wfile.write(TestHandler.DATA)
+
+    def do_HEAD(self):
+        self.send_head()
+
+    def send_head(self):
+        self.send_response(200)
+        self.send_header("Content-type", "text/plain")
+        self.send_header("Content-Length", str(len(TestHandler.DATA)))
+        self.end_headers()
+
+class TestSecureHandler(BaseHTTPServer.BaseHTTPRequestHandler):
+    DATA = "PySide"
+    allow_reuse_address = True
+
+    def do_GET(self):
+        self.send_head()
+        self.wfile.write(py3k.b(TestHandler.DATA))
+
+    def do_HEAD(self):
+        self.send_head()
+
+    def send_head(self):
+        try:
+            handler = self.marshall_handler()
+            handler.do_request(self)
+        except:
+            self.send_response(401)
+            self.send_header("WWW-Authenticate", "Basic realm='Secure Area'")
+            self.send_header("Content-type", "text/plain")
+            self.send_header("Content-Length", str(len(TestHandler.DATA)))
+            self.end_headers()
+
+# Workaround for the missing shutdown method in python2.5
+class CompatTCPServer(SocketServer.TCPServer):
+    def __init__(self, server_address, RequestHandlerClass):
+        SocketServer.TCPServer.__init__(self, server_address, RequestHandlerClass)
+
+        self.isPy25 = sys.version_info[0] == 2 and sys.version_info[1] == 5
+        if self.isPy25:
+            self.__is_shut_down = threading.Event()
+            self.__serving = False
+
+    def serve_forever(self, poll_interval=0.5):
+        """Handle one request at a time until shutdown.
+
+        Polls for shutdown every poll_interval seconds. Ignores
+        self.timeout. If you need to do periodic tasks, do them in
+        another thread.
+        """
+        if self.isPy25:
+            self.__serving = True
+            self.__is_shut_down.clear()
+            while self.__serving:
+                # XXX: Consider using another file descriptor or
+                # connecting to the socket to wake this up instead of
+                # polling. Polling reduces our responsiveness to a
+                # shutdown request and wastes cpu at all other times.
+                r, w, e = select.select([self], [], [], poll_interval)
+                if r:
+                    self.py25_handle_request_noblock()
+            self.__is_shut_down.set()
+        else:
+            SocketServer.TCPServer.serve_forever(self, poll_interval)
+
+    def py25_handle_request_noblock(self):
+        """Handle one request, without blocking.
+
+        I assume that select.select has returned that the socket is
+        readable before this function was called, so there should be
+        no risk of blocking in get_request().
+        """
+        if self.isPy25:
+            try:
+                request, client_address = self.get_request()
+            except socket.error:
+                return
+            if self.verify_request(request, client_address):
+                try:
+                    self.process_request(request, client_address)
+                except:
+                    self.handle_error(request, client_address)
+                    self.close_request(request)
+
+    def shutdown(self):
+        """Stops the serve_forever loop.
+
+        Blocks until the loop has finished. This must be called while
+        serve_forever() is running in another thread, or it will
+        deadlock.
+        """
+        if self.isPy25:
+            self.__serving = False
+            if not self.__is_shut_down:
+                self.__is_shut_down.wait()
+        else:
+            SocketServer.TCPServer.shutdown(self)
+
+
+class TestServer(threading.Thread):
+
+    def __init__(self, secure=False):
+        threading.Thread.__init__(self)
+
+        self._port = int(os.getenv("PYSIDE_TESTSERVER_PORT") or 12321)
+        self.keep_running = True
+
+        if secure:
+            handle = TestSecureHandler
+        else:
+            handle = TestHandler
+
+        while True:
+            try:
+                self.httpd = CompatTCPServer((''  , self._port), handle)
+                break
+            except:
+                self._port = self._port + random.randint(1, 100)
+
+    def port(self):
+        return self._port
+
+    def run(self):
+        self.httpd.serve_forever()
+
+    def shutdown(self):
+        self.httpd.shutdown()
+        self.join()
+
diff --git a/tests/util/processtimer.py b/tests/util/processtimer.py
old mode 100755
new mode 100644
diff --git a/tests/util/py2xfunctions.py b/tests/util/py2xfunctions.py
new file mode 100644
index 0000000..1ff6441
--- /dev/null
+++ b/tests/util/py2xfunctions.py
@@ -0,0 +1,18 @@
+def b(s):
+    return s
+
+def l(n):
+    return long(n)
+
+def unicode_(s):
+    if type(s) == str:
+        import codecs
+        c = codecs.lookup('utf-8')
+        s2 = c.decode(s, 'ignore')
+        return s2[0]
+    return u'%s' % s
+
+unicode = unicode
+unichr = unichr
+long = long
+buffer = buffer
diff --git a/tests/util/py3kcompat.py b/tests/util/py3kcompat.py
new file mode 100644
index 0000000..bf11290
--- /dev/null
+++ b/tests/util/py3kcompat.py
@@ -0,0 +1,34 @@
+# -*- coding: utf-8 -*-
+#
+# This file is part of the Shiboken Python Bindings Generator project.
+#
+# Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+#
+# Contact: PySide team <contact@pyside.org>
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public License
+# version 2.1 as published by the Free Software Foundation. Please
+# review the following information to ensure the GNU Lesser General
+# Public License version 2.1 requirements will be met:
+# http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+# #
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+# 02110-1301 USA
+
+import sys
+
+IS_PY3K = sys.version_info[0] == 3
+
+if IS_PY3K:
+    from py3xfunctions import b, l, unicode_, unicode, unichr, long, unichr, buffer
+else:
+    from py2xfunctions import b, l, unicode_, unicode, unichr, long, unichr, buffer
+
diff --git a/tests/util/py3xfunctions.py b/tests/util/py3xfunctions.py
new file mode 100644
index 0000000..4b8d801
--- /dev/null
+++ b/tests/util/py3xfunctions.py
@@ -0,0 +1,26 @@
+def b(s):
+    if type(s) == bytes:
+        return s
+    return bytes(s, "UTF8")
+
+def buffer_(s):
+    if s == None:
+        return None
+    elif type(s) == str:
+        return bytes(s, "UTF8")
+    elif type(s) == bytes:
+        return s
+    else:
+        memoryview(s)
+
+def l(n):
+    return n
+
+def unicode_(s):
+    return s
+
+unicode = str
+unichr = chr
+long = int
+unichr = chr
+buffer = buffer_
diff --git a/tests/util/pyqtcheck.py b/tests/util/pyqtcheck.py
old mode 100755
new mode 100644