pro2cmake: Add LibraryMapping.components

LibraryMapping.components is a list that holds the sub-components of a
CMake package.  Before, we held this information in
LibraryMapping.extra as find_package argument.

A subsequent patch will make use of LibraryMapping.components and
doesn't have to do find_package argument parsing.

Change-Id: Ie0d317245fb6ec1511e06b2e14c364292fced63a
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>

1 files changed, 188 insertions, 248 deletions

diff --git a/util/cmake/helper.py b/util/cmake/helper.py
index e924e272bb..900975de36 100644
--- a/util/cmake/helper.py
+++ b/util/cmake/helper.py
@@ -39,6 +39,7 @@ class LibraryMapping:
         *,
         resultVariable: typing.Optional[str] = None,
         extra: typing.List[str] = [],
+        components: typing.Optional[typing.List[str]] = None,
         appendFoundSuffix: bool = True,
         emit_if: str = "",
         is_bundled_with_qt: bool = False,
@@ -52,6 +53,7 @@ class LibraryMapping:
         self.appendFoundSuffix = appendFoundSuffix
         # Allows passing addiitonal arguments to the generated find_package call.
         self.extra = extra
+        self.components = components
         self.targetName = targetName
 
         # True if qt bundles the library sources as part of Qt.
@@ -77,360 +79,300 @@ class LibraryMapping:
 
 _qt_library_map = [
     # Qt:
-    LibraryMapping(
-        "androidextras", "Qt6", "Qt::AndroidExtras", extra=["COMPONENTS", "AndroidExtras"]
-    ),
-    LibraryMapping("3danimation", "Qt6", "Qt::3DAnimation", extra=["COMPONENTS", "3DAnimation"]),
-    LibraryMapping("3dcore", "Qt6", "Qt::3DCore", extra=["COMPONENTS", "3DCore"]),
-    LibraryMapping("3dcoretest", "Qt6", "Qt::3DCoreTest", extra=["COMPONENTS", "3DCoreTest"]),
-    LibraryMapping("3dextras", "Qt6", "Qt::3DExtras", extra=["COMPONENTS", "3DExtras"]),
-    LibraryMapping("3dinput", "Qt6", "Qt::3DInput", extra=["COMPONENTS", "3DInput"]),
-    LibraryMapping("3dlogic", "Qt6", "Qt::3DLogic", extra=["COMPONENTS", "3DLogic"]),
-    LibraryMapping("3dquick", "Qt6", "Qt::3DQuick", extra=["COMPONENTS", "3DQuick"]),
-    LibraryMapping(
-        "3dquickextras", "Qt6", "Qt::3DQuickExtras", extra=["COMPONENTS", "3DQuickExtras"]
-    ),
-    LibraryMapping("3dquickinput", "Qt6", "Qt::3DQuickInput", extra=["COMPONENTS", "3DQuickInput"]),
-    LibraryMapping(
-        "3dquickrender", "Qt6", "Qt::3DQuickRender", extra=["COMPONENTS", "3DQuickRender"]
-    ),
-    LibraryMapping("3drender", "Qt6", "Qt::3DRender", extra=["COMPONENTS", "3DRender"]),
-    LibraryMapping(
-        "application-lib", "Qt6", "Qt::AppManApplication", extra=["COMPONENTS", "AppManApplication"]
-    ),
-    LibraryMapping("axbase", "Qt6", "Qt::AxBasePrivate", extra=["COMPONENTS", "AxBasePrivate"]),
-    LibraryMapping("axcontainer", "Qt6", "Qt::AxContainer", extra=["COMPONENTS", "AxContainer"]),
-    LibraryMapping("axserver", "Qt6", "Qt::AxServer", extra=["COMPONENTS", "AxServer"]),
-    LibraryMapping("bluetooth", "Qt6", "Qt::Bluetooth", extra=["COMPONENTS", "Bluetooth"]),
-    LibraryMapping("bootstrap", "Qt6", "Qt::Bootstrap", extra=["COMPONENTS", "Bootstrap"]),
+    LibraryMapping("androidextras", "Qt6", "Qt::AndroidExtras", components=["AndroidExtras"]),
+    LibraryMapping("3danimation", "Qt6", "Qt::3DAnimation", components=["3DAnimation"]),
+    LibraryMapping("3dcore", "Qt6", "Qt::3DCore", components=["3DCore"]),
+    LibraryMapping("3dcoretest", "Qt6", "Qt::3DCoreTest", components=["3DCoreTest"]),
+    LibraryMapping("3dextras", "Qt6", "Qt::3DExtras", components=["3DExtras"]),
+    LibraryMapping("3dinput", "Qt6", "Qt::3DInput", components=["3DInput"]),
+    LibraryMapping("3dlogic", "Qt6", "Qt::3DLogic", components=["3DLogic"]),
+    LibraryMapping("3dquick", "Qt6", "Qt::3DQuick", components=["3DQuick"]),
+    LibraryMapping("3dquickextras", "Qt6", "Qt::3DQuickExtras", components=["3DQuickExtras"]),
+    LibraryMapping("3dquickinput", "Qt6", "Qt::3DQuickInput", components=["3DQuickInput"]),
+    LibraryMapping("3dquickrender", "Qt6", "Qt::3DQuickRender", components=["3DQuickRender"]),
+    LibraryMapping("3drender", "Qt6", "Qt::3DRender", components=["3DRender"]),
+    LibraryMapping(
+        "application-lib", "Qt6", "Qt::AppManApplication", components=["AppManApplication"]
+    ),
+    LibraryMapping("axbase", "Qt6", "Qt::AxBasePrivate", components=["AxBasePrivate"]),
+    LibraryMapping("axcontainer", "Qt6", "Qt::AxContainer", components=["AxContainer"]),
+    LibraryMapping("axserver", "Qt6", "Qt::AxServer", components=["AxServer"]),
+    LibraryMapping("bluetooth", "Qt6", "Qt::Bluetooth", components=["Bluetooth"]),
+    LibraryMapping("bootstrap", "Qt6", "Qt::Bootstrap", components=["Bootstrap"]),
     # bootstrap-dbus: Not needed in Qt6!
-    LibraryMapping("client", "Qt6", "Qt::WaylandClient", extra=["COMPONENTS", "WaylandClient"]),
-    LibraryMapping("coap", "Qt6", "Qt::Coap", extra=["COMPONENTS", "Coap"]),
-    LibraryMapping("common-lib", "Qt6", "Qt::AppManCommon", extra=["COMPONENTS", "AppManCommon"]),
-    LibraryMapping(
-        "compositor", "Qt6", "Qt::WaylandCompositor", extra=["COMPONENTS", "WaylandCompositor"]
-    ),
-    LibraryMapping("concurrent", "Qt6", "Qt::Concurrent", extra=["COMPONENTS", "Concurrent"]),
-    LibraryMapping("container", "Qt6", "Qt::AxContainer", extra=["COMPONENTS", "AxContainer"]),
-    LibraryMapping("control", "Qt6", "Qt::AxServer", extra=["COMPONENTS", "AxServer"]),
-    LibraryMapping(
-        "core_headers", "Qt6", "Qt::WebEngineCore", extra=["COMPONENTS", "WebEngineCore"]
-    ),
-    LibraryMapping("core", "Qt6", "Qt::Core", extra=["COMPONENTS", "Core"]),
-    LibraryMapping("crypto-lib", "Qt6", "Qt::AppManCrypto", extra=["COMPONENTS", "AppManCrypto"]),
-    LibraryMapping("dbus", "Qt6", "Qt::DBus", extra=["COMPONENTS", "DBus"]),
-    LibraryMapping("designer", "Qt6", "Qt::Designer", extra=["COMPONENTS", "Designer"]),
+    LibraryMapping("client", "Qt6", "Qt::WaylandClient", components=["WaylandClient"]),
+    LibraryMapping("coap", "Qt6", "Qt::Coap", components=["Coap"]),
+    LibraryMapping("common-lib", "Qt6", "Qt::AppManCommon", components=["AppManCommon"]),
+    LibraryMapping("compositor", "Qt6", "Qt::WaylandCompositor", components=["WaylandCompositor"]),
+    LibraryMapping("concurrent", "Qt6", "Qt::Concurrent", components=["Concurrent"]),
+    LibraryMapping("container", "Qt6", "Qt::AxContainer", components=["AxContainer"]),
+    LibraryMapping("control", "Qt6", "Qt::AxServer", components=["AxServer"]),
+    LibraryMapping("core_headers", "Qt6", "Qt::WebEngineCore", components=["WebEngineCore"]),
+    LibraryMapping("core", "Qt6", "Qt::Core", components=["Core"]),
+    LibraryMapping("crypto-lib", "Qt6", "Qt::AppManCrypto", components=["AppManCrypto"]),
+    LibraryMapping("dbus", "Qt6", "Qt::DBus", components=["DBus"]),
+    LibraryMapping("designer", "Qt6", "Qt::Designer", components=["Designer"]),
     LibraryMapping(
         "designercomponents",
         "Qt6",
         "Qt::DesignerComponentsPrivate",
-        extra=["COMPONENTS", "DesignerComponentsPrivate"],
+        components=["DesignerComponentsPrivate"],
     ),
     LibraryMapping(
         "devicediscovery",
         "Qt6",
         "Qt::DeviceDiscoverySupportPrivate",
-        extra=["COMPONENTS", "DeviceDiscoverySupportPrivate"],
+        components=["DeviceDiscoverySupportPrivate"],
     ),
     LibraryMapping(
         "devicediscovery_support",
         "Qt6",
         "Qt::DeviceDiscoverySupportPrivate",
-        extra=["COMPONENTS", "DeviceDiscoverySupportPrivate"],
+        components=["DeviceDiscoverySupportPrivate"],
     ),
-    LibraryMapping("edid", "Qt6", "Qt::EdidSupport", extra=["COMPONENTS", "EdidSupport"]),
-    LibraryMapping("edid_support", "Qt6", "Qt::EdidSupport", extra=["COMPONENTS", "EdidSupport"]),
-    LibraryMapping("eglconvenience", "Qt6", "Qt::EglSupport", extra=["COMPONENTS", "EglSupport"]),
+    LibraryMapping("edid", "Qt6", "Qt::EdidSupport", components=["EdidSupport"]),
+    LibraryMapping("edid_support", "Qt6", "Qt::EdidSupport", components=["EdidSupport"]),
+    LibraryMapping("eglconvenience", "Qt6", "Qt::EglSupport", components=["EglSupport"]),
     LibraryMapping(
         "eglfsdeviceintegration",
         "Qt6",
         "Qt::EglFSDeviceIntegrationPrivate",
-        extra=["COMPONENTS", "EglFSDeviceIntegrationPrivate"],
+        components=["EglFSDeviceIntegrationPrivate"],
     ),
     LibraryMapping(
         "eglfs_kms_support",
         "Qt6",
         "Qt::EglFsKmsSupportPrivate",
-        extra=["COMPONENTS", "EglFsKmsSupportPrivate"],
+        components=["EglFsKmsSupportPrivate"],
     ),
     LibraryMapping(
         "eglfs_kms_gbm_support",
         "Qt6",
         "Qt::EglFsKmsGbmSupportPrivate",
-        extra=["COMPONENTS", "EglFsKmsGbmSupportPrivate"],
+        components=["EglFsKmsGbmSupportPrivate"],
     ),
-    LibraryMapping("egl_support", "Qt6", "Qt::EglSupport", extra=["COMPONENTS", "EglSupport"]),
+    LibraryMapping("egl_support", "Qt6", "Qt::EglSupport", components=["EglSupport"]),
     # enginio: Not needed in Qt6!
     LibraryMapping(
         "eventdispatchers",
         "Qt6",
         "Qt::EventDispatcherSupport",
-        extra=["COMPONENTS", "EventDispatcherSupport"],
+        components=["EventDispatcherSupport"],
     ),
     LibraryMapping(
         "eventdispatcher_support",
         "Qt6",
         "Qt::EventDispatcherSupport",
-        extra=["COMPONENTS", "EventDispatcherSupport"],
-    ),
-    LibraryMapping(
-        "fbconvenience", "Qt6", "Qt::FbSupportPrivate", extra=["COMPONENTS", "FbSupportPrivate"]
-    ),
-    LibraryMapping(
-        "fb_support", "Qt6", "Qt::FbSupportPrivate", extra=["COMPONENTS", "FbSupportPrivate"]
+        components=["EventDispatcherSupport"],
     ),
+    LibraryMapping("fbconvenience", "Qt6", "Qt::FbSupportPrivate", components=["FbSupportPrivate"]),
+    LibraryMapping("fb_support", "Qt6", "Qt::FbSupportPrivate", components=["FbSupportPrivate"]),
     LibraryMapping(
         "fontdatabase_support",
         "Qt6",
         "Qt::FontDatabaseSupport",
-        extra=["COMPONENTS", "FontDatabaseSupport"],
-    ),
-    LibraryMapping("gamepad", "Qt6", "Qt::Gamepad", extra=["COMPONENTS", "Gamepad"]),
-    LibraryMapping("geniviextras", "Qt6", "Qt::GeniviExtras", extra=["COMPONENTS", "GeniviExtras"]),
-    LibraryMapping(
-        "global", "Qt6", "Qt::Core", extra=["COMPONENTS", "Core"]
-    ),  # manually added special case
-    LibraryMapping("glx_support", "Qt6", "Qt::GlxSupport", extra=["COMPONENTS", "GlxSupport"]),
-    LibraryMapping(
-        "gsttools", "Qt6", "Qt::MultimediaGstTools", extra=["COMPONENTS", "MultimediaGstTools"]
+        components=["FontDatabaseSupport"],
     ),
-    LibraryMapping("gui", "Qt6", "Qt::Gui", extra=["COMPONENTS", "Gui"]),
-    LibraryMapping("help", "Qt6", "Qt::Help", extra=["COMPONENTS", "Help"]),
+    LibraryMapping("gamepad", "Qt6", "Qt::Gamepad", components=["Gamepad"]),
+    LibraryMapping("geniviextras", "Qt6", "Qt::GeniviExtras", components=["GeniviExtras"]),
+    LibraryMapping("global", "Qt6", "Qt::Core", components=["Core"]),  # manually added special case
+    LibraryMapping("glx_support", "Qt6", "Qt::GlxSupport", components=["GlxSupport"]),
+    LibraryMapping("gsttools", "Qt6", "Qt::MultimediaGstTools", components=["MultimediaGstTools"]),
+    LibraryMapping("gui", "Qt6", "Qt::Gui", components=["Gui"]),
+    LibraryMapping("help", "Qt6", "Qt::Help", components=["Help"]),
     LibraryMapping(
         "hunspellinputmethod",
         "Qt6",
         "Qt::HunspellInputMethodPrivate",
-        extra=["COMPONENTS", "HunspellInputMethodPrivate"],
-    ),
-    LibraryMapping(
-        "input", "Qt6", "Qt::InputSupportPrivate", extra=["COMPONENTS", "InputSupportPrivate"]
+        components=["HunspellInputMethodPrivate"],
     ),
+    LibraryMapping("input", "Qt6", "Qt::InputSupportPrivate", components=["InputSupportPrivate"]),
     LibraryMapping(
         "input_support",
         "Qt6",
         "Qt::InputSupportPrivate",
-        extra=["COMPONENTS", "InputSupportPrivate"],
-    ),
-    LibraryMapping(
-        "installer-lib", "Qt6", "Qt::AppManInstaller", extra=["COMPONENTS", "AppManInstaller"]
-    ),
-    LibraryMapping("ivi", "Qt6", "Qt::Ivi", extra=["COMPONENTS", "Ivi"]),
-    LibraryMapping("ivicore", "Qt6", "Qt::IviCore", extra=["COMPONENTS", "IviCore"]),
-    LibraryMapping("ivimedia", "Qt6", "Qt::IviMedia", extra=["COMPONENTS", "IviMedia"]),
-    LibraryMapping("knx", "Qt6", "Qt::Knx", extra=["COMPONENTS", "Knx"]),
-    LibraryMapping(
-        "kmsconvenience", "Qt6", "Qt::KmsSupportPrivate", extra=["COMPONENTS", "KmsSupportPrivate"]
-    ),
-    LibraryMapping(
-        "kms_support", "Qt6", "Qt::KmsSupportPrivate", extra=["COMPONENTS", "KmsSupportPrivate"]
+        components=["InputSupportPrivate"],
     ),
+    LibraryMapping("installer-lib", "Qt6", "Qt::AppManInstaller", components=["AppManInstaller"]),
+    LibraryMapping("ivi", "Qt6", "Qt::Ivi", components=["Ivi"]),
+    LibraryMapping("ivicore", "Qt6", "Qt::IviCore", components=["IviCore"]),
+    LibraryMapping("ivimedia", "Qt6", "Qt::IviMedia", components=["IviMedia"]),
+    LibraryMapping("knx", "Qt6", "Qt::Knx", components=["Knx"]),
     LibraryMapping(
-        "launcher-lib", "Qt6", "Qt::AppManLauncher", extra=["COMPONENTS", "AppManLauncher"]
+        "kmsconvenience", "Qt6", "Qt::KmsSupportPrivate", components=["KmsSupportPrivate"]
     ),
-    LibraryMapping("lib", "Qt6", "Qt::Designer", extra=["COMPONENTS", "Designer"]),
+    LibraryMapping("kms_support", "Qt6", "Qt::KmsSupportPrivate", components=["KmsSupportPrivate"]),
+    LibraryMapping("launcher-lib", "Qt6", "Qt::AppManLauncher", components=["AppManLauncher"]),
+    LibraryMapping("lib", "Qt6", "Qt::Designer", components=["Designer"]),
     LibraryMapping(
         "linuxaccessibility_support",
         "Qt6",
         "Qt::LinuxAccessibilitySupport",
-        extra=["COMPONENTS", "LinuxAccessibilitySupport"],
-    ),
-    LibraryMapping("location", "Qt6", "Qt::Location", extra=["COMPONENTS", "Location"]),
-    LibraryMapping("macextras", "Qt6", "Qt::MacExtras", extra=["COMPONENTS", "MacExtras"]),
-    LibraryMapping("main-lib", "Qt6", "Qt::AppManMain", extra=["COMPONENTS", "AppManMain"]),
-    LibraryMapping(
-        "manager-lib", "Qt6", "Qt::AppManManager", extra=["COMPONENTS", "AppManManager"]
+        components=["LinuxAccessibilitySupport"],
     ),
-    LibraryMapping(
-        "monitor-lib", "Qt6", "Qt::AppManMonitor", extra=["COMPONENTS", "AppManMonitor"]
-    ),
-    LibraryMapping("mqtt", "Qt6", "Qt::Mqtt", extra=["COMPONENTS", "Mqtt"]),
-    LibraryMapping("multimedia", "Qt6", "Qt::Multimedia", extra=["COMPONENTS", "Multimedia"]),
+    LibraryMapping("location", "Qt6", "Qt::Location", components=["Location"]),
+    LibraryMapping("macextras", "Qt6", "Qt::MacExtras", components=["MacExtras"]),
+    LibraryMapping("main-lib", "Qt6", "Qt::AppManMain", components=["AppManMain"]),
+    LibraryMapping("manager-lib", "Qt6", "Qt::AppManManager", components=["AppManManager"]),
+    LibraryMapping("monitor-lib", "Qt6", "Qt::AppManMonitor", components=["AppManMonitor"]),
+    LibraryMapping("mqtt", "Qt6", "Qt::Mqtt", components=["Mqtt"]),
+    LibraryMapping("multimedia", "Qt6", "Qt::Multimedia", components=["Multimedia"]),
     LibraryMapping(
         "multimediawidgets",
         "Qt6",
         "Qt::MultimediaWidgets",
-        extra=["COMPONENTS", "MultimediaWidgets"],
-    ),
-    LibraryMapping("network", "Qt6", "Qt::Network", extra=["COMPONENTS", "Network"]),
-    LibraryMapping("networkauth", "Qt6", "Qt::NetworkAuth", extra=["COMPONENTS", "NetworkAuth"]),
-    LibraryMapping("nfc", "Qt6", "Qt::Nfc", extra=["COMPONENTS", "Nfc"]),
-    LibraryMapping("oauth", "Qt6", "Qt::NetworkAuth", extra=["COMPONENTS", "NetworkAuth"]),
-    LibraryMapping("opcua", "Qt6", "Qt::OpcUa", extra=["COMPONENTS", "OpcUa"]),
-    LibraryMapping(
-        "opcua_private", "Qt6", "Qt::OpcUaPrivate", extra=["COMPONENTS", "OpcUaPrivate"]
-    ),
-    LibraryMapping("opengl", "Qt6", "Qt::OpenGL", extra=["COMPONENTS", "OpenGL"]),
-    LibraryMapping(
-        "openglwidgets", "Qt6", "Qt::OpenGLWidgets", extra=["COMPONENTS", "OpenGLWidgets"]
-    ),
-    LibraryMapping(
-        "package-lib", "Qt6", "Qt::AppManPackage", extra=["COMPONENTS", "AppManPackage"]
-    ),
+        components=["MultimediaWidgets"],
+    ),
+    LibraryMapping("network", "Qt6", "Qt::Network", components=["Network"]),
+    LibraryMapping("networkauth", "Qt6", "Qt::NetworkAuth", components=["NetworkAuth"]),
+    LibraryMapping("nfc", "Qt6", "Qt::Nfc", components=["Nfc"]),
+    LibraryMapping("oauth", "Qt6", "Qt::NetworkAuth", components=["NetworkAuth"]),
+    LibraryMapping("opcua", "Qt6", "Qt::OpcUa", components=["OpcUa"]),
+    LibraryMapping("opcua_private", "Qt6", "Qt::OpcUaPrivate", components=["OpcUaPrivate"]),
+    LibraryMapping("opengl", "Qt6", "Qt::OpenGL", components=["OpenGL"]),
+    LibraryMapping("openglwidgets", "Qt6", "Qt::OpenGLWidgets", components=["OpenGLWidgets"]),
+    LibraryMapping("package-lib", "Qt6", "Qt::AppManPackage", components=["AppManPackage"]),
     LibraryMapping(
         "packetprotocol",
         "Qt6",
         "Qt::PacketProtocolPrivate",
-        extra=["COMPONENTS", "PacketProtocolPrivate"],
+        components=["PacketProtocolPrivate"],
     ),
     LibraryMapping(
         "particles",
         "Qt6",
         "Qt::QuickParticlesPrivate",
-        extra=["COMPONENTS", "QuickParticlesPrivate"],
+        components=["QuickParticlesPrivate"],
     ),
     LibraryMapping(
         "plugin-interfaces",
         "Qt6",
         "Qt::AppManPluginInterfaces",
-        extra=["COMPONENTS", "AppManPluginInterfaces"],
+        components=["AppManPluginInterfaces"],
     ),
