Differential D355 Diff 950 languages/plugins/custom-definesandincludes/compilerprovider/gcclikecompiler.cpp

Changeset View

Standalone View

View Options

languages/plugins/custom-definesandincludes/compilerprovider/gcclikecompiler.cpp

Show First 20 Lines • Show All 148 Lines • ▼ Show 20 Line(s)145 case FirstSearch:
149 } 149​ }
150 case Includes: 150​ case Includes:
151 //Detect the include-paths by the first space that is prepended. Reason: The list may contain relative paths like "." 151​ //Detect the include-paths by the first space that is prepended. Reason: The list may contain relative paths like "."
152 if ( !line.startsWith( ' ' ) ) { 152​ if ( !line.startsWith( ' ' ) ) {
153 // We've reached the end of the list. 153​ // We've reached the end of the list.
154 mode = Finished; 154​ mode = Finished;
155 } else { 155​ } else {
156 // This is an include path, add it to the list. 156​ // This is an include path, add it to the list.
157 m_definesIncludes[arguments].includePaths << Path( QDir::cleanPath( line.trimmed() ) ); 157​ m_definesIncludes[arguments].includePaths << Path(QFileInfo(line.trimmed()).canonicalFilePath());
158 } 158​ }
159 break; 159​ break;
160 default: 160​ default:
161 break; 161​ break;
162 } 162​ }
163 if ( mode == Finished ) { 163​ if ( mode == Finished ) {
164 break; 164​ break;
165 } 165​ }
166 } 166​ }
167 167​
168 return m_definesIncludes[arguments].includePaths; 168​ return m_definesIncludes[arguments].includePaths;
169} 169​}
170 170​
171GccLikeCompiler::GccLikeCompiler(const QString& name, const QString& path, bool editable, const QString& factoryName): 171​GccLikeCompiler::GccLikeCompiler(const QString& name, const QString& path, bool editable, const QString& factoryName):
172 ICompiler(name, path, factoryName, editable) 172​ ICompiler(name, path, factoryName, editable)
173{} 173​{}