Changeset 153 for trunk/qmake/generators

Timestamp:

Aug 31, 2009, 4:11:39 PM (16 years ago)

Author:

Dmitry A. Kuminov

Message:

qmake/os2/gnumake: Corrected the space escaping function definition; could wrongly add a trailing space to the argument.

File:

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

trunk/qmake/generators/os2/gnumake.cpp

@@ -231 +231 @@
     /* function to convert from DOS-like to Unix-like space escaping in file
      * names */
+    t << "null :=" << endl << "space := $(null) # end of the line" << endl;
+    t << "# function to change DOS-like space escaping to Unix-like" << endl;
     t << "q = $(subst %,\\%,$(subst ;,\\;,$(subst &,\\&,"
          "$(subst +,\\+,$(subst $(space),\\ ,$(subst \",,$(1)))))))" << endl << endl;
@@ -688 +690 @@
      * filenames with double quotes. However, this is not appropriate for make
      * rule definitions (targets/dependencies) where Unix escaping is
-     * expected. For this reason, we must convert escaping to Unix mode using
-     * the q function that we define in writeMakefile() */
+     * expected. If we'd deal only with immediate strings, we could provide
+     * necessary escaping in place, but we often use make variables instead of
+     * direct file names so we must perform such escaping on the fly. This is
+     * what we do here using the q function that we define in writeMakefile().*/
     if (isDosLikeShell()) {
         QString ret = vars;