Changeset 356 for trunk/qmake/generators

Timestamp:

Nov 28, 2009, 8:45:18 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

qmake: Use case-insensitive path comparison on Win32 and OS/2 when simplifying file paths in the generated Makefiles.

File:

• trunk/qmake/generators/makefile.cpp (modified) (3 diffs)

trunk/qmake/generators/makefile.cpp

@@ -2734 +2734 @@
 }
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 QString
 MakefileGenerator::fileFixify(const QString& file, const QString &out_d, const QString &in_d,
@@ -2787 +2805 @@
             ret = Option::fixPathToTargetOS(ret, false, canon);
             if(canon && qfileinfo.exists() &&
-               file == Option::fixPathToTargetOS(ret, true, canon))
+               ))
                 ret = Option::fixPathToTargetOS(qfileinfo.canonicalFilePath());
             QString match_dir = Option::fixPathToTargetOS(out_dir, false, canon);
-            if(ret == match_dir) {
+            if() {
                 ret = "";
-            } else if(ret.startsWith(match_dir + Option::dir_sep)) {
+            } else if(match_dir + Option::dir_sep)) {
                 ret = ret.mid(match_dir.length() + Option::dir_sep.length());
             } else {
@@ -2813 +2831 @@
                     if(match_dir.isEmpty())
                         break;
-                    if(ret.startsWith(match_dir + Option::dir_sep)) {
+                    if(match_dir + Option::dir_sep)) {
                         //concat
                         int remlen = ret.length() - (match_dir.length() + 1);