-    LibraryMapping("positioning", "Qt6", "Qt::Positioning", extra=["COMPONENTS", "Positioning"]),
+    LibraryMapping("positioning", "Qt6", "Qt::Positioning", components=["Positioning"]),
     LibraryMapping(
-        "positioningquick", "Qt6", "Qt::PositioningQuick", extra=["COMPONENTS", "PositioningQuick"]
+        "positioningquick", "Qt6", "Qt::PositioningQuick", components=["PositioningQuick"]
     ),
-    LibraryMapping("printsupport", "Qt6", "Qt::PrintSupport", extra=["COMPONENTS", "PrintSupport"]),
-    LibraryMapping("purchasing", "Qt6", "Qt::Purchasing", extra=["COMPONENTS", "Purchasing"]),
+    LibraryMapping("printsupport", "Qt6", "Qt::PrintSupport", components=["PrintSupport"]),
+    LibraryMapping("purchasing", "Qt6", "Qt::Purchasing", components=["Purchasing"]),
+    LibraryMapping("qmldebug", "Qt6", "Qt::QmlDebugPrivate", components=["QmlDebugPrivate"]),
     LibraryMapping(
-        "qmldebug", "Qt6", "Qt::QmlDebugPrivate", extra=["COMPONENTS", "QmlDebugPrivate"]
+        "qmldevtools", "Qt6", "Qt::QmlDevToolsPrivate", components=["QmlDevToolsPrivate"]
     ),
     LibraryMapping(
-        "qmldevtools", "Qt6", "Qt::QmlDevToolsPrivate", extra=["COMPONENTS", "QmlDevToolsPrivate"]
+        "qmlcompiler", "Qt6", "Qt::QmlCompilerPrivate", components=["QmlCompilerPrivate"]
     ),
