projects / qt:qt.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 1a7a117 a52f572)
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
authorQt Continuous Integration System <qt-info@nokia.com>
Thu, 4 Nov 2010 19:25:15 +0000 (20:25 +0100)
committerQt Continuous Integration System <qt-info@nokia.com>
Thu, 4 Nov 2010 19:25:15 +0000 (20:25 +0100)
commitc715f4108186c919773a612d9442ec55bc218ea1
treedc0be04025f1887f1d9a84d0443b01abe11409a6tree | snapshot
parent1a7a1172d048108c30a9890ce9477686711ad756commit | diff
parenta52f572d513e2002e442769a46664009f45bc74acommit | diff
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
  Remove code changes that were NOT intended as part of the fix
  Wordwrap QInputDialog label in Symbian
  Use qtmain.lib to provide entry point for all Symbian applications
6b46b7419a5aee9bd5fce67b7bfa8afe8e