Commit 07352531 authored by Anthony Heading's avatar Anthony Heading Committed by Eike Ziller

Fix off-by-one error which stops qtchooser finding qmake

At startup,  qtcreator prints an error:

% qtcreator
"The command \"/qmake\" could not be started."

This appears to be because of an off-by-one error in
BuildableHelperLibrary::qtChooserToQmakePath(const QString &path) which
parses the output of a call to "qtchooser -print-env" to extract the
value of the QTTOOLDIR variable.  The code attempts to move past the
prefix string to find the end quote, but by moving one too few
characters it finds the starting quote instead, resulting in a zero
length string result.

Change-Id: I74368f10a81eda2286ae735bdc595c0f92e4e665
Reviewed-by: Tobias Hunger's avatarTobias Hunger <tobias.hunger@qt.io>
Reviewed-by: Eike Ziller's avatarEike Ziller <eike.ziller@qt.io>
parent 4d79ffb8
......@@ -50,7 +50,7 @@ QString BuildableHelperLibrary::qtChooserToQmakePath(const QString &path)
int pos = output.indexOf(toolDir);
if (pos == -1)
return QString();
pos += toolDir.count() - 1;
pos += toolDir.count();
int end = output.indexOf('\"', pos);
if (end == -1)
return QString();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment