diff options
| author | David Boddie <david.boddie@nokia.com> | 2010-10-27 15:05:59 (GMT) |
|---|---|---|
| committer | David Boddie <david.boddie@nokia.com> | 2010-10-27 15:05:59 (GMT) |
| commit | 7ca94a08b9c232aaccb74fa85912515b8f9a6619 (patch) | |
| tree | e60229477bc8269cf14904620bf0fc5ad18ef6d0 /demos/qtdemo/mainwindow.cpp | |
| parent | f8c9314d6224948c28487e291b4cdad0049682c7 (diff) | |
| parent | 7285c09ef777569514e73dffa22ecfdb7df6ba8f (diff) | |
| download | Qt-7ca94a08b9c232aaccb74fa85912515b8f9a6619.zip Qt-7ca94a08b9c232aaccb74fa85912515b8f9a6619.tar.gz Qt-7ca94a08b9c232aaccb74fa85912515b8f9a6619.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7
Diffstat (limited to 'demos/qtdemo/mainwindow.cpp')
| -rw-r--r-- | demos/qtdemo/mainwindow.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/demos/qtdemo/mainwindow.cpp b/demos/qtdemo/mainwindow.cpp index 16c5bf3..e39802a 100644 --- a/demos/qtdemo/mainwindow.cpp +++ b/demos/qtdemo/mainwindow.cpp @@ -388,7 +388,7 @@ void MainWindow::keyPressEvent(QKeyEvent *event) s += "\nAdapt: "; s += Colors::noAdapt ? "off" : "on"; - s += "\nAdaption occured: "; + s += "\nAdaption occurred: "; s += Colors::adapted ? "yes" : "no"; s += "\nOpenGL version: "; s += Colors::glVersion; |