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

ProjectExplorer: Introduce a alias for QList<Tasks>

Browse Source 
Change-Id: I91391ad22b420926b0f512cac23cfe009048b218
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
hjk
2019-05-27 16:09:44 +02:00
parent 24560d8830
commit 2b1c8aa877
73 changed files with 359 additions and 360 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/android/androidgdbserverkitinformation.cpp
View File

@@ -86,9 +86,9 @@ void AndroidGdbServerKitAspect::setup(Kit *kit)
kit->setValue(id(), autoDetect(kit).toString()); kit->setValue(id(), autoDetect(kit).toString());
} }
QList<Task> AndroidGdbServerKitAspect::validate(const Kit *) const Tasks AndroidGdbServerKitAspect::validate(const Kit *) const
{ {
return QList<Task>(); return {};
} }
bool AndroidGdbServerKitAspect::isApplicableToKit(const Kit *k) const bool AndroidGdbServerKitAspect::isApplicableToKit(const Kit *k) const

2
src/plugins/android/androidgdbserverkitinformation.h
View File

@@ -37,7 +37,7 @@ public:
AndroidGdbServerKitAspect(); AndroidGdbServerKitAspect();
void setup(ProjectExplorer::Kit *) override; void setup(ProjectExplorer::Kit *) override;
QList<ProjectExplorer::Task> validate(const ProjectExplorer::Kit *) const override; ProjectExplorer::Tasks validate(const ProjectExplorer::Kit *) const override;
bool isApplicableToKit(const ProjectExplorer::Kit *k) const override; bool isApplicableToKit(const ProjectExplorer::Kit *k) const override;
ItemList toUserOutput(const ProjectExplorer::Kit *) const override; ItemList toUserOutput(const ProjectExplorer::Kit *) const override;

28
src/plugins/baremetal/iarewparser.cpp
View File

