diff options
| author | Jocelyn Turcotte <jocelyn.turcotte@nokia.com> | 2009-10-23 15:26:29 (GMT) |
|---|---|---|
| committer | Jocelyn Turcotte <jocelyn.turcotte@nokia.com> | 2009-10-23 15:26:29 (GMT) |
| commit | afcffc4e0bdbac7850bcef9e67332c7cbd1ea611 (patch) | |
| tree | 0f898561b6c2106969736126ee5aa5c0a328c865 /src/gui/dialogs | |
| parent | 0e917ae9587aa0727e6b26ba3eb0157362748fb7 (diff) | |
| download | Qt-afcffc4e0bdbac7850bcef9e67332c7cbd1ea611.zip Qt-afcffc4e0bdbac7850bcef9e67332c7cbd1ea611.tar.gz Qt-afcffc4e0bdbac7850bcef9e67332c7cbd1ea611.tar.bz2 | |
QT_NO_CURSOR build fix on windows. Random corrections for it on mac.
Reviewed-by: Denis Dzyubenko
Diffstat (limited to 'src/gui/dialogs')
| -rw-r--r-- | src/gui/dialogs/qwizard.cpp | 2 | ||||
| -rw-r--r-- | src/gui/dialogs/qwizard_win.cpp | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/src/gui/dialogs/qwizard.cpp b/src/gui/dialogs/qwizard.cpp index 0102e25..db1c9e9 100644 --- a/src/gui/dialogs/qwizard.cpp +++ b/src/gui/dialogs/qwizard.cpp @@ -1537,7 +1537,9 @@ void QWizardPrivate::handleAeroStyleChange() vistaHelper->backButton()->show(); } else { q->setMouseTracking(true); // ### original value possibly different +#ifndef QT_NO_CURSOR q->unsetCursor(); // ### ditto +#endif antiFlickerWidget->move(0, 0); vistaHelper->hideBackButton(); vistaHelper->setTitleBarIconAndCaptionVisible(true); diff --git a/src/gui/dialogs/qwizard_win.cpp b/src/gui/dialogs/qwizard_win.cpp index aa38ddc..f3f3a4e 100644 --- a/src/gui/dialogs/qwizard_win.cpp +++ b/src/gui/dialogs/qwizard_win.cpp @@ -387,10 +387,12 @@ bool QVistaHelper::winEvent(MSG* msg, long* result) void QVistaHelper::setMouseCursor(QPoint pos) { +#ifndef QT_NO_CURSOR if (rtTop.contains(pos)) wizard->setCursor(Qt::SizeVerCursor); else wizard->setCursor(Qt::ArrowCursor); +#endif } void QVistaHelper::mouseEvent(QEvent *event) |