From 40760383969022be5488bb180dc7e1f8babcc0eb Mon Sep 17 00:00:00 2001 From: Romain Pokrzywka Date: Sun, 15 Jan 2012 23:53:01 -0600 Subject: Fix compilation when QT_NO_CURSOR is defined Change-Id: Iacf8ef2032d5c229a7483d6993120684ee9bb04e Reviewed-by: Jeremy Katz --- src/plugins/platforms/fb_base/fb_base.cpp | 5 +++++ src/plugins/platforms/linuxfb/qlinuxfbintegration.cpp | 2 ++ 2 files changed, 7 insertions(+) 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) -- cgit v0.12