diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-03-07 14:53:42 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-03-07 14:53:48 +0100 |
| commit | ac5d069b678bb95cd509e22c8ae9f5ef4ae0f838 (patch) | |
| tree | ae87a0b8faf8d72bb4c3bf1013ae26bc8554c155 /sources/pyside2 | |
| parent | df7c72e63c6b7aecee156db2eff726bcfb89977e (diff) | |
| parent | 507beab92fcb39e9b47d465a51d649f7ea6935d5 (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Change-Id: I622426aa55762e32f40995b72d49a3f966103b36
Diffstat (limited to 'sources/pyside2')
| -rw-r--r-- | sources/pyside2/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | sources/pyside2/PySide2/QtCore/typesystem_core_common.xml | 9 |
2 files changed, 4 insertions, 7 deletions
diff --git a/sources/pyside2/CMakeLists.txt b/sources/pyside2/CMakeLists.txt index 4db611f0d..41c62c67a 100644 --- a/sources/pyside2/CMakeLists.txt +++ b/sources/pyside2/CMakeLists.txt @@ -96,7 +96,7 @@ message(STATUS "PYTHON_CONFIG_SUFFIX: ${PYTHON_CONFIG_SUFFIX}") message(STATUS "PYTHON_SHARED_LIBRARY_SUFFIX: ${PYTHON_SHARED_LIBRARY_SUFFIX}") find_package(Shiboken2 2.0.0 REQUIRED) -find_package(Qt5 5.6.0 REQUIRED COMPONENTS Core) +find_package(Qt5 5.7 REQUIRED COMPONENTS Core) add_definitions(${Qt5Core_DEFINITIONS}) find_file(GL_H "gl.h" PATH_SUFFIXES "GL") diff --git a/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml b/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml index 11111d96c..554111e35 100644 --- a/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml +++ b/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml @@ -2374,9 +2374,6 @@ <enum-type name="UrlFormattingOption" /> <enum-type name="UserInputResolutionOption" flags="UserInputResolutionOptions"/> <enum-type name="ParsingMode"/> - <modify-documentation xpath='description/para[3]'> - <para>URLs can be represented in two forms: encoded or unencoded. The unencoded representation is suitable for showing to users, but the encoded representation is typically what you would send to a web server. For example, the unencoded URL "http://bühler.example.com" would be sent to the server as "http://xn--bhler-kva.example.com/List%20of%20applicants.xml".</para> - </modify-documentation> <extra-includes> <include file-name="QStringList" location="global"/> </extra-includes> @@ -3989,9 +3986,9 @@ <modify-documentation xpath='description/code'> <code>machine = QStateMachine() -s1 = new QState() -s11 = new QState(s1) -s12 = new QState(s1) +s1 = QState() +s11 = QState(s1) +s12 = QState(s1) s1h = QHistoryState(s1) s1h.setDefaultState(s11) |