diff options
Diffstat (limited to 'src/quick/items')
| -rw-r--r-- | src/quick/items/context2d/qquickcanvasitem.cpp | 2 | ||||
| -rw-r--r-- | src/quick/items/qquickdrag.cpp | 6 | ||||
| -rw-r--r-- | src/quick/items/qquickwindowmodule.cpp | 4 |
3 files changed, 8 insertions, 4 deletions
diff --git a/src/quick/items/context2d/qquickcanvasitem.cpp b/src/quick/items/context2d/qquickcanvasitem.cpp index 11aff9b95d..cb694c499a 100644 --- a/src/quick/items/context2d/qquickcanvasitem.cpp +++ b/src/quick/items/context2d/qquickcanvasitem.cpp @@ -277,7 +277,7 @@ QQuickCanvasItemPrivate::~QQuickCanvasItemPrivate() \section1 Tips for Porting Existing HTML5 Canvas Applications - Although the Canvas item is provides a HTML5 like API, HTML5 canvas + Although the Canvas item provides an HTML5-like API, HTML5 canvas applications need to be modified to run in the Canvas item: \list \li Replace all DOM API calls with QML property bindings or Canvas item methods. diff --git a/src/quick/items/qquickdrag.cpp b/src/quick/items/qquickdrag.cpp index 64e46d1762..4d46485718 100644 --- a/src/quick/items/qquickdrag.cpp +++ b/src/quick/items/qquickdrag.cpp @@ -33,6 +33,9 @@ #include "qquickdrag_p.h" +#include <private/qguiapplication_p.h> +#include <qpa/qplatformintegration.h> +#include <qpa/qplatformdrag.h> #include <private/qquickitem_p.h> #include <QtQuick/private/qquickevents_p_p.h> #include <private/qquickitemchangelistener_p.h> @@ -724,7 +727,8 @@ Qt::DropAction QQuickDragAttachedPrivate::startDrag(Qt::DropActions supportedAct Qt::DropAction dropAction = drag->exec(supportedActions); - delete drag; + if (!QGuiApplicationPrivate::platformIntegration()->drag()->ownsDragObject()) + drag->deleteLater(); deliverLeaveEvent(); diff --git a/src/quick/items/qquickwindowmodule.cpp b/src/quick/items/qquickwindowmodule.cpp index 414f068285..5c66a2ef84 100644 --- a/src/quick/items/qquickwindowmodule.cpp +++ b/src/quick/items/qquickwindowmodule.cpp @@ -143,9 +143,9 @@ void QQuickWindowQmlImpl::setWindowVisibility() error.setObject(this); const QQmlContextData* urlContext = data->context; - while (urlContext && urlContext->url.isEmpty()) + while (urlContext && urlContext->url().isEmpty()) urlContext = urlContext->parent; - error.setUrl(urlContext ? urlContext->url : QUrl()); + error.setUrl(urlContext ? urlContext->url() : QUrl()); QString objectId = data->context->findObjectId(this); if (!objectId.isEmpty()) |