1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

assume windows shell iff dir separator is backslash

Browse Source 
Change-Id: I411a4d6691e18b818ee7d1ced7f126f97af0902f
Reviewed-by: Mark Brand <mabrand@mabrand.nl>
This commit is contained in:
Oswald Buddenhagen 2012-05-03 20:50:19 +02:00
parent c0abbd39fc
commit e18ceca47e
3 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
qmake/generators/makefile.h
View File

@ -260,7 +260,7 @@ public:
virtual bool supportsMergedBuilds() { return false; } virtual bool supportsMergedBuilds() { return false; }
virtual bool mergeBuildProject(MakefileGenerator * /*other*/) { return false; } virtual bool mergeBuildProject(MakefileGenerator * /*other*/) { return false; }
virtual bool openOutput(QFile &, const QString &build) const; 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) inline void MakefileGenerator::setNoIO(bool o)

9
qmake/generators/win32/mingw_make.cpp
View File

@ -57,15 +57,6 @@ MingwMakefileGenerator::MingwMakefileGenerator() : Win32MakefileGenerator(), ini
quote = "'"; 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 MingwMakefileGenerator::escapeDependencyPath(const QString &path) const
{ {
QString ret = path; QString ret = path;

1
qmake/generators/win32/mingw_make.h
View File

@ -57,7 +57,6 @@ protected:
bool writeMakefile(QTextStream &); bool writeMakefile(QTextStream &);
void init(); void init();
private: private:
bool isWindowsShell() const;
void writeMingwParts(QTextStream &); void writeMingwParts(QTextStream &);
void writeIncPart(QTextStream &t); void writeIncPart(QTextStream &t);
void writeLibsPart(QTextStream &t); void writeLibsPart(QTextStream &t);