diff options
author | David Boddie <dboddie@trolltech.com> | 2009-11-03 16:37:05 +0100 |
---|---|---|
committer | David Boddie <dboddie@trolltech.com> | 2009-11-03 16:37:05 +0100 |
commit | c0a58b079d00dad484faa6249b8109a639576399 (patch) | |
tree | d2828950d8e5664da5606783161f2a48db3ce722 /examples/mainwindows/mdi/mainwindow.cpp | |
parent | 93ec4104781d7f9929b8b8a05dee3d94f8cd4b17 (diff) | |
parent | c95a0e6e8eb8ba5fd2a4412b318ad998b3ccb4fc (diff) |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.6
Conflicts:
src/gui/kernel/qevent.cpp
src/network/ssl/qsslerror.cpp
Diffstat (limited to 'examples/mainwindows/mdi/mainwindow.cpp')
-rw-r--r-- | examples/mainwindows/mdi/mainwindow.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/examples/mainwindows/mdi/mainwindow.cpp b/examples/mainwindows/mdi/mainwindow.cpp index 712d91f884..edb33b7a40 100644 --- a/examples/mainwindows/mdi/mainwindow.cpp +++ b/examples/mainwindows/mdi/mainwindow.cpp @@ -71,7 +71,7 @@ MainWindow::MainWindow() void MainWindow::closeEvent(QCloseEvent *event) { mdiArea->closeAllSubWindows(); - if (activeMdiChild()) { + if (mdiArea->currentSubWindow()) { event->ignore(); } else { writeSettings(); |