diff options
author | Bea Lam <bea.lam@nokia.com> | 2009-10-26 04:14:06 (GMT) |
---|---|---|
committer | Bea Lam <bea.lam@nokia.com> | 2009-10-26 04:14:06 (GMT) |
commit | 2559961affdbf66d1cfad3b71b439b6aea0bc66f (patch) | |
tree | d8a8585f955e109ab859a1aaa4e6510897533638 /src/qt3support | |
parent | 90a883796acb961a572c90d53c0505110a466a8a (diff) | |
parent | a3716fc7c1a1d4eaa4186fd134de7593d96bcf9e (diff) | |
download | Qt-2559961affdbf66d1cfad3b71b439b6aea0bc66f.zip Qt-2559961affdbf66d1cfad3b71b439b6aea0bc66f.tar.gz Qt-2559961affdbf66d1cfad3b71b439b6aea0bc66f.tar.bz2 |
Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/qt3support')
-rw-r--r-- | src/qt3support/widgets/q3dockwindow.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qt3support/widgets/q3dockwindow.cpp b/src/qt3support/widgets/q3dockwindow.cpp index 46ad86c..80d30c4 100644 --- a/src/qt3support/widgets/q3dockwindow.cpp +++ b/src/qt3support/widgets/q3dockwindow.cpp @@ -409,7 +409,7 @@ Q3DockWindowHandle::Q3DockWindowHandle(Q3DockWindow *dw) ctrlDown = false; timer = new QTimer(this); connect(timer, SIGNAL(timeout()), this, SLOT(minimize())); -#ifdef Q_WS_WIN +#if defined(Q_WS_WIN) && !defined(QT_NO_CURSOR) setCursor(Qt::SizeAllCursor); #endif } |