summaryrefslogtreecommitdiffstats
path: root/tools/qdbus
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-03-03 09:39:48 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-03-03 09:39:48 (GMT)
commit2808823eafe3b9773a84039c38e9f149a578a4f3 (patch)
treed10c0ae3d6d970962ca6aa3e982f5992afb9d6ea /tools/qdbus
parent46dbe721c8a9efc555eb4c449141071825f2f747 (diff)
parente614e3548bbe505c75e8b3a54f44f07522a6ecf5 (diff)
downloadQt-2808823eafe3b9773a84039c38e9f149a578a4f3.zip
Qt-2808823eafe3b9773a84039c38e9f149a578a4f3.tar.gz
Qt-2808823eafe3b9773a84039c38e9f149a578a4f3.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Add and use QGLContextPrivate::eglSurfaceForDevice() QMetaType: Now we can register typedefs.
Diffstat (limited to 'tools/qdbus')
0 files changed, 0 insertions, 0 deletions