diff options
Diffstat (limited to 'src/designer/src/lib/shared/actioneditor_p.h')
-rw-r--r-- | src/designer/src/lib/shared/actioneditor_p.h | 34 |
1 files changed, 6 insertions, 28 deletions
diff --git a/src/designer/src/lib/shared/actioneditor_p.h b/src/designer/src/lib/shared/actioneditor_p.h index 2f78887ba..471d12d04 100644 --- a/src/designer/src/lib/shared/actioneditor_p.h +++ b/src/designer/src/lib/shared/actioneditor_p.h @@ -1,30 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the Qt Designer of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:GPL-EXCEPT$ -** 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 General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 as published by the Free Software -** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT -** 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-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2016 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 // // W A R N I N G @@ -88,7 +63,7 @@ public: static void setObjectNamingMode(ObjectNamingMode n) { m_objectNamingMode = n; } static QString actionTextToName(const QString &text, - const QString &prefix = QLatin1String("action")); + const QString &prefix = QLatin1StringView("action")); // Utility to create a configure button with menu for usage on toolbars static QToolButton *createConfigureMenuButton(const QString &t, QMenu **ptrToMenu); @@ -96,6 +71,8 @@ public: public slots: void setFilter(const QString &filter); void mainContainerChanged(); + void clearSelection(); + void selectAction(QAction *a); // For use by the menu editor private slots: void slotCurrentItemChanged(QAction *item); @@ -158,6 +135,7 @@ private: QString m_filter; QWidget *m_filterWidget; + bool m_withinSelectAction = false; }; } // namespace qdesigner_internal |