diff options
| author | Tobias Hunger <tobias.hunger@qt.io> | 2019-04-08 16:07:23 +0200 |
|---|---|---|
| committer | Tobias Hunger <tobias.hunger@qt.io> | 2019-04-09 07:29:21 +0000 |
| commit | 9afc605eb5dea636d3805b0a4e14294030595da3 (patch) | |
| tree | 7bbfc82fa5c6b2e074860987f699b265b622cc79 /util/cmake | |
| parent | 3bc9586e617447be4453a7e882e7898ffdd7d8b6 (diff) | |
CMake: Fix mappings in helper.py
Some of the Qt names were wrong. Fix them and remove the work-arounds
in the library mappings.
Change-Id: I9b9afa3fb35c578e5c8d9cdef77224eb072ec8da
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'util/cmake')
| -rw-r--r-- | util/cmake/helper.py | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/util/cmake/helper.py b/util/cmake/helper.py index b2f06d1a34..5a22ff523d 100644 --- a/util/cmake/helper.py +++ b/util/cmake/helper.py @@ -69,7 +69,7 @@ def map_qt_base_library(lib: str) -> str: 'fbconvenience': 'Qt::FbSupport', 'fontdatabase_support': 'Qt::FontDatabaseSupport', 'gamepad': 'Qt::Gamepad', - 'glxconvenience': 'Qt::GlxSupport', + 'glx_support': 'Qt::GlxSupport', 'graphics_support': 'Qt::GraphicsSupport', 'gsttools': 'Qt::MultimediaGstTools', 'gui': 'Qt::Gui', @@ -82,7 +82,7 @@ def map_qt_base_library(lib: str) -> str: 'kms_support': 'Qt::KmsSupport', 'launcher-lib': 'Qt::AppManLauncher', 'lib': 'Qt::Designer', - 'linuxaccessibility': 'Qt::LinuxAccessibilitySupport', + 'linuxaccessibility_support': 'Qt::LinuxAccessibilitySupport', 'location': 'Qt::Location', 'logic': 'Qt::3DLogic', 'macextras': 'Qt::MacExtras', @@ -140,8 +140,7 @@ def map_qt_base_library(lib: str) -> str: 'uiplugin': 'Qt::UiPlugin', 'uitools': 'Qt::UiTools', 'virtualkeyboard': 'Qt::VirtualKeyboard', - 'vkconvenience': 'Qt::VulkanSupport', - 'vulkan_supportPrivate': 'Qt::VulkanSupportPrivate', + 'vulkan_support': 'Qt::VulkanSupport', 'webchannel': 'Qt::WebChannel', 'webengine': 'Qt::WebEngine', 'webenginewidgets': 'Qt::WebEngineWidgets', @@ -231,7 +230,6 @@ libray_mapping = { 'libproxy': 'LibProxy::LibProxy', 'librt': 'WrapRt', 'libudev': 'PkgConfig::Libudev', - 'linuxaccessibility_supportPrivate': 'Qt::LinuxAccessibilitySupportPrivate', 'mtdev': 'PkgConfig::Mtdev', 'odbc': 'ODBC::ODBC', 'pcre2': 'PCRE2', @@ -239,7 +237,6 @@ libray_mapping = { 'sqlite': 'SQLite::SQLite3', 'SQLite3': 'SQLite::SQLite3', 'tslib': 'PkgConfig::Tslib', - 'vulkan_supportPrivate': 'Qt::VulkanSupportPrivate', 'x11sm': '${X11_SM_LIB} ${X11_ICE_LIB}', 'xcb_icccm': 'XCB::ICCCM', 'xcb_image': 'XCB::IMAGE', |