diff --git a/src/private/DragController.cpp b/src/private/DragController.cpp index 8ca1c4a5..1ffc5071 100644 --- a/src/private/DragController.cpp +++ b/src/private/DragController.cpp @@ -827,16 +827,16 @@ static QRect topLevelGeometry(const QWidget *topLevel) #endif static ViewWrapper::Ptr qtTopLevelUnderCursor_impl(QPoint globalPos, const Window::List &windows, - View *windowBeingDragged) // TODOm2: Rename to viewBeingDragged + View *rootViewBeingDragged) { for (auto i = windows.size() - 1; i >= 0; --i) { Window::Ptr window = windows.at(i); auto tl = window->rootView(); - if (!tl->isVisible() || tl->equals(windowBeingDragged) || tl->isMinimized()) + if (!tl->isVisible() || tl->equals(rootViewBeingDragged) || tl->isMinimized()) continue; - if (windowBeingDragged && windowBeingDragged->window()->equals(window)) + if (rootViewBeingDragged && rootViewBeingDragged->window()->equals(window)) continue; if (window->geometry().contains(globalPos)) { diff --git a/src/qtquick/views/View_qtquick.h b/src/qtquick/views/View_qtquick.h index f933aa03..ca37723c 100644 --- a/src/qtquick/views/View_qtquick.h +++ b/src/qtquick/views/View_qtquick.h @@ -56,6 +56,7 @@ inline std::shared_ptr asQQuickWrapper(QQuickItem *item) } + class DOCKS_EXPORT View_qtquick : public QQuickItem, public View {