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

Changeset View

Standalone View

View Options

projectmanagers/custommake/makefileresolver/makefileresolver.cpp

Show First 20 Lines • Show All 656 Lines • ▼ Show 20 Line(s)555{
657 PathResolutionResult ret = processOutput(fullOutput, workingDirectory); 657​ PathResolutionResult ret = processOutput(fullOutput, workingDirectory);
658 if (ret.paths.isEmpty() && ret.frameworkDirectories.isEmpty()) 658​ if (ret.paths.isEmpty() && ret.frameworkDirectories.isEmpty())
659 return PathResolutionResult(false, i18n("Could not extract include paths from make output"), 659​ return PathResolutionResult(false, i18n("Could not extract include paths from make output"),
660 i18n("Folder: \"%1\" Command: \"%2\" Output: \"%3\"", workingDirectory, 660​ i18n("Folder: \"%1\" Command: \"%2\" Output: \"%3\"", workingDirectory,
661 source.getCommand(file, workingDirectory, makeParameters), fullOutput)); 661​ source.getCommand(file, workingDirectory, makeParameters), fullOutput));
662 return ret; 662​ return ret;
663} 663​}
664 664​
665static QRegularExpression defineRegularExpression() 665​QRegularExpression MakeFileResolver::defineRegularExpression()
666{ 666​{
667 static const QRegularExpression pattern( 667​ static const QRegularExpression pattern(
668 "-D([^\\s=]+)(?:=(?:\"(.*?)(?<!\\\\)\"|([^\\s]*)))?" 668​ "-D([^\\s=]+)(?:=(?:\"(.*?)(?<!\\\\)\"|([^\\s]*)))?"
669 ); 669​ );
670 Q_ASSERT(pattern.isValid()); 670​ Q_ASSERT(pattern.isValid());
671 return pattern; 671​ return pattern;
672} 672​}
673 673​
▲ Show 20 Lines • Show All 102 Lines • Show Last 20 Lines