@@ -247,18 +247,18 @@ void BareMetalPlugin::testIarOutputParsers_data()
QTest::addColumn<OutputParserTester::Channel>("inputChannel"); QTest::addColumn<OutputParserTester::Channel>("inputChannel");
QTest::addColumn<QString>("childStdOutLines"); QTest::addColumn<QString>("childStdOutLines");
QTest::addColumn<QString>("childStdErrLines"); QTest::addColumn<QString>("childStdErrLines");
QTest::addColumn<QList<ProjectExplorer::Task> >("tasks"); QTest::addColumn<Tasks >("tasks");
QTest::addColumn<QString>("outputLines"); QTest::addColumn<QString>("outputLines");
QTest::newRow("pass-through stdout") QTest::newRow("pass-through stdout")
<< "Sometext" << OutputParserTester::STDOUT << "Sometext" << OutputParserTester::STDOUT
<< "Sometext\n" << QString() << "Sometext\n" << QString()
<< QList<Task>() << Tasks()
<< QString(); << QString();
QTest::newRow("pass-through stderr") QTest::newRow("pass-through stderr")
<< "Sometext" << OutputParserTester::STDERR << "Sometext" << OutputParserTester::STDERR
<< QString() << "Sometext\n" << QString() << "Sometext\n"
<< QList<Task>() << Tasks()
<< QString(); << QString();
const Core::Id categoryCompile = Constants::TASK_CATEGORY_COMPILE; const Core::Id categoryCompile = Constants::TASK_CATEGORY_COMPILE;
@@ -269,7 +269,7 @@ void BareMetalPlugin::testIarOutputParsers_data()
<< OutputParserTester::STDOUT << OutputParserTester::STDOUT
<< QString::fromLatin1("Error in command line: Some error\n") << QString::fromLatin1("Error in command line: Some error\n")
<< QString() << QString()
<< (QList<Task>() << Task(Task::Error, << (Tasks() << Task(Task::Error,
QLatin1String("Error in command line: Some error"), QLatin1String("Error in command line: Some error"),
Utils::FileName(), Utils::FileName(),
-1, -1,
@@ -284,7 +284,7 @@ void BareMetalPlugin::testIarOutputParsers_data()
<< QString() << QString()
<< QString::fromLatin1("\"c:\\foo\\main.c\",63 Warning[Pe223]:\n" << QString::fromLatin1("\"c:\\foo\\main.c\",63 Warning[Pe223]:\n"
" Some warning \"foo\" bar\n") " Some warning \"foo\" bar\n")
<< (QList<Task>() << Task(Task::Warning, << (Tasks() << Task(Task::Warning,
QLatin1String("[Pe223]: Some warning \"foo\" bar"), QLatin1String("[Pe223]: Some warning \"foo\" bar"),
Utils::FileName::fromUserInput(QLatin1String("c:\\foo\\main.c")), Utils::FileName::fromUserInput(QLatin1String("c:\\foo\\main.c")),
63, 63,
@@ -302,7 +302,7 @@ void BareMetalPlugin::testIarOutputParsers_data()
" ^\n" " ^\n"
"\"c:\\foo\\main.c\",63 Warning[Pe223]:\n" "\"c:\\foo\\main.c\",63 Warning[Pe223]:\n"
" Some warning\n") " Some warning\n")
<< (QList<Task>() << Task(Task::Warning, << (Tasks() << Task(Task::Warning,
QLatin1String("[Pe223]: Some warning\n" QLatin1String("[Pe223]: Some warning\n"
" some_detail;\n" " some_detail;\n"
" ^"), " ^"),
@@ -320,7 +320,7 @@ void BareMetalPlugin::testIarOutputParsers_data()
<< QString::fromLatin1("\"c:\\foo\\main.c\",63 Warning[Pe223]:\n" << QString::fromLatin1("\"c:\\foo\\main.c\",63 Warning[Pe223]:\n"
" Some warning\n" " Some warning\n"
" , split\n") " , split\n")
<< (QList<Task>() << Task(Task::Warning, << (Tasks() << Task(Task::Warning,
QLatin1String("[Pe223]: Some warning, split"), QLatin1String("[Pe223]: Some warning, split"),
Utils::FileName::fromUserInput(QLatin1String("c:\\foo\\main.c")), Utils::FileName::fromUserInput(QLatin1String("c:\\foo\\main.c")),
63, 63,
@@ -334,7 +334,7 @@ void BareMetalPlugin::testIarOutputParsers_data()
<< QString() << QString()
<< QString::fromLatin1("\"c:\\foo\\main.c\",63 Error[Pe223]:\n" << QString::fromLatin1("\"c:\\foo\\main.c\",63 Error[Pe223]:\n"
" Some error\n") " Some error\n")
<< (QList<Task>() << Task(Task::Error, << (Tasks() << Task(Task::Error,
QLatin1String("[Pe223]: Some error"), QLatin1String("[Pe223]: Some error"),
Utils::FileName::fromUserInput(QLatin1String("c:\\foo\\main.c")), Utils::FileName::fromUserInput(QLatin1String("c:\\foo\\main.c")),
63, 63,
@@ -352,7 +352,7 @@ void BareMetalPlugin::testIarOutputParsers_data()
" ^\n" " ^\n"
"\"c:\\foo\\main.c\",63 Error[Pe223]:\n" "\"c:\\foo\\main.c\",63 Error[Pe223]:\n"
" Some error\n") " Some error\n")
<< (QList<Task>() << Task(Task::Error, << (Tasks() << Task(Task::Error,
QLatin1String("[Pe223]: Some error\n" QLatin1String("[Pe223]: Some error\n"
" some_detail;\n" " some_detail;\n"
" ^"), " ^"),
@@ -370,7 +370,7 @@ void BareMetalPlugin::testIarOutputParsers_data()
<< QString::fromLatin1("\"c:\\foo\\main.c\",63 Error[Pe223]:\n" << QString::fromLatin1("\"c:\\foo\\main.c\",63 Error[Pe223]:\n"
" Some error\n" " Some error\n"
" , split\n") " , split\n")
<< (QList<Task>() << Task(Task::Error, << (Tasks() << Task(Task::Error,
QLatin1String("[Pe223]: Some error, split"), QLatin1String("[Pe223]: Some error, split"),
Utils::FileName::fromUserInput(QLatin1String("c:\\foo\\main.c")), Utils::FileName::fromUserInput(QLatin1String("c:\\foo\\main.c")),
63, 63,
@@ -388,7 +388,7 @@ void BareMetalPlugin::testIarOutputParsers_data()
" o\\bar\\mai\n" " o\\bar\\mai\n"
" n.c.o\n" " n.c.o\n"
"]\n") "]\n")
<< (QList<Task>() << Task(Task::Error, << (Tasks() << Task(Task::Error,
QLatin1String("[Li005]: Some error \"foo\""), QLatin1String("[Li005]: Some error \"foo\""),
Utils::FileName::fromUserInput(QLatin1String("c:\\foo\\bar\\main.c.o")), Utils::FileName::fromUserInput(QLatin1String("c:\\foo\\bar\\main.c.o")),
-1, -1,
@@ -406,7 +406,7 @@ void BareMetalPlugin::testIarOutputParsers_data()
" c:\\foo.c\n" " c:\\foo.c\n"
" c:\\bar.c\n" " c:\\bar.c\n"
"Fatal error detected, aborting.\n") "Fatal error detected, aborting.\n")
<< (QList<Task>() << Task(Task::Error, << (Tasks() << Task(Task::Error,
QLatin1String("[Su011]: Some error:\n" QLatin1String("[Su011]: Some error:\n"
" c:\\foo.c\n" " c:\\foo.c\n"
" c:\\bar.c"), " c:\\bar.c"),
@@ -420,7 +420,7 @@ void BareMetalPlugin::testIarOutputParsers_data()
<< OutputParserTester::STDERR << OutputParserTester::STDERR
<< QString() << QString()
<< QString::fromLatin1("At end of source Error[Pe040]: Some error \";\"\n") << QString::fromLatin1("At end of source Error[Pe040]: Some error \";\"\n")
<< (QList<Task>() << Task(Task::Error, << (Tasks() << Task(Task::Error,
QLatin1String("[Pe040]: Some error \";\""), QLatin1String("[Pe040]: Some error \";\""),
Utils::FileName(), Utils::FileName(),
-1, -1,
@@ -434,7 +434,7 @@ void BareMetalPlugin::testIarOutputParsers()
testbench.appendOutputParser(new IarParser); testbench.appendOutputParser(new IarParser);
QFETCH(QString, input); QFETCH(QString, input);
QFETCH(OutputParserTester::Channel, inputChannel); QFETCH(OutputParserTester::Channel, inputChannel);
QFETCH(QList<Task>, tasks); QFETCH(Tasks, tasks);
QFETCH(QString, childStdOutLines); QFETCH(QString, childStdOutLines);
QFETCH(QString, childStdErrLines); QFETCH(QString, childStdErrLines);
QFETCH(QString, outputLines); QFETCH(QString, outputLines);

42
src/plugins/baremetal/keilparser.cpp
View File

@@ -236,18 +236,18 @@ void BareMetalPlugin::testKeilOutputParsers_data()
QTest::addColumn<OutputParserTester::Channel>("inputChannel"); QTest::addColumn<OutputParserTester::Channel>("inputChannel");
QTest::addColumn<QString>("childStdOutLines"); QTest::addColumn<QString>("childStdOutLines");
QTest::addColumn<QString>("childStdErrLines"); QTest::addColumn<QString>("childStdErrLines");
QTest::addColumn<QList<ProjectExplorer::Task> >("tasks"); QTest::addColumn<Tasks >("tasks");
QTest::addColumn<QString>("outputLines"); QTest::addColumn<QString>("outputLines");
QTest::newRow("pass-through stdout") QTest::newRow("pass-through stdout")
<< "Sometext" << OutputParserTester::STDOUT << "Sometext" << OutputParserTester::STDOUT
<< "Sometext\n" << QString() << "Sometext\n" << QString()
<< QList<Task>() << Tasks()
<< QString(); << QString();
QTest::newRow("pass-through stderr") QTest::newRow("pass-through stderr")
<< "Sometext" << OutputParserTester::STDERR << "Sometext" << OutputParserTester::STDERR
<< QString() << "Sometext\n" << QString() << "Sometext\n"
<< QList<Task>() << Tasks()
<< QString(); << QString();
const Core::Id categoryCompile = Constants::TASK_CATEGORY_COMPILE; const Core::Id categoryCompile = Constants::TASK_CATEGORY_COMPILE;
@@ -259,7 +259,7 @@ void BareMetalPlugin::testKeilOutputParsers_data()
<< OutputParserTester::STDERR << OutputParserTester::STDERR
<< QString() << QString()
<< QString::fromLatin1("\"c:\\foo\\main.c\", line 63: Warning: #1234: Some warning\n") << QString::fromLatin1("\"c:\\foo\\main.c\", line 63: Warning: #1234: Some warning\n")
<< (QList<Task>() << Task(Task::Warning, << (Tasks() << Task(Task::Warning,
QLatin1String("#1234: Some warning"), QLatin1String("#1234: Some warning"),
Utils::FileName::fromUserInput(QLatin1String("c:\\foo\\main.c")), Utils::FileName::fromUserInput(QLatin1String("c:\\foo\\main.c")),
63, 63,
@@ -275,7 +275,7 @@ void BareMetalPlugin::testKeilOutputParsers_data()
<< QString::fromLatin1("\"c:\\foo\\main.c\", line 63: Warning: #1234: Some warning\n" << QString::fromLatin1("\"c:\\foo\\main.c\", line 63: Warning: #1234: Some warning\n"
" int f;\n" " int f;\n"
" ^\n") " ^\n")
<< (QList<Task>() << Task(Task::Warning, << (Tasks() << Task(Task::Warning,
QLatin1String("#1234: Some warning\n" QLatin1String("#1234: Some warning\n"
" int f;\n" " int f;\n"
" ^"), " ^"),
@@ -289,7 +289,7 @@ void BareMetalPlugin::testKeilOutputParsers_data()
<< OutputParserTester::STDERR << OutputParserTester::STDERR
<< QString() << QString()
<< QString::fromLatin1("\"c:\\foo\\main.c\", line 63: Error: #1234: Some error\n") << QString::fromLatin1("\"c:\\foo\\main.c\", line 63: Error: #1234: Some error\n")
<< (QList<Task>() << Task(Task::Error, << (Tasks() << Task(Task::Error,
QLatin1String("#1234: Some error"), QLatin1String("#1234: Some error"),
Utils::FileName::fromUserInput(QLatin1String("c:\\foo\\main.c")), Utils::FileName::fromUserInput(QLatin1String("c:\\foo\\main.c")),
63, 63,
@@ -301,7 +301,7 @@ void BareMetalPlugin::testKeilOutputParsers_data()
<< OutputParserTester::STDERR << OutputParserTester::STDERR
<< QString() << QString()
<< QString::fromLatin1("\"flash.sct\", line 51 (column 20): Error: L1234: Some error\n") << QString::fromLatin1("\"flash.sct\", line 51 (column 20): Error: L1234: Some error\n")
<< (QList<Task>() << Task(Task::Error, << (Tasks() << Task(Task::Error,
QLatin1String("L1234: Some error"), QLatin1String("L1234: Some error"),
Utils::FileName::fromUserInput(QLatin1String("flash.sct")), Utils::FileName::fromUserInput(QLatin1String("flash.sct")),
51, 51,
@@ -317,7 +317,7 @@ void BareMetalPlugin::testKeilOutputParsers_data()
<< QString::fromLatin1("\"c:\\foo\\main.c\", line 63: Error: #1234: Some error\n" << QString::fromLatin1("\"c:\\foo\\main.c\", line 63: Error: #1234: Some error\n"
" int f;\n" " int f;\n"
" ^\n") " ^\n")
<< (QList<Task>() << Task(Task::Error, << (Tasks() << Task(Task::Error,
QLatin1String("#1234: Some error\n" QLatin1String("#1234: Some error\n"
" int f;\n" " int f;\n"
" ^"), " ^"),
@@ -331,7 +331,7 @@ void BareMetalPlugin::testKeilOutputParsers_data()
<< OutputParserTester::STDERR << OutputParserTester::STDERR
<< QString() << QString()
<< QString::fromLatin1("\"c:\\foo\\main.c\", line 71: Error: At end of source: #40: Some error\n") << QString::fromLatin1("\"c:\\foo\\main.c\", line 71: Error: At end of source: #40: Some error\n")
<< (QList<Task>() << Task(Task::Error, << (Tasks() << Task(Task::Error,
QLatin1String("#40: Some error"), QLatin1String("#40: Some error"),
Utils::FileName::fromUserInput(QLatin1String("c:\\foo\\main.c")), Utils::FileName::fromUserInput(QLatin1String("c:\\foo\\main.c")),
71, 71,
@@ -343,7 +343,7 @@ void BareMetalPlugin::testKeilOutputParsers_data()
<< OutputParserTester::STDERR << OutputParserTester::STDERR
<< QString() << QString()
<< QString::fromLatin1("Error: L6226E: Some error.\n") << QString::fromLatin1("Error: L6226E: Some error.\n")
<< (QList<Task>() << Task(Task::Error, << (Tasks() << Task(Task::Error,
QLatin1String("L6226E: Some error."), QLatin1String("L6226E: Some error."),
Utils::FileName(), Utils::FileName(),
-1, -1,
@@ -358,7 +358,7 @@ void BareMetalPlugin::testKeilOutputParsers_data()
<< OutputParserTester::STDOUT << OutputParserTester::STDOUT
<< QString::fromLatin1("*** WARNING #A9 IN 15 (c:\\foo\\dscr.a51, LINE 15): Some warning\n") << QString::fromLatin1("*** WARNING #A9 IN 15 (c:\\foo\\dscr.a51, LINE 15): Some warning\n")
<< QString() << QString()
<< (QList<Task>() << Task(Task::Warning, << (Tasks() << Task(Task::Warning,
QLatin1String("#A9: Some warning"), QLatin1String("#A9: Some warning"),
Utils::FileName::fromUserInput(QLatin1String("c:\\foo\\dscr.a51")), Utils::FileName::fromUserInput(QLatin1String("c:\\foo\\dscr.a51")),
15, 15,
@@ -370,7 +370,7 @@ void BareMetalPlugin::testKeilOutputParsers_data()
<< OutputParserTester::STDOUT << OutputParserTester::STDOUT
<< QString::fromLatin1("*** ERROR #A9 IN 15 (c:\\foo\\dscr.a51, LINE 15): Some error\n") << QString::fromLatin1("*** ERROR #A9 IN 15 (c:\\foo\\dscr.a51, LINE 15): Some error\n")
<< QString() << QString()
<< (QList<Task>() << Task(Task::Error, << (Tasks() << Task(Task::Error,
QLatin1String("#A9: Some error"), QLatin1String("#A9: Some error"),
Utils::FileName::fromUserInput(QLatin1String("c:\\foo\\dscr.a51")), Utils::FileName::fromUserInput(QLatin1String("c:\\foo\\dscr.a51")),
15, 15,
@@ -386,7 +386,7 @@ void BareMetalPlugin::testKeilOutputParsers_data()
" Some detail 1\n" " Some detail 1\n"
" Some detail N\n") " Some detail N\n")
<< QString() << QString()
<< (QList<Task>() << Task(Task::Error, << (Tasks() << Task(Task::Error,
QLatin1String("Assembler fatal error\n" QLatin1String("Assembler fatal error\n"
" Some detail 1\n" " Some detail 1\n"
" Some detail N"), " Some detail N"),
@@ -401,7 +401,7 @@ void BareMetalPlugin::testKeilOutputParsers_data()
<< OutputParserTester::STDOUT << OutputParserTester::STDOUT
<< QString::fromLatin1("*** WARNING C123 IN LINE 13 OF c:\\foo.c: Some warning\n") << QString::fromLatin1("*** WARNING C123 IN LINE 13 OF c:\\foo.c: Some warning\n")
<< QString() << QString()
<< (QList<Task>() << Task(Task::Warning, << (Tasks() << Task(Task::Warning,
QLatin1String("C123: Some warning"), QLatin1String("C123: Some warning"),
Utils::FileName::fromUserInput(QLatin1String("c:\\foo.c")), Utils::FileName::fromUserInput(QLatin1String("c:\\foo.c")),
13, 13,
@@ -413,7 +413,7 @@ void BareMetalPlugin::testKeilOutputParsers_data()
<< OutputParserTester::STDOUT << OutputParserTester::STDOUT
<< QString::fromLatin1("*** WARNING C123 IN LINE 13 OF c:\\foo.c: Some warning : 'extended text'\n") << QString::fromLatin1("*** WARNING C123 IN LINE 13 OF c:\\foo.c: Some warning : 'extended text'\n")
<< QString() << QString()
<< (QList<Task>() << Task(Task::Warning, << (Tasks() << Task(Task::Warning,
QLatin1String("C123: Some warning : 'extended text'"), QLatin1String("C123: Some warning : 'extended text'"),
Utils::FileName::fromUserInput(QLatin1String("c:\\foo.c")), Utils::FileName::fromUserInput(QLatin1String("c:\\foo.c")),
13, 13,
@@ -425,7 +425,7 @@ void BareMetalPlugin::testKeilOutputParsers_data()
<< OutputParserTester::STDOUT << OutputParserTester::STDOUT
<< QString::fromLatin1("*** ERROR C123 IN LINE 13 OF c:\\foo.c: Some error\n") << QString::fromLatin1("*** ERROR C123 IN LINE 13 OF c:\\foo.c: Some error\n")
<< QString() << QString()
<< (QList<Task>() << Task(Task::Error, << (Tasks() << Task(Task::Error,
QLatin1String("C123: Some error"), QLatin1String("C123: Some error"),
Utils::FileName::fromUserInput(QLatin1String("c:\\foo.c")), Utils::FileName::fromUserInput(QLatin1String("c:\\foo.c")),
13, 13,
@@ -437,7 +437,7 @@ void BareMetalPlugin::testKeilOutputParsers_data()
<< OutputParserTester::STDOUT << OutputParserTester::STDOUT
<< QString::fromLatin1("*** ERROR C123 IN LINE 13 OF c:\\foo.c: Some error : 'extended text'\n") << QString::fromLatin1("*** ERROR C123 IN LINE 13 OF c:\\foo.c: Some error : 'extended text'\n")
<< QString() << QString()
<< (QList<Task>() << Task(Task::Error, << (Tasks() << Task(Task::Error,
QLatin1String("C123: Some error : 'extended text'"), QLatin1String("C123: Some error : 'extended text'"),
Utils::FileName::fromUserInput(QLatin1String("c:\\foo.c")), Utils::FileName::fromUserInput(QLatin1String("c:\\foo.c")),
13, 13,
@@ -453,7 +453,7 @@ void BareMetalPlugin::testKeilOutputParsers_data()
" Some detail 1\n" " Some detail 1\n"
" Some detail N\n") " Some detail N\n")
<< QString() << QString()
<< (QList<Task>() << Task(Task::Error, << (Tasks() << Task(Task::Error,
QLatin1String("Compiler fatal error\n" QLatin1String("Compiler fatal error\n"
" Some detail 1\n" " Some detail 1\n"
" Some detail N"), " Some detail N"),
@@ -468,7 +468,7 @@ void BareMetalPlugin::testKeilOutputParsers_data()
<< OutputParserTester::STDOUT << OutputParserTester::STDOUT
<< QString::fromLatin1("*** FATAL ERROR L456: Some error\n") << QString::fromLatin1("*** FATAL ERROR L456: Some error\n")
<< QString() << QString()
<< (QList<Task>() << Task(Task::Error, << (Tasks() << Task(Task::Error,
QLatin1String("L456: Some error"), QLatin1String("L456: Some error"),
Utils::FileName(), Utils::FileName(),
-1, -1,
@@ -484,7 +484,7 @@ void BareMetalPlugin::testKeilOutputParsers_data()
" Some detail 1\n" " Some detail 1\n"
" Some detail N\n") " Some detail N\n")
<< QString() << QString()
<< (QList<Task>() << Task(Task::Error, << (Tasks() << Task(Task::Error,
QLatin1String("L456: Some error\n" QLatin1String("L456: Some error\n"
" Some detail 1\n" " Some detail 1\n"
" Some detail N"), " Some detail N"),
@@ -500,7 +500,7 @@ void BareMetalPlugin::testKeilOutputParsers()
testbench.appendOutputParser(new KeilParser); testbench.appendOutputParser(new KeilParser);
QFETCH(QString, input); QFETCH(QString, input);
QFETCH(OutputParserTester::Channel, inputChannel); QFETCH(OutputParserTester::Channel, inputChannel);
QFETCH(QList<Task>, tasks); QFETCH(Tasks, tasks);
QFETCH(QString, childStdOutLines); QFETCH(QString, childStdOutLines);
QFETCH(QString, childStdErrLines); QFETCH(QString, childStdErrLines);
QFETCH(QString, outputLines); QFETCH(QString, outputLines);

24
src/plugins/baremetal/sdccparser.cpp
View File

@@ -190,18 +190,18 @@ void BareMetalPlugin::testSdccOutputParsers_data()
QTest::addColumn<OutputParserTester::Channel>("inputChannel"); QTest::addColumn<OutputParserTester::Channel>("inputChannel");
QTest::addColumn<QString>("childStdOutLines"); QTest::addColumn<QString>("childStdOutLines");
QTest::addColumn<QString>("childStdErrLines"); QTest::addColumn<QString>("childStdErrLines");
QTest::addColumn<QList<ProjectExplorer::Task> >("tasks"); QTest::addColumn<Tasks >("tasks");
QTest::addColumn<QString>("outputLines"); QTest::addColumn<QString>("outputLines");
QTest::newRow("pass-through stdout") QTest::newRow("pass-through stdout")
<< "Sometext" << OutputParserTester::STDOUT << "Sometext" << OutputParserTester::STDOUT
<< "Sometext\n" << QString() << "Sometext\n" << QString()
<< QList<Task>() << Tasks()
<< QString(); << QString();
QTest::newRow("pass-through stderr") QTest::newRow("pass-through stderr")
<< "Sometext" << OutputParserTester::STDERR << "Sometext" << OutputParserTester::STDERR
<< QString() << "Sometext\n" << QString() << "Sometext\n"
<< QList<Task>() << Tasks()
<< QString(); << QString();
const Core::Id categoryCompile = Constants::TASK_CATEGORY_COMPILE; const Core::Id categoryCompile = Constants::TASK_CATEGORY_COMPILE;
@@ -213,7 +213,7 @@ void BareMetalPlugin::testSdccOutputParsers_data()
<< OutputParserTester::STDERR << OutputParserTester::STDERR
<< QString() << QString()
<< QString::fromLatin1("c:\\foo\\main.c:63: warning 123: Some warning\n") << QString::fromLatin1("c:\\foo\\main.c:63: warning 123: Some warning\n")
<< (QList<Task>() << Task(Task::Warning, << (Tasks() << Task(Task::Warning,
QLatin1String("Some warning"), QLatin1String("Some warning"),
Utils::FileName::fromUserInput(QLatin1String("c:\\foo\\main.c")), Utils::FileName::fromUserInput(QLatin1String("c:\\foo\\main.c")),
63, 63,
@@ -229,7 +229,7 @@ void BareMetalPlugin::testSdccOutputParsers_data()
<< QString::fromLatin1("c:\\foo\\main.c:63: warning 123: Some warning\n" << QString::fromLatin1("c:\\foo\\main.c:63: warning 123: Some warning\n"
"details #1\n" "details #1\n"
" details #2\n") " details #2\n")
<< (QList<Task>() << Task(Task::Warning, << (Tasks() << Task(Task::Warning,
QLatin1String("Some warning\n" QLatin1String("Some warning\n"
"details #1\n" "details #1\n"
" details #2"), " details #2"),
@@ -243,7 +243,7 @@ void BareMetalPlugin::testSdccOutputParsers_data()
<< OutputParserTester::STDERR << OutputParserTester::STDERR
<< QString() << QString()
<< QString::fromLatin1("c:\\foo\\main.c:63: error 123: Some error\n") << QString::fromLatin1("c:\\foo\\main.c:63: error 123: Some error\n")
<< (QList<Task>() << Task(Task::Error, << (Tasks() << Task(Task::Error,
QLatin1String("Some error"), QLatin1String("Some error"),
Utils::FileName::fromUserInput(QLatin1String("c:\\foo\\main.c")), Utils::FileName::fromUserInput(QLatin1String("c:\\foo\\main.c")),
63, 63,
@@ -259,7 +259,7 @@ void BareMetalPlugin::testSdccOutputParsers_data()
<< QString::fromLatin1("c:\\foo\\main.c:63: error 123: Some error\n" << QString::fromLatin1("c:\\foo\\main.c:63: error 123: Some error\n"
"details #1\n" "details #1\n"
" details #2\n") " details #2\n")
<< (QList<Task>() << Task(Task::Error, << (Tasks() << Task(Task::Error,
QLatin1String("Some error\n" QLatin1String("Some error\n"
"details #1\n" "details #1\n"
" details #2"), " details #2"),
@@ -273,7 +273,7 @@ void BareMetalPlugin::testSdccOutputParsers_data()
<< OutputParserTester::STDERR << OutputParserTester::STDERR
<< QString() << QString()
<< QString::fromLatin1("c:\\foo\\main.c:63: syntax error: Some error\n") << QString::fromLatin1("c:\\foo\\main.c:63: syntax error: Some error\n")
<< (QList<Task>() << Task(Task::Error, << (Tasks() << Task(Task::Error,
QLatin1String("Some error"), QLatin1String("Some error"),
Utils::FileName::fromUserInput(QLatin1String("c:\\foo\\main.c")), Utils::FileName::fromUserInput(QLatin1String("c:\\foo\\main.c")),
63, 63,
@@ -285,7 +285,7 @@ void BareMetalPlugin::testSdccOutputParsers_data()
<< OutputParserTester::STDERR << OutputParserTester::STDERR
<< QString() << QString()
<< QString::fromLatin1("at 1: error 123: Some error\n") << QString::fromLatin1("at 1: error 123: Some error\n")
<< (QList<Task>() << Task(Task::Error, << (Tasks() << Task(Task::Error,
QLatin1String("Some error"), QLatin1String("Some error"),
Utils::FileName(), Utils::FileName(),
-1, -1,
@@ -297,7 +297,7 @@ void BareMetalPlugin::testSdccOutputParsers_data()
<< OutputParserTester::STDERR << OutputParserTester::STDERR
<< QString() << QString()
<< QString::fromLatin1("?ASlink-Warning-Couldn't find library 'foo.lib'\n") << QString::fromLatin1("?ASlink-Warning-Couldn't find library 'foo.lib'\n")
<< (QList<Task>() << Task(Task::Warning, << (Tasks() << Task(Task::Warning,
QLatin1String("Couldn't find library 'foo.lib'"), QLatin1String("Couldn't find library 'foo.lib'"),
Utils::FileName(), Utils::FileName(),
-1, -1,
@@ -309,7 +309,7 @@ void BareMetalPlugin::testSdccOutputParsers_data()
<< OutputParserTester::STDERR << OutputParserTester::STDERR
<< QString() << QString()
<< QString::fromLatin1("?ASlink-Error-<cannot open> : \"foo.rel\"\n") << QString::fromLatin1("?ASlink-Error-<cannot open> : \"foo.rel\"\n")
<< (QList<Task>() << Task(Task::Error, << (Tasks() << Task(Task::Error,
QLatin1String("<cannot open> : \"foo.rel\""), QLatin1String("<cannot open> : \"foo.rel\""),
Utils::FileName(), Utils::FileName(),
-1, -1,
@@ -323,7 +323,7 @@ void BareMetalPlugin::testSdccOutputParsers()
testbench.appendOutputParser(new SdccParser); testbench.appendOutputParser(new SdccParser);
QFETCH(QString, input); QFETCH(QString, input);
QFETCH(OutputParserTester::Channel, inputChannel); QFETCH(OutputParserTester::Channel, inputChannel);
QFETCH(QList<Task>, tasks); QFETCH(Tasks, tasks);
QFETCH(QString, childStdOutLines); QFETCH(QString, childStdOutLines);
QFETCH(QString, childStdErrLines); QFETCH(QString, childStdErrLines);
QFETCH(QString, outputLines); QFETCH(QString, outputLines);

14
src/plugins/cmakeprojectmanager/cmakekitinformation.cpp
View File

@@ -245,9 +245,9 @@ void CMakeKitAspect::setCMakeTool(Kit *k, const Core::Id id)
k->setValue(TOOL_ID, toSet.toSetting()); k->setValue(TOOL_ID, toSet.toSetting());
} }
QList<Task> CMakeKitAspect::validate(const Kit *k) const Tasks CMakeKitAspect::validate(const Kit *k) const
{ {
QList<Task> result; Tasks result;
CMakeTool *tool = CMakeKitAspect::cmakeTool(k); CMakeTool *tool = CMakeKitAspect::cmakeTool(k);
if (tool) { if (tool) {
CMakeTool::Version version = tool->version(); CMakeTool::Version version = tool->version();
@@ -650,12 +650,12 @@ QVariant CMakeGeneratorKitAspect::defaultValue(const Kit *k) const
return GeneratorInfo({it->name, extraGenerator, QString(), QString()}).toVariant(); return GeneratorInfo({it->name, extraGenerator, QString(), QString()}).toVariant();
} }
QList<Task> CMakeGeneratorKitAspect::validate(const Kit *k) const Tasks CMakeGeneratorKitAspect::validate(const Kit *k) const
{ {
CMakeTool *tool = CMakeKitAspect::cmakeTool(k); CMakeTool *tool = CMakeKitAspect::cmakeTool(k);
GeneratorInfo info = generatorInfo(k); GeneratorInfo info = generatorInfo(k);
QList<Task> result; Tasks result;
if (tool) { if (tool) {
if (!tool->isValid()) { if (!tool->isValid()) {
result << Task(Task::Warning, tr("CMake Tool is unconfigured, CMake generator will be ignored."), result << Task(Task::Warning, tr("CMake Tool is unconfigured, CMake generator will be ignored."),
@@ -952,9 +952,9 @@ QVariant CMakeConfigurationKitAspect::defaultValue(const Kit *k) const
return tmp; return tmp;
} }
QList<Task> CMakeConfigurationKitAspect::validate(const Kit *k) const Tasks CMakeConfigurationKitAspect::validate(const Kit *k) const
{ {
QTC_ASSERT(k, return QList<Task>()); QTC_ASSERT(k, return Tasks());
const QtSupport::BaseQtVersion *const version = QtSupport::QtKitAspect::qtVersion(k); const QtSupport::BaseQtVersion *const version = QtSupport::QtKitAspect::qtVersion(k);
const ToolChain *const tcC = ToolChainKitAspect::toolChain(k, ProjectExplorer::Constants::C_LANGUAGE_ID); const ToolChain *const tcC = ToolChainKitAspect::toolChain(k, ProjectExplorer::Constants::C_LANGUAGE_ID);
@@ -980,7 +980,7 @@ QList<Task> CMakeConfigurationKitAspect::validate(const Kit *k) const
qtInstallDirs = CMakeConfigItem::cmakeSplitValue(expandedValue.toString()); qtInstallDirs = CMakeConfigItem::cmakeSplitValue(expandedValue.toString());
} }
QList<Task> result; Tasks result;
// Validate Qt: // Validate Qt:
if (qmakePath.isEmpty()) { if (qmakePath.isEmpty()) {
if (version && version->isValid() && isQt4) { if (version && version->isValid() && isQt4) {

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

@@ -47,7 +47,7 @@ public:
static void setCMakeTool(ProjectExplorer::Kit *k, const Core::Id id); static void setCMakeTool(ProjectExplorer::Kit *k, const Core::Id id);
// KitAspect interface // KitAspect interface
QList<ProjectExplorer::Task> validate(const ProjectExplorer::Kit *k) const final; ProjectExplorer::Tasks validate(const ProjectExplorer::Kit *k) const final;
void setup(ProjectExplorer::Kit *k) final; void setup(ProjectExplorer::Kit *k) final;
void fix(ProjectExplorer::Kit *k) final; void fix(ProjectExplorer::Kit *k) final;
ItemList toUserOutput(const ProjectExplorer::Kit *k) const final; ItemList toUserOutput(const ProjectExplorer::Kit *k) const final;
@@ -77,7 +77,7 @@ public:
static QStringList generatorArguments(const ProjectExplorer::Kit *k); static QStringList generatorArguments(const ProjectExplorer::Kit *k);
// KitAspect interface // KitAspect interface
QList<ProjectExplorer::Task> validate(const ProjectExplorer::Kit *k) const final; ProjectExplorer::Tasks validate(const ProjectExplorer::Kit *k) const final;
void setup(ProjectExplorer::Kit *k) final; void setup(ProjectExplorer::Kit *k) final;
void fix(ProjectExplorer::Kit *k) final; void fix(ProjectExplorer::Kit *k) final;
void upgrade(ProjectExplorer::Kit *k) final; void upgrade(ProjectExplorer::Kit *k) final;
@@ -103,7 +103,7 @@ public:
static CMakeConfig defaultConfiguration(const ProjectExplorer::Kit *k); static CMakeConfig defaultConfiguration(const ProjectExplorer::Kit *k);
// KitAspect interface // KitAspect interface
QList<ProjectExplorer::Task> validate(const ProjectExplorer::Kit *k) const final; ProjectExplorer::Tasks validate(const ProjectExplorer::Kit *k) const final;
void setup(ProjectExplorer::Kit *k) final; void setup(ProjectExplorer::Kit *k) final;
void fix(ProjectExplorer::Kit *k) final; void fix(ProjectExplorer::Kit *k) final;
ItemList toUserOutput(const ProjectExplorer::Kit *k) const final; ItemList toUserOutput(const ProjectExplorer::Kit *k) const final;

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

@@ -146,7 +146,7 @@ void Internal::CMakeProjectPlugin::testCMakeParser_data()
QTest::addColumn<OutputParserTester::Channel>("inputChannel"); QTest::addColumn<OutputParserTester::Channel>("inputChannel");
QTest::addColumn<QString>("childStdOutLines"); QTest::addColumn<QString>("childStdOutLines");
QTest::addColumn<QString>("childStdErrLines"); QTest::addColumn<QString>("childStdErrLines");
QTest::addColumn<QList<ProjectExplorer::Task> >("tasks"); QTest::addColumn<Tasks>("tasks");
QTest::addColumn<QString>("outputLines"); QTest::addColumn<QString>("outputLines");
const Core::Id categoryBuild = Constants::TASK_CATEGORY_BUILDSYSTEM; const Core::Id categoryBuild = Constants::TASK_CATEGORY_BUILDSYSTEM;
@@ -155,12 +155,12 @@ void Internal::CMakeProjectPlugin::testCMakeParser_data()
QTest::newRow("pass-through stdout") QTest::newRow("pass-through stdout")
<< QString::fromLatin1("Sometext") << OutputParserTester::STDOUT << QString::fromLatin1("Sometext") << OutputParserTester::STDOUT
<< QString::fromLatin1("Sometext\n") << QString() << QString::fromLatin1("Sometext\n") << QString()
<< QList<ProjectExplorer::Task>() << Tasks()
<< QString(); << QString();
QTest::newRow("pass-through stderr") QTest::newRow("pass-through stderr")
<< QString::fromLatin1("Sometext") << OutputParserTester::STDERR << QString::fromLatin1("Sometext") << OutputParserTester::STDERR
<< QString() << QString::fromLatin1("Sometext\n") << QString() << QString::fromLatin1("Sometext\n")
<< QList<ProjectExplorer::Task>() << Tasks()
<< QString(); << QString();
// positive tests // positive tests
@@ -177,7 +177,7 @@ void Internal::CMakeProjectPlugin::testCMakeParser_data()
" .hxx .in .txx\n\n") " .hxx .in .txx\n\n")
<< OutputParserTester::STDERR << OutputParserTester::STDERR
<< QString() << QString() << QString() << QString()
<< (QList<ProjectExplorer::Task>() << (Tasks()
<< Task(Task::Error, << Task(Task::Error,
QLatin1String("Cannot find source file: unknownFile.qml Tried extensions .c .C .c++ .cc .cpp .cxx .m .M .mm .h .hh .h++ .hm .hpp .hxx .in .txx"), QLatin1String("Cannot find source file: unknownFile.qml Tried extensions .c .C .c++ .cc .cpp .cxx .m .M .mm .h .hh .h++ .hm .hpp .hxx .in .txx"),
Utils::FileName::fromUserInput(QLatin1String("src/1/app/CMakeLists.txt")), 70, Utils::FileName::fromUserInput(QLatin1String("src/1/app/CMakeLists.txt")), 70,
@@ -193,7 +193,7 @@ void Internal::CMakeProjectPlugin::testCMakeParser_data()
" add_subdirectory given source \"app1\" which is not an existing directory.\n\n") " add_subdirectory given source \"app1\" which is not an existing directory.\n\n")
<< OutputParserTester::STDERR << OutputParserTester::STDERR
<< QString() << QString() << QString() << QString()
<< (QList<ProjectExplorer::Task>() << (Tasks()
<< Task(Task::Error, << Task(Task::Error,
QLatin1String("add_subdirectory given source \"app1\" which is not an existing directory."), QLatin1String("add_subdirectory given source \"app1\" which is not an existing directory."),
Utils::FileName::fromUserInput(QLatin1String("src/1/CMakeLists.txt")), 8, Utils::FileName::fromUserInput(QLatin1String("src/1/CMakeLists.txt")), 8,
@@ -205,7 +205,7 @@ void Internal::CMakeProjectPlugin::testCMakeParser_data()
" Unknown CMake command \"i_am_wrong_command\".\n\n") " Unknown CMake command \"i_am_wrong_command\".\n\n")
<< OutputParserTester::STDERR << OutputParserTester::STDERR
<< QString() << QString() << QString() << QString()
<< (QList<ProjectExplorer::Task>() << (Tasks()
<< Task(Task::Error, << Task(Task::Error,
QLatin1String("Unknown CMake command \"i_am_wrong_command\"."), QLatin1String("Unknown CMake command \"i_am_wrong_command\"."),
Utils::FileName::fromUserInput(QLatin1String("src/1/CMakeLists.txt")), 8, Utils::FileName::fromUserInput(QLatin1String("src/1/CMakeLists.txt")), 8,
@@ -217,7 +217,7 @@ void Internal::CMakeProjectPlugin::testCMakeParser_data()
" message called with incorrect number of arguments\n\n") " message called with incorrect number of arguments\n\n")
<< OutputParserTester::STDERR << OutputParserTester::STDERR
<< QString() << QString() << QString() << QString()
<< (QList<ProjectExplorer::Task>() << (Tasks()
<< Task(Task::Error, << Task(Task::Error,
QLatin1String("message called with incorrect number of arguments"), QLatin1String("message called with incorrect number of arguments"),
Utils::FileName::fromUserInput(QLatin1String("src/1/CMakeLists.txt")), 8, Utils::FileName::fromUserInput(QLatin1String("src/1/CMakeLists.txt")), 8,
@@ -231,7 +231,7 @@ void Internal::CMakeProjectPlugin::testCMakeParser_data()
"\".") "\".")
<< OutputParserTester::STDERR << OutputParserTester::STDERR
<< QString() << QString() << QString() << QString()
<< (QList<ProjectExplorer::Task>() << (Tasks()
<< Task(Task::Error, << Task(Task::Error,
QLatin1String("Parse error. Expected \"(\", got newline with text \"\n\"."), QLatin1String("Parse error. Expected \"(\", got newline with text \"\n\"."),
Utils::FileName::fromUserInput(QLatin1String("/test/path/CMakeLists.txt")), 9, Utils::FileName::fromUserInput(QLatin1String("/test/path/CMakeLists.txt")), 9,
@@ -244,7 +244,7 @@ void Internal::CMakeProjectPlugin::testCMakeParser_data()
"CMAKE_MAKE_PROGRAM\n") "CMAKE_MAKE_PROGRAM\n")
<< OutputParserTester::STDERR << OutputParserTester::STDERR
<< QString() << QString::fromLatin1("Missing variable is:\nCMAKE_MAKE_PROGRAM\n") << QString() << QString::fromLatin1("Missing variable is:\nCMAKE_MAKE_PROGRAM\n")
<< (QList<ProjectExplorer::Task>() << (Tasks()
<< Task(Task::Error, << Task(Task::Error,
QLatin1String("Error required internal CMake variable not set, cmake may be not be built correctly."), QLatin1String("Error required internal CMake variable not set, cmake may be not be built correctly."),
Utils::FileName(), -1, categoryBuild)) Utils::FileName(), -1, categoryBuild))
@@ -257,7 +257,7 @@ void Internal::CMakeProjectPlugin::testCMakeParser_data()
" \".\n") " \".\n")
<< OutputParserTester::STDERR << OutputParserTester::STDERR
<< QString() << QString() << QString() << QString()
<< (QList<ProjectExplorer::Task>() << (Tasks()
<< Task(Task::Error, << Task(Task::Error,
QLatin1String("Parse error. Expected \"(\", got newline with text \" \"."), QLatin1String("Parse error. Expected \"(\", got newline with text \" \"."),
Utils::FileName::fromUserInput(QLatin1String("CMakeLists.txt")), 4, Utils::FileName::fromUserInput(QLatin1String("CMakeLists.txt")), 4,
@@ -270,7 +270,7 @@ void Internal::CMakeProjectPlugin::testCMakeParser_data()
"Argument not separated from preceding token by whitespace.") "Argument not separated from preceding token by whitespace.")
<< OutputParserTester::STDERR << OutputParserTester::STDERR
<< QString() << QString() << QString() << QString()
<< (QList<ProjectExplorer::Task>() << (Tasks()
<< Task(Task::Warning, << Task(Task::Warning,
QLatin1String("Argument not separated from preceding token by whitespace."), QLatin1String("Argument not separated from preceding token by whitespace."),
Utils::FileName::fromUserInput(QLatin1String("/test/path/CMakeLists.txt")), 9, Utils::FileName::fromUserInput(QLatin1String("/test/path/CMakeLists.txt")), 9,
@@ -284,7 +284,7 @@ void Internal::CMakeProjectPlugin::testCMakeParser()
testbench.appendOutputParser(new CMakeParser); testbench.appendOutputParser(new CMakeParser);
QFETCH(QString, input); QFETCH(QString, input);
QFETCH(OutputParserTester::Channel, inputChannel); QFETCH(OutputParserTester::Channel, inputChannel);
QFETCH(QList<Task>, tasks); QFETCH(Tasks, tasks);
QFETCH(QString, childStdOutLines); QFETCH(QString, childStdOutLines);
QFETCH(QString, childStdErrLines); QFETCH(QString, childStdErrLines);
QFETCH(QString, outputLines); QFETCH(QString, outputLines);

4
src/plugins/cmakeprojectmanager/cmakeproject.cpp
View File

@@ -402,9 +402,9 @@ bool CMakeProject::knowsAllBuildExecutables() const
return false; return false;
} }
QList<Task> CMakeProject::projectIssues(const Kit *k) const Tasks CMakeProject::projectIssues(const Kit *k) const
{ {
QList<Task> result = Project::projectIssues(k); Tasks result = Project::projectIssues(k);
if (!CMakeKitAspect::cmakeTool(k)) if (!CMakeKitAspect::cmakeTool(k))
result.append(createProjectTask(Task::TaskType::Error, tr("No cmake tool set."))); result.append(createProjectTask(Task::TaskType::Error, tr("No cmake tool set.")));

2
src/plugins/cmakeprojectmanager/cmakeproject.h
View File

@@ -67,7 +67,7 @@ public:
bool knowsAllBuildExecutables() const final; bool knowsAllBuildExecutables() const final;
QList<ProjectExplorer::Task> projectIssues(const ProjectExplorer::Kit *k) const final; ProjectExplorer::Tasks projectIssues(const ProjectExplorer::Kit *k) const final;
void runCMake(); void runCMake();
void runCMakeAndScanProjectTree(); void runCMakeAndScanProjectTree();

4
src/plugins/debugger/debuggerkitinformation.cpp
View File

@@ -343,9 +343,9 @@ Runnable DebuggerKitAspect::runnable(const Kit *kit)
return runnable; return runnable;
} }
QList<Task> DebuggerKitAspect::validateDebugger(const Kit *k) Tasks DebuggerKitAspect::validateDebugger(const Kit *k)
{ {
QList<Task> result; Tasks result;
const ConfigurationErrors errors = configurationErrors(k); const ConfigurationErrors errors = configurationErrors(k);
if (errors == NoConfigurationError) if (errors == NoConfigurationError)

4
src/plugins/debugger/debuggerkitinformation.h
View File

@@ -41,7 +41,7 @@ class DEBUGGER_EXPORT DebuggerKitAspect : public ProjectExplorer::KitAspect
public: public:
DebuggerKitAspect(); DebuggerKitAspect();
QList<ProjectExplorer::Task> validate(const ProjectExplorer::Kit *k) const override ProjectExplorer::Tasks validate(const ProjectExplorer::Kit *k) const override
{ return DebuggerKitAspect::validateDebugger(k); } { return DebuggerKitAspect::validateDebugger(k); }
void setup(ProjectExplorer::Kit *k) override; void setup(ProjectExplorer::Kit *k) override;
@@ -61,7 +61,7 @@ public:
}; };
Q_DECLARE_FLAGS(ConfigurationErrors, ConfigurationError) Q_DECLARE_FLAGS(ConfigurationErrors, ConfigurationError)
static QList<ProjectExplorer::Task> validateDebugger(const ProjectExplorer::Kit *k); static ProjectExplorer::Tasks validateDebugger(const ProjectExplorer::Kit *k);
static ConfigurationErrors configurationErrors(const ProjectExplorer::Kit *k); static ConfigurationErrors configurationErrors(const ProjectExplorer::Kit *k);
ProjectExplorer::KitAspectWidget *createConfigWidget(ProjectExplorer::Kit *k) const override; ProjectExplorer::KitAspectWidget *createConfigWidget(ProjectExplorer::Kit *k) const override;

2
src/plugins/debugger/debuggerruncontrol.cpp
View File

@@ -959,7 +959,7 @@ DebuggerRunTool::DebuggerRunTool(RunControl *runControl, AllowTerminal allowTerm
// This will only be shown in some cases, but we don't want to access // This will only be shown in some cases, but we don't want to access
// the kit at that time anymore. // the kit at that time anymore.
const QList<Task> tasks = DebuggerKitAspect::validateDebugger(kit); const Tasks tasks = DebuggerKitAspect::validateDebugger(kit);
for (const Task &t : tasks) { for (const Task &t : tasks) {
if (t.type != Task::Warning) if (t.type != Task::Warning)
m_runParameters.validationErrors.append(t.description); m_runParameters.validationErrors.append(t.description);

12
src/plugins/nim/project/nimcompilerbuildstep.cpp
View File

@@ -316,19 +316,19 @@ void NimPlugin::testNimParser_data()
QTest::addColumn<OutputParserTester::Channel>("inputChannel"); QTest::addColumn<OutputParserTester::Channel>("inputChannel");
QTest::addColumn<QString>("childStdOutLines"); QTest::addColumn<QString>("childStdOutLines");
QTest::addColumn<QString>("childStdErrLines"); QTest::addColumn<QString>("childStdErrLines");
QTest::addColumn<QList<ProjectExplorer::Task> >("tasks"); QTest::addColumn<Tasks >("tasks");
QTest::addColumn<QString>("outputLines"); QTest::addColumn<QString>("outputLines");
// negative tests // negative tests
QTest::newRow("pass-through stdout") QTest::newRow("pass-through stdout")
<< "Sometext" << OutputParserTester::STDOUT << "Sometext" << OutputParserTester::STDOUT
<< "Sometext\n" << QString() << "Sometext\n" << QString()
<< QList<Task>() << Tasks()
<< QString(); << QString();
QTest::newRow("pass-through stderr") QTest::newRow("pass-through stderr")
<< "Sometext" << OutputParserTester::STDERR << "Sometext" << OutputParserTester::STDERR
<< QString() << "Sometext\n" << QString() << "Sometext\n"
<< QList<Task>() << Tasks()
<< QString(); << QString();
// positive tests // positive tests
@@ -336,7 +336,7 @@ void NimPlugin::testNimParser_data()
<< QString::fromLatin1("main.nim(23, 1) Error: undeclared identifier: 'x'") << QString::fromLatin1("main.nim(23, 1) Error: undeclared identifier: 'x'")
<< OutputParserTester::STDERR << OutputParserTester::STDERR
<< QString("") << QString("main.nim(23, 1) Error: undeclared identifier: 'x'\n") << QString("") << QString("main.nim(23, 1) Error: undeclared identifier: 'x'\n")
<< QList<Task>({Task(Task::Error, << Tasks({Task(Task::Error,
"Error: undeclared identifier: 'x'", "Error: undeclared identifier: 'x'",
Utils::FileName::fromUserInput("main.nim"), 23, Utils::FileName::fromUserInput("main.nim"), 23,
ProjectExplorer::Constants::TASK_CATEGORY_COMPILE)}) ProjectExplorer::Constants::TASK_CATEGORY_COMPILE)})
@@ -346,7 +346,7 @@ void NimPlugin::testNimParser_data()
<< QString::fromLatin1("lib/pure/parseopt.nim(56, 34) Warning: quoteIfContainsWhite is deprecated [Deprecated]") << QString::fromLatin1("lib/pure/parseopt.nim(56, 34) Warning: quoteIfContainsWhite is deprecated [Deprecated]")
<< OutputParserTester::STDERR << OutputParserTester::STDERR
<< QString("") << QString("lib/pure/parseopt.nim(56, 34) Warning: quoteIfContainsWhite is deprecated [Deprecated]\n") << QString("") << QString("lib/pure/parseopt.nim(56, 34) Warning: quoteIfContainsWhite is deprecated [Deprecated]\n")
<< QList<Task>({Task(Task::Warning, << Tasks({Task(Task::Warning,
"Warning: quoteIfContainsWhite is deprecated [Deprecated]", "Warning: quoteIfContainsWhite is deprecated [Deprecated]",
Utils::FileName::fromUserInput("lib/pure/parseopt.nim"), 56, Utils::FileName::fromUserInput("lib/pure/parseopt.nim"), 56,
ProjectExplorer::Constants::TASK_CATEGORY_COMPILE)}) ProjectExplorer::Constants::TASK_CATEGORY_COMPILE)})
@@ -359,7 +359,7 @@ void NimPlugin::testNimParser()
testbench.appendOutputParser(new NimParser); testbench.appendOutputParser(new NimParser);
QFETCH(QString, input); QFETCH(QString, input);
QFETCH(OutputParserTester::Channel, inputChannel); QFETCH(OutputParserTester::Channel, inputChannel);
QFETCH(QList<Task>, tasks); QFETCH(Tasks, tasks);
QFETCH(QString, childStdOutLines); QFETCH(QString, childStdOutLines);
QFETCH(QString, childStdErrLines); QFETCH(QString, childStdErrLines);
QFETCH(QString, outputLines); QFETCH(QString, outputLines);

7
src/plugins/nim/project/nimproject.cpp
View File

@@ -150,11 +150,10 @@ void NimProject::updateProject()
emitParsingFinished(true); emitParsingFinished(true);
} }
QList<Task> NimProject::projectIssues(const Kit *k) const Tasks NimProject::projectIssues(const Kit *k) const
{ {
QList<Task> result = Project::projectIssues(k); Tasks result = Project::projectIssues(k);
auto tc = dynamic_cast<NimToolChain *>(ToolChainKitAspect::toolChain(k, auto tc = dynamic_cast<NimToolChain *>(ToolChainKitAspect::toolChain(k, Constants::C_NIMLANGUAGE_ID));
Constants::C_NIMLANGUAGE_ID));
if (!tc) { if (!tc) {
result.append(createProjectTask(Task::TaskType::Error, tr("No Nim compiler set."))); result.append(createProjectTask(Task::TaskType::Error, tr("No Nim compiler set.")));
return result; return result;

2
src/plugins/nim/project/nimproject.h
View File

@@ -41,7 +41,7 @@ class NimProject : public ProjectExplorer::Project
public: public:
explicit NimProject(const Utils::FileName &fileName); explicit NimProject(const Utils::FileName &fileName);
QList<ProjectExplorer::Task> projectIssues(const ProjectExplorer::Kit *k) const final; ProjectExplorer::Tasks projectIssues(const ProjectExplorer::Kit *k) const final;
Utils::FileNameList nimFiles() const; Utils::FileNameList nimFiles() const;
QVariantMap toMap() const final; QVariantMap toMap() const final;

2
src/plugins/projectexplorer/ansifilterparser.cpp
View File

@@ -168,7 +168,7 @@ void ProjectExplorerPlugin::testAnsiFilterOutputParser()
QFETCH(QString, childStdErrLines); QFETCH(QString, childStdErrLines);
testbench.testParsing(input, inputChannel, testbench.testParsing(input, inputChannel,
QList<Task>(), childStdOutLines, childStdErrLines, Tasks(), childStdOutLines, childStdErrLines,
QString()); QString());
} }

2
src/plugins/projectexplorer/buildconfiguration.cpp
View File

@@ -404,7 +404,7 @@ BuildConfigurationFactory::~BuildConfigurationFactory()
g_buildConfigurationFactories.removeOne(this); g_buildConfigurationFactories.removeOne(this);
} }
const QList<Task> BuildConfigurationFactory::reportIssues(ProjectExplorer::Kit *kit, const QString &projectPath, const Tasks BuildConfigurationFactory::reportIssues(ProjectExplorer::Kit *kit, const QString &projectPath,
const QString &buildDir) const const QString &buildDir) const
{ {
if (m_issueReporter) if (m_issueReporter)

8
src/plugins/projectexplorer/buildconfiguration.h
View File

@@ -27,6 +27,7 @@
#include "projectexplorer_export.h" #include "projectexplorer_export.h"
#include "projectconfiguration.h" #include "projectconfiguration.h"
#include "task.h"
#include <utils/environment.h> #include <utils/environment.h>
#include <utils/fileutils.h> #include <utils/fileutils.h>
@@ -40,7 +41,6 @@ class Kit;
class NamedWidget; class NamedWidget;
class Node; class Node;
class Target; class Target;
class Task;
class PROJECTEXPLORER_EXPORT BuildConfiguration : public ProjectConfiguration class PROJECTEXPLORER_EXPORT BuildConfiguration : public ProjectConfiguration
{ {
@@ -150,10 +150,10 @@ public:
static BuildConfigurationFactory *find(const Kit *k, const QString &projectPath); static BuildConfigurationFactory *find(const Kit *k, const QString &projectPath);
static BuildConfigurationFactory *find(Target *parent); static BuildConfigurationFactory *find(Target *parent);
using IssueReporter = std::function<QList<ProjectExplorer::Task>(Kit *, const QString &, const QString &)>; using IssueReporter = std::function<Tasks(Kit *, const QString &, const QString &)>;
void setIssueReporter(const IssueReporter &issueReporter); void setIssueReporter(const IssueReporter &issueReporter);
const QList<Task> reportIssues(ProjectExplorer::Kit *kit, const Tasks reportIssues(ProjectExplorer::Kit *kit,
const QString &projectPath, const QString &buildDir) const; const QString &projectPath, const QString &buildDir) const;
protected: protected:
virtual QList<BuildInfo> availableBuilds(const Target *parent) const = 0; virtual QList<BuildInfo> availableBuilds(const Target *parent) const = 0;

2
src/plugins/projectexplorer/buildmanager.cpp
View File

@@ -376,7 +376,7 @@ void BuildManager::nextBuildQueue()
const QString projectName = d->m_currentBuildStep->project()->displayName(); const QString projectName = d->m_currentBuildStep->project()->displayName();
const QString targetName = t->displayName(); const QString targetName = t->displayName();
addToOutputWindow(tr("Error while building/deploying project %1 (kit: %2)").arg(projectName, targetName), BuildStep::OutputFormat::Stderr); addToOutputWindow(tr("Error while building/deploying project %1 (kit: %2)").arg(projectName, targetName), BuildStep::OutputFormat::Stderr);
const QList<Task> kitTasks = t->kit()->validate(); const Tasks kitTasks = t->kit()->validate();
if (!kitTasks.isEmpty()) { if (!kitTasks.isEmpty()) {
addToOutputWindow(tr("The kit %1 has configuration issues which might be the root cause for this problem.") addToOutputWindow(tr("The kit %1 has configuration issues which might be the root cause for this problem.")
.arg(targetName), BuildStep::OutputFormat::Stderr); .arg(targetName), BuildStep::OutputFormat::Stderr);

24
src/plugins/projectexplorer/clangparser.cpp
View File

@@ -141,7 +141,7 @@ void ProjectExplorerPlugin::testClangOutputParser_data()
QTest::addColumn<OutputParserTester::Channel>("inputChannel"); QTest::addColumn<OutputParserTester::Channel>("inputChannel");
QTest::addColumn<QString>("childStdOutLines"); QTest::addColumn<QString>("childStdOutLines");
QTest::addColumn<QString>("childStdErrLines"); QTest::addColumn<QString>("childStdErrLines");
QTest::addColumn<QList<Task> >("tasks"); QTest::addColumn<Tasks >("tasks");
QTest::addColumn<QString>("outputLines"); QTest::addColumn<QString>("outputLines");
const Core::Id categoryCompile = Constants::TASK_CATEGORY_COMPILE; const Core::Id categoryCompile = Constants::TASK_CATEGORY_COMPILE;
@@ -149,19 +149,19 @@ void ProjectExplorerPlugin::testClangOutputParser_data()
QTest::newRow("pass-through stdout") QTest::newRow("pass-through stdout")
<< QString::fromLatin1("Sometext") << OutputParserTester::STDOUT << QString::fromLatin1("Sometext") << OutputParserTester::STDOUT
<< QString::fromLatin1("Sometext\n") << QString() << QString::fromLatin1("Sometext\n") << QString()
<< QList<Task>() << Tasks()
<< QString(); << QString();
QTest::newRow("pass-through stderr") QTest::newRow("pass-through stderr")
<< QString::fromLatin1("Sometext") << OutputParserTester::STDERR << QString::fromLatin1("Sometext") << OutputParserTester::STDERR
<< QString() << QString::fromLatin1("Sometext\n") << QString() << QString::fromLatin1("Sometext\n")
<< QList<Task>() << Tasks()
<< QString(); << QString();
QTest::newRow("clang++ warning") QTest::newRow("clang++ warning")
<< QString::fromLatin1("clang++: warning: argument unused during compilation: '-mthreads'") << QString::fromLatin1("clang++: warning: argument unused during compilation: '-mthreads'")
<< OutputParserTester::STDERR << OutputParserTester::STDERR
<< QString() << QString() << QString() << QString()
<< (QList<Task>() << (Tasks()
<< Task(Task::Warning, << Task(Task::Warning,
QLatin1String("argument unused during compilation: '-mthreads'"), QLatin1String("argument unused during compilation: '-mthreads'"),
Utils::FileName(), -1, Utils::FileName(), -1,
@@ -171,7 +171,7 @@ void ProjectExplorerPlugin::testClangOutputParser_data()
<< QString::fromLatin1("clang++: error: no input files [err_drv_no_input_files]") << QString::fromLatin1("clang++: error: no input files [err_drv_no_input_files]")
<< OutputParserTester::STDERR << OutputParserTester::STDERR
<< QString() << QString() << QString() << QString()
<< (QList<Task>() << (Tasks()
<< Task(Task::Error, << Task(Task::Error,
QLatin1String("no input files [err_drv_no_input_files]"), QLatin1String("no input files [err_drv_no_input_files]"),
Utils::FileName(), -1, Utils::FileName(), -1,
@@ -184,7 +184,7 @@ void ProjectExplorerPlugin::testClangOutputParser_data()
" ^") " ^")
<< OutputParserTester::STDERR << OutputParserTester::STDERR
<< QString() << QString() << QString() << QString()
<< (QList<Task>() << (Tasks()
<< Task(Task::Unknown, << Task(Task::Unknown,
QLatin1String("In file included from ..\\..\\..\\QtSDK1.1\\Desktop\\Qt\\4.7.3\\mingw\\include/QtCore/qnamespace.h:45:"), QLatin1String("In file included from ..\\..\\..\\QtSDK1.1\\Desktop\\Qt\\4.7.3\\mingw\\include/QtCore/qnamespace.h:45:"),
Utils::FileName::fromUserInput(QLatin1String("..\\..\\..\\QtSDK1.1\\Desktop\\Qt\\4.7.3\\mingw\\include/QtCore/qnamespace.h")), 45, Utils::FileName::fromUserInput(QLatin1String("..\\..\\..\\QtSDK1.1\\Desktop\\Qt\\4.7.3\\mingw\\include/QtCore/qnamespace.h")), 45,
@@ -202,7 +202,7 @@ void ProjectExplorerPlugin::testClangOutputParser_data()
" ^") " ^")
<< OutputParserTester::STDERR << OutputParserTester::STDERR
<< QString() << QString() << QString() << QString()
<< (QList<Task>() << (Tasks()
<< Task(Task::Unknown, << Task(Task::Unknown,
QLatin1String("instantiated from:\n" QLatin1String("instantiated from:\n"
"# define Q_CORE_EXPORT Q_DECL_IMPORT\n" "# define Q_CORE_EXPORT Q_DECL_IMPORT\n"
@@ -216,7 +216,7 @@ void ProjectExplorerPlugin::testClangOutputParser_data()
" ^") " ^")
<< OutputParserTester::STDERR << OutputParserTester::STDERR
<< QString() << QString() << QString() << QString()
<< (QList<Task>() << (Tasks()
<< Task(Task::Error, << Task(Task::Error,
QLatin1String("'bits/c++config.h' file not found\n" QLatin1String("'bits/c++config.h' file not found\n"
"#include <bits/c++config.h>\n" "#include <bits/c++config.h>\n"
@@ -231,7 +231,7 @@ void ProjectExplorerPlugin::testClangOutputParser_data()
" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ^") " ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ^")
<< OutputParserTester::STDERR << OutputParserTester::STDERR
<< QString() << QString() << QString() << QString()
<< (QList<Task>() << (Tasks()
<< Task(Task::Warning, << Task(Task::Warning,
QLatin1String("?: has lower precedence than +; + will be evaluated first [-Wparentheses]\n" QLatin1String("?: has lower precedence than +; + will be evaluated first [-Wparentheses]\n"
" int x = option->rect.x() + horizontal ? 2 : 6;\n" " int x = option->rect.x() + horizontal ? 2 : 6;\n"
@@ -245,7 +245,7 @@ void ProjectExplorerPlugin::testClangOutputParser_data()
"CodeSign error: code signing is required for product type 'Application' in SDK 'iOS 7.0'") "CodeSign error: code signing is required for product type 'Application' in SDK 'iOS 7.0'")
<< OutputParserTester::STDERR << OutputParserTester::STDERR
<< QString() << QString::fromLatin1("Check dependencies\n") << QString() << QString::fromLatin1("Check dependencies\n")
<< (QList<Task>() << (Tasks()
<< Task(Task::Error, << Task(Task::Error,
QLatin1String("No matching provisioning profiles found: No provisioning profiles with a valid signing identity (i.e. certificate and private key pair) were found."), QLatin1String("No matching provisioning profiles found: No provisioning profiles with a valid signing identity (i.e. certificate and private key pair) were found."),
Utils::FileName(), -1, Utils::FileName(), -1,
@@ -259,7 +259,7 @@ void ProjectExplorerPlugin::testClangOutputParser_data()
<< QString::fromLatin1("/home/qtwebkithelpviewer.h:0: Note: No relevant classes found. No output generated.") << QString::fromLatin1("/home/qtwebkithelpviewer.h:0: Note: No relevant classes found. No output generated.")
<< OutputParserTester::STDERR << OutputParserTester::STDERR
<< QString() << QString() << QString() << QString()
<< (QList<ProjectExplorer::Task>() << (Tasks()
<< Task(Task::Unknown, << Task(Task::Unknown,
QLatin1String("Note: No relevant classes found. No output generated."), QLatin1String("Note: No relevant classes found. No output generated."),
Utils::FileName::fromUserInput(QLatin1String("/home/qtwebkithelpviewer.h")), 0, Utils::FileName::fromUserInput(QLatin1String("/home/qtwebkithelpviewer.h")), 0,
@@ -274,7 +274,7 @@ void ProjectExplorerPlugin::testClangOutputParser()
testbench.appendOutputParser(new ClangParser); testbench.appendOutputParser(new ClangParser);
QFETCH(QString, input); QFETCH(QString, input);
QFETCH(OutputParserTester::Channel, inputChannel); QFETCH(OutputParserTester::Channel, inputChannel);
QFETCH(QList<Task>, tasks); QFETCH(Tasks, tasks);
QFETCH(QString, childStdOutLines); QFETCH(QString, childStdOutLines);
QFETCH(QString, childStdErrLines); QFETCH(QString, childStdErrLines);
QFETCH(QString, outputLines); QFETCH(QString, outputLines);

40
src/plugins/projectexplorer/customparser.cpp
View File

@@ -215,7 +215,7 @@ void ProjectExplorerPlugin::testCustomOutputParsers_data()
QTest::addColumn<int>("warningMessageCap"); QTest::addColumn<int>("warningMessageCap");
QTest::addColumn<QString>("childStdOutLines"); QTest::addColumn<QString>("childStdOutLines");
QTest::addColumn<QString>("childStdErrLines"); QTest::addColumn<QString>("childStdErrLines");
QTest::addColumn<QList<Task> >("tasks"); QTest::addColumn<Tasks >("tasks");
QTest::addColumn<QString>("outputLines"); QTest::addColumn<QString>("outputLines");
const Core::Id categoryCompile = Constants::TASK_CATEGORY_COMPILE; const Core::Id categoryCompile = Constants::TASK_CATEGORY_COMPILE;
@@ -230,7 +230,7 @@ void ProjectExplorerPlugin::testCustomOutputParsers_data()
<< QString() << 1 << 2 << 3 << QString() << 1 << 2 << 3
<< QString() << 1 << 2 << 3 << QString() << 1 << 2 << 3
<< QString::fromLatin1("Sometext\n") << QString() << QString::fromLatin1("Sometext\n") << QString()
<< QList<Task>() << Tasks()
<< QString(); << QString();
QTest::newRow("pass-through stdout") QTest::newRow("pass-through stdout")
@@ -241,7 +241,7 @@ void ProjectExplorerPlugin::testCustomOutputParsers_data()
<< simplePattern << 1 << 2 << 3 << simplePattern << 1 << 2 << 3
<< QString() << 1 << 2 << 3 << QString() << 1 << 2 << 3
<< QString::fromLatin1("Sometext\n") << QString() << QString::fromLatin1("Sometext\n") << QString()
<< QList<Task>() << Tasks()
<< QString(); << QString();
QTest::newRow("pass-through stderr") QTest::newRow("pass-through stderr")
@@ -252,7 +252,7 @@ void ProjectExplorerPlugin::testCustomOutputParsers_data()
<< simplePattern << 1 << 2 << 3 << simplePattern << 1 << 2 << 3
<< QString() << 1 << 2 << 3 << QString() << 1 << 2 << 3
<< QString() << QString::fromLatin1("Sometext\n") << QString() << QString::fromLatin1("Sometext\n")
<< QList<Task>() << Tasks()
<< QString(); << QString();
const QString simpleError = "main.c:9: error: `sfasdf' undeclared (first use this function)"; const QString simpleError = "main.c:9: error: `sfasdf' undeclared (first use this function)";
@@ -267,7 +267,7 @@ void ProjectExplorerPlugin::testCustomOutputParsers_data()
<< simplePattern << 1 << 2 << 3 << simplePattern << 1 << 2 << 3
<< QString() << 0 << 0 << 0 << QString() << 0 << 0 << 0
<< QString() << QString() << QString() << QString()
<< QList<Task>{Task(Task::Error, message, fileName, 9, categoryCompile)} << Tasks{Task(Task::Error, message, fileName, 9, categoryCompile)}
<< QString(); << QString();
const QString pathPattern = "^([a-z\\./]+):(\\d+): error: ([^\\s].+)$"; const QString pathPattern = "^([a-z\\./]+):(\\d+): error: ([^\\s].+)$";
@@ -282,7 +282,7 @@ void ProjectExplorerPlugin::testCustomOutputParsers_data()
<< pathPattern << 1 << 2 << 3 << pathPattern << 1 << 2 << 3
<< QString() << 0 << 0 << 0 << QString() << 0 << 0 << 0
<< QString() << QString() << QString() << QString()
<< QList<Task>{Task(Task::Error, message, expandedFileName, 9, categoryCompile)} << Tasks{Task(Task::Error, message, expandedFileName, 9, categoryCompile)}
<< QString(); << QString();
expandedFileName = FileName::fromString("/home/src/project/subdir/main.c"); expandedFileName = FileName::fromString("/home/src/project/subdir/main.c");
@@ -294,7 +294,7 @@ void ProjectExplorerPlugin::testCustomOutputParsers_data()
<< pathPattern << 1 << 2 << 3 << pathPattern << 1 << 2 << 3
<< QString() << 0 << 0 << 0 << QString() << 0 << 0 << 0
<< QString() << QString() << QString() << QString()
<< QList<Task>{Task(Task::Error, message, expandedFileName, 9, categoryCompile)} << Tasks{Task(Task::Error, message, expandedFileName, 9, categoryCompile)}
<< QString(); << QString();
workingDir = "/home/src/build-project"; workingDir = "/home/src/build-project";
@@ -306,7 +306,7 @@ void ProjectExplorerPlugin::testCustomOutputParsers_data()
<< pathPattern << 1 << 2 << 3 << pathPattern << 1 << 2 << 3
<< QString() << 0 << 0 << 0 << QString() << 0 << 0 << 0
<< QString() << QString() << QString() << QString()
<< QList<Task>{Task(Task::Error, message, expandedFileName, 9, categoryCompile)} << Tasks{Task(Task::Error, message, expandedFileName, 9, categoryCompile)}
<< QString(); << QString();
QTest::newRow("simple error on wrong channel") QTest::newRow("simple error on wrong channel")
@@ -317,7 +317,7 @@ void ProjectExplorerPlugin::testCustomOutputParsers_data()
<< simplePattern << 1 << 2 << 3 << simplePattern << 1 << 2 << 3
<< QString() << 0 << 0 << 0 << QString() << 0 << 0 << 0
<< simpleErrorPassThrough << QString() << simpleErrorPassThrough << QString()
<< QList<Task>() << Tasks()
<< QString(); << QString();
QTest::newRow("simple error on other wrong channel") QTest::newRow("simple error on other wrong channel")
@@ -328,7 +328,7 @@ void ProjectExplorerPlugin::testCustomOutputParsers_data()
<< simplePattern << 1 << 2 << 3 << simplePattern << 1 << 2 << 3
<< QString() << 0 << 0 << 0 << QString() << 0 << 0 << 0
<< QString() << simpleErrorPassThrough << QString() << simpleErrorPassThrough
<< QList<Task>() << Tasks()
<< QString(); << QString();
const QString simpleError2 = "Error: Line 19 in main.c: `sfasdf' undeclared (first use this function)"; const QString simpleError2 = "Error: Line 19 in main.c: `sfasdf' undeclared (first use this function)";
@@ -343,7 +343,7 @@ void ProjectExplorerPlugin::testCustomOutputParsers_data()
<< simplePattern2 << 2 << 1 << 3 << simplePattern2 << 2 << 1 << 3
<< QString() << 1 << 2 << 3 << QString() << 1 << 2 << 3
<< QString() << QString() << QString() << QString()
<< QList<Task>{Task(Task::Error, message, fileName, lineNumber2, categoryCompile)} << Tasks{Task(Task::Error, message, fileName, lineNumber2, categoryCompile)}
<< QString(); << QString();
QTest::newRow("another simple error on stdout") QTest::newRow("another simple error on stdout")
@@ -354,7 +354,7 @@ void ProjectExplorerPlugin::testCustomOutputParsers_data()
<< simplePattern2 << 2 << 1 << 3 << simplePattern2 << 2 << 1 << 3
<< QString() << 1 << 2 << 3 << QString() << 1 << 2 << 3
<< QString() << QString() << QString() << QString()
<< QList<Task>{Task(Task::Error, message, fileName, lineNumber2, categoryCompile)} << Tasks{Task(Task::Error, message, fileName, lineNumber2, categoryCompile)}
<< QString(); << QString();
const QString simpleWarningPattern = "^([a-z]+\\.[a-z]+):(\\d+): warning: ([^\\s].+)$"; const QString simpleWarningPattern = "^([a-z]+\\.[a-z]+):(\\d+): warning: ([^\\s].+)$";
@@ -369,7 +369,7 @@ void ProjectExplorerPlugin::testCustomOutputParsers_data()
<< QString() << 1 << 2 << 3 << QString() << 1 << 2 << 3
<< simpleWarningPattern << 1 << 2 << 3 << simpleWarningPattern << 1 << 2 << 3
<< QString() << QString() << QString() << QString()
<< QList<Task>{Task(Task::Warning, warningMessage, fileName, 1234, categoryCompile)} << Tasks{Task(Task::Warning, warningMessage, fileName, 1234, categoryCompile)}
<< QString(); << QString();
const QString simpleWarning2 = "Warning: `helloWorld' declared but not used (main.c:19)"; const QString simpleWarning2 = "Warning: `helloWorld' declared but not used (main.c:19)";
@@ -384,7 +384,7 @@ void ProjectExplorerPlugin::testCustomOutputParsers_data()
<< simplePattern2 << 1 << 2 << 3 << simplePattern2 << 1 << 2 << 3
<< simpleWarningPattern2 << 2 << 3 << 1 << simpleWarningPattern2 << 2 << 3 << 1
<< QString() << QString() << QString() << QString()
<< QList<Task>{Task(Task::Warning, warningMessage, fileName, lineNumber2, categoryCompile)} << Tasks{Task(Task::Warning, warningMessage, fileName, lineNumber2, categoryCompile)}
<< QString(); << QString();
QTest::newRow("warning on wrong channel") QTest::newRow("warning on wrong channel")
@@ -395,7 +395,7 @@ void ProjectExplorerPlugin::testCustomOutputParsers_data()
<< QString() << 1 << 2 << 3 << QString() << 1 << 2 << 3
<< simpleWarningPattern2 << 2 << 3 << 1 << simpleWarningPattern2 << 2 << 3 << 1
<< simpleWarningPassThrough2 << QString() << simpleWarningPassThrough2 << QString()
<< QList<Task>() << Tasks()
<< QString(); << QString();
QTest::newRow("warning on other wrong channel") QTest::newRow("warning on other wrong channel")
@@ -406,7 +406,7 @@ void ProjectExplorerPlugin::testCustomOutputParsers_data()
<< QString() << 1 << 2 << 3 << QString() << 1 << 2 << 3
<< simpleWarningPattern2 << 2 << 3 << 1 << simpleWarningPattern2 << 2 << 3 << 1
<< QString() << simpleWarningPassThrough2 << QString() << simpleWarningPassThrough2
<< QList<Task>() << Tasks()
<< QString(); << QString();
QTest::newRow("error and *warning*") QTest::newRow("error and *warning*")
@@ -417,7 +417,7 @@ void ProjectExplorerPlugin::testCustomOutputParsers_data()
<< simplePattern << 1 << 2 << 3 << simplePattern << 1 << 2 << 3
<< simpleWarningPattern << 1 << 2 << 3 << simpleWarningPattern << 1 << 2 << 3
<< QString() << QString() << QString() << QString()
<< QList<Task>{Task(Task::Warning, warningMessage, fileName, 1234, categoryCompile)} << Tasks{Task(Task::Warning, warningMessage, fileName, 1234, categoryCompile)}
<< QString(); << QString();
QTest::newRow("*error* when equal pattern") QTest::newRow("*error* when equal pattern")
@@ -428,7 +428,7 @@ void ProjectExplorerPlugin::testCustomOutputParsers_data()
<< simplePattern << 1 << 2 << 3 << simplePattern << 1 << 2 << 3
<< simplePattern << 1 << 2 << 3 << simplePattern << 1 << 2 << 3
<< QString() << QString() << QString() << QString()
<< QList<Task>{Task(Task::Error, message, fileName, 9, categoryCompile)} << Tasks{Task(Task::Error, message, fileName, 9, categoryCompile)}
<< QString(); << QString();
const QString unitTestError = "../LedDriver/LedDriverTest.c:63: FAIL: Expected 0x0080 Was 0xffff"; const QString unitTestError = "../LedDriver/LedDriverTest.c:63: FAIL: Expected 0x0080 Was 0xffff";
@@ -445,7 +445,7 @@ void ProjectExplorerPlugin::testCustomOutputParsers_data()
<< unitTestPattern << 1 << 2 << 3 << unitTestPattern << 1 << 2 << 3
<< QString() << 1 << 2 << 3 << QString() << 1 << 2 << 3
<< QString() << QString() << QString() << QString()
<< QList<Task>{Task(Task::Error, unitTestMessage, unitTestFileName, unitTestLineNumber, categoryCompile)} << Tasks{Task(Task::Error, unitTestMessage, unitTestFileName, unitTestLineNumber, categoryCompile)}
<< QString(); << QString();
} }
@@ -466,7 +466,7 @@ void ProjectExplorerPlugin::testCustomOutputParsers()
QFETCH(int, warningMessageCap); QFETCH(int, warningMessageCap);
QFETCH(QString, childStdOutLines); QFETCH(QString, childStdOutLines);
QFETCH(QString, childStdErrLines); QFETCH(QString, childStdErrLines);
QFETCH(QList<Task>, tasks); QFETCH(Tasks, tasks);
QFETCH(QString, outputLines); QFETCH(QString, outputLines);
CustomParserSettings settings; CustomParserSettings settings;

8
src/plugins/projectexplorer/extracompiler.cpp
View File

@@ -59,7 +59,7 @@ public:
const Project *project; const Project *project;
Utils::FileName source; Utils::FileName source;
FileNameToContentsHash contents; FileNameToContentsHash contents;
QList<Task> issues; Tasks issues;
QDateTime compileTime; QDateTime compileTime;
Core::IEditor *lastEditor = nullptr; Core::IEditor *lastEditor = nullptr;
QMetaObject::Connection activeBuildConfigConnection; QMetaObject::Connection activeBuildConfigConnection;
@@ -265,7 +265,7 @@ Utils::Environment ExtraCompiler::buildEnvironment() const
return Utils::Environment::systemEnvironment(); return Utils::Environment::systemEnvironment();
} }
void ExtraCompiler::setCompileIssues(const QList<Task> &issues) void ExtraCompiler::setCompileIssues(const Tasks &issues)
{ {
d->issues = issues; d->issues = issues;
d->updateIssues(); d->updateIssues();
@@ -380,10 +380,10 @@ bool ProcessExtraCompiler::prepareToRun(const QByteArray &sourceContents)
return true; return true;
} }
QList<Task> ProcessExtraCompiler::parseIssues(const QByteArray &stdErr) Tasks ProcessExtraCompiler::parseIssues(const QByteArray &stdErr)
{ {
Q_UNUSED(stdErr); Q_UNUSED(stdErr);
return QList<Task>(); return {};
} }
void ProcessExtraCompiler::runImpl(const ContentProvider &provider) void ProcessExtraCompiler::runImpl(const ContentProvider &provider)

4
src/plugins/projectexplorer/extracompiler.h
View File

@@ -79,7 +79,7 @@ signals:
protected: protected:
Utils::Environment buildEnvironment() const; Utils::Environment buildEnvironment() const;
void setCompileIssues(const QList<Task> &issues); void setCompileIssues(const Tasks &issues);
private: private:
void onTargetsBuilt(Project *project); void onTargetsBuilt(Project *project);
@@ -123,7 +123,7 @@ protected:
{ Q_UNUSED(process); Q_UNUSED(sourceContents); } { Q_UNUSED(process); Q_UNUSED(sourceContents); }
virtual FileNameToContentsHash handleProcessFinished(QProcess *process) = 0; virtual FileNameToContentsHash handleProcessFinished(QProcess *process) = 0;
virtual QList<Task> parseIssues(const QByteArray &stdErr); virtual Tasks parseIssues(const QByteArray &stdErr);
private: private:
using ContentProvider = std::function<QByteArray()>; using ContentProvider = std::function<QByteArray()>;

100
src/plugins/projectexplorer/gccparser.cpp
View File

@@ -199,7 +199,7 @@ void ProjectExplorerPlugin::testGccOutputParsers_data()
QTest::addColumn<OutputParserTester::Channel>("inputChannel"); QTest::addColumn<OutputParserTester::Channel>("inputChannel");
QTest::addColumn<QString>("childStdOutLines"); QTest::addColumn<QString>("childStdOutLines");
QTest::addColumn<QString>("childStdErrLines"); QTest::addColumn<QString>("childStdErrLines");
QTest::addColumn<QList<Task> >("tasks"); QTest::addColumn<Tasks >("tasks");
QTest::addColumn<QString>("outputLines"); QTest::addColumn<QString>("outputLines");
const Core::Id categoryCompile = Constants::TASK_CATEGORY_COMPILE; const Core::Id categoryCompile = Constants::TASK_CATEGORY_COMPILE;
@@ -207,18 +207,18 @@ void ProjectExplorerPlugin::testGccOutputParsers_data()
QTest::newRow("pass-through stdout") QTest::newRow("pass-through stdout")
<< QString::fromLatin1("Sometext") << OutputParserTester::STDOUT << QString::fromLatin1("Sometext") << OutputParserTester::STDOUT
<< QString::fromLatin1("Sometext\n") << QString() << QString::fromLatin1("Sometext\n") << QString()
<< QList<Task>() << Tasks()
<< QString(); << QString();
QTest::newRow("pass-through stderr") QTest::newRow("pass-through stderr")
<< QString::fromLatin1("Sometext") << OutputParserTester::STDERR << QString::fromLatin1("Sometext") << OutputParserTester::STDERR
<< QString() << QString::fromLatin1("Sometext\n") << QString() << QString::fromLatin1("Sometext\n")
<< QList<Task>() << Tasks()
<< QString(); << QString();
QTest::newRow("ar output") QTest::newRow("ar output")
<< QString::fromLatin1("../../../../x86/i686-unknown-linux-gnu/bin/i686-unknown-linux-gnu-ar: creating lib/libSkyView.a") << OutputParserTester::STDERR << QString::fromLatin1("../../../../x86/i686-unknown-linux-gnu/bin/i686-unknown-linux-gnu-ar: creating lib/libSkyView.a") << OutputParserTester::STDERR
<< QString() << QString::fromLatin1("../../../../x86/i686-unknown-linux-gnu/bin/i686-unknown-linux-gnu-ar: creating lib/libSkyView.a\n") << QString() << QString::fromLatin1("../../../../x86/i686-unknown-linux-gnu/bin/i686-unknown-linux-gnu-ar: creating lib/libSkyView.a\n")
<< QList<Task>() << Tasks()
<< QString(); << QString();
QTest::newRow("GCCE error") QTest::newRow("GCCE error")
@@ -227,7 +227,7 @@ void ProjectExplorerPlugin::testGccOutputParsers_data()
"/temp/test/untitled8/main.cpp:9: error: (Each undeclared identifier is reported only once for each function it appears in.)") "/temp/test/untitled8/main.cpp:9: error: (Each undeclared identifier is reported only once for each function it appears in.)")
<< OutputParserTester::STDERR << OutputParserTester::STDERR
<< QString() << QString() << QString() << QString()
<< (QList<Task>() << (Tasks()
<< Task(Task::Unknown, << Task(Task::Unknown,
QLatin1String("In function `int main(int, char**)':"), QLatin1String("In function `int main(int, char**)':"),
Utils::FileName::fromUserInput(QLatin1String("/temp/test/untitled8/main.cpp")), -1, Utils::FileName::fromUserInput(QLatin1String("/temp/test/untitled8/main.cpp")), -1,
@@ -246,7 +246,7 @@ void ProjectExplorerPlugin::testGccOutputParsers_data()
<< QString::fromLatin1("/src/corelib/global/qglobal.h:1635: warning: inline function `QDebug qDebug()' used but never defined") << QString::fromLatin1("/src/corelib/global/qglobal.h:1635: warning: inline function `QDebug qDebug()' used but never defined")
<< OutputParserTester::STDERR << OutputParserTester::STDERR
<< QString() << QString() << QString() << QString()
<< (QList<Task>() << (Tasks()
<< Task(Task::Warning, << Task(Task::Warning,
QLatin1String("inline function `QDebug qDebug()' used but never defined"), QLatin1String("inline function `QDebug qDebug()' used but never defined"),
Utils::FileName::fromUserInput(QLatin1String("/src/corelib/global/qglobal.h")), 1635, Utils::FileName::fromUserInput(QLatin1String("/src/corelib/global/qglobal.h")), 1635,
@@ -256,7 +256,7 @@ void ProjectExplorerPlugin::testGccOutputParsers_data()
<< QString::fromLatin1("main.cpp:7:2: warning: Some warning") << QString::fromLatin1("main.cpp:7:2: warning: Some warning")
<< OutputParserTester::STDERR << OutputParserTester::STDERR
<< QString() << QString() << QString() << QString()
<< (QList<Task>() << Task(Task::Warning, << (Tasks() << Task(Task::Warning,
QLatin1String("Some warning"), QLatin1String("Some warning"),
Utils::FileName::fromUserInput(QLatin1String("main.cpp")), 7, Utils::FileName::fromUserInput(QLatin1String("main.cpp")), 7,
categoryCompile)) categoryCompile))
@@ -265,7 +265,7 @@ void ProjectExplorerPlugin::testGccOutputParsers_data()
<< QString::fromLatin1("C:\\temp\\test\\untitled8\\main.cpp:7: #error Symbian error") << QString::fromLatin1("C:\\temp\\test\\untitled8\\main.cpp:7: #error Symbian error")
<< OutputParserTester::STDERR << OutputParserTester::STDERR
<< QString() << QString() << QString() << QString()
<< (QList<Task>() << (Tasks()
<< Task(Task::Error, << Task(Task::Error,
QLatin1String("#error Symbian error"), QLatin1String("#error Symbian error"),
Utils::FileName::fromUserInput(QLatin1String("C:\\temp\\test\\untitled8\\main.cpp")), 7, Utils::FileName::fromUserInput(QLatin1String("C:\\temp\\test\\untitled8\\main.cpp")), 7,
@@ -276,7 +276,7 @@ void ProjectExplorerPlugin::testGccOutputParsers_data()
<< QString::fromLatin1("C:\\temp\\test\\untitled8\\main.cpp:8: warning: #warning Symbian warning") << QString::fromLatin1("C:\\temp\\test\\untitled8\\main.cpp:8: warning: #warning Symbian warning")
<< OutputParserTester::STDERR << OutputParserTester::STDERR
<< QString() << QString() << QString() << QString()
<< (QList<Task>() << (Tasks()
<< Task(Task::Warning, << Task(Task::Warning,
QLatin1String("#warning Symbian warning"), QLatin1String("#warning Symbian warning"),
Utils::FileName::fromUserInput(QLatin1String("C:\\temp\\test\\untitled8\\main.cpp")), 8, Utils::FileName::fromUserInput(QLatin1String("C:\\temp\\test\\untitled8\\main.cpp")), 8,
@@ -286,7 +286,7 @@ void ProjectExplorerPlugin::testGccOutputParsers_data()
<< QString::fromLatin1("/temp/test/untitled8/main.cpp:8:2: warning: #warning Symbian warning") << QString::fromLatin1("/temp/test/untitled8/main.cpp:8:2: warning: #warning Symbian warning")
<< OutputParserTester::STDERR << OutputParserTester::STDERR
<< QString() << QString() << QString() << QString()
<< (QList<Task>() << (Tasks()
<< Task(Task::Warning, << Task(Task::Warning,
QLatin1String("#warning Symbian warning"), QLatin1String("#warning Symbian warning"),
Utils::FileName::fromUserInput(QLatin1String("/temp/test/untitled8/main.cpp")), 8, Utils::FileName::fromUserInput(QLatin1String("/temp/test/untitled8/main.cpp")), 8,
@@ -298,7 +298,7 @@ void ProjectExplorerPlugin::testGccOutputParsers_data()
"collect2: ld returned 1 exit status") "collect2: ld returned 1 exit status")
<< OutputParserTester::STDERR << OutputParserTester::STDERR
<< QString() << QString() << QString() << QString()
<< (QList<Task>() << (Tasks()
<< Task(Task::Unknown, << Task(Task::Unknown,
QLatin1String("In function `main':"), QLatin1String("In function `main':"),
Utils::FileName::fromUserInput(QLatin1String("main.o")), -1, Utils::FileName::fromUserInput(QLatin1String("main.o")), -1,
@@ -319,7 +319,7 @@ void ProjectExplorerPlugin::testGccOutputParsers_data()
"collect2: ld returned 1 exit status") "collect2: ld returned 1 exit status")
<< OutputParserTester::STDERR << OutputParserTester::STDERR
<< QString() << QString() << QString() << QString()
<< (QList<Task>() << (Tasks()
<< Task(Task::Unknown, << Task(Task::Unknown,
QLatin1String("In function `main':"), QLatin1String("In function `main':"),
Utils::FileName::fromUserInput(QLatin1String("main.o")), -1, Utils::FileName::fromUserInput(QLatin1String("main.o")), -1,
@@ -338,7 +338,7 @@ void ProjectExplorerPlugin::testGccOutputParsers_data()
<< QString::fromLatin1("c:\\Qt\\4.6\\lib/QtGuid4.dll: file not recognized: File format not recognized") << QString::fromLatin1("c:\\Qt\\4.6\\lib/QtGuid4.dll: file not recognized: File format not recognized")
<< OutputParserTester::STDERR << OutputParserTester::STDERR
<< QString() << QString() << QString() << QString()
<< (QList<Task>() << (Tasks()
<< Task(Task::Error, << Task(Task::Error,
QLatin1String("file not recognized: File format not recognized"), QLatin1String("file not recognized: File format not recognized"),
Utils::FileName::fromUserInput(QLatin1String("c:\\Qt\\4.6\\lib/QtGuid4.dll")), -1, Utils::FileName::fromUserInput(QLatin1String("c:\\Qt\\4.6\\lib/QtGuid4.dll")), -1,
@@ -348,7 +348,7 @@ void ProjectExplorerPlugin::testGccOutputParsers_data()
<< QString::fromLatin1("g++: /usr/local/lib: No such file or directory") << QString::fromLatin1("g++: /usr/local/lib: No such file or directory")
<< OutputParserTester::STDERR << OutputParserTester::STDERR
<< QString() << QString() << QString() << QString()
<< (QList<Task>() << (Tasks()
<< Task(Task::Error, << Task(Task::Error,
QLatin1String("/usr/local/lib: No such file or directory"), QLatin1String("/usr/local/lib: No such file or directory"),
Utils::FileName(), -1, Utils::FileName(), -1,
@@ -361,7 +361,7 @@ void ProjectExplorerPlugin::testGccOutputParsers_data()
"../../../../master/src/plugins/debugger/gdb/gdbengine.cpp:2115: warning: unused variable 'handler'") "../../../../master/src/plugins/debugger/gdb/gdbengine.cpp:2115: warning: unused variable 'handler'")
<< OutputParserTester::STDERR << OutputParserTester::STDERR
<< QString() << QString() << QString() << QString()
<< (QList<Task>() << (Tasks()
<< Task(Task::Unknown, << Task(Task::Unknown,
QLatin1String("In member function 'void Debugger::Internal::GdbEngine::handleBreakInsert2(const Debugger::Internal::GdbResponse&)':"), QLatin1String("In member function 'void Debugger::Internal::GdbEngine::handleBreakInsert2(const Debugger::Internal::GdbResponse&)':"),
Utils::FileName::fromUserInput(QLatin1String("../../../../master/src/plugins/debugger/gdb/gdbengine.cpp")), -1, Utils::FileName::fromUserInput(QLatin1String("../../../../master/src/plugins/debugger/gdb/gdbengine.cpp")), -1,
@@ -381,7 +381,7 @@ void ProjectExplorerPlugin::testGccOutputParsers_data()
"/home/code/src/creator/src/plugins/projectexplorer/gnumakeparser.cpp:264: error: expected ';' before ':' token") "/home/code/src/creator/src/plugins/projectexplorer/gnumakeparser.cpp:264: error: expected ';' before ':' token")
<< OutputParserTester::STDERR << OutputParserTester::STDERR
<< QString() << QString() << QString() << QString()
<< (QList<Task>() << (Tasks()
<< Task(Task::Unknown, << Task(Task::Unknown,
QLatin1String("In member function 'void ProjectExplorer::ProjectExplorerPlugin::testGnuMakeParserTaskMangling_data()':"), QLatin1String("In member function 'void ProjectExplorer::ProjectExplorerPlugin::testGnuMakeParserTaskMangling_data()':"),
Utils::FileName::fromUserInput(QLatin1String("/home/code/src/creator/src/plugins/projectexplorer/gnumakeparser.cpp")), -1, Utils::FileName::fromUserInput(QLatin1String("/home/code/src/creator/src/plugins/projectexplorer/gnumakeparser.cpp")), -1,
@@ -401,13 +401,13 @@ void ProjectExplorerPlugin::testGccOutputParsers_data()
<< OutputParserTester::STDERR << OutputParserTester::STDERR
<< QString() << QString::fromLatin1("distcc[73168] (dcc_get_hostlist) Warning: no hostlist is set; can't distribute work\n" << QString() << QString::fromLatin1("distcc[73168] (dcc_get_hostlist) Warning: no hostlist is set; can't distribute work\n"
"distcc[73168] (dcc_build_somewhere) Warning: failed to distribute, running locally instead\n") "distcc[73168] (dcc_build_somewhere) Warning: failed to distribute, running locally instead\n")
<< QList<Task>() << Tasks()
<< QString(); << QString();
QTest::newRow("ld warning (QTCREATORBUG-905)") QTest::newRow("ld warning (QTCREATORBUG-905)")
<< QString::fromLatin1("ld: warning: Core::IEditor* QVariant::value<Core::IEditor*>() const has different visibility (hidden) in .obj/debug-shared/openeditorsview.o and (default) in .obj/debug-shared/editormanager.o") << QString::fromLatin1("ld: warning: Core::IEditor* QVariant::value<Core::IEditor*>() const has different visibility (hidden) in .obj/debug-shared/openeditorsview.o and (default) in .obj/debug-shared/editormanager.o")
<< OutputParserTester::STDERR << OutputParserTester::STDERR
<< QString() << QString() << QString() << QString()
<< ( QList<Task>() << ( Tasks()
<< Task(Task::Warning, << Task(Task::Warning,
QLatin1String("Core::IEditor* QVariant::value<Core::IEditor*>() const has different visibility (hidden) in .obj/debug-shared/openeditorsview.o and (default) in .obj/debug-shared/editormanager.o"), QLatin1String("Core::IEditor* QVariant::value<Core::IEditor*>() const has different visibility (hidden) in .obj/debug-shared/openeditorsview.o and (default) in .obj/debug-shared/editormanager.o"),
Utils::FileName(), -1, Utils::FileName(), -1,
@@ -417,7 +417,7 @@ void ProjectExplorerPlugin::testGccOutputParsers_data()
<< QString::fromLatin1("ld: fatal: Symbol referencing errors. No output written to testproject") << QString::fromLatin1("ld: fatal: Symbol referencing errors. No output written to testproject")
<< OutputParserTester::STDERR << OutputParserTester::STDERR
<< QString() << QString() << QString() << QString()
<< ( QList<Task>() << ( Tasks()
<< Task(Task::Error, << Task(Task::Error,
QLatin1String("Symbol referencing errors. No output written to testproject"), QLatin1String("Symbol referencing errors. No output written to testproject"),
Utils::FileName(), -1, Utils::FileName(), -1,
@@ -427,13 +427,13 @@ void ProjectExplorerPlugin::testGccOutputParsers_data()
<< QString::fromLatin1("TeamBuilder Client:: error: could not find Scheduler, running Job locally...") << QString::fromLatin1("TeamBuilder Client:: error: could not find Scheduler, running Job locally...")
<< OutputParserTester::STDERR << OutputParserTester::STDERR
<< QString() << QString::fromLatin1("TeamBuilder Client:: error: could not find Scheduler, running Job locally...\n") << QString() << QString::fromLatin1("TeamBuilder Client:: error: could not find Scheduler, running Job locally...\n")
<< QList<Task>() << Tasks()
<< QString(); << QString();
QTest::newRow("note") QTest::newRow("note")
<< QString::fromLatin1("/home/dev/creator/share/qtcreator/debugger/dumper.cpp:1079: note: initialized from here") << QString::fromLatin1("/home/dev/creator/share/qtcreator/debugger/dumper.cpp:1079: note: initialized from here")
<< OutputParserTester::STDERR << OutputParserTester::STDERR
<< QString() << QString() << QString() << QString()
<< ( QList<Task>() << ( Tasks()
<< Task(Task::Unknown, << Task(Task::Unknown,
QLatin1String("initialized from here"), QLatin1String("initialized from here"),
Utils::FileName::fromUserInput(QLatin1String("/home/dev/creator/share/qtcreator/debugger/dumper.cpp")), 1079, Utils::FileName::fromUserInput(QLatin1String("/home/dev/creator/share/qtcreator/debugger/dumper.cpp")), 1079,
@@ -444,7 +444,7 @@ void ProjectExplorerPlugin::testGccOutputParsers_data()
"/Qt/4.6.2-Symbian/s60sdk/epoc32/include/stdapis/stlport/stl/_tree.c:194: warning: suggest explicit braces to avoid ambiguous 'else'") "/Qt/4.6.2-Symbian/s60sdk/epoc32/include/stdapis/stlport/stl/_tree.c:194: warning: suggest explicit braces to avoid ambiguous 'else'")
<< OutputParserTester::STDERR << OutputParserTester::STDERR
<< QString() << QString() << QString() << QString()
<< ( QList<Task>() << ( Tasks()
<< Task(Task::Unknown, << Task(Task::Unknown,
QLatin1String("In static member function 'static std::_Rb_tree_node_base* std::_Rb_global<_Dummy>::_Rebalance_for_erase(std::_Rb_tree_node_base*, std::_Rb_tree_node_base*&, std::_Rb_tree_node_base*&, std::_Rb_tree_node_base*&)':"), QLatin1String("In static member function 'static std::_Rb_tree_node_base* std::_Rb_global<_Dummy>::_Rebalance_for_erase(std::_Rb_tree_node_base*, std::_Rb_tree_node_base*&, std::_Rb_tree_node_base*&, std::_Rb_tree_node_base*&)':"),
Utils::FileName::fromUserInput(QLatin1String("/Qt/4.6.2-Symbian/s60sdk/epoc32/include/stdapis/stlport/stl/_tree.c")), -1, Utils::FileName::fromUserInput(QLatin1String("/Qt/4.6.2-Symbian/s60sdk/epoc32/include/stdapis/stlport/stl/_tree.c")), -1,
@@ -458,13 +458,13 @@ void ProjectExplorerPlugin::testGccOutputParsers_data()
<< QString::fromLatin1("rm: cannot remove `release/moc_mainwindow.cpp': No such file or directory") << QString::fromLatin1("rm: cannot remove `release/moc_mainwindow.cpp': No such file or directory")
<< OutputParserTester::STDERR << OutputParserTester::STDERR
<< QString() << QString::fromLatin1("rm: cannot remove `release/moc_mainwindow.cpp': No such file or directory\n") << QString() << QString::fromLatin1("rm: cannot remove `release/moc_mainwindow.cpp': No such file or directory\n")
<< QList<Task>() << Tasks()
<< QString(); << QString();
QTest::newRow("ld: missing library") QTest::newRow("ld: missing library")
<< QString::fromLatin1("/usr/bin/ld: cannot find -ldoesnotexist") << QString::fromLatin1("/usr/bin/ld: cannot find -ldoesnotexist")
<< OutputParserTester::STDERR << OutputParserTester::STDERR
<< QString() << QString() << QString() << QString()
<< ( QList<Task>() << ( Tasks()
<< Task(Task::Error, << Task(Task::Error,
QLatin1String("cannot find -ldoesnotexist"), QLatin1String("cannot find -ldoesnotexist"),
Utils::FileName(), -1, Utils::FileName(), -1,
@@ -476,7 +476,7 @@ void ProjectExplorerPlugin::testGccOutputParsers_data()
"../../scriptbug/main.cpp:8: warning: unused variable c") "../../scriptbug/main.cpp:8: warning: unused variable c")
<< OutputParserTester::STDERR << OutputParserTester::STDERR
<< QString() << QString() << QString() << QString()
<< ( QList<Task>() << ( Tasks()
<< Task(Task::Unknown, << Task(Task::Unknown,
QLatin1String("In function void foo(i) [with i = double]:"), QLatin1String("In function void foo(i) [with i = double]:"),
Utils::FileName::fromUserInput(QLatin1String("../../scriptbug/main.cpp")), -1, Utils::FileName::fromUserInput(QLatin1String("../../scriptbug/main.cpp")), -1,
@@ -494,7 +494,7 @@ void ProjectExplorerPlugin::testGccOutputParsers_data()
<< QString::fromLatin1("main.cpp:10: instantiated from here ") << QString::fromLatin1("main.cpp:10: instantiated from here ")
<< OutputParserTester::STDERR << OutputParserTester::STDERR
<< QString() << QString() << QString() << QString()
<< ( QList<Task>() << ( Tasks()
<< Task(Task::Unknown, << Task(Task::Unknown,
QLatin1String("instantiated from here"), QLatin1String("instantiated from here"),
Utils::FileName::fromUserInput(QLatin1String("main.cpp")), 10, Utils::FileName::fromUserInput(QLatin1String("main.cpp")), 10,
@@ -504,7 +504,7 @@ void ProjectExplorerPlugin::testGccOutputParsers_data()
<< QString::fromLatin1("/dev/creator/src/plugins/find/basetextfind.h: In constructor 'Find::BaseTextFind::BaseTextFind(QTextEdit*)':") << QString::fromLatin1("/dev/creator/src/plugins/find/basetextfind.h: In constructor 'Find::BaseTextFind::BaseTextFind(QTextEdit*)':")
<< OutputParserTester::STDERR << OutputParserTester::STDERR
<< QString() << QString() << QString() << QString()
<< ( QList<Task>() << ( Tasks()
<< Task(Task::Unknown, << Task(Task::Unknown,
QLatin1String("In constructor 'Find::BaseTextFind::BaseTextFind(QTextEdit*)':"), QLatin1String("In constructor 'Find::BaseTextFind::BaseTextFind(QTextEdit*)':"),
Utils::FileName::fromUserInput(QLatin1String("/dev/creator/src/plugins/find/basetextfind.h")), -1, Utils::FileName::fromUserInput(QLatin1String("/dev/creator/src/plugins/find/basetextfind.h")), -1,
@@ -519,7 +519,7 @@ void ProjectExplorerPlugin::testGccOutputParsers_data()
"../../scriptbug/main.cpp:5: warning: unused parameter v") "../../scriptbug/main.cpp:5: warning: unused parameter v")
<< OutputParserTester::STDERR << OutputParserTester::STDERR
<< QString() << QString() << QString() << QString()
<< ( QList<Task>() << ( Tasks()
<< Task(Task::Unknown, << Task(Task::Unknown,
QLatin1String("At global scope:"), QLatin1String("At global scope:"),
Utils::FileName::fromUserInput(QLatin1String("../../scriptbug/main.cpp")), -1, Utils::FileName::fromUserInput(QLatin1String("../../scriptbug/main.cpp")), -1,
@@ -546,7 +546,7 @@ void ProjectExplorerPlugin::testGccOutputParsers_data()
<< QString::fromLatin1("/home/code/test.cpp:54:38: fatal error: test.moc: No such file or directory") << QString::fromLatin1("/home/code/test.cpp:54:38: fatal error: test.moc: No such file or directory")
<< OutputParserTester::STDERR << OutputParserTester::STDERR
<< QString() << QString() << QString() << QString()
<< ( QList<Task>() << ( Tasks()
<< Task(Task::Error, << Task(Task::Error,
QLatin1String("test.moc: No such file or directory"), QLatin1String("test.moc: No such file or directory"),
Utils::FileName::fromUserInput(QLatin1String("/home/code/test.cpp")), 54, Utils::FileName::fromUserInput(QLatin1String("/home/code/test.cpp")), 54,
@@ -560,7 +560,7 @@ void ProjectExplorerPlugin::testGccOutputParsers_data()
"collect2: ld returned 1 exit status") "collect2: ld returned 1 exit status")
<< OutputParserTester::STDERR << OutputParserTester::STDERR
<< QString() << QString() << QString() << QString()
<< ( QList<Task>() << ( Tasks()
<< Task(Task::Unknown, << Task(Task::Unknown,
QLatin1String("In function `QPlotAxis':"), QLatin1String("In function `QPlotAxis':"),
Utils::FileName::fromUserInput(QLatin1String("debug/qplotaxis.o")), -1, Utils::FileName::fromUserInput(QLatin1String("debug/qplotaxis.o")), -1,
@@ -587,7 +587,7 @@ void ProjectExplorerPlugin::testGccOutputParsers_data()
"../stl/main.cpp:31: warning: unused parameter index") "../stl/main.cpp:31: warning: unused parameter index")
<< OutputParserTester::STDERR << OutputParserTester::STDERR
<< QString() << QString() << QString() << QString()
<< ( QList<Task>() << ( Tasks()
<< Task(Task::Unknown, << Task(Task::Unknown,
QLatin1String("In member function typename _Vector_base<_Tp, _Alloc>::_Tp_alloc_type::const_reference Vector<_Tp, _Alloc>::at(int) [with _Tp = Point, _Alloc = Allocator<Point>]:"), QLatin1String("In member function typename _Vector_base<_Tp, _Alloc>::_Tp_alloc_type::const_reference Vector<_Tp, _Alloc>::at(int) [with _Tp = Point, _Alloc = Allocator<Point>]:"),
Utils::FileName::fromUserInput(QLatin1String("../stl/main.cpp")), -1, Utils::FileName::fromUserInput(QLatin1String("../stl/main.cpp")), -1,
@@ -617,7 +617,7 @@ void ProjectExplorerPlugin::testGccOutputParsers_data()
"C:/Symbian_SDK/epoc32/include/e32cmn.inl:7094: warning: returning reference to temporary") "C:/Symbian_SDK/epoc32/include/e32cmn.inl:7094: warning: returning reference to temporary")
<< OutputParserTester::STDERR << OutputParserTester::STDERR
<< QString() << QString() << QString() << QString()
<< ( QList<Task>() << ( Tasks()
<< Task(Task::Unknown, << Task(Task::Unknown,
QLatin1String("In file included from C:/Symbian_SDK/epoc32/include/e32cmn.h:6792,"), QLatin1String("In file included from C:/Symbian_SDK/epoc32/include/e32cmn.h:6792,"),
Utils::FileName::fromUserInput(QLatin1String("C:/Symbian_SDK/epoc32/include/e32cmn.h")), 6792, Utils::FileName::fromUserInput(QLatin1String("C:/Symbian_SDK/epoc32/include/e32cmn.h")), 6792,
@@ -640,7 +640,7 @@ void ProjectExplorerPlugin::testGccOutputParsers_data()
<< QString::fromLatin1("../../../src/XmlUg/targetdelete.c: At top level:") << QString::fromLatin1("../../../src/XmlUg/targetdelete.c: At top level:")
<< OutputParserTester::STDERR << OutputParserTester::STDERR
<< QString() << QString() << QString() << QString()
<< ( QList<Task>() << ( Tasks()
<< Task(Task::Unknown, << Task(Task::Unknown,
QLatin1String("At top level:"), QLatin1String("At top level:"),
Utils::FileName::fromUserInput(QLatin1String("../../../src/XmlUg/targetdelete.c")), -1, Utils::FileName::fromUserInput(QLatin1String("../../../src/XmlUg/targetdelete.c")), -1,
@@ -653,7 +653,7 @@ void ProjectExplorerPlugin::testGccOutputParsers_data()
"/Symbian/SDK/epoc32/include/variant/Symbian_OS.hrh:1134:26: warning: no newline at end of file") "/Symbian/SDK/epoc32/include/variant/Symbian_OS.hrh:1134:26: warning: no newline at end of file")
<< OutputParserTester::STDERR << OutputParserTester::STDERR
<< QString() << QString() << QString() << QString()
<< ( QList<Task>() << ( Tasks()
<< Task(Task::Unknown, << Task(Task::Unknown,
QLatin1String("In file included from /Symbian/SDK/EPOC32/INCLUDE/GCCE/GCCE.h:15,"), QLatin1String("In file included from /Symbian/SDK/EPOC32/INCLUDE/GCCE/GCCE.h:15,"),
Utils::FileName::fromUserInput(QLatin1String("/Symbian/SDK/EPOC32/INCLUDE/GCCE/GCCE.h")), 15, Utils::FileName::fromUserInput(QLatin1String("/Symbian/SDK/EPOC32/INCLUDE/GCCE/GCCE.h")), 15,
@@ -672,7 +672,7 @@ void ProjectExplorerPlugin::testGccOutputParsers_data()
<< QString::fromLatin1("release/main.o:main.cpp:(.text+0x42): undefined reference to `MainWindow::doSomething()'") << QString::fromLatin1("release/main.o:main.cpp:(.text+0x42): undefined reference to `MainWindow::doSomething()'")
<< OutputParserTester::STDERR << OutputParserTester::STDERR
<< QString() << QString() << QString() << QString()
<< ( QList<Task>() << ( Tasks()
<< Task(Task::Error, << Task(Task::Error,
QLatin1String("undefined reference to `MainWindow::doSomething()'"), QLatin1String("undefined reference to `MainWindow::doSomething()'"),
Utils::FileName::fromUserInput(QLatin1String("main.cpp")), -1, Utils::FileName::fromUserInput(QLatin1String("main.cpp")), -1,
@@ -684,7 +684,7 @@ void ProjectExplorerPlugin::testGccOutputParsers_data()
"../../../src/shared/proparser/profileevaluator.cpp:2817:9: warning: case value '0' not in enumerated type 'ProFileEvaluator::Private::TestFunc'") "../../../src/shared/proparser/profileevaluator.cpp:2817:9: warning: case value '0' not in enumerated type 'ProFileEvaluator::Private::TestFunc'")
<< OutputParserTester::STDERR << OutputParserTester::STDERR
<< QString() << QString() << QString() << QString()
<< ( QList<Task>() << ( Tasks()
<< Task(Task::Unknown, << Task(Task::Unknown,
QLatin1String("In member function 'ProFileEvaluator::Private::VisitReturn ProFileEvaluator::Private::evaluateConditionalFunction(const ProString&, const ProStringList&)':"), QLatin1String("In member function 'ProFileEvaluator::Private::VisitReturn ProFileEvaluator::Private::evaluateConditionalFunction(const ProString&, const ProStringList&)':"),
Utils::FileName::fromUserInput(QLatin1String("../../../src/shared/proparser/profileevaluator.cpp")), -1, Utils::FileName::fromUserInput(QLatin1String("../../../src/shared/proparser/profileevaluator.cpp")), -1,
@@ -700,7 +700,7 @@ void ProjectExplorerPlugin::testGccOutputParsers_data()
"./mw.h:4:0: warning: \"STUPID_DEFINE\" redefined") "./mw.h:4:0: warning: \"STUPID_DEFINE\" redefined")
<< OutputParserTester::STDERR << OutputParserTester::STDERR
<< QString() << QString() << QString() << QString()
<< ( QList<Task>() << ( Tasks()
<< Task(Task::Unknown, << Task(Task::Unknown,
QLatin1String("In file included from <command-line>:0:0:"), QLatin1String("In file included from <command-line>:0:0:"),
Utils::FileName::fromUserInput(QLatin1String("<command-line>")), 0, Utils::FileName::fromUserInput(QLatin1String("<command-line>")), 0,
@@ -716,7 +716,7 @@ void ProjectExplorerPlugin::testGccOutputParsers_data()
"file.h:21:5: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]") "file.h:21:5: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]")
<< OutputParserTester::STDERR << OutputParserTester::STDERR
<< QString() << QString() << QString() << QString()
<< ( QList<Task>() << ( Tasks()
<< Task(Task::Unknown, << Task(Task::Unknown,
QLatin1String("In function 'void UnitTest::CheckEqual(UnitTest::TestResults&, const Expected&, const Actual&, const UnitTest::TestDetails&) [with Expected = unsigned int, Actual = int]':"), QLatin1String("In function 'void UnitTest::CheckEqual(UnitTest::TestResults&, const Expected&, const Actual&, const UnitTest::TestDetails&) [with Expected = unsigned int, Actual = int]':"),
Utils::FileName::fromUserInput(QLatin1String("file.h")), -1, Utils::FileName::fromUserInput(QLatin1String("file.h")), -1,
@@ -734,7 +734,7 @@ void ProjectExplorerPlugin::testGccOutputParsers_data()
<< QString::fromLatin1("cns5k_ins_parser_tests.cpp:(.text._ZN20CNS5kINSParserEngine21DropBytesUntilStartedEP14CircularBufferIhE[CNS5kINSParserEngine::DropBytesUntilStarted(CircularBuffer<unsigned char>*)]+0x6d): undefined reference to `CNS5kINSPacket::SOH_BYTE'") << QString::fromLatin1("cns5k_ins_parser_tests.cpp:(.text._ZN20CNS5kINSParserEngine21DropBytesUntilStartedEP14CircularBufferIhE[CNS5kINSParserEngine::DropBytesUntilStarted(CircularBuffer<unsigned char>*)]+0x6d): undefined reference to `CNS5kINSPacket::SOH_BYTE'")
<< OutputParserTester::STDERR << OutputParserTester::STDERR
<< QString() << QString() << QString() << QString()
<< ( QList<Task>() << ( Tasks()
<< Task(Task::Error, << Task(Task::Error,
QLatin1String("undefined reference to `CNS5kINSPacket::SOH_BYTE'"), QLatin1String("undefined reference to `CNS5kINSPacket::SOH_BYTE'"),
Utils::FileName::fromUserInput(QLatin1String("cns5k_ins_parser_tests.cpp")), -1, Utils::FileName::fromUserInput(QLatin1String("cns5k_ins_parser_tests.cpp")), -1,
@@ -745,7 +745,7 @@ void ProjectExplorerPlugin::testGccOutputParsers_data()
<< QString::fromLatin1("mainwindow.ui: Warning: The name 'pushButton' (QPushButton) is already in use, defaulting to 'pushButton1'.") << QString::fromLatin1("mainwindow.ui: Warning: The name 'pushButton' (QPushButton) is already in use, defaulting to 'pushButton1'.")
<< OutputParserTester::STDERR << OutputParserTester::STDERR
<< QString() << QString() << QString() << QString()
<< ( QList<Task>() << ( Tasks()
<< Task(Task::Warning, << Task(Task::Warning,
QLatin1String("The name 'pushButton' (QPushButton) is already in use, defaulting to 'pushButton1'."), QLatin1String("The name 'pushButton' (QPushButton) is already in use, defaulting to 'pushButton1'."),
Utils::FileName::fromUserInput(QLatin1String("mainwindow.ui")), -1, Utils::FileName::fromUserInput(QLatin1String("mainwindow.ui")), -1,
@@ -756,7 +756,7 @@ void ProjectExplorerPlugin::testGccOutputParsers_data()
<< QString::fromLatin1("libimf.so: warning: warning: feupdateenv is not implemented and will always fail") << QString::fromLatin1("libimf.so: warning: warning: feupdateenv is not implemented and will always fail")
<< OutputParserTester::STDERR << OutputParserTester::STDERR
<< QString() << QString() << QString() << QString()
<< ( QList<Task>() << ( Tasks()
<< Task(Task::Warning, << Task(Task::Warning,
QLatin1String("warning: feupdateenv is not implemented and will always fail"), QLatin1String("warning: feupdateenv is not implemented and will always fail"),
Utils::FileName::fromUserInput(QLatin1String("libimf.so")), -1, Utils::FileName::fromUserInput(QLatin1String("libimf.so")), -1,
@@ -770,7 +770,7 @@ void ProjectExplorerPlugin::testGccOutputParsers_data()
" ^") " ^")
<< OutputParserTester::STDERR << OutputParserTester::STDERR
<< QString() << QString() << QString() << QString()
<< ( QList<Task>() << ( Tasks()
<< Task(Task::Unknown, << Task(Task::Unknown,
QLatin1String("In file included from /home/code/src/creator/src/libs/extensionsystem/pluginerrorview.cpp:31:0:"), QLatin1String("In file included from /home/code/src/creator/src/libs/extensionsystem/pluginerrorview.cpp:31:0:"),
Utils::FileName::fromUserInput(QLatin1String("/home/code/src/creator/src/libs/extensionsystem/pluginerrorview.cpp")), 31, Utils::FileName::fromUserInput(QLatin1String("/home/code/src/creator/src/libs/extensionsystem/pluginerrorview.cpp")), 31,
@@ -791,7 +791,7 @@ void ProjectExplorerPlugin::testGccOutputParsers_data()
"main.cpp:7:22: error: within this context") "main.cpp:7:22: error: within this context")
<< OutputParserTester::STDERR << OutputParserTester::STDERR
<< QString() << QString() << QString() << QString()
<< ( QList<Task>() << ( Tasks()
<< Task(Task::Unknown, << Task(Task::Unknown,
QLatin1String("In file included from /usr/include/qt4/QtCore/QString:1:0,"), QLatin1String("In file included from /usr/include/qt4/QtCore/QString:1:0,"),
Utils::FileName::fromUserInput(QLatin1String("/usr/include/qt4/QtCore/QString")), 1, Utils::FileName::fromUserInput(QLatin1String("/usr/include/qt4/QtCore/QString")), 1,
@@ -821,7 +821,7 @@ void ProjectExplorerPlugin::testGccOutputParsers_data()
"collect2: error: ld returned 1 exit status") "collect2: error: ld returned 1 exit status")
<< OutputParserTester::STDERR << OutputParserTester::STDERR
<< QString() << QString() << QString() << QString()
<< (QList<Task>() << (Tasks()
<< Task(Task::Unknown, << Task(Task::Unknown,
QLatin1String("In function `foo()':"), QLatin1String("In function `foo()':"),
Utils::FileName::fromUserInput(QLatin1String("foo.o")), -1, Utils::FileName::fromUserInput(QLatin1String("foo.o")), -1,
@@ -847,7 +847,7 @@ void ProjectExplorerPlugin::testGccOutputParsers_data()
"collect2: error: ld returned 1 exit status") "collect2: error: ld returned 1 exit status")
<< OutputParserTester::STDERR << OutputParserTester::STDERR
<< QString() << QString() << QString() << QString()
<< (QList<Task>() << (Tasks()
<< Task(Task::Error, << Task(Task::Error,
QLatin1String("multiple definition of `foo'"), QLatin1String("multiple definition of `foo'"),
Utils::FileName::fromUserInput(QLatin1String("foo.o")), -1, Utils::FileName::fromUserInput(QLatin1String("foo.o")), -1,
@@ -867,7 +867,7 @@ void ProjectExplorerPlugin::testGccOutputParsers_data()
<< "obj/gtest-clang-printing.o:gtest-clang-printing.cpp:llvm::VerifyDisableABIBreakingChecks: error: undefined reference to 'llvm::DisableABIBreakingChecks'" << "obj/gtest-clang-printing.o:gtest-clang-printing.cpp:llvm::VerifyDisableABIBreakingChecks: error: undefined reference to 'llvm::DisableABIBreakingChecks'"
<< OutputParserTester::STDERR << OutputParserTester::STDERR
<< QString() << QString() << QString() << QString()
<< (QList<Task>() << (Tasks()
<< Task(Task::Error, << Task(Task::Error,
QLatin1String("error: undefined reference to 'llvm::DisableABIBreakingChecks'"), QLatin1String("error: undefined reference to 'llvm::DisableABIBreakingChecks'"),
Utils::FileName::fromString("gtest-clang-printing.cpp"), -1, Utils::FileName::fromString("gtest-clang-printing.cpp"), -1,
@@ -879,7 +879,7 @@ void ProjectExplorerPlugin::testGccOutputParsers_data()
<< QString::fromLatin1("ranlib: file: lib/libtest.a(Test0.cpp.o) has no symbols") << QString::fromLatin1("ranlib: file: lib/libtest.a(Test0.cpp.o) has no symbols")
<< OutputParserTester::STDERR << OutputParserTester::STDERR
<< QString() << QString() << QString() << QString()
<< (QList<Task>() << (Tasks()
<< Task(Task::Warning, << Task(Task::Warning,
QLatin1String("file: lib/libtest.a(Test0.cpp.o) has no symbols"), QLatin1String("file: lib/libtest.a(Test0.cpp.o) has no symbols"),
Utils::FileName(), -1, Utils::FileName(), -1,
@@ -890,7 +890,7 @@ void ProjectExplorerPlugin::testGccOutputParsers_data()
<< QString::fromLatin1("/path/to/XCode/and/ranlib: file: lib/libtest.a(Test0.cpp.o) has no symbols") << QString::fromLatin1("/path/to/XCode/and/ranlib: file: lib/libtest.a(Test0.cpp.o) has no symbols")
<< OutputParserTester::STDERR << OutputParserTester::STDERR
<< QString() << QString() << QString() << QString()
<< (QList<Task>() << (Tasks()
<< Task(Task::Warning, << Task(Task::Warning,
QLatin1String("file: lib/libtest.a(Test0.cpp.o) has no symbols"), QLatin1String("file: lib/libtest.a(Test0.cpp.o) has no symbols"),
Utils::FileName(), -1, Utils::FileName(), -1,
@@ -901,7 +901,7 @@ void ProjectExplorerPlugin::testGccOutputParsers_data()
<< QString::fromLatin1("/home/qtwebkithelpviewer.h:0: Note: No relevant classes found. No output generated.") << QString::fromLatin1("/home/qtwebkithelpviewer.h:0: Note: No relevant classes found. No output generated.")
<< OutputParserTester::STDERR << OutputParserTester::STDERR
<< QString() << QString() << QString() << QString()
<< (QList<ProjectExplorer::Task>() << (Tasks()
<< Task(Task::Unknown, << Task(Task::Unknown,
QLatin1String("Note: No relevant classes found. No output generated."), QLatin1String("Note: No relevant classes found. No output generated."),
Utils::FileName::fromUserInput(QLatin1String("/home/qtwebkithelpviewer.h")), 0, Utils::FileName::fromUserInput(QLatin1String("/home/qtwebkithelpviewer.h")), 0,
@@ -916,7 +916,7 @@ void ProjectExplorerPlugin::testGccOutputParsers()
testbench.appendOutputParser(new GccParser); testbench.appendOutputParser(new GccParser);
QFETCH(QString, input); QFETCH(QString, input);
QFETCH(OutputParserTester::Channel, inputChannel); QFETCH(OutputParserTester::Channel, inputChannel);
QFETCH(QList<Task>, tasks); QFETCH(Tasks, tasks);
QFETCH(QString, childStdOutLines); QFETCH(QString, childStdOutLines);
QFETCH(QString, childStdErrLines); QFETCH(QString, childStdErrLines);
QFETCH(QString, outputLines); QFETCH(QString, outputLines);

34
src/plugins/projectexplorer/gnumakeparser.cpp
View File

@@ -234,7 +234,7 @@ void ProjectExplorerPlugin::testGnuMakeParserParsing_data()
QTest::addColumn<OutputParserTester::Channel>("inputChannel"); QTest::addColumn<OutputParserTester::Channel>("inputChannel");
QTest::addColumn<QString>("childStdOutLines"); QTest::addColumn<QString>("childStdOutLines");
QTest::addColumn<QString>("childStdErrLines"); QTest::addColumn<QString>("childStdErrLines");
QTest::addColumn<QList<Task> >("tasks"); QTest::addColumn<Tasks >("tasks");
QTest::addColumn<QString>("outputLines"); QTest::addColumn<QString>("outputLines");
QTest::addColumn<QStringList>("additionalSearchDirs"); QTest::addColumn<QStringList>("additionalSearchDirs");
@@ -242,14 +242,14 @@ void ProjectExplorerPlugin::testGnuMakeParserParsing_data()
<< QStringList() << QStringList()
<< QString::fromLatin1("Sometext") << OutputParserTester::STDOUT << QString::fromLatin1("Sometext") << OutputParserTester::STDOUT
<< QString::fromLatin1("Sometext\n") << QString() << QString::fromLatin1("Sometext\n") << QString()
<< QList<Task>() << Tasks()
<< QString() << QString()
<< QStringList(); << QStringList();
QTest::newRow("pass-through stderr") QTest::newRow("pass-through stderr")
<< QStringList() << QStringList()
<< QString::fromLatin1("Sometext") << OutputParserTester::STDERR << QString::fromLatin1("Sometext") << OutputParserTester::STDERR
<< QString() << QString::fromLatin1("Sometext\n") << QString() << QString::fromLatin1("Sometext\n")
<< QList<Task>() << Tasks()
<< QString() << QString()
<< QStringList(); << QStringList();
QTest::newRow("pass-through gcc infos") QTest::newRow("pass-through gcc infos")
@@ -266,7 +266,7 @@ void ProjectExplorerPlugin::testGnuMakeParserParsing_data()
"../../scriptbug/main.cpp: In instantiation of void bar(i) [with i = double]:\n" "../../scriptbug/main.cpp: In instantiation of void bar(i) [with i = double]:\n"
"../../scriptbug/main.cpp:8: instantiated from void foo(i) [with i = double]\n" "../../scriptbug/main.cpp:8: instantiated from void foo(i) [with i = double]\n"
"../../scriptbug/main.cpp:22: instantiated from here\n") "../../scriptbug/main.cpp:22: instantiated from here\n")
<< QList<Task>() << Tasks()
<< QString() << QString()
<< QStringList(); << QStringList();
@@ -277,7 +277,7 @@ void ProjectExplorerPlugin::testGnuMakeParserParsing_data()
"make[4]: Entering directory `/home/code/build/qt/examples/opengl/grabber'") "make[4]: Entering directory `/home/code/build/qt/examples/opengl/grabber'")
<< OutputParserTester::STDOUT << OutputParserTester::STDOUT
<< QString() << QString() << QString() << QString()
<< QList<Task>() << Tasks()
<< QString() << QString()
<< QStringList({"/home/code/build/qt/examples/opengl/grabber", << QStringList({"/home/code/build/qt/examples/opengl/grabber",
"/home/code/build/qt/examples/opengl/grabber", "/test/dir"}); "/home/code/build/qt/examples/opengl/grabber", "/test/dir"});
@@ -286,7 +286,7 @@ void ProjectExplorerPlugin::testGnuMakeParserParsing_data()
<< QString::fromLatin1("make[4]: Leaving directory `/home/code/build/qt/examples/opengl/grabber'") << QString::fromLatin1("make[4]: Leaving directory `/home/code/build/qt/examples/opengl/grabber'")
<< OutputParserTester::STDOUT << OutputParserTester::STDOUT
<< QString() << QString() << QString() << QString()
<< QList<Task>() << Tasks()
<< QString() << QString()
<< QStringList("/test/dir"); << QStringList("/test/dir");
QTest::newRow("make error") QTest::newRow("make error")
@@ -294,7 +294,7 @@ void ProjectExplorerPlugin::testGnuMakeParserParsing_data()
<< QString::fromLatin1("make: *** No rule to make target `hello.c', needed by `hello.o'. Stop.") << QString::fromLatin1("make: *** No rule to make target `hello.c', needed by `hello.o'. Stop.")
<< OutputParserTester::STDERR << OutputParserTester::STDERR
<< QString() << QString() << QString() << QString()
<< (QList<Task>() << (Tasks()
<< Task(Task::Error, << Task(Task::Error,
QString::fromLatin1("No rule to make target `hello.c', needed by `hello.o'. Stop."), QString::fromLatin1("No rule to make target `hello.c', needed by `hello.o'. Stop."),
Utils::FileName(), -1, Utils::FileName(), -1,
@@ -308,7 +308,7 @@ void ProjectExplorerPlugin::testGnuMakeParserParsing_data()
"make[2]: *** [sub-projectexplorer-make_default] Error 2") "make[2]: *** [sub-projectexplorer-make_default] Error 2")
<< OutputParserTester::STDERR << OutputParserTester::STDERR
<< QString() << QString() << QString() << QString()
<< (QList<Task>() << (Tasks()
<< Task(Task::Error, << Task(Task::Error,
QString::fromLatin1("[.obj/debug-shared/gnumakeparser.o] Error 1"), QString::fromLatin1("[.obj/debug-shared/gnumakeparser.o] Error 1"),
Utils::FileName(), -1, Utils::FileName(), -1,
@@ -320,7 +320,7 @@ void ProjectExplorerPlugin::testGnuMakeParserParsing_data()
<< QString::fromLatin1("Makefile:360: *** missing separator (did you mean TAB instead of 8 spaces?). Stop.") << QString::fromLatin1("Makefile:360: *** missing separator (did you mean TAB instead of 8 spaces?). Stop.")
<< OutputParserTester::STDERR << OutputParserTester::STDERR
<< QString() << QString() << QString() << QString()
<< (QList<Task>() << (Tasks()
<< Task(Task::Error, << Task(Task::Error,
QString::fromLatin1("missing separator (did you mean TAB instead of 8 spaces?). Stop."), QString::fromLatin1("missing separator (did you mean TAB instead of 8 spaces?). Stop."),
Utils::FileName::fromUserInput(QLatin1String("Makefile")), 360, Utils::FileName::fromUserInput(QLatin1String("Makefile")), 360,
@@ -333,7 +333,7 @@ void ProjectExplorerPlugin::testGnuMakeParserParsing_data()
"mingw32-make: *** [debug] Error 2") "mingw32-make: *** [debug] Error 2")
<< OutputParserTester::STDERR << OutputParserTester::STDERR
<< QString() << QString() << QString() << QString()
<< (QList<Task>() << (Tasks()
<< Task(Task::Error, << Task(Task::Error,
QString::fromLatin1("[debug/qplotaxis.o] Error 1"), QString::fromLatin1("[debug/qplotaxis.o] Error 1"),
Utils::FileName(), -1, Utils::FileName(), -1,
@@ -345,7 +345,7 @@ void ProjectExplorerPlugin::testGnuMakeParserParsing_data()
<< QString::fromLatin1("mingw64-make.exe[1]: *** [dynlib.inst] Error -1073741819") << QString::fromLatin1("mingw64-make.exe[1]: *** [dynlib.inst] Error -1073741819")
<< OutputParserTester::STDERR << OutputParserTester::STDERR
<< QString() << QString() << QString() << QString()
<< (QList<Task>() << (Tasks()
<< Task(Task::Error, << Task(Task::Error,
QString::fromLatin1("[dynlib.inst] Error -1073741819"), QString::fromLatin1("[dynlib.inst] Error -1073741819"),
Utils::FileName(), -1, Utils::FileName(), -1,
@@ -357,7 +357,7 @@ void ProjectExplorerPlugin::testGnuMakeParserParsing_data()
<< QString::fromLatin1("make[2]: warning: jobserver unavailable: using -j1. Add `+' to parent make rule.") << QString::fromLatin1("make[2]: warning: jobserver unavailable: using -j1. Add `+' to parent make rule.")
<< OutputParserTester::STDERR << OutputParserTester::STDERR
<< QString() << QString() << QString() << QString()
<< (QList<Task>() << (Tasks()
<< Task(Task::Warning, << Task(Task::Warning,
QString::fromLatin1("jobserver unavailable: using -j1. Add `+' to parent make rule."), QString::fromLatin1("jobserver unavailable: using -j1. Add `+' to parent make rule."),
Utils::FileName(), -1, Utils::FileName(), -1,
@@ -369,7 +369,7 @@ void ProjectExplorerPlugin::testGnuMakeParserParsing_data()
<< QString::fromLatin1("/home/dev/creator/share/qtcreator/debugger/dumper.cpp:1079: note: initialized from here") << QString::fromLatin1("/home/dev/creator/share/qtcreator/debugger/dumper.cpp:1079: note: initialized from here")
<< OutputParserTester::STDERR << OutputParserTester::STDERR
<< QString() << QString::fromLatin1("/home/dev/creator/share/qtcreator/debugger/dumper.cpp:1079: note: initialized from here\n") << QString() << QString::fromLatin1("/home/dev/creator/share/qtcreator/debugger/dumper.cpp:1079: note: initialized from here\n")
<< QList<Task>() << Tasks()
<< QString() << QString()
<< QStringList(); << QStringList();
QTest::newRow("Full path make exe") QTest::newRow("Full path make exe")
@@ -377,7 +377,7 @@ void ProjectExplorerPlugin::testGnuMakeParserParsing_data()
<< QString::fromLatin1("C:\\Qt\\4.6.2-Symbian\\s60sdk\\epoc32\\tools\\make.exe: *** [sis] Error 2") << QString::fromLatin1("C:\\Qt\\4.6.2-Symbian\\s60sdk\\epoc32\\tools\\make.exe: *** [sis] Error 2")
<< OutputParserTester::STDERR << OutputParserTester::STDERR
<< QString() << QString() << QString() << QString()
<< (QList<Task>() << (Tasks()
<< Task(Task::Error, << Task(Task::Error,
QString::fromLatin1("[sis] Error 2"), QString::fromLatin1("[sis] Error 2"),
Utils::FileName(), -1, Utils::FileName(), -1,
@@ -389,7 +389,7 @@ void ProjectExplorerPlugin::testGnuMakeParserParsing_data()
<< QString::fromLatin1("make: g++: Command not found") << QString::fromLatin1("make: g++: Command not found")
<< OutputParserTester::STDERR << OutputParserTester::STDERR
<< QString() << QString() << QString() << QString()
<< (QList<Task>() << (Tasks()
<< Task(Task::Error, << Task(Task::Error,
QString::fromLatin1("g++: Command not found"), QString::fromLatin1("g++: Command not found"),
Utils::FileName(), -1, Utils::FileName(), -1,
@@ -401,7 +401,7 @@ void ProjectExplorerPlugin::testGnuMakeParserParsing_data()
<< QString::fromLatin1("Makefile:794: warning: overriding commands for target `xxxx.app/Contents/Info.plist'") << QString::fromLatin1("Makefile:794: warning: overriding commands for target `xxxx.app/Contents/Info.plist'")
<< OutputParserTester::STDERR << OutputParserTester::STDERR
<< QString() << QString() << QString() << QString()
<< (QList<Task>() << (Tasks()
<< Task(Task::Warning, << Task(Task::Warning,
QString::fromLatin1("overriding commands for target `xxxx.app/Contents/Info.plist'"), QString::fromLatin1("overriding commands for target `xxxx.app/Contents/Info.plist'"),
Utils::FileName::fromString(QLatin1String("Makefile")), 794, Utils::FileName::fromString(QLatin1String("Makefile")), 794,
@@ -422,7 +422,7 @@ void ProjectExplorerPlugin::testGnuMakeParserParsing()
QFETCH(QStringList, extraSearchDirs); QFETCH(QStringList, extraSearchDirs);
QFETCH(QString, input); QFETCH(QString, input);
QFETCH(OutputParserTester::Channel, inputChannel); QFETCH(OutputParserTester::Channel, inputChannel);
QFETCH(QList<Task>, tasks); QFETCH(Tasks, tasks);
QFETCH(QString, childStdOutLines); QFETCH(QString, childStdOutLines);
QFETCH(QString, childStdErrLines); QFETCH(QString, childStdErrLines);
QFETCH(QString, outputLines); QFETCH(QString, outputLines);

6
src/plugins/projectexplorer/kit.cpp
View File

@@ -255,9 +255,9 @@ bool Kit::hasWarning() const
return d->m_hasWarning; return d->m_hasWarning;
} }
QList<Task> Kit::validate() const Tasks Kit::validate() const
{ {
QList<Task> result; Tasks result;
for (KitAspect *aspect : KitManager::kitAspects()) for (KitAspect *aspect : KitManager::kitAspects())
result.append(aspect->validate(this)); result.append(aspect->validate(this));
@@ -550,7 +550,7 @@ IOutputParser *Kit::createOutputParser() const
return first; return first;
} }
QString Kit::toHtml(const QList<Task> &additional) const QString Kit::toHtml(const Tasks &additional) const
{ {
QString result; QString result;
QTextStream str(&result); QTextStream str(&result);

4
src/plugins/projectexplorer/kit.h
View File

@@ -71,7 +71,7 @@ public:
bool isValid() const; bool isValid() const;
bool hasWarning() const; bool hasWarning() const;
QList<Task> validate() const; Tasks validate() const;
void fix(); // Fix the individual kit information: Make sure it contains a valid value. void fix(); // Fix the individual kit information: Make sure it contains a valid value.
// Fix will not look at other information in the kit! // Fix will not look at other information in the kit!
void setup(); // Apply advanced magic(TM). Used only once on each kit during initial setup. void setup(); // Apply advanced magic(TM). Used only once on each kit during initial setup.
@@ -116,7 +116,7 @@ public:
void addToEnvironment(Utils::Environment &env) const; void addToEnvironment(Utils::Environment &env) const;
IOutputParser *createOutputParser() const; IOutputParser *createOutputParser() const;
QString toHtml(const QList<Task> &additional = QList<Task>()) const; QString toHtml(const Tasks &additional = Tasks()) const;
Kit *clone(bool keepName = false) const; Kit *clone(bool keepName = false) const;
void copyFrom(const Kit *k); void copyFrom(const Kit *k);

20
src/plugins/projectexplorer/kitinformation.cpp
View File

@@ -122,9 +122,9 @@ SysRootKitAspect::SysRootKitAspect()
setPriority(31000); setPriority(31000);
} }
QList<Task> SysRootKitAspect::validate(const Kit *k) const Tasks SysRootKitAspect::validate(const Kit *k) const
{ {
QList<Task> result; Tasks result;
const Utils::FileName dir = SysRootKitAspect::sysRoot(k); const Utils::FileName dir = SysRootKitAspect::sysRoot(k);
if (dir.isEmpty()) if (dir.isEmpty())
return result; return result;
@@ -369,9 +369,9 @@ static QVariant defaultToolChainValue()
return result; return result;
} }
QList<Task> ToolChainKitAspect::validate(const Kit *k) const Tasks ToolChainKitAspect::validate(const Kit *k) const
{ {
QList<Task> result; Tasks result;
const QList<ToolChain*> tcList = toolChains(k); const QList<ToolChain*> tcList = toolChains(k);
if (tcList.isEmpty()) { if (tcList.isEmpty()) {
@@ -809,10 +809,10 @@ void DeviceTypeKitAspect::setup(Kit *k)
k->setValue(id(), QByteArray(Constants::DESKTOP_DEVICE_TYPE)); k->setValue(id(), QByteArray(Constants::DESKTOP_DEVICE_TYPE));
} }
QList<Task> DeviceTypeKitAspect::validate(const Kit *k) const Tasks DeviceTypeKitAspect::validate(const Kit *k) const
{ {
Q_UNUSED(k); Q_UNUSED(k);
return QList<Task>(); return {};
} }
KitAspectWidget *DeviceTypeKitAspect::createConfigWidget(Kit *k) const KitAspectWidget *DeviceTypeKitAspect::createConfigWidget(Kit *k) const
@@ -971,10 +971,10 @@ QVariant DeviceKitAspect::defaultValue(const Kit *k) const
return QString(); return QString();
} }
QList<Task> DeviceKitAspect::validate(const Kit *k) const Tasks DeviceKitAspect::validate(const Kit *k) const
{ {
IDevice::ConstPtr dev = DeviceKitAspect::device(k); IDevice::ConstPtr dev = DeviceKitAspect::device(k);
QList<Task> result; Tasks result;
if (dev.isNull()) if (dev.isNull())
result.append(Task(Task::Warning, tr("No device set."), result.append(Task(Task::Warning, tr("No device set."),
Utils::FileName(), -1, Core::Id(Constants::TASK_CATEGORY_BUILDSYSTEM))); Utils::FileName(), -1, Core::Id(Constants::TASK_CATEGORY_BUILDSYSTEM)));
@@ -1234,9 +1234,9 @@ EnvironmentKitAspect::EnvironmentKitAspect()
setPriority(29000); setPriority(29000);
} }
QList<Task> EnvironmentKitAspect::validate(const Kit *k) const Tasks EnvironmentKitAspect::validate(const Kit *k) const
{ {
QList<Task> result; Tasks result;
QTC_ASSERT(k, return result); QTC_ASSERT(k, return result);
const QVariant variant = k->value(EnvironmentKitAspect::id()); const QVariant variant = k->value(EnvironmentKitAspect::id());

10
src/plugins/projectexplorer/kitinformation.h
View File

@@ -50,7 +50,7 @@ class PROJECTEXPLORER_EXPORT SysRootKitAspect : public KitAspect
public: public:
SysRootKitAspect(); SysRootKitAspect();
QList<Task> validate(const Kit *k) const override; Tasks validate(const Kit *k) const override;
KitAspectWidget *createConfigWidget(Kit *k) const override; KitAspectWidget *createConfigWidget(Kit *k) const override;
ItemList toUserOutput(const Kit *k) const override; ItemList toUserOutput(const Kit *k) const override;
void addToMacroExpander(Kit *kit, Utils::MacroExpander *expander) const override; void addToMacroExpander(Kit *kit, Utils::MacroExpander *expander) const override;
@@ -71,7 +71,7 @@ class PROJECTEXPLORER_EXPORT ToolChainKitAspect : public KitAspect
public: public:
ToolChainKitAspect(); ToolChainKitAspect();
QList<Task> validate(const Kit *k) const override; Tasks validate(const Kit *k) const override;
void upgrade(Kit *k) override; void upgrade(Kit *k) override;
void fix(Kit *k) override; void fix(Kit *k) override;
void setup(Kit *k) override; void setup(Kit *k) override;
@@ -116,7 +116,7 @@ public:
DeviceTypeKitAspect(); DeviceTypeKitAspect();
void setup(Kit *k) override; void setup(Kit *k) override;
QList<Task> validate(const Kit *k) const override; Tasks validate(const Kit *k) const override;
KitAspectWidget *createConfigWidget(Kit *k) const override; KitAspectWidget *createConfigWidget(Kit *k) const override;
ItemList toUserOutput(const Kit *k) const override; ItemList toUserOutput(const Kit *k) const override;
@@ -139,7 +139,7 @@ class PROJECTEXPLORER_EXPORT DeviceKitAspect : public KitAspect
public: public:
DeviceKitAspect(); DeviceKitAspect();
QList<Task> validate(const Kit *k) const override; Tasks validate(const Kit *k) const override;
void fix(Kit *k) override; void fix(Kit *k) override;
void setup(Kit *k) override; void setup(Kit *k) override;
@@ -177,7 +177,7 @@ class PROJECTEXPLORER_EXPORT EnvironmentKitAspect : public KitAspect
public: public:
EnvironmentKitAspect(); EnvironmentKitAspect();
QList<Task> validate(const Kit *k) const override; Tasks validate(const Kit *k) const override;
void fix(Kit *k) override; void fix(Kit *k) override;
void addToEnvironment(const Kit *k, Utils::Environment &env) const override; void addToEnvironment(const Kit *k, Utils::Environment &env) const override;

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

@@ -80,7 +80,7 @@ public:
bool isEssential() const { return m_essential; } bool isEssential() const { return m_essential; }
// called to find issues with the kit // called to find issues with the kit
virtual QList<Task> validate(const Kit *) const = 0; virtual Tasks validate(const Kit *) const = 0;
// called after restoring a kit, so upgrading of kit information settings can be done // called after restoring a kit, so upgrading of kit information settings can be done
virtual void upgrade(Kit *) { return; } virtual void upgrade(Kit *) { return; }
// called to fix issues with this kitinformation. Does not modify the rest of the kit. // called to fix issues with this kitinformation. Does not modify the rest of the kit.

2
src/plugins/projectexplorer/kitmanagerconfigwidget.cpp
View File

@@ -211,7 +211,7 @@ bool KitManagerConfigWidget::hasWarning() const
QString KitManagerConfigWidget::validityMessage() const QString KitManagerConfigWidget::validityMessage() const
{ {
QList<Task> tmp; Tasks tmp;
if (!m_hasUniqueName) { if (!m_hasUniqueName) {
tmp.append(Task(Task::Warning, tr("Display name is not unique."), Utils::FileName(), -1, tmp.append(Task(Task::Warning, tr("Display name is not unique."), Utils::FileName(), -1,
ProjectExplorer::Constants::TASK_CATEGORY_COMPILE)); ProjectExplorer::Constants::TASK_CATEGORY_COMPILE));

20
src/plugins/projectexplorer/linuxiccparser.cpp
View File

@@ -141,25 +141,25 @@ void ProjectExplorerPlugin::testLinuxIccOutputParsers_data()
QTest::addColumn<OutputParserTester::Channel>("inputChannel"); QTest::addColumn<OutputParserTester::Channel>("inputChannel");
QTest::addColumn<QString>("childStdOutLines"); QTest::addColumn<QString>("childStdOutLines");
QTest::addColumn<QString>("childStdErrLines"); QTest::addColumn<QString>("childStdErrLines");
QTest::addColumn<QList<Task> >("tasks"); QTest::addColumn<Tasks >("tasks");
QTest::addColumn<QString>("outputLines"); QTest::addColumn<QString>("outputLines");
QTest::newRow("pass-through stdout") QTest::newRow("pass-through stdout")
<< QString::fromLatin1("Sometext") << OutputParserTester::STDOUT << QString::fromLatin1("Sometext") << OutputParserTester::STDOUT
<< QString::fromLatin1("Sometext\n") << QString() << QString::fromLatin1("Sometext\n") << QString()
<< QList<Task>() << Tasks()
<< QString(); << QString();
QTest::newRow("pass-through stderr") QTest::newRow("pass-through stderr")
<< QString::fromLatin1("Sometext") << OutputParserTester::STDERR << QString::fromLatin1("Sometext") << OutputParserTester::STDERR
<< QString() << QString::fromLatin1("Sometext\n") << QString() << QString::fromLatin1("Sometext\n")
<< QList<Task>() << Tasks()
<< QString(); << QString();
QTest::newRow("pch creation") QTest::newRow("pch creation")
<< QString::fromLatin1("\".pch/Qt5Core.pchi.cpp\": creating precompiled header file \".pch/Qt5Core.pchi\"") << QString::fromLatin1("\".pch/Qt5Core.pchi.cpp\": creating precompiled header file \".pch/Qt5Core.pchi\"")
<< OutputParserTester::STDERR << OutputParserTester::STDERR
<< QString() << QString() << QString() << QString()
<< QList<Task>() << Tasks()
<< QString(); << QString();
QTest::newRow("undeclared function") QTest::newRow("undeclared function")
@@ -169,7 +169,7 @@ void ProjectExplorerPlugin::testLinuxIccOutputParsers_data()
"\n") "\n")
<< OutputParserTester::STDERR << OutputParserTester::STDERR
<< QString() << QString::fromLatin1("\n") << QString() << QString::fromLatin1("\n")
<< (QList<Task>() << (Tasks()
<< Task(Task::Error, << Task(Task::Error,
QLatin1String("identifier \"f\" is undefined\nf(0);"), QLatin1String("identifier \"f\" is undefined\nf(0);"),
Utils::FileName::fromUserInput(QLatin1String("main.cpp")), 13, Utils::FileName::fromUserInput(QLatin1String("main.cpp")), 13,
@@ -185,7 +185,7 @@ void ProjectExplorerPlugin::testLinuxIccOutputParsers_data()
"\n") "\n")
<< OutputParserTester::STDERR << OutputParserTester::STDERR
<< QString() << QString::fromLatin1("\n") << QString() << QString::fromLatin1("\n")
<< (QList<Task>() << (Tasks()
<< Task(Task::Error, << Task(Task::Error,
QLatin1String("identifier \"f\" is undefined\nf(0);"), QLatin1String("identifier \"f\" is undefined\nf(0);"),
Utils::FileName::fromUserInput(QLatin1String("main.cpp")), 13, Utils::FileName::fromUserInput(QLatin1String("main.cpp")), 13,
@@ -200,7 +200,7 @@ void ProjectExplorerPlugin::testLinuxIccOutputParsers_data()
"\n") "\n")
<< OutputParserTester::STDERR << OutputParserTester::STDERR
<< QString() << QString::fromLatin1("\n") << QString() << QString::fromLatin1("\n")
<< (QList<Task>() << (Tasks()
<< Task(Task::Error, << Task(Task::Error,
QLatin1String("function \"AClass::privatefunc\" (declared at line 4 of \"main.h\") is inaccessible\nb.privatefunc();"), QLatin1String("function \"AClass::privatefunc\" (declared at line 4 of \"main.h\") is inaccessible\nb.privatefunc();"),
Utils::FileName::fromUserInput(QLatin1String("main.cpp")), 53, Utils::FileName::fromUserInput(QLatin1String("main.cpp")), 53,
@@ -214,7 +214,7 @@ void ProjectExplorerPlugin::testLinuxIccOutputParsers_data()
"\n") "\n")
<< OutputParserTester::STDERR << OutputParserTester::STDERR
<< QString() << QString::fromLatin1("\n") << QString() << QString::fromLatin1("\n")
<< (QList<Task>() << (Tasks()
<< Task(Task::Warning, << Task(Task::Warning,
QLatin1String("use of \"=\" where \"==\" may have been intended\nwhile (a = true)"), QLatin1String("use of \"=\" where \"==\" may have been intended\nwhile (a = true)"),
Utils::FileName::fromUserInput(QLatin1String("main.cpp")), 41, Utils::FileName::fromUserInput(QLatin1String("main.cpp")), 41,
@@ -224,7 +224,7 @@ void ProjectExplorerPlugin::testLinuxIccOutputParsers_data()
<< QString::fromLatin1("/home/qtwebkithelpviewer.h:0: Note: No relevant classes found. No output generated.") << QString::fromLatin1("/home/qtwebkithelpviewer.h:0: Note: No relevant classes found. No output generated.")
<< OutputParserTester::STDERR << OutputParserTester::STDERR
<< QString() << QString() << QString() << QString()
<< (QList<ProjectExplorer::Task>() << (Tasks()
<< Task(Task::Unknown, << Task(Task::Unknown,
QLatin1String("Note: No relevant classes found. No output generated."), QLatin1String("Note: No relevant classes found. No output generated."),
Utils::FileName::fromUserInput(QLatin1String("/home/qtwebkithelpviewer.h")), 0, Utils::FileName::fromUserInput(QLatin1String("/home/qtwebkithelpviewer.h")), 0,
@@ -239,7 +239,7 @@ void ProjectExplorerPlugin::testLinuxIccOutputParsers()
testbench.appendOutputParser(new LinuxIccParser); testbench.appendOutputParser(new LinuxIccParser);
QFETCH(QString, input); QFETCH(QString, input);
QFETCH(OutputParserTester::Channel, inputChannel); QFETCH(OutputParserTester::Channel, inputChannel);
QFETCH(QList<Task>, tasks); QFETCH(Tasks, tasks);
QFETCH(QString, childStdOutLines); QFETCH(QString, childStdOutLines);
QFETCH(QString, childStdErrLines); QFETCH(QString, childStdErrLines);
QFETCH(QString, outputLines); QFETCH(QString, outputLines);

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

@@ -307,25 +307,25 @@ void ProjectExplorerPlugin::testMsvcOutputParsers_data()
QTest::addColumn<OutputParserTester::Channel>("inputChannel"); QTest::addColumn<OutputParserTester::Channel>("inputChannel");
QTest::addColumn<QString>("childStdOutLines"); QTest::addColumn<QString>("childStdOutLines");
QTest::addColumn<QString>("childStdErrLines"); QTest::addColumn<QString>("childStdErrLines");
QTest::addColumn<QList<Task> >("tasks"); QTest::addColumn<Tasks >("tasks");
QTest::addColumn<QString>("outputLines"); QTest::addColumn<QString>("outputLines");
QTest::newRow("pass-through stdout") QTest::newRow("pass-through stdout")
<< "Sometext" << OutputParserTester::STDOUT << "Sometext" << OutputParserTester::STDOUT
<< "Sometext\n" << "" << "Sometext\n" << ""
<< QList<Task>() << Tasks()
<< ""; << "";
QTest::newRow("pass-through stderr") QTest::newRow("pass-through stderr")
<< "Sometext" << OutputParserTester::STDERR << "Sometext" << OutputParserTester::STDERR
<< "" << "Sometext\n" << "" << "Sometext\n"
<< QList<Task>() << Tasks()
<< ""; << "";
QTest::newRow("labeled error") QTest::newRow("labeled error")
<< "qmlstandalone\\main.cpp(54) : error C4716: 'findUnresolvedModule' : must return a value" << "qmlstandalone\\main.cpp(54) : error C4716: 'findUnresolvedModule' : must return a value"
<< OutputParserTester::STDOUT << OutputParserTester::STDOUT
<< "" << "" << "" << ""
<< (QList<Task>() << (Tasks()
<< Task(Task::Error, << Task(Task::Error,
"C4716: 'findUnresolvedModule' : must return a value", "C4716: 'findUnresolvedModule' : must return a value",
FileName::fromUserInput("qmlstandalone\\main.cpp"), 54, FileName::fromUserInput("qmlstandalone\\main.cpp"), 54,
@@ -336,7 +336,7 @@ void ProjectExplorerPlugin::testMsvcOutputParsers_data()
<< "qmlstandalone\\main.cpp(54): error C4716: 'findUnresolvedModule' : must return a value" << "qmlstandalone\\main.cpp(54): error C4716: 'findUnresolvedModule' : must return a value"
<< OutputParserTester::STDOUT << OutputParserTester::STDOUT
<< "" << "" << "" << ""
<< (QList<Task>() << (Tasks()
<< Task(Task::Error, << Task(Task::Error,
"C4716: 'findUnresolvedModule' : must return a value", "C4716: 'findUnresolvedModule' : must return a value",
FileName::fromUserInput("qmlstandalone\\main.cpp"), 54, FileName::fromUserInput("qmlstandalone\\main.cpp"), 54,
@@ -347,7 +347,7 @@ void ProjectExplorerPlugin::testMsvcOutputParsers_data()
<< "1>qmlstandalone\\main.cpp(54) : error C4716: 'findUnresolvedModule' : must return a value" << "1>qmlstandalone\\main.cpp(54) : error C4716: 'findUnresolvedModule' : must return a value"
<< OutputParserTester::STDOUT << OutputParserTester::STDOUT
<< "" << "" << "" << ""
<< (QList<Task>() << (Tasks()
<< Task(Task::Error, << Task(Task::Error,
"C4716: 'findUnresolvedModule' : must return a value", "C4716: 'findUnresolvedModule' : must return a value",
FileName::fromUserInput("qmlstandalone\\main.cpp"), 54, FileName::fromUserInput("qmlstandalone\\main.cpp"), 54,
@@ -358,7 +358,7 @@ void ProjectExplorerPlugin::testMsvcOutputParsers_data()
<< "x:\\src\\plugins\\projectexplorer\\msvcparser.cpp(69) : warning C4100: 'something' : unreferenced formal parameter" << "x:\\src\\plugins\\projectexplorer\\msvcparser.cpp(69) : warning C4100: 'something' : unreferenced formal parameter"
<< OutputParserTester::STDOUT << OutputParserTester::STDOUT
<< "" << "" << "" << ""
<< (QList<Task>() << (Tasks()
<< Task(Task::Warning, << Task(Task::Warning,
"C4100: 'something' : unreferenced formal parameter", "C4100: 'something' : unreferenced formal parameter",
FileName::fromUserInput("x:\\src\\plugins\\projectexplorer\\msvcparser.cpp"), 69, FileName::fromUserInput("x:\\src\\plugins\\projectexplorer\\msvcparser.cpp"), 69,
@@ -370,7 +370,7 @@ void ProjectExplorerPlugin::testMsvcOutputParsers_data()
<< "1>x:\\src\\plugins\\projectexplorer\\msvcparser.cpp(69) : warning C4100: 'something' : unreferenced formal parameter" << "1>x:\\src\\plugins\\projectexplorer\\msvcparser.cpp(69) : warning C4100: 'something' : unreferenced formal parameter"
<< OutputParserTester::STDOUT << OutputParserTester::STDOUT
<< "" << "" << "" << ""
<< (QList<Task>() << (Tasks()
<< Task(Task::Warning, << Task(Task::Warning,
"C4100: 'something' : unreferenced formal parameter", "C4100: 'something' : unreferenced formal parameter",
FileName::fromUserInput("x:\\src\\plugins\\projectexplorer\\msvcparser.cpp"), 69, FileName::fromUserInput("x:\\src\\plugins\\projectexplorer\\msvcparser.cpp"), 69,
@@ -382,7 +382,7 @@ void ProjectExplorerPlugin::testMsvcOutputParsers_data()
" x:\\src\\plugins\\texteditor\\completionsupport.h(39) : see declaration of 'TextEditor::CompletionItem'" " x:\\src\\plugins\\texteditor\\completionsupport.h(39) : see declaration of 'TextEditor::CompletionItem'"
<< OutputParserTester::STDOUT << OutputParserTester::STDOUT
<< "" << "" << "" << ""
<< (QList<Task>() << (Tasks()
<< Task(Task::Warning, << Task(Task::Warning,
"C4099: 'TextEditor::CompletionItem' : type name first seen using 'struct' now seen using 'class'", "C4099: 'TextEditor::CompletionItem' : type name first seen using 'struct' now seen using 'class'",
FileName::fromUserInput("x:\\src\\plugins\\texteditor\\icompletioncollector.h"), 50, FileName::fromUserInput("x:\\src\\plugins\\texteditor\\icompletioncollector.h"), 50,
@@ -398,7 +398,7 @@ void ProjectExplorerPlugin::testMsvcOutputParsers_data()
" x:\\src\\plugins\\texteditor\\completionsupport.h(39) : see declaration of 'TextEditor::CompletionItem'" " x:\\src\\plugins\\texteditor\\completionsupport.h(39) : see declaration of 'TextEditor::CompletionItem'"
<< OutputParserTester::STDOUT << OutputParserTester::STDOUT
<< "" << "" << "" << ""
<< (QList<Task>() << (Tasks()
<< Task(Task::Warning, << Task(Task::Warning,
"C4099: 'TextEditor::CompletionItem' : type name first seen using 'struct' now seen using 'class'", "C4099: 'TextEditor::CompletionItem' : type name first seen using 'struct' now seen using 'class'",
FileName::fromUserInput("x:\\src\\plugins\\texteditor\\icompletioncollector.h"), 50, FileName::fromUserInput("x:\\src\\plugins\\texteditor\\icompletioncollector.h"), 50,
@@ -413,7 +413,7 @@ void ProjectExplorerPlugin::testMsvcOutputParsers_data()
<< "LINK : fatal error LNK1146: no argument specified with option '/LIBPATH:'" << "LINK : fatal error LNK1146: no argument specified with option '/LIBPATH:'"
<< OutputParserTester::STDOUT << OutputParserTester::STDOUT
<< "" << "" << "" << ""
<< (QList<Task>() << (Tasks()
<< Task(Task::Error, << Task(Task::Error,
"LNK1146: no argument specified with option '/LIBPATH:'", "LNK1146: no argument specified with option '/LIBPATH:'",
FileName(), -1, FileName(), -1,
@@ -425,7 +425,7 @@ void ProjectExplorerPlugin::testMsvcOutputParsers_data()
<< "cl : Command line warning D9002 : ignoring unknown option '-fopenmp'" << "cl : Command line warning D9002 : ignoring unknown option '-fopenmp'"
<< OutputParserTester::STDERR << OutputParserTester::STDERR
<< "" << "" << "" << ""
<< (QList<Task>() << (Tasks()
<< Task(Task::Warning, << Task(Task::Warning,
"D9002 : ignoring unknown option '-fopenmp'", "D9002 : ignoring unknown option '-fopenmp'",
FileName(), -1, FileName(), -1,
@@ -440,7 +440,7 @@ void ProjectExplorerPlugin::testMsvcOutputParsers_data()
" No constructor could take the source type, or constructor overload resolution was ambiguous" " No constructor could take the source type, or constructor overload resolution was ambiguous"
<< OutputParserTester::STDOUT << OutputParserTester::STDOUT
<< "" << "" << "" << ""
<< (QList<Task>() << (Tasks()
<< Task(Task::Error, << Task(Task::Error,
"C2440: 'initializing' : cannot convert from 'int' to 'std::_Tree<_Traits>::iterator'\n" "C2440: 'initializing' : cannot convert from 'int' to 'std::_Tree<_Traits>::iterator'\n"
"with\n" "with\n"
@@ -455,7 +455,7 @@ void ProjectExplorerPlugin::testMsvcOutputParsers_data()
<< "main.obj : error LNK2019: unresolved external symbol \"public: void __thiscall Data::doit(void)\" (?doit@Data@@QAEXXZ) referenced in function _main" << "main.obj : error LNK2019: unresolved external symbol \"public: void __thiscall Data::doit(void)\" (?doit@Data@@QAEXXZ) referenced in function _main"
<< OutputParserTester::STDOUT << OutputParserTester::STDOUT
<< "" << "" << "" << ""
<< (QList<Task>() << (Tasks()
<< Task(Task::Error, << Task(Task::Error,
"LNK2019: unresolved external symbol \"public: void __thiscall Data::doit(void)\" (?doit@Data@@QAEXXZ) referenced in function _main", "LNK2019: unresolved external symbol \"public: void __thiscall Data::doit(void)\" (?doit@Data@@QAEXXZ) referenced in function _main",
FileName::fromUserInput("main.obj"), -1, FileName::fromUserInput("main.obj"), -1,
@@ -465,7 +465,7 @@ void ProjectExplorerPlugin::testMsvcOutputParsers_data()
<< "debug\\Experimentation.exe : fatal error LNK1120: 1 unresolved externals" << "debug\\Experimentation.exe : fatal error LNK1120: 1 unresolved externals"
<< OutputParserTester::STDOUT << OutputParserTester::STDOUT
<< "" << "" << "" << ""
<< (QList<Task>() << (Tasks()
<< Task(Task::Error, << Task(Task::Error,
"LNK1120: 1 unresolved externals", "LNK1120: 1 unresolved externals",
FileName::fromUserInput("debug\\Experimentation.exe"), -1, FileName::fromUserInput("debug\\Experimentation.exe"), -1,
@@ -476,7 +476,7 @@ void ProjectExplorerPlugin::testMsvcOutputParsers_data()
<< "Error: dependent '..\\..\\..\\..\\creator-2.5\\src\\plugins\\coreplugin\\ifile.h' does not exist." << "Error: dependent '..\\..\\..\\..\\creator-2.5\\src\\plugins\\coreplugin\\ifile.h' does not exist."
<< OutputParserTester::STDOUT << OutputParserTester::STDOUT
<< "" << "" << "" << ""
<< (QList<Task>() << (Tasks()
<< Task(Task::Error, << Task(Task::Error,
"dependent '..\\..\\..\\..\\creator-2.5\\src\\plugins\\coreplugin\\ifile.h' does not exist.", "dependent '..\\..\\..\\..\\creator-2.5\\src\\plugins\\coreplugin\\ifile.h' does not exist.",
FileName(), -1, FileName(), -1,
@@ -486,7 +486,7 @@ void ProjectExplorerPlugin::testMsvcOutputParsers_data()
<< "Error: dependent 'main.cpp' does not exist." << "Error: dependent 'main.cpp' does not exist."
<< OutputParserTester::STDERR << OutputParserTester::STDERR
<< "" << "" << "" << ""
<< (QList<Task>() << (Tasks()
<< Task(Task::Error, << Task(Task::Error,
"dependent 'main.cpp' does not exist.", "dependent 'main.cpp' does not exist.",
FileName(), -1, FileName(), -1,
@@ -504,7 +504,7 @@ void ProjectExplorerPlugin::testMsvcOutputParsers_data()
" ]" " ]"
<< OutputParserTester::STDOUT << OutputParserTester::STDOUT
<< "" << "" << "" << ""
<< (QList<Task>() << (Tasks()
<< Task(Task::Warning, << Task(Task::Warning,
"C4996: 'std::_Copy_impl': Function call with parameters that may be unsafe - this call relies on the caller to check that the passed values are correct. To disable this warning, use -D_SCL_SECURE_NO_WARNINGS. See documentation on how to use Visual C++ 'Checked Iterators'", "C4996: 'std::_Copy_impl': Function call with parameters that may be unsafe - this call relies on the caller to check that the passed values are correct. To disable this warning, use -D_SCL_SECURE_NO_WARNINGS. See documentation on how to use Visual C++ 'Checked Iterators'",
FileName::fromUserInput("c:\\Program Files (x86)\\Microsoft Visual Studio 10.0\\VC\\INCLUDE\\xutility"), 2227, FileName::fromUserInput("c:\\Program Files (x86)\\Microsoft Visual Studio 10.0\\VC\\INCLUDE\\xutility"), 2227,
@@ -530,7 +530,7 @@ void ProjectExplorerPlugin::testMsvcOutputParsers_data()
" or 'D:\\Project\\types.h(71) : Types::UINT64'" " or 'D:\\Project\\types.h(71) : Types::UINT64'"
<< OutputParserTester::STDOUT << OutputParserTester::STDOUT
<< "" << "" << "" << ""
<< (QList<Task>() << (Tasks()
<< Task(Task::Error, << Task(Task::Error,
"C2872: 'UINT64' : ambiguous symbol", "C2872: 'UINT64' : ambiguous symbol",
FileName::fromUserInput("D:\\Project\\file.h"), 98, FileName::fromUserInput("D:\\Project\\file.h"), 98,
@@ -548,7 +548,7 @@ void ProjectExplorerPlugin::testMsvcOutputParsers_data()
<< "/home/qtwebkithelpviewer.h:0: Note: No relevant classes found. No output generated." << "/home/qtwebkithelpviewer.h:0: Note: No relevant classes found. No output generated."
<< OutputParserTester::STDERR << OutputParserTester::STDERR
<< "" << "/home/qtwebkithelpviewer.h:0: Note: No relevant classes found. No output generated.\n" << "" << "/home/qtwebkithelpviewer.h:0: Note: No relevant classes found. No output generated.\n"
<< (QList<ProjectExplorer::Task>()) << (Tasks())
<< ""; << "";
QTest::newRow("error with note") QTest::newRow("error with note")
@@ -556,7 +556,7 @@ void ProjectExplorerPlugin::testMsvcOutputParsers_data()
"main.cpp(6): note: see declaration of 'func'" "main.cpp(6): note: see declaration of 'func'"
<< OutputParserTester::STDOUT << OutputParserTester::STDOUT
<< "" << "" << "" << ""
<< (QList<Task>() << (Tasks()
<< Task(Task::Error, << Task(Task::Error,
"C2733: 'func': second C linkage of overloaded function not allowed", "C2733: 'func': second C linkage of overloaded function not allowed",
FileName::fromUserInput("main.cpp"), 7, FileName::fromUserInput("main.cpp"), 7,
@@ -571,7 +571,7 @@ void ProjectExplorerPlugin::testMsvcOutputParsers_data()
<< QString::fromUtf8("cl: командная строка warning D9025: переопределение \"/MDd\" на \"/MTd\"") << QString::fromUtf8("cl: командная строка warning D9025: переопределение \"/MDd\" на \"/MTd\"")
<< OutputParserTester::STDERR << OutputParserTester::STDERR
<< "" << "" << "" << ""
<< (QList<ProjectExplorer::Task>() << (Tasks()
<< Task(Task::Warning, << Task(Task::Warning,
QString::fromUtf8("D9025: переопределение \"/MDd\" на \"/MTd\""), QString::fromUtf8("D9025: переопределение \"/MDd\" на \"/MTd\""),
FileName(), -1, Constants::TASK_CATEGORY_COMPILE)) FileName(), -1, Constants::TASK_CATEGORY_COMPILE))
@@ -584,7 +584,7 @@ void ProjectExplorerPlugin::testMsvcOutputParsers()
testbench.appendOutputParser(new MsvcParser); testbench.appendOutputParser(new MsvcParser);
QFETCH(QString, input); QFETCH(QString, input);
QFETCH(OutputParserTester::Channel, inputChannel); QFETCH(OutputParserTester::Channel, inputChannel);
QFETCH(QList<Task>, tasks); QFETCH(Tasks, tasks);
QFETCH(QString, childStdOutLines); QFETCH(QString, childStdOutLines);
QFETCH(QString, childStdErrLines); QFETCH(QString, childStdErrLines);
QFETCH(QString, outputLines); QFETCH(QString, outputLines);
@@ -600,7 +600,7 @@ void ProjectExplorerPlugin::testClangClOutputParsers_data()
QTest::addColumn<OutputParserTester::Channel>("inputChannel"); QTest::addColumn<OutputParserTester::Channel>("inputChannel");
QTest::addColumn<QString>("childStdOutLines"); QTest::addColumn<QString>("childStdOutLines");
QTest::addColumn<QString>("childStdErrLines"); QTest::addColumn<QString>("childStdErrLines");
QTest::addColumn<QList<Task> >("tasks"); QTest::addColumn<Tasks >("tasks");
QTest::addColumn<QString>("outputLines"); QTest::addColumn<QString>("outputLines");
const QString warning1 = "private field 'm_version' is not used [-Wunused-private-field]\n" const QString warning1 = "private field 'm_version' is not used [-Wunused-private-field]\n"
@@ -643,7 +643,7 @@ void ProjectExplorerPlugin::testClangClOutputParsers_data()
<< input << input
<< OutputParserTester::STDERR << OutputParserTester::STDERR
<< "" << expectedStderr << "" << expectedStderr
<< (QList<Task>() << (Tasks()
<< Task(Task::Warning, warning1.trimmed(), << Task(Task::Warning, warning1.trimmed(),
FileName::fromUserInput("./qwindowseglcontext.h"), 282, FileName::fromUserInput("./qwindowseglcontext.h"), 282,
Constants::TASK_CATEGORY_COMPILE) Constants::TASK_CATEGORY_COMPILE)
@@ -668,7 +668,7 @@ void ProjectExplorerPlugin::testClangClOutputParsers()
testbench.appendOutputParser(new ClangClParser); testbench.appendOutputParser(new ClangClParser);
QFETCH(QString, input); QFETCH(QString, input);
QFETCH(OutputParserTester::Channel, inputChannel); QFETCH(OutputParserTester::Channel, inputChannel);
QFETCH(QList<Task>, tasks); QFETCH(Tasks, tasks);
QFETCH(QString, childStdOutLines); QFETCH(QString, childStdOutLines);
QFETCH(QString, childStdErrLines); QFETCH(QString, childStdErrLines);
QFETCH(QString, outputLines); QFETCH(QString, outputLines);

2
src/plugins/projectexplorer/outputparser_test.cpp
View File

@@ -43,7 +43,7 @@ OutputParserTester::OutputParserTester() = default;
// test functions: // test functions:
void OutputParserTester::testParsing(const QString &lines, void OutputParserTester::testParsing(const QString &lines,
Channel inputChannel, Channel inputChannel,
QList<Task> tasks, Tasks tasks,
const QString &childStdOutLines, const QString &childStdOutLines,
const QString &childStdErrLines, const QString &childStdErrLines,
const QString &outputLines) const QString &outputLines)

4
src/plugins/projectexplorer/outputparser_test.h
View File

@@ -50,7 +50,7 @@ public:
// test functions: // test functions:
void testParsing(const QString &lines, Channel inputChannel, void testParsing(const QString &lines, Channel inputChannel,
QList<Task> tasks, Tasks tasks,
const QString &childStdOutLines, const QString &childStdOutLines,
const QString &childStdErrLines, const QString &childStdErrLines,
const QString &outputLines); const QString &outputLines);
@@ -76,7 +76,7 @@ private:
QString m_receivedStdErrChildLine; QString m_receivedStdErrChildLine;
QString m_receivedStdOutChildLine; QString m_receivedStdOutChildLine;
QList<Task> m_receivedTasks; Tasks m_receivedTasks;
QString m_receivedOutput; QString m_receivedOutput;
friend class TestTerminator; friend class TestTerminator;

4
src/plugins/projectexplorer/project.cpp
View File

@@ -331,9 +331,9 @@ Target *Project::target(Kit *k) const
return Utils::findOrDefault(d->m_targets, Utils::equal(&Target::kit, k)); return Utils::findOrDefault(d->m_targets, Utils::equal(&Target::kit, k));
} }
QList<Task> Project::projectIssues(const Kit *k) const Tasks Project::projectIssues(const Kit *k) const
{ {
QList<Task> result; Tasks result;
if (!k->isValid()) if (!k->isValid())
result.append(createProjectTask(Task::TaskType::Error, tr("Kit is not valid."))); result.append(createProjectTask(Task::TaskType::Error, tr("Kit is not valid.")));
return {}; return {};

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

@@ -126,7 +126,7 @@ public:
Target *activeTarget() const; Target *activeTarget() const;
Target *target(Core::Id id) const; Target *target(Core::Id id) const;
Target *target(Kit *k) const; Target *target(Kit *k) const;
virtual QList<Task> projectIssues(const Kit *k) const; virtual Tasks projectIssues(const Kit *k) const;
std::unique_ptr<Target> createTarget(Kit *k); std::unique_ptr<Target> createTarget(Kit *k);
static bool copySteps(Target *sourceTarget, Target *newTarget); static bool copySteps(Target *sourceTarget, Target *newTarget);

4
src/plugins/projectexplorer/targetsettingspanel.cpp
View File

@@ -299,7 +299,7 @@ class TargetItem : public TypedTreeItem<TreeItem, TargetGroupItem>
public: public:
enum { DefaultPage = 0 }; // Build page. enum { DefaultPage = 0 }; // Build page.
TargetItem(Project *project, Id kitId, const QList<Task> &issues) TargetItem(Project *project, Id kitId, const Tasks &issues)
: m_project(project), m_kitId(kitId), m_kitIssues(issues) : m_project(project), m_kitId(kitId), m_kitIssues(issues)
{ {
m_kitWarningForProject = containsType(m_kitIssues, Task::TaskType::Warning); m_kitWarningForProject = containsType(m_kitIssues, Task::TaskType::Warning);
@@ -499,7 +499,7 @@ public:
int m_currentChild = DefaultPage; int m_currentChild = DefaultPage;
bool m_kitErrorsForProject = false; bool m_kitErrorsForProject = false;
bool m_kitWarningForProject = false; bool m_kitWarningForProject = false;
QList<Task> m_kitIssues; Tasks m_kitIssues;
private: private:
enum class IconOverlay { enum class IconOverlay {

2
src/plugins/projectexplorer/targetsetupwidget.cpp
View File

@@ -318,7 +318,7 @@ QPair<Task::TaskType, QString> TargetSetupWidget::findIssues(const BuildInfo &in
return qMakePair(Task::Unknown, QString()); return qMakePair(Task::Unknown, QString());
QString buildDir = info.buildDirectory.toString(); QString buildDir = info.buildDirectory.toString();
QList<Task> issues; Tasks issues;
if (info.factory()) if (info.factory())
issues = info.factory()->reportIssues(m_kit, m_projectPath, buildDir); issues = info.factory()->reportIssues(m_kit, m_projectPath, buildDir);

4
src/plugins/projectexplorer/task.cpp
View File

@@ -168,7 +168,7 @@ uint qHash(const Task &task)
return task.taskId; return task.taskId;
} }
QString toHtml(const QList<Task> &issues) QString toHtml(const Tasks &issues)
{ {
QString result; QString result;
QTextStream str(&result); QTextStream str(&result);
@@ -191,7 +191,7 @@ QString toHtml(const QList<Task> &issues)
return result; return result;
} }
bool containsType(const QList<Task> &issues, Task::TaskType type) bool containsType(const Tasks &issues, Task::TaskType type)
{ {
return Utils::contains(issues, [type](const Task &t) { return t.type == type; }); return Utils::contains(issues, [type](const Task &t) { return t.type == type; });
} }

6
src/plugins/projectexplorer/task.h
View File

@@ -102,13 +102,15 @@ private:
friend class TaskHub; friend class TaskHub;
}; };
using Tasks = QList<Task>;
bool PROJECTEXPLORER_EXPORT operator==(const Task &t1, const Task &t2); bool PROJECTEXPLORER_EXPORT operator==(const Task &t1, const Task &t2);
uint PROJECTEXPLORER_EXPORT qHash(const Task &task); uint PROJECTEXPLORER_EXPORT qHash(const Task &task);
bool PROJECTEXPLORER_EXPORT operator<(const Task &a, const Task &b); bool PROJECTEXPLORER_EXPORT operator<(const Task &a, const Task &b);
QString PROJECTEXPLORER_EXPORT toHtml(const QList<Task> &issues); QString PROJECTEXPLORER_EXPORT toHtml(const Tasks &issues);
bool PROJECTEXPLORER_EXPORT containsType(const QList<Task> &issues, Task::TaskType); bool PROJECTEXPLORER_EXPORT containsType(const Tasks &issues, Task::TaskType);
} //namespace ProjectExplorer } //namespace ProjectExplorer

2
src/plugins/projectexplorer/taskhub.cpp
View File

@@ -117,7 +117,7 @@ TaskHub::TaskHub()
{ {
m_instance = this; m_instance = this;
qRegisterMetaType<ProjectExplorer::Task>("ProjectExplorer::Task"); qRegisterMetaType<ProjectExplorer::Task>("ProjectExplorer::Task");
qRegisterMetaType<QList<ProjectExplorer::Task> >("QList<ProjectExplorer::Task>"); qRegisterMetaType<Tasks >("Tasks");
} }
TaskHub::~TaskHub() TaskHub::~TaskHub()

4
src/plugins/projectexplorer/taskmodel.cpp
View File

@@ -86,12 +86,12 @@ void TaskModel::addCategory(Core::Id categoryId, const QString &categoryName)
m_categories.insert(categoryId, data); m_categories.insert(categoryId, data);
} }
QList<Task> TaskModel::tasks(Core::Id categoryId) const Tasks TaskModel::tasks(Core::Id categoryId) const
{ {
if (!categoryId.isValid()) if (!categoryId.isValid())
return m_tasks; return m_tasks;
QList<Task> taskList; Tasks taskList;
foreach (const Task &t, m_tasks) { foreach (const Task &t, m_tasks) {
if (t.category == categoryId) if (t.category == categoryId)
taskList.append(t); taskList.append(t);

4
src/plugins/projectexplorer/taskmodel.h
View File

@@ -53,7 +53,7 @@ public:
QString categoryDisplayName(Core::Id categoryId) const; QString categoryDisplayName(Core::Id categoryId) const;
void addCategory(Core::Id categoryId, const QString &categoryName); void addCategory(Core::Id categoryId, const QString &categoryName);
QList<Task> tasks(Core::Id categoryId = Core::Id()) const; Tasks tasks(Core::Id categoryId = Core::Id()) const;
void addTask(const Task &t); void addTask(const Task &t);
void removeTask(unsigned int id); void removeTask(unsigned int id);
void clearTasks(Core::Id categoryId = Core::Id()); void clearTasks(Core::Id categoryId = Core::Id());
@@ -110,7 +110,7 @@ private:
}; };
QHash<Core::Id,CategoryData> m_categories; // category id to data QHash<Core::Id,CategoryData> m_categories; // category id to data
QList<Task> m_tasks; // all tasks (in order of id) Tasks m_tasks; // all tasks (in order of id)
QHash<QString,bool> m_fileNotFound; QHash<QString,bool> m_fileNotFound;
QFont m_fileMeasurementFont; QFont m_fileMeasurementFont;

4
src/plugins/projectexplorer/toolchain.cpp
View File

@@ -382,9 +382,9 @@ Utils::LanguageVersion ToolChain::languageVersion(const Core::Id &language, cons
Used by the tool chain kit information to validate the kit. Used by the tool chain kit information to validate the kit.
*/ */
QList<Task> ToolChain::validateKit(const Kit *) const Tasks ToolChain::validateKit(const Kit *) const
{ {
return QList<Task>(); return {};
} }
QString ToolChain::sysRoot() const QString ToolChain::sysRoot() const

5
src/plugins/projectexplorer/toolchain.h
View File

@@ -31,12 +31,12 @@
#include "abi.h" #include "abi.h"
#include "headerpath.h" #include "headerpath.h"
#include "projectmacro.h" #include "projectmacro.h"
#include "task.h"
#include "toolchaincache.h" #include "toolchaincache.h"
#include <coreplugin/id.h> #include <coreplugin/id.h>
#include <utils/cpplanguage_details.h> #include <utils/cpplanguage_details.h>
#include <utils/fileutils.h>
#include <QObject> #include <QObject>
#include <QSet> #include <QSet>
@@ -68,7 +68,6 @@ class Abi;
class IOutputParser; class IOutputParser;
class ToolChainConfigWidget; class ToolChainConfigWidget;
class ToolChainFactory; class ToolChainFactory;
class Task;
class Kit; class Kit;
namespace Internal { class ToolChainSettingsAccessor; } namespace Internal { class ToolChainSettingsAccessor; }
@@ -152,7 +151,7 @@ public:
// Used by the toolchainmanager to save user-generated tool chains. // Used by the toolchainmanager to save user-generated tool chains.
// Make sure to call this function when deriving! // Make sure to call this function when deriving!
virtual QVariantMap toMap() const; virtual QVariantMap toMap() const;
virtual QList<Task> validateKit(const Kit *k) const; virtual Tasks validateKit(const Kit *k) const;
virtual bool isJobCountSupported() const { return true; } virtual bool isJobCountSupported() const { return true; }

28
src/plugins/projectexplorer/xcodebuildparser.cpp
View File

@@ -139,7 +139,7 @@ void ProjectExplorerPlugin::testXcodebuildParserParsing_data()
QTest::addColumn<OutputParserTester::Channel>("inputChannel"); QTest::addColumn<OutputParserTester::Channel>("inputChannel");
QTest::addColumn<QString>("childStdOutLines"); QTest::addColumn<QString>("childStdOutLines");
QTest::addColumn<QString>("childStdErrLines"); QTest::addColumn<QString>("childStdErrLines");
QTest::addColumn<QList<Task> >("tasks"); QTest::addColumn<Tasks >("tasks");
QTest::addColumn<QString>("outputLines"); QTest::addColumn<QString>("outputLines");
QTest::addColumn<ProjectExplorer::XcodebuildParser::XcodebuildStatus>("finalStatus"); QTest::addColumn<ProjectExplorer::XcodebuildParser::XcodebuildStatus>("finalStatus");
@@ -147,42 +147,42 @@ void ProjectExplorerPlugin::testXcodebuildParserParsing_data()
<< XcodebuildParser::OutsideXcodebuild << XcodebuildParser::OutsideXcodebuild
<< QString::fromLatin1("Sometext") << OutputParserTester::STDOUT << QString::fromLatin1("Sometext") << OutputParserTester::STDOUT
<< QString::fromLatin1("Sometext\n") << QString() << QString::fromLatin1("Sometext\n") << QString()
<< QList<Task>() << Tasks()
<< QString() << QString()
<< XcodebuildParser::OutsideXcodebuild; << XcodebuildParser::OutsideXcodebuild;
QTest::newRow("outside pass-through stderr") QTest::newRow("outside pass-through stderr")
<< XcodebuildParser::OutsideXcodebuild << XcodebuildParser::OutsideXcodebuild
<< QString::fromLatin1("Sometext") << OutputParserTester::STDERR << QString::fromLatin1("Sometext") << OutputParserTester::STDERR
<< QString() << QString::fromLatin1("Sometext\n") << QString() << QString::fromLatin1("Sometext\n")
<< QList<Task>() << Tasks()
<< QString() << QString()
<< XcodebuildParser::OutsideXcodebuild; << XcodebuildParser::OutsideXcodebuild;
QTest::newRow("inside pass stdout to stderr") QTest::newRow("inside pass stdout to stderr")
<< XcodebuildParser::InXcodebuild << XcodebuildParser::InXcodebuild
<< QString::fromLatin1("Sometext") << OutputParserTester::STDOUT << QString::fromLatin1("Sometext") << OutputParserTester::STDOUT
<< QString() << QString::fromLatin1("Sometext\n") << QString() << QString::fromLatin1("Sometext\n")
<< QList<Task>() << Tasks()
<< QString() << QString()
<< XcodebuildParser::InXcodebuild; << XcodebuildParser::InXcodebuild;
QTest::newRow("inside ignore stderr") QTest::newRow("inside ignore stderr")
<< XcodebuildParser::InXcodebuild << XcodebuildParser::InXcodebuild
<< QString::fromLatin1("Sometext") << OutputParserTester::STDERR << QString::fromLatin1("Sometext") << OutputParserTester::STDERR
<< QString() << QString() << QString() << QString()
<< QList<Task>() << Tasks()
<< QString() << QString()
<< XcodebuildParser::InXcodebuild; << XcodebuildParser::InXcodebuild;
QTest::newRow("unknown pass stdout to stderr") QTest::newRow("unknown pass stdout to stderr")
<< XcodebuildParser::UnknownXcodebuildState << XcodebuildParser::UnknownXcodebuildState
<< QString::fromLatin1("Sometext") << OutputParserTester::STDOUT << QString::fromLatin1("Sometext") << OutputParserTester::STDOUT
<< QString() << QString::fromLatin1("Sometext\n") << QString() << QString::fromLatin1("Sometext\n")
<< QList<Task>() << Tasks()
<< QString() << QString()
<< XcodebuildParser::UnknownXcodebuildState; << XcodebuildParser::UnknownXcodebuildState;
QTest::newRow("unknown ignore stderr (change?)") QTest::newRow("unknown ignore stderr (change?)")
<< XcodebuildParser::UnknownXcodebuildState << XcodebuildParser::UnknownXcodebuildState
<< QString::fromLatin1("Sometext") << OutputParserTester::STDERR << QString::fromLatin1("Sometext") << OutputParserTester::STDERR
<< QString() << QString() << QString() << QString()
<< QList<Task>() << Tasks()
<< QString() << QString()
<< XcodebuildParser::UnknownXcodebuildState; << XcodebuildParser::UnknownXcodebuildState;
QTest::newRow("switch outside->in->outside") QTest::newRow("switch outside->in->outside")
@@ -196,7 +196,7 @@ void ProjectExplorerPlugin::testXcodebuildParserParsing_data()
"outside2") "outside2")
<< OutputParserTester::STDOUT << OutputParserTester::STDOUT
<< QString::fromLatin1("outside\noutside2\n") << QString::fromLatin1("in xcodebuild\nin xcodebuild2\n") << QString::fromLatin1("outside\noutside2\n") << QString::fromLatin1("in xcodebuild\nin xcodebuild2\n")
<< QList<Task>() << Tasks()
<< QString() << QString()
<< XcodebuildParser::OutsideXcodebuild; << XcodebuildParser::OutsideXcodebuild;
QTest::newRow("switch Unknown->in->outside") QTest::newRow("switch Unknown->in->outside")
@@ -208,7 +208,7 @@ void ProjectExplorerPlugin::testXcodebuildParserParsing_data()
"outside") "outside")
<< OutputParserTester::STDOUT << OutputParserTester::STDOUT
<< QString::fromLatin1("outside\n") << QString::fromLatin1("unknown\nin xcodebuild\n") << QString::fromLatin1("outside\n") << QString::fromLatin1("unknown\nin xcodebuild\n")
<< QList<Task>() << Tasks()
<< QString() << QString()
<< XcodebuildParser::OutsideXcodebuild; << XcodebuildParser::OutsideXcodebuild;
QTest::newRow("switch in->unknown") QTest::newRow("switch in->unknown")
@@ -218,7 +218,7 @@ void ProjectExplorerPlugin::testXcodebuildParserParsing_data()
"unknownErr") "unknownErr")
<< OutputParserTester::STDERR << OutputParserTester::STDERR
<< QString() << QString() << QString() << QString()
<< (QList<Task>() << (Tasks()
<< Task( << Task(
Task::Error, Task::Error,
QCoreApplication::translate("ProjectExplorer::XcodebuildParser", QCoreApplication::translate("ProjectExplorer::XcodebuildParser",
@@ -235,7 +235,7 @@ void ProjectExplorerPlugin::testXcodebuildParserParsing_data()
"unknownErr") "unknownErr")
<< OutputParserTester::STDERR << OutputParserTester::STDERR
<< QString() << QString::fromLatin1("outErr\n") << QString() << QString::fromLatin1("outErr\n")
<< (QList<Task>() << (Tasks()
<< Task( << Task(
Task::Error, Task::Error,
QCoreApplication::translate("ProjectExplorer::XcodebuildParser", QCoreApplication::translate("ProjectExplorer::XcodebuildParser",
@@ -249,7 +249,7 @@ void ProjectExplorerPlugin::testXcodebuildParserParsing_data()
<< XcodebuildParser::InXcodebuild << XcodebuildParser::InXcodebuild
<< QString::fromLatin1("/somepath/somefile.app: replacing existing signature") << OutputParserTester::STDOUT << QString::fromLatin1("/somepath/somefile.app: replacing existing signature") << OutputParserTester::STDOUT
<< QString() << QString() << QString() << QString()
<< (QList<Task>() << (Tasks()
<< Task(Task::Warning, << Task(Task::Warning,
QCoreApplication::translate("ProjectExplorer::XcodebuildParser", QCoreApplication::translate("ProjectExplorer::XcodebuildParser",
"Replacing signature"), "Replacing signature"),
@@ -262,7 +262,7 @@ void ProjectExplorerPlugin::testXcodebuildParserParsing_data()
<< XcodebuildParser::OutsideXcodebuild << XcodebuildParser::OutsideXcodebuild
<< QString::fromLatin1("/somepath/somefile.app: replacing existing signature") << OutputParserTester::STDOUT << QString::fromLatin1("/somepath/somefile.app: replacing existing signature") << OutputParserTester::STDOUT
<< QString::fromLatin1("/somepath/somefile.app: replacing existing signature\n") << QString() << QString::fromLatin1("/somepath/somefile.app: replacing existing signature\n") << QString()
<< QList<Task>() << Tasks()
<< QString() << QString()
<< XcodebuildParser::OutsideXcodebuild; << XcodebuildParser::OutsideXcodebuild;
} }
@@ -282,7 +282,7 @@ void ProjectExplorerPlugin::testXcodebuildParserParsing()
QFETCH(OutputParserTester::Channel, inputChannel); QFETCH(OutputParserTester::Channel, inputChannel);
QFETCH(QString, childStdOutLines); QFETCH(QString, childStdOutLines);
QFETCH(QString, childStdErrLines); QFETCH(QString, childStdErrLines);
QFETCH(QList<Task>, tasks); QFETCH(Tasks, tasks);
QFETCH(QString, outputLines); QFETCH(QString, outputLines);
QFETCH(ProjectExplorer::XcodebuildParser::XcodebuildStatus, finalStatus); QFETCH(ProjectExplorer::XcodebuildParser::XcodebuildStatus, finalStatus);

4
src/plugins/qbsprojectmanager/qbsbuildconfiguration.cpp
View File

@@ -369,10 +369,10 @@ QbsBuildConfigurationFactory::QbsBuildConfigurationFactory()
registerBuildConfiguration<QbsBuildConfiguration>(Constants::QBS_BC_ID); registerBuildConfiguration<QbsBuildConfiguration>(Constants::QBS_BC_ID);
setSupportedProjectType(Constants::PROJECT_ID); setSupportedProjectType(Constants::PROJECT_ID);
setSupportedProjectMimeTypeName(Constants::MIME_TYPE); setSupportedProjectMimeTypeName(Constants::MIME_TYPE);
setIssueReporter([](Kit *k, const QString &projectPath, const QString &buildDir) -> QList<Task> { setIssueReporter([](Kit *k, const QString &projectPath, const QString &buildDir) -> Tasks {
const QtSupport::BaseQtVersion * const version = QtSupport::QtKitAspect::qtVersion(k); const QtSupport::BaseQtVersion * const version = QtSupport::QtKitAspect::qtVersion(k);
return version ? version->reportIssues(projectPath, buildDir) return version ? version->reportIssues(projectPath, buildDir)
: QList<ProjectExplorer::Task>(); : Tasks();
}); });
} }

2
src/plugins/qbsprojectmanager/qbskitinformation.cpp
View File

@@ -107,7 +107,7 @@ Core::Id QbsKitAspect::id()
return "Qbs.KitInformation"; return "Qbs.KitInformation";
} }
QList<Task> QbsKitAspect::validate(const Kit *) const { return QList<Task>(); } Tasks QbsKitAspect::validate(const Kit *) const { return {}; }
KitAspect::ItemList QbsKitAspect::toUserOutput(const Kit *k) const KitAspect::ItemList QbsKitAspect::toUserOutput(const Kit *k) const
{ {

2
src/plugins/qbsprojectmanager/qbskitinformation.h
View File

@@ -44,7 +44,7 @@ public:
private: private:
static Core::Id id(); static Core::Id id();
QList<ProjectExplorer::Task> validate(const ProjectExplorer::Kit *) const override; ProjectExplorer::Tasks validate(const ProjectExplorer::Kit *) const override;
ItemList toUserOutput(const ProjectExplorer::Kit *) const override; ItemList toUserOutput(const ProjectExplorer::Kit *) const override;
ProjectExplorer::KitAspectWidget *createConfigWidget(ProjectExplorer::Kit *) const override; ProjectExplorer::KitAspectWidget *createConfigWidget(ProjectExplorer::Kit *) const override;
}; };

2
src/plugins/qmakeprojectmanager/qmakebuildconfiguration.cpp
View File

@@ -586,7 +586,7 @@ QmakeBuildConfigurationFactory::QmakeBuildConfigurationFactory()
setSupportedProjectMimeTypeName(Constants::PROFILE_MIMETYPE); setSupportedProjectMimeTypeName(Constants::PROFILE_MIMETYPE);
setIssueReporter([](Kit *k, const QString &projectPath, const QString &buildDir) { setIssueReporter([](Kit *k, const QString &projectPath, const QString &buildDir) {
QtSupport::BaseQtVersion *version = QtSupport::QtKitAspect::qtVersion(k); QtSupport::BaseQtVersion *version = QtSupport::QtKitAspect::qtVersion(k);
QList<Task> issues; Tasks issues;
if (version) if (version)
issues << version->reportIssues(projectPath, buildDir); issues << version->reportIssues(projectPath, buildDir);
if (QmakeSettings::warnAgainstUnalignedBuildDir() if (QmakeSettings::warnAgainstUnalignedBuildDir()

4
src/plugins/qmakeprojectmanager/qmakekitinformation.cpp
View File

@@ -92,9 +92,9 @@ QmakeKitAspect::QmakeKitAspect()
setPriority(24000); setPriority(24000);
} }
QList<Task> QmakeKitAspect::validate(const Kit *k) const Tasks QmakeKitAspect::validate(const Kit *k) const
{ {
QList<Task> result; Tasks result;
QtSupport::BaseQtVersion *version = QtSupport::QtKitAspect::qtVersion(k); QtSupport::BaseQtVersion *version = QtSupport::QtKitAspect::qtVersion(k);
FileName mkspec = QmakeKitAspect::mkspec(k); FileName mkspec = QmakeKitAspect::mkspec(k);

2
src/plugins/qmakeprojectmanager/qmakekitinformation.h
View File

@@ -37,7 +37,7 @@ class QmakeKitAspect : public ProjectExplorer::KitAspect
public: public:
QmakeKitAspect(); QmakeKitAspect();
QList<ProjectExplorer::Task> validate(const ProjectExplorer::Kit *k) const override; ProjectExplorer::Tasks validate(const ProjectExplorer::Kit *k) const override;
void setup(ProjectExplorer::Kit *k) override; void setup(ProjectExplorer::Kit *k) override;
ProjectExplorer::KitAspectWidget *createConfigWidget(ProjectExplorer::Kit *k) const override; ProjectExplorer::KitAspectWidget *createConfigWidget(ProjectExplorer::Kit *k) const override;

20
src/plugins/qmakeprojectmanager/qmakeparser.cpp
View File

@@ -110,26 +110,26 @@ void QmakeProjectManagerPlugin::testQmakeOutputParsers_data()
QTest::addColumn<OutputParserTester::Channel>("inputChannel"); QTest::addColumn<OutputParserTester::Channel>("inputChannel");
QTest::addColumn<QString>("childStdOutLines"); QTest::addColumn<QString>("childStdOutLines");
QTest::addColumn<QString>("childStdErrLines"); QTest::addColumn<QString>("childStdErrLines");
QTest::addColumn<QList<ProjectExplorer::Task> >("tasks"); QTest::addColumn<Tasks >("tasks");
QTest::addColumn<QString>("outputLines"); QTest::addColumn<QString>("outputLines");
QTest::newRow("pass-through stdout") QTest::newRow("pass-through stdout")
<< QString::fromLatin1("Sometext") << OutputParserTester::STDOUT << QString::fromLatin1("Sometext") << OutputParserTester::STDOUT
<< QString::fromLatin1("Sometext\n") << QString() << QString::fromLatin1("Sometext\n") << QString()
<< QList<ProjectExplorer::Task>() << Tasks()
<< QString(); << QString();
QTest::newRow("pass-through stderr") QTest::newRow("pass-through stderr")
<< QString::fromLatin1("Sometext") << OutputParserTester::STDERR << QString::fromLatin1("Sometext") << OutputParserTester::STDERR
<< QString() << QString::fromLatin1("Sometext\n") << QString() << QString::fromLatin1("Sometext\n")
<< QList<ProjectExplorer::Task>() << Tasks()
<< QString(); << QString();
QTest::newRow("qMake error") QTest::newRow("qMake error")
<< QString::fromLatin1("Project ERROR: undefined file") << QString::fromLatin1("Project ERROR: undefined file")
<< OutputParserTester::STDERR << OutputParserTester::STDERR
<< QString() << QString() << QString() << QString()
<< (QList<ProjectExplorer::Task>() << (Tasks()
<< Task(Task::Error, << Task(Task::Error,
QLatin1String("undefined file"), QLatin1String("undefined file"),
Utils::FileName(), -1, Utils::FileName(), -1,
@@ -140,7 +140,7 @@ void QmakeProjectManagerPlugin::testQmakeOutputParsers_data()
<< QString::fromLatin1("e:\\project.pro:14: Parse Error ('sth odd')") << QString::fromLatin1("e:\\project.pro:14: Parse Error ('sth odd')")
<< OutputParserTester::STDERR << OutputParserTester::STDERR
<< QString() << QString() << QString() << QString()
<< (QList<ProjectExplorer::Task>() << (Tasks()
<< Task(Task::Error, << Task(Task::Error,
QLatin1String("Parse Error ('sth odd')"), QLatin1String("Parse Error ('sth odd')"),
Utils::FileName::fromUserInput(QLatin1String("e:\\project.pro")), Utils::FileName::fromUserInput(QLatin1String("e:\\project.pro")),
@@ -152,7 +152,7 @@ void QmakeProjectManagerPlugin::testQmakeOutputParsers_data()
<< QString::fromLatin1("Project WARNING: bearer module might require ReadUserData capability") << QString::fromLatin1("Project WARNING: bearer module might require ReadUserData capability")
<< OutputParserTester::STDERR << OutputParserTester::STDERR
<< QString() << QString() << QString() << QString()
<< (QList<ProjectExplorer::Task>() << (Tasks()
<< Task(Task::Warning, << Task(Task::Warning,
QLatin1String("bearer module might require ReadUserData capability"), QLatin1String("bearer module might require ReadUserData capability"),
Utils::FileName(), -1, Utils::FileName(), -1,
@@ -163,7 +163,7 @@ void QmakeProjectManagerPlugin::testQmakeOutputParsers_data()
<< QString::fromLatin1("WARNING: Failure to find: blackberrycreatepackagestepconfigwidget.cpp") << QString::fromLatin1("WARNING: Failure to find: blackberrycreatepackagestepconfigwidget.cpp")
<< OutputParserTester::STDERR << OutputParserTester::STDERR
<< QString() << QString() << QString() << QString()
<< (QList<ProjectExplorer::Task>() << (Tasks()
<< Task(Task::Warning, << Task(Task::Warning,
QLatin1String("Failure to find: blackberrycreatepackagestepconfigwidget.cpp"), QLatin1String("Failure to find: blackberrycreatepackagestepconfigwidget.cpp"),
Utils::FileName(), -1, Utils::FileName(), -1,
@@ -174,7 +174,7 @@ void QmakeProjectManagerPlugin::testQmakeOutputParsers_data()
<< QString::fromLatin1("WARNING: e:\\QtSDK\\Simulator\\Qt\\msvc2008\\lib\\qtmaind.prl:1: Unescaped backslashes are deprecated.") << QString::fromLatin1("WARNING: e:\\QtSDK\\Simulator\\Qt\\msvc2008\\lib\\qtmaind.prl:1: Unescaped backslashes are deprecated.")
<< OutputParserTester::STDERR << OutputParserTester::STDERR
<< QString() << QString() << QString() << QString()
<< (QList<ProjectExplorer::Task>() << (Tasks()
<< Task(Task::Warning, << Task(Task::Warning,
QLatin1String("Unescaped backslashes are deprecated."), QLatin1String("Unescaped backslashes are deprecated."),
Utils::FileName::fromUserInput(QLatin1String("e:\\QtSDK\\Simulator\\Qt\\msvc2008\\lib\\qtmaind.prl")), 1, Utils::FileName::fromUserInput(QLatin1String("e:\\QtSDK\\Simulator\\Qt\\msvc2008\\lib\\qtmaind.prl")), 1,
@@ -184,7 +184,7 @@ void QmakeProjectManagerPlugin::testQmakeOutputParsers_data()
<< QString::fromLatin1("/home/qtwebkithelpviewer.h:0: Note: No relevant classes found. No output generated.") << QString::fromLatin1("/home/qtwebkithelpviewer.h:0: Note: No relevant classes found. No output generated.")
<< OutputParserTester::STDERR << OutputParserTester::STDERR
<< QString() << QString() << QString() << QString()
<< (QList<ProjectExplorer::Task>() << (Tasks()
<< Task(Task::Unknown, << Task(Task::Unknown,
QLatin1String("Note: No relevant classes found. No output generated."), QLatin1String("Note: No relevant classes found. No output generated."),
Utils::FileName::fromUserInput(QLatin1String("/home/qtwebkithelpviewer.h")), 0, Utils::FileName::fromUserInput(QLatin1String("/home/qtwebkithelpviewer.h")), 0,
@@ -198,7 +198,7 @@ void QmakeProjectManagerPlugin::testQmakeOutputParsers()
testbench.appendOutputParser(new QMakeParser); testbench.appendOutputParser(new QMakeParser);
QFETCH(QString, input); QFETCH(QString, input);
QFETCH(OutputParserTester::Channel, inputChannel); QFETCH(OutputParserTester::Channel, inputChannel);
QFETCH(QList<Task>, tasks); QFETCH(Tasks, tasks);
QFETCH(QString, childStdOutLines); QFETCH(QString, childStdOutLines);
QFETCH(QString, childStdErrLines); QFETCH(QString, childStdErrLines);
QFETCH(QString, outputLines); QFETCH(QString, outputLines);

4
src/plugins/qmakeprojectmanager/qmakeproject.cpp
View File

@@ -540,9 +540,9 @@ void QmakeProject::buildFinished(bool success)
m_invalidateQmakeVfsContents = true; m_invalidateQmakeVfsContents = true;
} }
QList<Task> QmakeProject::projectIssues(const Kit *k) const Tasks QmakeProject::projectIssues(const Kit *k) const
{ {
QList<Task> result = Project::projectIssues(k); Tasks result = Project::projectIssues(k);
if (!QtSupport::QtKitAspect::qtVersion(k)) if (!QtSupport::QtKitAspect::qtVersion(k))
result.append(createProjectTask(Task::TaskType::Error, tr("No Qt version set in kit."))); result.append(createProjectTask(Task::TaskType::Error, tr("No Qt version set in kit.")));
else if (!QtSupport::QtKitAspect::qtVersion(k)->isValid()) else if (!QtSupport::QtKitAspect::qtVersion(k)->isValid())

2
src/plugins/qmakeprojectmanager/qmakeproject.h
View File

@@ -61,7 +61,7 @@ public:
QmakeProFile *rootProFile() const; QmakeProFile *rootProFile() const;
QList<ProjectExplorer::Task> projectIssues(const ProjectExplorer::Kit *k) const final; ProjectExplorer::Tasks projectIssues(const ProjectExplorer::Kit *k) const final;
QmakeProFileNode *rootProjectNode() const final; QmakeProFileNode *rootProjectNode() const final;

2
src/plugins/qmakeprojectmanager/qmakeprojectconfigwidget.cpp
View File

@@ -298,7 +298,7 @@ void QmakeProjectConfigWidget::updateProblemLabel()
QString buildDirectory = m_buildConfiguration->target()->project()->projectDirectory().toString(); QString buildDirectory = m_buildConfiguration->target()->project()->projectDirectory().toString();
if (m_buildConfiguration->isShadowBuild()) if (m_buildConfiguration->isShadowBuild())
buildDirectory = m_buildConfiguration->buildDirectory().toString(); buildDirectory = m_buildConfiguration->buildDirectory().toString();
QList<ProjectExplorer::Task> issues; Tasks issues;
issues = version->reportIssues(proFileName, buildDirectory); issues = version->reportIssues(proFileName, buildDirectory);
Utils::sort(issues); Utils::sort(issues);

2
src/plugins/qmakeprojectmanager/qmakestep.cpp
View File

@@ -234,7 +234,7 @@ bool QMakeStep::init()
QTC_ASSERT(node, return false); QTC_ASSERT(node, return false);
QString proFile = node->filePath().toString(); QString proFile = node->filePath().toString();
QList<ProjectExplorer::Task> tasks = qtVersion->reportIssues(proFile, workingDirectory); Tasks tasks = qtVersion->reportIssues(proFile, workingDirectory);
Utils::sort(tasks); Utils::sort(tasks);
if (!tasks.isEmpty()) { if (!tasks.isEmpty()) {

10
src/plugins/qmljseditor/qmltaskmanager.cpp
View File

@@ -60,9 +60,9 @@ QmlTaskManager::QmlTaskManager()
connect(&m_updateDelay, &QTimer::timeout, this, [this] { updateMessagesNow(); }); connect(&m_updateDelay, &QTimer::timeout, this, [this] { updateMessagesNow(); });
} }
static QList<Task> convertToTasks(const QList<DiagnosticMessage> &messages, const FileName &fileName, Core::Id category) static Tasks convertToTasks(const QList<DiagnosticMessage> &messages, const FileName &fileName, Core::Id category)
{ {
QList<Task> result; Tasks result;
foreach (const DiagnosticMessage &msg, messages) { foreach (const DiagnosticMessage &msg, messages) {
Task::TaskType type = msg.isError() ? Task::Error : Task::Warning; Task::TaskType type = msg.isError() ? Task::Error : Task::Warning;
Task task(type, msg.message, fileName, msg.loc.startLine, category); Task task(type, msg.message, fileName, msg.loc.startLine, category);
@@ -71,7 +71,7 @@ static QList<Task> convertToTasks(const QList<DiagnosticMessage> &messages, cons
return result; return result;
} }
static QList<Task> convertToTasks(const QList<StaticAnalysis::Message> &messages, const FileName &fileName, Core::Id category) static Tasks convertToTasks(const QList<StaticAnalysis::Message> &messages, const FileName &fileName, Core::Id category)
{ {
QList<DiagnosticMessage> diagnostics; QList<DiagnosticMessage> diagnostics;
foreach (const StaticAnalysis::Message &msg, messages) foreach (const StaticAnalysis::Message &msg, messages)
@@ -179,7 +179,7 @@ void QmlTaskManager::displayAllResults()
void QmlTaskManager::insertTask(const Task &task) void QmlTaskManager::insertTask(const Task &task)
{ {
QList<Task> tasks = m_docsWithTasks.value(task.file.toString()); Tasks tasks = m_docsWithTasks.value(task.file.toString());
tasks.append(task); tasks.append(task);
m_docsWithTasks.insert(task.file.toString(), tasks); m_docsWithTasks.insert(task.file.toString(), tasks);
TaskHub::addTask(task); TaskHub::addTask(task);
@@ -188,7 +188,7 @@ void QmlTaskManager::insertTask(const Task &task)
void QmlTaskManager::removeTasksForFile(const QString &fileName) void QmlTaskManager::removeTasksForFile(const QString &fileName)
{ {
if (m_docsWithTasks.contains(fileName)) { if (m_docsWithTasks.contains(fileName)) {
const QList<Task> tasks = m_docsWithTasks.value(fileName); const Tasks tasks = m_docsWithTasks.value(fileName);
foreach (const Task &task, tasks) foreach (const Task &task, tasks)
TaskHub::removeTask(task); TaskHub::removeTask(task);
m_docsWithTasks.remove(fileName); m_docsWithTasks.remove(fileName);

4
src/plugins/qmljseditor/qmltaskmanager.h
View File

@@ -65,7 +65,7 @@ private:
{ {
public: public:
QString fileName; QString fileName;
QList<ProjectExplorer::Task> tasks; ProjectExplorer::Tasks tasks;
}; };
static void collectMessages(QFutureInterface<FileErrorMessages> &future, static void collectMessages(QFutureInterface<FileErrorMessages> &future,
QmlJS::Snapshot snapshot, QmlJS::Snapshot snapshot,
@@ -74,7 +74,7 @@ private:
bool updateSemantic); bool updateSemantic);
private: private:
QHash<QString, QList<ProjectExplorer::Task> > m_docsWithTasks; QHash<QString, ProjectExplorer::Tasks > m_docsWithTasks;
QFutureWatcher<FileErrorMessages> m_messageCollector; QFutureWatcher<FileErrorMessages> m_messageCollector;
QTimer m_updateDelay; QTimer m_updateDelay;
bool m_updatingSemantic = false; bool m_updatingSemantic = false;

4
src/plugins/qmlprojectmanager/qmlproject.cpp
View File

@@ -287,9 +287,9 @@ void QmlProject::refreshTargetDirectory()
updateDeploymentData(target); updateDeploymentData(target);
} }
QList<Task> QmlProject::projectIssues(const Kit *k) const Tasks QmlProject::projectIssues(const Kit *k) const
{ {
QList<Task> result = Project::projectIssues(k); Tasks result = Project::projectIssues(k);
const QtSupport::BaseQtVersion *version = QtSupport::QtKitAspect::qtVersion(k); const QtSupport::BaseQtVersion *version = QtSupport::QtKitAspect::qtVersion(k);
if (!version) if (!version)

2
src/plugins/qmlprojectmanager/qmlproject.h
View File

@@ -48,7 +48,7 @@ public:
explicit QmlProject(const Utils::FileName &filename); explicit QmlProject(const Utils::FileName &filename);
~QmlProject() override; ~QmlProject() override;
QList<ProjectExplorer::Task> projectIssues(const ProjectExplorer::Kit *k) const final; ProjectExplorer::Tasks projectIssues(const ProjectExplorer::Kit *k) const final;
bool validProjectFile() const; bool validProjectFile() const;

12
src/plugins/qtsupport/baseqtversion.cpp
View File

@@ -352,9 +352,9 @@ QSet<Id> BaseQtVersion::availableFeatures() const
return features; return features;
} }
QList<Task> BaseQtVersion::validateKit(const Kit *k) Tasks BaseQtVersion::validateKit(const Kit *k)
{ {
QList<Task> result; Tasks result;
BaseQtVersion *version = QtKitAspect::qtVersion(k); BaseQtVersion *version = QtKitAspect::qtVersion(k);
Q_ASSERT(version == this); Q_ASSERT(version == this);
@@ -1466,11 +1466,11 @@ void BaseQtVersion::recheckDumper()
m_versionInfoUpToDate = false; m_versionInfoUpToDate = false;
} }
QList<Task> BaseQtVersion::reportIssuesImpl(const QString &proFile, const QString &buildDir) const Tasks BaseQtVersion::reportIssuesImpl(const QString &proFile, const QString &buildDir) const
{ {
Q_UNUSED(proFile); Q_UNUSED(proFile);
Q_UNUSED(buildDir); Q_UNUSED(buildDir);
QList<Task> results; Tasks results;
if (!isValid()) { if (!isValid()) {
//: %1: Reason for being invalid //: %1: Reason for being invalid
@@ -1492,9 +1492,9 @@ QList<Task> BaseQtVersion::reportIssuesImpl(const QString &proFile, const QStrin
return results; return results;
} }
QList<Task> BaseQtVersion::reportIssues(const QString &proFile, const QString &buildDir) const Tasks BaseQtVersion::reportIssues(const QString &proFile, const QString &buildDir) const
{ {
QList<Task> results = reportIssuesImpl(proFile, buildDir); Tasks results = reportIssuesImpl(proFile, buildDir);
Utils::sort(results); Utils::sort(results);
return results; return results;
} }

8
src/plugins/qtsupport/baseqtversion.h
View File

@@ -31,6 +31,7 @@
#include <utils/macroexpander.h> #include <utils/macroexpander.h>
#include <projectexplorer/abi.h> #include <projectexplorer/abi.h>
#include <projectexplorer/task.h>
#include <QSet> #include <QSet>
#include <QStringList> #include <QStringList>
@@ -48,7 +49,6 @@ class Kit;
class ToolChain; class ToolChain;
class HeaderPath; class HeaderPath;
class Target; class Target;
class Task;
} // namespace ProjectExplorer } // namespace ProjectExplorer
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
@@ -201,7 +201,7 @@ public:
/// Check a .pro-file/Qt version combination on possible issues /// Check a .pro-file/Qt version combination on possible issues
/// @return a list of tasks, ordered on severity (errors first, then /// @return a list of tasks, ordered on severity (errors first, then
/// warnings and finally info items. /// warnings and finally info items.
QList<ProjectExplorer::Task> reportIssues(const QString &proFile, const QString &buildDir) const; ProjectExplorer::Tasks reportIssues(const QString &proFile, const QString &buildDir) const;
static bool isQmlDebuggingSupported(ProjectExplorer::Kit *k, QString *reason = nullptr); static bool isQmlDebuggingSupported(ProjectExplorer::Kit *k, QString *reason = nullptr);
bool isQmlDebuggingSupported(QString *reason = nullptr) const; bool isQmlDebuggingSupported(QString *reason = nullptr) const;
@@ -221,7 +221,7 @@ public:
virtual QSet<Core::Id> targetDeviceTypes() const = 0; virtual QSet<Core::Id> targetDeviceTypes() const = 0;
virtual QList<ProjectExplorer::Task> validateKit(const ProjectExplorer::Kit *k); virtual ProjectExplorer::Tasks validateKit(const ProjectExplorer::Kit *k);
Utils::FileName headerPath() const; Utils::FileName headerPath() const;
Utils::FileName docsPath() const; Utils::FileName docsPath() const;
@@ -261,7 +261,7 @@ protected:
BaseQtVersion(); BaseQtVersion();
BaseQtVersion(const BaseQtVersion &other) = delete; BaseQtVersion(const BaseQtVersion &other) = delete;
virtual QList<ProjectExplorer::Task> reportIssuesImpl(const QString &proFile, const QString &buildDir) const; virtual ProjectExplorer::Tasks reportIssuesImpl(const QString &proFile, const QString &buildDir) const;
// helper function for desktop and simulator to figure out the supported abis based on the libraries // helper function for desktop and simulator to figure out the supported abis based on the libraries
Utils::FileNameList qtCorePaths() const; Utils::FileNameList qtCorePaths() const;

4
src/plugins/qtsupport/qscxmlcgenerator.cpp
View File

@@ -52,9 +52,9 @@ QScxmlcGenerator::QScxmlcGenerator(const Project *project,
m_impl = m_tmpdir.path() + QLatin1Char('/') + targets[1].fileName(); m_impl = m_tmpdir.path() + QLatin1Char('/') + targets[1].fileName();
} }
QList<Task> QScxmlcGenerator::parseIssues(const QByteArray &processStderr) Tasks QScxmlcGenerator::parseIssues(const QByteArray &processStderr)
{ {
QList<Task> issues; Tasks issues;
foreach (const QByteArray &line, processStderr.split('\n')) { foreach (const QByteArray &line, processStderr.split('\n')) {
QByteArrayList tokens = line.split(':'); QByteArrayList tokens = line.split(':');

2
src/plugins/qtsupport/qscxmlcgenerator.h
View File

@@ -49,7 +49,7 @@ private:
Utils::FileName tmpFile() const; Utils::FileName tmpFile() const;
ProjectExplorer::FileNameToContentsHash handleProcessFinished(QProcess *process) override; ProjectExplorer::FileNameToContentsHash handleProcessFinished(QProcess *process) override;
bool prepareToRun(const QByteArray &sourceContents) override; bool prepareToRun(const QByteArray &sourceContents) override;
QList<ProjectExplorer::Task> parseIssues(const QByteArray &processStderr) override; ProjectExplorer::Tasks parseIssues(const QByteArray &processStderr) override;
Utils::TemporaryDirectory m_tmpdir; Utils::TemporaryDirectory m_tmpdir;
QString m_header; QString m_header;

2
src/plugins/qtsupport/qtkitinformation.cpp
View File

@@ -193,7 +193,7 @@ void QtKitAspect::setup(ProjectExplorer::Kit *k)
k->setValue(id(), candidates.first()->uniqueId()); k->setValue(id(), candidates.first()->uniqueId());
} }
QList<ProjectExplorer::Task> QtKitAspect::validate(const ProjectExplorer::Kit *k) const Tasks QtKitAspect::validate(const ProjectExplorer::Kit *k) const
{ {
QTC_ASSERT(QtVersionManager::isLoaded(), return { }); QTC_ASSERT(QtVersionManager::isLoaded(), return { });
BaseQtVersion *version = qtVersion(k); BaseQtVersion *version = qtVersion(k);

2
src/plugins/qtsupport/qtkitinformation.h
View File

@@ -44,7 +44,7 @@ public:
void setup(ProjectExplorer::Kit *k) override; void setup(ProjectExplorer::Kit *k) override;
QList<ProjectExplorer::Task> validate(const ProjectExplorer::Kit *k) const override; ProjectExplorer::Tasks validate(const ProjectExplorer::Kit *k) const override;
void fix(ProjectExplorer::Kit *) override; void fix(ProjectExplorer::Kit *) override;
ProjectExplorer::KitAspectWidget *createConfigWidget(ProjectExplorer::Kit *k) const override; ProjectExplorer::KitAspectWidget *createConfigWidget(ProjectExplorer::Kit *k) const override;

22
src/plugins/qtsupport/qtparser.cpp
View File

@@ -96,19 +96,19 @@ void QtSupportPlugin::testQtOutputParser_data()
QTest::addColumn<OutputParserTester::Channel>("inputChannel"); QTest::addColumn<OutputParserTester::Channel>("inputChannel");
QTest::addColumn<QString>("childStdOutLines"); QTest::addColumn<QString>("childStdOutLines");
QTest::addColumn<QString>("childStdErrLines"); QTest::addColumn<QString>("childStdErrLines");
QTest::addColumn<QList<ProjectExplorer::Task> >("tasks"); QTest::addColumn<Tasks >("tasks");
QTest::addColumn<QString>("outputLines"); QTest::addColumn<QString>("outputLines");
QTest::newRow("pass-through stdout") QTest::newRow("pass-through stdout")
<< QString::fromLatin1("Sometext") << OutputParserTester::STDOUT << QString::fromLatin1("Sometext") << OutputParserTester::STDOUT
<< QString::fromLatin1("Sometext\n") << QString() << QString::fromLatin1("Sometext\n") << QString()
<< QList<ProjectExplorer::Task>() << Tasks()
<< QString(); << QString();
QTest::newRow("pass-through stderr") QTest::newRow("pass-through stderr")
<< QString::fromLatin1("Sometext") << OutputParserTester::STDERR << QString::fromLatin1("Sometext") << OutputParserTester::STDERR
<< QString() << QString::fromLatin1("Sometext\n") << QString() << QString::fromLatin1("Sometext\n")
<< QList<ProjectExplorer::Task>() << Tasks()
<< QString(); << QString();
QTest::newRow("pass-through gcc infos") QTest::newRow("pass-through gcc infos")
<< QString::fromLatin1("/temp/test/untitled8/main.cpp: In function `int main(int, char**)':\n" << QString::fromLatin1("/temp/test/untitled8/main.cpp: In function `int main(int, char**)':\n"
@@ -123,13 +123,13 @@ void QtSupportPlugin::testQtOutputParser_data()
"../../scriptbug/main.cpp: In instantiation of void bar(i) [with i = double]:\n" "../../scriptbug/main.cpp: In instantiation of void bar(i) [with i = double]:\n"
"../../scriptbug/main.cpp:8: instantiated from void foo(i) [with i = double]\n" "../../scriptbug/main.cpp:8: instantiated from void foo(i) [with i = double]\n"
"../../scriptbug/main.cpp:22: instantiated from here\n") "../../scriptbug/main.cpp:22: instantiated from here\n")
<< QList<ProjectExplorer::Task>() << Tasks()
<< QString(); << QString();
QTest::newRow("qdoc warning") QTest::newRow("qdoc warning")
<< QString::fromLatin1("/home/user/dev/qt5/qtscript/src/script/api/qscriptengine.cpp:295: warning: Can't create link to 'Object Trees & Ownership'") << QString::fromLatin1("/home/user/dev/qt5/qtscript/src/script/api/qscriptengine.cpp:295: warning: Can't create link to 'Object Trees & Ownership'")
<< OutputParserTester::STDERR << OutputParserTester::STDERR
<< QString() << QString() << QString() << QString()
<< (QList<ProjectExplorer::Task>() << Task(Task::Warning, << (Tasks() << Task(Task::Warning,
QLatin1String("Can't create link to 'Object Trees & Ownership'"), QLatin1String("Can't create link to 'Object Trees & Ownership'"),
Utils::FileName::fromUserInput(QLatin1String("/home/user/dev/qt5/qtscript/src/script/api/qscriptengine.cpp")), 295, Utils::FileName::fromUserInput(QLatin1String("/home/user/dev/qt5/qtscript/src/script/api/qscriptengine.cpp")), 295,
ProjectExplorer::Constants::TASK_CATEGORY_COMPILE)) ProjectExplorer::Constants::TASK_CATEGORY_COMPILE))
@@ -138,7 +138,7 @@ void QtSupportPlugin::testQtOutputParser_data()
<< QString::fromLatin1("..\\untitled\\errorfile.h:0: Warning: No relevant classes found. No output generated.") << QString::fromLatin1("..\\untitled\\errorfile.h:0: Warning: No relevant classes found. No output generated.")
<< OutputParserTester::STDERR << OutputParserTester::STDERR
<< QString() << QString() << QString() << QString()
<< (QList<ProjectExplorer::Task>() << Task(Task::Warning, << (Tasks() << Task(Task::Warning,
QLatin1String("No relevant classes found. No output generated."), QLatin1String("No relevant classes found. No output generated."),
Utils::FileName::fromUserInput(QLatin1String("..\\untitled\\errorfile.h")), 0, Utils::FileName::fromUserInput(QLatin1String("..\\untitled\\errorfile.h")), 0,
ProjectExplorer::Constants::TASK_CATEGORY_COMPILE)) ProjectExplorer::Constants::TASK_CATEGORY_COMPILE))
@@ -147,7 +147,7 @@ void QtSupportPlugin::testQtOutputParser_data()
<< QString::fromLatin1("c:\\code\\test.h(96): Warning: Property declaration ) has no READ accessor function. The property will be invalid.") << QString::fromLatin1("c:\\code\\test.h(96): Warning: Property declaration ) has no READ accessor function. The property will be invalid.")
<< OutputParserTester::STDERR << OutputParserTester::STDERR
<< QString() << QString() << QString() << QString()
<< (QList<ProjectExplorer::Task>() << Task(Task::Warning, << (Tasks() << Task(Task::Warning,
QLatin1String("Property declaration ) has no READ accessor function. The property will be invalid."), QLatin1String("Property declaration ) has no READ accessor function. The property will be invalid."),
Utils::FileName::fromUserInput(QLatin1String("c:\\code\\test.h")), 96, Utils::FileName::fromUserInput(QLatin1String("c:\\code\\test.h")), 96,
ProjectExplorer::Constants::TASK_CATEGORY_COMPILE)) ProjectExplorer::Constants::TASK_CATEGORY_COMPILE))
@@ -156,7 +156,7 @@ void QtSupportPlugin::testQtOutputParser_data()
<< QString::fromLatin1("/home/qtwebkithelpviewer.h:0: Note: No relevant classes found. No output generated.") << QString::fromLatin1("/home/qtwebkithelpviewer.h:0: Note: No relevant classes found. No output generated.")
<< OutputParserTester::STDERR << OutputParserTester::STDERR
<< QString() << QString() << QString() << QString()
<< (QList<ProjectExplorer::Task>() << Task(Task::Unknown, << (Tasks() << Task(Task::Unknown,
QLatin1String("No relevant classes found. No output generated."), QLatin1String("No relevant classes found. No output generated."),
Utils::FileName::fromUserInput(QLatin1String("/home/qtwebkithelpviewer.h")), 0, Utils::FileName::fromUserInput(QLatin1String("/home/qtwebkithelpviewer.h")), 0,
ProjectExplorer::Constants::TASK_CATEGORY_COMPILE)) ProjectExplorer::Constants::TASK_CATEGORY_COMPILE))
@@ -165,7 +165,7 @@ void QtSupportPlugin::testQtOutputParser_data()
<< QString::fromLatin1("E:/sandbox/creator/loaden/src/libs/utils/iwelcomepage.h(54): Error: Undefined interface") << QString::fromLatin1("E:/sandbox/creator/loaden/src/libs/utils/iwelcomepage.h(54): Error: Undefined interface")
<< OutputParserTester::STDERR << OutputParserTester::STDERR
<< QString() << QString() << QString() << QString()
<< (QList<ProjectExplorer::Task>() << Task(Task::Error, << (Tasks() << Task(Task::Error,
QLatin1String("Undefined interface"), QLatin1String("Undefined interface"),
Utils::FileName::fromUserInput(QLatin1String("E:/sandbox/creator/loaden/src/libs/utils/iwelcomepage.h")), 54, Utils::FileName::fromUserInput(QLatin1String("E:/sandbox/creator/loaden/src/libs/utils/iwelcomepage.h")), 54,
ProjectExplorer::Constants::TASK_CATEGORY_COMPILE)) ProjectExplorer::Constants::TASK_CATEGORY_COMPILE))
@@ -174,7 +174,7 @@ void QtSupportPlugin::testQtOutputParser_data()
<< QString::fromLatin1("Warning: dropping duplicate messages in '/some/place/qtcreator_fr.qm'") << QString::fromLatin1("Warning: dropping duplicate messages in '/some/place/qtcreator_fr.qm'")
<< OutputParserTester::STDERR << OutputParserTester::STDERR
<< QString() << QString() << QString() << QString()
<< (QList<ProjectExplorer::Task>() << Task(Task::Warning, << (Tasks() << Task(Task::Warning,
QLatin1String("dropping duplicate messages"), QLatin1String("dropping duplicate messages"),
Utils::FileName::fromUserInput(QLatin1String("/some/place/qtcreator_fr.qm")), -1, Utils::FileName::fromUserInput(QLatin1String("/some/place/qtcreator_fr.qm")), -1,
ProjectExplorer::Constants::TASK_CATEGORY_COMPILE)) ProjectExplorer::Constants::TASK_CATEGORY_COMPILE))
@@ -187,7 +187,7 @@ void QtSupportPlugin::testQtOutputParser()
testbench.appendOutputParser(new QtParser); testbench.appendOutputParser(new QtParser);
QFETCH(QString, input); QFETCH(QString, input);
QFETCH(OutputParserTester::Channel, inputChannel); QFETCH(OutputParserTester::Channel, inputChannel);
QFETCH(QList<Task>, tasks); QFETCH(Tasks, tasks);
QFETCH(QString, childStdOutLines); QFETCH(QString, childStdOutLines);
QFETCH(QString, childStdErrLines); QFETCH(QString, childStdErrLines);
QFETCH(QString, outputLines); QFETCH(QString, outputLines);

2
src/plugins/qtsupport/qttestparser.cpp
View File

@@ -115,7 +115,7 @@ void QtSupportPlugin::testQtTestOutputParser()
"PASS : MyTest::anotherTest()\n"; "PASS : MyTest::anotherTest()\n";
const FileName theFile = FileName::fromString(HostOsInfo::isWindowsHost() const FileName theFile = FileName::fromString(HostOsInfo::isWindowsHost()
? QString("C:/dev/tests/tst_mytest.cpp") : QString("/home/me/tests/tst_mytest.cpp")); ? QString("C:/dev/tests/tst_mytest.cpp") : QString("/home/me/tests/tst_mytest.cpp"));
const QList<Task> expectedTasks{ const Tasks expectedTasks{
Task(Task::Error, "XPASS : MyTest::someTest()", theFile, 154, Task(Task::Error, "XPASS : MyTest::someTest()", theFile, 154,
Constants::TASK_CATEGORY_AUTOTEST), Constants::TASK_CATEGORY_AUTOTEST),
Task(Task::Error, "FAIL! : MyTest::someOtherTest(init) " Task(Task::Error, "FAIL! : MyTest::someOtherTest(init) "

2
tests/auto/toolchaincache/toolchaincache.pro
View File

@@ -1,5 +1,3 @@
QT -= gui
include(../qttest.pri) include(../qttest.pri)
SOURCES += \ SOURCES += \

1
tests/auto/toolchaincache/toolchaincache.qbs
View File

@@ -3,6 +3,7 @@ import qbs
QtcAutotest { QtcAutotest {
name: "ToolChainCache autotest" name: "ToolChainCache autotest"
Depends { name: "ProjectExplorer" } Depends { name: "ProjectExplorer" }
Depends { name: "Qt.gui" } // For QIcon in Task
Group { Group {
name: "Test sources" name: "Test sources"
files: "tst_toolchaincache.cpp" files: "tst_toolchaincache.cpp"