summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2011-08-24 06:04:09 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2011-08-24 06:04:09 (GMT)
commitfba03060f1bb0a7ed5a89335bb459a5e0f60078d (patch)
tree402d8a79e36ff32bda01e7b6aa6edf7d248514b7
parent52d3a7418818e5b6f497a4a7c6efd4b590356c35 (diff)
parent0b19ee5ecabfc516256f0a6db0f2e7bc37e703a0 (diff)
downloadQt-fba03060f1bb0a7ed5a89335bb459a5e0f60078d.zip
Qt-fba03060f1bb0a7ed5a89335bb459a5e0f60078d.tar.gz
Qt-fba03060f1bb0a7ed5a89335bb459a5e0f60078d.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: In landscape mode QComboboBox popup can not be showed completely
-rw-r--r--src/gui/widgets/qcombobox.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/widgets/qcombobox.cpp b/src/gui/widgets/qcombobox.cpp
index f4a627b..8a69bdf 100644
--- a/src/gui/widgets/qcombobox.cpp
+++ b/src/gui/widgets/qcombobox.cpp
@@ -2473,7 +2473,7 @@ void QComboBox::showPopup()
} else {
TRect staConTopRect = TRect();
AknLayoutUtils::LayoutMetricsRect(AknLayoutUtils::EStaconTop, staConTopRect);
- listRect.setWidth(listRect.height());
+ listRect.setWidth(screen.height());
//by default popup is centered on screen in landscape
listRect.moveCenter(screen.center());
if (staConTopRect.IsEmpty()) {