projects / qt:qt.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: dbfc08c fbe0d24)
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
authorQt Continuous Integration System <qt-info@nokia.com>
Fri, 27 May 2011 14:10:25 +0000 (00:10 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Fri, 27 May 2011 14:10:25 +0000 (00:10 +1000)
commitaa36b6701c11a5bb0bae6de9df570a6c530bcead
tree2879ec5e06b5b5ef17029bffb7f2d82f253e5290tree | snapshot
parentdbfc08cf8de75439f78f2b10a6b487ff23735f69commit | diff
parentfbe0d24bdd429248dbf9e9be592f15fd7b1648bccommit | diff
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
  Remove unnecessary QtQuick 1.1 effectiveLayoutDirection, effectiveHorizontalAlignment and anchors.mirror properties
17 files changed:
doc/src/declarative/righttoleft.qdoc diff1 | diff2 | blob | history
doc/src/declarative/whatsnew.qdoc diff1 | diff2 | blob | history
src/declarative/graphicsitems/qdeclarativeanchors_p.h diff1 | diff2 | blob | history
src/declarative/graphicsitems/qdeclarativegridview.cpp diff1 | diff2 | blob | history
src/declarative/graphicsitems/qdeclarativegridview_p.h diff1 | diff2 | blob | history
src/declarative/graphicsitems/qdeclarativeitem.cpp diff1 | diff2 | blob | history
src/declarative/graphicsitems/qdeclarativelistview.cpp diff1 | diff2 | blob | history
src/declarative/graphicsitems/qdeclarativelistview_p.h diff1 | diff2 | blob | history
src/declarative/graphicsitems/qdeclarativepositioners.cpp diff1 | diff2 | blob | history
src/declarative/graphicsitems/qdeclarativepositioners_p.h diff1 | diff2 | blob | history
src/declarative/graphicsitems/qdeclarativetext.cpp diff1 | diff2 | blob | history
src/declarative/graphicsitems/qdeclarativetext_p.h diff1 | diff2 | blob | history
src/declarative/graphicsitems/qdeclarativetextedit.cpp diff1 | diff2 | blob | history
src/declarative/graphicsitems/qdeclarativetextedit_p.h diff1 | diff2 | blob | history
src/declarative/graphicsitems/qdeclarativetextinput.cpp diff1 | diff2 | blob | history
src/declarative/graphicsitems/qdeclarativetextinput_p.h diff1 | diff2 | blob | history
tests/auto/declarative/qdeclarativeanchors/tst_qdeclarativeanchors.cpp diff1 | diff2 | blob | history
6b46b7419a5aee9bd5fce67b7bfa8afe8e