Skip to content

Commit 11af012

Browse files
committed
changed using QPixmap::grabWidget to QWidget::grab() for Qt5
1 parent 9238611 commit 11af012

File tree

3 files changed

+20
-4
lines changed

3 files changed

+20
-4
lines changed

src/webdriver/extension_qt/q_view_executor.cc

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,8 +109,13 @@ void QViewCmdExecutor::GetScreenShot(std::string* png, Error** error) {
109109
QWidget* view = getView(view_id_, error);
110110
if (NULL == view)
111111
return;
112-
113-
QPixmap pixmap = QPixmap::grabWidget(view);
112+
113+
QPixmap pixmap;
114+
if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)) {
115+
pixmap = view->grab();
116+
} else {
117+
pixmap = QPixmap::grabWidget(view);
118+
}
114119

115120
saveScreenshot(pixmap, png, error);
116121
}

src/webdriver/extension_qt/web_view_executor.cc

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,13 @@ void QWebViewCmdExecutor::GetElementScreenShot(const ElementId& element, std::st
129129
if (*error)
130130
return;
131131

132-
QPixmap pixmap = QPixmap::grabWidget(view_);
132+
QPixmap pixmap;
133+
134+
if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)) {
135+
pixmap = view_->grab();
136+
} else {
137+
pixmap = QPixmap::grabWidget(view_);
138+
}
133139

134140
QRect viewRect = pixmap.rect();
135141
QRect elementRect(location.x(), location.y(), size.width(), size.height());

src/webdriver/extension_qt/widget_view_executor.cc

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,12 @@ void QWidgetViewCmdExecutor::GetElementScreenShot(const ElementId& element, std:
200200
const FilePath::CharType kPngFileName[] = FILE_PATH_LITERAL("./screen.png");
201201
FilePath path = session_->temp_dir().Append(kPngFileName);;
202202

203-
QPixmap pixmap = QPixmap::grabWidget(pWidget);
203+
QPixmap pixmap;
204+
if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)) {
205+
pixmap = pWidget->grab();
206+
} else {
207+
pixmap = QPixmap::grabWidget(pWidget);
208+
}
204209

205210
#if defined(OS_WIN)
206211
session_->logger().Log(kInfoLogLevel, "Save screenshot to - " + path.MaybeAsASCII());

0 commit comments

Comments
 (0)