Differential D4095 Diff 12149 projectmanagers/custommake/makefileresolver/makefileresolver.cpp

Changeset View

Standalone View

View Options

projectmanagers/custommake/makefileresolver/makefileresolver.cpp

Show First 20 Lines • Show All 519 Lines • ▼ Show 20 Line(s)425{
520 PathResolutionResult ret = processOutput(fullOutput, workingDirectory); 520​ PathResolutionResult ret = processOutput(fullOutput, workingDirectory);
521 if (ret.paths.isEmpty() && ret.frameworkDirectories.isEmpty()) 521​ if (ret.paths.isEmpty() && ret.frameworkDirectories.isEmpty())
522 return PathResolutionResult(false, i18n("Could not extract include paths from make output"), 522​ return PathResolutionResult(false, i18n("Could not extract include paths from make output"),
523 i18n("Folder: \"%1\" Command: \"%2\" Output: \"%3\"", workingDirectory, 523​ i18n("Folder: \"%1\" Command: \"%2\" Output: \"%3\"", workingDirectory,
524 source.getCommand(file, workingDirectory, makeParameters), fullOutput)); 524​ source.getCommand(file, workingDirectory, makeParameters), fullOutput));
525 return ret; 525​ return ret;
526} 526​}
527 527​
528static QRegularExpression defineRegularExpression() 528​QRegularExpression MakeFileResolver::defineRegularExpression()
529{ 529​{
530 static const QRegularExpression pattern( 530​ static const QRegularExpression pattern(
531 "-D([^\\s=]+)(?:=(?:\"(.*?)(?<!\\\\)\"|([^\\s]*)))?" 531​ "-D([^\\s=]+)(?:=(?:\"(.*?)(?<!\\\\)\"|([^\\s]*)))?"
532 ); 532​ );
533 Q_ASSERT(pattern.isValid()); 533​ Q_ASSERT(pattern.isValid());
534 return pattern; 534​ return pattern;
535} 535​}
536 536​
▲ Show 20 Lines • Show All 102 Lines • Show Last 20 Lines