diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-14 16:26:55 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-14 16:26:55 (GMT) |
| commit | 0fd2be8bc43af85e59963235ce75fcf989b42768 (patch) | |
| tree | af22034a65033e38c53f2768d14ddaf4b0bfa80e /demos | |
| parent | 9358d77fc1de64d2a8a06bfa4095dcde9f9b009b (diff) | |
| parent | c407d79f79c67f2f2bb84efc93061fd57fe4cf54 (diff) | |
| download | Qt-0fd2be8bc43af85e59963235ce75fcf989b42768.zip Qt-0fd2be8bc43af85e59963235ce75fcf989b42768.tar.gz Qt-0fd2be8bc43af85e59963235ce75fcf989b42768.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:
Correctly splice properties from derived metaobjects together
Fix consistency of setting currentIndex in ListView and GridView.
Optimization: Don't generate intermediate QDeclarativeComponent's
Diffstat (limited to 'demos')
0 files changed, 0 insertions, 0 deletions