diff options
| author | Bea Lam <bea.lam@nokia.com> | 2009-11-05 04:17:49 (GMT) |
|---|---|---|
| committer | Bea Lam <bea.lam@nokia.com> | 2009-11-05 04:17:49 (GMT) |
| commit | c4bc9a635bf0fd42e80e570909e204ae24b303b2 (patch) | |
| tree | f31b37dc4aec0de9aba28b7f0a734336fd0812dc /doc/src/snippets/code | |
| parent | 3babe49011d363aaaabafb70bfb0626217ec8959 (diff) | |
| parent | d39ec85b7e5d8702c2888cdad4ccdae72531c199 (diff) | |
| download | Qt-c4bc9a635bf0fd42e80e570909e204ae24b303b2.zip Qt-c4bc9a635bf0fd42e80e570909e204ae24b303b2.tar.gz Qt-c4bc9a635bf0fd42e80e570909e204ae24b303b2.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] |