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

* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
  Removed a change from the 4.7.0 change log.
  Improve look and feel of itemviews on mac
  doc: Fixed many broken links.
  doc: Fixed many broken links.
  update 4.7.0 changes
  QPushButton's click area exceeds the button area by far on Mac OS X
  QApplication::closeAllWindows() should ignore windows being closed
  Examples: Fix compilation with namespace.
  Use QApplication::arguments() to check for command line args
  Added support for .rc files on VS2010.
  Doc: Updating CSS and JS
  Docs: added an intro for qml, Quick for Beginners.
  Fix crash on exit in native wifi plugin on Vista+ when run in debugger.

1 files changed, 5 insertions, 5 deletions

diff --git a/doc/src/getting-started/how-to-learn-qt.qdoc b/doc/src/getting-started/how-to-learn-qt.qdoc
index ce8f521..642421b 100644
--- a/doc/src/getting-started/how-to-learn-qt.qdoc
+++ b/doc/src/getting-started/how-to-learn-qt.qdoc
@@ -59,11 +59,11 @@
     If you want to design your user interfaces using a design tool, then
     read at least the first few chapters of the \l{Qt Designer manual}.
 
-    By now you'll have produced some small working applications and have a
-    broad feel for Qt programming. You could start work on your own
-    projects straight away, but we recommend reading a couple of key
-    overviews to deepen your understanding of Qt: \l{Qt Object Model}
-    and \l{Signals and Slots}.
+    By now you'll have produced some small working applications and
+    have a broad feel for Qt programming. You could start work on your
+    own projects straight away, but we recommend reading a couple of
+    key overviews to deepen your understanding of Qt: The Qt \l{Object
+    Model} and \l{Signals and Slots}.
 
     \beginfloatleft
     \inlineimage qtdemo-small.png