diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2017-03-21 16:07:44 +0100 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2017-03-22 10:35:57 +0000 |
| commit | 441927a98a9c1ee7cd0ab5ed481b66c69cf30453 (patch) | |
| tree | 11211893570b14367247869c7b7af9e76f4f1d98 /PySide2 | |
| parent | 67705ee7f3b2b51dea435943d071fd5b55366116 (diff) | |
Partially fix QtScriptTools/debugger_test.py
The generated module library did not include all necessary dependent
libraries (QtWdigets), which caused symbols not to be found on module
import.
The test still fails for now, due to an issue in QtScriptTools
module itself, specifically continue an interrupted evaluation does
not work.
Change-Id: I5439509a3541674fed6113d1ed73135497fc7d2a
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Diffstat (limited to 'PySide2')
| -rw-r--r-- | PySide2/QtScriptTools/CMakeLists.txt | 10 | ||||
| -rw-r--r-- | PySide2/QtScriptTools/typesystem_scripttools.xml | 1 |
2 files changed, 8 insertions, 3 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"/> |