Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt
authorDavid Boddie <david.boddie@nokia.com>
Mon, 18 Apr 2011 16:05:58 +0000 (18:05 +0200)
committerDavid Boddie <david.boddie@nokia.com>
Mon, 18 Apr 2011 16:05:58 +0000 (18:05 +0200)
commitddb22795641253a026b72f752ebc769745dd41be
tree149b270565a98054a03c615d0ce071b58bac53c0
parentb1c421239ddb16a6c259af2298e0608961a1f3ba
parent6814998ab4d9c6b0990b0bf01119ace69363ce3e
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt

Conflicts:
examples/webkit/webkit.pro
doc/src/development/qmake-manual.qdoc
doc/src/getting-started/examples.qdoc
src/corelib/kernel/qobject.cpp
src/declarative/graphicsitems/qdeclarativeborderimage.cpp
src/network/access/qnetworkaccessmanager.cpp
src/opengl/qgl.cpp
src/opengl/qglframebufferobject.cpp
src/opengl/qglpixelbuffer.cpp