Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into qt-4.7-from-4.6
authorSimon Hausmann <simon.hausmann@nokia.com>
Fri, 21 May 2010 06:15:04 +0000 (08:15 +0200)
committerSimon Hausmann <simon.hausmann@nokia.com>
Fri, 21 May 2010 06:15:04 +0000 (08:15 +0200)
commit6c5d190923fb23e2f644e71ac2393c25619848c8
tree78cf279084269f88dff58c4bc0ab33f2aa882866
parent2fb3ec5c80a0b9d211c0168fdcd1f4fb84c9b315
parentdb87996d4ca90f8fffb5a8e012fa7f2336c038b0
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into qt-4.7-from-4.6
mkspecs/features/qt.prf
mkspecs/features/symbian/qt.prf
src/corelib/global/qglobal.h