diff options
| author | Bradley T. Hughes <bradley.hughes@nokia.com> | 2009-04-24 09:21:42 (GMT) |
|---|---|---|
| committer | Bradley T. Hughes <bradley.hughes@nokia.com> | 2009-04-24 09:21:42 (GMT) |
| commit | d6aa7692aaeba9b08534eb9ecd16760a5377d4b9 (patch) | |
| tree | 3ad4144fd8586f46e3e0fcad8abded9532f9063d /src/gui/graphicsview/qgraphicsview.cpp | |
| parent | 2bfde77e07c1de1866a1d171fc5dc5c584618e8e (diff) | |
| parent | 3ab7dc5d764d41bf828dd76672ca2918b004bad3 (diff) | |
| download | Qt-d6aa7692aaeba9b08534eb9ecd16760a5377d4b9.zip Qt-d6aa7692aaeba9b08534eb9ecd16760a5377d4b9.tar.gz Qt-d6aa7692aaeba9b08534eb9ecd16760a5377d4b9.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into windows-7-multitouch
Diffstat (limited to 'src/gui/graphicsview/qgraphicsview.cpp')
| -rw-r--r-- | src/gui/graphicsview/qgraphicsview.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/gui/graphicsview/qgraphicsview.cpp b/src/gui/graphicsview/qgraphicsview.cpp index 9e4647b..b59e475 100644 --- a/src/gui/graphicsview/qgraphicsview.cpp +++ b/src/gui/graphicsview/qgraphicsview.cpp @@ -2809,9 +2809,7 @@ void QGraphicsView::setupViewport(QWidget *widget) const bool isGLWidget = widget->inherits("QGLWidget"); - d->accelerateScrolling = !(isGLWidget - || widget->testAttribute(Qt::WA_MSWindowsUseDirect3D) - || qApp->testAttribute(Qt::AA_MSWindowsUseDirect3DByDefault)); + d->accelerateScrolling = !(isGLWidget); widget->setFocusPolicy(Qt::StrongFocus); |