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

Conflicts:
	configure
	mkspecs/features/create_cmake.prf

Change-Id: I94aea83b83833395d5db399209e0e51b92ef23b5

8 files changed, 46 insertions, 48 deletions

diff --git a/src/plugins/platforms/cocoa/qcocoaaccessibility.h b/src/plugins/platforms/cocoa/qcocoaaccessibility.h
index 3f0367d36a..86bb5323a7 100644
--- a/src/plugins/platforms/cocoa/qcocoaaccessibility.h
+++ b/src/plugins/platforms/cocoa/qcocoaaccessibility.h
@@ -46,11 +46,11 @@
 #include <QtGui>
 #include <qpa/qplatformaccessibility.h>
 
-class QCococaAccessibility : public QPlatformAccessibility
+class QCocoaAccessibility : public QPlatformAccessibility
 {
 public:
-    QCococaAccessibility();
-    ~QCococaAccessibility();
+    QCocoaAccessibility();
+    ~QCocoaAccessibility();
     void notifyAccessibilityUpdate(QAccessibleEvent *event);
     void setRootObject(QObject *o);
     void initialize();
@@ -79,6 +79,7 @@ namespace QCocoaAccessible {
 
 NSString *macRole(QAccessibleInterface *interface);
 bool shouldBeIgnored(QAccessibleInterface *interface);
+NSArray *unignoredChildren(id parentObject, QAccessibleInterface *interface);
 NSString *getTranslatedAction(const QString &qtAction);
 NSMutableArray *createTranslatedActionsList(const QStringList &qtActions);
 QString translateAction(NSString *nsAction);
diff --git a/src/plugins/platforms/cocoa/qcocoaaccessibility.mm b/src/plugins/platforms/cocoa/qcocoaaccessibility.mm
index 9c38a874e5..5649f3ad73 100644
--- a/src/plugins/platforms/cocoa/qcocoaaccessibility.mm
+++ b/src/plugins/platforms/cocoa/qcocoaaccessibility.mm
@@ -44,17 +44,17 @@
 #include <QtGui/private/qaccessible2_p.h>
 #include <private/qcore_mac_p.h>
 
-QCococaAccessibility::QCococaAccessibility()
+QCocoaAccessibility::QCocoaAccessibility()
 {
 
 }
 
-QCococaAccessibility::~QCococaAccessibility()
+QCocoaAccessibility::~QCocoaAccessibility()
 {
 
 }
 
-void QCococaAccessibility::notifyAccessibilityUpdate(QAccessibleEvent *event)
+void QCocoaAccessibility::notifyAccessibilityUpdate(QAccessibleEvent *event)
 {
     QObject *object = event->object();
     if (!object)
@@ -78,17 +78,17 @@ void QCococaAccessibility::notifyAccessibilityUpdate(QAccessibleEvent *event)
     }
 }
 
-void QCococaAccessibility::setRootObject(QObject *o)
+void QCocoaAccessibility::setRootObject(QObject *o)
 {
     Q_UNUSED(o)
 }
 
-void QCococaAccessibility::initialize()
+void QCocoaAccessibility::initialize()
 {
 
 }
 
-void QCococaAccessibility::cleanup()
+void QCocoaAccessibility::cleanup()
 {
 
 }
@@ -223,6 +223,26 @@ bool shouldBeIgnored(QAccessibleInterface *interface)
     return false;
 }
 
