feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QtSupport: Fix wrong build directory for examples

Browse Source 
By partially reverting 92fbbaea9b

Task-number: QTCREATORBUG-13630
Change-Id: Ia04a224f2a12839d2cf27828009c945383a4c19c
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
This commit is contained in:
Daniel Teske
2014-12-08 13:47:47 +01:00
committed by Eike Ziller
parent b36c399272
commit d36c4d87db
3 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/qmakeprojectmanager/qmakebuildconfiguration.cpp
View File

@@ -651,7 +651,7 @@ QmakeBuildInfo *QmakeBuildConfigurationFactory::createBuildInfo(const Kit *k,
// check if this project is in the source directory:
Utils::FileName projectFilePath = Utils::FileName::fromString(projectPath);
if (version->isSubProject(projectFilePath)) {
if (version->isInSourceDirectory(projectFilePath)) {
// assemble build directory
QString projectDirectory = projectFilePath.toFileInfo().absolutePath();
QDir qtSourceDir = QDir(version->sourcePath().toString());

11
src/plugins/qtsupport/baseqtversion.cpp
View File

@@ -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();

1
src/plugins/qtsupport/baseqtversion.h
View File

@@ -124,6 +124,7 @@ public:
virtual Utils::Environment qmakeRunEnvironment() const;
virtual Utils::FileName sourcePath() const;
bool isInSourceDirectory(const Utils::FileName &filePath);
bool isSubProject(const Utils::FileName &filePath);
// used by UiCodeModelSupport