Changeset 29 for trunk/qmake/generators/win32

Timestamp:

Jun 12, 2009, 1:32:11 PM (16 years ago)

Author:

Dmitry A. Kuminov

Message:

qmake: More OS/2-specific fixes. Enabled GNUMakefileGenerator (turned on by MAKEFILE_GENERATOR=GNUMAKE).

Location:

trunk/qmake/generators/win32

Files:

• mingw_make.cpp (modified) (1 diff)
• mingw_make.h (modified) (1 diff)

trunk/qmake/generators/win32/mingw_make.cpp

@@ -58 +58 @@
 }
 
-bool MingwMakefileGenerator::isWindowsShell() const
+bool MingwMakefileGenerator::isDosLikeShell() const
 {
 #ifdef Q_OS_WIN
     return Option::shellPath.isEmpty();
 #else
-    return Win32MakefileGenerator::isWindowsShell();
+    return Win32MakefileGenerator::isDosLikeShell();
 #endif
 }

trunk/qmake/generators/win32/mingw_make.h

@@ -56 +56 @@
     QString getLibTarget();
 private:
-    bool isWindowsShell() const;
+    bool isDosLikeShell() const;
     void writeMingwParts(QTextStream &);
     void writeIncPart(QTextStream &t);