AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

CMake: Fix mappings in helper.py

Browse Source 
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>
This commit is contained in:
Tobias Hunger 2019-04-08 16:07:23 +02:00
parent 3bc9586e61
commit 9afc605eb5
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
util/cmake/helper.py
View File

@ -69,7 +69,7 @@ def map_qt_base_library(lib: str) -> str:
'fbconvenience': 'Qt::FbSupport', 'fbconvenience': 'Qt::FbSupport',
'fontdatabase_support': 'Qt::FontDatabaseSupport', 'fontdatabase_support': 'Qt::FontDatabaseSupport',
'gamepad': 'Qt::Gamepad', 'gamepad': 'Qt::Gamepad',
'glxconvenience': 'Qt::GlxSupport', 'glx_support': 'Qt::GlxSupport',
'graphics_support': 'Qt::GraphicsSupport', 'graphics_support': 'Qt::GraphicsSupport',
'gsttools': 'Qt::MultimediaGstTools', 'gsttools': 'Qt::MultimediaGstTools',
'gui': 'Qt::Gui', 'gui': 'Qt::Gui',
@ -82,7 +82,7 @@ def map_qt_base_library(lib: str) -> str:
'kms_support': 'Qt::KmsSupport', 'kms_support': 'Qt::KmsSupport',
'launcher-lib': 'Qt::AppManLauncher', 'launcher-lib': 'Qt::AppManLauncher',
'lib': 'Qt::Designer', 'lib': 'Qt::Designer',
'linuxaccessibility': 'Qt::LinuxAccessibilitySupport', 'linuxaccessibility_support': 'Qt::LinuxAccessibilitySupport',
'location': 'Qt::Location', 'location': 'Qt::Location',
'logic': 'Qt::3DLogic', 'logic': 'Qt::3DLogic',
'macextras': 'Qt::MacExtras', 'macextras': 'Qt::MacExtras',
@ -140,8 +140,7 @@ def map_qt_base_library(lib: str) -> str:
'uiplugin': 'Qt::UiPlugin', 'uiplugin': 'Qt::UiPlugin',
'uitools': 'Qt::UiTools', 'uitools': 'Qt::UiTools',
'virtualkeyboard': 'Qt::VirtualKeyboard', 'virtualkeyboard': 'Qt::VirtualKeyboard',
'vkconvenience': 'Qt::VulkanSupport', 'vulkan_support': 'Qt::VulkanSupport',
'vulkan_supportPrivate': 'Qt::VulkanSupportPrivate',
'webchannel': 'Qt::WebChannel', 'webchannel': 'Qt::WebChannel',
'webengine': 'Qt::WebEngine', 'webengine': 'Qt::WebEngine',
'webenginewidgets': 'Qt::WebEngineWidgets', 'webenginewidgets': 'Qt::WebEngineWidgets',
@ -231,7 +230,6 @@ libray_mapping = {
'libproxy': 'LibProxy::LibProxy', 'libproxy': 'LibProxy::LibProxy',
'librt': 'WrapRt', 'librt': 'WrapRt',
'libudev': 'PkgConfig::Libudev', 'libudev': 'PkgConfig::Libudev',
'linuxaccessibility_supportPrivate': 'Qt::LinuxAccessibilitySupportPrivate',
'mtdev': 'PkgConfig::Mtdev', 'mtdev': 'PkgConfig::Mtdev',
'odbc': 'ODBC::ODBC', 'odbc': 'ODBC::ODBC',
'pcre2': 'PCRE2', 'pcre2': 'PCRE2',
@ -239,7 +237,6 @@ libray_mapping = {
'sqlite': 'SQLite::SQLite3', 'sqlite': 'SQLite::SQLite3',
'SQLite3': 'SQLite::SQLite3', 'SQLite3': 'SQLite::SQLite3',
'tslib': 'PkgConfig::Tslib', 'tslib': 'PkgConfig::Tslib',
'vulkan_supportPrivate': 'Qt::VulkanSupportPrivate',
'x11sm': '${X11_SM_LIB} ${X11_ICE_LIB}', 'x11sm': '${X11_SM_LIB} ${X11_ICE_LIB}',
'xcb_icccm': 'XCB::ICCCM', 'xcb_icccm': 'XCB::ICCCM',
'xcb_image': 'XCB::IMAGE', 'xcb_image': 'XCB::IMAGE',