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

CMake: Export CMakeParser

Browse Source 
Task-number: QTCREATORBUG-17731
Change-Id: Iae2fdb0fd06489c558a58c698553edeaec9924ce
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
This commit is contained in:
Tobias Hunger
2017-02-23 11:32:27 +01:00
committed by Tim Jenssen
parent ce69c5da15
commit 021ea165dd
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/cmakeprojectmanager/cmakeparser.cpp
View File

@@ -30,7 +30,6 @@
#include <projectexplorer/projectexplorerconstants.h> #include <projectexplorer/projectexplorerconstants.h>
using namespace CMakeProjectManager; using namespace CMakeProjectManager;
using namespace Internal;
using namespace ProjectExplorer; using namespace ProjectExplorer;
const char COMMON_ERROR_PATTERN[] = "^CMake Error at (.*):([0-9]*) \\((.*)\\):"; const char COMMON_ERROR_PATTERN[] = "^CMake Error at (.*):([0-9]*) \\((.*)\\):";
@@ -141,7 +140,7 @@ void CMakeParser::doFlush()
#include <QTest> #include <QTest>
void CMakeProjectPlugin::testCMakeParser_data() void Internal::CMakeProjectPlugin::testCMakeParser_data()
{ {
QTest::addColumn<QString>("input"); QTest::addColumn<QString>("input");
QTest::addColumn<OutputParserTester::Channel>("inputChannel"); QTest::addColumn<OutputParserTester::Channel>("inputChannel");
@@ -265,7 +264,7 @@ void CMakeProjectPlugin::testCMakeParser_data()
<< QString(); << QString();
} }
void CMakeProjectPlugin::testCMakeParser() void Internal::CMakeProjectPlugin::testCMakeParser()
{ {
OutputParserTester testbench; OutputParserTester testbench;
testbench.appendOutputParser(new CMakeParser); testbench.appendOutputParser(new CMakeParser);

6
src/plugins/cmakeprojectmanager/cmakeparser.h
View File

@@ -25,15 +25,16 @@
#pragma once #pragma once
#include "cmake_global.h"
#include <projectexplorer/ioutputparser.h> #include <projectexplorer/ioutputparser.h>
#include <projectexplorer/task.h> #include <projectexplorer/task.h>
#include <QRegularExpression> #include <QRegularExpression>
namespace CMakeProjectManager { namespace CMakeProjectManager {
namespace Internal {
class CMakeParser : public ProjectExplorer::IOutputParser class CMAKE_EXPORT CMakeParser : public ProjectExplorer::IOutputParser
{ {
Q_OBJECT Q_OBJECT
@@ -58,4 +59,3 @@ private:
}; };
} // namespace CMakeProjectManager } // namespace CMakeProjectManager
} // namespace Internal