diff options
author | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-10-30 12:54:35 +0100 |
---|---|---|
committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-10-30 17:49:02 +0100 |
commit | ce19dedfb361d5753c0e1c6d374830f8bbd48bc9 (patch) | |
tree | 9ad4c2789618c446a1f03785e71fc4ba9f061eec /src/platformsupport | |
parent | 3680d3453c5f0ae45c71ee0afa75edbf894dfe7f (diff) |
CMake: Regenerate qtbase projects to use correct CONFIG_MODULE_NAMEs
Also sneak in testlib's misisng QMAKE_MODULE_CONFIG values.
Task-number: QTBUG-88025
Change-Id: I76a37b8d8dbf7f294f91e32a5edbc52f5c83555b
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'src/platformsupport')
8 files changed, 8 insertions, 2 deletions
diff --git a/src/platformsupport/devicediscovery/.prev_CMakeLists.txt b/src/platformsupport/devicediscovery/.prev_CMakeLists.txt index dcbc74363b..e113786e32 100644 --- a/src/platformsupport/devicediscovery/.prev_CMakeLists.txt +++ b/src/platformsupport/devicediscovery/.prev_CMakeLists.txt @@ -5,6 +5,7 @@ ##################################################################### qt_internal_add_module(DeviceDiscoverySupport + CONFIG_MODULE_NAME devicediscovery_support STATIC INTERNAL_MODULE SOURCES diff --git a/src/platformsupport/devicediscovery/CMakeLists.txt b/src/platformsupport/devicediscovery/CMakeLists.txt index 5eede39e68..e113786e32 100644 --- a/src/platformsupport/devicediscovery/CMakeLists.txt +++ b/src/platformsupport/devicediscovery/CMakeLists.txt @@ -5,7 +5,7 @@ ##################################################################### qt_internal_add_module(DeviceDiscoverySupport - CONFIG_MODULE_NAME devicediscovery_support # special case + CONFIG_MODULE_NAME devicediscovery_support STATIC INTERNAL_MODULE SOURCES diff --git a/src/platformsupport/fbconvenience/.prev_CMakeLists.txt b/src/platformsupport/fbconvenience/.prev_CMakeLists.txt index c310cb1faa..c34b5b3375 100644 --- a/src/platformsupport/fbconvenience/.prev_CMakeLists.txt +++ b/src/platformsupport/fbconvenience/.prev_CMakeLists.txt @@ -5,6 +5,7 @@ ##################################################################### qt_internal_add_module(FbSupport + CONFIG_MODULE_NAME fb_support STATIC INTERNAL_MODULE SOURCES diff --git a/src/platformsupport/fbconvenience/CMakeLists.txt b/src/platformsupport/fbconvenience/CMakeLists.txt index 34512c9b9d..c34b5b3375 100644 --- a/src/platformsupport/fbconvenience/CMakeLists.txt +++ b/src/platformsupport/fbconvenience/CMakeLists.txt @@ -5,9 +5,9 @@ ##################################################################### qt_internal_add_module(FbSupport + CONFIG_MODULE_NAME fb_support STATIC INTERNAL_MODULE - CONFIG_MODULE_NAME "fb_support" # special case SOURCES qfbbackingstore.cpp qfbbackingstore_p.h qfbcursor.cpp qfbcursor_p.h diff --git a/src/platformsupport/input/.prev_CMakeLists.txt b/src/platformsupport/input/.prev_CMakeLists.txt index 0b7fae078b..251f345e24 100644 --- a/src/platformsupport/input/.prev_CMakeLists.txt +++ b/src/platformsupport/input/.prev_CMakeLists.txt @@ -5,6 +5,7 @@ ##################################################################### qt_internal_add_module(InputSupport + CONFIG_MODULE_NAME input_support STATIC INTERNAL_MODULE DEFINES diff --git a/src/platformsupport/input/CMakeLists.txt b/src/platformsupport/input/CMakeLists.txt index 12a1b22e9a..867141fdea 100644 --- a/src/platformsupport/input/CMakeLists.txt +++ b/src/platformsupport/input/CMakeLists.txt @@ -10,6 +10,7 @@ qt_find_package(Mtdev) # special case ##################################################################### qt_internal_add_module(InputSupport + CONFIG_MODULE_NAME input_support STATIC INTERNAL_MODULE DEFINES diff --git a/src/platformsupport/kmsconvenience/.prev_CMakeLists.txt b/src/platformsupport/kmsconvenience/.prev_CMakeLists.txt index cc037d9ef5..b915e81cc8 100644 --- a/src/platformsupport/kmsconvenience/.prev_CMakeLists.txt +++ b/src/platformsupport/kmsconvenience/.prev_CMakeLists.txt @@ -5,6 +5,7 @@ ##################################################################### qt_internal_add_module(KmsSupport + CONFIG_MODULE_NAME kms_support STATIC INTERNAL_MODULE SOURCES diff --git a/src/platformsupport/kmsconvenience/CMakeLists.txt b/src/platformsupport/kmsconvenience/CMakeLists.txt index d53dcda19f..a5b392f733 100644 --- a/src/platformsupport/kmsconvenience/CMakeLists.txt +++ b/src/platformsupport/kmsconvenience/CMakeLists.txt @@ -7,6 +7,7 @@ qt_find_package(Libdrm) # special case ##################################################################### qt_internal_add_module(KmsSupport + CONFIG_MODULE_NAME kms_support STATIC INTERNAL_MODULE SOURCES |