diff options
author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2011-08-18 13:46:52 +0200 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2011-08-18 13:47:33 +0200 |
commit | cc632c15978874e7d5b560776d41cfbd949fe88a (patch) | |
tree | 4431916896e80115e7e475db15aff3848fd1b502 /src/plugins/qtsupport | |
parent | e43496944607a975c6ce2a5844bdc8bc861f02ee (diff) | |
download | qt-creator-cc632c15978874e7d5b560776d41cfbd949fe88a.tar.gz |
Header cleanup in ProjectExplorer.
Change-Id: I19f100003427ba43aaae5ba0dc7078088017cb09
Reviewed-on: http://codereview.qt.nokia.com/3178
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Diffstat (limited to 'src/plugins/qtsupport')
-rw-r--r-- | src/plugins/qtsupport/baseqtversion.cpp | 1 | ||||
-rw-r--r-- | src/plugins/qtsupport/qtparser.cpp | 9 |
2 files changed, 6 insertions, 4 deletions
diff --git a/src/plugins/qtsupport/baseqtversion.cpp b/src/plugins/qtsupport/baseqtversion.cpp index 0f5d84801c..ddf6ba6cf0 100644 --- a/src/plugins/qtsupport/baseqtversion.cpp +++ b/src/plugins/qtsupport/baseqtversion.cpp @@ -38,6 +38,7 @@ #include "qtversionmanager.h" #include "profilereader.h" #include <projectexplorer/toolchainmanager.h> +#include <projectexplorer/toolchain.h> #include <projectexplorer/debugginghelper.h> #include <projectexplorer/gnumakeparser.h> #include <projectexplorer/projectexplorer.h> diff --git a/src/plugins/qtsupport/qtparser.cpp b/src/plugins/qtsupport/qtparser.cpp index 9d11f5298f..9d67772ca5 100644 --- a/src/plugins/qtsupport/qtparser.cpp +++ b/src/plugins/qtsupport/qtparser.cpp @@ -32,20 +32,21 @@ #include "qtparser.h" -#include <projectexplorer/taskwindow.h> +#include <projectexplorer/task.h> #include <projectexplorer/projectexplorerconstants.h> + #include <utils/qtcassert.h> using namespace QtSupport; using ProjectExplorer::Task; // opt. drive letter + filename: (2 brackets) -static const char FILE_PATTERN[] = "^(([A-Za-z]:)?[^:]+\\.[^:]+)"; +#define FILE_PATTERN "^(([A-Za-z]:)?[^:]+\\.[^:]+)" -QtParser::QtParser() +QtParser::QtParser() : + m_mocRegExp(QLatin1String(FILE_PATTERN"[:\\(](\\d+)\\)?:\\s(Warning|Error):\\s(.+)$")) { setObjectName(QLatin1String("QtParser")); - m_mocRegExp.setPattern(QString::fromLatin1(FILE_PATTERN) + "[:\\(](\\d+)\\)?:\\s(Warning|Error):\\s(.+)$"); m_mocRegExp.setMinimal(true); } |