diff options
author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-10-12 11:55:52 +0200 |
---|---|---|
committer | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2016-10-15 18:45:33 +0000 |
commit | ea913750b8793e1e518bd0eabc338e557df5ee6c (patch) | |
tree | ab4648ab3e680f19d30d568f6626b22fb6764500 /src/platformsupport/input | |
parent | ec774500fb964f039bc47abce67e655699d374f7 (diff) |
create modularized version of qtplatformsupport module
lumping together all kinds of unrelated stuff has caused problems with
spurious dependencies from the beginning. as the modularization infra is
now in a state which supports many small private libraries just fine,
take advantage of it.
Change-Id: Ic40f47ce76a308bbfd32deae281f6f064fe1ef4c
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
Diffstat (limited to 'src/platformsupport/input')
-rw-r--r-- | src/platformsupport/input/evdevkeyboard/qevdevkeyboardmanager_p.h | 2 | ||||
-rw-r--r-- | src/platformsupport/input/evdevmouse/qevdevmousemanager.cpp | 2 | ||||
-rw-r--r-- | src/platformsupport/input/evdevtablet/qevdevtabletmanager.cpp | 2 | ||||
-rw-r--r-- | src/platformsupport/input/evdevtouch/qevdevtouchmanager.cpp | 2 | ||||
-rw-r--r-- | src/platformsupport/input/input.pro (renamed from src/platformsupport/input/input.pri) | 11 |
5 files changed, 15 insertions, 4 deletions
diff --git a/src/platformsupport/input/evdevkeyboard/qevdevkeyboardmanager_p.h b/src/platformsupport/input/evdevkeyboard/qevdevkeyboardmanager_p.h index 01f23f2542..d2e34fead3 100644 --- a/src/platformsupport/input/evdevkeyboard/qevdevkeyboardmanager_p.h +++ b/src/platformsupport/input/evdevkeyboard/qevdevkeyboardmanager_p.h @@ -53,7 +53,7 @@ #include "qevdevkeyboardhandler_p.h" -#include <QtPlatformSupport/private/qdevicediscovery_p.h> +#include <QtDeviceDiscoverySupport/private/qdevicediscovery_p.h> #include <QObject> #include <QHash> diff --git a/src/platformsupport/input/evdevmouse/qevdevmousemanager.cpp b/src/platformsupport/input/evdevmouse/qevdevmousemanager.cpp index 2d96691b09..b2f3fe5787 100644 --- a/src/platformsupport/input/evdevmouse/qevdevmousemanager.cpp +++ b/src/platformsupport/input/evdevmouse/qevdevmousemanager.cpp @@ -44,7 +44,7 @@ #include <QScreen> #include <QLoggingCategory> #include <qpa/qwindowsysteminterface.h> -#include <QtPlatformSupport/private/qdevicediscovery_p.h> +#include <QtDeviceDiscoverySupport/private/qdevicediscovery_p.h> #include <private/qguiapplication_p.h> #include <private/qinputdevicemanager_p_p.h> #include <private/qhighdpiscaling_p.h> diff --git a/src/platformsupport/input/evdevtablet/qevdevtabletmanager.cpp b/src/platformsupport/input/evdevtablet/qevdevtabletmanager.cpp index 89a60df98d..4b00424e92 100644 --- a/src/platformsupport/input/evdevtablet/qevdevtabletmanager.cpp +++ b/src/platformsupport/input/evdevtablet/qevdevtabletmanager.cpp @@ -43,7 +43,7 @@ #include <QStringList> #include <QGuiApplication> #include <QLoggingCategory> -#include <QtPlatformSupport/private/qdevicediscovery_p.h> +#include <QtDeviceDiscoverySupport/private/qdevicediscovery_p.h> #include <private/qguiapplication_p.h> #include <private/qinputdevicemanager_p_p.h> diff --git a/src/platformsupport/input/evdevtouch/qevdevtouchmanager.cpp b/src/platformsupport/input/evdevtouch/qevdevtouchmanager.cpp index d0c6c10224..ab71d08fb1 100644 --- a/src/platformsupport/input/evdevtouch/qevdevtouchmanager.cpp +++ b/src/platformsupport/input/evdevtouch/qevdevtouchmanager.cpp @@ -43,7 +43,7 @@ #include <QStringList> #include <QGuiApplication> #include <QLoggingCategory> -#include <QtPlatformSupport/private/qdevicediscovery_p.h> +#include <QtDeviceDiscoverySupport/private/qdevicediscovery_p.h> #include <private/qguiapplication_p.h> #include <private/qinputdevicemanager_p_p.h> diff --git a/src/platformsupport/input/input.pri b/src/platformsupport/input/input.pro index eb4d8a983d..2c2ace6780 100644 --- a/src/platformsupport/input/input.pri +++ b/src/platformsupport/input/input.pro @@ -1,3 +1,12 @@ +TARGET = QtInputSupport +MODULE = input_support + +QT = core-private gui-private devicediscovery_support-private +CONFIG += static internal_module + +DEFINES += QT_NO_CAST_FROM_ASCII +PRECOMPILED_HEADER = ../../corelib/global/qt_pch.h + qtConfig(evdev) { include($$PWD/evdevmouse/evdevmouse.pri) include($$PWD/evdevkeyboard/evdevkeyboard.pri) @@ -16,3 +25,5 @@ qtConfig(libinput) { qtConfig(evdev)|qtConfig(libinput) { include($$PWD/shared/shared.pri) } + +load(qt_module) |