-    LibraryMapping(
-        "qmlcompiler", "Qt6", "Qt::QmlCompilerPrivate", extra=["COMPONENTS", "QmlCompilerPrivate"]
-    ),
-    LibraryMapping("qml", "Qt6", "Qt::Qml", extra=["COMPONENTS", "Qml"]),
-    LibraryMapping("qmldom", "Qt6", "Qt::QmlDomPrivate", extra=["COMPONENTS", "QmlDomPrivate"]),
-    LibraryMapping("qmlmodels", "Qt6", "Qt::QmlModels", extra=["COMPONENTS", "QmlModels"]),
-    LibraryMapping("qmltest", "Qt6", "Qt::QuickTest", extra=["COMPONENTS", "QuickTest"]),
+    LibraryMapping("qml", "Qt6", "Qt::Qml", components=["Qml"]),
+    LibraryMapping("qmldom", "Qt6", "Qt::QmlDomPrivate", components=["QmlDomPrivate"]),
+    LibraryMapping("qmlmodels", "Qt6", "Qt::QmlModels", components=["QmlModels"]),
+    LibraryMapping("qmltest", "Qt6", "Qt::QuickTest", components=["QuickTest"]),
     LibraryMapping(
         "qtmultimediaquicktools",
         "Qt6",
         "Qt::MultimediaQuickPrivate",
-        extra=["COMPONENTS", "MultimediaQuickPrivate"],
+        components=["MultimediaQuickPrivate"],
     ),
     LibraryMapping(
         "quick3dassetimport",
         "Qt6",
         "Qt::Quick3DAssetImport",
-        extra=["COMPONENTS", "Quick3DAssetImport"],
-    ),
-    LibraryMapping("core5compat", "Qt6", "Qt::Core5Compat", extra=["COMPONENTS", "Core5Compat"]),
-    LibraryMapping("quick3d", "Qt6", "Qt::Quick3D", extra=["COMPONENTS", "Quick3D"]),
-    LibraryMapping(
-        "quick3drender", "Qt6", "Qt::Quick3DRender", extra=["COMPONENTS", "Quick3DRender"]
+        components=["Quick3DAssetImport"],
     ),
