Changeset 189 for trunk/qmake/generators/win32

Timestamp:

Sep 22, 2009, 2:10:57 AM (16 years ago)

Author:

Dmitry A. Kuminov

Message:

qmake: Obey OS/2 CMD.EXE cmd.line length restriction in $(DEL_FILE) statements (r37 contd).

File:

• trunk/qmake/generators/win32/winmakefile.cpp (modified) (5 diffs)

trunk/qmake/generators/win32/winmakefile.cpp

@@ -489 +489 @@
     const QString del_suffix =
         Option::target_mode == Option::TARG_OS2_MODE ?
-        QString(" >nul 2>&1"): // reduce noise
-        QString::null;
+        QString(" >nul 2>&1"): // reduce noise
+        QString::null;
 
     const int commandlineLimit =
         Option::target_mode == Option::TARG_OS2_MODE ?
-        1024: // OS/2 CMD.EXE limit
+        10
         2047; // NT limit, expanded
 
@@ -784 +784 @@
         targetdir += Option::dir_sep;
 
+
+
+
+
+
     if(t == "target" && project->first("TEMPLATE") == "lib") {
         if(project->isActiveConfig("create_prl") && !project->isActiveConfig("no_install_prl") &&
@@ -795 +800 @@
             if(!uninst.isEmpty())
                 uninst.append("\n\t");
-            uninst.append("-$(DEL_FILE) \"" + dst_prl + "\"");
+            uninst.append("-$(DEL_FILE) \"" + dst_prl + "\"");
         }
         if(project->isActiveConfig("shared") && !project->isActiveConfig("plugin")) {
@@ -807 +812 @@
             if(!uninst.isEmpty())
                 uninst.append("\n\t");
-            uninst.append("-$(DEL_FILE) \"" + dst_targ + "\"");
+            uninst.append("-$(DEL_FILE) \"" + dst_targ + "\"");
         }
     }
@@ -819 +824 @@
         if(!uninst.isEmpty())
             uninst.append("\n\t");
-        uninst.append("-$(DEL_FILE) \"" + dst_targ + "\"");
+        uninst.append("-$(DEL_FILE) \"" + dst_targ + "\"");
     }
     return ret;