projects / qt:qt.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: e61071a ad8e7b2)
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>
Fri, 12 Nov 2010 16:40:36 +0000 (17:40 +0100)
committerQt Continuous Integration System <qt-info@nokia.com>
Fri, 12 Nov 2010 16:40:36 +0000 (17:40 +0100)
commitc7ad2de8f653c82ed26275d9a1791ebf2bb38644
tree8cb794acff34db69b93baf4963bf66e19eb877f9tree | snapshot
parente61071a2a170eaeb524778e9e903100323b88bbecommit | diff
parentad8e7b27427825bee730c55735cd2554407205e4commit | 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:
  Add Location as self signable capability in patch_capabilities.pl
  Localize .loc and .pkg content based on TRANSLATIONS
  Bump Qt version to 4.7.2.
  SSL: Fix for systemCaCertificates being called first on symbian
  Send WinIdChange event when winId is set to zero
6b46b7419a5aee9bd5fce67b7bfa8afe8e