feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlDesigner: hotfix for Qt 5.3.2 to ungrab the mouse

Browse Source 
At the moment the QML world does not get the release event if
a drag started in QML and ends up on QWidget world.

Hotfix: 3.2
Task-number: QTCREATORBUG-12510
Change-Id: I4f4c023e177221af61ba9e754f27a5087013fb08
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
This commit is contained in:
Tim Jenssen
2014-06-30 14:53:34 +02:00
parent 329952f5ee
commit ce96202857
2 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.cpp
View File

@@ -55,6 +55,10 @@
#include <QShortcut>
#include <QQuickItem>
#include <private/qquickwidget_p.h> // mouse ungrabbing workaround on quickitems
#include <private/qquickwindow_p.h> // mouse ungrabbing workaround on quickitems
namespace QmlDesigner {
ItemLibraryWidget::ItemLibraryWidget(QWidget *parent) :
@@ -369,6 +373,13 @@ void ItemLibraryWidget::setResourcePath(const QString &resourcePath)
updateSearch();
}
static void ungrabMouseOnQMLWorldWorkAround(QQuickWidget *quickWidget)
{
const QQuickWidgetPrivate *widgetPrivate = QQuickWidgetPrivate::get(quickWidget);
if (widgetPrivate && widgetPrivate->offscreenWindow && widgetPrivate->offscreenWindow->mouseGrabberItem())
widgetPrivate->offscreenWindow->mouseGrabberItem()->ungrabMouse();
}
void ItemLibraryWidget::startDragAndDrop(QVariant itemLibraryId)
{
m_currentitemLibraryEntry = itemLibraryId.value<ItemLibraryEntry>();
@@ -380,6 +391,8 @@ void ItemLibraryWidget::startDragAndDrop(QVariant itemLibraryId)
drag->setMimeData(mimeData);
drag->exec();
ungrabMouseOnQMLWorldWorkAround(m_itemViewQuickWidget.data());
}
void ItemLibraryWidget::removeImport(const QString &name)

1
src/plugins/qmldesigner/qmldesignerplugin.pro
View File

@@ -1,4 +1,5 @@
QT += quickwidgets
QT += widgets-private quick-private quickwidgets-private core-private gui-private #mouse ungrabbing workaround on quickitems
CONFIG += exceptions
INCLUDEPATH += $$PWD