diff options
| author | Romain Pokrzywka <romain.pokrzywka@kdab.com> | 2012-01-16 05:53:01 (GMT) |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-04-10 19:39:21 (GMT) |
| commit | 40760383969022be5488bb180dc7e1f8babcc0eb (patch) | |
| tree | 17bab02774ff6948d87231ddff076aca0d8c5eb5 | |
| parent | ae3ba4e5c592e92718d81bd51305a0410fc2bd2f (diff) | |
| download | Qt-40760383969022be5488bb180dc7e1f8babcc0eb.zip Qt-40760383969022be5488bb180dc7e1f8babcc0eb.tar.gz Qt-40760383969022be5488bb180dc7e1f8babcc0eb.tar.bz2 | |
Fix compilation when QT_NO_CURSOR is defined
Change-Id: Iacf8ef2032d5c229a7483d6993120684ee9bb04e
Reviewed-by: Jeremy Katz <jeremy.katz@nokia.com>
| -rw-r--r-- | src/plugins/platforms/fb_base/fb_base.cpp | 5 | ||||
| -rw-r--r-- | src/plugins/platforms/linuxfb/qlinuxfbintegration.cpp | 2 |
2 files changed, 7 insertions, 0 deletions
diff --git a/src/plugins/platforms/fb_base/fb_base.cpp b/src/plugins/platforms/fb_base/fb_base.cpp index 389dfe5..5f71d36 100644 --- a/src/plugins/platforms/fb_base/fb_base.cpp +++ b/src/plugins/platforms/fb_base/fb_base.cpp @@ -119,6 +119,10 @@ void QPlatformSoftwareCursor::setCursor(const uchar *data, const uchar *mask, in void QPlatformSoftwareCursor::changeCursor(QCursor * widgetCursor, QWidget * widget) { +#ifdef QT_NO_CURSOR + Q_UNUSED(widgetCursor); + Q_UNUSED(widget); +#else Q_UNUSED(widget); Qt::CursorShape shape = widgetCursor->shape(); @@ -134,6 +138,7 @@ void QPlatformSoftwareCursor::changeCursor(QCursor * widgetCursor, QWidget * wid QPoint screenOffset = screen->geometry().topLeft(); // global to local translation if (onScreen || screen->geometry().intersects(currentRect.translated(screenOffset))) setDirty(); +#endif } QFbScreen::QFbScreen() : cursor(0), mGeometry(), mDepth(16), mFormat(QImage::Format_RGB16), mScreenImage(0), compositePainter(0), isUpToDate(false) diff --git a/src/plugins/platforms/linuxfb/qlinuxfbintegration.cpp b/src/plugins/platforms/linuxfb/qlinuxfbintegration.cpp index 306f1c7..64b1a2e 100644 --- a/src/plugins/platforms/linuxfb/qlinuxfbintegration.cpp +++ b/src/plugins/platforms/linuxfb/qlinuxfbintegration.cpp @@ -827,7 +827,9 @@ QLinuxFbScreen::QLinuxFbScreen(uchar * d, int w, mFormat); mFbScreenImage = new QImage(data, mGeometry.width(), mGeometry.height(), bytesPerLine, mFormat); +#ifndef QT_NO_CURSOR cursor = new QPlatformSoftwareCursor(this); +#endif } void QLinuxFbScreen::setGeometry(QRect rect) |