assume windows shell iff dir separator is backslash

Change-Id: I411a4d6691e18b818ee7d1ced7f126f97af0902f
Reviewed-by: Mark Brand <mabrand@mabrand.nl>

diff --git a/qmake/generators/makefile.h b/qmake/generators/makefile.h
index b177cc7..dc6714d 100644 (file)
--- a/qmake/generators/makefile.h
+++ b/qmake/generators/makefile.h
@@ -260,7 +260,7 @@ public:
     virtual bool supportsMergedBuilds() { return false; }
     virtual bool mergeBuildProject(MakefileGenerator * /*other*/) { return false; }
     virtual bool openOutput(QFile &, const QString &build) const;
-    virtual bool isWindowsShell() const { return Option::host_mode == Option::HOST_WIN_MODE; }
+    bool isWindowsShell() const { return Option::dir_sep == QLatin1String("\\"); }
 };
 
 inline void MakefileGenerator::setNoIO(bool o)

diff --git a/qmake/generators/win32/mingw_make.cpp b/qmake/generators/win32/mingw_make.cpp
index 568e60a..c579c88 100644 (file)
--- a/qmake/generators/win32/mingw_make.cpp
+++ b/qmake/generators/win32/mingw_make.cpp
@@ -57,15 +57,6 @@ MingwMakefileGenerator::MingwMakefileGenerator() : Win32MakefileGenerator(), ini
         quote = "'";
 }
 
-bool MingwMakefileGenerator::isWindowsShell() const
-{
-#ifdef Q_OS_WIN
-    return Option::shellPath.isEmpty();
-#else
-    return Win32MakefileGenerator::isWindowsShell();
-#endif
-}
-
 QString MingwMakefileGenerator::escapeDependencyPath(const QString &path) const
 {
     QString ret = path;

diff --git a/qmake/generators/win32/mingw_make.h b/qmake/generators/win32/mingw_make.h
index 08d87cb..88832dd 100644 (file)
--- a/qmake/generators/win32/mingw_make.h
+++ b/qmake/generators/win32/mingw_make.h
@@ -57,7 +57,6 @@ protected:
     bool writeMakefile(QTextStream &);
     void init();
 private:
-    bool isWindowsShell() const;
     void writeMingwParts(QTextStream &);
     void writeIncPart(QTextStream &t);
     void writeLibsPart(QTextStream &t);