summaryrefslogtreecommitdiff
path: root/src/3rdparty/webkit/WebCore/platform/ScrollView.cpp
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-06-04 05:43:47 +0200
committerQt Continuous Integration System <qt-info@nokia.com>2010-06-04 05:43:47 +0200
commit1448e19b3613ab7c5498c17c619586d03ec46d18 (patch)
treea6ce8079bf05a0692c3370c7fc88887711edd7a2 /src/3rdparty/webkit/WebCore/platform/ScrollView.cpp
parent58c591974bf34577e27638f1328a04c4f7c698f8 (diff)
parenta039a3a53d0a07b04e3b30ba2a73150ea5d2522a (diff)
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: tst_qgraphicsitem: stabilize on X11 Added OpenGL 3.3 and 4.0 recognition to QGLFormat Fix compilation: disable -no-feature-* for bootstrapped QString: Fix severals bugs when comparing with QStringRef QProgressBar: make accessors const. Changes: add patch for artificial emboldening Added static version of QGLFramebufferObject::release(). Fix compilation on WinXP MinGW32; Add a new qconfig feature GESTURES
Diffstat (limited to 'src/3rdparty/webkit/WebCore/platform/ScrollView.cpp')
0 files changed, 0 insertions, 0 deletions