diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2021-08-04 16:18:44 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2021-08-06 21:08:21 +0200 |
| commit | b2f00dfb46af633b00946cb1ebfe963964f803ca (patch) | |
| tree | 0b52bda2d0e77744c7969c06ce5882c8d7c9cb2d /src/plugins/platforms/xcb | |
| parent | eb4fb9fa32797d48d4779464483230ad92f349a6 (diff) | |
CMake: Rename qt6_add_plugin TYPE option to PLUGIN_TYPE
The intention is to remove TYPE as a keyword completely before 6.2.0
release, but in case if that's not possible due to the large amount
of repositories and examples, just print a deprecation warning for
now and handle both TYPE and PLUGIN_TYPE.
Task-number: QTBUG-95170
Pick-to: 6.2
Change-Id: If0c18345483b9254b0fc21120229fcc2a2fbfbf5
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'src/plugins/platforms/xcb')
3 files changed, 3 insertions, 3 deletions
diff --git a/src/plugins/platforms/xcb/CMakeLists.txt b/src/plugins/platforms/xcb/CMakeLists.txt index 83f4d5b209..48c44a92ab 100644 --- a/src/plugins/platforms/xcb/CMakeLists.txt +++ b/src/plugins/platforms/xcb/CMakeLists.txt @@ -162,7 +162,7 @@ endif() qt_internal_add_plugin(QXcbIntegrationPlugin OUTPUT_NAME qxcb - TYPE platforms + PLUGIN_TYPE platforms DEFAULT_IF ${QT_QPA_DEFAULT_PLATFORM} MATCHES xcb # special case SOURCES qxcbmain.cpp diff --git a/src/plugins/platforms/xcb/gl_integrations/xcb_egl/CMakeLists.txt b/src/plugins/platforms/xcb/gl_integrations/xcb_egl/CMakeLists.txt index d24050edf3..4a62c8ad46 100644 --- a/src/plugins/platforms/xcb/gl_integrations/xcb_egl/CMakeLists.txt +++ b/src/plugins/platforms/xcb/gl_integrations/xcb_egl/CMakeLists.txt @@ -8,7 +8,7 @@ qt_find_package(EGL) # special case qt_internal_add_plugin(QXcbEglIntegrationPlugin OUTPUT_NAME qxcb-egl-integration - TYPE xcbglintegrations + PLUGIN_TYPE xcbglintegrations SOURCES qxcbeglcontext.h qxcbeglintegration.cpp qxcbeglintegration.h diff --git a/src/plugins/platforms/xcb/gl_integrations/xcb_glx/CMakeLists.txt b/src/plugins/platforms/xcb/gl_integrations/xcb_glx/CMakeLists.txt index 80f785a2f0..ae81eba545 100644 --- a/src/plugins/platforms/xcb/gl_integrations/xcb_glx/CMakeLists.txt +++ b/src/plugins/platforms/xcb/gl_integrations/xcb_glx/CMakeLists.txt @@ -6,7 +6,7 @@ qt_internal_add_plugin(QXcbGlxIntegrationPlugin OUTPUT_NAME qxcb-glx-integration - TYPE xcbglintegrations + PLUGIN_TYPE xcbglintegrations SOURCES qglxintegration.cpp qglxintegration.h qxcbglxintegration.cpp qxcbglxintegration.h |