diff options
| author | A-Team <ateam@pad.test.qt.nokia.com> | 2010-10-23 22:00:13 (GMT) |
|---|---|---|
| committer | A-Team <ateam@pad.test.qt.nokia.com> | 2010-10-23 22:00:13 (GMT) |
| commit | 3c7b40623ea36fb0098d46451c3154ef83f7e564 (patch) | |
| tree | c6873ce3c452387aac002daacc38bcaa036e0966 /src/gui/widgets | |
| parent | 0787890a9a06a0f05c78c7e4d85655fdc1fc9398 (diff) | |
| parent | bb2b9362ced23ff2aae824ef001efe7a34b464cc (diff) | |
| download | Qt-3c7b40623ea36fb0098d46451c3154ef83f7e564.zip Qt-3c7b40623ea36fb0098d46451c3154ef83f7e564.tar.gz Qt-3c7b40623ea36fb0098d46451c3154ef83f7e564.tar.bz2 | |
Merge branch '4.7-upstream' into 4.7-doc
Diffstat (limited to 'src/gui/widgets')
| -rw-r--r-- | src/gui/widgets/qcombobox.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/widgets/qcombobox.cpp b/src/gui/widgets/qcombobox.cpp index 96d2acd..7859bdc 100644 --- a/src/gui/widgets/qcombobox.cpp +++ b/src/gui/widgets/qcombobox.cpp @@ -2476,7 +2476,7 @@ void QComboBox::showPopup() listRect.setWidth(listRect.height()); //by default popup is centered on screen in landscape listRect.moveCenter(screen.center()); - if (staConTopRect.IsEmpty()) { + if (staConTopRect.IsEmpty() && AknLayoutUtils::CbaLocation() != AknLayoutUtils::EAknCbaLocationBottom) { // landscape without stacon, menu should be at the right (opt.direction == Qt::LeftToRight) ? listRect.setRight(screen.right()) : listRect.setLeft(screen.left()); |