diff options
author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-05-29 12:27:13 +0200 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-05-29 12:27:15 +0200 |
commit | b8b516d00a096f44a6703d77d0219b27523b4f93 (patch) | |
tree | 26b99e447136fe37b18d8457a68608d8562ecbf7 | |
parent | 7beb2809397bd49809a3e4032195f93315d8422e (diff) | |
parent | 5dc72386fb6dd90d8eb75ea04ef9d318ecf62bd2 (diff) |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: I2099b742b0c74c61deb019a64508fcfe8382e0fb
-rw-r--r-- | coin_build_instructions.py | 8 | ||||
-rw-r--r-- | coin_test_instructions.py | 8 | ||||
-rw-r--r-- | sources/pyside2/doc/CMakeLists.txt | 9 | ||||
-rw-r--r-- | sources/pyside2/doc/index.rst | 4 | ||||
-rw-r--r-- | sources/pyside2/doc/qtmodules/pyside-qtmultimediawidgets.qdocconf.in | 3 |
5 files changed, 29 insertions, 3 deletions
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 diff --git a/sources/pyside2/doc/CMakeLists.txt b/sources/pyside2/doc/CMakeLists.txt index 3105d7a09..1c2c3669e 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() @@ -52,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 <Qt${module}/Qt${module}>") + if (${moduleIn} STREQUAL "X11Extras") + set(globalHeader "QX11Info") + else() + set(globalHeader "Qt${module}") + endif() + set(docHeaderContents "${docHeaderContents}\n#include <Qt${module}/${globalHeader}>") set(typeSystemDocXmlContents "${typeSystemDocXmlContents}\n<load-typesystem name=\"Qt${module}/typesystem_${lowerModule}.xml\" generate=\"yes\"/>") endforeach() endif() 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 <PySide2/QtOpenGL/index.html>`_ Offers classes that make it easy to use OpenGL in Qt applications. * - `Qt PrintSupport <PySide2/QtPrintSupport/index.html>`_ - Offers classes that make it easy to use OpenGL in Qt applications. + Provides extensive cross-platform support for printing. - `Qt Qml <PySide2/QtQml/index.html>`_ Python API for Qt QML. * - `Qt Charts <PySide2/QtCharts/index.html>`_ @@ -75,7 +75,7 @@ Qt Modules * - `Qt X11Extras <PySide2/QtX11Extras/index.html>`_ Provides information about the X display configuration. - `Qt Xml <PySide2/QtXml/index.html>`_ - Provides a stream reader and writer for XML documents. + Provides C++ implementations of SAX and DOM. * - `Qt XmlPatterns <PySide2/QtXmlPatterns/index.html>`_ Provides support for XPath, XQuery, XSLTi, and XML Schema validation. - `Qt 3D Core <PySide2/Qt3DCore/index.html>`_ 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) |