+    LibraryMapping("core5compat", "Qt6", "Qt::Core5Compat", components=["Core5Compat"]),
+    LibraryMapping("quick3d", "Qt6", "Qt::Quick3D", components=["Quick3D"]),
+    LibraryMapping("quick3drender", "Qt6", "Qt::Quick3DRender", components=["Quick3DRender"]),
     LibraryMapping(
         "quick3druntimerender",
         "Qt6",
         "Qt::Quick3DRuntimeRender",
-        extra=["COMPONENTS", "Quick3DRuntimeRender"],
-    ),
-    LibraryMapping("quick3dutils", "Qt6", "Qt::Quick3DUtils", extra=["COMPONENTS", "Quick3DUtils"]),
-    LibraryMapping(
-        "quickcontrols2", "Qt6", "Qt::QuickControls2", extra=["COMPONENTS", "QuickControls2"]
+        components=["Quick3DRuntimeRender"],
     ),
+    LibraryMapping("quick3dutils", "Qt6", "Qt::Quick3DUtils", components=["Quick3DUtils"]),
+    LibraryMapping("quickcontrols2", "Qt6", "Qt::QuickControls2", components=["QuickControls2"]),
     LibraryMapping(
         "quickcontrols2impl",
         "Qt6",
         "Qt::QuickControls2Impl",
-        extra=["COMPONENTS", "QuickControls2Impl"],
-    ),
-    LibraryMapping("quick", "Qt6", "Qt::Quick", extra=["COMPONENTS", "Quick"]),
-    LibraryMapping(
-        "quickshapes", "Qt6", "Qt::QuickShapesPrivate", extra=["COMPONENTS", "QuickShapesPrivate"]
-    ),
-    LibraryMapping(
-        "quicktemplates2", "Qt6", "Qt::QuickTemplates2", extra=["COMPONENTS", "QuickTemplates2"]
-    ),
-    LibraryMapping("quickwidgets", "Qt6", "Qt::QuickWidgets", extra=["COMPONENTS", "QuickWidgets"]),
-    LibraryMapping(
-        "remoteobjects", "Qt6", "Qt::RemoteObjects", extra=["COMPONENTS", "RemoteObjects"]
-    ),
-    LibraryMapping("script", "Qt6", "Qt::Script", extra=["COMPONENTS", "Script"]),
-    LibraryMapping("scripttools", "Qt6", "Qt::ScriptTools", extra=["COMPONENTS", "ScriptTools"]),
-    LibraryMapping("scxml", "Qt6", "Qt::Scxml", extra=["COMPONENTS", "Scxml"]),
-    LibraryMapping("sensors", "Qt6", "Qt::Sensors", extra=["COMPONENTS", "Sensors"]),
-    LibraryMapping("serialport", "Qt6", "Qt::SerialPort", extra=["COMPONENTS", "SerialPort"]),
-    LibraryMapping("serialbus", "Qt6", "Qt::SerialBus", extra=["COMPONENTS", "SerialBus"]),
-    LibraryMapping("services", "Qt6", "Qt::ServiceSupport", extra=["COMPONENTS", "ServiceSupport"]),
-    LibraryMapping(
-        "service_support", "Qt6", "Qt::ServiceSupport", extra=["COMPONENTS", "ServiceSupport"]
-    ),
-    LibraryMapping("shadertools", "Qt6", "Qt::ShaderTools", extra=["COMPONENTS", "ShaderTools"]),
-    LibraryMapping("statemachine", "Qt6", "Qt::StateMachine", extra=["COMPONENTS", "StateMachine"]),
-    LibraryMapping("sql", "Qt6", "Qt::Sql", extra=["COMPONENTS", "Sql"]),
-    LibraryMapping("svg", "Qt6", "Qt::Svg", extra=["COMPONENTS", "Svg"]),
-    LibraryMapping("svgwidgets", "Qt6", "Qt::SvgWidgets", extra=["COMPONENTS", "SvgWidgets"]),
-    LibraryMapping("charts", "Qt6", "Qt::Charts", extra=["COMPONENTS", "Charts"]),
-    LibraryMapping("testlib", "Qt6", "Qt::Test", extra=["COMPONENTS", "Test"]),
-    LibraryMapping("texttospeech", "Qt6", "Qt::TextToSpeech", extra=["COMPONENTS", "TextToSpeech"]),
-    LibraryMapping(
-        "theme_support", "Qt6", "Qt::ThemeSupport", extra=["COMPONENTS", "ThemeSupport"]
-    ),
-    LibraryMapping("tts", "Qt6", "Qt::TextToSpeech", extra=["COMPONENTS", "TextToSpeech"]),
-    LibraryMapping("uiplugin", "Qt6", "Qt::UiPlugin", extra=["COMPONENTS", "UiPlugin"]),
-    LibraryMapping("uitools", "Qt6", "Qt::UiTools", extra=["COMPONENTS", "UiTools"]),
-    LibraryMapping(
-        "virtualkeyboard", "Qt6", "Qt::VirtualKeyboard", extra=["COMPONENTS", "VirtualKeyboard"]
-    ),
-    LibraryMapping(
-        "waylandclient", "Qt6", "Qt::WaylandClient", extra=["COMPONENTS", "WaylandClient"]
-    ),
+        components=["QuickControls2Impl"],
+    ),
+    LibraryMapping("quick", "Qt6", "Qt::Quick", components=["Quick"]),
+    LibraryMapping(
+        "quickshapes", "Qt6", "Qt::QuickShapesPrivate", components=["QuickShapesPrivate"]
+    ),
+    LibraryMapping("quicktemplates2", "Qt6", "Qt::QuickTemplates2", components=["QuickTemplates2"]),
+    LibraryMapping("quickwidgets", "Qt6", "Qt::QuickWidgets", components=["QuickWidgets"]),
+    LibraryMapping("remoteobjects", "Qt6", "Qt::RemoteObjects", components=["RemoteObjects"]),
+    LibraryMapping("script", "Qt6", "Qt::Script", components=["Script"]),
+    LibraryMapping("scripttools", "Qt6", "Qt::ScriptTools", components=["ScriptTools"]),
+    LibraryMapping("scxml", "Qt6", "Qt::Scxml", components=["Scxml"]),
+    LibraryMapping("sensors", "Qt6", "Qt::Sensors", components=["Sensors"]),
+    LibraryMapping("serialport", "Qt6", "Qt::SerialPort", components=["SerialPort"]),
+    LibraryMapping("serialbus", "Qt6", "Qt::SerialBus", components=["SerialBus"]),
+    LibraryMapping("services", "Qt6", "Qt::ServiceSupport", components=["ServiceSupport"]),
+    LibraryMapping("service_support", "Qt6", "Qt::ServiceSupport", components=["ServiceSupport"]),
+    LibraryMapping("shadertools", "Qt6", "Qt::ShaderTools", components=["ShaderTools"]),
+    LibraryMapping("statemachine", "Qt6", "Qt::StateMachine", components=["StateMachine"]),
+    LibraryMapping("sql", "Qt6", "Qt::Sql", components=["Sql"]),
+    LibraryMapping("svg", "Qt6", "Qt::Svg", components=["Svg"]),
+    LibraryMapping("svgwidgets", "Qt6", "Qt::SvgWidgets", components=["SvgWidgets"]),
+    LibraryMapping("charts", "Qt6", "Qt::Charts", components=["Charts"]),
+    LibraryMapping("testlib", "Qt6", "Qt::Test", components=["Test"]),
+    LibraryMapping("texttospeech", "Qt6", "Qt::TextToSpeech", components=["TextToSpeech"]),
+    LibraryMapping("theme_support", "Qt6", "Qt::ThemeSupport", components=["ThemeSupport"]),
+    LibraryMapping("tts", "Qt6", "Qt::TextToSpeech", components=["TextToSpeech"]),
+    LibraryMapping("uiplugin", "Qt6", "Qt::UiPlugin", components=["UiPlugin"]),
+    LibraryMapping("uitools", "Qt6", "Qt::UiTools", components=["UiTools"]),
+    LibraryMapping("virtualkeyboard", "Qt6", "Qt::VirtualKeyboard", components=["VirtualKeyboard"]),
+    LibraryMapping("waylandclient", "Qt6", "Qt::WaylandClient", components=["WaylandClient"]),
     LibraryMapping(
         "waylandcompositor",
         "Qt6",
         "Qt::WaylandCompositor",
-        extra=["COMPONENTS", "WaylandCompositor"],
-    ),
-    LibraryMapping("webchannel", "Qt6", "Qt::WebChannel", extra=["COMPONENTS", "WebChannel"]),
-    LibraryMapping("webengine", "Qt6", "Qt::WebEngine", extra=["COMPONENTS", "WebEngine"]),
-    LibraryMapping(
-        "webenginewidgets", "Qt6", "Qt::WebEngineWidgets", extra=["COMPONENTS", "WebEngineWidgets"]
-    ),
-    LibraryMapping("websockets", "Qt6", "Qt::WebSockets", extra=["COMPONENTS", "WebSockets"]),
-    LibraryMapping("webview", "Qt6", "Qt::WebView", extra=["COMPONENTS", "WebView"]),
-    LibraryMapping("widgets", "Qt6", "Qt::Widgets", extra=["COMPONENTS", "Widgets"]),
-    LibraryMapping("window-lib", "Qt6", "Qt::AppManWindow", extra=["COMPONENTS", "AppManWindow"]),
-    LibraryMapping("winextras", "Qt6", "Qt::WinExtras", extra=["COMPONENTS", "WinExtras"]),
-    LibraryMapping("x11extras", "Qt6", "Qt::X11Extras", extra=["COMPONENTS", "X11Extras"]),
-    LibraryMapping(
-        "xcb_qpa_lib", "Qt6", "Qt::XcbQpaPrivate", extra=["COMPONENTS", "XcbQpaPrivate"]
+        components=["WaylandCompositor"],
     ),
