summaryrefslogtreecommitdiffstats
path: root/src/plugins/generic
diff options
context:
space:
mode:
Diffstat (limited to 'src/plugins/generic')
-rw-r--r--src/plugins/generic/evdevkeyboard/CMakeLists.txt15
-rw-r--r--src/plugins/generic/evdevmouse/CMakeLists.txt15
-rw-r--r--src/plugins/generic/evdevtablet/CMakeLists.txt15
-rw-r--r--src/plugins/generic/evdevtouch/CMakeLists.txt15
-rw-r--r--src/plugins/generic/libinput/CMakeLists.txt15
-rw-r--r--src/plugins/generic/tslib/.prev_CMakeLists.txt15
-rw-r--r--src/plugins/generic/tslib/CMakeLists.txt15
-rw-r--r--src/plugins/generic/tuiotouch/CMakeLists.txt12
-rw-r--r--src/plugins/generic/tuiotouch/qtuiohandler.cpp40
9 files changed, 67 insertions, 90 deletions
diff --git a/src/plugins/generic/evdevkeyboard/CMakeLists.txt b/src/plugins/generic/evdevkeyboard/CMakeLists.txt
index 59510d604e..86f5c36124 100644
--- a/src/plugins/generic/evdevkeyboard/CMakeLists.txt
+++ b/src/plugins/generic/evdevkeyboard/CMakeLists.txt
@@ -1,25 +1,22 @@
# Generated from evdevkeyboard.pro.
#####################################################################
-## qevdevkeyboardplugin Plugin:
+## QEvdevKeyboardPlugin Plugin:
#####################################################################
-add_qt_plugin(qevdevkeyboardplugin
+qt_add_plugin(QEvdevKeyboardPlugin
+ OUTPUT_NAME qevdevkeyboardplugin
TYPE generic
- CLASS_NAME QEvdevKeyboardPlugin
SOURCES
main.cpp
- LIBRARIES
- Qt::CorePrivate
- Qt::GuiPrivate
- Qt::InputSupportPrivate
PUBLIC_LIBRARIES
Qt::Core
+ Qt::CorePrivate
Qt::Gui
- Qt::InputSupport
+ Qt::GuiPrivate
+ Qt::InputSupportPrivate
)
#### Keys ignored in scope 1:.:.:evdevkeyboard.pro:<TRUE>:
# OTHER_FILES = "evdevkeyboard.json"
# PLUGIN_EXTENDS = "-"
-# _LOADED = "qt_plugin"
diff --git a/src/plugins/generic/evdevmouse/CMakeLists.txt b/src/plugins/generic/evdevmouse/CMakeLists.txt
index 339a538576..2ed6c1b6d4 100644
--- a/src/plugins/generic/evdevmouse/CMakeLists.txt
+++ b/src/plugins/generic/evdevmouse/CMakeLists.txt
@@ -1,25 +1,22 @@
# Generated from evdevmouse.pro.
#####################################################################
-## qevdevmouseplugin Plugin:
+## QEvdevMousePlugin Plugin:
#####################################################################
-add_qt_plugin(qevdevmouseplugin
+qt_add_plugin(QEvdevMousePlugin
+ OUTPUT_NAME qevdevmouseplugin
TYPE generic
- CLASS_NAME QEvdevMousePlugin
SOURCES
main.cpp
- LIBRARIES
- Qt::CorePrivate
- Qt::GuiPrivate
- Qt::InputSupportPrivate
PUBLIC_LIBRARIES
Qt::Core
+ Qt::CorePrivate
Qt::Gui
- Qt::InputSupport
+ Qt::GuiPrivate
+ Qt::InputSupportPrivate
)
#### Keys ignored in scope 1:.:.:evdevmouse.pro:<TRUE>:
# OTHER_FILES = "evdevmouse.json"
# PLUGIN_EXTENDS = "-"
-# _LOADED = "qt_plugin"
diff --git a/src/plugins/generic/evdevtablet/CMakeLists.txt b/src/plugins/generic/evdevtablet/CMakeLists.txt
index 2898f00bde..93dd10a0e1 100644
--- a/src/plugins/generic/evdevtablet/CMakeLists.txt
+++ b/src/plugins/generic/evdevtablet/CMakeLists.txt
@@ -1,25 +1,22 @@
# Generated from evdevtablet.pro.
#####################################################################
-## qevdevtabletplugin Plugin:
+## QEvdevTabletPlugin Plugin:
#####################################################################
-add_qt_plugin(qevdevtabletplugin
+qt_add_plugin(QEvdevTabletPlugin
+ OUTPUT_NAME qevdevtabletplugin
TYPE generic
- CLASS_NAME QEvdevTabletPlugin
SOURCES
main.cpp
- LIBRARIES
- Qt::CorePrivate
- Qt::GuiPrivate
- Qt::InputSupportPrivate
PUBLIC_LIBRARIES
Qt::Core
+ Qt::CorePrivate
Qt::Gui
- Qt::InputSupport
+ Qt::GuiPrivate
+ Qt::InputSupportPrivate
)
#### Keys ignored in scope 1:.:.:evdevtablet.pro:<TRUE>:
# OTHER_FILES = "evdevtablet.json"
# PLUGIN_EXTENDS = "-"
-# _LOADED = "qt_plugin"
diff --git a/src/plugins/generic/evdevtouch/CMakeLists.txt b/src/plugins/generic/evdevtouch/CMakeLists.txt
index ae0ec4ae4b..e4a4d40c2a 100644
--- a/src/plugins/generic/evdevtouch/CMakeLists.txt
+++ b/src/plugins/generic/evdevtouch/CMakeLists.txt
@@ -1,25 +1,22 @@
# Generated from evdevtouch.pro.
#####################################################################
-## qevdevtouchplugin Plugin:
+## QEvdevTouchScreenPlugin Plugin:
#####################################################################
-add_qt_plugin(qevdevtouchplugin
+qt_add_plugin(QEvdevTouchScreenPlugin
+ OUTPUT_NAME qevdevtouchplugin
TYPE generic
- CLASS_NAME QEvdevTouchScreenPlugin
SOURCES
main.cpp
- LIBRARIES
- Qt::CorePrivate
- Qt::GuiPrivate
- Qt::InputSupportPrivate
PUBLIC_LIBRARIES
Qt::Core
+ Qt::CorePrivate
Qt::Gui
- Qt::InputSupport
+ Qt::GuiPrivate
+ Qt::InputSupportPrivate
)
#### Keys ignored in scope 1:.:.:evdevtouch.pro:<TRUE>:
# OTHER_FILES = "evdevtouch.json"
# PLUGIN_EXTENDS = "-"
-# _LOADED = "qt_plugin"
diff --git a/src/plugins/generic/libinput/CMakeLists.txt b/src/plugins/generic/libinput/CMakeLists.txt
index f44265c4d6..b772623307 100644
--- a/src/plugins/generic/libinput/CMakeLists.txt
+++ b/src/plugins/generic/libinput/CMakeLists.txt
@@ -1,25 +1,22 @@
# Generated from libinput.pro.
#####################################################################
-## qlibinputplugin Plugin:
+## QLibInputPlugin Plugin:
#####################################################################
-add_qt_plugin(qlibinputplugin
+qt_add_plugin(QLibInputPlugin
+ OUTPUT_NAME qlibinputplugin
TYPE generic
- CLASS_NAME QLibInputPlugin
SOURCES
main.cpp
- LIBRARIES
- Qt::CorePrivate
- Qt::GuiPrivate
- Qt::InputSupportPrivate
PUBLIC_LIBRARIES
Qt::Core
+ Qt::CorePrivate
Qt::Gui
- Qt::InputSupport
+ Qt::GuiPrivate
+ Qt::InputSupportPrivate
)
#### Keys ignored in scope 1:.:.:libinput.pro:<TRUE>:
# OTHER_FILES = "libinput.json"
# PLUGIN_EXTENDS = "-"
-# _LOADED = "qt_plugin"
diff --git a/src/plugins/generic/tslib/.prev_CMakeLists.txt b/src/plugins/generic/tslib/.prev_CMakeLists.txt
index 12aa29bb00..3e82a077c3 100644
--- a/src/plugins/generic/tslib/.prev_CMakeLists.txt
+++ b/src/plugins/generic/tslib/.prev_CMakeLists.txt
@@ -1,26 +1,23 @@
# Generated from tslib.pro.
#####################################################################
-## qtslibplugin Plugin:
+## QTsLibPlugin Plugin:
#####################################################################
-add_qt_plugin(qtslibplugin
+qt_add_plugin(QTsLibPlugin
+ OUTPUT_NAME qtslibplugin
TYPE generic
- CLASS_NAME QTsLibPlugin
SOURCES
main.cpp
- LIBRARIES
- Qt::CorePrivate
- Qt::GuiPrivate
- Qt::InputSupportPrivate
PUBLIC_LIBRARIES
PkgConfig::Tslib
Qt::Core
+ Qt::CorePrivate
Qt::Gui
- Qt::InputSupport
+ Qt::GuiPrivate
+ Qt::InputSupportPrivate
)
#### Keys ignored in scope 1:.:.:tslib.pro:<TRUE>:
# OTHER_FILES = "tslib.json"
# PLUGIN_EXTENDS = "-"
-# _LOADED = "qt_plugin"
diff --git a/src/plugins/generic/tslib/CMakeLists.txt b/src/plugins/generic/tslib/CMakeLists.txt
index 714c8853f1..964e322a55 100644
--- a/src/plugins/generic/tslib/CMakeLists.txt
+++ b/src/plugins/generic/tslib/CMakeLists.txt
@@ -3,26 +3,23 @@
qt_find_package(Tslib) # special case
#####################################################################
-## qtslibplugin Plugin:
+## QTsLibPlugin Plugin:
#####################################################################
-add_qt_plugin(qtslibplugin
+qt_add_plugin(QTsLibPlugin
+ OUTPUT_NAME qtslibplugin
TYPE generic
- CLASS_NAME QTsLibPlugin
SOURCES
main.cpp
- LIBRARIES
- Qt::CorePrivate
- Qt::GuiPrivate
- Qt::InputSupportPrivate
PUBLIC_LIBRARIES
PkgConfig::Tslib
Qt::Core
+ Qt::CorePrivate
Qt::Gui
- Qt::InputSupport
+ Qt::GuiPrivate
+ Qt::InputSupportPrivate
)
#### Keys ignored in scope 1:.:.:tslib.pro:<TRUE>:
# OTHER_FILES = "tslib.json"
# PLUGIN_EXTENDS = "-"
-# _LOADED = "qt_plugin"
diff --git a/src/plugins/generic/tuiotouch/CMakeLists.txt b/src/plugins/generic/tuiotouch/CMakeLists.txt
index ec0f03367e..82db49d4c3 100644
--- a/src/plugins/generic/tuiotouch/CMakeLists.txt
+++ b/src/plugins/generic/tuiotouch/CMakeLists.txt
@@ -1,12 +1,12 @@
# Generated from tuiotouch.pro.
#####################################################################
-## qtuiotouchplugin Plugin:
+## QTuioTouchPlugin Plugin:
#####################################################################
-add_qt_plugin(qtuiotouchplugin
+qt_add_plugin(QTuioTouchPlugin
+ OUTPUT_NAME qtuiotouchplugin
TYPE generic
- CLASS_NAME QTuioTouchPlugin
SOURCES
main.cpp
qoscbundle.cpp qoscbundle_p.h
@@ -16,16 +16,14 @@ add_qt_plugin(qtuiotouchplugin
qtuiotoken_p.h
DEFINES
QT_NO_FOREACH
- LIBRARIES
- Qt::CorePrivate
- Qt::GuiPrivate
PUBLIC_LIBRARIES
Qt::Core
+ Qt::CorePrivate
Qt::Gui
+ Qt::GuiPrivate
Qt::Network
)
#### Keys ignored in scope 1:.:.:tuiotouch.pro:<TRUE>:
# OTHER_FILES = "tuiotouch.json"
# PLUGIN_EXTENDS = "-"
-# _LOADED = "qt_plugin"
diff --git a/src/plugins/generic/tuiotouch/qtuiohandler.cpp b/src/plugins/generic/tuiotouch/qtuiohandler.cpp
index cb82672acd..6ad4597b19 100644
--- a/src/plugins/generic/tuiotouch/qtuiohandler.cpp
+++ b/src/plugins/generic/tuiotouch/qtuiohandler.cpp
@@ -226,7 +226,7 @@ void QTuioHandler::process2DCurSource(const QOscMessage &message)
return;
}
- if (QMetaType::Type(arguments.at(1).type()) != QMetaType::QByteArray) {
+ if (QMetaType::Type(arguments.at(1).userType()) != QMetaType::QByteArray) {
qCWarning(lcTuioSource, "Ignoring malformed TUIO source message (bad argument type)");
return;
}
@@ -248,7 +248,7 @@ void QTuioHandler::process2DCurAlive(const QOscMessage &message)
QMap<int, QTuioCursor> newActiveCursors;
for (int i = 1; i < arguments.count(); ++i) {
- if (QMetaType::Type(arguments.at(i).type()) != QMetaType::Int) {
+ if (QMetaType::Type(arguments.at(i).userType()) != QMetaType::Int) {
qCWarning(lcTuioHandler) << "Ignoring malformed TUIO alive message (bad argument on position" << i << arguments << ')';
return;
}
@@ -293,12 +293,12 @@ void QTuioHandler::process2DCurSet(const QOscMessage &message)
return;
}
- if (QMetaType::Type(arguments.at(1).type()) != QMetaType::Int ||
- QMetaType::Type(arguments.at(2).type()) != QMetaType::Float ||
- QMetaType::Type(arguments.at(3).type()) != QMetaType::Float ||
- QMetaType::Type(arguments.at(4).type()) != QMetaType::Float ||
- QMetaType::Type(arguments.at(5).type()) != QMetaType::Float ||
- QMetaType::Type(arguments.at(6).type()) != QMetaType::Float
+ if (QMetaType::Type(arguments.at(1).userType()) != QMetaType::Int ||
+ QMetaType::Type(arguments.at(2).userType()) != QMetaType::Float ||
+ QMetaType::Type(arguments.at(3).userType()) != QMetaType::Float ||
+ QMetaType::Type(arguments.at(4).userType()) != QMetaType::Float ||
+ QMetaType::Type(arguments.at(5).userType()) != QMetaType::Float ||
+ QMetaType::Type(arguments.at(6).userType()) != QMetaType::Float
) {
qCWarning(lcTuioSet) << "Ignoring malformed TUIO set message with bad types: " << arguments;
return;
@@ -391,7 +391,7 @@ void QTuioHandler::process2DObjSource(const QOscMessage &message)
return;
}
- if (QMetaType::Type(arguments.at(1).type()) != QMetaType::QByteArray) {
+ if (QMetaType::Type(arguments.at(1).userType()) != QMetaType::QByteArray) {
qCWarning(lcTuioSource, "Ignoring malformed TUIO source message (bad argument type)");
return;
}
@@ -413,7 +413,7 @@ void QTuioHandler::process2DObjAlive(const QOscMessage &message)
QMap<int, QTuioToken> newActiveTokens;
for (int i = 1; i < arguments.count(); ++i) {
- if (QMetaType::Type(arguments.at(i).type()) != QMetaType::Int) {
+ if (QMetaType::Type(arguments.at(i).userType()) != QMetaType::Int) {
qCWarning(lcTuioHandler) << "Ignoring malformed TUIO alive message (bad argument on position" << i << arguments << ')';
return;
}
@@ -458,16 +458,16 @@ void QTuioHandler::process2DObjSet(const QOscMessage &message)
return;
}
- if (QMetaType::Type(arguments.at(1).type()) != QMetaType::Int ||
- QMetaType::Type(arguments.at(2).type()) != QMetaType::Int ||
- QMetaType::Type(arguments.at(3).type()) != QMetaType::Float ||
- QMetaType::Type(arguments.at(4).type()) != QMetaType::Float ||
- QMetaType::Type(arguments.at(5).type()) != QMetaType::Float ||
- QMetaType::Type(arguments.at(6).type()) != QMetaType::Float ||
- QMetaType::Type(arguments.at(7).type()) != QMetaType::Float ||
- QMetaType::Type(arguments.at(8).type()) != QMetaType::Float ||
- QMetaType::Type(arguments.at(9).type()) != QMetaType::Float ||
- QMetaType::Type(arguments.at(10).type()) != QMetaType::Float) {
+ if (QMetaType::Type(arguments.at(1).userType()) != QMetaType::Int ||
+ QMetaType::Type(arguments.at(2).userType()) != QMetaType::Int ||
+ QMetaType::Type(arguments.at(3).userType()) != QMetaType::Float ||
+ QMetaType::Type(arguments.at(4).userType()) != QMetaType::Float ||
+ QMetaType::Type(arguments.at(5).userType()) != QMetaType::Float ||
+ QMetaType::Type(arguments.at(6).userType()) != QMetaType::Float ||
+ QMetaType::Type(arguments.at(7).userType()) != QMetaType::Float ||
+ QMetaType::Type(arguments.at(8).userType()) != QMetaType::Float ||
+ QMetaType::Type(arguments.at(9).userType()) != QMetaType::Float ||
+ QMetaType::Type(arguments.at(10).userType()) != QMetaType::Float) {
qCWarning(lcTuioSet) << "Ignoring malformed TUIO set message with bad types: " << arguments;
return;
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-21 10:06:43 +0000