Skip to content

Commit 4528891

Browse files
committed
fix: fix build errors with Qt 5
1 parent dc37155 commit 4528891

File tree

2 files changed

+25
-5
lines changed

2 files changed

+25
-5
lines changed

src/details/QCefViewPrivate.cpp

Lines changed: 22 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1196,10 +1196,17 @@ QCefViewPrivate::onDragEnter(QDragEnterEvent* event)
11961196
CefRefPtr<CefDragData> dragData = CreateCefDragDataFromQMimeData(*(event->mimeData()));
11971197

11981198
CefMouseEvent e;
1199+
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
1200+
auto b = event->mouseButtons();
1201+
auto m = event->keyboardModifiers();
1202+
e.x = event->pos().x();
1203+
e.y = event->pos().y();
1204+
#else
11991205
auto b = event->buttons();
12001206
auto m = event->modifiers();
12011207
e.x = event->position().x();
12021208
e.y = event->position().y();
1209+
#endif
12031210
e.modifiers |= m & Qt::ControlModifier ? EVENTFLAG_CONTROL_DOWN : 0;
12041211
e.modifiers |= m & Qt::ShiftModifier ? EVENTFLAG_SHIFT_DOWN : 0;
12051212
e.modifiers |= m & Qt::AltModifier ? EVENTFLAG_ALT_DOWN : 0;
@@ -1222,10 +1229,17 @@ QCefViewPrivate::onDragMove(QDragMoveEvent* event)
12221229
{
12231230
if (isOSRModeEnabled_ && pCefBrowser_ && pCefBrowser_->GetHost()) {
12241231
CefMouseEvent e;
1232+
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
1233+
auto b = event->mouseButtons();
1234+
auto m = event->keyboardModifiers();
1235+
e.x = event->pos().x();
1236+
e.y = event->pos().y();
1237+
#else
12251238
auto b = event->buttons();
12261239
auto m = event->modifiers();
12271240
e.x = event->position().x();
12281241
e.y = event->position().y();
1242+
#endif
12291243
e.modifiers |= m & Qt::ControlModifier ? EVENTFLAG_CONTROL_DOWN : 0;
12301244
e.modifiers |= m & Qt::ShiftModifier ? EVENTFLAG_SHIFT_DOWN : 0;
12311245
e.modifiers |= m & Qt::AltModifier ? EVENTFLAG_ALT_DOWN : 0;
@@ -1257,12 +1271,18 @@ QCefViewPrivate::onDrop(QDropEvent* event)
12571271
{
12581272
if (isOSRModeEnabled_ && pCefBrowser_ && pCefBrowser_->GetHost()) {
12591273

1274+
CefMouseEvent e;
1275+
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
1276+
auto b = event->mouseButtons();
1277+
auto m = event->keyboardModifiers();
1278+
e.x = event->pos().x();
1279+
e.y = event->pos().y();
1280+
#else
12601281
auto b = event->buttons();
12611282
auto m = event->modifiers();
1262-
1263-
CefMouseEvent e;
12641283
e.x = event->position().x();
12651284
e.y = event->position().y();
1285+
#endif
12661286
e.modifiers |= m & Qt::ControlModifier ? EVENTFLAG_CONTROL_DOWN : 0;
12671287
e.modifiers |= m & Qt::ShiftModifier ? EVENTFLAG_SHIFT_DOWN : 0;
12681288
e.modifiers |= m & Qt::AltModifier ? EVENTFLAG_ALT_DOWN : 0;

src/details/utils/DragAndDropUtils.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -144,12 +144,12 @@ CreateQMimeDataFromCefDragData(CefDragData& dragData)
144144

145145
CefString fragmentText = dragData.GetFragmentText();
146146
if (!fragmentText.empty()) {
147-
mimeData->setText(QString::fromUtf8(fragmentText.ToString()));
147+
mimeData->setText(QString::fromStdString(fragmentText.ToString()));
148148
}
149149

150150
CefString fragmentHtml = dragData.GetFragmentHtml();
151151
if (!fragmentHtml.empty()) {
152-
mimeData->setHtml(QString::fromUtf8(fragmentHtml.ToString()));
152+
mimeData->setHtml(QString::fromStdString(fragmentHtml.ToString()));
153153
}
154154

155155
// CefString fragmentBaseUrl = dragData.GetFragmentBaseURL();
@@ -159,7 +159,7 @@ CreateQMimeDataFromCefDragData(CefDragData& dragData)
159159

160160
CefString link = dragData.GetLinkURL();
161161
if (!link.empty()) {
162-
urls.append(QString::fromUtf8(link.ToString()));
162+
urls.append(QString::fromStdString(link.ToString()));
163163
}
164164

165165
size_t bufferSize = dragData.GetFileContents(nullptr);

0 commit comments

Comments
 (0)