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

Inline expression to bypass compiler bug

Browse Source 
MSVC managed to trigger the this != &other assertion in
QString(const QString &other); so just skip creation of the
intermediate string in the function whose body tripped over this.

Change-Id: I687003cfc588531018c6069863ce2a76078c8e3f
Fixes: QTBUG-73802
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
This commit is contained in:
Dmitry Sokolov 2019-02-14 10:49:52 +01:00 committed by Edward Welbourne
parent 55e31e6389
commit 441520141e
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
qmake/generators/makefile.cpp
View File

@ -81,8 +81,8 @@ bool MakefileGenerator::canExecute(const QStringList &cmdline, int *a) const
QString MakefileGenerator::mkdir_p_asstring(const QString &dir, bool escape) const QString MakefileGenerator::mkdir_p_asstring(const QString &dir, bool escape) const
{ {
QString edir = escape ? escapeFilePath(Option::fixPathToTargetOS(dir, false, false)) : dir; return "@" + makedir.arg(
return "@" + makedir.arg(edir); escape ? escapeFilePath(Option::fixPathToTargetOS(dir, false, false)) : dir);
} }
bool MakefileGenerator::mkdir(const QString &in_path) const bool MakefileGenerator::mkdir(const QString &in_path) const