summaryrefslogtreecommitdiffstats
path: root/src/plugins/generic
diff options
context:
space:
mode:
Diffstat (limited to 'src/plugins/generic')
-rw-r--r--src/plugins/generic/CMakeLists.txt1
-rw-r--r--src/plugins/generic/evdevkeyboard/CMakeLists.txt14
-rw-r--r--src/plugins/generic/evdevmouse/CMakeLists.txt14
-rw-r--r--src/plugins/generic/evdevtablet/CMakeLists.txt14
-rw-r--r--src/plugins/generic/evdevtouch/CMakeLists.txt14
-rw-r--r--src/plugins/generic/libinput/CMakeLists.txt14
-rw-r--r--src/plugins/generic/tslib/CMakeLists.txt17
-rw-r--r--src/plugins/generic/tuiotouch/CMakeLists.txt13
-rw-r--r--src/plugins/generic/tuiotouch/qtuiohandler.cpp10
9 files changed, 77 insertions, 34 deletions
diff --git a/src/plugins/generic/CMakeLists.txt b/src/plugins/generic/CMakeLists.txt
index 8fa648006a..487a79b22b 100644
--- a/src/plugins/generic/CMakeLists.txt
+++ b/src/plugins/generic/CMakeLists.txt
@@ -1,4 +1,3 @@
-
if(QT_FEATURE_evdev)
add_subdirectory(evdevmouse)
add_subdirectory(evdevtouch)
diff --git a/src/plugins/generic/evdevkeyboard/CMakeLists.txt b/src/plugins/generic/evdevkeyboard/CMakeLists.txt
index 6b63d8825f..fd636e6b94 100644
--- a/src/plugins/generic/evdevkeyboard/CMakeLists.txt
+++ b/src/plugins/generic/evdevkeyboard/CMakeLists.txt
@@ -12,8 +12,14 @@ add_qt_plugin(qevdevkeyboardplugin
Qt::CorePrivate
Qt::GuiPrivate
Qt::InputSupportPrivate
- # OTHER_FILES = "evdevkeyboard.json"
- # PLUGIN_CLASS_NAME = "QEvdevKeyboardPlugin"
- # PLUGIN_EXTENDS = "-"
- # _LOADED = "qt_plugin"
+ PUBLIC_LIBRARIES
+ Qt::Core
+ Qt::Gui
+ Qt::InputSupport
)
+
+#### Keys ignored in scope 1:.:.:evdevkeyboard.pro:<TRUE>:
+# OTHER_FILES = "evdevkeyboard.json"
+# PLUGIN_CLASS_NAME = "QEvdevKeyboardPlugin"
+# PLUGIN_EXTENDS = "-"
+# _LOADED = "qt_plugin"
diff --git a/src/plugins/generic/evdevmouse/CMakeLists.txt b/src/plugins/generic/evdevmouse/CMakeLists.txt
index 686c4ab2e3..0035e6d960 100644
--- a/src/plugins/generic/evdevmouse/CMakeLists.txt
+++ b/src/plugins/generic/evdevmouse/CMakeLists.txt
@@ -12,8 +12,14 @@ add_qt_plugin(qevdevmouseplugin
Qt::CorePrivate
Qt::GuiPrivate
Qt::InputSupportPrivate
- # OTHER_FILES = "evdevmouse.json"
- # PLUGIN_CLASS_NAME = "QEvdevMousePlugin"
- # PLUGIN_EXTENDS = "-"
- # _LOADED = "qt_plugin"
+ PUBLIC_LIBRARIES
+ Qt::Core
+ Qt::Gui
+ Qt::InputSupport
)
+
+#### Keys ignored in scope 1:.:.:evdevmouse.pro:<TRUE>:
+# OTHER_FILES = "evdevmouse.json"
+# PLUGIN_CLASS_NAME = "QEvdevMousePlugin"
+# PLUGIN_EXTENDS = "-"
+# _LOADED = "qt_plugin"
diff --git a/src/plugins/generic/evdevtablet/CMakeLists.txt b/src/plugins/generic/evdevtablet/CMakeLists.txt
index a402023e47..c473fce68b 100644
--- a/src/plugins/generic/evdevtablet/CMakeLists.txt
+++ b/src/plugins/generic/evdevtablet/CMakeLists.txt
@@ -12,8 +12,14 @@ add_qt_plugin(qevdevtabletplugin
Qt::CorePrivate
Qt::GuiPrivate
Qt::InputSupportPrivate
- # OTHER_FILES = "evdevtablet.json"
- # PLUGIN_CLASS_NAME = "QEvdevTabletPlugin"
- # PLUGIN_EXTENDS = "-"
- # _LOADED = "qt_plugin"
+ PUBLIC_LIBRARIES
+ Qt::Core
+ Qt::Gui
+ Qt::InputSupport
)
+
+#### Keys ignored in scope 1:.:.:evdevtablet.pro:<TRUE>:
+# OTHER_FILES = "evdevtablet.json"
+# PLUGIN_CLASS_NAME = "QEvdevTabletPlugin"
+# PLUGIN_EXTENDS = "-"
+# _LOADED = "qt_plugin"
diff --git a/src/plugins/generic/evdevtouch/CMakeLists.txt b/src/plugins/generic/evdevtouch/CMakeLists.txt
index d29b82b01c..fd6b9008ca 100644
--- a/src/plugins/generic/evdevtouch/CMakeLists.txt
+++ b/src/plugins/generic/evdevtouch/CMakeLists.txt
@@ -12,8 +12,14 @@ add_qt_plugin(qevdevtouchplugin
Qt::CorePrivate
Qt::GuiPrivate
Qt::InputSupportPrivate
- # OTHER_FILES = "evdevtouch.json"
- # PLUGIN_CLASS_NAME = "QEvdevTouchScreenPlugin"
- # PLUGIN_EXTENDS = "-"
- # _LOADED = "qt_plugin"
+ PUBLIC_LIBRARIES
+ Qt::Core
+ Qt::Gui
+ Qt::InputSupport
)
+
+#### Keys ignored in scope 1:.:.:evdevtouch.pro:<TRUE>:
+# OTHER_FILES = "evdevtouch.json"
+# PLUGIN_CLASS_NAME = "QEvdevTouchScreenPlugin"
+# PLUGIN_EXTENDS = "-"
+# _LOADED = "qt_plugin"
diff --git a/src/plugins/generic/libinput/CMakeLists.txt b/src/plugins/generic/libinput/CMakeLists.txt
index e83029d867..fb0cf677e9 100644
--- a/src/plugins/generic/libinput/CMakeLists.txt
+++ b/src/plugins/generic/libinput/CMakeLists.txt
@@ -12,8 +12,14 @@ add_qt_plugin(qlibinputplugin
Qt::CorePrivate
Qt::GuiPrivate
Qt::InputSupportPrivate
- # OTHER_FILES = "libinput.json"
- # PLUGIN_CLASS_NAME = "QLibInputPlugin"
- # PLUGIN_EXTENDS = "-"
- # _LOADED = "qt_plugin"
+ PUBLIC_LIBRARIES
+ Qt::Core
+ Qt::Gui
+ Qt::InputSupport
)
+
+#### Keys ignored in scope 1:.:.:libinput.pro:<TRUE>:
+# OTHER_FILES = "libinput.json"
+# PLUGIN_CLASS_NAME = "QLibInputPlugin"
+# PLUGIN_EXTENDS = "-"
+# _LOADED = "qt_plugin"
diff --git a/src/plugins/generic/tslib/CMakeLists.txt b/src/plugins/generic/tslib/CMakeLists.txt
index 33ee2a9564..b46217d845 100644
--- a/src/plugins/generic/tslib/CMakeLists.txt
+++ b/src/plugins/generic/tslib/CMakeLists.txt
@@ -1,5 +1,7 @@
# Generated from tslib.pro.
+find_package(Tslib) # special case
+
#####################################################################
## qtslibplugin Plugin:
#####################################################################
@@ -12,8 +14,15 @@ add_qt_plugin(qtslibplugin
Qt::CorePrivate
Qt::GuiPrivate
Qt::InputSupportPrivate
- # OTHER_FILES = "tslib.json"
- # PLUGIN_CLASS_NAME = "QTsLibPlugin"
- # PLUGIN_EXTENDS = "-"
- # _LOADED = "qt_plugin"
+ PUBLIC_LIBRARIES
+ PkgConfig::Tslib
+ Qt::Core
+ Qt::Gui
+ Qt::InputSupport
)
+
+#### Keys ignored in scope 1:.:.:tslib.pro:<TRUE>:
+# OTHER_FILES = "tslib.json"
+# PLUGIN_CLASS_NAME = "QTsLibPlugin"
+# PLUGIN_EXTENDS = "-"
+# _LOADED = "qt_plugin"
diff --git a/src/plugins/generic/tuiotouch/CMakeLists.txt b/src/plugins/generic/tuiotouch/CMakeLists.txt
index 189ff9eed2..c6452780c5 100644
--- a/src/plugins/generic/tuiotouch/CMakeLists.txt
+++ b/src/plugins/generic/tuiotouch/CMakeLists.txt
@@ -18,9 +18,14 @@ add_qt_plugin(qtuiotouchplugin
LIBRARIES
Qt::CorePrivate
Qt::GuiPrivate
+ PUBLIC_LIBRARIES
+ Qt::Core
+ Qt::Gui
Qt::Network
- # OTHER_FILES = "tuiotouch.json"
- # PLUGIN_CLASS_NAME = "QTuioTouchPlugin"
- # PLUGIN_EXTENDS = "-"
- # _LOADED = "qt_plugin"
)
+
+#### Keys ignored in scope 1:.:.:tuiotouch.pro:<TRUE>:
+# OTHER_FILES = "tuiotouch.json"
+# PLUGIN_CLASS_NAME = "QTuioTouchPlugin"
+# PLUGIN_EXTENDS = "-"
+# _LOADED = "qt_plugin"
diff --git a/src/plugins/generic/tuiotouch/qtuiohandler.cpp b/src/plugins/generic/tuiotouch/qtuiohandler.cpp
index bb18ba5085..cb82672acd 100644
--- a/src/plugins/generic/tuiotouch/qtuiohandler.cpp
+++ b/src/plugins/generic/tuiotouch/qtuiohandler.cpp
@@ -169,7 +169,7 @@ void QTuioHandler::processPackets()
messages.push_back(msg);
}
- for (const QOscMessage &message : messages) {
+ for (const QOscMessage &message : qAsConst(messages)) {
if (message.addressPattern() == "/tuio/2Dcur") {
QList<QVariant> arguments = message.arguments();
if (arguments.count() == 0) {
@@ -368,12 +368,12 @@ void QTuioHandler::process2DCurFseq(const QOscMessage &message)
QList<QWindowSystemInterface::TouchPoint> tpl;
tpl.reserve(m_activeCursors.size() + m_deadCursors.size());
- for (const QTuioCursor &tc : m_activeCursors) {
+ for (const QTuioCursor &tc : qAsConst(m_activeCursors)) {
QWindowSystemInterface::TouchPoint tp = cursorToTouchPoint(tc, win);
tpl.append(tp);
}
- for (const QTuioCursor &tc : m_deadCursors) {
+ for (const QTuioCursor &tc : qAsConst(m_deadCursors)) {
QWindowSystemInterface::TouchPoint tp = cursorToTouchPoint(tc, win);
tp.state = Qt::TouchPointReleased;
tpl.append(tp);
@@ -542,12 +542,12 @@ void QTuioHandler::process2DObjFseq(const QOscMessage &message)
QList<QWindowSystemInterface::TouchPoint> tpl;
tpl.reserve(m_activeTokens.size() + m_deadTokens.size());
- for (const QTuioToken & t : m_activeTokens) {
+ for (const QTuioToken & t : qAsConst(m_activeTokens)) {
QWindowSystemInterface::TouchPoint tp = tokenToTouchPoint(t, win);
tpl.append(tp);
}
- for (const QTuioToken & t : m_deadTokens) {
+ for (const QTuioToken & t : qAsConst(m_deadTokens)) {
QWindowSystemInterface::TouchPoint tp = tokenToTouchPoint(t, win);
tp.state = Qt::TouchPointReleased;
tp.velocity = QVector2D();
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-30 09:56:11 +0000