Changeset 998 for trunk

Timestamp:

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

Author:

Dmitry A. Kuminov

Message:

qmake: Revert r530.

This change introduced behavior unexpected by qmake users (compared
to e.g. the Window platform where the drive letter remains intact), made it
not possible to specify the full install path (including the drive letter) and
hence is wrong.

File:

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

trunk/qmake/generators/makefile.cpp

@@ -1221 +1221 @@
 {
     QString ret(root + path);
-    if(path.length() > 2 && path[1] == ':') { //c:\foo
-        if (Option::target_mode == Option::TARG_OS2_MODE)
-            ret = root + path.mid(2);
-        else
-            ret = path.mid(0, 2) + root + path.mid(2);
-    }
+    if(path.length() > 2 && path[1] == ':') //c:\foo
+        ret = QString(path.mid(0, 2) + root + path.mid(2));
     while(ret.endsWith("\\"))
         ret = ret.left(ret.length()-1);