@@ -1196,10 +1196,17 @@ QCefViewPrivate::onDragEnter(QDragEnterEvent* event)
1196
1196
CefRefPtr<CefDragData> dragData = CreateCefDragDataFromQMimeData (*(event->mimeData ()));
1197
1197
1198
1198
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
1199
1205
auto b = event->buttons ();
1200
1206
auto m = event->modifiers ();
1201
1207
e.x = event->position ().x ();
1202
1208
e.y = event->position ().y ();
1209
+ #endif
1203
1210
e.modifiers |= m & Qt::ControlModifier ? EVENTFLAG_CONTROL_DOWN : 0 ;
1204
1211
e.modifiers |= m & Qt::ShiftModifier ? EVENTFLAG_SHIFT_DOWN : 0 ;
1205
1212
e.modifiers |= m & Qt::AltModifier ? EVENTFLAG_ALT_DOWN : 0 ;
@@ -1222,10 +1229,17 @@ QCefViewPrivate::onDragMove(QDragMoveEvent* event)
1222
1229
{
1223
1230
if (isOSRModeEnabled_ && pCefBrowser_ && pCefBrowser_->GetHost ()) {
1224
1231
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
1225
1238
auto b = event->buttons ();
1226
1239
auto m = event->modifiers ();
1227
1240
e.x = event->position ().x ();
1228
1241
e.y = event->position ().y ();
1242
+ #endif
1229
1243
e.modifiers |= m & Qt::ControlModifier ? EVENTFLAG_CONTROL_DOWN : 0 ;
1230
1244
e.modifiers |= m & Qt::ShiftModifier ? EVENTFLAG_SHIFT_DOWN : 0 ;
1231
1245
e.modifiers |= m & Qt::AltModifier ? EVENTFLAG_ALT_DOWN : 0 ;
@@ -1257,12 +1271,18 @@ QCefViewPrivate::onDrop(QDropEvent* event)
1257
1271
{
1258
1272
if (isOSRModeEnabled_ && pCefBrowser_ && pCefBrowser_->GetHost ()) {
1259
1273
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
1260
1281
auto b = event->buttons ();
1261
1282
auto m = event->modifiers ();
1262
-
1263
- CefMouseEvent e;
1264
1283
e.x = event->position ().x ();
1265
1284
e.y = event->position ().y ();
1285
+ #endif
1266
1286
e.modifiers |= m & Qt::ControlModifier ? EVENTFLAG_CONTROL_DOWN : 0 ;
1267
1287
e.modifiers |= m & Qt::ShiftModifier ? EVENTFLAG_SHIFT_DOWN : 0 ;
1268
1288
e.modifiers |= m & Qt::AltModifier ? EVENTFLAG_ALT_DOWN : 0 ;
0 commit comments