diff options
| author | Alan Alpert <alan.alpert@nokia.com> | 2009-11-05 00:53:00 (GMT) |
|---|---|---|
| committer | Alan Alpert <alan.alpert@nokia.com> | 2009-11-05 00:53:00 (GMT) |
| commit | aa6f6174374e0abfe94f37ccefce2d0e2b5fe13e (patch) | |
| tree | 2848c48829255e8a2e85cc50bd84cc6a2a27939c /doc/src/snippets/code | |
| parent | f3cce7a770f25c42d5c85b012df338fc712f5b2e (diff) | |
| parent | 9e5c80bd52467afa481775fe9695bac7edcf7324 (diff) | |
| download | Qt-aa6f6174374e0abfe94f37ccefce2d0e2b5fe13e.zip Qt-aa6f6174374e0abfe94f37ccefce2d0e2b5fe13e.tar.gz Qt-aa6f6174374e0abfe94f37ccefce2d0e2b5fe13e.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@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] |