diff --git a/src/plugins/projectexplorer/copytaskhandler.cpp b/src/plugins/projectexplorer/copytaskhandler.cpp index 8694050cd2f1515605a16083fc8fedc3f4b0d406..fc2ea22f89f5d31051b4f0b79600c553142455e2 100644 --- a/src/plugins/projectexplorer/copytaskhandler.cpp +++ b/src/plugins/projectexplorer/copytaskhandler.cpp @@ -33,6 +33,7 @@ #include <coreplugin/coreconstants.h> +#include <QtCore/QDir> #include <QtGui/QAction> #include <QtGui/QApplication> #include <QtGui/QClipboard> @@ -48,16 +49,18 @@ void CopyTaskHandler::handle(const ProjectExplorer::Task &task) QString type; switch (task.type) { case Task::Error: - type = tr("error: ", "Task is of type error"); + //: Task is of type: error + type = tr("error: "); break; case Task::Warning: - type = tr("warning: ", "Task is of type warning"); + //: Task is of type: warning + type = tr("warning: "); break; default: break; } - QApplication::clipboard()->setText(task.file + ':' + + QApplication::clipboard()->setText(QDir::toNativeSeparators(task.file) + ':' + QString::number(task.line) + ": " + type + task.description); } diff --git a/src/plugins/projectexplorer/gccparser.cpp b/src/plugins/projectexplorer/gccparser.cpp index 00aca2c846ba540668ca82d4646eef134fbc7301..a997133a92930be1d1edf83e13fcdc9fb1c3653b 100644 --- a/src/plugins/projectexplorer/gccparser.cpp +++ b/src/plugins/projectexplorer/gccparser.cpp @@ -32,6 +32,8 @@ #include "taskwindow.h" #include "projectexplorerconstants.h" +#include <QtCore/QDir> + using namespace ProjectExplorer; namespace { @@ -100,7 +102,7 @@ void GccParser::stdError(const QString &line) int lineno = m_regExp.cap(3).toInt(); Task task(Task::Unknown, m_regExp.cap(8) /* description */, - filename, lineno, + QDir::fromNativeSeparators(filename), lineno, Constants::TASK_CATEGORY_COMPILE); if (m_regExp.cap(7) == QLatin1String("warning")) task.type = Task::Warning; @@ -118,7 +120,7 @@ void GccParser::stdError(const QString &line) } else if (m_regExpIncluded.indexIn(lne) > -1) { emit addTask(Task(Task::Unknown, lne /* description */, - m_regExpIncluded.cap(1) /* filename */, + QDir::fromNativeSeparators(m_regExpIncluded.cap(1)) /* filename */, m_regExpIncluded.cap(3).toInt() /* linenumber */, Constants::TASK_CATEGORY_COMPILE)); return; diff --git a/src/plugins/projectexplorer/gnumakeparser.cpp b/src/plugins/projectexplorer/gnumakeparser.cpp index 0e2664bffffdc01df0fbf2e526bf84e6613f5461..1cefce09cd0da0cb6ed853be4c20671041e9bf8e 100644 --- a/src/plugins/projectexplorer/gnumakeparser.cpp +++ b/src/plugins/projectexplorer/gnumakeparser.cpp @@ -87,7 +87,7 @@ void GnuMakeParser::stdError(const QString &line) m_suppressIssues = true; addTask(Task(Task::Error, m_makefileError.cap(3), - m_makefileError.cap(1), + QDir::fromNativeSeparators(m_makefileError.cap(1)), m_makefileError.cap(2).toInt(), Constants::TASK_CATEGORY_BUILDSYSTEM)); } diff --git a/src/plugins/projectexplorer/ldparser.cpp b/src/plugins/projectexplorer/ldparser.cpp index 85a6c566440f85732c64f434bb559502c6eee4c9..f387d553f4cfa10ce29e18ea41d2965c9c76764c 100644 --- a/src/plugins/projectexplorer/ldparser.cpp +++ b/src/plugins/projectexplorer/ldparser.cpp @@ -31,6 +31,8 @@ #include "projectexplorerconstants.h" #include "taskwindow.h" +#include <QtCore/QDir> + using namespace ProjectExplorer; namespace { @@ -98,7 +100,7 @@ void LdParser::stdError(const QString &line) && !m_regExpLinker.cap(4).startsWith(QLatin1String("(.text+0x"))) filename = m_regExpLinker.cap(4); QString description = m_regExpLinker.cap(8).trimmed(); - Task task(Task::Error, description, filename, lineno, + Task task(Task::Error, description, QDir::fromNativeSeparators(filename), lineno, Constants::TASK_CATEGORY_COMPILE); if (m_regExpInFunction.indexIn(description) > -1 || description.startsWith(QLatin1String("At global scope")) || diff --git a/src/plugins/projectexplorer/linuxiccparser.cpp b/src/plugins/projectexplorer/linuxiccparser.cpp index a1038aa32d08f06fe95baeacea656605274ad647..721429a42f81df0290fbe630064da0c5a74ea308 100644 --- a/src/plugins/projectexplorer/linuxiccparser.cpp +++ b/src/plugins/projectexplorer/linuxiccparser.cpp @@ -31,7 +31,8 @@ #include "ldparser.h" #include "taskwindow.h" #include "projectexplorerconstants.h" -#include <QtCore/QDebug> + +#include <QtCore/QDir> using namespace ProjectExplorer; @@ -71,7 +72,8 @@ void LinuxIccParser::stdError(const QString &line) if (m_expectFirstLine && m_firstLine.indexIn(line) != -1) { // Clear out old task m_temporary = ProjectExplorer::Task(Task::Unknown, m_firstLine.cap(6).trimmed(), - m_firstLine.cap(1), m_firstLine.cap(2).toInt(), + QDir::fromNativeSeparators(m_firstLine.cap(1)), + m_firstLine.cap(2).toInt(), QLatin1String(Constants::TASK_CATEGORY_COMPILE)); QString category = m_firstLine.cap(4); if (category == QLatin1String("error")) diff --git a/src/plugins/qt4projectmanager/qt-s60/abldparser.cpp b/src/plugins/qt4projectmanager/qt-s60/abldparser.cpp index 4fbf4d0c782bc1778fd8a370cc20c3fc215464b8..8be4c3f7fb84bee4ae7f13247d235680385ec9a0 100644 --- a/src/plugins/qt4projectmanager/qt-s60/abldparser.cpp +++ b/src/plugins/qt4projectmanager/qt-s60/abldparser.cpp @@ -32,6 +32,8 @@ #include <projectexplorer/projectexplorerconstants.h> #include <projectexplorer/taskwindow.h> +#include <QtCore/QDir> + using namespace Qt4ProjectManager; using namespace ProjectExplorer; using namespace ProjectExplorer::Constants; @@ -73,7 +75,7 @@ void AbldParser::stdOutput(const QString &line) if (m_perlIssue.indexIn(lne) > -1) { m_waitingForStdOutContinuation = true; - m_currentFile = m_perlIssue.cap(2); + m_currentFile = QDir::fromNativeSeparators(m_perlIssue.cap(2)); m_currentLine = m_perlIssue.cap(3).toInt(); Task task(Task::Unknown, @@ -143,7 +145,7 @@ void AbldParser::stdError(const QString &line) } if (lne.startsWith(QLatin1String("MMPFILE \""))) { - m_currentFile = lne.mid(9, lne.size() - 10); + m_currentFile = QDir::fromNativeSeparators(lne.mid(9, lne.size() - 10)); m_waitingForStdErrContinuation = false; return; } diff --git a/src/plugins/qt4projectmanager/qt-s60/rvctparser.cpp b/src/plugins/qt4projectmanager/qt-s60/rvctparser.cpp index cde0deeee409b01e89c10cc424f2b790231dc9fc..1dd868e1bc15eac121386fd2e66b95e1c01cab3b 100644 --- a/src/plugins/qt4projectmanager/qt-s60/rvctparser.cpp +++ b/src/plugins/qt4projectmanager/qt-s60/rvctparser.cpp @@ -31,6 +31,8 @@ #include <projectexplorer/projectexplorerconstants.h> #include <projectexplorer/taskwindow.h> +#include <QtCore/QDir> + using namespace ProjectExplorer; using namespace ProjectExplorer::Constants; using namespace Qt4ProjectManager; @@ -80,7 +82,8 @@ void RvctParser::stdError(const QString &line) m_task = new Task(Task::Unknown, m_warningOrError.cap(5) /* description */, - m_warningOrError.cap(1) /* file */, m_warningOrError.cap(2).toInt() /* line */, + QDir::fromNativeSeparators(m_warningOrError.cap(1)) /* file */, + m_warningOrError.cap(2).toInt() /* line */, TASK_CATEGORY_COMPILE); if (m_warningOrError.cap(4) == "Warning") m_task->type = Task::Warning; diff --git a/src/plugins/qt4projectmanager/qt-s60/sbsv2parser.cpp b/src/plugins/qt4projectmanager/qt-s60/sbsv2parser.cpp index fb9f04fc64aa5becae042e867c1763b7f5bd6115..5f60d2997157f6555306b61b148f4c95611e6d50 100644 --- a/src/plugins/qt4projectmanager/qt-s60/sbsv2parser.cpp +++ b/src/plugins/qt4projectmanager/qt-s60/sbsv2parser.cpp @@ -65,7 +65,7 @@ void SbsV2Parser::stdOutput(const QString &line) { // Eat most output! if (line.startsWith(QLatin1String("sbs: build log in "))) { - QString logfile = line.mid(18).trimmed(); + QString logfile = QDir::fromNativeSeparators(line.mid(18).trimmed()); parseLogFile(logfile); addTask(ProjectExplorer::Task(Task::Unknown, tr("SBSv2 build log"), logfile, -1, diff --git a/src/plugins/qt4projectmanager/qt-s60/winscwparser.cpp b/src/plugins/qt4projectmanager/qt-s60/winscwparser.cpp index 9d1522fe98edf18ddb8cda10601bd5ac9b0c46a2..0d04793f65b26eccd0b2729fb430c66a5b414f02 100644 --- a/src/plugins/qt4projectmanager/qt-s60/winscwparser.cpp +++ b/src/plugins/qt4projectmanager/qt-s60/winscwparser.cpp @@ -31,6 +31,8 @@ #include <projectexplorer/projectexplorerconstants.h> #include <projectexplorer/taskwindow.h> +#include <QtCore/QDir> + using namespace Qt4ProjectManager; using namespace ProjectExplorer; using namespace ProjectExplorer::Constants; @@ -54,7 +56,7 @@ void WinscwParser::stdOutput(const QString &line) if (m_compilerProblem.indexIn(lne) > -1) { Task task(Task::Error, m_compilerProblem.cap(3) /* description */, - m_compilerProblem.cap(1) /* filename */, + QDir::fromNativeSeparators(m_compilerProblem.cap(1)) /* filename */, m_compilerProblem.cap(2).toInt() /* linenumber */, TASK_CATEGORY_COMPILE); if (task.description.startsWith(QLatin1String("warning: "))) { @@ -74,7 +76,7 @@ void WinscwParser::stdError(const QString &line) if (m_linkerProblem.indexIn(lne) > -1) { emit addTask(Task(Task::Error, m_linkerProblem.cap(2) /* description */, - m_linkerProblem.cap(1) /* filename */, + QDir::fromNativeSeparators(m_linkerProblem.cap(1)) /* filename */, -1 /* linenumber */, TASK_CATEGORY_COMPILE)); return; diff --git a/src/plugins/tasklist/tasklistplugin.cpp b/src/plugins/tasklist/tasklistplugin.cpp index f3573828bb4a3d3e6b07b1a03bf7ccd0d6f5f15a..4ed60440d8a6cadee8f6e9a741cfbb61470fdc90 100644 --- a/src/plugins/tasklist/tasklistplugin.cpp +++ b/src/plugins/tasklist/tasklistplugin.cpp @@ -41,6 +41,7 @@ #include <projectexplorer/task.h> #include <projectexplorer/taskhub.h> +#include <QtCore/QDir> #include <QtCore/QStringList> #include <QtCore/QtPlugin> @@ -105,6 +106,7 @@ public: description = chunks.at(3); } if (!file.isEmpty()) { + file = QDir::fromNativeSeparators(file); QFileInfo fi(file); if (fi.isRelative() && context) { QString fullPath = context->projectDirectory() + '/' + file;