Commit 70e1aad0 authored by Daniel Teske's avatar Daniel Teske

QMake: Also check for QtChooser in DesktopQtVersion::fromMap

This is only done for DesktopQtVersions, as I believe that only those
are affected by this.

Fixes more issues described in

Task-number: QTCREATORBUG-9841
Change-Id: Ifb7a797e71c812daef5bc5139bc339fb11423c15
Reviewed-by: default avatarTobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Orgad Shaneh's avatarOrgad Shaneh <orgads@gmail.com>
parent f959990a
......@@ -388,6 +388,15 @@ void BaseQtVersion::fromMap(const QVariantMap &map)
QString string = map.value(QLatin1String(QTVERSIONQMAKEPATH)).toString();
if (string.startsWith(QLatin1Char('~')))
string.remove(0, 1).prepend(QDir::homePath());
QFileInfo fi(string);
if (BuildableHelperLibrary::isQtChooser(fi)) {
// we don't want to treat qtchooser as a normal qmake
// see e.g. QTCREATORBUG-9841, also this lead to users changing what
// qtchooser forwards too behind our backs, which will inadvertly lead to bugs
string = BuildableHelperLibrary::qtChooserToQmakePath(string);
}
ctor(FileName::fromString(string));
}
......
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