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

Compile fix Windows.

Browse Source 
Change-Id: I93048cf9e4fda2d261037408967c30a0f5796110
Reviewed-on: http://codereview.qt.nokia.com/3181
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
This commit is contained in:
Friedemann Kleint
2011-08-18 13:58:23 +02:00
parent cc632c1597
commit 2a3684fb2f
2 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/plugins/projectexplorer/msvcparser.cpp
View File

@@ -33,9 +33,8 @@
#include "msvcparser.h" #include "msvcparser.h"
#include "projectexplorerconstants.h" #include "projectexplorerconstants.h"
namespace { static const char FILE_POS_PATTERN[] = "(cl|LINK|.+) : ";
const char * const FILE_POS_PATTERN = "(cl|LINK|.+) : "; static const char ERROR_PATTERN[] = "[A-Z]+\\d\\d\\d\\d ?:";
const char * const ERROR_PATTERN = "[A-Z]+\\d\\d\\d\\d ?:";
static QPair<QString, int> parseFileName(const QString &input) static QPair<QString, int> parseFileName(const QString &input)
{ {
@@ -60,8 +59,6 @@ static QPair<QString, int> parseFileName(const QString &input)
return qMakePair(fileName, linenumber); return qMakePair(fileName, linenumber);
} }
} // namespace
using namespace ProjectExplorer; using namespace ProjectExplorer;
MsvcParser::MsvcParser() MsvcParser::MsvcParser()

2
src/plugins/projectexplorer/msvcparser.h
View File

@@ -34,7 +34,7 @@
#define MSVCPARSER_H #define MSVCPARSER_H
#include "ioutputparser.h" #include "ioutputparser.h"
#include "taskwindow.h" #include "task.h"
#include <QtCore/QRegExp> #include <QtCore/QRegExp>
#include <QtCore/QString> #include <QtCore/QString>