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

Generic Project: Use relative paths for importing

Browse Source 
Task-number: QTCREATORBUG-10387
Change-Id: I75746491dc7dee358748aa89829ba2d6f12c0e1b
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
Daniel Teske
2013-10-22 17:21:34 +02:00
parent 15c8bdeba6
commit 7bf1c64df9
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/genericprojectmanager/genericprojectwizard.cpp
View File

@@ -163,11 +163,15 @@ Core::GeneratedFiles GenericProjectWizard::generateFiles(const QWizard *w,
QStringList includePaths; QStringList includePaths;
foreach (const QString &path, paths) { foreach (const QString &path, paths) {
QFileInfo fileInfo(dir, path); QFileInfo fileInfo(path);
QDir thisDir(fileInfo.absoluteFilePath()); QDir thisDir(fileInfo.absoluteFilePath());
if (! thisDir.entryList(nameFilters, QDir::Files).isEmpty()) if (! thisDir.entryList(nameFilters, QDir::Files).isEmpty()) {
includePaths.append(path); QString relative = dir.relativeFilePath(path);
if (relative.isEmpty())
relative = QLatin1String(".");
includePaths.append(relative);
}
} }
Core::GeneratedFile generatedCreatorFile(creatorFileName); Core::GeneratedFile generatedCreatorFile(creatorFileName);