diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-14 17:32:38 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-14 17:32:38 (GMT) |
commit | 01e03e91a0c6867205f5a3ab0306f0c6a067ffad (patch) | |
tree | 955e50177c165846334dd5920f2d6484d99f16f2 /examples/opengl/pbuffers2/main.cpp | |
parent | b915d0aa46599f707df4db6eb33965602a2d7422 (diff) | |
parent | 3849cd0cca618fac88a54861a3ec30780711ce75 (diff) | |
download | Qt-01e03e91a0c6867205f5a3ab0306f0c6a067ffad.zip Qt-01e03e91a0c6867205f5a3ab0306f0c6a067ffad.tar.gz Qt-01e03e91a0c6867205f5a3ab0306f0c6a067ffad.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: (24 commits)
Update the dependencies in src.pro because we don't have a good buildsystem
QtDeclarative doesn't use QtXml, so don't link to it or require others to
Add new logo for QML Launcher (Mac OS X)
Rename QML Runtime (executable) to QML Launcher
Remove skins from qml launcher.
Fix compilation of QtDeclarative module (gcc)
Qt.include() support in worker scripts
Only add "include" property in non-workerscript threads
Missing files from 645b9ee9dd6e0576542cc61872ecedb408ca8a89
Reduce the chance of AnchorAnimation animating geometry changes it
Add Qt.include() method for scoped inclusion of JavaScript files
Fix crash in ParentAnimation.
Revert "Fix crash in ParentAnimation."
Symbian build fix to declarative auto and benchmark tests
Revert "Use raster graphicssystem for qml.app on OS X."
Fix crash in ParentAnimation.
Minor declarative webview tweaks
Removed dependency of QDeclarativeWebView to private Qt (Declarative) API
Note that you need to unset a flag to create a visual item
Follow-up on Flickable changes.
...
Diffstat (limited to 'examples/opengl/pbuffers2/main.cpp')
0 files changed, 0 insertions, 0 deletions