forked from qt-creator/qt-creator
adjust to changed QMakeParser API
amends b7706cdfeb
.
Change-Id: I83fc5d2b1c660d3c6f9c456b0f54c0fd2d669140
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
committed by
Christian Stenger
parent
ce799321ac
commit
48687c0fa1
@@ -448,7 +448,7 @@ void tst_ProFileWriter::adds()
|
||||
|
||||
QMakeVfs vfs;
|
||||
QMakeParser parser(0, &vfs, &parseHandler);
|
||||
ProFile *proFile = parser.parsedProBlock(input, QLatin1String(BASE_DIR "/test.pro"), 1);
|
||||
ProFile *proFile = parser.parsedProBlock(QStringRef(&input), QLatin1String(BASE_DIR "/test.pro"), 1);
|
||||
QVERIFY(proFile);
|
||||
PW::putVarValues(proFile, &lines, values, var, PW::PutFlags(flags), scope);
|
||||
proFile->deref();
|
||||
@@ -619,7 +619,7 @@ void tst_ProFileWriter::removes()
|
||||
|
||||
QMakeVfs vfs;
|
||||
QMakeParser parser(0, &vfs, &parseHandler);
|
||||
ProFile *proFile = parser.parsedProBlock(input, QLatin1String(BASE_DIR "/test.pro"), 1);
|
||||
ProFile *proFile = parser.parsedProBlock(QStringRef(&input), QLatin1String(BASE_DIR "/test.pro"), 1);
|
||||
QVERIFY(proFile);
|
||||
QmakeProjectManager::Internal::ProWriter::removeVarValues(proFile, &lines, values, vars);
|
||||
proFile->deref();
|
||||
@@ -648,7 +648,7 @@ void tst_ProFileWriter::multiVar()
|
||||
|
||||
QMakeVfs vfs;
|
||||
QMakeParser parser(0, &vfs, &parseHandler);
|
||||
ProFile *proFile = parser.parsedProBlock(input, QLatin1String(BASE_DIR "/test.pro"), 1);
|
||||
ProFile *proFile = parser.parsedProBlock(QStringRef(&input), QLatin1String(BASE_DIR "/test.pro"), 1);
|
||||
QVERIFY(proFile);
|
||||
QmakeProjectManager::Internal::ProWriter::removeFiles(proFile, &lines, baseDir, files, vars);
|
||||
proFile->deref();
|
||||
@@ -669,7 +669,7 @@ void tst_ProFileWriter::addFiles()
|
||||
|
||||
QMakeVfs vfs;
|
||||
QMakeParser parser(0, &vfs, &parseHandler);
|
||||
ProFile *proFile = parser.parsedProBlock(input, QLatin1String(BASE_DIR "/test.pro"), 1);
|
||||
ProFile *proFile = parser.parsedProBlock(QStringRef(&input), QLatin1String(BASE_DIR "/test.pro"), 1);
|
||||
QVERIFY(proFile);
|
||||
QmakeProjectManager::Internal::ProWriter::addFiles(proFile, &lines,
|
||||
QStringList() << QString::fromLatin1(BASE_DIR "/sub/bar.cpp"),
|
||||
@@ -691,7 +691,7 @@ void tst_ProFileWriter::removeFiles()
|
||||
|
||||
QMakeVfs vfs;
|
||||
QMakeParser parser(0, &vfs, &parseHandler);
|
||||
ProFile *proFile = parser.parsedProBlock(input, QLatin1String(BASE_DIR "/test.pro"), 1);
|
||||
ProFile *proFile = parser.parsedProBlock(QStringRef(&input), QLatin1String(BASE_DIR "/test.pro"), 1);
|
||||
QVERIFY(proFile);
|
||||
QmakeProjectManager::Internal::ProWriter::removeFiles(proFile, &lines, QDir(BASE_DIR),
|
||||
QStringList() << QString::fromLatin1(BASE_DIR "/sub/bar.cpp"),
|
||||
|
Reference in New Issue
Block a user