diff options
| author | Sami Merila <sami.merila@nokia.com> | 2010-03-05 09:08:37 (GMT) |
|---|---|---|
| committer | Sami Merila <sami.merila@nokia.com> | 2010-03-05 09:08:37 (GMT) |
| commit | 5dba125fb953718d8282ff317a6ff34b612bcf45 (patch) | |
| tree | ebdf2ada09d08e9ec6ae5c36f38a81911ec96a89 /src/gui/dialogs | |
| parent | 68eea46d309ff82e45c243a7689013f36454c85b (diff) | |
| parent | 92c42901344ae654d8bc102e566d47d735cb3954 (diff) | |
| download | Qt-5dba125fb953718d8282ff317a6ff34b612bcf45.zip Qt-5dba125fb953718d8282ff317a6ff34b612bcf45.tar.gz Qt-5dba125fb953718d8282ff317a6ff34b612bcf45.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6
Diffstat (limited to 'src/gui/dialogs')
| -rw-r--r-- | src/gui/dialogs/qdialog.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gui/dialogs/qdialog.cpp b/src/gui/dialogs/qdialog.cpp index 9ff2ad8..d86d63e 100644 --- a/src/gui/dialogs/qdialog.cpp +++ b/src/gui/dialogs/qdialog.cpp @@ -807,11 +807,11 @@ void QDialog::setVisible(bool visible) void QDialog::showEvent(QShowEvent *event) { if (!event->spontaneous() && !testAttribute(Qt::WA_Moved)) { - Qt::WindowStates state = windowState(); + Qt::WindowStates state = windowState(); adjustPosition(parentWidget()); setAttribute(Qt::WA_Moved, false); // not really an explicit position - if (state != windowState()) - setWindowState(state); + if (state != windowState()) + setWindowState(state); } } |