Merge remote-tracking branch 'origin/5.6' into 5.7

Conflicts:
	.qmake.conf
	config.tests/unix/nis/nis.cpp
	mkspecs/unsupported/freebsd-g++/qplatformdefs.h
	src/corelib/tools/qdatetime.cpp
	src/corelib/tools/qsimd.cpp
	src/corelib/tools/qsimd_p.h
	src/network/access/access.pri
	src/network/access/qnetworkreplynsurlconnectionimpl.mm
	src/network/access/qnetworkreplynsurlconnectionimpl_p.h
	src/plugins/platforms/cocoa/qnsview.mm
	src/plugins/printsupport/windows/qwindowsprintdevice.cpp
	tests/auto/corelib/kernel/qobject/tst_qobject.cpp
	tests/auto/network/access/qnetworkreply/BLACKLIST
	tests/auto/widgets/widgets/qopenglwidget/BLACKLIST

Change-Id: I4b32055bbf922392ef0264fd403405416fffee57

2 files changed, 14 insertions, 4 deletions

diff --git a/src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler.cpp b/src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler.cpp
index 36de1e0c69..c7f6dd2740 100644
--- a/src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler.cpp
+++ b/src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler.cpp
@@ -60,7 +60,7 @@ Q_LOGGING_CATEGORY(qLcEvdevKeyMap, "qt.qpa.input.keymap")
 #include "qevdevkeyboard_defaultmap_p.h"
 
 QEvdevKeyboardHandler::QEvdevKeyboardHandler(const QString &device, int fd, bool disableZap, bool enableCompose, const QString &keymapFile)
-    : m_device(device), m_fd(fd),
+    : m_device(device), m_fd(fd), m_notify(Q_NULLPTR),
       m_modifiers(0), m_composing(0), m_dead_unicode(0xffff),
       m_no_zap(disableZap), m_do_compose(enableCompose),
       m_keymap(0), m_keymap_size(0), m_keycompose(0), m_keycompose_size(0)
@@ -75,9 +75,8 @@ QEvdevKeyboardHandler::QEvdevKeyboardHandler(const QString &device, int fd, bool
         unloadKeymap();
 
     // socket notifier for events on the keyboard device
-    QSocketNotifier *notifier;
-    notifier = new QSocketNotifier(m_fd, QSocketNotifier::Read, this);
-    connect(notifier, SIGNAL(activated(int)), this, SLOT(readKeycode()));
+    m_notify = new QSocketNotifier(m_fd, QSocketNotifier::Read, this);
+    connect(m_notify, SIGNAL(activated(int)), this, SLOT(readKeycode()));
 }
 
 QEvdevKeyboardHandler::~QEvdevKeyboardHandler()
@@ -162,6 +161,14 @@ void QEvdevKeyboardHandler::readKeycode()
         } else if (result < 0) {
             if (errno != EINTR && errno != EAGAIN) {
                 qErrnoWarning(errno, "evdevkeyboard: Could not read from input device");
+                // If the device got disconnected, stop reading, otherwise we get flooded
+                // by the above error over and over again.
+                if (errno == ENODEV) {
+                    delete m_notify;
+                    m_notify = Q_NULLPTR;
+                    qt_safe_close(m_fd);
+                    m_fd = -1;
+                }
                 return;
             }
         } else {
diff --git a/src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler_p.h b/src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler_p.h
index 89fa879115..b94323fcbb 100644
--- a/src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler_p.h
+++ b/src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler_p.h
@@ -57,6 +57,8 @@
 
 QT_BEGIN_NAMESPACE
 
+class QSocketNotifier;
+
 namespace QEvdevKeyboardMap {
     const quint32 FileMagic = 0x514d4150; // 'QMAP'
 
@@ -186,6 +188,7 @@ private:
 
     QString m_device;
     int m_fd;
+    QSocketNotifier *m_notify;
 
     // keymap handling
     quint8 m_modifiers;