Merge branch '4.5' of scm.dev.nokia.troll.no:qt/qt into 4.6
authorSimon Hausmann <simon.hausmann@nokia.com>
Thu, 1 Oct 2009 16:10:22 +0000 (18:10 +0200)
committerSimon Hausmann <simon.hausmann@nokia.com>
Thu, 1 Oct 2009 16:10:22 +0000 (18:10 +0200)
commit30d9101ecabeb0778c829c3578f1fcf5ec276a8c
treed6d67506c2bae71bf967845ff503e02dd41372ae
parent6ee282013b82b5f46fa972296b801eab55c614c1
parent984fe9ebfc6d9582d21bcf1d09cb0578fd163f54
Merge branch '4.5' of scm.dev.nokia.troll.no:qt/qt into 4.6
src/gui/kernel/qapplication.cpp
src/network/access/qhttpnetworkconnection.cpp
tests/auto/qwidget/tst_qwidget.cpp
tools/linguist/lconvert/main.cpp
tools/linguist/lupdate/main.cpp