path: root/qmake/generators/win32/mingw_make.h
diff options
authorOswald Buddenhagen <>2015-02-06 15:30:02 +0100
committerOswald Buddenhagen <>2015-02-17 18:27:29 +0000
commite3a7237d8214bb229997730775fd89d06b9db269 (patch)
treeb37a9b71c19a6b69d67d0234ad0d2783b983e2a4 /qmake/generators/win32/mingw_make.h
parentc0d67bb5c9370408ca68f21925de5ec9e89ad9cb (diff)
fix quoting issues. all of them. (*)
instead of quoting more or less random variable contents early, consistently quote everything only right before it is needed. this way we can be sure that everything is correctly quoted, but not over-quoted. this removed the need for the insanity that unescapeFilePath() and similar ad-hoc contraptions were. this had the somewhat counter-intuitive effect that it was possible to remove escapeFilePath() calls from PBX::writeSettings() calls - these were actually only unescaping. [ChangeLog][qmake][Important Behavior Changes] A lot of quoting issues have been fixed. As a side effect, qmake has become more sensitive to over-quoted file names in project files. (*) ok, maybe not. close enough. Task-number: fatal: out of memory Change-Id: I8c51cfffb59ccd156b46bd5c56754c480667443a Reviewed-by: Joerg Bornemann <>
Diffstat (limited to 'qmake/generators/win32/mingw_make.h')
1 files changed, 2 insertions, 1 deletions
diff --git a/qmake/generators/win32/mingw_make.h b/qmake/generators/win32/mingw_make.h
index a29442c916..e76391080c 100644
--- a/qmake/generators/win32/mingw_make.h
+++ b/qmake/generators/win32/mingw_make.h
@@ -45,6 +45,8 @@ public:
QString escapeDependencyPath(const QString &path) const;
+ ProString escapeDependencyPath(const ProString &path) const { return MakefileGenerator::escapeDependencyPath(path); }
+ virtual ProString fixLibFlag(const ProString &lib);
QString getLibTarget();
virtual QString getManifestFileForRcFile() const;
bool writeMakefile(QTextStream &);
@@ -64,7 +66,6 @@ private:
virtual bool findLibraries();
QString objectsLinkLine;
- QString quote;
inline MingwMakefileGenerator::~MingwMakefileGenerator()