diff options
author | Ulf Hermann <ulf.hermann@qt.io> | 2018-05-28 16:21:03 +0200 |
---|---|---|
committer | Ulf Hermann <ulf.hermann@qt.io> | 2018-05-29 12:14:58 +0000 |
commit | 6b9ff15ad5b0e1082dae2e6819b75448e08a6d60 (patch) | |
tree | ac24b15acf5362078827efaead69c54dfb67dec4 /src/plugins/qmlprofiler/qmlprofileractions.h | |
parent | a741b7300f1a3da8fd9b47fad64654669095b203 (diff) | |
download | qt-creator-6b9ff15ad5b0e1082dae2e6819b75448e08a6d60.tar.gz |
QmlProfiler: Move action registration out of QmlProfilerTool
This enables us to have multiple QmlProfilerTool instances without
conflicting action registrations. Ultimately there should be a way to
unregister actions, or to add some extra description on which tool
instance they refer to, but this is a minimal first step.
The main problem this fixes for now is the warnings generated by the
tests.
Change-Id: I2193fc48a5a68c52f46e5567919f3035bc93df36
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Diffstat (limited to 'src/plugins/qmlprofiler/qmlprofileractions.h')
-rw-r--r-- | src/plugins/qmlprofiler/qmlprofileractions.h | 57 |
1 files changed, 57 insertions, 0 deletions
diff --git a/src/plugins/qmlprofiler/qmlprofileractions.h b/src/plugins/qmlprofiler/qmlprofileractions.h new file mode 100644 index 0000000000..2a0b80eea3 --- /dev/null +++ b/src/plugins/qmlprofiler/qmlprofileractions.h @@ -0,0 +1,57 @@ +/**************************************************************************** +** +** Copyright (C) 2018 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 <coreplugin/actionmanager/actioncontainer.h> + +#include <QObject> +#include <QAction> + +#include <memory> + +namespace QmlProfiler { +namespace Internal { + +class QmlProfilerTool; +class QmlProfilerActions : public QObject +{ + Q_OBJECT +public: + explicit QmlProfilerActions(QObject *parent = nullptr); + + void attachToTool(QmlProfilerTool *tool); + void registerActions(); + +private: + std::unique_ptr<Core::ActionContainer> m_options; + std::unique_ptr<QAction> m_loadQmlTrace; + std::unique_ptr<QAction> m_saveQmlTrace; + std::unique_ptr<QAction> m_runAction; + std::unique_ptr<QAction> m_attachAction; +}; + +} // namespace Internal +} // namespace QmlProfiler |