+    LibraryMapping("webchannel", "Qt6", "Qt::WebChannel", components=["WebChannel"]),
+    LibraryMapping("webengine", "Qt6", "Qt::WebEngine", components=["WebEngine"]),
     LibraryMapping(
-        "xkbcommon_support", "Qt6", "Qt::XkbCommonSupport", extra=["COMPONENTS", "XkbCommonSupport"]
+        "webenginewidgets", "Qt6", "Qt::WebEngineWidgets", components=["WebEngineWidgets"]
     ),
-    LibraryMapping("xmlpatterns", "Qt6", "Qt::XmlPatterns", extra=["COMPONENTS", "XmlPatterns"]),
-    LibraryMapping("xml", "Qt6", "Qt::Xml", extra=["COMPONENTS", "Xml"]),
+    LibraryMapping("websockets", "Qt6", "Qt::WebSockets", components=["WebSockets"]),
+    LibraryMapping("webview", "Qt6", "Qt::WebView", components=["WebView"]),
+    LibraryMapping("widgets", "Qt6", "Qt::Widgets", components=["Widgets"]),
+    LibraryMapping("window-lib", "Qt6", "Qt::AppManWindow", components=["AppManWindow"]),
+    LibraryMapping("winextras", "Qt6", "Qt::WinExtras", components=["WinExtras"]),
+    LibraryMapping("x11extras", "Qt6", "Qt::X11Extras", components=["X11Extras"]),
+    LibraryMapping("xcb_qpa_lib", "Qt6", "Qt::XcbQpaPrivate", components=["XcbQpaPrivate"]),
     LibraryMapping(
-        "qmlworkerscript", "Qt6", "Qt::QmlWorkerScript", extra=["COMPONENTS", "QmlWorkerScript"]
+        "xkbcommon_support", "Qt6", "Qt::XkbCommonSupport", components=["XkbCommonSupport"]
     ),
