projects / qt:qt.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 74d391a 72fd839)
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
authorQt Continuous Integration System <qt-info@nokia.com>
Thu, 30 Sep 2010 20:38:55 +0000 (22:38 +0200)
committerQt Continuous Integration System <qt-info@nokia.com>
Thu, 30 Sep 2010 20:38:55 +0000 (22:38 +0200)
commitffd14464a6c5158c1b88b9cfa51e44507fb557f9
treed7f956118cbbe5870470831a51bf034887b5c17ctree | snapshot
parent74d391adfd907d80ae35abe25fe346b2b4d649f9commit | diff
parent72fd8399aa36395e41f497fff79842496d6f9b03commit | diff
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
  Some 4.7.1 changes.
  Fix QScriptEngine::abortEvaluation.
  QAxBase::dynamicCall() returns invalid QVariant
  Fixes cursor shape when widget becomes native on X11.
  Update changes
6b46b7419a5aee9bd5fce67b7bfa8afe8e