forked from qt-creator/qt-creator
Pass the parent calling object to the addAction() functions and use a queued connection. This prevents the following sequence of events: 1. The menu is dismissed when selecting a menu item. 2. The deletion gets queued via deleteLater(). 2. The onTriggered action gets invoked and opens a dialog box. 3. The dialog box triggers the events to be processed. 4. The menu is deleted when processing the events, while still in the event function to handle the dismissal. This only affected the watch menu since the others were leaked. Added cleanup handlers for the other debugger menus to avoid leaking them. Task-number: QTCREATORBUG-26989 Change-Id: Ifa2c52d7bea884c55d43fa545e3e2870301e4052 Reviewed-by: hjk <hjk@qt.io>
71 lines
2.3 KiB
C++
71 lines
2.3 KiB
C++
/****************************************************************************
|
|
**
|
|
** Copyright (C) 2016 The Qt Company Ltd.
|
|
** Contact: https://www.qt.io/licensing/
|
|
**
|
|
** This file is part of Qt Creator.
|
|
**
|
|
** 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.
|
|
**
|
|
****************************************************************************/
|
|
|
|
#pragma once
|
|
|
|
#include "debuggerconstants.h"
|
|
|
|
#include <projectexplorer/abi.h>
|
|
|
|
#include <functional>
|
|
|
|
QT_BEGIN_NAMESPACE
|
|
class QObject;
|
|
class QWidget;
|
|
class QMenu;
|
|
class QAction;
|
|
QT_END_NAMESPACE
|
|
|
|
namespace Utils { class BaseTreeView; }
|
|
|
|
namespace Debugger {
|
|
namespace Internal {
|
|
|
|
enum TestCases
|
|
{
|
|
// Gdb
|
|
TestNoBoundsOfCurrentFunction = 1
|
|
};
|
|
|
|
// Some convenience.
|
|
void openTextEditor(const QString &titlePattern, const QString &contents);
|
|
|
|
bool isTestRun();
|
|
|
|
QAction *addAction(const QObject *parent, QMenu *menu, const QString &display, bool on,
|
|
const std::function<void()> &onTriggered = {});
|
|
QAction *addAction(const QObject *parent, QMenu *menu, const QString &d1, const QString &d2, bool on,
|
|
const std::function<void()> &onTriggered);
|
|
QAction *addCheckableAction(const QObject *parent, QMenu *menu, const QString &display, bool on,
|
|
bool checked, const std::function<void()> &onTriggered);
|
|
|
|
// Qt's various build paths for unpatched versions
|
|
QStringList qtBuildPaths();
|
|
|
|
QWidget *addSearch(Utils::BaseTreeView *treeView);
|
|
|
|
} // namespace Internal
|
|
} // namespace Debugger
|