+    LibraryMapping("xmlpatterns", "Qt6", "Qt::XmlPatterns", components=["XmlPatterns"]),
+    LibraryMapping("xml", "Qt6", "Qt::Xml", components=["Xml"]),
+    LibraryMapping("qmlworkerscript", "Qt6", "Qt::QmlWorkerScript", components=["QmlWorkerScript"]),
     LibraryMapping(
         "quickparticles",
         "Qt6",
         "Qt::QuickParticlesPrivate",
-        extra=["COMPONENTS", "QuickParticlesPrivate"],
+        components=["QuickParticlesPrivate"],
     ),
     LibraryMapping(
         "linuxofono_support",
         "Qt6",
         "Qt::LinuxOfonoSupport",
-        extra=["COMPONENTS", "LinuxOfonoSupport"],
+        components=["LinuxOfonoSupport"],
     ),
     LibraryMapping(
         "linuxofono_support_private",
         "Qt6",
         "Qt::LinuxOfonoSupportPrivate",
-        extra=["COMPONENTS", "LinuxOfonoSupportPrivate"],
-    ),
-    LibraryMapping("tools", "Qt6", "Qt::Tools", extra=["COMPONENTS", "Tools"]),
-    LibraryMapping("axcontainer", "Qt6", "Qt::AxContainer", extra=["COMPONENTS", "AxContainer"]),
-    LibraryMapping(
-        "webkitwidgets", "Qt6", "Qt::WebKitWidgets", extra=["COMPONENTS", "WebKitWidgets"]
-    ),
-    LibraryMapping("zlib", "Qt6", "Qt::Zlib", extra=["COMPONENTS", "Zlib"]),
-    LibraryMapping("httpserver", "Qt6", "Qt::HttpServer", extra=["COMPONENTS", "HttpServer"]),
-    LibraryMapping("sslserver", "Qt6", "Qt::SslServer", extra=["COMPONENTS", "HttpServer"]),
+        components=["LinuxOfonoSupportPrivate"],
+    ),
+    LibraryMapping("tools", "Qt6", "Qt::Tools", components=["Tools"]),
+    LibraryMapping("axcontainer", "Qt6", "Qt::AxContainer", components=["AxContainer"]),
+    LibraryMapping("webkitwidgets", "Qt6", "Qt::WebKitWidgets", components=["WebKitWidgets"]),
+    LibraryMapping("zlib", "Qt6", "Qt::Zlib", components=["Zlib"]),
+    LibraryMapping("httpserver", "Qt6", "Qt::HttpServer", components=["HttpServer"]),
+    LibraryMapping("sslserver", "Qt6", "Qt::SslServer", components=["HttpServer"]),
 ]
 
 # Note that the library map is adjusted dynamically further down.
