diff options
| author | Christian Tismer <tismer@stackless.com> | 2016-10-18 18:10:08 +0200 |
|---|---|---|
| committer | Christian Tismer <tismer@stackless.com> | 2016-10-19 08:26:36 +0000 |
| commit | dc22a4e370cedc23371029543a919dec2b02a23d (patch) | |
| tree | e16b0c82a92488cc5e9ad59f5b22484a85285d60 /PySide2/QtOpenGL | |
| parent | c3d0ece2e4fff0c540201e9d803010d7b9a32a83 (diff) | |
Build QtOpenGL support
I had to correct the inheritance - QtOpenGL is dependent of QtWidgets.
QtGui is not sufficient.
Enabled the QtOpenGL tests as well.
We also prepared the transition from Qt5WebKit to Qt5WebEngine, because
since Qt 5.6 Qt5WebKit is removed and the tests are never enabled.
Task-number: PYSIDE-314
Task-number: PYSIDE-320
Change-Id: I9b6c0a92470b5a8c1cdaf2723f918bf4dcd715c0
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Diffstat (limited to 'PySide2/QtOpenGL')
| -rw-r--r-- | PySide2/QtOpenGL/CMakeLists.txt | 11 | ||||
| -rw-r--r-- | PySide2/QtOpenGL/typesystem_opengl.xml | 4 |
2 files changed, 8 insertions, 7 deletions
diff --git a/PySide2/QtOpenGL/CMakeLists.txt b/PySide2/QtOpenGL/CMakeLists.txt index e74090866..ebc08946c 100644 --- a/PySide2/QtOpenGL/CMakeLists.txt +++ b/PySide2/QtOpenGL/CMakeLists.txt @@ -16,17 +16,19 @@ ${QtOpenGL_GEN_DIR}/qglwidget_wrapper.cpp ${QtOpenGL_GEN_DIR}/qtopengl_module_wrapper.cpp ) -make_path(QtOpenGL_typesystem_path ${QtCore_SOURCE_DIR} ${QtGui_SOURCE_DIR} - ${QtCore_BINARY_DIR} ${QtGui_BINARY_DIR} - ${QtWebKit_SOURCE_DIR}) +make_path(QtOpenGL_typesystem_path ${QtCore_SOURCE_DIR} ${QtGui_SOURCE_DIR} ${QtWidgets_SOURCE_DIR} + ${QtCore_BINARY_DIR} ${QtGui_BINARY_DIR} ${QtWidgets_BINARY_DIR} + ${QtOpenGL_SOURCE_DIR}) set(QtOpenGL_include_dirs ${QtOpenGL_SOURCE_DIR} ${Qt5Core_INCLUDE_DIRS} ${Qt5Gui_INCLUDE_DIRS} + ${Qt5Widgets_INCLUDE_DIRS} ${Qt5OpenGL_INCLUDE_DIRS} ${SHIBOKEN_PYTHON_INCLUDE_DIR} ${SHIBOKEN_INCLUDE_DIR} ${libpyside_SOURCE_DIR} + ${QtWidgets_GEN_DIR} ${QtGui_GEN_DIR} ${QtCore_GEN_DIR} ${QtOpenGL_GEN_DIR} @@ -35,8 +37,9 @@ set(QtOpenGL_libraries pyside2 ${SHIBOKEN_PYTHON_LIBRARIES} ${Qt5Core_LIBRARIES} ${Qt5Gui_LIBRARIES} + ${Qt5Widgets_LIBRARIES} ${Qt5OpenGL_LIBRARIES}) -set(QtOpenGL_deps QtGui) +set(QtOpenGL_deps QtWidgets) create_pyside_module(QtOpenGL QtOpenGL_include_dirs diff --git a/PySide2/QtOpenGL/typesystem_opengl.xml b/PySide2/QtOpenGL/typesystem_opengl.xml index 8bd52783c..6a373ac8a 100644 --- a/PySide2/QtOpenGL/typesystem_opengl.xml +++ b/PySide2/QtOpenGL/typesystem_opengl.xml @@ -36,7 +36,7 @@ $QT_END_LICENSE$ --> <typesystem package="PySide2.QtOpenGL"> - <load-typesystem name="typesystem_gui.xml" generate="no" /> + <load-typesystem name="typesystem_widgets.xml" generate="no" /> <primitive-type name="GLbitfield"/> <primitive-type name="GLboolean"/> @@ -85,7 +85,6 @@ </modify-function> <!-- ### Obsolete functions and ctors --> - <modify-function signature="generateFontDisplayLists(QFont, int)" remove="all"/> <modify-function signature="QGLContext(const QGLFormat&, QPaintDevice*)" remove="all" /> <!-- ### --> </object-type> @@ -114,7 +113,6 @@ <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> |