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

Qt Continuous Integration System · Qt Continuous Integration System · commit ec6543371108 · 2011-10-22T07:22:24.000+10:00
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qa-staging:
  Doc: Fix example code
diff --git a/doc/src/getting-started/gettingstartedqt.qdoc b/doc/src/getting-started/gettingstartedqt.qdoc
@@ -374,7 +374,7 @@
     \code
 25        Notepad::Notepad()
 26        {
-27            saveAction = new QAction(tr("&Open"), this);
+27            openAction = new QAction(tr("&Open"), this);
 28            saveAction = new QAction(tr("&Save"), this);
 29            exitAction = new QAction(tr("E&xit"), this);
 30

Original file line number	Diff line number	Diff line change
`@@ -374,7 +374,7 @@`
`374`	`374`	`\code`
`375`	`375`	`25 Notepad::Notepad()`
`376`	`376`	`26 {`
`377`		`-27 saveAction = new QAction(tr("&Open"), this);`
	`377`	`+27 openAction = new QAction(tr("&Open"), this);`
`378`	`378`	`28 saveAction = new QAction(tr("&Save"), this);`
`379`	`379`	`29 exitAction = new QAction(tr("E&xit"), this);`
`380`	`380`	`30`