diff options
| author | Oliver Wolff <oliver.wolff@qt.io> | 2017-09-07 13:10:14 +0200 |
|---|---|---|
| committer | Oliver Wolff <oliver.wolff@qt.io> | 2017-09-18 05:44:42 +0000 |
| commit | 9c204e05ae7fefe9525b30238b469b1bb65d2537 (patch) | |
| tree | 114edc18634fb3ebcfbb59ef9f2ba95cb9bc48b1 | |
| parent | f364358a817ba57fa5aa9c67e731241249e704f8 (diff) | |
Move inputinfomanager into generic systeminfo sources
The class does not have any OS specific code and should
be seen as the OS independent base implementation of
QInputInfoManagerPrivate.
Change-Id: Icbfe9a1bc611dfeeeb86bc03db4c7b4d21d3183b
Reviewed-by: Rainer Keller <Rainer.Keller@qt.io>
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
Reviewed-by: Lorn Potter <lorn.potter@gmail.com>
| -rw-r--r-- | src/systeminfo/qinputinfo.cpp | 7 | ||||
| -rw-r--r-- | src/systeminfo/qinputinfomanager.cpp (renamed from src/systeminfo/linux/qinputinfomanager.cpp) | 0 | ||||
| -rw-r--r-- | src/systeminfo/qinputinfomanager_p.h (renamed from src/systeminfo/linux/qinputinfomanager_p.h) | 0 | ||||
| -rw-r--r-- | src/systeminfo/systeminfo.pro | 12 |
4 files changed, 11 insertions, 8 deletions
diff --git a/src/systeminfo/qinputinfo.cpp b/src/systeminfo/qinputinfo.cpp index a62ffba3..c4539cdc 100644 --- a/src/systeminfo/qinputinfo.cpp +++ b/src/systeminfo/qinputinfo.cpp @@ -34,9 +34,11 @@ #include "qinputinfo.h" -#if defined(Q_OS_LINUX) -#include "linux/qinputinfomanager_p.h" +#include "qinputinfomanager_p.h" + +Q_GLOBAL_STATIC(QInputInfoManagerPrivate, inputDeviceManagerPrivate) +#if defined(Q_OS_LINUX) #if !defined(QT_NO_UDEV) #include "linux/qinputinfomanagerudev_p.h" #endif @@ -93,6 +95,7 @@ QInputInfoManagerPrivate * QInputInfoManagerPrivate::instance() #ifndef QT_NO_UDEV return inputDeviceManagerUdev(); #endif + return inputDeviceManagerPrivate(); } /*! diff --git a/src/systeminfo/linux/qinputinfomanager.cpp b/src/systeminfo/qinputinfomanager.cpp index d2e1b5c3..d2e1b5c3 100644 --- a/src/systeminfo/linux/qinputinfomanager.cpp +++ b/src/systeminfo/qinputinfomanager.cpp diff --git a/src/systeminfo/linux/qinputinfomanager_p.h b/src/systeminfo/qinputinfomanager_p.h index 099a8025..099a8025 100644 --- a/src/systeminfo/linux/qinputinfomanager_p.h +++ b/src/systeminfo/qinputinfomanager_p.h diff --git a/src/systeminfo/systeminfo.pro b/src/systeminfo/systeminfo.pro index 1620b6fd..cc9b861c 100644 --- a/src/systeminfo/systeminfo.pro +++ b/src/systeminfo/systeminfo.pro @@ -63,10 +63,10 @@ linux-*: !simulator: { qinputinfo.cpp \ linux/qdeviceinfo_linux.cpp \ linux/qnetworkinfo_linux.cpp \ - linux/qinputinfomanager.cpp + qinputinfomanager.cpp HEADERS += \ qinputinfo.h \ - linux/qinputinfomanager_p.h + qinputinfomanager_p.h config_mir { DEFINES += QT_UNITY8 @@ -193,6 +193,7 @@ simulator { HEADERS += simulator/qsysteminfodata_simulator_p.h PRIVATE_HEADERS += \ + qinputinfomanager_p.h \ linux/qdeviceinfo_linux_p.h \ linux/qnetworkinfo_linux_p.h \ simulator/qsysteminfobackend_simulator_p.h \ @@ -204,14 +205,13 @@ simulator { qinputinfo.cpp \ linux/qdeviceinfo_linux.cpp \ linux/qnetworkinfo_linux.cpp \ - linux/qinputinfomanager.cpp \ + qinputinfomanager.cpp \ simulator/qsysteminfobackend_simulator.cpp \ simulator/qsysteminfoconnection_simulator.cpp \ simulator/qsysteminfo_simulator.cpp - HEADERS += \ - qinputinfo.h \ - linux/qinputinfomanager_p.h + HEADERS += \ + qinputinfo.h linux-*: { PRIVATE_HEADERS += \ |