aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/qmlprofiler
diff options
context:
space:
mode:
authorAlessandro Portale <[email protected]>2012-08-22 13:27:25 +0200
committerAlessandro Portale <[email protected]>2012-08-22 13:42:42 +0200
commitae23d50576ac076aeb22a3d56abdb5e2c1d9b327 (patch)
treec3849a2481be618e6635e27e80e7263d687480e2 /src/plugins/qmlprofiler
parentc107b10bae60abc483793ec1da55266b77630fcb (diff)
Removal of Symbian support
Qt Creator's support for Symbian was at its peak in version 2.4.x. Nobody really verified it in Qt Creator 2.5 or 2.6. It is most likely rotten. Let's remove it! Also, the Symbian support code was spread throughout the whole Qt Creator code base. The plugin interfaces evolved in the meantime and target platforms like Android or QNX have 99% of their code in separate plugins. In case anyone wants to revive Symbian support in Qt Creator, please create a plugin for it. Change-Id: I56a758a3e2fd5b8c64d9aeb8f63d8e916c4883be Reviewed-by: Alessandro Portale <[email protected]>
Diffstat (limited to 'src/plugins/qmlprofiler')
-rw-r--r--src/plugins/qmlprofiler/codaqmlprofilerrunner.cpp85
-rw-r--r--src/plugins/qmlprofiler/codaqmlprofilerrunner.h69
-rw-r--r--src/plugins/qmlprofiler/qmlprofiler.pro2
-rw-r--r--src/plugins/qmlprofiler/qmlprofiler.qbs4
-rw-r--r--src/plugins/qmlprofiler/qmlprofilerclientmanager.cpp9
-rw-r--r--src/plugins/qmlprofiler/qmlprofilerengine.cpp6
-rw-r--r--src/plugins/qmlprofiler/qmlprofilertool.cpp29
7 files changed, 3 insertions, 201 deletions
diff --git a/src/plugins/qmlprofiler/codaqmlprofilerrunner.cpp b/src/plugins/qmlprofiler/codaqmlprofilerrunner.cpp
deleted file mode 100644
index 9087833b5e3..00000000000
--- a/src/plugins/qmlprofiler/codaqmlprofilerrunner.cpp
+++ /dev/null
@@ -1,85 +0,0 @@
-/**************************************************************************
-**
-** This file is part of Qt Creator
-**
-** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies).
-**
-** Contact: http://www.qt-project.org/
-**
-**
-** GNU Lesser General Public License Usage
-**
-** This file may be used under the terms of the GNU Lesser General Public
-** License version 2.1 as published by the Free Software Foundation and
-** appearing in the file LICENSE.LGPL included in the packaging of this file.
-** Please review the following information to ensure the GNU Lesser General
-** Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** Other Usage
-**
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**************************************************************************/
-
-#include "codaqmlprofilerrunner.h"
-#include <utils/qtcassert.h>
-
-#include <projectexplorer/projectexplorerconstants.h>
-#include <projectexplorer/target.h>
-#include <extensionsystem/pluginmanager.h>
-#include <qt4projectmanager/qt-s60/s60deployconfiguration.h>
-#include <projectexplorer/runconfiguration.h>
-#include <analyzerbase/analyzerconstants.h>
-#include <qt4projectmanager/qt-s60/codaruncontrol.h>
-
-using namespace ProjectExplorer;
-using namespace Qt4ProjectManager;
-using namespace QmlProfiler::Internal;
-
-CodaQmlProfilerRunner::CodaQmlProfilerRunner(S60DeviceRunConfiguration *configuration,
- QObject *parent) :
- AbstractQmlProfilerRunner(parent),
- m_configuration(configuration),
- m_runControl(new CodaRunControl(configuration, QmlProfilerRunMode))
-{
- connect(m_runControl, SIGNAL(finished()), this, SIGNAL(stopped()));
- connect(m_runControl,
- SIGNAL(appendMessage(ProjectExplorer::RunControl*,QString,Utils::OutputFormat)),
- this, SLOT(appendMessage(ProjectExplorer::RunControl*,QString,Utils::OutputFormat)));
-}
-
-CodaQmlProfilerRunner::~CodaQmlProfilerRunner()
-{
- delete m_runControl;
-}
-
-void CodaQmlProfilerRunner::start()
-{
- QTC_ASSERT(m_runControl, return);
- m_runControl->start();
-}
-
-void CodaQmlProfilerRunner::stop()
-{
- QTC_ASSERT(m_runControl, return);
- m_runControl->stop();
-}
-
-void CodaQmlProfilerRunner::appendMessage(ProjectExplorer::RunControl *, const QString &message,
- Utils::OutputFormat format)
-{
- emit appendMessage(message, format);
-}
-
-quint16 QmlProfiler::Internal::CodaQmlProfilerRunner::debugPort() const
-{
- return m_configuration->debuggerAspect()->qmlDebugServerPort();
-}
-
diff --git a/src/plugins/qmlprofiler/codaqmlprofilerrunner.h b/src/plugins/qmlprofiler/codaqmlprofilerrunner.h
deleted file mode 100644
index 59b0979cbdc..00000000000
--- a/src/plugins/qmlprofiler/codaqmlprofilerrunner.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/**************************************************************************
-**
-** This file is part of Qt Creator
-**
-** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies).
-**
-** Contact: http://www.qt-project.org/
-**
-**
-** GNU Lesser General Public License Usage
-**
-** This file may be used under the terms of the GNU Lesser General Public
-** License version 2.1 as published by the Free Software Foundation and
-** appearing in the file LICENSE.LGPL included in the packaging of this file.
-** Please review the following information to ensure the GNU Lesser General
-** Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** Other Usage
-**
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**************************************************************************/
-
-#ifndef CODAQMLPROFILERRUNNER_H
-#define CODAQMLPROFILERRUNNER_H
-
-#include "abstractqmlprofilerrunner.h"
-
-#include <utils/environment.h>
-#include <projectexplorer/runconfiguration.h>
-#include <qt4projectmanager/qt-s60/s60devicerunconfiguration.h>
-
-namespace QmlProfiler {
-namespace Internal {
-
-class CodaQmlProfilerRunner : public AbstractQmlProfilerRunner
-{
- Q_OBJECT
-
- using AbstractQmlProfilerRunner::appendMessage; // don't hide signal
-public:
- explicit CodaQmlProfilerRunner(Qt4ProjectManager::S60DeviceRunConfiguration *configuration,
- QObject *parent = 0);
- ~CodaQmlProfilerRunner();
-
- // AbstractQmlProfilerRunner
- virtual void start();
- virtual void stop();
- virtual quint16 debugPort() const;
-
-private slots:
- void appendMessage(ProjectExplorer::RunControl *, const QString &message,
- Utils::OutputFormat format);
-private:
- Qt4ProjectManager::S60DeviceRunConfiguration *m_configuration;
- ProjectExplorer::RunControl *m_runControl;
-};
-
-} // namespace Internal
-} // namespace QmlProfiler
-
-#endif // CODAQMLPROFILERRUNNER_H
diff --git a/src/plugins/qmlprofiler/qmlprofiler.pro b/src/plugins/qmlprofiler/qmlprofiler.pro
index 1f6bf5c6940..8c98eb2c532 100644
--- a/src/plugins/qmlprofiler/qmlprofiler.pro
+++ b/src/plugins/qmlprofiler/qmlprofiler.pro
@@ -26,7 +26,6 @@ SOURCES += \
qmlprofilerengine.cpp \
qmlprofilerattachdialog.cpp \
localqmlprofilerrunner.cpp \
- codaqmlprofilerrunner.cpp \
remotelinuxqmlprofilerrunner.cpp \
qmlprofilereventview.cpp \
qmlprofilerdetailsrewriter.cpp \
@@ -48,7 +47,6 @@ HEADERS += \
qmlprofilerattachdialog.h \
abstractqmlprofilerrunner.h \
localqmlprofilerrunner.h \
- codaqmlprofilerrunner.h \
remotelinuxqmlprofilerrunner.h \
qmlprofilereventview.h \
qmlprofilerdetailsrewriter.h \
diff --git a/src/plugins/qmlprofiler/qmlprofiler.qbs b/src/plugins/qmlprofiler/qmlprofiler.qbs
index 6e2f9f2954f..92fa17e5d4b 100644
--- a/src/plugins/qmlprofiler/qmlprofiler.qbs
+++ b/src/plugins/qmlprofiler/qmlprofiler.qbs
@@ -13,7 +13,6 @@ QtcPlugin {
Depends { name: "RemoteLinux" }
Depends { name: "ProjectExplorer" }
Depends { name: "QtSupport" }
- Depends { name: "symbianutils" }
Depends { name: "TextEditor" }
Depends { name: "QmlDebug" }
Depends { name: "QmlJS" }
@@ -23,7 +22,6 @@ QtcPlugin {
Depends { name: "cpp" }
cpp.includePaths: [
"canvas",
- "../../shared/symbianutils",
"..",
"../../libs",
buildDirectory
@@ -31,8 +29,6 @@ QtcPlugin {
files: [
"abstractqmlprofilerrunner.h",
- "codaqmlprofilerrunner.cpp",
- "codaqmlprofilerrunner.h",
"localqmlprofilerrunner.cpp",
"localqmlprofilerrunner.h",
"qmlprofilerattachdialog.cpp",
diff --git a/src/plugins/qmlprofiler/qmlprofilerclientmanager.cpp b/src/plugins/qmlprofiler/qmlprofilerclientmanager.cpp
index 547f9a05727..4e7c567b08a 100644
--- a/src/plugins/qmlprofiler/qmlprofilerclientmanager.cpp
+++ b/src/plugins/qmlprofiler/qmlprofilerclientmanager.cpp
@@ -225,13 +225,8 @@ void QmlProfilerClientManager::connectToClient()
if (!d->connection || d->connection->state() != QAbstractSocket::UnconnectedState)
return;
- if (d->connectMode == QmlProfilerClientManagerPrivate::TcpConnection) {
- QmlProfilerTool::logStatus(QString("QML Profiler: Connecting to %1:%2 ...").arg(d->tcpHost, QString::number(d->tcpPort)));
- d->connection->connectToHost(d->tcpHost, d->tcpPort);
- } else {
- QmlProfilerTool::logStatus(QString("QML Profiler: Connecting to %1 ...").arg(d->tcpHost));
- d->connection->connectToOst(d->ostDevice);
- }
+ QmlProfilerTool::logStatus(QString("QML Profiler: Connecting to %1:%2 ...").arg(d->tcpHost, QString::number(d->tcpPort)));
+ d->connection->connectToHost(d->tcpHost, d->tcpPort);
}
bool QmlProfilerClientManager::isConnected() const
diff --git a/src/plugins/qmlprofiler/qmlprofilerengine.cpp b/src/plugins/qmlprofiler/qmlprofilerengine.cpp
index 32a667242d8..90e056aa78a 100644
--- a/src/plugins/qmlprofiler/qmlprofilerengine.cpp
+++ b/src/plugins/qmlprofiler/qmlprofilerengine.cpp
@@ -30,7 +30,6 @@
#include "qmlprofilerengine.h"
-#include "codaqmlprofilerrunner.h"
#include "localqmlprofilerrunner.h"
#include "remotelinuxqmlprofilerrunner.h"
@@ -42,8 +41,6 @@
#include <qmlprojectmanager/qmlprojectplugin.h>
#include <projectexplorer/localapplicationruncontrol.h>
#include <projectexplorer/applicationrunconfiguration.h>
-#include <qt4projectmanager/qt-s60/s60devicedebugruncontrol.h>
-#include <qt4projectmanager/qt-s60/s60devicerunconfiguration.h>
#include <qmldebug/qmloutputparser.h>
#include <remotelinux/remotelinuxrunconfiguration.h>
@@ -107,9 +104,6 @@ QmlProfilerEngine::QmlProfilerEnginePrivate::createRunner(ProjectExplorer::RunCo
conf.environment = rc2->environment();
conf.port = rc2->debuggerAspect()->qmlDebugServerPort();
runner = new LocalQmlProfilerRunner(conf, parent);
- } else if (Qt4ProjectManager::S60DeviceRunConfiguration *s60Config =
- qobject_cast<Qt4ProjectManager::S60DeviceRunConfiguration*>(runConfiguration)) {
- runner = new CodaQmlProfilerRunner(s60Config, parent);
} else if (RemoteLinux::RemoteLinuxRunConfiguration *rmConfig =
qobject_cast<RemoteLinux::RemoteLinuxRunConfiguration *>(runConfiguration)) {
runner = new RemoteLinuxQmlProfilerRunner(rmConfig, parent);
diff --git a/src/plugins/qmlprofiler/qmlprofilertool.cpp b/src/plugins/qmlprofiler/qmlprofilertool.cpp
index caefcd01017..0843297cd43 100644
--- a/src/plugins/qmlprofiler/qmlprofilertool.cpp
+++ b/src/plugins/qmlprofiler/qmlprofilertool.cpp
@@ -69,11 +69,6 @@
#include <coreplugin/actionmanager/actionmanager.h>
#include <coreplugin/actionmanager/actioncontainer.h>
-#include <qt4projectmanager/qt-s60/s60devicedebugruncontrol.h>
-#include <qt4projectmanager/qt-s60/s60devicerunconfiguration.h>
-#include <qt4projectmanager/qt-s60/s60deployconfiguration.h>
-#include <qt4projectmanager/qt-s60/symbianidevice.h>
-
#include <qtsupport/qtprofileinformation.h>
#include <QApplication>
@@ -253,17 +248,6 @@ IAnalyzerEngine *QmlProfilerTool::createEngine(const AnalyzerStartParameters &sp
return 0;
}
}
-
- // Check whether we should use OST instead of TCP
- if (Qt4ProjectManager::S60DeployConfiguration *deployConfig
- = qobject_cast<Qt4ProjectManager::S60DeployConfiguration*>(
- runConfiguration->target()->activeDeployConfiguration())) {
- if (deployConfig->device()->communicationChannel()
- == Qt4ProjectManager::SymbianIDevice::CommunicationCodaSerialConnection) {
- d->m_profilerConnections->setOstConnection(deployConfig->device()->serialPortName());
- isTcpConnection = false;
- }
- }
}
// FIXME: Check that there's something sensible in sp.connParams
@@ -295,8 +279,7 @@ bool QmlProfilerTool::canRun(RunConfiguration *runConfiguration, RunMode mode) c
{
if (qobject_cast<QmlProjectRunConfiguration *>(runConfiguration)
|| qobject_cast<RemoteLinuxRunConfiguration *>(runConfiguration)
- || qobject_cast<LocalApplicationRunConfiguration *>(runConfiguration)
- || qobject_cast<Qt4ProjectManager::S60DeviceRunConfiguration *>(runConfiguration))
+ || qobject_cast<LocalApplicationRunConfiguration *>(runConfiguration))
return mode == runMode();
return false;
}
@@ -345,16 +328,6 @@ AnalyzerStartParameters QmlProfilerTool::createStartParameters(RunConfiguration
sp.analyzerCmdPrefix = rc3->commandPrefix();
sp.displayName = rc3->displayName();
sp.sysroot = sysroot(rc3);
- } else if (Qt4ProjectManager::S60DeviceRunConfiguration *rc4 =
- qobject_cast<Qt4ProjectManager::S60DeviceRunConfiguration *>(runConfiguration)) {
- Qt4ProjectManager::S60DeployConfiguration *deployConf =
- qobject_cast<Qt4ProjectManager::S60DeployConfiguration *>(runConfiguration->target()->activeDeployConfiguration());
-
- sp.debuggeeArgs = rc4->commandLineArguments();
- sp.displayName = rc4->displayName();
- sp.connParams.host = deployConf->device()->address();
- sp.connParams.port = rc4->debuggerAspect()->qmlDebugServerPort();
- sp.sysroot = sysroot(rc4);
} else {
// What could that be?
QTC_ASSERT(false, return sp);