Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt
authorSimon Hausmann <simon.hausmann@nokia.com>
Fri, 18 Sep 2009 13:22:27 +0000 (15:22 +0200)
committerSimon Hausmann <simon.hausmann@nokia.com>
Fri, 18 Sep 2009 13:22:27 +0000 (15:22 +0200)
commitb68c5cd72b4fc58a1422a801e1c52c72be32f3d4
tree0de572352715008a541f52d8d17d377195469604
parent9f80bac10f1ab5155999cb554559cd3dacab2bb9
parentb9b8a1cb6bc5a1b93373a7a634a23dcd785b3c31
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt

Conflicts:
src/3rdparty/webkit/WebKit/qt/Api/qwebframe.cpp
src/gui/kernel/qwidget_x11.cpp
src/3rdparty/webkit/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp
src/corelib/global/qglobal.h