--- pyside/packaging/setuptools/modules/PySide/PySide/QtCore/typesystem_core.xml	2012-02-26 16:45:08.019393500 -0500
+++ 1.0.8_modded/packaging/setuptools/modules/PySide/PySide/QtCore/typesystem_core.xml	2012-02-25 14:23:05.199157400 -0500
@@ -3342,6 +3342,7 @@ s1.addTransition(button.clicked, s1h)&lt
   </add-function>
 
   <inject-code class="native" position="beginning">
+    QT_BEGIN_NAMESPACE
     extern bool
     qRegisterResourceData(int,
                         const unsigned char *,
@@ -3353,6 +3354,7 @@ s1.addTransition(button.clicked, s1h)&lt
                             const unsigned char *,
                             const unsigned char *,
                             const unsigned char *);
+    QT_END_NAMESPACE
   </inject-code>
   <add-function signature="qRegisterResourceData(int, PyBytes, PyBytes, PyBytes)" return-type="bool">
     <inject-code class="target" position="beginning">
--- pyside/packaging/setuptools/modules/PySide/PySide/QtDeclarative/CMakeLists.txt	2012-02-26 16:45:08.019393500 -0500
+++ 1.0.8_modded/packaging/setuptools/modules/PySide/PySide/QtDeclarative/CMakeLists.txt	2012-02-25 16:53:22.043446700 -0500
@@ -47,7 +47,6 @@ set(QtDeclarative_libraries   pyside
                               ${QT_QTSVG_LIBRARY}
                               ${QT_QTSQL_LIBRARY}
                               ${QT_QTXMLPATTERNS_LIBRARY}
-                              ${QT_QTOPENGL_LIBRARY}
                               ${QT_QTDECLARATIVE_LIBRARY})
 
 set(QtDeclarative_deps QtGui QtNetwork)
--- pyside/packaging/setuptools/modules/PySide/PySide/QtGui/typesystem_gui_common.xml	2012-02-26 16:45:08.034993500 -0500
+++ 1.0.8_modded/packaging/setuptools/modules/PySide/PySide/QtGui/typesystem_gui_common.xml	2012-02-25 16:00:46.399245500 -0500
@@ -3981,6 +3981,11 @@
       <include file-name="QMessageBox" location="global"/>
       <include file-name="glue/qwidget_glue.h" location="local"/>
     </extra-includes>
+    <add-function signature="FromCObject(PyObject*)" return-type="PyObject*" static="yes">
+        <inject-code class="target" position="beginning">
+   <![CDATA[ %PYARG_0 = Shiboken::createWrapper<QWidget>((const QWidget *)PyCObject_AsVoidPtr(%1), false, false); ]]>
+        </inject-code>
+    </add-function>
 
     <enum-type name="RenderFlag" flags="RenderFlags"/>
 
--- pyside/packaging/setuptools/modules/PySide/PySide/__init__.py.in	2012-02-26 16:45:08.066193600 -0500
+++ 1.0.8_modded/packaging/setuptools/modules/PySide/PySide/__init__.py.in	2012-02-25 16:54:11.003027400 -0500
@@ -1,6 +1,6 @@
 import sys
 
-__all__ = ['QtCore', 'QtGui', 'QtNetwork', 'QtOpenGL', 'QtSql', 'QtSvg', 'QtTest', 'QtWebKit', 'QtScript']
+__all__ = ['QtCore', 'QtGui', 'QtNetwork', 'QtSql', 'QtSvg', 'QtTest', 'QtWebKit', 'QtScript']
 
 if sys.version_info[0] < 3:
     import private
