diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-06-11 15:08:22 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-06-11 15:08:22 (GMT) |
commit | 3a54e5ead647a318641d9a2bcf75eda4b8859d1b (patch) | |
tree | b17fb765b6a9cf8a2e21c1930dd59b18f20c9739 /src/declarative/graphicsitems/qdeclarativegridview.cpp | |
parent | dafb256321f9195f84fc3f8b5c79482c9e734416 (diff) | |
parent | 999caa5d5418cde3bf0cb531fe2c1e15da537dd9 (diff) | |
download | Qt-3a54e5ead647a318641d9a2bcf75eda4b8859d1b.zip Qt-3a54e5ead647a318641d9a2bcf75eda4b8859d1b.tar.gz Qt-3a54e5ead647a318641d9a2bcf75eda4b8859d1b.tar.bz2 |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Adjust handling of library .bundle on Mac
Fix compilation: remove spurious semi-colon
Avoid the incorrect usage of QScopedArrayPointer.
Diffstat (limited to 'src/declarative/graphicsitems/qdeclarativegridview.cpp')
0 files changed, 0 insertions, 0 deletions