Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-team

* '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-team: (60 commits)
  Fix assert error on Windows with a negative char.
  Revert readonly BorderImage::sourceSize change
  URLs used with scheme handler use appropriate encoding for scheme
  Fix memory leak in ListModel custom parser
  DEF file update
  If automatic translation of input widget is off, skip reset
  Prevent leakage of native window handles
  QSslCertificate: blacklist fraudulent *.google.com
  Symbian: Not possible to catch RequestSoftwareInputPanel in eventFilter
  Added an additional check to workaround an issue on Windows.
  Exact word bubble doesn't disappear when screen is tapped (fix part 2)
  Exact word bubble doesn't disappear when screen is tapped
  Compile fix for Symbian 5th and earlier
  Symbian: Fix backspace on empty lines of multiline textedits
  Handle CloseSoftwareInputPanel event in QCoeFepInputContext
  Fix delayed password masking mid-string.
  Disabled splitscreen translation still moves screen
  Make text rendering working outside the gui thread on Symbian.
  Fix softkeys cleanup
  Fix clientRect usage in QWidgetPrivate::setGeometry_sys()
  ...

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()) {