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
tree2879ec5e06b5b5ef17029bffb7f2d82f253e5290
parentdbfc08cf8de75439f78f2b10a6b487ff23735f69
parentfbe0d24bdd429248dbf9e9be592f15fd7b1648bc
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
doc/src/declarative/whatsnew.qdoc
src/declarative/graphicsitems/qdeclarativeanchors_p.h
src/declarative/graphicsitems/qdeclarativegridview.cpp
src/declarative/graphicsitems/qdeclarativegridview_p.h
src/declarative/graphicsitems/qdeclarativeitem.cpp
src/declarative/graphicsitems/qdeclarativelistview.cpp
src/declarative/graphicsitems/qdeclarativelistview_p.h
src/declarative/graphicsitems/qdeclarativepositioners.cpp
src/declarative/graphicsitems/qdeclarativepositioners_p.h
src/declarative/graphicsitems/qdeclarativetext.cpp
src/declarative/graphicsitems/qdeclarativetext_p.h
src/declarative/graphicsitems/qdeclarativetextedit.cpp
src/declarative/graphicsitems/qdeclarativetextedit_p.h
src/declarative/graphicsitems/qdeclarativetextinput.cpp
src/declarative/graphicsitems/qdeclarativetextinput_p.h
tests/auto/declarative/qdeclarativeanchors/tst_qdeclarativeanchors.cpp