summaryrefslogtreecommitdiffstats
path: root/src/testlib
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-09-02 07:54:21 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-09-02 07:54:21 (GMT)
commit4b05255a970e33f471345c826cab5a857a3a83f8 (patch)
tree93fd84e4b57ce8074de9b3ce2c598985d32dc886 /src/testlib
parent22db0e0eeb9ac703f3d249ca7221a97628a3289f (diff)
parentb22697903a004fa947bae916a152ac3311346510 (diff)
downloadQt-4b05255a970e33f471345c826cab5a857a3a83f8.zip
Qt-4b05255a970e33f471345c826cab5a857a3a83f8.tar.gz
Qt-4b05255a970e33f471345c826cab5a857a3a83f8.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: Don't overflow the unreferenced cost counter Remove extra strings The declarative parser should only save comment text (and not /*,*/,//) Support for qsTrId and meta-data in comments for QML. Flickable ensure internal pressed state is cleared when mouse is released. Fix examples autotest Support JS "in" operator on QML objects Only emit change signal when variant properties actually change Use QApplication in QDeclarativeEngine example. Maintain high score name dialog length, as well as name.
Diffstat (limited to 'src/testlib')
0 files changed, 0 insertions, 0 deletions