Commit 2d4e1df9 authored by Friedemann Kleint's avatar Friedemann Kleint
Browse files

Merge remote branch 'origin/2.2'

parents f9db43d8 219c3372
......@@ -482,7 +482,7 @@ void JSDebuggerAgentPrivate::messageReceived(const QByteArray &message)
fileNameToBreakpoints.clear();
foreach (const JSAgentBreakpointData &bp, breakpoints) {
fileNameToBreakpoints.insert(fileName(bp.fileUrl), bp);
fileNameToBreakpoints.insertMulti(fileName(bp.fileUrl), bp);
}
//qDebug() << "BREAKPOINTS";
......
......@@ -406,11 +406,6 @@ bool PathChooser::validatePath(const QString &path, QString *errorMessage)
{
QString expandedPath = m_d->expandedPath(path);
QString displayPath = expandedPath;
if (expandedPath.isEmpty())
//: Selected path is not valid:
displayPath = tr("<not valid>");
if (expandedPath.isEmpty()) {
if (errorMessage)
*errorMessage = tr("The path must not be empty.");
......@@ -495,7 +490,10 @@ QString PathChooser::homePath()
void PathChooser::setExpectedKind(Kind expected)
{
if (m_d->m_acceptingKind == expected)
return;
m_d->m_acceptingKind = expected;
m_d->m_lineEdit->triggerChanged();
}
PathChooser::Kind PathChooser::expectedKind() const
......
......@@ -41,10 +41,10 @@
#include <utils/qtcassert.h>
#include <QTcpServer>
#include <QTcpSocket>
#include <QEventLoop>
#include <QNetworkInterface>
#include <QtNetwork/QTcpServer>
#include <QtNetwork/QTcpSocket>
#include <QtNetwork/QNetworkInterface>
#include <QtCore/QEventLoop>
using namespace Valgrind::Memcheck;
......
......@@ -35,9 +35,9 @@
#include "valgrindprocess.h"
#include <QDebug>
#include <QEventLoop>
#include <QFileInfo>
#include <QtCore/QDebug>
#include <QtCore/QEventLoop>
#include <QtCore/QFileInfo>
namespace Valgrind {
namespace Internal {
......
......@@ -40,7 +40,7 @@
#include <utils/environment.h>
#include <QEventLoop>
#include <QtCore/QEventLoop>
using namespace Valgrind;
......@@ -250,4 +250,4 @@ void ValgrindRunner::stop()
{
if (d->process)
d->process->close();
}
\ No newline at end of file
}
......@@ -36,7 +36,7 @@
#ifndef VALGRIND_RUNNER_H
#define VALGRIND_RUNNER_H
#include <QProcess>
#include <QtCore/QProcess>
#include "valgrind_global.h"
......
......@@ -36,8 +36,8 @@
#include "announcethread.h"
#include "frame.h"
#include <QSharedData>
#include <QVector>
#include <QtCore/QSharedData>
#include <QtCore/QVector>
#include <algorithm>
......
......@@ -38,7 +38,7 @@
#include "../valgrind_global.h"
#include <QSharedDataPointer>
#include <QtCore/QSharedDataPointer>
QT_BEGIN_NAMESPACE
template <typename T> class QVector;
......
......@@ -38,12 +38,12 @@
#include "stack.h"
#include "suppression.h"
#include <QSharedData>
#include <QString>
#include <QTextStream>
#include <QVector>
#include <QtCore/QSharedData>
#include <QtCore/QString>
#include <QtCore/QTextStream>
#include <QtCore/QVector>
#include <QtAlgorithms>
#include <QtCore/QtAlgorithms>
using namespace Valgrind;
using namespace Valgrind::XmlProtocol;
......
......@@ -38,8 +38,8 @@
#include "../valgrind_global.h"
#include <QMetaType>
#include <QSharedDataPointer>
#include <QtCore/QMetaType>
#include <QtCore/QSharedDataPointer>
QT_BEGIN_NAMESPACE
class QString;
......
......@@ -40,8 +40,8 @@
#include "modelhelpers.h"
#include <utils/qtcassert.h>
#include <QDir>
#include <QVector>
#include <QtCore/QDir>
#include <QtCore/QVector>
using namespace Valgrind;
using namespace Valgrind::XmlProtocol;
......
......@@ -38,8 +38,8 @@
#include "../valgrind_global.h"
#include <QAbstractItemModel>
#include <QSharedPointer>
#include <QtCore/QAbstractItemModel>
#include <QtCore/QSharedPointer>
namespace Valgrind {
namespace XmlProtocol {
......
......@@ -35,9 +35,8 @@
#include "frame.h"
#include <QString>
#include <QtAlgorithms>
#include <QtCore/QString>
#include <QtCore/QtAlgorithms>
using namespace Valgrind;
using namespace Valgrind::XmlProtocol;
......
......@@ -38,7 +38,7 @@
#include "../valgrind_global.h"
#include <QSharedDataPointer>
#include <QtCore/QSharedDataPointer>
namespace Valgrind {
namespace XmlProtocol {
......
......@@ -36,9 +36,9 @@
#include "stack.h"
#include "frame.h"
#include <QSharedData>
#include <QString>
#include <QVector>
#include <QtCore/QSharedData>
#include <QtCore/QString>
#include <QtCore/QVector>
#include <algorithm>
......
......@@ -38,7 +38,7 @@
#include "../valgrind_global.h"
#include <QSharedDataPointer>
#include <QtCore/QSharedDataPointer>
QT_BEGIN_NAMESPACE
template <typename T> class QVector;
......
......@@ -37,11 +37,12 @@
#include "error.h"
#include "frame.h"
#include "stack.h"
#include "modelhelpers.h"
#include <utils/qtcassert.h>
#include <QDir>
#include <QVector>
#include "modelhelpers.h"
#include <QtCore/QDir>
#include <QtCore/QVector>
using namespace Valgrind;
using namespace Valgrind::XmlProtocol;
......
......@@ -38,7 +38,7 @@
#include "../valgrind_global.h"
#include <QAbstractItemModel>
#include <QtCore/QAbstractItemModel>
namespace Valgrind {
namespace XmlProtocol {
......
......@@ -35,8 +35,8 @@
#include "status.h"
#include <QSharedData>
#include <QString>
#include <QtCore/QSharedData>
#include <QtCore/QString>
using namespace Valgrind;
using namespace Valgrind::XmlProtocol;
......
......@@ -38,8 +38,8 @@
#include "../valgrind_global.h"
#include <QMetaType>
#include <QSharedDataPointer>
#include <QtCore/QMetaType>
#include <QtCore/QSharedDataPointer>
QT_BEGIN_NAMESPACE
class QString;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment