diff options
| author | Jan-Arve Sæther <jan-arve.saether@nokia.com> | 2009-10-28 07:53:39 +0100 |
|---|---|---|
| committer | Jan-Arve Sæther <jan-arve.saether@nokia.com> | 2009-10-28 07:53:39 +0100 |
| commit | 262d0df3b166fecb3502e81b2ab85cadd71ae70f (patch) | |
| tree | 17f8cba9c8f1ff4f46b45386c79ff9ebb3f998be /src/qt3support | |
| parent | df0001a3d62938c713b351c7e59228b803ec5670 (diff) | |
| parent | 1607216cc6292ef9a4af68ce6d29dc79fffea92c (diff) | |
Merge branch 'fixes' of git://gitorious.org/~fleury/qt/fleury-openbossa-clone into openbossa-fleury-fixes3
Conflicts:
src/gui/graphicsview/qgraphicsanchorlayout_p.cpp
src/gui/graphicsview/qgraphicsanchorlayout_p.h
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 46ad86cd05..80d30c4c9d 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 } |