don't crash if builddir is suffix of sourcedir (or vice-versa)
Task-number: QTBUG-32145 Change-Id: I97a6e2ebd51350cbf39c86efa5c26a376c49da95 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
This commit is contained in:
parent
35f79a2c11
commit
b30273ec4a
@ -249,7 +249,8 @@ void QMakeGlobals::setDirectories(const QString &input_dir, const QString &outpu
|
||||
int srcLen = srcpath.length();
|
||||
int dstLen = dstpath.length();
|
||||
int lastSl = -1;
|
||||
while (++lastSl, srcpath.at(--srcLen) == dstpath.at(--dstLen))
|
||||
while (++lastSl, --srcLen, --dstLen,
|
||||
srcLen && dstLen && srcpath.at(srcLen) == dstpath.at(dstLen))
|
||||
if (srcpath.at(srcLen) == QLatin1Char('/'))
|
||||
lastSl = 0;
|
||||
source_root = srcpath.left(srcLen + lastSl);
|
||||
|
Loading…
Reference in New Issue
Block a user