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: (29 commits)
  Small optimization when checking if MouseArea's onPressAndHold is
  Fix autotest.
  Fixed `nmake clean' breaking declarative imports on Windows.
  Fix drawing flicker on Qml Viewer startup
  Fix snake demo
  Add qmlmethod Item::childAt() to delarative item
  Cursor positioning in QTextDocument after undo()
  Fix slow network access in qmlviewer (Windows)
  Don't layout multiple times when an ancestor becomes (in)visible.
  Add an example of animated item add/remove in ListView
  Add test for PropertyChanges with attached properties.
  Make declarative autotests compile on Symbian abld build system
  Accept enter key in the webbrower demo url input.
  Keep reported point/pixel size in sync.
  Remove unnecessary CloseSoftwareInputPanel events after TextEdit or TextInput has lost focus
  Ensure state operations assigned to the default state are triggered
  Add image example.
  Fix regression in input panel autotests
  Improve docs about Qml component case sensitivity.
  Add some performance tips to QML docs.
  ...

1 files changed, 9 insertions, 20 deletions

diff --git a/src/declarative/graphicsitems/qdeclarativetextedit.cpp b/src/declarative/graphicsitems/qdeclarativetextedit.cpp
index 94973f2..c086851 100644
--- a/src/declarative/graphicsitems/qdeclarativetextedit.cpp
+++ b/src/declarative/graphicsitems/qdeclarativetextedit.cpp
@@ -1391,9 +1391,9 @@ void QDeclarativeTextEditPrivate::updateDefaultTextOption()
     your application.
 
     By default the opening of input panels follows the platform style. On Symbian^1 and
-    Symbian^3 -based devices the panels are opened by clicking TextEdit and need to be
-    manually closed by the user. On other platforms the panels are automatically opened
-    when TextEdit element gains focus and closed when the focus is lost.
+    Symbian^3 -based devices the panels are opened by clicking TextEdit. On other platforms
+    the panels are automatically opened when TextEdit element gains focus. Input panels are
+    always closed if no editor owns focus.
 
   . You can disable the automatic behavior by setting the property \c focusOnPress to false
     and use functions openSoftwareInputPanel() and closeSoftwareInputPanel() to implement
@@ -1415,9 +1415,9 @@ void QDeclarativeTextEditPrivate::updateDefaultTextOption()
                         textEdit.openSoftwareInputPanel();
                     } else {
                         textEdit.focus = false;
-                        textEdit.closeSoftwareInputPanel();
                     }
                 }
+                onPressAndHold: textEdit.closeSoftwareInputPanel();
             }
         }
     \endcode
@@ -1442,9 +1442,9 @@ void QDeclarativeTextEdit::openSoftwareInputPanel()
     your application.
 
     By default the opening of input panels follows the platform style. On Symbian^1 and
-    Symbian^3 -based devices the panels are opened by clicking TextEdit and need to be
-    manually closed by the user. On other platforms the panels are automatically opened
-    when TextEdit element gains focus and closed when the focus is lost.
+    Symbian^3 -based devices the panels are opened by clicking TextEdit. On other platforms
+    the panels are automatically opened when TextEdit element gains focus. Input panels are
+    always closed if no editor owns focus.
 
   . You can disable the automatic behavior by setting the property \c focusOnPress to false
     and use functions openSoftwareInputPanel() and closeSoftwareInputPanel() to implement
@@ -1466,9 +1466,9 @@ void QDeclarativeTextEdit::openSoftwareInputPanel()
                         textEdit.openSoftwareInputPanel();
                     } else {
                         textEdit.focus = false;
-                        textEdit.closeSoftwareInputPanel();
                     }
                 }
+                onPressAndHold: textEdit.closeSoftwareInputPanel();
             }
         }
     \endcode
@@ -1489,22 +1489,11 @@ void QDeclarativeTextEdit::focusInEvent(QFocusEvent *event)
 {
     Q_D(const QDeclarativeTextEdit);
     if (d->showInputPanelOnFocus) {
-        if (d->focusOnPress && !isReadOnly() && event->reason() != Qt::ActiveWindowFocusReason) {
+        if (d->focusOnPress && !isReadOnly()) {
             openSoftwareInputPanel();
         }
     }
     QDeclarativePaintedItem::focusInEvent(event);
 }
 
-void QDeclarativeTextEdit::focusOutEvent(QFocusEvent *event)
-{
-    Q_D(const QDeclarativeTextEdit);
-    if (d->showInputPanelOnFocus) {
-        if (d->focusOnPress && !isReadOnly()) {
-            closeSoftwareInputPanel();
-        }
-    }
-    QDeclarativePaintedItem::focusOutEvent(event);
-}
-
 QT_END_NAMESPACE