diff options
author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-04-26 08:03:54 +0200 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-04-26 08:04:41 +0200 |
commit | 9b01aae7777c7ccde9eed1a8c55aead1524e00e5 (patch) | |
tree | c62834ca412f290485dd96d2a7522809b8fce6e1 /sources/pyside2/CMakeLists.txt | |
parent | 2156651b39fbb6717ed936c94dcd28295436e0a4 (diff) | |
parent | 0b842db3a95a44fbda3379d2093cb52f8ae2a1ff (diff) |
Merge remote-tracking branch 'origin/5.9' into 5.11
Change-Id: Id40dab17b02800199f70072115d7473041f683d8
Diffstat (limited to 'sources/pyside2/CMakeLists.txt')
-rw-r--r-- | sources/pyside2/CMakeLists.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sources/pyside2/CMakeLists.txt b/sources/pyside2/CMakeLists.txt index 41c62c67a..3e56881df 100644 --- a/sources/pyside2/CMakeLists.txt +++ b/sources/pyside2/CMakeLists.txt @@ -330,7 +330,7 @@ if(APPLE) endif() # Collect all optional modules. -set(ALL_OPTIONAL_MODULES Xml XmlPatterns Help Multimedia MultimediaWidgets OpenGL Qml Quick QuickWidgets Script ScriptTools TextToSpeech Charts Svg DataVisualization) +set(ALL_OPTIONAL_MODULES Xml XmlPatterns Help Multimedia MultimediaWidgets OpenGL Positioning Location Qml Quick QuickWidgets Script ScriptTools Sensors TextToSpeech Charts Svg DataVisualization) find_package(Qt5UiTools) if(Qt5UiTools_FOUND) list(APPEND ALL_OPTIONAL_MODULES UiTools) @@ -340,7 +340,7 @@ endif() if(WIN32) list(APPEND ALL_OPTIONAL_MODULES AxContainer) endif() -list(APPEND ALL_OPTIONAL_MODULES WebChannel WebEngineWidgets WebKit WebKitWidgets WebSockets) +list(APPEND ALL_OPTIONAL_MODULES WebChannel WebEngineCore WebEngineWidgets WebKit WebKitWidgets WebSockets) if (Qt5Core_VERSION VERSION_GREATER 5.9.3) # Depending on fixes in Qt3D list(APPEND ALL_OPTIONAL_MODULES 3DCore 3DRender 3DInput 3DLogic 3DAnimation 3DExtras) endif() |