diff options
| author | Leander Beernaert <leander.beernaert@qt.io> | 2019-11-20 09:25:19 +0100 |
|---|---|---|
| committer | Leander Beernaert <leander.beernaert@qt.io> | 2019-11-25 14:53:27 +0000 |
| commit | 1c655fb0fc08e89ab5efb23889266b710334f1a5 (patch) | |
| tree | ad0eae64bab5ffb902bf63bc88a98fed5cd1d83b /src/plugins/platforms/eglfs | |
| parent | bc1cae774ad8cc084a98cb37d363770efbde025c (diff) | |
Post merge fixes
Change-Id: I78d3c9687f99c0a32da04257e297e88ef0b02581
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'src/plugins/platforms/eglfs')
| -rw-r--r-- | src/plugins/platforms/eglfs/.prev_CMakeLists.txt | 20 | ||||
| -rw-r--r-- | src/plugins/platforms/eglfs/CMakeLists.txt | 2 |
2 files changed, 9 insertions, 13 deletions
diff --git a/src/plugins/platforms/eglfs/.prev_CMakeLists.txt b/src/plugins/platforms/eglfs/.prev_CMakeLists.txt index a47c1b0527..6f3309ea3c 100644 --- a/src/plugins/platforms/eglfs/.prev_CMakeLists.txt +++ b/src/plugins/platforms/eglfs/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## EglFSDeviceIntegration Module: ##################################################################### -add_qt_module(EglFSDeviceIntegration +qt_add_module(EglFSDeviceIntegration INTERNAL_MODULE SOURCES api/qeglfsdeviceintegration.cpp api/qeglfsdeviceintegration_p.h @@ -43,43 +43,42 @@ add_qt_module(EglFSDeviceIntegration #### Keys ignored in scope 2:.:.:eglfsdeviceintegration.pro:<TRUE>: # MODULE = "eglfsdeviceintegration" -# _LOADED = "qt_module" ## Scopes: ##################################################################### -extend_target(EglFSDeviceIntegration CONDITION TARGET Qt::InputSupportPrivate +qt_extend_target(EglFSDeviceIntegration CONDITION TARGET Qt::InputSupportPrivate LIBRARIES Qt::InputSupportPrivate PUBLIC_LIBRARIES Qt::InputSupport ) -extend_target(EglFSDeviceIntegration CONDITION TARGET Qt::PlatformCompositorSupportPrivate +qt_extend_target(EglFSDeviceIntegration CONDITION TARGET Qt::PlatformCompositorSupportPrivate LIBRARIES Qt::PlatformCompositorSupportPrivate PUBLIC_LIBRARIES Qt::PlatformCompositorSupport ) -extend_target(EglFSDeviceIntegration CONDITION NOT EGLFS_PLATFORM_HOOKS_SOURCES_ISEMPTY +qt_extend_target(EglFSDeviceIntegration CONDITION NOT EGLFS_PLATFORM_HOOKS_SOURCES_ISEMPTY DEFINES EGLFS_PLATFORM_HOOKS ) -extend_target(EglFSDeviceIntegration CONDITION NOT EGLFS_DEVICE_INTEGRATION_ISEMPTY +qt_extend_target(EglFSDeviceIntegration CONDITION NOT EGLFS_DEVICE_INTEGRATION_ISEMPTY DEFINES EGLFS_PREFERRED_PLUGIN= ) -if(NOT DEFINES___contains___QT_NO_CURSOR) +if(QT_FEATURE_cursor) # Resources: set(cursor_resource_files "cursor-atlas.png" "cursor.json" ) - add_qt_resource(EglFSDeviceIntegration "cursor" + qt_add_resource(EglFSDeviceIntegration "cursor" PREFIX "/" FILES @@ -87,7 +86,7 @@ if(NOT DEFINES___contains___QT_NO_CURSOR) ) endif() -extend_target(EglFSDeviceIntegration CONDITION QT_FEATURE_opengl +qt_extend_target(EglFSDeviceIntegration CONDITION QT_FEATURE_opengl SOURCES api/qeglfscontext.cpp api/qeglfscontext_p.h api/qeglfscursor.cpp api/qeglfscursor_p.h @@ -96,7 +95,7 @@ extend_target(EglFSDeviceIntegration CONDITION QT_FEATURE_opengl ## qeglfs Plugin: ##################################################################### -add_qt_plugin(qeglfs +qt_add_plugin(qeglfs TYPE platforms CLASS_NAME QEglFSIntegrationPlugin SOURCES @@ -113,7 +112,6 @@ add_qt_plugin(qeglfs #### Keys ignored in scope 11:.:.:eglfs-plugin.pro:<TRUE>: # OTHER_FILES = "$$PWD/eglfs.json" -# _LOADED = "qt_plugin" ## Scopes: ##################################################################### diff --git a/src/plugins/platforms/eglfs/CMakeLists.txt b/src/plugins/platforms/eglfs/CMakeLists.txt index 2dde32b0f3..01949586bc 100644 --- a/src/plugins/platforms/eglfs/CMakeLists.txt +++ b/src/plugins/platforms/eglfs/CMakeLists.txt @@ -35,7 +35,6 @@ qt_add_module(EglFSDeviceIntegration #### Keys ignored in scope 2:.:.:eglfsdeviceintegration.pro:<TRUE>: # MODULE = "eglfsdeviceintegration" -# _LOADED = "qt_module" ## Scopes: ##################################################################### @@ -100,7 +99,6 @@ qt_add_plugin(qeglfs #### Keys ignored in scope 11:.:.:eglfs-plugin.pro:<TRUE>: # OTHER_FILES = "$$PWD/eglfs.json" -# _LOADED = "qt_plugin" ## Scopes: ##################################################################### |