diff options
| -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 += \ |