Merge remote-tracking branch 'origin/5.4' into dev

Conflicts:
	src/corelib/tools/qbytearray.cpp
	src/gui/image/qimage.cpp
	src/gui/image/qppmhandler.cpp
	src/gui/kernel/qguiapplication.cpp
	src/gui/painting/qpaintengine_raster.cpp

Change-Id: I7c1a8e7ebdfd7f7ae767fdb932823498a7660765

1 files changed, 11 insertions, 1 deletions

diff --git a/src/plugins/platforms/cocoa/qnsview.mm b/src/plugins/platforms/cocoa/qnsview.mm
index cfcbb8053c..d72664f0a0 100644
--- a/src/plugins/platforms/cocoa/qnsview.mm
+++ b/src/plugins/platforms/cocoa/qnsview.mm
@@ -130,7 +130,7 @@ static NSString *_q_NSWindowDidChangeOcclusionStateNotification = nil;
 
 @end
 
-@implementation QNSView
+@implementation QT_MANGLE_NAMESPACE(QNSView)
 
 + (void)initialize
 {
@@ -159,6 +159,7 @@ static NSString *_q_NSWindowDidChangeOcclusionStateNotification = nil;
         m_sendUpAsRightButton = false;
         m_inputSource = 0;
         m_mouseMoveHelper = [[QNSViewMouseMoveHelper alloc] initWithView:self];
+        m_resendKeyEvent = false;
 
         if (!touchDevice) {
             touchDevice = new QTouchDevice;
@@ -1425,6 +1426,8 @@ static QTabletEvent::TabletDevice wacomTabletDevice(NSEvent *theEvent)
                 }
             }
         }
+        if (m_resendKeyEvent)
+            m_sendKeyEvent = true;
     }
 
     if (m_sendKeyEvent && m_composingText.isEmpty())
@@ -1432,6 +1435,7 @@ static QTabletEvent::TabletDevice wacomTabletDevice(NSEvent *theEvent)
                                                        nativeScanCode, nativeVirtualKey, nativeModifiers, text, [nsevent isARepeat]);
 
     m_sendKeyEvent = false;
+    m_resendKeyEvent = false;
 }
 
 - (void)keyDown:(NSEvent *)nsevent
@@ -1502,6 +1506,12 @@ static QTabletEvent::TabletDevice wacomTabletDevice(NSEvent *theEvent)
     }
 }
 
+- (void) insertNewline:(id)sender
+{
+    Q_UNUSED(sender);
+    m_resendKeyEvent = true;
+}
+
 - (void) doCommandBySelector:(SEL)aSelector
 {
     [self tryToPerform:aSelector with:self];