Changeset 362 for trunk/qmake/generators/makefiledeps.cpp

Timestamp:

Nov 30, 2009, 12:56:45 AM (16 years ago)

Author:

Dmitry A. Kuminov

Message:

qmake: Don't assume that relative paths in all OSes look like in *nix [vendor bug].

File:

• trunk/qmake/generators/makefiledeps.cpp (modified) (2 diffs)

trunk/qmake/generators/makefiledeps.cpp

@@ -625 +625 @@
                     if(try_local) {
                         QString dir = findFileInfo(file->file).path();
-                        if(QDir::isRelativePath(dir))
-                            dir.prepend(qmake_getpwd() + "/");
-                        if(!dir.endsWith("/"))
-                            dir += "/";
-                        QMakeLocalFileName f(dir + lfn.local());
+                        QMakeLocalFileName f(QDir(dir).absoluteFilePath(lfn.local()));
                         if(findFileInfo(f).exists()) {
                             lfn = fixPathForFile(f);
@@ -636 +632 @@
                     }
                     if(!exists) { //path lookup
-                        for(QList<QMakeLocalFileName>::Iterator it = depdirs.begin(); it != depdirs.end(); ++it) {
-                            QMakeLocalFileName f((*it).real() + Option::dir_sep + lfn.real());
+                        foreach(const QMakeLocalFileName &dd, depdirs) {
+                            QMakeLocalFileName f(QDir(dd.real()).absoluteFilePath(lfn.real()));
                             QFileInfo fi(findFileInfo(f));
                             if(fi.exists() && !fi.isDir()) {