diff options
author | Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io> | 2019-02-18 17:32:59 +0100 |
---|---|---|
committer | Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io> | 2019-02-25 09:19:07 +0000 |
commit | fe9e90cd7fd54084438815f93616e7edaa19f7cb (patch) | |
tree | 577857edccb89e483ade17de49b6e135c4ef7fe9 /sources/pyside2/PySide2/QtWebEngineWidgets | |
parent | f324cced79a004d6ecb698a01189500384d0f966 (diff) |
Add common QPrintSupport typesystem for QWebEngine
Moved around the files so we have a general QPrintSupport
typesystem that we can include in other modules that need it,
like QWebEngine.
Change-Id: Ic277c37e6b0c08b370102d1bef18cd1375239169
Task-number: PYSIDE-946
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Christian Tismer <tismer@stackless.com>
Diffstat (limited to 'sources/pyside2/PySide2/QtWebEngineWidgets')
-rw-r--r-- | sources/pyside2/PySide2/QtWebEngineWidgets/CMakeLists.txt | 4 | ||||
-rw-r--r-- | sources/pyside2/PySide2/QtWebEngineWidgets/typesystem_webenginewidgets.xml | 1 |
2 files changed, 4 insertions, 1 deletions
diff --git a/sources/pyside2/PySide2/QtWebEngineWidgets/CMakeLists.txt b/sources/pyside2/PySide2/QtWebEngineWidgets/CMakeLists.txt index 555be9c41..214ebc56b 100644 --- a/sources/pyside2/PySide2/QtWebEngineWidgets/CMakeLists.txt +++ b/sources/pyside2/PySide2/QtWebEngineWidgets/CMakeLists.txt @@ -34,6 +34,7 @@ set(QtWebEngineWidgets_include_dirs ${QtNetwork_GEN_DIR} ${QtWebChannel_GEN_DIR} ${QtWebEngineCore_GEN_DIR} + ${QtPrintSupport_GEN_DIR} ) set(QtWebEngineWidgets_libraries pyside2 ${Qt5WebEngineWidgets_LIBRARIES} @@ -42,8 +43,9 @@ set(QtWebEngineWidgets_libraries pyside2 ${Qt5Widgets_LIBRARIES} ${Qt5Gui_LIBRARIES} ${Qt5Core_LIBRARIES} + ${Qt5PrintSupport_LIBRARIES} ) -set(QtWebEngineWidgets_deps QtGui QtWidgets QtNetwork QtWebChannel) +set(QtWebEngineWidgets_deps QtGui QtWidgets QtNetwork QtWebChannel QtPrintSupport) create_pyside_module(NAME QtWebEngineWidgets INCLUDE_DIRS QtWebEngineWidgets_include_dirs LIBRARIES QtWebEngineWidgets_libraries diff --git a/sources/pyside2/PySide2/QtWebEngineWidgets/typesystem_webenginewidgets.xml b/sources/pyside2/PySide2/QtWebEngineWidgets/typesystem_webenginewidgets.xml index e51303c42..cd4cd8a91 100644 --- a/sources/pyside2/PySide2/QtWebEngineWidgets/typesystem_webenginewidgets.xml +++ b/sources/pyside2/PySide2/QtWebEngineWidgets/typesystem_webenginewidgets.xml @@ -46,6 +46,7 @@ <load-typesystem name="QtNetwork/typesystem_network.xml" generate="no"/> <load-typesystem name="QtWebChannel/typesystem_webchannel.xml" generate="no"/> <load-typesystem name="QtWebEngineCore/typesystem_webenginecore.xml" generate="no"/> + <load-typesystem name="QtPrintSupport/typesystem_printsupport.xml" generate="no"/> <object-type name="QWebEngineCertificateError"> |