Changeset 1044

Timestamp:

Sep 1, 2011, 6:48:13 PM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

qmake: Make MakefileGenerator::fileFixify() honor file name case sensitivity.

On platforms with case-insensitive file names (Windows, OS/2), this fixes
the procedure of shortening relative paths which would not work if the file
and in/out directory names had different cases.

File:

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

trunk/qmake/generators/makefile.cpp

@@ -53 +53 @@
 #include <qsettings.h>
 #include <qdatetime.h>
+
 #if defined(Q_OS_UNIX)
 #include <unistd.h>
@@ -2871 +2872 @@
         return cacheVal;
 
+
+
+
     //do the fixin'
     QString pwd = qmake_getpwd();
@@ -2912 +2916 @@
             if(ret == match_dir) {
                 ret = "";
-            } else if(ret.startsWith(match_dir + Option::dir_sep)) {
+            } else if(ret.startsWith(match_dir + Option::dir_sep)) {
                 ret = ret.mid(match_dir.length() + Option::dir_sep.length());
             } else {
@@ -2933 +2937 @@
                     if(match_dir.isEmpty())
                         break;
-                    if(ret.startsWith(match_dir + Option::dir_sep)) {
+                    if(ret.startsWith(match_dir + Option::dir_sep)) {
                         //concat
                         int remlen = ret.length() - (match_dir.length() + 1);