Adding support to QtScript module.

6 files changed, 83 insertions, 3 deletions

diff --git a/PySide/CMakeLists.txt b/PySide/CMakeLists.txt
index 32f9b7c75..3f1a8aca1 100644
--- a/PySide/CMakeLists.txt
+++ b/PySide/CMakeLists.txt
@@ -33,8 +33,6 @@ 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)
@@ -75,6 +73,7 @@ HAS_QT_MODULE(QT_QTUITOOLS_FOUND QtUiTools)
 HAS_QT_MODULE(QT_QTHELP_FOUND QtHelp)
 HAS_QT_MODULE(QT_QTXMLPATTERNS_FOUND QtXmlPatterns)
 HAS_QT_MODULE(QT_QTMAEMO5_FOUND QtMaemo5)
+HAS_QT_MODULE(QT_QTSCRIPT_FOUND QtScript)
 
 HAS_QT_MODULE(QT_QTMULTIMEDIA_FOUND QtMultimedia)
 
diff --git a/PySide/QtCore/CMakeLists.txt b/PySide/QtCore/CMakeLists.txt
index 3b8bef867..35fbbc0c9 100644
--- a/PySide/QtCore/CMakeLists.txt
+++ b/PySide/QtCore/CMakeLists.txt
@@ -10,6 +10,7 @@ else()
     ${CMAKE_CURRENT_BINARY_DIR}/${BINDING_NAME}/QtCore/qabstracttransition_wrapper.cpp
     ${CMAKE_CURRENT_BINARY_DIR}/${BINDING_NAME}/QtCore/qanimationgroup_wrapper.cpp
     ${CMAKE_CURRENT_BINARY_DIR}/${BINDING_NAME}/QtCore/qeventtransition_wrapper.cpp
+    ${CMAKE_CURRENT_BINARY_DIR}/${BINDING_NAME}/QtCore/qfactoryinterface_wrapper.cpp
     ${CMAKE_CURRENT_BINARY_DIR}/${BINDING_NAME}/QtCore/qfinalstate_wrapper.cpp
     ${CMAKE_CURRENT_BINARY_DIR}/${BINDING_NAME}/QtCore/qhistorystate_wrapper.cpp
     ${CMAKE_CURRENT_BINARY_DIR}/${BINDING_NAME}/QtCore/qmargins_wrapper.cpp
diff --git a/PySide/QtCore/typesystem_core.xml b/PySide/QtCore/typesystem_core.xml
index 41d5f5399..4b181e3e2 100644
--- a/PySide/QtCore/typesystem_core.xml
+++ b/PySide/QtCore/typesystem_core.xml
@@ -2818,6 +2818,8 @@
     </inject-code>
   </add-function>
 
+  <object-type name="QFactoryInterface"/>
+
   <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."/>
diff --git a/PySide/QtScript/CMakeLists.txt b/PySide/QtScript/CMakeLists.txt
new file mode 100644
index 000000000..fda930c19
--- /dev/null
+++ b/PySide/QtScript/CMakeLists.txt
@@ -0,0 +1,47 @@
+project(QtScript)
+
+set(QtScript_SRC
+${CMAKE_CURRENT_BINARY_DIR}/PySide/QtScript/qscriptable_wrapper.cpp
+${CMAKE_CURRENT_BINARY_DIR}/PySide/QtScript/qscriptclass_wrapper.cpp
+${CMAKE_CURRENT_BINARY_DIR}/PySide/QtScript/qscriptclasspropertyiterator_wrapper.cpp
+${CMAKE_CURRENT_BINARY_DIR}/PySide/QtScript/qscriptcontext_wrapper.cpp
+${CMAKE_CURRENT_BINARY_DIR}/PySide/QtScript/qscriptcontextinfo_wrapper.cpp
+${CMAKE_CURRENT_BINARY_DIR}/PySide/QtScript/qscriptengineagent_wrapper.cpp
+${CMAKE_CURRENT_BINARY_DIR}/PySide/QtScript/qtscript_module_wrapper.cpp
+${CMAKE_CURRENT_BINARY_DIR}/PySide/QtScript/qscriptengine_wrapper.cpp
+${CMAKE_CURRENT_BINARY_DIR}/PySide/QtScript/qscriptextensioninterface_wrapper.cpp
+${CMAKE_CURRENT_BINARY_DIR}/PySide/QtScript/qscriptextensionplugin_wrapper.cpp
+${CMAKE_CURRENT_BINARY_DIR}/PySide/QtScript/qscriptprogram_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
+
+)
+
+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.so DESTINATION ${SITE_PACKAGE}/PySide)
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtScript/pyside_qtscript_python.h
+        DESTINATION include/PySide/QtScript/)
+
diff --git a/PySide/QtScript/typesystem_script.xml b/PySide/QtScript/typesystem_script.xml
new file mode 100644
index 000000000..e3603c737
--- /dev/null
+++ b/PySide/QtScript/typesystem_script.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0"?>
+<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"/>
+    <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="QScriptClassPropertyIterator"/>
+    <object-type name="QScriptContext"/>
+    <value-type name="QScriptContextInfo"/>
+    <object-type name="QScriptEngineAgent"/>
+    <object-type name="QScriptEngine"/>
+    <object-type name="QScriptExtensionInterface"/>
+    <object-type name="QScriptExtensionPlugin"/>
+    <object-type name="QScriptProgram"/>
+    <value-type name="QScriptString"/>
+    <value-type name="QScriptValue"/>
+    <object-type name="QScriptValueIterator"/>
+</typesystem>
+
diff --git a/PySide/__init__.py b/PySide/__init__.py
index b5cd62b32..d9db08ea3 100644
--- a/PySide/__init__.py
+++ b/PySide/__init__.py
@@ -1 +1 @@
-__all__ = ['QtCore', 'QtGui', 'QtNetwork', 'QtOpenGL', 'QtSql', 'QtSvg', 'QtTest', 'QtWebKit']
\ No newline at end of file
+__all__ = ['QtCore', 'QtGui', 'QtNetwork', 'QtOpenGL', 'QtSql', 'QtSvg', 'QtTest', 'QtWebKit', 'QtScript']