diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-30 14:32:25 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-30 14:32:25 (GMT) |
commit | a32aedc044948965d91a21b9731d3c70a7dfb45c (patch) | |
tree | af5d0ffb6a59ed887c3025c28448e5dd1209fcb4 /src/gui/graphicsview/qgraphicswidget.cpp | |
parent | 0996c6787e7b5fd9254cf2558ec0f8a892a482cf (diff) | |
parent | dbbd84e61bf433495268c639670f9b9f82eb56f4 (diff) | |
download | Qt-a32aedc044948965d91a21b9731d3c70a7dfb45c.zip Qt-a32aedc044948965d91a21b9731d3c70a7dfb45c.tar.gz Qt-a32aedc044948965d91a21b9731d3c70a7dfb45c.tar.bz2 |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( ecfa4583e573ce4dff1f0df12f6bdba3022376e5 )
do not detect the echo-without-newline syntax over and over
speed up by removing nonsense
no need for CONFIG += ordered here
Autotest: don't allow choosing between debug/release mode.
Diffstat (limited to 'src/gui/graphicsview/qgraphicswidget.cpp')
0 files changed, 0 insertions, 0 deletions