diff options
Diffstat (limited to 'src/plugins/platforms/cocoa/qcocoadrag.h')
| -rw-r--r-- | src/plugins/platforms/cocoa/qcocoadrag.h | 53 |
1 files changed, 13 insertions, 40 deletions
diff --git a/src/plugins/platforms/cocoa/qcocoadrag.h b/src/plugins/platforms/cocoa/qcocoadrag.h index 5a5b985c6e..dedf8a7fd9 100644 --- a/src/plugins/platforms/cocoa/qcocoadrag.h +++ b/src/plugins/platforms/cocoa/qcocoadrag.h @@ -1,46 +1,9 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the plugins of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2016 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #ifndef QCOCOADRAG_H #define QCOCOADRAG_H -#include <AppKit/AppKit.h> #include <QtGui> #include <qpa/qplatformdrag.h> #include <private/qsimpledrag_p.h> @@ -48,6 +11,12 @@ #include <QtGui/private/qdnd_p.h> #include <QtGui/private/qinternalmimedata_p.h> +#include <QtCore/qeventloop.h> + +Q_FORWARD_DECLARE_OBJC_CLASS(NSView); +Q_FORWARD_DECLARE_OBJC_CLASS(NSEvent); +Q_FORWARD_DECLARE_OBJC_CLASS(NSPasteboard); + QT_BEGIN_NAMESPACE class QCocoaDrag : public QPlatformDrag @@ -69,11 +38,15 @@ public: void setLastMouseEvent(NSEvent *event, NSView *view); void setAcceptedAction(Qt::DropAction act); + void exitDragLoop(); private: QDrag *m_drag; NSEvent *m_lastEvent; NSView *m_lastView; Qt::DropAction m_executed_drop_action; + QEventLoop *m_internalDragLoop = nullptr; + + bool maybeDragMultipleItems(); QPixmap dragPixmap(QDrag *drag, QPoint &hotSpot) const; }; @@ -86,7 +59,7 @@ public: protected: bool hasFormat_sys(const QString &mimeType) const; QStringList formats_sys() const; - QVariant retrieveData_sys(const QString &mimeType, QVariant::Type type) const; + QVariant retrieveData_sys(const QString &mimeType, QMetaType type) const; public: CFStringRef dropPasteboard; }; |