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

Fix compilation of S60 parsers.

Browse Source 
* Incorporate new TaskWindow changes.

Reviewed-By: kkoehne
This commit is contained in:
Tobias Hunger
2009-11-11 11:00:54 +01:00
parent f8aa2c9951
commit 082a76dc67
4 changed files with 26 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/plugins/projectexplorer/buildprogress.cpp
View File

@@ -36,6 +36,7 @@
#include <QtGui/QFont> #include <QtGui/QFont>
#include <QtGui/QPixmap> #include <QtGui/QPixmap>
using namespace ProjectExplorer;
using namespace ProjectExplorer::Internal; using namespace ProjectExplorer::Internal;
BuildProgress::BuildProgress(TaskWindow *taskWindow) BuildProgress::BuildProgress(TaskWindow *taskWindow)

25
src/plugins/qt4projectmanager/qt-s60/abldparser.cpp
View File

@@ -32,6 +32,7 @@
#include <projectexplorer/projectexplorerconstants.h> #include <projectexplorer/projectexplorerconstants.h>
#include <projectexplorer/buildparserinterface.h> #include <projectexplorer/buildparserinterface.h>
#include <projectexplorer/taskwindow.h>
#include <extensionsystem/pluginmanager.h> #include <extensionsystem/pluginmanager.h>
@@ -99,13 +100,13 @@ void AbldParser::stdOutput(const QString &line)
if (lne.startsWith("Is Perl, version ")) { if (lne.startsWith("Is Perl, version ")) {
emit addToTaskWindow( emit addToTaskWindow(
QString(), //filename QString(), //filename
ProjectExplorer::BuildParserInterface::Error, TaskWindow::Error,
-1, //linenumber -1, //linenumber
lne); lne);
return; return;
} }
if (lne.startsWith("FATAL ERROR:")) { if (lne.startsWith("FATAL ERROR:")) {
emit addToTaskWindow(QString(), ProjectExplorer::BuildParserInterface::Error, emit addToTaskWindow(QString(), TaskWindow::Error,
-1, lne.mid(12)); -1, lne.mid(12));
m_waitingForStdOutContinuation = false; m_waitingForStdOutContinuation = false;
return; return;
@@ -113,13 +114,13 @@ void AbldParser::stdOutput(const QString &line)
if (m_perlIssue.indexIn(lne) > -1) { if (m_perlIssue.indexIn(lne) > -1) {
m_waitingForStdOutContinuation = true; m_waitingForStdOutContinuation = true;
ProjectExplorer::BuildParserInterface::PatternType type; TaskWindow::TaskType type;
if (m_perlIssue.cap(1) == QLatin1String("WARNING")) if (m_perlIssue.cap(1) == QLatin1String("WARNING"))
type = ProjectExplorer::BuildParserInterface::Warning; type = TaskWindow::Warning;
else if (m_perlIssue.cap(1) == QLatin1String("ERROR")) else if (m_perlIssue.cap(1) == QLatin1String("ERROR"))
type = ProjectExplorer::BuildParserInterface::Error; type = TaskWindow::Error;
else else
type = ProjectExplorer::BuildParserInterface::Unknown; type = TaskWindow::Unknown;
m_currentFile = m_perlIssue.cap(2); m_currentFile = m_perlIssue.cap(2);
m_currentLine = m_perlIssue.cap(3).toInt(); m_currentLine = m_perlIssue.cap(3).toInt();
@@ -136,7 +137,7 @@ void AbldParser::stdOutput(const QString &line)
if (m_waitingForStdOutContinuation) { if (m_waitingForStdOutContinuation) {
emit addToTaskWindow(m_currentFile, emit addToTaskWindow(m_currentFile,
ProjectExplorer::BuildParserInterface::Unknown, TaskWindow::Unknown,
m_currentLine, lne); m_currentLine, lne);
m_waitingForStdOutContinuation = true; m_waitingForStdOutContinuation = true;
return; return;
@@ -159,7 +160,7 @@ void AbldParser::stdError(const QString &line)
lne.startsWith("Platform ")) { lne.startsWith("Platform ")) {
emit addToTaskWindow( emit addToTaskWindow(
QString(), // filename, QString(), // filename,
ProjectExplorer::BuildParserInterface::Error, TaskWindow::Error,
-1, // linenumber -1, // linenumber
lne); lne);
return; return;
@@ -167,7 +168,7 @@ void AbldParser::stdError(const QString &line)
if (lne.startsWith("Died at ")) { if (lne.startsWith("Died at ")) {
emit addToTaskWindow(QString(), emit addToTaskWindow(QString(),
ProjectExplorer::BuildParserInterface::Error, TaskWindow::Error,
-1, lne); -1, lne);
m_waitingForStdErrContinuation = false; m_waitingForStdErrContinuation = false;
return; return;
@@ -185,7 +186,7 @@ void AbldParser::stdError(const QString &line)
if (lne.startsWith("WARNING: ")) { if (lne.startsWith("WARNING: ")) {
QString description = lne.mid(9); QString description = lne.mid(9);
emit addToTaskWindow(m_currentFile, emit addToTaskWindow(m_currentFile,
ProjectExplorer::BuildParserInterface::Warning, TaskWindow::Warning,
-1, description); -1, description);
m_waitingForStdErrContinuation = true; m_waitingForStdErrContinuation = true;
return; return;
@@ -193,7 +194,7 @@ void AbldParser::stdError(const QString &line)
if (lne.startsWith("ERROR: ")) { if (lne.startsWith("ERROR: ")) {
QString description = lne.mid(7); QString description = lne.mid(7);
emit addToTaskWindow(m_currentFile, emit addToTaskWindow(m_currentFile,
ProjectExplorer::BuildParserInterface::Error, TaskWindow::Error,
-1, description); -1, description);
m_waitingForStdErrContinuation = true; m_waitingForStdErrContinuation = true;
return; return;
@@ -201,7 +202,7 @@ void AbldParser::stdError(const QString &line)
if (m_waitingForStdErrContinuation) if (m_waitingForStdErrContinuation)
{ {
emit addToTaskWindow(m_currentFile, emit addToTaskWindow(m_currentFile,
ProjectExplorer::BuildParserInterface::Unknown, TaskWindow::Unknown,
-1, lne); -1, lne);
m_waitingForStdErrContinuation = true; m_waitingForStdErrContinuation = true;
return; return;

14
src/plugins/qt4projectmanager/qt-s60/rvctparser.cpp
View File

@@ -29,7 +29,9 @@
#include "rvctparser.h" #include "rvctparser.h"
#include <projectexplorer/projectexplorerconstants.h> #include <projectexplorer/projectexplorerconstants.h>
#include <projectexplorer/taskwindow.h>
using namespace ProjectExplorer;
using namespace Qt4ProjectManager; using namespace Qt4ProjectManager;
RvctParser::RvctParser() : RvctParser::RvctParser() :
@@ -77,17 +79,17 @@ void RvctParser::stdError(const QString &line)
QString description = m_linkerProblem.cap(2); QString description = m_linkerProblem.cap(2);
emit addToTaskWindow( emit addToTaskWindow(
m_linkerProblem.cap(1), //filename m_linkerProblem.cap(1), //filename
ProjectExplorer::BuildParserInterface::Error, TaskWindow::Error,
-1, //linenumber -1, //linenumber
description); description);
} else if (m_warningOrError.indexIn(lne) > -1) { } else if (m_warningOrError.indexIn(lne) > -1) {
ProjectExplorer::BuildParserInterface::PatternType type; TaskWindow::TaskType type;
if (m_warningOrError.cap(4) == "Warning") if (m_warningOrError.cap(4) == "Warning")
type = ProjectExplorer::BuildParserInterface::Warning; type = TaskWindow::Warning;
else if (m_warningOrError.cap(4) == "Error") else if (m_warningOrError.cap(4) == "Error")
type = ProjectExplorer::BuildParserInterface::Error; type = TaskWindow::Error;
else else
type = ProjectExplorer::BuildParserInterface::Unknown; type = TaskWindow::Unknown;
QString description = m_warningOrError.cap(5); QString description = m_warningOrError.cap(5);
@@ -107,7 +109,7 @@ void RvctParser::stdError(const QString &line)
// additional information on the problem. // additional information on the problem.
emit addToTaskWindow( emit addToTaskWindow(
m_lastFile, //filesname m_lastFile, //filesname
ProjectExplorer::BuildParserInterface::Unknown, TaskWindow::Unknown,
m_lastLine, //linenumber m_lastLine, //linenumber
lne //description lne //description
); );

6
src/plugins/qt4projectmanager/qt-s60/winscwparser.cpp
View File

@@ -29,8 +29,10 @@
#include "winscwparser.h" #include "winscwparser.h"
#include <projectexplorer/projectexplorerconstants.h> #include <projectexplorer/projectexplorerconstants.h>
#include <projectexplorer/taskwindow.h>
using namespace Qt4ProjectManager; using namespace Qt4ProjectManager;
using namespace ProjectExplorer;
WinscwParser::WinscwParser() WinscwParser::WinscwParser()
{ {
@@ -76,7 +78,7 @@ void WinscwParser::stdOutput(const QString &line)
emit addToTaskWindow( emit addToTaskWindow(
file_name, file_name,
ProjectExplorer::BuildParserInterface::Error, TaskWindow::Error,
line_info.toInt(), line_info.toInt(),
description); description);
return; return;
@@ -92,7 +94,7 @@ void WinscwParser::stdError(const QString &line)
QString description = m_linkerProblem.cap(2); QString description = m_linkerProblem.cap(2);
emit addToTaskWindow( emit addToTaskWindow(
m_linkerProblem.cap(1), //filename m_linkerProblem.cap(1), //filename
ProjectExplorer::BuildParserInterface::Error, TaskWindow::Error,
-1, //linenumber -1, //linenumber
description); description);
} }