summaryrefslogtreecommitdiffstats
path: root/src/declarative
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2011-02-09 13:24:46 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2011-02-09 13:24:46 (GMT)
commit4a1e5fce254a3ef32f59c67f22ba621ebb84ccc5 (patch)
tree085cdbdfc1b5868f419924c45dfa759060375452 /src/declarative
parentee10a38cc5470f41fbbc1d1ca483fad947d0aef2 (diff)
parentea770c9aa3099facd7adccf5d4a159bc163e7356 (diff)
downloadQt-4a1e5fce254a3ef32f59c67f22ba621ebb84ccc5.zip
Qt-4a1e5fce254a3ef32f59c67f22ba621ebb84ccc5.tar.gz
Qt-4a1e5fce254a3ef32f59c67f22ba621ebb84ccc5.tar.bz2
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team: Fix for loading QPixmaps from file in GL graphics system Fix code style in qgl_symbian.cpp
Diffstat (limited to 'src/declarative')
0 files changed, 0 insertions, 0 deletions