diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-09-27 18:58:17 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-09-27 18:58:17 (GMT) |
| commit | 7b796b4dcdebfba55c4754d241edb334217fc550 (patch) | |
| tree | d9dc239f7172a5e64c03462ae741771b72fcdc44 /src/opengl/qgl.cpp | |
| parent | 53f5b448f5dd33459837536a855463c917b4c14e (diff) | |
| parent | 858469445ceb745c70dad9cd4f913acc34683e15 (diff) | |
| download | Qt-7b796b4dcdebfba55c4754d241edb334217fc550.zip Qt-7b796b4dcdebfba55c4754d241edb334217fc550.tar.gz Qt-7b796b4dcdebfba55c4754d241edb334217fc550.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:
Add export to QDeclarativeBasePositioner
Fix assert when placing a .qml file inside $QTDIR/imports
Diffstat (limited to 'src/opengl/qgl.cpp')
0 files changed, 0 insertions, 0 deletions