summaryrefslogtreecommitdiffstats
path: root/mkspecs/common
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-10-19 19:20:53 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-10-19 19:20:53 (GMT)
commit70f7a6e7ebec1fca9087fde56ce9961f34a52dc5 (patch)
tree99cf40a280fdc3b5dc252e7c5311a17fdb09582e /mkspecs/common
parentc849ddd06371e5a6455c63d67a14171ac06bf9d4 (diff)
parented1212be97e632b7716d8a2eb3f9b0efbd001627 (diff)
downloadQt-70f7a6e7ebec1fca9087fde56ce9961f34a52dc5.zip
Qt-70f7a6e7ebec1fca9087fde56ce9961f34a52dc5.tar.gz
Qt-70f7a6e7ebec1fca9087fde56ce9961f34a52dc5.tar.bz2
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: Tic-tac-toe: Fix z-order of status text. Don't export QtDeclarative symbols needed by QtCreator on Symbian Properties take precedence over methods Call the correct vme meta object when connecting alias signals Fix Twitter demo's list view for devices Fix QDeclarativeTextLayout under non-affine transformation Fix visual tests. ListView.visibleArea.heightRatio should not emit a signal when it does not change. Properties should have precedence over methods.
Diffstat (limited to 'mkspecs/common')
0 files changed, 0 insertions, 0 deletions