diff options
| -rw-r--r-- | PySide2/QtScriptTools/CMakeLists.txt | 10 | ||||
| -rw-r--r-- | PySide2/QtScriptTools/typesystem_scripttools.xml | 1 | ||||
| -rw-r--r-- | tests/QtScriptTools/debugger_test.py | 6 |
3 files changed, 13 insertions, 4 deletions
diff --git a/PySide2/QtScriptTools/CMakeLists.txt b/PySide2/QtScriptTools/CMakeLists.txt index 13ec63a7..43652207 100644 --- a/PySide2/QtScriptTools/CMakeLists.txt +++ b/PySide2/QtScriptTools/CMakeLists.txt @@ -8,12 +8,14 @@ ${QtScriptTools_GEN_DIR}/qtscripttools_module_wrapper.cpp make_path(QtScriptTools_typesystem_path ${QtCore_SOURCE_DIR} ${QtGui_SOURCE_DIR} ${QtScript_SOURCE_DIR} ${QtCore_BINARY_DIR} ${QtGui_BINARY_DIR} ${QtScript_BINARY_DIR} + ${QtWidgets_SOURCE_DIR} ${QtWidgets_BINARY_DIR} ${QtScriptTools_SOURCE_DIR}) set(QtScriptTools_include_dirs ${QtScriptTools_SOURCE_DIR} ${QtScriptTools_BINARY_DIR} ${Qt5Core_INCLUDE_DIRS} ${Qt5Gui_INCLUDE_DIRS} + ${Qt5Widgets_INCLUDE_DIRS} ${Qt5Script_INCLUDE_DIRS} ${Qt5ScriptTools_INCLUDE_DIRS} ${SHIBOKEN_PYTHON_INCLUDE_DIR} @@ -21,6 +23,7 @@ set(QtScriptTools_include_dirs ${QtScriptTools_SOURCE_DIR} ${libpyside_SOURCE_DIR} ${QtCore_GEN_DIR} ${QtGui_GEN_DIR} + ${QtWidgets_GEN_DIR} ${QtScript_GEN_DIR} ) @@ -28,10 +31,11 @@ set(QtScriptTools_libraries pyside2 ${SHIBOKEN_PYTHON_LIBRARIES} ${Qt5Core_LIBRARIES} ${Qt5Gui_LIBRARIES} - ${Qt5Script_LIBRARYIES} - ${Qt5ScriptTools_LIBRARYIES}) + ${Qt5Widgets_LIBRARIES} + ${Qt5Script_LIBRARIES} + ${Qt5ScriptTools_LIBRARIES}) -set(QtScriptTools_deps QtCore QtScript QtGui) +set(QtScriptTools_deps QtCore QtScript QtGui QtWidgets) create_pyside_module(QtScriptTools QtScriptTools_include_dirs diff --git a/PySide2/QtScriptTools/typesystem_scripttools.xml b/PySide2/QtScriptTools/typesystem_scripttools.xml index 812d924f..15bda405 100644 --- a/PySide2/QtScriptTools/typesystem_scripttools.xml +++ b/PySide2/QtScriptTools/typesystem_scripttools.xml @@ -42,6 +42,7 @@ <typesystem package="PySide2.QtScriptTools"> <load-typesystem name="typesystem_script.xml" generate="no" /> <load-typesystem name="typesystem_gui.xml" generate="no" /> + <load-typesystem name="typesystem_widgets.xml" generate="no" /> <object-type name="QScriptEngineDebugger"> <enum-type name="DebuggerAction"/> diff --git a/tests/QtScriptTools/debugger_test.py b/tests/QtScriptTools/debugger_test.py index 6e27a72a..ea8e557a 100644 --- a/tests/QtScriptTools/debugger_test.py +++ b/tests/QtScriptTools/debugger_test.py @@ -62,7 +62,11 @@ class DebuggerTest(UsesQApplication): self.debugger.connect(SIGNAL('evaluationSuspended()'), self.suspended) self.debugger.connect(SIGNAL('evaluationResumed()'), self.resumed) - self.debugger.action(QScriptEngineDebugger.InterruptAction).trigger() + # For some reason StepIntoAction does not actually continue execution, and thus interrupting + # causes the test to hang. The same behavior is present in a Qt5.6 C++ code equivalent. It + # seems like a bug in QtScript, thus the interruption is commented out for now, which will + # force the test to fail. + #self.debugger.action(QScriptEngineDebugger.InterruptAction).trigger() self.engine.evaluate("3+4\n2+1\n5+1") self.assertTrue(self.has_resumed >= 1) self.assertTrue(self.has_suspended >= 1) |