+NSArray *unignoredChildren(id parentObject, QAccessibleInterface *interface)
+{
+    int numKids = interface->childCount();
+    // qDebug() << "Children for: " << axid << iface << " are: " << numKids;
+
+    NSMutableArray *kids = [NSMutableArray arrayWithCapacity:numKids];
+    for (int i = 0; i < numKids; ++i) {
+        QAccessibleInterface *child = interface->child(i);
+        Q_ASSERT(child);
+        if (child->state().invalid || child->state().invisible)
+            continue;
+
+        QAccessible::Id childId = QAccessible::uniqueId(child);
+        //qDebug() << "    kid: " << childId << child;
+        QCocoaAccessibleElement *element = [QCocoaAccessibleElement createElementWithId:childId parent:parentObject];
+        [kids addObject: element];
+        [element release];
+    }
+    return NSAccessibilityUnignoredChildren(kids);
+}
 /*
     Translates a predefined QAccessibleActionInterface action to a Mac action constant.
     Returns 0 if the Qt Action has no mac equivalent. Ownership of the NSString is
diff --git a/src/plugins/platforms/cocoa/qcocoaaccessibilityelement.mm b/src/plugins/platforms/cocoa/qcocoaaccessibilityelement.mm
index 55a23fda76..7eae22f720 100644
--- a/src/plugins/platforms/cocoa/qcocoaaccessibilityelement.mm
+++ b/src/plugins/platforms/cocoa/qcocoaaccessibilityelement.mm
@@ -137,22 +137,7 @@
     } else if ([attribute isEqualToString:NSAccessibilityRoleDescriptionAttribute]) {
         return NSAccessibilityRoleDescription(role, nil);
     } else if ([attribute isEqualToString:NSAccessibilityChildrenAttribute]) {
-
-        int numKids = iface->childCount();
-        // qDebug() << "Children for: " << axid << iface << " are: " << numKids;
-
-        NSMutableArray *kids = [NSMutableArray arrayWithCapacity:numKids];
-        for (int i = 0; i < numKids; ++i) {
-            QAccessibleInterface *child = iface->child(i);
-            Q_ASSERT(child);
-            QAccessible::Id childId = QAccessible::uniqueId(child);
-            //qDebug() << "    kid: " << childId << child;
-            QCocoaAccessibleElement *element = [QCocoaAccessibleElement createElementWithId:childId parent:self];
-            [kids addObject: element];
-            [element release];
-        }
-        return NSAccessibilityUnignoredChildren(kids);
-
+        return QCocoaAccessible::unignoredChildren(self, iface);
     } else if ([attribute isEqualToString:NSAccessibilityFocusedAttribute]) {
         // Just check if the app thinks we're focused.
         id focusedElement = [NSApp accessibilityAttributeValue:NSAccessibilityFocusedUIElementAttribute];
diff --git a/src/plugins/platforms/cocoa/qcocoacolordialoghelper.mm b/src/plugins/platforms/cocoa/qcocoacolordialoghelper.mm
index 4002d61318..75a33cbda3 100644
--- a/src/plugins/platforms/cocoa/qcocoacolordialoghelper.mm
+++ b/src/plugins/platforms/cocoa/qcocoacolordialoghelper.mm
@@ -100,6 +100,11 @@ QT_NAMESPACE_ALIAS_OBJC_CLASS(QNSColorPanelDelegate);
     mDialogIsExecuting = false;
     mResultSet = false;
 
+#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_7
+    if (QSysInfo::MacintoshVersion >= QSysInfo::MV_10_7)
+        [mColorPanel setRestorable:NO];
+#endif
+
     if (mHelper->options()->testOption(QColorDialogOptions::NoButtons)) {
         mStolenContentView = 0;
         mOkButton = 0;
@@ -276,6 +281,7 @@ QT_NAMESPACE_ALIAS_OBJC_CLASS(QNSColorPanelDelegate);
 - (void)showModelessPanel
 {
     mDialogIsExecuting = false;
+    mResultSet = false;
     [mColorPanel makeKeyAndOrderFront:mColorPanel];
 }
 
@@ -369,10 +375,8 @@ void QCocoaColorDialogHelper::exec()
 
 bool QCocoaColorDialogHelper::show(Qt::WindowFlags, Qt::WindowModality windowModality, QWindow *parent)
 {
-    if (windowModality == Qt::WindowModal) {
-        // Cocoa's shared color panel cannot be shown as a sheet
-        return false;
-    }
+    if (windowModality == Qt::WindowModal)
+        windowModality = Qt::ApplicationModal;
     return showCocoaColorPanel(windowModality, parent);
 }
 
@@ -435,9 +439,9 @@ bool QCocoaColorDialogHelper::showCocoaColorPanel(Qt::WindowModality windowModal
     createNSColorPanelDelegate();
     QNSColorPanelDelegate *delegate = static_cast<QNSColorPanelDelegate *>(mDelegate);
     [delegate->mColorPanel setShowsAlpha:options()->testOption(QColorDialogOptions::ShowAlphaChannel)];
-    if (windowModality == Qt::NonModal)
+    if (windowModality != Qt::WindowModal)
         [delegate showModelessPanel];
-    // no need to show a Qt::ApplicationModal dialog here, since it will be done in _q_platformRunNativeAppModalPanel()
+    // no need to show a Qt::WindowModal dialog here, because it's necessary to call exec() in that case
     return true;
 }
 
diff --git a/src/plugins/platforms/cocoa/qcocoaintegration.mm b/src/plugins/platforms/cocoa/qcocoaintegration.mm
index 987520f307..6d1882f622 100644
--- a/src/plugins/platforms/cocoa/qcocoaintegration.mm
+++ b/src/plugins/platforms/cocoa/qcocoaintegration.mm
@@ -219,7 +219,7 @@ QCocoaIntegration::QCocoaIntegration()
     , mEventDispatcher(new QCocoaEventDispatcher())
     , mInputContext(new QCocoaInputContext)
 #ifndef QT_NO_ACCESSIBILITY
-    , mAccessibility(new QCococaAccessibility)
+    , mAccessibility(new QCocoaAccessibility)
 #endif
     , mCocoaClipboard(new QCocoaClipboard)
     , mCocoaDrag(new QCocoaDrag)
diff --git a/src/plugins/platforms/cocoa/qcocoawindow.mm b/src/plugins/platforms/cocoa/qcocoawindow.mm
index 9c2a301bba..cc72f050d2 100644
--- a/src/plugins/platforms/cocoa/qcocoawindow.mm
+++ b/src/plugins/platforms/cocoa/qcocoawindow.mm
@@ -238,6 +238,8 @@ QCocoaWindow::QCocoaWindow(QWindow *tlw)
     setGeometry(tlw->geometry());
     recreateWindow(parent());
     tlw->setGeometry(geometry());
+    if (tlw->isTopLevel())
+        setWindowIcon(tlw->icon());
     m_inConstructor = false;
 }
 
diff --git a/src/plugins/platforms/cocoa/qnsview.mm b/src/plugins/platforms/cocoa/qnsview.mm
index 1df88e2f4c..70b08c7feb 100644
--- a/src/plugins/platforms/cocoa/qnsview.mm
+++ b/src/plugins/platforms/cocoa/qnsview.mm
@@ -1288,7 +1288,7 @@ static QTouchDevice *touchDevice = 0;
                        NSFilenamesPboardType, NSPostScriptPboardType, NSTIFFPboardType,
                        NSRTFPboardType, NSTabularTextPboardType, NSFontPboardType,
                        NSRulerPboardType, NSFileContentsPboardType, NSColorPboardType,
-                       NSRTFDPboardType, NSHTMLPboardType, NSPICTPboardType,
+                       NSRTFDPboardType, NSHTMLPboardType,
                        NSURLPboardType, NSPDFPboardType, NSVCardPboardType,
                        NSFilesPromisePboardType, NSInkTextPboardType,
                        NSMultipleTextSelectionPboardType, mimeTypeGeneric, nil];
diff --git a/src/plugins/platforms/cocoa/qnsviewaccessibility.mm b/src/plugins/platforms/cocoa/qnsviewaccessibility.mm
index 331a66417d..86e5066fbb 100644
--- a/src/plugins/platforms/cocoa/qnsviewaccessibility.mm
+++ b/src/plugins/platforms/cocoa/qnsviewaccessibility.mm
@@ -74,21 +74,7 @@
     } else if ([attribute isEqualToString:NSAccessibilityChildrenAttribute]) {
         if (!m_window->accessibleRoot())
             return [super accessibilityAttributeValue:attribute];
-
-        // Create QCocoaAccessibleElements for each child if the
-        // root accessible interface.
-        int numKids = m_window->accessibleRoot()->childCount();
-        NSMutableArray *kids = [NSMutableArray arrayWithCapacity:numKids];
-        for (int i = 0; i < numKids; ++i) {
-            QAccessibleInterface *child = m_window->accessibleRoot()->child(i);
-            Q_ASSERT(child);
-            QAccessible::Id childAxid = QAccessible::uniqueId(child);
-            QCocoaAccessibleElement *element = [QCocoaAccessibleElement createElementWithId:childAxid parent:self];
-            [kids addObject: element];
-            [element release];
-        }
-
-        return NSAccessibilityUnignoredChildren(kids);
+        return QCocoaAccessible::unignoredChildren(self, m_window->accessibleRoot());
     } else {
         return [super accessibilityAttributeValue:attribute];
     }