whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fb platforms: migrate to fbconvenience changes 

Task-number: QTBUG-56306
Change-Id: Ia0f48e139ba2c1f8f2167afa145d808093cd3e83
Reviewed-by: Andy Nichols <andy.nichols@qt.io>
bb10
Laszlo Agocs 2016-10-10 10:04:08 +02:00
parent e6dd52f836
commit d92e984cb7
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/platforms/bsdfb/qbsdfbscreen.cpp
View File

@ -243,7 +243,7 @@ QRegion QBsdFbScreen::doRedraw()
const auto rects = touched.rects();
for (const QRect &rect : rects)
m_blitter->drawImage(rect, *mScreenImage, rect);
m_blitter->drawImage(rect, mScreenImage, rect);
return touched;
}

2
src/plugins/platforms/linuxfb/qlinuxfbscreen.cpp
View File

@ -414,7 +414,7 @@ QRegion QLinuxFbScreen::doRedraw()
mBlitter->setCompositionMode(QPainter::CompositionMode_Source);
for (const QRect &rect : touched)
mBlitter->drawImage(rect, *mScreenImage, rect);
mBlitter->drawImage(rect, mScreenImage, rect);
return touched;
}

8
src/plugins/platforms/vnc/qvncscreen.cpp
View File

@ -150,10 +150,10 @@ QPixmap QVncScreen::grabWindow(WId wid, int x, int y, int width, int height) con
{
if (!wid) {
if (width < 0)
width = mScreenImage->width() - x;
width = mScreenImage.width() - x;
if (height < 0)
height = mScreenImage->height() - y;
return QPixmap::fromImage(*mScreenImage).copy(x, y, width, height);
height = mScreenImage.height() - y;
return QPixmap::fromImage(mScreenImage).copy(x, y, width, height);
}
QFbWindow *window = windowForId(wid);
@ -165,7 +165,7 @@ QPixmap QVncScreen::grabWindow(WId wid, int x, int y, int width, int height) con
height = geom.height() - y;
QRect rect(geom.topLeft() + QPoint(x, y), QSize(width, height));
rect &= window->geometry();
return QPixmap::fromImage(*mScreenImage).copy(rect);
return QPixmap::fromImage(mScreenImage).copy(rect);
}
return QPixmap();

2
src/plugins/platforms/vnc/qvncscreen.h
View File

@ -64,7 +64,7 @@ public:
QPixmap grabWindow(WId wid, int x, int y, int width, int height) const Q_DECL_OVERRIDE;
QRegion doRedraw() Q_DECL_OVERRIDE;
QImage *image() const { return mScreenImage; }
QImage *image() { return &mScreenImage; }
void enableClientCursor(QVncClient *client);
void disableClientCursor(QVncClient *client);