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

Conflicts:
	src/gui/painting/painting.pri
	src/plugins/platforms/xcb/qxcbconnection.cpp
	tests/auto/corelib/thread/qthreadstorage/qthreadstorage.pro
	tests/auto/corelib/tools/qlocale/test/test.pro
	tests/auto/gui/kernel/qwindow/tst_qwindow.cpp
	tools/configure/environment.cpp

Change-Id: I9c40f458b89b2c206de2d2c24e90b5f679c93495

1 files changed, 17 insertions, 0 deletions

diff --git a/src/plugins/platforms/ios/qiosmenu.mm b/src/plugins/platforms/ios/qiosmenu.mm
index f68321fb3b..5f9346816a 100644
--- a/src/plugins/platforms/ios/qiosmenu.mm
+++ b/src/plugins/platforms/ios/qiosmenu.mm
@@ -62,11 +62,23 @@ static NSString *const kSelectorPrefix = @"_qtMenuItem_";
 {
     if (self = [super init]) {
         [self setVisibleMenuItems:visibleMenuItems];
+        [[NSNotificationCenter defaultCenter]
+            addObserver:self
+            selector:@selector(menuClosed)
+            name:UIMenuControllerDidHideMenuNotification object:nil];
     }
 
     return self;
 }
 
+-(void)dealloc
+{
+    [[NSNotificationCenter defaultCenter]
+        removeObserver:self
+        name:UIMenuControllerDidHideMenuNotification object:nil];
+    [super dealloc];
+}
+
 - (void)setVisibleMenuItems:(const QIOSMenuItemList &)visibleMenuItems
 {
     m_visibleMenuItems = visibleMenuItems;
@@ -86,6 +98,11 @@ static NSString *const kSelectorPrefix = @"_qtMenuItem_";
         [[UIMenuController sharedMenuController] setMenuVisible:YES animated:NO];
 }
 
+-(void)menuClosed
+{
+    QIOSMenu::currentMenu()->dismiss();
+}
+
 - (id)targetForAction:(SEL)action withSender:(id)sender
 {
     Q_UNUSED(sender);