diff options
| author | Water-Team <water@pad.test.qt.nokia.com> | 2011-10-20 23:00:13 (GMT) |
|---|---|---|
| committer | Water-Team <water@pad.test.qt.nokia.com> | 2011-10-20 23:00:13 (GMT) |
| commit | fff5d2c672b06e40903f9b9e067829d59f1397e0 (patch) | |
| tree | 1f6af551d7770ab645679134b4fa84605457f969 /src/gui/dialogs | |
| parent | 0b41e3f1215d59b381af5073ddc6c912b5aa36e7 (diff) | |
| parent | 2df43004a5c093879371574cfe9ea3f68fefa69c (diff) | |
| download | Qt-fff5d2c672b06e40903f9b9e067829d59f1397e0.zip Qt-fff5d2c672b06e40903f9b9e067829d59f1397e0.tar.gz Qt-fff5d2c672b06e40903f9b9e067829d59f1397e0.tar.bz2 | |
Merge branch '4.8-upstream' into master-water
Diffstat (limited to 'src/gui/dialogs')
| -rw-r--r-- | src/gui/dialogs/qdialog.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/gui/dialogs/qdialog.cpp b/src/gui/dialogs/qdialog.cpp index 2fb6c67..d2211af 100644 --- a/src/gui/dialogs/qdialog.cpp +++ b/src/gui/dialogs/qdialog.cpp @@ -909,6 +909,10 @@ bool QDialog::symbianAdjustedPosition() AknLayoutUtils::LayoutMetricsRect(AknLayoutUtils::EStatusPane, statusPaneRect); } else { AknLayoutUtils::LayoutMetricsRect(AknLayoutUtils::EStaconTop, statusPaneRect); + // In some native layouts, StaCon is not used. Try to fetch the status pane + // height from StatusPane component. + if (statusPaneRect.IsEmpty()) + AknLayoutUtils::LayoutMetricsRect(AknLayoutUtils::EStatusPane, statusPaneRect); } p.setX(0); |