Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration into maste...
authorQt Continuous Integration System <qt-info@nokia.com>
Tue, 17 May 2011 23:11:22 +0000 (09:11 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Tue, 17 May 2011 23:11:22 +0000 (09:11 +1000)
commit2c07b5d2cba8d8e499bd0861eefef12d4e00d99a
tree3e6b31daecfe217b355fa973f2f122da8468c0ac
parentcb2980a09aefcc207eacb500d5a3c74f064859dd
parent3773fcb78db02a2577c89f755c07c2c7dbf0de74
Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration into master-integration

* 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: (55 commits)
  Fix thread safety regression of QNetworkConfigurationManager
  Fix instability in QNetworkConfigurationManager autotest
  Support word selection list with predictive text from splitview
  Fix softkey icon positioning in S60 5.3
  QDeclarativeMouseArea: block context menu events
  ListViews loses items if all visible items are removed.
  Make TextEdit word selection more natural.
  Clear confusion between QMainWindow and QMainWindowLayout.
  Fix for rounded corners bug in QMenu
  Compile
  QWidgetPrivate::setParent_sys might be using null pointer
  Ensure the TextEdit cursor delegate is repositioned on mouse events.
  Don't crash on an invalid replacementStart from an input method.
  Fix incorrect hardware address on systems without getifaddrs()
  Enable multisampling on Symbian if hw supports it
  Fix QtCoreu.def file error
  Introduce platform extension to QGraphicsSystem
  Fix Symbian/WinsCW build break
  Prevent crash in OpenGL engine when scaling images / pixmaps.
  emit QNetWorkAccessManager::finished on QNetworkReply::abort()
  ...
qmake/generators/makefile.cpp
src/gui/kernel/qwidget.cpp
src/gui/text/qfontengine_ft.cpp
src/gui/text/qtextobject.cpp
src/gui/text/qtextobject.h
src/gui/widgets/qlinecontrol.cpp
tests/auto/qpixmap/tst_qpixmap.cpp
tests/auto/qwidget/tst_qwidget.cpp