diff options
| author | Morten Johan Sørvig <morten.sorvig@nokia.com> | 2009-11-05 06:26:24 (GMT) |
|---|---|---|
| committer | Morten Johan Sørvig <morten.sorvig@nokia.com> | 2009-11-05 06:26:24 (GMT) |
| commit | ee88b2d8408396188eb2ce52d740c395c6cd4656 (patch) | |
| tree | 1f59ea0612fecbaca595594d3812dd2aab64cf63 /doc/src/snippets/code | |
| parent | 673973acc20ce4e068d63fa5b0391f5c785be8a3 (diff) | |
| parent | aa58293b57a05cd52b36ba14a05958dceb65c603 (diff) | |
| download | Qt-ee88b2d8408396188eb2ce52d740c395c6cd4656.zip Qt-ee88b2d8408396188eb2ce52d740c395c6cd4656.tar.gz Qt-ee88b2d8408396188eb2ce52d740c395c6cd4656.tar.bz2 | |
Merge remote branch 'qt-official/4.6' 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] |