Changeset 52 for trunk

Timestamp:

Jun 25, 2009, 9:42:27 PM (16 years ago)

Author:

Dmitry A. Kuminov

Message:

qmake: Fixed copy-paste typo in subdirs rule generation that blocked generation of Makefiles from .pro files in subdirs from the parent Makefile [vendor bug]. Also use escapeFilePath() in these rules since on some platforms (like OS/2) trailing slashes are not accepted in 'cd' and 'mkdir' commands.

Location:

trunk/qmake/generators

Files:

• makefile.cpp (modified) (2 diffs)
• os2/gnumake.cpp (modified) (1 diff)

trunk/qmake/generators/makefile.cpp

@@ -2353 +2353 @@
                     pwd.cd(in.at(i)); \
                 } \
-                directory ## _cdout = "\n\t@cd " + out.join(Option::dir_sep); \
+                directory ## _cdout = "\n\t@cd " + ); \
             } else { \
-                directory ## _cdin = "\n\tcd " + directory + " && ";  \
+                directory ## _cdin = "\n\tcd " +  + " && ";  \
             } \
         } else { \
@@ -2369 +2369 @@
             if(in.startsWith(in_directory))
                 in = in.mid(in_directory.length());
-            if(out.startsWith(in_directory))
-                out = out.mid(in_directory.length());
+            if(out.startsWith(_directory))
+                out = out.mid(_directory.length());
             t << mkfile << ": " << "\n\t";
             if(!in_directory.isEmpty()) {

trunk/qmake/generators/os2/gnumake.cpp

@@ -78 +78 @@
     } else {
         ret.replace(QRegExp("\""), "");
+
         if (ret.contains(QRegExp("[ +&;%]")))
             ret = quote + ret + quote;