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

don't crash if builddir is suffix of sourcedir (or vice-versa)

Browse Source 
Task-number: QTBUG-32145
Change-Id: I97a6e2ebd51350cbf39c86efa5c26a376c49da95
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
This commit is contained in:
Oswald Buddenhagen 2013-07-03 16:54:44 +02:00 committed by The Qt Project
parent 35f79a2c11
commit b30273ec4a
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
qmake/library/qmakeglobals.cpp
View File

@ -249,7 +249,8 @@ void QMakeGlobals::setDirectories(const QString &input_dir, const QString &outpu
int srcLen = srcpath.length(); int srcLen = srcpath.length();
int dstLen = dstpath.length(); int dstLen = dstpath.length();
int lastSl = -1; 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('/')) if (srcpath.at(srcLen) == QLatin1Char('/'))
lastSl = 0; lastSl = 0;
source_root = srcpath.left(srcLen + lastSl); source_root = srcpath.left(srcLen + lastSl);