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

Conflicts:
	src/corelib/global/qglobal.cpp
	src/corelib/global/qglobal.h
	src/corelib/global/qsysinfo.h
	src/corelib/global/qsystemdetection.h
	src/corelib/kernel/qobjectdefs.h
	src/plugins/plugins.pro
	tests/auto/widgets/itemviews/qlistview/qlistview.pro

Change-Id: Ib55aa79d707c4c1453fb9d697f6cf92211ed665c

1 files changed, 30 insertions, 28 deletions

diff --git a/src/widgets/kernel/qwidget.cpp b/src/widgets/kernel/qwidget.cpp
index f57d180e3b..9ea5fd6018 100644
--- a/src/widgets/kernel/qwidget.cpp
+++ b/src/widgets/kernel/qwidget.cpp
@@ -2454,7 +2454,7 @@ QWidget *QWidget::find(WId id)
     If a widget is non-native (alien) and winId() is invoked on it, that widget
     will be provided a native handle.
 
-    On Mac OS X, the type returned depends on which framework Qt was linked
+    On OS X, the type returned depends on which framework Qt was linked
     against. If Qt is using Carbon, the {WId} is actually an HIViewRef. If Qt
     is using Cocoa, {WId} is a pointer to an NSView.
 
@@ -2590,7 +2590,7 @@ QWindow *QWidget::windowHandle() const
     The style sheet contains a textual description of customizations to the
     widget's style, as described in the \l{Qt Style Sheets} document.
 
-    Since Qt 4.5, Qt style sheets fully supports Mac OS X.
+    Since Qt 4.5, Qt style sheets fully supports OS X.
 
     \warning Qt style sheets are currently not supported for custom QStyle
     subclasses. We plan to address this in some future release.
@@ -5065,7 +5065,7 @@ void QWidget::render(QPaintDevice *target, const QPoint &targetOffset,
     Transformations and settings applied to the \a painter will be used
     when rendering.
 
-    \note The \a painter must be active. On Mac OS X the widget will be
+    \note The \a painter must be active. On OS X the widget will be
     rendered into a QPixmap and then drawn by the \a painter.
 
     \sa QPainter::device()
@@ -6200,7 +6200,7 @@ QString QWidget::windowIconText() const
     If the window title is set at any point, then the window title takes precedence and
     will be shown instead of the file path string.
 
-    Additionally, on Mac OS X, this has an added benefit that it sets the
+    Additionally, on OS X, this has an added benefit that it sets the
     \l{http://developer.apple.com/documentation/UserExperience/Conceptual/OSXHIGuidelines/XHIGWindows/chapter_17_section_3.html}{proxy icon}
     for the window, assuming that the file path exists.
 
@@ -11225,7 +11225,7 @@ bool QWidget::testAttribute_helper(Qt::WidgetAttribute attribute) const
 
   By default the value of this property is 1.0.
 
-  This feature is available on Embedded Linux, Mac OS X, Windows,
+  This feature is available on Embedded Linux, OS X, Windows,
   and X11 platforms that support the Composite extension.
 
   This feature is not available on Windows CE.
@@ -11288,7 +11288,7 @@ void QWidgetPrivate::setWindowOpacity_sys(qreal level)
 
     A modified window is a window whose content has changed but has
     not been saved to disk. This flag will have different effects
-    varied by the platform. On Mac OS X the close button will have a
+    varied by the platform. On OS X the close button will have a
     modified look; on other platforms, the window title will have an
     '*' (asterisk).
 
@@ -12285,20 +12285,21 @@ QPaintEngine *QWidget::paintEngine() const
 */
 QPoint QWidget::mapToGlobal(const QPoint &pos) const
 {
-#ifndef QT_NO_GRAPHICSVIEW
-    Q_D(const QWidget);
-    if (d->extra && d->extra->proxyWidget && d->extra->proxyWidget->scene()) {
-        const QList <QGraphicsView *> views = d->extra->proxyWidget->scene()->views();
-        if (!views.isEmpty()) {
-            const QPointF scenePos = d->extra->proxyWidget->mapToScene(pos);
-            const QPoint viewPortPos = views.first()->mapFromScene(scenePos);
-            return views.first()->viewport()->mapToGlobal(viewPortPos);
-        }
-    }
-#endif // !QT_NO_GRAPHICSVIEW
     int x = pos.x(), y = pos.y();
     const QWidget *w = this;
     while (w) {
+#ifndef QT_NO_GRAPHICSVIEW
+        const QWidgetPrivate *d = w->d_func();
+        if (d->extra && d->extra->proxyWidget && d->extra->proxyWidget->scene()) {
+            const QList <QGraphicsView *> views = d->extra->proxyWidget->scene()->views();
+            if (!views.isEmpty()) {
+                const QPointF scenePos = d->extra->proxyWidget->mapToScene(QPoint(x, y));
+                const QPoint viewPortPos = views.first()->mapFromScene(scenePos);
+                return views.first()->viewport()->mapToGlobal(viewPortPos);
+            }
+        }
+#endif // !QT_NO_GRAPHICSVIEW
+
         QWindow *window = w->windowHandle();
         if (window && window->handle())
             return window->mapToGlobal(QPoint(x, y));
@@ -12320,20 +12321,21 @@ QPoint QWidget::mapToGlobal(const QPoint &pos) const
 */
 QPoint QWidget::mapFromGlobal(const QPoint &pos) const
 {
-#ifndef QT_NO_GRAPHICSVIEW
-    Q_D(const QWidget);
-    if (d->extra && d->extra->proxyWidget && d->extra->proxyWidget->scene()) {
-        const QList <QGraphicsView *> views = d->extra->proxyWidget->scene()->views();
-        if (!views.isEmpty()) {
-            const QPoint viewPortPos = views.first()->viewport()->mapFromGlobal(pos);
-            const QPointF scenePos = views.first()->mapToScene(viewPortPos);
-            return d->extra->proxyWidget->mapFromScene(scenePos).toPoint();
-        }
-    }
-#endif // !QT_NO_GRAPHICSVIEW
     int x = pos.x(), y = pos.y();
     const QWidget *w = this;
     while (w) {
+#ifndef QT_NO_GRAPHICSVIEW
+        const QWidgetPrivate *d = w->d_func();
+        if (d->extra && d->extra->proxyWidget && d->extra->proxyWidget->scene()) {
+            const QList <QGraphicsView *> views = d->extra->proxyWidget->scene()->views();
+            if (!views.isEmpty()) {
+                const QPoint viewPortPos = views.first()->viewport()->mapFromGlobal(QPoint(x, y));
+                const QPointF scenePos = views.first()->mapToScene(viewPortPos);
+                return d->extra->proxyWidget->mapFromScene(scenePos).toPoint();
+            }
+        }
+#endif // !QT_NO_GRAPHICSVIEW
+
         QWindow *window = w->windowHandle();
         if (window && window->handle())
             return window->mapFromGlobal(QPoint(x, y));