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

Merge remote-tracking branch 'origin/3.1'

Browse Source 
Conflicts:
	qtcreator.pri
	qtcreator.qbs
	src/libs/qmljs/qmljsmodelmanagerinterface.cpp
	src/plugins/qmldesigner/designercore/instances/nodeinstanceserverproxy.cpp

Change-Id: Ie216b715d6f87a6d72d3b8fe3d4e777e561579f9
This commit is contained in:
Eike Ziller
2014-05-02 10:00:20 +02:00
parent f4520bafac 4b2cc015f8
commit 0fb641c90e
64 changed files with 442 additions and 245 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/valgrind/memcheckerrorview.cpp
View File

@@ -198,6 +198,8 @@ static QString relativeToPath()
static QString errorLocation(const QModelIndex &index, const Error &error,
bool link = false, const QString &linkAttr = QString())
{
if (!index.isValid())
return QString();
const ErrorListModel *model = 0;
const QAbstractProxyModel *proxy = qobject_cast<const QAbstractProxyModel *>(index.model());
while (!model && proxy) {

6
src/plugins/valgrind/memchecktool.cpp
View File

@@ -48,6 +48,7 @@
#include <extensionsystem/iplugin.h>
#include <extensionsystem/pluginmanager.h>
#include <projectexplorer/deploymentdata.h>
#include <projectexplorer/projectexplorer.h>
#include <projectexplorer/project.h>
#include <projectexplorer/runconfiguration.h>
@@ -144,6 +145,11 @@ bool MemcheckErrorFilterProxyModel::filterAcceptsRow(int sourceRow, const QModel
foreach (Project *project, SessionManager::projects()) {
validFolders << project->projectDirectory();
foreach (Target *target, project->targets()) {
foreach (const ProjectExplorer::DeployableFile &file,
target->deploymentData().allFiles()) {
if (file.isExecutable())
validFolders << file.remoteDirectory();
}
foreach (BuildConfiguration *config, target->buildConfigurations())
validFolders << config->buildDirectory().toString();
}

2
src/plugins/valgrind/valgrindprocess.cpp
View File

@@ -142,7 +142,7 @@ void ValgrindProcess::run(const QString &valgrindExecutable, const QStringList &
if (m_remote.m_connection->state() != QSsh::SshConnection::Connected) {
connect(m_remote.m_connection, SIGNAL(connected()), this, SLOT(connected()));
connect(m_remote.m_connection, SIGNAL(error(QSsh::SshError)),
this, SLOT(handelError(QSsh::SshError)));
this, SLOT(handleError(QSsh::SshError)));
if (m_remote.m_connection->state() == QSsh::SshConnection::Unconnected)
m_remote.m_connection->connectToHost();
} else {

2
src/plugins/valgrind/xmlprotocol/errorlistmodel.cpp
View File

@@ -239,7 +239,7 @@ int ErrorListModel::rowCount(const QModelIndex &parent) const
{
if (parent.isValid())
return 0;
return qMax(1, d->errors.count());
return d->errors.count();
}
int ErrorListModel::columnCount(const QModelIndex &parent) const