diff options
author | Yann Bodson <yann.bodson@nokia.com> | 2009-11-04 05:34:26 (GMT) |
---|---|---|
committer | Yann Bodson <yann.bodson@nokia.com> | 2009-11-04 05:34:26 (GMT) |
commit | 0ced984d3e2cb2a7a1a219ae7a9b09ff4e15a55c (patch) | |
tree | e0112b3ddefa71824e45d55f44517904e3c9680c /doc/src/snippets/code | |
parent | a59291393cc70a1f922e4796efbb72b29920da27 (diff) | |
parent | ec502c9e9a26f984023e4f08126e033a504970b2 (diff) | |
download | Qt-0ced984d3e2cb2a7a1a219ae7a9b09ff4e15a55c.zip Qt-0ced984d3e2cb2a7a1a219ae7a9b09ff4e15a55c.tar.gz Qt-0ced984d3e2cb2a7a1a219ae7a9b09ff4e15a55c.tar.bz2 |
Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'doc/src/snippets/code')
-rw-r--r-- | doc/src/snippets/code/doc_src_i18n.qdoc | 2 | ||||
-rw-r--r-- | doc/src/snippets/code/src_corelib_kernel_qobject.cpp | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/doc/src/snippets/code/doc_src_i18n.qdoc b/doc/src/snippets/code/doc_src_i18n.qdoc index eca2868..80faabc 100644 --- a/doc/src/snippets/code/doc_src_i18n.qdoc +++ b/doc/src/snippets/code/doc_src_i18n.qdoc @@ -184,7 +184,7 @@ void Clock::setTime(const QTime &time) //! [12] -void QWidget::changeEvent(QEvent *event) +void MyWidget::changeEvent(QEvent *event) { if (e->type() == QEvent::LanguageChange) { titleLabel->setText(tr("Document Title")); diff --git a/doc/src/snippets/code/src_corelib_kernel_qobject.cpp b/doc/src/snippets/code/src_corelib_kernel_qobject.cpp index 4c64374..88d8025 100644 --- a/doc/src/snippets/code/src_corelib_kernel_qobject.cpp +++ b/doc/src/snippets/code/src_corelib_kernel_qobject.cpp @@ -235,9 +235,8 @@ MyWindow::MyWindow() { QLabel *senderLabel = new QLabel(tr("Name:")); QLabel *recipientLabel = new QLabel(tr("Name:", "recipient")); - ... -} //! [17] +} //! [18] |