Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-water-team

* '4.7' of git://scm.dev.nokia.troll.no/qt/qt-water-team: (43 commits)
  Doc: Added a missing license header.
  Fix timer warning when deleting item views
  More testing for KeyNavigation attached properties.
  Add tests for ListView.indexAt() and GridView.IndexAt()
  runonphone: Only print the modprobe instructions on linux
  reword: Make the USB serial device enumeration work on OS X, too
  runonphone: Check that the device->config is valid before dereferencing it
  Remove few compile warnings
  Fix using QFileDialog statics in Symbian.
  Setting TextInput.cursorPosition outside bounds crashed.
  Update test bitmaps for QDeclarativeImage::svg() autotest on Windows
  Don't truncate image:// url strings prematurely
  Update docs on importing javascript files
  Fix deployment of minehunt for Symbian
  Quiet unused parameter warnings.
  doc: Replaced some \raw and \endraw uses with \table and \endtable
  doc: Replaced some \raw and \endraw uses with \table and \endtable
  doc: Replaced some \raw and \endraw uses with \table and \endtable
  Doc: Added a note about the Public Suffix List.
  Doc: Fixed doc bug in Diagram Scene example
  ...

1 files changed, 59 insertions, 0 deletions

diff --git a/doc/src/snippets/declarative/focus/basicwidget.qml b/doc/src/snippets/declarative/focus/basicwidget.qml
new file mode 100644
index 0000000..71e75ff
--- /dev/null
+++ b/doc/src/snippets/declarative/focus/basicwidget.qml
@@ -0,0 +1,59 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the FOO module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+import QtQuick 1.0
+
+//! [focus true]
+Rectangle {
+    color: "lightsteelblue"; width: 240; height: 25
+    Text { id: myText }
+    Item {
+        id: keyHandler
+        focus: true
+        Keys.onPressed: {
+            if (event.key == Qt.Key_A)
+                myText.text = 'Key A was pressed'
+            else if (event.key == Qt.Key_B)
+                myText.text = 'Key B was pressed'
+            else if (event.key == Qt.Key_C)
+                myText.text = 'Key C was pressed'
+        }
+    }
+}
+//! [focus true]