summaryrefslogtreecommitdiffstats
path: root/doc/src
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2011-10-21 21:22:24 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2011-10-21 21:22:24 (GMT)
commitec6543371108bbe24fb8d98eb1ff057c641a0e9d (patch)
treefca9d39edb579cd7ec22dc4386586bf0332d9583 /doc/src
parentff4ad4409109c4c805f7d931c6b76095016618f4 (diff)
parent657b33557df8a997d7d440f33fd9fa34e97d1e0a (diff)
downloadQt-ec6543371108bbe24fb8d98eb1ff057c641a0e9d.zip
Qt-ec6543371108bbe24fb8d98eb1ff057c641a0e9d.tar.gz
Qt-ec6543371108bbe24fb8d98eb1ff057c641a0e9d.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qa-staging into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qa-staging: Doc: Fix example code
Diffstat (limited to 'doc/src')
-rw-r--r--doc/src/getting-started/gettingstartedqt.qdoc2
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/src/getting-started/gettingstartedqt.qdoc b/doc/src/getting-started/gettingstartedqt.qdoc
index fc9d799..eda5ee1 100644
--- 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