diff options
| author | Daniel Teske <daniel.teske@theqtcompany.com> | 2014-12-08 13:47:47 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@theqtcompany.com> | 2014-12-08 13:58:49 +0100 |
| commit | d36c4d87dbf9ac045edfff257cf3f7083bf0ea65 (patch) | |
| tree | e2003668dfa4f9cb089dd26d72c6e259168d0903 /src/plugins/qtsupport/baseqtversion.cpp | |
| parent | b36c39927260638a318c4f94bad4011c7ece2d9b (diff) | |
| download | qt-creator-d36c4d87dbf9ac045edfff257cf3f7083bf0ea65.tar.gz | |
QtSupport: Fix wrong build directory for examplesv3.3.0
By partially reverting 92fbbaea9b4d96f88d556c12cb40c5382a53df70
Task-number: QTCREATORBUG-13630
Change-Id: Ia04a224f2a12839d2cf27828009c945383a4c19c
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
Diffstat (limited to 'src/plugins/qtsupport/baseqtversion.cpp')
| -rw-r--r-- | src/plugins/qtsupport/baseqtversion.cpp | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/src/plugins/qtsupport/baseqtversion.cpp b/src/plugins/qtsupport/baseqtversion.cpp index 0038fa3eab..ddaf755b63 100644 --- a/src/plugins/qtsupport/baseqtversion.cpp +++ b/src/plugins/qtsupport/baseqtversion.cpp @@ -1478,6 +1478,17 @@ FileName BaseQtVersion::sourcePath(const QHash<QString, QString> &versionInfo) return FileName::fromUserInput(sourcePath); } +bool BaseQtVersion::isInSourceDirectory(const Utils::FileName &filePath) +{ + const Utils::FileName &source = sourcePath(); + if (source.isEmpty()) + return false; + QDir dir = QDir(source.toString()); + if (dir.dirName() == QLatin1String("qtbase")) + dir.cdUp(); + return filePath.isChildOf(dir); +} + bool BaseQtVersion::isSubProject(const Utils::FileName &filePath) { const Utils::FileName &source = sourcePath(); |