@@ -478,9 +420,7 @@ _library_map = [
         extra=["2.6.0"],
     ),
     LibraryMapping("host_dbus", None, None),
-    LibraryMapping(
-        "icu", "ICU", "ICU::i18n ICU::uc ICU::data", extra=["COMPONENTS", "i18n", "uc", "data"]
-    ),
+    LibraryMapping("icu", "ICU", "ICU::i18n ICU::uc ICU::data", components=["i18n", "uc", "data"]),
     LibraryMapping("journald", "Libsystemd", "PkgConfig::Libsystemd"),
     LibraryMapping("jpeg", "JPEG", "JPEG::JPEG"),  # see also libjpeg
     LibraryMapping("libatomic", "WrapAtomic", "WrapAtomic::WrapAtomic"),
@@ -558,61 +498,59 @@ _library_map = [
         resultVariable="TARGET XCB::XCB",
         appendFoundSuffix=False,
     ),
-    LibraryMapping(
-        "xcb_glx", "XCB", "XCB::GLX", extra=["COMPONENTS", "GLX"], resultVariable="XCB_GLX"
-    ),
+    LibraryMapping("xcb_glx", "XCB", "XCB::GLX", components=["GLX"], resultVariable="XCB_GLX"),
     LibraryMapping(
         "xcb_icccm",
         "XCB",
         "XCB::ICCCM",
-        extra=["0.3.9", "COMPONENTS", "ICCCM"],
+        extra=["0.3.9"],
+        components=["ICCCM"],
         resultVariable="XCB_ICCCM",
     ),
     LibraryMapping(
         "xcb_image",
         "XCB",
         "XCB::IMAGE",
-        extra=["0.3.9", "COMPONENTS", "IMAGE"],
+        extra=["0.3.9"],
+        components=["IMAGE"],
         resultVariable="XCB_IMAGE",
     ),
     LibraryMapping(
         "xcb_keysyms",
         "XCB",
         "XCB::KEYSYMS",
-        extra=["0.3.9", "COMPONENTS", "KEYSYMS"],
+        extra=["0.3.9"],
+        components=["KEYSYMS"],
         resultVariable="XCB_KEYSYMS",
     ),
     LibraryMapping(
-        "xcb_randr", "XCB", "XCB::RANDR", extra=["COMPONENTS", "RANDR"], resultVariable="XCB_RANDR"
+        "xcb_randr", "XCB", "XCB::RANDR", components=["RANDR"], resultVariable="XCB_RANDR"
     ),
     LibraryMapping(
         "xcb_render",
         "XCB",
         "XCB::RENDER",
-        extra=["COMPONENTS", "RENDER"],
+        components=["RENDER"],
         resultVariable="XCB_RENDER",
     ),
     LibraryMapping(
         "xcb_renderutil",
         "XCB",
         "XCB::RENDERUTIL",
-        extra=["0.3.9", "COMPONENTS", "RENDERUTIL"],
+        extra=["0.3.9"],
+        components=["RENDERUTIL"],
         resultVariable="XCB_RENDERUTIL",
     ),
     LibraryMapping(
-        "xcb_shape", "XCB", "XCB::SHAPE", extra=["COMPONENTS", "SHAPE"], resultVariable="XCB_SHAPE"
-    ),
-    LibraryMapping(
-        "xcb_shm", "XCB", "XCB::SHM", extra=["COMPONENTS", "SHM"], resultVariable="XCB_SHM"
-    ),
-    LibraryMapping(
-        "xcb_sync", "XCB", "XCB::SYNC", extra=["COMPONENTS", "SYNC"], resultVariable="XCB_SYNC"
+        "xcb_shape", "XCB", "XCB::SHAPE", components=["SHAPE"], resultVariable="XCB_SHAPE"
     ),
