OSDN Git Service

Maemo: Bugfix: Use TargetInformation::workingDir in all cases.
authorChristian Kandeler <christian.kandeler@nokia.com>
Fri, 8 Oct 2010 13:10:26 +0000 (15:10 +0200)
committerChristian Kandeler <christian.kandeler@nokia.com>
Fri, 8 Oct 2010 13:38:38 +0000 (15:38 +0200)
We currently use buildDir in one place and workingDir in another,
which breaks projects that have DESTDIR set.

Reviewed-by: Tobias Hunger
src/plugins/qt4projectmanager/qt-maemo/maemodeployablelistmodel.cpp

index 272e1c2..c5740cb 100644 (file)
@@ -218,7 +218,7 @@ QString MaemoDeployableListModel::localExecutableFilePath() const
     fileName += ti.target;
     if (isLib)
         fileName += QLatin1String(isStatic ? ".a" : ".so");
-    return QDir::cleanPath(ti.buildDir + '/' + fileName);
+    return QDir::cleanPath(ti.workingDir + '/' + fileName);
 }
 
 QString MaemoDeployableListModel::remoteExecutableFilePath() const