Changeset 1043

Timestamp:

Sep 1, 2011, 6:44:38 PM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

OS/2: Fix QMAKESPECDIR value set by qmake in Makefiles.

When resolving the "default" makespec, specdir was treated
relative to the Makefile's directory while it was actually relative to
the .pro directory, which, together with the bug fixed in r1042
could produce really fancy paths on output.

File:

• trunk/qmake/generators/os2/gnumake.cpp (modified) (1 diff)

trunk/qmake/generators/os2/gnumake.cpp

@@ -310 +310 @@
         // unnecessary duplication, in the absense of symlinks on OS/2)
         QString origSpec = var("QMAKESPEC_ORIGINAL");
-        if (!origSpec.isEmpty())
-            spec = fileFixify(QDir::cleanPath(QDir(spec).absoluteFilePath(origSpec)));
+        if (!origSpec.isEmpty()) {
+            // Note: Option::mkfile::qmakespec is asbolute, specdir() may be not
+            spec = QDir(Option::mkfile::qmakespec).absoluteFilePath(origSpec);
+            spec = fileFixify(QDir::cleanPath(spec));
+        }
     }
     project->values("QMAKESPECDIR") = QStringList(spec);