--- pyside/packaging/setuptools/modules/PySide/PySide/CMakeLists.txt	2012-02-26 16:45:08.003793500 -0500
+++ 1.0.8_modded/packaging/setuptools/modules/PySide/PySide/CMakeLists.txt	2012-02-25 17:14:09.300383400 -0500
@@ -19,7 +19,7 @@ HAS_QT_MODULE(QT_QTWEBKIT_FOUND QtWebKit
 HAS_QT_MODULE(QT_QTSVG_FOUND QtSvg)
 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_QTOPENGL_FOUND QtOpenGL)
 HAS_QT_MODULE(QT_QTSQL_FOUND QtSql)
 if(QT_QTDESIGNER_FOUND)
     HAS_QT_MODULE(QT_QTUITOOLS_FOUND QtUiTools)
@@ -30,7 +30,7 @@ HAS_QT_MODULE(QT_QTMAEMO5_FOUND QtMaemo5
 HAS_QT_MODULE(QT_QTSCRIPT_FOUND QtScript)
 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_PHONON_FOUND phonon)
 HAS_QT_MODULE(QT_QTDECLARATIVE_FOUND QtDeclarative)
 
 # install
--- pyside/packaging/setuptools/modules/PySide/CMakeLists.txt	2012-02-26 16:45:08.003793500 -0500
+++ 1.0.8_modded/packaging/setuptools/modules/PySide/CMakeLists.txt	2012-02-25 13:29:09.704745400 -0500
@@ -21,6 +21,10 @@ if(USE_XVFB)
     endif()
 endif()
 
+IF (NOT $ENV{QT_NAMESPACE} STREQUAL "")
+  add_definitions(-DQT_NAMESPACE=$ENV{QT_NAMESPACE})
+ENDIF (NOT $ENV{QT_NAMESPACE} STREQUAL "")
+
 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)" )
--- pyside/packaging/setuptools/modules/Shiboken/CMakeLists.txt	2012-02-26 16:44:57.988575900 -0500
+++ 1.0.8_modded/packaging/setuptools/modules/Shiboken/CMakeLists.txt	2012-02-25 13:38:06.634697200 -0500
@@ -17,6 +17,10 @@ set(shiboken_MINOR_VERSION "0")
 set(shiboken_MICRO_VERSION "9")
 set(shiboken_VERSION "${shiboken_MAJOR_VERSION}.${shiboken_MINOR_VERSION}.${shiboken_MICRO_VERSION}")
 
+IF (NOT $ENV{QT_NAMESPACE} STREQUAL "")
+  add_definitions(-DQT_NAMESPACE=$ENV{QT_NAMESPACE})
+ENDIF (NOT $ENV{QT_NAMESPACE} STREQUAL "")
+
 option(BUILD_TESTS "Build tests." TRUE)
 option(USE_PYTHON3 "Use python3 libraries to build shiboken." FALSE)
 
