feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Analyzer: Move toolbar icon specification down to individual RunControls

Browse Source 
Giving individual RunControls the freedom back to decide what they want,
even if they currrently decide to use the same one.

Change-Id: Ia2acf4b9d32d23c486339b2488611038672aba25
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
This commit is contained in:
hjk
2016-05-30 16:56:46 +02:00
parent a8a1b3b573
commit 0cf9b6e956
5 changed files with 17 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/plugins/qmlprofiler/qmlprofilerruncontrol.cpp
View File

@@ -31,17 +31,21 @@
#include <debugger/analyzer/analyzerstartparameters.h>
#include <coreplugin/icore.h>
#include <utils/qtcassert.h>
#include <coreplugin/helpmanager.h>
#include <projectexplorer/projectexplorerconstants.h>
#include <projectexplorer/kitinformation.h>
#include <projectexplorer/target.h>
#include <projectexplorer/environmentaspect.h>
#include <projectexplorer/kitinformation.h>
#include <projectexplorer/localapplicationruncontrol.h>
#include <projectexplorer/projectexplorerconstants.h>
#include <projectexplorer/projectexplorericons.h>
#include <projectexplorer/runnables.h>
#include <projectexplorer/target.h>
#include <qtsupport/qtsupportconstants.h>
#include <qmldebug/qmloutputparser.h>
#include <utils/qtcassert.h>
#include <QMainWindow>
#include <QMessageBox>
#include <QTimer>
@@ -79,6 +83,8 @@ QmlProfilerRunControl::QmlProfilerRunControl(RunConfiguration *runConfiguration,
: AnalyzerRunControl(runConfiguration, ProjectExplorer::Constants::QML_PROFILER_RUN_MODE)
, d(new QmlProfilerRunControlPrivate)
{
setIcon(ProjectExplorer::Icons::ANALYZER_START_SMALL_TOOLBAR);
d->m_tool = tool;
// Only wait 4 seconds for the 'Waiting for connection' on application output, then just try to connect
// (application output might be redirected / blocked)