1 files changed, 7 insertions, 5 deletions
diff --git a/src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler_p.h b/src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler_p.h
index 21e6d055a0..f92a2bf704 100644
--- a/src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler_p.h
+++ b/src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler_p.h
@@ -55,6 +55,8 @@
 #include <QTimer>
 #include <QDataStream>
 
+#include <memory>
+
 QT_BEGIN_NAMESPACE
 
 class QSocketNotifier;
@@ -134,13 +136,13 @@ class QFdContainer
     int m_fd;
     Q_DISABLE_COPY_MOVE(QFdContainer);
 public:
-    explicit QFdContainer(int fd = -1) Q_DECL_NOTHROW : m_fd(fd) {}
+    explicit QFdContainer(int fd = -1) noexcept : m_fd(fd) {}
     ~QFdContainer() { reset(); }
 
-    int get() const Q_DECL_NOTHROW { return m_fd; }
+    int get() const noexcept { return m_fd; }
 
-    int release() Q_DECL_NOTHROW { int result = m_fd; m_fd = -1; return result; }
-    void reset() Q_DECL_NOTHROW;
+    int release() noexcept { int result = m_fd; m_fd = -1; return result; }
+    void reset() noexcept;
 };
 
 class QEvdevKeyboardHandler : public QObject
@@ -168,7 +170,7 @@ public:
         SwitchConsoleMask  = 0x0000007f
     };
 
-    static QEvdevKeyboardHandler *create(const QString &device,
+    static std::unique_ptr<QEvdevKeyboardHandler> create(const QString &device,
                                          const QString &specification,
                                          const QString &defaultKeymapFile = QString());