diff options
| author | Sergio Ahumada <sergio.ahumada@nokia.com> | 2011-10-27 10:29:33 (GMT) |
|---|---|---|
| committer | Sergio Ahumada <sergio.ahumada@nokia.com> | 2011-10-27 10:29:33 (GMT) |
| commit | 5c02fd9c3938b7e27b087cfd731cb8eefff486d7 (patch) | |
| tree | 23849e2fd6f18f5ef1ba8e1368375eb04a4b67e3 /doc | |
| parent | 6937461976682546f6d8b0f3bfddb034a6d226cf (diff) | |
| parent | 7a0cdd851d8ea1e2b51d3b91dbb69a67d379b794 (diff) | |
| download | Qt-5c02fd9c3938b7e27b087cfd731cb8eefff486d7.zip Qt-5c02fd9c3938b7e27b087cfd731cb8eefff486d7.tar.gz Qt-5c02fd9c3938b7e27b087cfd731cb8eefff486d7.tar.bz2 | |
Merge remote-tracking branch 'upstream/4.7' into 4.7
Conflicts:
src/gui/inputmethod/qcoefepinputcontext_s60.cpp
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/src/getting-started/gettingstartedqt.qdoc | 2 |
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 |