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/generic | |
| parent | eb4fb9fa32797d48d4779464483230ad92f349a6 (diff) | |
| download | qtbase-b2f00dfb46af633b00946cb1ebfe963964f803ca.tar.gz | |
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/generic')
| -rw-r--r-- | src/plugins/generic/evdevkeyboard/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/plugins/generic/evdevmouse/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/plugins/generic/evdevtablet/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/plugins/generic/evdevtouch/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/plugins/generic/libinput/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/plugins/generic/tslib/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/plugins/generic/tuiotouch/CMakeLists.txt | 2 |
7 files changed, 7 insertions, 7 deletions
diff --git a/src/plugins/generic/evdevkeyboard/CMakeLists.txt b/src/plugins/generic/evdevkeyboard/CMakeLists.txt index 7134a2d858..1568ac82cb 100644 --- a/src/plugins/generic/evdevkeyboard/CMakeLists.txt +++ b/src/plugins/generic/evdevkeyboard/CMakeLists.txt @@ -6,7 +6,7 @@ qt_internal_add_plugin(QEvdevKeyboardPlugin OUTPUT_NAME qevdevkeyboardplugin - TYPE generic + PLUGIN_TYPE generic DEFAULT_IF FALSE SOURCES main.cpp diff --git a/src/plugins/generic/evdevmouse/CMakeLists.txt b/src/plugins/generic/evdevmouse/CMakeLists.txt index 78cf80f588..f467f631f5 100644 --- a/src/plugins/generic/evdevmouse/CMakeLists.txt +++ b/src/plugins/generic/evdevmouse/CMakeLists.txt @@ -6,7 +6,7 @@ qt_internal_add_plugin(QEvdevMousePlugin OUTPUT_NAME qevdevmouseplugin - TYPE generic + PLUGIN_TYPE generic DEFAULT_IF FALSE SOURCES main.cpp diff --git a/src/plugins/generic/evdevtablet/CMakeLists.txt b/src/plugins/generic/evdevtablet/CMakeLists.txt index 880090dd02..4f39c1be87 100644 --- a/src/plugins/generic/evdevtablet/CMakeLists.txt +++ b/src/plugins/generic/evdevtablet/CMakeLists.txt @@ -6,7 +6,7 @@ qt_internal_add_plugin(QEvdevTabletPlugin OUTPUT_NAME qevdevtabletplugin - TYPE generic + PLUGIN_TYPE generic DEFAULT_IF FALSE SOURCES main.cpp diff --git a/src/plugins/generic/evdevtouch/CMakeLists.txt b/src/plugins/generic/evdevtouch/CMakeLists.txt index d15367c6c2..4b90efbd69 100644 --- a/src/plugins/generic/evdevtouch/CMakeLists.txt +++ b/src/plugins/generic/evdevtouch/CMakeLists.txt @@ -6,7 +6,7 @@ qt_internal_add_plugin(QEvdevTouchScreenPlugin OUTPUT_NAME qevdevtouchplugin - TYPE generic + PLUGIN_TYPE generic DEFAULT_IF FALSE SOURCES main.cpp diff --git a/src/plugins/generic/libinput/CMakeLists.txt b/src/plugins/generic/libinput/CMakeLists.txt index 79da268510..bf423c601d 100644 --- a/src/plugins/generic/libinput/CMakeLists.txt +++ b/src/plugins/generic/libinput/CMakeLists.txt @@ -6,7 +6,7 @@ qt_internal_add_plugin(QLibInputPlugin OUTPUT_NAME qlibinputplugin - TYPE generic + PLUGIN_TYPE generic DEFAULT_IF FALSE SOURCES main.cpp diff --git a/src/plugins/generic/tslib/CMakeLists.txt b/src/plugins/generic/tslib/CMakeLists.txt index 9a6e368825..42d6f59b13 100644 --- a/src/plugins/generic/tslib/CMakeLists.txt +++ b/src/plugins/generic/tslib/CMakeLists.txt @@ -8,7 +8,7 @@ qt_find_package(Tslib) # special case qt_internal_add_plugin(QTsLibPlugin OUTPUT_NAME qtslibplugin - TYPE generic + PLUGIN_TYPE generic DEFAULT_IF FALSE SOURCES main.cpp diff --git a/src/plugins/generic/tuiotouch/CMakeLists.txt b/src/plugins/generic/tuiotouch/CMakeLists.txt index b572b140b4..8271216182 100644 --- a/src/plugins/generic/tuiotouch/CMakeLists.txt +++ b/src/plugins/generic/tuiotouch/CMakeLists.txt @@ -6,7 +6,7 @@ qt_internal_add_plugin(QTuioTouchPlugin OUTPUT_NAME qtuiotouchplugin - TYPE generic + PLUGIN_TYPE generic DEFAULT_IF FALSE SOURCES main.cpp |