diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-09-14 14:00:52 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-09-14 14:00:52 (GMT) |
| commit | 4d2936ffd9291d27d57d056794b44f872a1e13ad (patch) | |
| tree | e498edbcf64eb819085dd9a80615bf6e1b6feade /src/gui/kernel | |
| parent | 37b9c2df53b281bddee26291855e0c7f01f52a7c (diff) | |
| parent | 3b4b4eb7741863bb1876dcf1d9a4b7132b895b35 (diff) | |
| download | Qt-4d2936ffd9291d27d57d056794b44f872a1e13ad.zip Qt-4d2936ffd9291d27d57d056794b44f872a1e13ad.tar.gz Qt-4d2936ffd9291d27d57d056794b44f872a1e13ad.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Fixed audio-backend detection in configure tests.
Added support for using -L notation in the LIBS variable.
Remove redundant code in SgImage -> VGImage conversion on Symbian.
Fix incorrect dialog positioning on Symbian
Eliminated duplicated code from library handling.
Add QtOpenGL .def files
Moved the sis_targets feature profile to the correct directory.
Diffstat (limited to 'src/gui/kernel')
| -rw-r--r-- | src/gui/kernel/qwidget_s60.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/kernel/qwidget_s60.cpp b/src/gui/kernel/qwidget_s60.cpp index c98c05a..4109ed8 100644 --- a/src/gui/kernel/qwidget_s60.cpp +++ b/src/gui/kernel/qwidget_s60.cpp @@ -518,7 +518,7 @@ void QWidgetPrivate::show_sys() if (q->windowState() & Qt::WindowMaximized) { TRect r = static_cast<CEikAppUi*>(S60->appUi())->ClientRect(); id->SetExtent(r.iTl, r.Size()); - } else if (!q->testAttribute(Qt::WA_Moved)) { + } else if (!q->testAttribute(Qt::WA_Moved) && q->windowType() != Qt::Dialog) { id->SetPosition(static_cast<CEikAppUi*>(S60->appUi())->ClientRect().iTl); } } |