Changeset 847 for trunk/qmake/generators

Timestamp:

May 6, 2011, 7:26:50 PM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

qmake: Fixed the OS/2 build and the GNUMAKE generator.

Location:

trunk/qmake/generators

Files:

• makefile.cpp (modified) (1 diff)
• metamakefile.cpp (modified) (1 diff)
• symbian/symmake_abld.cpp (modified) (1 diff)

trunk/qmake/generators/makefile.cpp

@@ -1884 +1884 @@
                 Option::target_mode == Option::TARG_OS2_MODE ?
                     QString(" >nul 2>&1") : // reduce noise
-                isForSymbian() ?
-                    QString(" 2> NUL") :
                     QString::null;
 

trunk/qmake/generators/metamakefile.cpp

@@ -557 +557 @@
 #endif
         *target_mode = Option::TARG_SYMBIAN_MODE;
+    } else if (gen == "GNUMAKE") {
+        *host_mode = Option::HOST_OS2_MODE;
+        *target_mode = Option::TARG_OS2_MODE;
     } else {
         fprintf(stderr, "Unknown generator specified: %s\n", gen.toLatin1().constData());

trunk/qmake/generators/symbian/symmake_abld.cpp

@@ -320 +320 @@
                     dirsToClean << fixedValue;
                     t << "\t-@ " << dirExists << " \""  << fixedValue << "\" "
-                      << (isWindowsShell() ? "" : "|| ")
+                      << (isDosLikeShell() ? "" : "|| ")
                       << mkdir << " \"" << fixedValue << "\"" << endl;
                 }