Changeset 54 for trunk/qmake/generators

Timestamp:

Jun 25, 2009, 11:18:10 PM (16 years ago)

Author:

Dmitry A. Kuminov

Message:

qmake: os2/GNUMAKE: Add missing QMAKESPECDIR to the compiler response file.

File:

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

trunk/qmake/generators/os2/gnumake.cpp

@@ -305 +305 @@
     incsSemicolon += "$(QMAKESPECDIR)";
     t << "INCLUDEPATH   = " << incsSemicolon << endl;
+    /* createCompilerResponseFiles() will need QAKESPECDIR expanded) */
+    project->values("INCLUDEPATH").append(specdir());
 }
 
@@ -527 +529 @@
     static const char *vars[] = { "CFLAGS",   /*<=*/ "QMAKE_CFLAGS",
                                   "CXXFLAGS", /*<=*/ "QMAKE_CXXFLAGS",
-                                  "INCPATH",  /*<=*/ "INCPATH" };
+                                  "INCPATH",  /*<=*/ "INCLUDEPATH" };
 
     /* QMAKE_XXX_RSP_VAR is used as a flag whether it is necessary to
@@ -545 +547 @@
             if (file.open(QIODevice::WriteOnly | QIODevice::Text)) {
                 QTextStream rt(&file);
-                if (!qstrcmp(vars[i+1], "INCPATH")) {
+                if (!qstrcmp(vars[i+1], "INCLUDEPATH")) {
                     QString opt = var("QMAKE_CFLAGS_INCDIR");
                     rt << varGlue(vars[i+1], opt, "\n" + opt, QString::null);
@@ -581 +583 @@
      * 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 using the q*
-     * function that we define in writeMakefile() below */
+     * expected. For this reason, we must convert escaping to Unix mode using
+     * the q function that we define in writeMakefile() */
     if (isDosLikeShell()) {
         QString ret = vars;