diff options
| author | Jason McDonald <jason.mcdonald@nokia.com> | 2009-11-04 03:19:17 (GMT) |
|---|---|---|
| committer | Jason McDonald <jason.mcdonald@nokia.com> | 2009-11-04 03:19:17 (GMT) |
| commit | 9f30be82b42c7b29236067ec819dc037d7d648dd (patch) | |
| tree | 5a319f0dead678dee115507b493ddb846c9d15d9 /doc/src/snippets/code | |
| parent | ac30ce00afe700e5ba803038c95121313f33509b (diff) | |
| parent | 8caacf51667d4cf770b18a8b59e46f842861210e (diff) | |
| download | Qt-9f30be82b42c7b29236067ec819dc037d7d648dd.zip Qt-9f30be82b42c7b29236067ec819dc037d7d648dd.tar.gz Qt-9f30be82b42c7b29236067ec819dc037d7d648dd.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
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] |