diff options
Diffstat (limited to 'src')
22 files changed, 82 insertions, 67 deletions
diff --git a/src/platformsupport/input/evdevkeyboard/evdevkeyboard.pri b/src/platformsupport/input/evdevkeyboard/evdevkeyboard.pri new file mode 100644 index 0000000000..1797f48d04 --- /dev/null +++ b/src/platformsupport/input/evdevkeyboard/evdevkeyboard.pri @@ -0,0 +1,12 @@ +HEADERS += \ + $$PWD/qevdevkeyboard_defaultmap_p.h \ + $$PWD/qevdevkeyboardhandler_p.h \ + $$PWD/qevdevkeyboardmanager_p.h + +SOURCES += \ + $$PWD/qevdevkeyboardhandler.cpp \ + $$PWD/qevdevkeyboardmanager.cpp + +contains(QT_CONFIG, libudev) { + LIBS += $$QMAKE_LIBS_LIBUDEV +} diff --git a/src/plugins/generic/evdevkeyboard/qevdevkeyboard_defaultmap.h b/src/platformsupport/input/evdevkeyboard/qevdevkeyboard_defaultmap_p.h index 49b07efff9..9369f1233d 100644 --- a/src/plugins/generic/evdevkeyboard/qevdevkeyboard_defaultmap.h +++ b/src/platformsupport/input/evdevkeyboard/qevdevkeyboard_defaultmap_p.h @@ -39,8 +39,8 @@ ** ****************************************************************************/ -#ifndef QEVDEVKEYBOARDHANDLER_DEFAULTMAP_H -#define QEVDEVKEYBOARDHANDLER_DEFAULTMAP_H +#ifndef QEVDEVKEYBOARDHANDLER_DEFAULTMAP_P_H +#define QEVDEVKEYBOARDHANDLER_DEFAULTMAP_P_H // no QT_BEGIN_NAMESPACE, since we include it internally... @@ -784,4 +784,4 @@ const QEvdevKeyboardMap::Composing QEvdevKeyboardHandler::s_keycompose_default[] { 0x0049, 0x004a, 0x0178 }, }; -#endif // QEVDEVKEYBOARDHANDLER_DEFAULTMAP_H +#endif // QEVDEVKEYBOARDHANDLER_DEFAULTMAP_P_H diff --git a/src/plugins/generic/evdevkeyboard/qevdevkeyboardhandler.cpp b/src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler.cpp index c963606305..9d596780a9 100644 --- a/src/plugins/generic/evdevkeyboard/qevdevkeyboardhandler.cpp +++ b/src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include "qevdevkeyboardhandler.h" +#include "qevdevkeyboardhandler_p.h" #include <qplatformdefs.h> @@ -60,7 +60,7 @@ QT_BEGIN_NAMESPACE // simple builtin US keymap -#include "qevdevkeyboard_defaultmap.h" +#include "qevdevkeyboard_defaultmap_p.h" QEvdevKeyboardHandler::QEvdevKeyboardHandler(const QString &device, int fd, bool disableZap, bool enableCompose, const QString &keymapFile) : m_device(device), m_fd(fd), diff --git a/src/plugins/generic/evdevkeyboard/qevdevkeyboardhandler.h b/src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler_p.h index 6b7901f42e..2d38df814d 100644 --- a/src/plugins/generic/evdevkeyboard/qevdevkeyboardhandler.h +++ b/src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler_p.h @@ -39,8 +39,8 @@ ** ****************************************************************************/ -#ifndef QEVDEVKEYBOARDHANDLER_H -#define QEVDEVKEYBOARDHANDLER_H +#ifndef QEVDEVKEYBOARDHANDLER_P_H +#define QEVDEVKEYBOARDHANDLER_P_H #include <qobject.h> #include <QTimer> @@ -199,4 +199,4 @@ QT_END_NAMESPACE QT_END_HEADER -#endif // QEVDEVKEYBOARDHANDLER_H +#endif // QEVDEVKEYBOARDHANDLER_P_H diff --git a/src/plugins/generic/evdevkeyboard/qevdevkeyboardmanager.cpp b/src/platformsupport/input/evdevkeyboard/qevdevkeyboardmanager.cpp index 43d20e5c0d..4143d10244 100644 --- a/src/plugins/generic/evdevkeyboard/qevdevkeyboardmanager.cpp +++ b/src/platformsupport/input/evdevkeyboard/qevdevkeyboardmanager.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include "qevdevkeyboardmanager.h" +#include "qevdevkeyboardmanager_p.h" #include <QStringList> #include <QCoreApplication> diff --git a/src/plugins/generic/evdevkeyboard/qevdevkeyboardmanager.h b/src/platformsupport/input/evdevkeyboard/qevdevkeyboardmanager_p.h index 3cd576d039..35e0d14bcd 100644 --- a/src/plugins/generic/evdevkeyboard/qevdevkeyboardmanager.h +++ b/src/platformsupport/input/evdevkeyboard/qevdevkeyboardmanager_p.h @@ -39,10 +39,10 @@ ** ****************************************************************************/ -#ifndef QEVDEVKEYBOARDMANAGER_H -#define QEVDEVKEYBOARDMANAGER_H +#ifndef QEVDEVKEYBOARDMANAGER_P_H +#define QEVDEVKEYBOARDMANAGER_P_H -#include "qevdevkeyboardhandler.h" +#include "qevdevkeyboardhandler_p.h" #include <QtPlatformSupport/private/qdevicediscovery_p.h> @@ -75,4 +75,4 @@ QT_END_HEADER QT_END_NAMESPACE -#endif // QEVDEVKEYBOARDMANAGER_H +#endif // QEVDEVKEYBOARDMANAGER_P_H diff --git a/src/platformsupport/input/evdevmouse/evdevmouse.pri b/src/platformsupport/input/evdevmouse/evdevmouse.pri new file mode 100644 index 0000000000..16b456683d --- /dev/null +++ b/src/platformsupport/input/evdevmouse/evdevmouse.pri @@ -0,0 +1,12 @@ +HEADERS += \ + $$PWD/qevdevmousehandler_p.h \ + $$PWD/qevdevmousemanager_p.h + +SOURCES += \ + $$PWD/qevdevmousehandler.cpp \ + $$PWD/qevdevmousemanager.cpp + +contains(QT_CONFIG, libudev) { + LIBS += $$QMAKE_LIBS_LIBUDEV +} + diff --git a/src/plugins/generic/evdevmouse/qevdevmousehandler.cpp b/src/platformsupport/input/evdevmouse/qevdevmousehandler.cpp index 439d2c095a..2e318a0c3a 100644 --- a/src/plugins/generic/evdevmouse/qevdevmousehandler.cpp +++ b/src/platformsupport/input/evdevmouse/qevdevmousehandler.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include "qevdevmousehandler.h" +#include "qevdevmousehandler_p.h" #include <QSocketNotifier> #include <QStringList> @@ -73,9 +73,9 @@ QEvdevMouseHandler *QEvdevMouseHandler::create(const QString &device, const QStr QStringList args = specification.split(QLatin1Char(':')); foreach (const QString &arg, args) { - if (arg == "nocompress") + if (arg == QLatin1String("nocompress")) compression = false; - else if (arg.startsWith("dejitter=")) + else if (arg.startsWith(QLatin1String("dejitter="))) jitterLimit = arg.mid(9).toInt(); } diff --git a/src/plugins/generic/evdevmouse/qevdevmousehandler.h b/src/platformsupport/input/evdevmouse/qevdevmousehandler_p.h index e3444735fe..38ee312372 100644 --- a/src/plugins/generic/evdevmouse/qevdevmousehandler.h +++ b/src/platformsupport/input/evdevmouse/qevdevmousehandler_p.h @@ -39,8 +39,8 @@ ** ****************************************************************************/ -#ifndef QEVDEVMOUSEHANDLER_H -#define QEVDEVMOUSEHANDLER_H +#ifndef QEVDEVMOUSEHANDLER_P_H +#define QEVDEVMOUSEHANDLER_P_H #include <QObject> #include <QString> @@ -83,4 +83,4 @@ QT_END_NAMESPACE QT_END_HEADER -#endif // QEVDEVMOUSEHANDLER_H +#endif // QEVDEVMOUSEHANDLER_P_H diff --git a/src/plugins/generic/evdevmouse/qevdevmousemanager.cpp b/src/platformsupport/input/evdevmouse/qevdevmousemanager.cpp index 132161c176..f1a86cb15a 100644 --- a/src/plugins/generic/evdevmouse/qevdevmousemanager.cpp +++ b/src/platformsupport/input/evdevmouse/qevdevmousemanager.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include "qevdevmousemanager.h" +#include "qevdevmousemanager_p.h" #include <QStringList> #include <QGuiApplication> @@ -63,19 +63,19 @@ QEvdevMouseManager::QEvdevMouseManager(const QString &key, const QString &specif QStringList devices; foreach (const QString &arg, args) { - if (arg.startsWith("/dev/")) { + if (arg.startsWith(QLatin1String("/dev/"))) { // if device is specified try to use it devices.append(arg); args.removeAll(arg); - } else if (arg.startsWith("xoffset=")) { + } else if (arg.startsWith(QLatin1String("xoffset="))) { m_xoffset = arg.mid(8).toInt(); - } else if (arg.startsWith("yoffset=")) { + } else if (arg.startsWith(QLatin1String("yoffset="))) { m_yoffset = arg.mid(8).toInt(); } } // build new specification without /dev/ elements - m_spec = args.join(":"); + m_spec = args.join(QLatin1String(":")); // add all mice for devices specified in the argument list foreach (const QString &device, devices) diff --git a/src/plugins/generic/evdevmouse/qevdevmousemanager.h b/src/platformsupport/input/evdevmouse/qevdevmousemanager_p.h index ee528de15c..2bc3fa798d 100644 --- a/src/plugins/generic/evdevmouse/qevdevmousemanager.h +++ b/src/platformsupport/input/evdevmouse/qevdevmousemanager_p.h @@ -39,10 +39,10 @@ ** ****************************************************************************/ -#ifndef QEVDEVMOUSEMANAGER_H -#define QEVDEVMOUSEMANAGER_H +#ifndef QEVDEVMOUSEMANAGER_P_H +#define QEVDEVMOUSEMANAGER_P_H -#include "qevdevmousehandler.h" +#include "qevdevmousehandler_p.h" #include <QtPlatformSupport/private/qdevicediscovery_p.h> @@ -82,4 +82,4 @@ QT_END_HEADER QT_END_NAMESPACE -#endif // QEVDEVMOUSEMANAGER_H +#endif // QEVDEVMOUSEMANAGER_P_H diff --git a/src/platformsupport/input/evdevtouch/evdevtouch.pri b/src/platformsupport/input/evdevtouch/evdevtouch.pri new file mode 100644 index 0000000000..64c4b9afd9 --- /dev/null +++ b/src/platformsupport/input/evdevtouch/evdevtouch.pri @@ -0,0 +1,13 @@ +HEADERS += \ + $$PWD/qevdevtouch_p.h + +SOURCES += \ + $$PWD/qevdevtouch.cpp + +contains(QT_CONFIG, libudev) { + LIBS += $$QMAKE_LIBS_LIBUDEV +} + +# DEFINES += USE_MTDEV + +contains(DEFINES, USE_MTDEV): LIBS += -lmtdev diff --git a/src/plugins/generic/evdevtouch/qevdevtouch.cpp b/src/platformsupport/input/evdevtouch/qevdevtouch.cpp index aa43b6ac85..1369e2ae53 100644 --- a/src/plugins/generic/evdevtouch/qevdevtouch.cpp +++ b/src/platformsupport/input/evdevtouch/qevdevtouch.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include "qevdevtouch.h" +#include "qevdevtouch_p.h" #include <QStringList> #include <QHash> #include <QSocketNotifier> diff --git a/src/plugins/generic/evdevtouch/qevdevtouch.h b/src/platformsupport/input/evdevtouch/qevdevtouch_p.h index 40ed9b2a91..63b02f2086 100644 --- a/src/plugins/generic/evdevtouch/qevdevtouch.h +++ b/src/platformsupport/input/evdevtouch/qevdevtouch_p.h @@ -39,8 +39,8 @@ ** ****************************************************************************/ -#ifndef QEVDEVTOUCH_H -#define QEVDEVTOUCH_H +#ifndef QEVDEVTOUCH_P_H +#define QEVDEVTOUCH_P_H #include <QObject> #include <QString> @@ -95,4 +95,4 @@ QT_END_NAMESPACE QT_END_HEADER -#endif // QEVDEVTOUCH_H +#endif // QEVDEVTOUCH_P_H diff --git a/src/platformsupport/input/input.pri b/src/platformsupport/input/input.pri new file mode 100644 index 0000000000..f377aeaf4c --- /dev/null +++ b/src/platformsupport/input/input.pri @@ -0,0 +1,6 @@ +contains(QT_CONFIG, evdev) { + include($$PWD/evdevmouse/evdevmouse.pri) + include($$PWD/evdevkeyboard/evdevkeyboard.pri) + include($$PWD/evdevtouch/evdevtouch.pri) +} + diff --git a/src/platformsupport/platformsupport.pro b/src/platformsupport/platformsupport.pro index e55bbe0627..fba1096ab2 100644 --- a/src/platformsupport/platformsupport.pro +++ b/src/platformsupport/platformsupport.pro @@ -31,6 +31,7 @@ include(eventdispatchers/eventdispatchers.pri) include(fb_base/fb_base.pri) include(fontdatabases/fontdatabases.pri) include(glxconvenience/glxconvenience.pri) +include(input/input.pri) include(inputcontext/inputcontext.pri) include(devicediscovery/devicediscovery.pri) include(services/services.pri) diff --git a/src/plugins/generic/evdevkeyboard/evdevkeyboard.pro b/src/plugins/generic/evdevkeyboard/evdevkeyboard.pro index b632e5b7ec..2d808a029e 100644 --- a/src/plugins/generic/evdevkeyboard/evdevkeyboard.pro +++ b/src/plugins/generic/evdevkeyboard/evdevkeyboard.pro @@ -5,20 +5,10 @@ DESTDIR = $$QT.gui.plugins/generic target.path = $$[QT_INSTALL_PLUGINS]/generic INSTALLS += target -HEADERS = \ - qevdevkeyboard_defaultmap.h \ - qevdevkeyboardhandler.h \ - qevdevkeyboardmanager.h - QT += core-private platformsupport-private -SOURCES = main.cpp \ - qevdevkeyboardhandler.cpp \ - qevdevkeyboardmanager.cpp +SOURCES = main.cpp OTHER_FILES += \ evdevkeyboard.json -contains(QT_CONFIG, libudev) { - LIBS += $$QMAKE_LIBS_LIBUDEV -} diff --git a/src/plugins/generic/evdevkeyboard/main.cpp b/src/plugins/generic/evdevkeyboard/main.cpp index 5d769d0ecf..b23fac810d 100644 --- a/src/plugins/generic/evdevkeyboard/main.cpp +++ b/src/plugins/generic/evdevkeyboard/main.cpp @@ -40,7 +40,7 @@ ****************************************************************************/ #include <qgenericplugin_qpa.h> -#include "qevdevkeyboardmanager.h" +#include <QtPlatformSupport/private/qevdevkeyboardmanager_p.h> QT_BEGIN_NAMESPACE diff --git a/src/plugins/generic/evdevmouse/evdevmouse.pro b/src/plugins/generic/evdevmouse/evdevmouse.pro index fb9c0e71b8..e61a187103 100644 --- a/src/plugins/generic/evdevmouse/evdevmouse.pro +++ b/src/plugins/generic/evdevmouse/evdevmouse.pro @@ -5,18 +5,10 @@ DESTDIR = $$QT.gui.plugins/generic target.path = $$[QT_INSTALL_PLUGINS]/generic INSTALLS += target -HEADERS = qevdevmousehandler.h \ - qevdevmousemanager.h - QT += core-private platformsupport-private -SOURCES = main.cpp \ - qevdevmousehandler.cpp \ - qevdevmousemanager.cpp +SOURCES = main.cpp OTHER_FILES += \ evdevmouse.json -contains(QT_CONFIG, libudev) { - LIBS += $$QMAKE_LIBS_LIBUDEV -} diff --git a/src/plugins/generic/evdevmouse/main.cpp b/src/plugins/generic/evdevmouse/main.cpp index b49c183d7b..b1d4703902 100644 --- a/src/plugins/generic/evdevmouse/main.cpp +++ b/src/plugins/generic/evdevmouse/main.cpp @@ -40,7 +40,7 @@ ****************************************************************************/ #include <qgenericplugin_qpa.h> -#include "qevdevmousemanager.h" +#include <QtPlatformSupport/private/qevdevmousemanager_p.h> QT_BEGIN_NAMESPACE diff --git a/src/plugins/generic/evdevtouch/evdevtouch.pro b/src/plugins/generic/evdevtouch/evdevtouch.pro index c7d298d534..a774e56023 100644 --- a/src/plugins/generic/evdevtouch/evdevtouch.pro +++ b/src/plugins/generic/evdevtouch/evdevtouch.pro @@ -5,21 +5,10 @@ DESTDIR = $$QT.gui.plugins/generic target.path = $$[QT_INSTALL_PLUGINS]/generic INSTALLS += target -HEADERS = \ - qevdevtouch.h - -SOURCES = main.cpp \ - qevdevtouch.cpp +SOURCES = main.cpp QT += core-private platformsupport-private OTHER_FILES += \ evdevtouch.json -contains(QT_CONFIG, libudev) { - LIBS += $$QMAKE_LIBS_LIBUDEV -} - -# DEFINES += USE_MTDEV - -contains(DEFINES, USE_MTDEV): LIBS += -lmtdev diff --git a/src/plugins/generic/evdevtouch/main.cpp b/src/plugins/generic/evdevtouch/main.cpp index 47b026ac96..0068ec88a8 100644 --- a/src/plugins/generic/evdevtouch/main.cpp +++ b/src/plugins/generic/evdevtouch/main.cpp @@ -40,7 +40,7 @@ ****************************************************************************/ #include <qgenericplugin_qpa.h> -#include "qevdevtouch.h" +#include <QtPlatformSupport/private/qevdevtouch_p.h> QT_BEGIN_NAMESPACE |