diff options
Diffstat (limited to 'sources')
| -rw-r--r-- | sources/pyside2/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | sources/pyside2/pyside_version.py | 2 | ||||
| -rw-r--r-- | sources/shiboken2/shiboken_version.py | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/sources/pyside2/CMakeLists.txt b/sources/pyside2/CMakeLists.txt index 3e56881df..027635b07 100644 --- a/sources/pyside2/CMakeLists.txt +++ b/sources/pyside2/CMakeLists.txt @@ -330,7 +330,9 @@ if(APPLE) endif() # Collect all optional modules. -set(ALL_OPTIONAL_MODULES Xml XmlPatterns Help Multimedia MultimediaWidgets OpenGL Positioning Location Qml Quick QuickWidgets Script ScriptTools Sensors TextToSpeech Charts Svg DataVisualization) +# Temporarily disable Positioning Location until +# qtlocation/987e5359ade73c4326fe102892dfc1eb1143ba9d is in qt5.git +set(ALL_OPTIONAL_MODULES Xml XmlPatterns Help Multimedia MultimediaWidgets OpenGL Qml Quick QuickWidgets Script ScriptTools Sensors TextToSpeech Charts Svg DataVisualization) find_package(Qt5UiTools) if(Qt5UiTools_FOUND) list(APPEND ALL_OPTIONAL_MODULES UiTools) diff --git a/sources/pyside2/pyside_version.py b/sources/pyside2/pyside_version.py index ed24abfc8..a883bab96 100644 --- a/sources/pyside2/pyside_version.py +++ b/sources/pyside2/pyside_version.py @@ -38,7 +38,7 @@ ############################################################################# major_version = "5" -minor_version = "11" +minor_version = "12" patch_version = "0" pre_release_version_type = "a" # e.g. "a", "b", "rc". pre_release_version = "1" # e.g "1", "2", (which means "beta1", "beta2", if type is "b") diff --git a/sources/shiboken2/shiboken_version.py b/sources/shiboken2/shiboken_version.py index ed24abfc8..a883bab96 100644 --- a/sources/shiboken2/shiboken_version.py +++ b/sources/shiboken2/shiboken_version.py @@ -38,7 +38,7 @@ ############################################################################# major_version = "5" -minor_version = "11" +minor_version = "12" patch_version = "0" pre_release_version_type = "a" # e.g. "a", "b", "rc". pre_release_version = "1" # e.g "1", "2", (which means "beta1", "beta2", if type is "b") |