From 09fa2b541abb3237838929dd9e975c0a977fd338 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Mon, 28 May 2018 15:23:51 +0200 Subject: Documentation: Add QtMultimediaWidgets They share the qdoc.conf file with QtMultimedia, which needs to be special-cased, similar to QQuickWidgets. Task-number: PYSIDE-363 Change-Id: I5abade0a715ff3245be2322eae42e7c93f643fc9 Reviewed-by: Alexandru Croitor --- sources/pyside2/doc/CMakeLists.txt | 2 ++ sources/pyside2/doc/qtmodules/pyside-qtmultimediawidgets.qdocconf.in | 3 +++ 2 files changed, 5 insertions(+) create mode 100644 sources/pyside2/doc/qtmodules/pyside-qtmultimediawidgets.qdocconf.in diff --git a/sources/pyside2/doc/CMakeLists.txt b/sources/pyside2/doc/CMakeLists.txt index 3105d7a09..eb9a8ad10 100644 --- a/sources/pyside2/doc/CMakeLists.txt +++ b/sources/pyside2/doc/CMakeLists.txt @@ -41,6 +41,8 @@ foreach(moduleIn ${all_module_shortnames}) set(modules 3DCore 3DRender 3DInput 3DLogic 3DAnimation "${moduleIn}") elseif ("${moduleIn}" STREQUAL "QuickWidgets") set(modules Qml Quick "${moduleIn}") + elseif ("${moduleIn}" STREQUAL "MultimediaWidgets") + set(modules Multimedia "${moduleIn}") else() set(modules "${moduleIn}") endif() diff --git a/sources/pyside2/doc/qtmodules/pyside-qtmultimediawidgets.qdocconf.in b/sources/pyside2/doc/qtmodules/pyside-qtmultimediawidgets.qdocconf.in new file mode 100644 index 000000000..5415c392c --- /dev/null +++ b/sources/pyside2/doc/qtmodules/pyside-qtmultimediawidgets.qdocconf.in @@ -0,0 +1,3 @@ +include(@QT_SRC_DIR@/../qtmultimedia/src/multimedia/doc/qtmultimedia.qdocconf) +includepaths += -I @QT_SRC_DIR@/../qtmultimedia/src/multimedia/doc +include(../pyside-config.qdocconf) -- cgit v1.2.3 From 44acd87abb025e25992a195b819d8f5cf00ea01e Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Mon, 28 May 2018 16:19:10 +0200 Subject: Documentation: Fix Qt11Extras Work around the non-standard header naming of the module in the documentation generation (see also file sources/pyside2/PySide2/QtX11Extras/QtX11Extras_global.post.h.in). Task-number: PYSIDE-363 Change-Id: I3ff8bb666513a13fde4d13693fd06bdd7866e050 Reviewed-by: Alexandru Croitor --- sources/pyside2/doc/CMakeLists.txt | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/sources/pyside2/doc/CMakeLists.txt b/sources/pyside2/doc/CMakeLists.txt index eb9a8ad10..1c2c3669e 100644 --- a/sources/pyside2/doc/CMakeLists.txt +++ b/sources/pyside2/doc/CMakeLists.txt @@ -54,7 +54,12 @@ foreach(moduleIn ${all_module_shortnames}) " -I ${QT_INCLUDE_DIR}Qt${module}/${Qt5Core_VERSION} \\\n" " -I ${QT_INCLUDE_DIR}Qt${module}/${Qt5Core_VERSION}/Qt${module} \\\n") - set(docHeaderContents "${docHeaderContents}\n#include ") + if (${moduleIn} STREQUAL "X11Extras") + set(globalHeader "QX11Info") + else() + set(globalHeader "Qt${module}") + endif() + set(docHeaderContents "${docHeaderContents}\n#include ") set(typeSystemDocXmlContents "${typeSystemDocXmlContents}\n") endforeach() endif() -- cgit v1.2.3 From 751653a4f5a73a9499d5690b93fa582208d5bd47 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Mon, 28 May 2018 15:08:22 +0200 Subject: Documentation: Fix some oversights in the index page Task-number: PYSIDE-363 Change-Id: Ib0bc82733932eb96f9d2ca42649d28bc600d8f60 Reviewed-by: Alexandru Croitor --- sources/pyside2/doc/index.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sources/pyside2/doc/index.rst b/sources/pyside2/doc/index.rst index efc3ea2fa..d505d5759 100644 --- a/sources/pyside2/doc/index.rst +++ b/sources/pyside2/doc/index.rst @@ -26,7 +26,7 @@ Qt Modules - `Qt OpenGL `_ Offers classes that make it easy to use OpenGL in Qt applications. * - `Qt PrintSupport `_ - Offers classes that make it easy to use OpenGL in Qt applications. + Provides extensive cross-platform support for printing. - `Qt Qml `_ Python API for Qt QML. * - `Qt Charts `_ @@ -75,7 +75,7 @@ Qt Modules * - `Qt X11Extras `_ Provides information about the X display configuration. - `Qt Xml `_ - Provides a stream reader and writer for XML documents. + Provides C++ implementations of SAX and DOM. * - `Qt XmlPatterns `_ Provides support for XPath, XQuery, XSLTi, and XML Schema validation. - `Qt 3D Core `_ -- cgit v1.2.3 From 8d5e491eaeb3188154135a6ef8e9400983c4bafa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simo=20F=C3=A4lt?= Date: Tue, 29 May 2018 10:00:43 +0300 Subject: Fix Pyside build Disabling some of the configurations due to fact that those are not supported yet. 32 bit windows build on 64 bit host will be re-enabled once we get 32 bit python provisioned to 64 bit windows. Change-Id: I74492ed654dfef5aaf8e02ca8e0c715a0c27d2c8 Reviewed-by: Friedemann Kleint Reviewed-by: Qt CI Bot --- coin_build_instructions.py | 8 ++++++++ coin_test_instructions.py | 8 ++++++++ 2 files changed, 16 insertions(+) diff --git a/coin_build_instructions.py b/coin_build_instructions.py index 175513570..ad4331845 100644 --- a/coin_build_instructions.py +++ b/coin_build_instructions.py @@ -89,6 +89,14 @@ def call_setup(python_ver): run_instruction(cmd, "Failed to run setup.py") def run_build_instructions(): + # Disable unsupported configs for now + if CI_HOST_OS_VER in ["WinRT_10"]: + print("Disabled " + CI_HOST_OS_VER + " from Coin configuration") + exit() + if CI_HOST_ARCH == "X86_64" and CI_TARGET_ARCH == "X86": + print("Disabled 32 bit build on 64 bit from Coin configuration, until toolchains provisioned") + exit() + # Uses default python, hopefully we have python2 installed on all hosts call_setup("") diff --git a/coin_test_instructions.py b/coin_test_instructions.py index 29b664542..c9c184dd0 100644 --- a/coin_test_instructions.py +++ b/coin_test_instructions.py @@ -72,6 +72,14 @@ def call_testrunner(python_ver, buildnro): run_instruction(cmd, "Failed to run testrunner.py") def run_test_instructions(): + # Disable unsupported configs for now + if CI_HOST_OS_VER in ["WinRT_10"]: + print("Disabled " + CI_HOST_OS_VER + " from Coin configuration") + exit() + if CI_HOST_ARCH == "X86_64" and CI_TARGET_ARCH == "X86": + print("Disabled 32 bit build on 64 bit from Coin configuration, until toolchains provisioned") + exit() + os.chdir(CI_ENV_AGENT_DIR) call_testrunner("", "0") # We know that second build was with python3 -- cgit v1.2.3