Changeset 999 for trunk/qmake/generators/os2/gnumake.cpp

Timestamp:

Aug 17, 2011, 5:28:54 PM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

qmake: gnumake/os2: QMAKESPECDIR was not passed to the compiler.

The original directory of mkspecs/os2-* was only added to the Makefile itself
but not to the response file actually used by the compiler. This affected building
all applications located outside the Qt source tree.

This is a bug of the feature introduced in r974.

File:

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

trunk/qmake/generators/os2/gnumake.cpp

@@ -314 +314 @@
         QString origSpec = var("QMAKESPEC_ORIGINAL");
         if (!origSpec.isEmpty())
-            spec = QDir::cleanPath(QDir(spec).absoluteFilePath(origSpec));
-    }
+            spec = fileFixify(QDir::cleanPath(QDir(spec).absoluteFilePath(origSpec)));
+    }
+    project->values("QMAKESPECDIR") = QStringList(spec);
     t << "QMAKESPECDIR  = " << escapeFilePath(spec) << endl;
 
@@ -512 +513 @@
     incsSemicolon += "$(QMAKESPECDIR)";
     t << "INCLUDEPATH   = " << incsSemicolon << endl;
-    /* createCompilerResponseFiles() will need QAKESPECDIR expanded) */
-    project->values("INCLUDEPATH").append(specdir());
+    /* createCompilerResponseFiles() will need QMAKESPECDIR expanded) */
+    project->values("INCLUDEPATH").append(var("QMAKESPECDIR"));
 }