From f61f8bb966fdc04662fb4e6597698b573fcb8b94 Mon Sep 17 00:00:00 2001
From: Allan Sandfeld Jensen <allan.jensen@qt.io>
Date: Tue, 17 Nov 2020 13:40:00 +0100
Subject: Replace qt_make_unique with std::make_unique

We can depend on C++14 now.

Change-Id: Iee9796cd22dbfbb70d4bdb25f0eee1662a026d6d
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
---
 src/platformsupport/input/evdevtablet/qevdevtabletmanager.cpp | 3 +--
 src/platformsupport/input/evdevtouch/qevdevtouchmanager.cpp   | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

(limited to 'src/platformsupport')

diff --git a/src/platformsupport/input/evdevtablet/qevdevtabletmanager.cpp b/src/platformsupport/input/evdevtablet/qevdevtabletmanager.cpp
index d9888c5b97..d0da367d2d 100644
--- a/src/platformsupport/input/evdevtablet/qevdevtabletmanager.cpp
+++ b/src/platformsupport/input/evdevtablet/qevdevtabletmanager.cpp
@@ -48,7 +48,6 @@
 #include <QtDeviceDiscoverySupport/private/qdevicediscovery_p.h>
 #include <private/qguiapplication_p.h>
 #include <private/qinputdevicemanager_p_p.h>
-#include <private/qmemory_p.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -96,7 +95,7 @@ QEvdevTabletManager::~QEvdevTabletManager()
 void QEvdevTabletManager::addDevice(const QString &deviceNode)
 {
     qCDebug(qLcEvdevTablet, "Adding device at %ls", qUtf16Printable(deviceNode));
-    auto handler = qt_make_unique<QEvdevTabletHandlerThread>(deviceNode, m_spec);
+    auto handler = std::make_unique<QEvdevTabletHandlerThread>(deviceNode, m_spec);
     if (handler) {
         m_activeDevices.add(deviceNode, std::move(handler));
         updateDeviceCount();
diff --git a/src/platformsupport/input/evdevtouch/qevdevtouchmanager.cpp b/src/platformsupport/input/evdevtouch/qevdevtouchmanager.cpp
index a1226ac66a..b3e90cdca8 100644
--- a/src/platformsupport/input/evdevtouch/qevdevtouchmanager.cpp
+++ b/src/platformsupport/input/evdevtouch/qevdevtouchmanager.cpp
@@ -48,7 +48,6 @@
 #include <QtDeviceDiscoverySupport/private/qdevicediscovery_p.h>
 #include <private/qguiapplication_p.h>
 #include <private/qinputdevicemanager_p_p.h>
-#include <private/qmemory_p.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -96,7 +95,7 @@ QEvdevTouchManager::~QEvdevTouchManager()
 void QEvdevTouchManager::addDevice(const QString &deviceNode)
 {
     qCDebug(qLcEvdevTouch, "evdevtouch: Adding device at %ls", qUtf16Printable(deviceNode));
-    auto handler = qt_make_unique<QEvdevTouchScreenHandlerThread>(deviceNode, m_spec);
+    auto handler = std::make_unique<QEvdevTouchScreenHandlerThread>(deviceNode, m_spec);
     if (handler) {
         connect(handler.get(), &QEvdevTouchScreenHandlerThread::touchDeviceRegistered, this, &QEvdevTouchManager::updateInputDeviceCount);
         m_activeDevices.add(deviceNode, std::move(handler));
-- 
cgit v1.2.3