From c6a74143b28c3097716e8dc4ac3f217ddcb35f48 Mon Sep 17 00:00:00 2001
From: Tobias Hunger <tobias.hunger@nokia.com>
Date: Mon, 28 Mar 2011 17:47:13 +0200
Subject: [PATCH] Fix project locations for symbian and maemo
---
.../qt4projectmanager/qt-maemo/qt4maemotargetfactory.cpp | 9 ++++++---
.../qt4projectmanager/qt-s60/qt4symbiantargetfactory.cpp | 5 ++---
2 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/src/plugins/qt4projectmanager/qt-maemo/qt4maemotargetfactory.cpp b/src/plugins/qt4projectmanager/qt-maemo/qt4maemotargetfactory.cpp
index 2dbf5924482..d9b1df4181f 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/qt4maemotargetfactory.cpp
+++ b/src/plugins/qt4projectmanager/qt-maemo/qt4maemotargetfactory.cpp
@@ -146,11 +146,14 @@ QString Qt4MaemoTargetFactory::buildNameForId(const QString &id) const
QString Qt4MaemoTargetFactory::shadowBuildDirectory(const QString &profilePath, const QString &id, const QString &suffix)
{
- //TODO why?
#if defined(Q_OS_WIN)
- return profilePath;
-#endif
+ // No shadowbuilding for windows!
+ Q_UNUSED(id);
+ Q_UNUSED(suffix);
+ return QFileInfo(profilePath).absolutePath();
+#else
return Qt4BaseTargetFactory::shadowBuildDirectory(profilePath, id, suffix);
+#endif
}
bool Qt4MaemoTargetFactory::isMobileTarget(const QString &id)
diff --git a/src/plugins/qt4projectmanager/qt-s60/qt4symbiantargetfactory.cpp b/src/plugins/qt4projectmanager/qt-s60/qt4symbiantargetfactory.cpp
index 0ed35db69be..82775104a2c 100644
--- a/src/plugins/qt4projectmanager/qt-s60/qt4symbiantargetfactory.cpp
+++ b/src/plugins/qt4projectmanager/qt-s60/qt4symbiantargetfactory.cpp
@@ -127,12 +127,11 @@ ProjectExplorer::Target *Qt4SymbianTargetFactory::restore(ProjectExplorer::Proje
return 0;
}
-QString Qt4SymbianTargetFactory::shadowBuildDirectory(const QString &projectDirectory, const QString &id, const QString &suffix)
+QString Qt4SymbianTargetFactory::shadowBuildDirectory(const QString &profilePath, const QString &id, const QString &suffix)
{
- Q_UNUSED(projectDirectory);
Q_UNUSED(id);
Q_UNUSED(suffix);
- return projectDirectory;
+ return QFileInfo(profilePath).absolutePath();
}
QList<ProjectExplorer::Task> Qt4SymbianTargetFactory::reportIssues(const QString &proFile)
--
GitLab