diff options
| author | Eike Ziller <eike.ziller@digia.com> | 2013-12-05 11:58:42 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@digia.com> | 2013-12-05 11:58:42 +0100 |
| commit | 072d551c73874fc5ba9b9137af511716fd4bd7f5 (patch) | |
| tree | c0010fb7873a11eae0cd503fd0c13653fe62da3a /src/plugins/qtsupport | |
| parent | d3b8da6cf845561364388449db5edccc03846244 (diff) | |
| parent | 44d254b37bd700e576fa7e0860c061b9e37da5aa (diff) | |
| download | qt-creator-072d551c73874fc5ba9b9137af511716fd4bd7f5.tar.gz | |
Merge remote-tracking branch 'origin/3.0'
Conflicts:
qtcreator.pri
qtcreator.qbs
Change-Id: I49dca8a41519869f122a4dfdbd6564b357ddeb1e
Diffstat (limited to 'src/plugins/qtsupport')
| -rw-r--r-- | src/plugins/qtsupport/baseqtversion.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/qtsupport/baseqtversion.cpp b/src/plugins/qtsupport/baseqtversion.cpp index 451d4dcb92..e656693009 100644 --- a/src/plugins/qtsupport/baseqtversion.cpp +++ b/src/plugins/qtsupport/baseqtversion.cpp @@ -218,7 +218,7 @@ QString BaseQtVersion::defaultDisplayName(const QString &versionString, const Fi && dirName.compare(QLatin1String("qt"), Qt::CaseInsensitive)) { break; } - } while (dir.cdUp()); + } while (!dir.isRoot() && dir.cdUp()); } return fromPath ? |