Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (144 commits)
  Correct Flipable back item based on parent, not scene transform
  Round ideal width up to prevent incorrect word wrapping on Mac OS X
  Correct ownership of signal handlers in state changes.
  Remove unnecesary check for debug output.
  Error message on QWS appears to have changed.
  Removed multimedia effects from tvtennis declarative example
  Add some test asserts
  Fixes doc of mouse area's onEntered
  Remove debug messages from mousearea autotest file
  Prevent handling of Up/Down on Mac OS X, for consistency with other platforms.
  Optimize QGW constructor.
  There is no Qt.widgets
  Avoid changing header dependencies.
  Avoid many unnecessary allocations, so so that paint engines attached to pixmaps
  Doc
  Fix autotests
  Fix autotests (remove import Qt.widgets)
  Add missing qml file to qdeclarativemousearea
  Doc fix
  Clean up example code, add white background behind text
  ...

1 files changed, 6 insertions, 0 deletions

diff --git a/src/gui/kernel/qwidget.cpp b/src/gui/kernel/qwidget.cpp
index 20d1d30..60f38f2 100644
--- a/src/gui/kernel/qwidget.cpp
+++ b/src/gui/kernel/qwidget.cpp
@@ -6232,6 +6232,12 @@ void QWidget::setFocus(Qt::FocusReason reason)
                         QApplication::sendEvent(that->style(), &event);
                 }
                 if (!isHidden()) {
+#ifndef QT_NO_GRAPHICSVIEW
+                    // Update proxy state
+                    if (QWExtra *topData = window()->d_func()->extra)
+                        if (topData->proxyWidget && topData->proxyWidget->hasFocus())
+                            topData->proxyWidget->d_func()->updateProxyInputMethodAcceptanceFromWidget();
+#endif
                     // Send event to self
                     QFocusEvent event(QEvent::FocusIn, reason);
                     QPointer<QWidget> that = f;