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

* 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: (94 commits)
  Not possible to enter negative values to widgets with numeric fields
  QmlViewer: Enable remote qml debugging
  QDeclarativeDebug: Warn user for Qt configured with -no-declarative-debug
  Improve Flickable dynamics and allow platform specific tweaking.
  Fixed the declarative headers and includes within qdoc.
  Removed invalid public slots section.
  Minor feature fix led to refactoring for i18n's sake.
  Fixed string-int concatenation issue.
  Fixed license headers for examples in 4.7
  qdoc: Allowed multiple values for certain metadata tags.
  Removing extra comma in `enum' declaration.
  Take phonon backend back in qt.iby
  Mac: p2 combobox regression fix
  win32-g++: Correct the order of linked Windows libraries
  Remove SIGBUS emission from QNetworkSession destruction.
  Remove obsolete files from qt.iby
  Fix QGradient stop with NaN position on Symbian.
  win32-g++: Correct the order of linked Windows libraries
  Fixing a traling space on if statement that fails in Solaris.
  Do not add project path to SYMBIAN_MATCHED_TRANSLATIONS if not needed
  ...

1 files changed, 0 insertions, 0 deletions

diff --git a/examples/webkit/webkit-guide/img/tmp/land7.jpg b/examples/webkit/webkit-guide/img/tmp/land7.jpg
new file mode 100644
index 0000000..6ac6d88
--- /dev/null
+++ b/examples/webkit/webkit-guide/img/tmp/land7.jpg