Changeset 363 for trunk/qmake/generators/makefiledeps.cpp
- Timestamp:
- Nov 30, 2009, 6:52:30 PM (16 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/qmake/generators/makefiledeps.cpp
r362 r363 625 625 if(try_local) { 626 626 QString dir = findFileInfo(file->file).path(); 627 QMakeLocalFileName f(QDir(dir).absoluteFilePath(lfn.local())); 627 if(QDir::isRelativePath(dir)) 628 dir.prepend(qmake_getpwd() + "/"); 629 if(!dir.endsWith("/")) 630 dir += "/"; 631 QMakeLocalFileName f(dir + lfn.local()); 628 632 if(findFileInfo(f).exists()) { 629 633 lfn = fixPathForFile(f); … … 632 636 } 633 637 if(!exists) { //path lookup 634 for each(const QMakeLocalFileName &dd, depdirs) {635 QMakeLocalFileName f( QDir(dd.real()).absoluteFilePath(lfn.real()));638 for(QList<QMakeLocalFileName>::Iterator it = depdirs.begin(); it != depdirs.end(); ++it) { 639 QMakeLocalFileName f((*it).real() + Option::dir_sep + lfn.real()); 636 640 QFileInfo fi(findFileInfo(f)); 637 641 if(fi.exists() && !fi.isDir()) {
Note:
See TracChangeset
for help on using the changeset viewer.