+    LibraryMapping("xcb_shm", "XCB", "XCB::SHM", components=["SHM"], resultVariable="XCB_SHM"),
+    LibraryMapping("xcb_sync", "XCB", "XCB::SYNC", components=["SYNC"], resultVariable="XCB_SYNC"),
     LibraryMapping(
         "xcb_xfixes",
         "XCB",
         "XCB::XFIXES",
-        extra=["COMPONENTS", "XFIXES"],
+        components=["XFIXES"],
         resultVariable="TARGET XCB::XFIXES",
         appendFoundSuffix=False,
     ),
@@ -620,7 +558,7 @@ _library_map = [
         "xcb-xfixes",
         "XCB",
         "XCB::XFIXES",
-        extra=["COMPONENTS", "XFIXES"],
+        components=["XFIXES"],
         resultVariable="TARGET XCB::XFIXES",
         appendFoundSuffix=False,
     ),
@@ -628,12 +566,11 @@ _library_map = [
         "xcb_xinput",
         "XCB",
         "XCB::XINPUT",
-        extra=["1.12", "COMPONENTS", "XINPUT"],
+        extra=["1.12"],
+        components=["XINPUT"],
         resultVariable="XCB_XINPUT",
     ),
-    LibraryMapping(
-        "xcb_xkb", "XCB", "XCB::XKB", extra=["COMPONENTS", "XKB"], resultVariable="XCB_XKB"
-    ),
+    LibraryMapping("xcb_xkb", "XCB", "XCB::XKB", components=["XKB"], resultVariable="XCB_XKB"),
     LibraryMapping("xcb_xlib", "X11_XCB", "X11::XCB"),
     LibraryMapping("xcomposite", "XComposite", "PkgConfig::XComposite"),
     LibraryMapping("xkbcommon_evdev", "XKB", "XKB::XKB", extra=["0.5.0"]),  # see also xkbcommon
@@ -854,6 +791,9 @@ def generate_find_package_info(
     isRequired = False
 
     extra = lib.extra.copy()
+    if lib.components:
+        extra.append("COMPONENTS")
+        extra += lib.components
 
     if "REQUIRED" in extra and use_qt_find_package:
         isRequired = True