diff options
| -rw-r--r-- | qmake/generators/makefile.h | 2 | ||||
| -rw-r--r-- | qmake/generators/win32/mingw_make.cpp | 9 | ||||
| -rw-r--r-- | qmake/generators/win32/mingw_make.h | 1 |
3 files changed, 1 insertions, 11 deletions
diff --git a/qmake/generators/makefile.h b/qmake/generators/makefile.h index b177cc7eb0..dc6714dd64 100644 --- 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 568e60a068..c579c88109 100644 --- 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 08d87cb916..88832dde76 100644 --- 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); |