Generic Project: Use relative paths for importing

Task-number: QTCREATORBUG-10387
Change-Id: I75746491dc7dee358748aa89829ba2d6f12c0e1b
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>

1 files changed, 7 insertions, 3 deletions

diff --git a/src/plugins/genericprojectmanager/genericprojectwizard.cpp b/src/plugins/genericprojectmanager/genericprojectwizard.cpp
index 5f97652ca53..0f7cbdeacd3 100644
--- a/src/plugins/genericprojectmanager/genericprojectwizard.cpp
+++ b/src/plugins/genericprojectmanager/genericprojectwizard.cpp
@@ -163,11 +163,15 @@ Core::GeneratedFiles GenericProjectWizard::generateFiles(const QWizard *w,
 
     QStringList includePaths;
     foreach (const QString &path, paths) {
-        QFileInfo fileInfo(dir, path);
+        QFileInfo fileInfo(path);
         QDir thisDir(fileInfo.absoluteFilePath());
 
-        if (! thisDir.entryList(nameFilters, QDir::Files).isEmpty())
-            includePaths.append(path);
+        if (! thisDir.entryList(nameFilters, QDir::Files).isEmpty()) {
+            QString relative = dir.relativeFilePath(path);
+            if (relative.isEmpty())
+                relative = QLatin1String(".");
+            includePaths.append(relative);
+        }
     }
 
     Core::GeneratedFile generatedCreatorFile(creatorFileName);