diff options
| author | Tobias Hunger <tobias.hunger@nokia.com> | 2011-06-30 13:16:15 +0200 |
|---|---|---|
| committer | Tobias Hunger <tobias.hunger@nokia.com> | 2011-06-30 18:16:52 +0200 |
| commit | 368f259d5e58e00986dec8ff2c8c41da92ba8751 (patch) | |
| tree | 53a4513fc0ef463bb1dcdfeffeb2daacf5c79240 /src/plugins/qt4projectmanager/qt-s60 | |
| parent | d0de83d9bd76dfea14aac85bf4a5687c001c2850 (diff) | |
| download | qt-creator-368f259d5e58e00986dec8ff2c8c41da92ba8751.tar.gz | |
Fix unit test
Change-Id: Ifb825f44aed8a0df90177a8d75ff6cc579df4d7a
Reviewed-on: http://codereview.qt.nokia.com/951
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
Diffstat (limited to 'src/plugins/qt4projectmanager/qt-s60')
4 files changed, 5 insertions, 13 deletions
diff --git a/src/plugins/qt4projectmanager/qt-s60/abldparser.cpp b/src/plugins/qt4projectmanager/qt-s60/abldparser.cpp index c54786eec2..504ac65200 100644 --- a/src/plugins/qt4projectmanager/qt-s60/abldparser.cpp +++ b/src/plugins/qt4projectmanager/qt-s60/abldparser.cpp @@ -35,8 +35,6 @@ #include <projectexplorer/projectexplorerconstants.h> #include <projectexplorer/taskwindow.h> -#include <QtCore/QDir> - using namespace Qt4ProjectManager; using namespace ProjectExplorer; using namespace ProjectExplorer::Constants; @@ -78,7 +76,7 @@ void AbldParser::stdOutput(const QString &line) if (m_perlIssue.indexIn(lne) > -1) { m_waitingForStdOutContinuation = true; - m_currentFile = QDir::fromNativeSeparators(m_perlIssue.cap(2)); + m_currentFile = m_perlIssue.cap(2); m_currentLine = m_perlIssue.cap(3).toInt(); Task task(Task::Unknown, @@ -148,7 +146,7 @@ void AbldParser::stdError(const QString &line) } if (lne.startsWith(QLatin1String("MMPFILE \""))) { - m_currentFile = QDir::fromNativeSeparators(lne.mid(9, lne.size() - 10)); + m_currentFile = 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 54b1e4ecfb..c783b4abc2 100644 --- a/src/plugins/qt4projectmanager/qt-s60/rvctparser.cpp +++ b/src/plugins/qt4projectmanager/qt-s60/rvctparser.cpp @@ -34,8 +34,6 @@ #include <projectexplorer/projectexplorerconstants.h> #include <projectexplorer/taskwindow.h> -#include <QtCore/QDir> - using namespace ProjectExplorer; using namespace ProjectExplorer::Constants; using namespace Qt4ProjectManager; @@ -85,7 +83,7 @@ void RvctParser::stdError(const QString &line) m_task = new Task(Task::Unknown, m_warningOrError.cap(5) /* description */, - QDir::fromNativeSeparators(m_warningOrError.cap(1)) /* file */, + m_warningOrError.cap(1) /* file */, m_warningOrError.cap(2).toInt() /* line */, TASK_CATEGORY_COMPILE); if (m_warningOrError.cap(4) == "Warning") diff --git a/src/plugins/qt4projectmanager/qt-s60/s60createpackageparser.cpp b/src/plugins/qt4projectmanager/qt-s60/s60createpackageparser.cpp index 47c52dedba..5dfea8114e 100644 --- a/src/plugins/qt4projectmanager/qt-s60/s60createpackageparser.cpp +++ b/src/plugins/qt4projectmanager/qt-s60/s60createpackageparser.cpp @@ -35,8 +35,6 @@ #include <projectexplorer/projectexplorerconstants.h> #include <projectexplorer/taskwindow.h> -#include <QtCore/QDebug> - using namespace Qt4ProjectManager::Internal; S60CreatePackageParser::S60CreatePackageParser(const QString &packageName) : diff --git a/src/plugins/qt4projectmanager/qt-s60/winscwparser.cpp b/src/plugins/qt4projectmanager/qt-s60/winscwparser.cpp index 4fa0e50096..b2f2c8d962 100644 --- a/src/plugins/qt4projectmanager/qt-s60/winscwparser.cpp +++ b/src/plugins/qt4projectmanager/qt-s60/winscwparser.cpp @@ -34,8 +34,6 @@ #include <projectexplorer/projectexplorerconstants.h> -#include <QtCore/QDir> - using namespace Qt4ProjectManager; using namespace ProjectExplorer; using namespace ProjectExplorer::Constants; @@ -59,7 +57,7 @@ void WinscwParser::stdOutput(const QString &line) if (m_compilerProblem.indexIn(lne) > -1) { Task task(Task::Error, m_compilerProblem.cap(3) /* description */, - QDir::fromNativeSeparators(m_compilerProblem.cap(1)) /* filename */, + m_compilerProblem.cap(1) /* filename */, m_compilerProblem.cap(2).toInt() /* linenumber */, TASK_CATEGORY_COMPILE); if (task.description.startsWith(QLatin1String("warning: "))) { @@ -79,7 +77,7 @@ void WinscwParser::stdError(const QString &line) if (m_linkerProblem.indexIn(lne) > -1) { emit addTask(Task(Task::Error, m_linkerProblem.cap(2) /* description */, - QDir::fromNativeSeparators(m_linkerProblem.cap(1)) /* filename */, + m_linkerProblem.cap(1) /* filename */, -1 /* linenumber */, TASK_CATEGORY_COMPILE)); return; |