diff options
Diffstat (limited to 'src/gui/kernel/qplatformmenu_p.h')
-rw-r--r-- | src/gui/kernel/qplatformmenu_p.h | 58 |
1 files changed, 14 insertions, 44 deletions
diff --git a/src/gui/kernel/qplatformmenu_p.h b/src/gui/kernel/qplatformmenu_p.h index 05e17051ba..00e3fa56da 100644 --- a/src/gui/kernel/qplatformmenu_p.h +++ b/src/gui/kernel/qplatformmenu_p.h @@ -1,41 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2020 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the QtGui module 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) 2020 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 QPLATFORMMENU_P_H #define QPLATFORMMENU_P_H @@ -53,32 +17,38 @@ #include <QtGui/private/qtguiglobal_p.h> +#include <QtCore/qnativeinterface.h> + QT_BEGIN_NAMESPACE -// ----------------- QPlatformInterface ----------------- +// ----------------- QNativeInterface ----------------- +#if !defined(Q_OS_MACOS) && defined(Q_QDOC) +typedef void NSMenu; +#else QT_END_NAMESPACE Q_FORWARD_DECLARE_OBJC_CLASS(NSMenu); QT_BEGIN_NAMESPACE +#endif -namespace QPlatformInterface::Private { +namespace QNativeInterface::Private { -#if defined(Q_OS_MACOS) +#if defined(Q_OS_MACOS) || defined(Q_QDOC) struct Q_GUI_EXPORT QCocoaMenu { - QT_DECLARE_PLATFORM_INTERFACE(QCocoaMenu) + QT_DECLARE_NATIVE_INTERFACE(QCocoaMenu) virtual NSMenu *nsMenu() const = 0; virtual void setAsDockMenu() const = 0; }; struct Q_GUI_EXPORT QCocoaMenuBar { - QT_DECLARE_PLATFORM_INTERFACE(QCocoaMenuBar) + QT_DECLARE_NATIVE_INTERFACE(QCocoaMenuBar) virtual NSMenu *nsMenu() const = 0; }; #endif -} // QPlatformInterface::Private +} // QNativeInterface::Private QT_END_NAMESPACE |