summaryrefslogtreecommitdiffstats
path: root/src/gui/dialogs/qdialog.cpp
diff options
context:
space:
mode:
authorCasper van Donderen <casper.vandonderen@nokia.com>2011-10-21 10:23:24 (GMT)
committerCasper van Donderen <casper.vandonderen@nokia.com>2011-10-21 10:23:24 (GMT)
commitbc1d28416be82c621159edce8364a97d4bf7a163 (patch)
tree3fed14b18cb20ab1737543dea9d97c6c5392404c /src/gui/dialogs/qdialog.cpp
parenta0d738e5addfbee866c5b5185d14d74a43d51b11 (diff)
parent2df43004a5c093879371574cfe9ea3f68fefa69c (diff)
downloadQt-bc1d28416be82c621159edce8364a97d4bf7a163.zip
Qt-bc1d28416be82c621159edce8364a97d4bf7a163.tar.gz
Qt-bc1d28416be82c621159edce8364a97d4bf7a163.tar.bz2
Merge remote-tracking branch 'mainline/4.8'
Diffstat (limited to 'src/gui/dialogs/qdialog.cpp')
-rw-r--r--src/gui/dialogs/qdialog.cpp4
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);