--- pyside/packaging/setuptools/modules/Generatorrunner/CMakeLists.txt	2012-02-26 16:44:43.752949800 -0500
+++ 1.0.8_modded/packaging/setuptools/modules/Generatorrunner/CMakeLists.txt	2012-02-25 13:26:34.942928700 -0500
@@ -10,6 +10,10 @@ option(INSTALL_TESTS "Install tests" FAL
 option(TEST_INSTALL_DIR "Test install directory" FALSE)
 option(ENABLE_VERSION_SUFFIX "Used to use current version in suffix to generated files. This is used to allow multiples versions installed simultaneous." FALSE)
 
+IF (NOT $ENV{QT_NAMESPACE} STREQUAL "")
+  add_definitions(-DQT_NAMESPACE=$ENV{QT_NAMESPACE})
+ENDIF (NOT $ENV{QT_NAMESPACE} STREQUAL "")
+
 if(MSVC)
     set(CMAKE_CXX_FLAGS "/Zc:wchar_t- /EHsc /DWIN32 /D_WINDOWS /D_SCL_SECURE_NO_WARNINGS")
 else()
--- pyside/packaging/setuptools/modules/Apiextractor/CMakeLists.txt	2012-02-26 16:44:11.804093700 -0500
+++ 1.0.8_modded/packaging/setuptools/modules/Apiextractor/CMakeLists.txt	2012-02-25 14:59:57.637749100 -0500
@@ -59,6 +59,7 @@ add_definitions(${QT_DEFINITIONS})
 add_definitions(-DQT_PLUGIN)
 add_definitions(-DQT_SHARED)
 add_definitions(-DRXX_ALLOCATOR_INIT_0)
+add_definitions(-DQT_NAMESPACE=$ENV{QT_NAMESPACE})
 
 if(ENABLE_VERSION_SUFFIX)
     set(apiextractor_SUFFIX "-${apiextractor_MAJOR_VERSION}.${apiextractor_MINOR_VERSION}")
--- pyside/packaging/setuptools/modules/PySide/libpyside/signalmanager.h	2012-02-26 16:43:52.413259700 -0500
+++ 1.0.8_modded/packaging/setuptools/modules/PySide/libpyside/signalmanager.h	2012-02-25 13:28:24.864682700 -0500
@@ -29,8 +29,11 @@
 #include <QStringList>
 #include <QMetaMethod>
 #include <QMetaType>
+#include <QtCore/qnamespace.h>
 
+QT_BEGIN_NAMESPACE
 class QObject;
+QT_END_NAMESPACE
 
 namespace PySide
 {
--- pyside/packaging/setuptools/modules/PySide/PySide/global.h.in	2012-02-26 16:43:52.070059000 -0500
+++ 1.0.8_modded/packaging/setuptools/modules/PySide/PySide/global.h.in	2012-02-25 16:52:18.518755200 -0500
@@ -412,8 +412,8 @@ QT_END_HEADER
 //QtHelp need be included after QtSql
 #include "@QT_QTHELP_INCLUDE_DIR@/QtHelp"
 
-#ifndef QT_NO_OPENGL
-#include <@GL_H@>
-#include <@QT_QTOPENGL_INCLUDE_DIR@/QtOpenGL>
-#endif // QT_NO_OPENGL
+//#ifndef QT_NO_OPENGL
+//#include <@GL_H@>
+//#include <@QT_QTOPENGL_INCLUDE_DIR@/QtOpenGL>
+//#endif // QT_NO_OPENGL
 
--- pyside/packaging/setuptools/modules/Generatorrunner/generator.h	2012-02-26 16:43:35.440429800 -0500
+++ 1.0.8_modded/packaging/setuptools/modules/Generatorrunner/generator.h	2012-02-25 13:26:11.630896000 -0500
@@ -29,10 +29,13 @@
 #include <QtCore/QLinkedList>
 #include <abstractmetalang.h>
 #include "generatorrunnermacros.h"
+ #include <QtCore/qnamespace.h>
 
 class ApiExtractor;
 class AbstractMetaBuilder;
+QT_BEGIN_NAMESPACE
 class QFile;
+QT_END_NAMESPACE
 
 #define EXPORT_GENERATOR_PLUGIN(X)\
 extern "C" GENRUNNER_EXPORT void getGenerators(GeneratorList* list)\
--- pyside/packaging/setuptools/modules/Apiextractor/parser/rpp/preprocessor.h	2012-02-26 16:43:31.306422600 -0500
+++ 1.0.8_modded/packaging/setuptools/modules/Apiextractor/parser/rpp/preprocessor.h	2012-02-25 15:02:35.537970200 -0500
@@ -29,7 +29,10 @@
 #include <QtCore/qstring.h>
 #include <QtCore/qstringlist.h>
 
+QT_BEGIN_NAMESPACE
 class QByteArray;
+QT_END_NAMESPACE
+
 class PreprocessorPrivate;
 
 class Preprocessor
--- pyside/packaging/setuptools/modules/Apiextractor/parser/ast.h	2012-02-26 16:43:31.275222500 -0500
+++ 1.0.8_modded/packaging/setuptools/modules/Apiextractor/parser/ast.h	2012-02-25 15:01:54.497912700 -0500
@@ -26,10 +26,13 @@
 #ifndef AST_H
 #define AST_H
 
+#include <qglobal.h>
 #include "smallobject.h"
 #include "list.h"
 
+QT_BEGIN_NAMESPACE
 class QString;
+QT_END_NAMESPACE
 
 #define DECLARE_AST_NODE(k) \
     enum { __node_kind = Kind_##k };
--- pyside/packaging/setuptools/modules/Apiextractor/parser/compiler_utils.h	2012-02-26 16:43:31.275222500 -0500
+++ 1.0.8_modded/packaging/setuptools/modules/Apiextractor/parser/compiler_utils.h	2012-02-25 15:02:18.367946200 -0500
@@ -30,8 +30,11 @@
 
 #include "codemodel.h"
 
+QT_BEGIN_NAMESPACE
 class QString;
 class QStringList;
+QT_END_NAMESPACE
+
 struct TypeSpecifierAST;
 struct DeclaratorAST;
 class TokenStream;
--- pyside/packaging/setuptools/modules/Apiextractor/apiextractor.h	2012-02-26 16:43:31.228422400 -0500
+++ 1.0.8_modded/packaging/setuptools/modules/Apiextractor/apiextractor.h	2012-02-25 15:00:16.217775100 -0500
@@ -30,7 +30,10 @@
 #include <QStringList>
 
 class AbstractMetaBuilder;
+
+QT_BEGIN_NAMESPACE
 class QIODevice;
+QT_END_NAMESPACE
 
 class APIEXTRACTOR_API ApiExtractor
 {
--- pyside/packaging/setuptools/modules/Apiextractor/docparser.h	2012-02-26 16:43:31.259622500 -0500
+++ 1.0.8_modded/packaging/setuptools/modules/Apiextractor/docparser.h	2012-02-25 15:00:32.927798500 -0500
@@ -28,9 +28,11 @@
 
 #include "abstractmetalang.h"
 
+QT_BEGIN_NAMESPACE
 class QDomDocument;
 class QDomNode;
 class QXmlQuery;
+QT_END_NAMESPACE
 
 class APIEXTRACTOR_API DocParser
 {
--- pyside/packaging/setuptools/modules/Apiextractor/include.h	2012-02-26 16:43:31.275222500 -0500
+++ 1.0.8_modded/packaging/setuptools/modules/Apiextractor/include.h	2012-02-25 15:05:58.555054400 -0500
@@ -28,7 +28,9 @@
 #include <QString>
 #include <QList>
 
+QT_BEGIN_NAMESPACE
 class QTextStream;
+QT_END_NAMESPACE
 
 class APIEXTRACTOR_API Include
 {
--- pyside/packaging/setuptools/modules/Apiextractor/reporthandler.h	2012-02-26 16:43:31.306422600 -0500
+++ 1.0.8_modded/packaging/setuptools/modules/Apiextractor/reporthandler.h	2012-02-25 15:06:18.175081900 -0500
@@ -21,10 +21,15 @@
  *
  */
 
+#include "include.h"
+
 #ifndef REPORTHANDLER_H
 #define REPORTHANDLER_H
 
+QT_BEGIN_NAMESPACE
 class QString;
+QT_END_NAMESPACE
+
 #include "apiextractormacros.h"
 
 class APIEXTRACTOR_API ReportHandler
--- pyside/packaging/setuptools/modules/Apiextractor/typesystem.h	2012-02-26 16:43:31.368822700 -0500
+++ 1.0.8_modded/packaging/setuptools/modules/Apiextractor/typesystem.h	2012-02-25 15:01:21.817867000 -0500
@@ -39,7 +39,10 @@
 class Indentor;
 
 class AbstractMetaType;
+
+QT_BEGIN_NAMESPACE
 class QTextStream;
+QT_END_NAMESPACE
 
 class EnumTypeEntry;
 class FlagsTypeEntry;