Make sure we get the executable without debug/ release and suffix on win.

2010-04-09 11:54:57 +02:00
parent b2ddf72035
commit fa76824aa9
1 changed files with 7 additions and 2 deletions
--- a/src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationstep.cpp
+++ b/src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationstep.cpp
@@ -211,8 +211,13 @@ const Qt4BuildConfiguration *MaemoPackageCreationStep::qt4BuildConfiguration() c

 QString MaemoPackageCreationStep::executable() const
 {
-    return qt4BuildConfiguration()->qt4Target()->qt4Project()->rootProjectNode()
-        ->targetInformation().executable;
+    const TargetInformation &ti = qt4BuildConfiguration()->qt4Target()
+        ->qt4Project()->rootProjectNode()->targetInformation();
+    if (!ti.valid)
+        return QString();
+
+    return QDir::toNativeSeparators(QDir::cleanPath(ti.workingDir
+        + QLatin1Char('/') + ti.target));
 }

 QString MaemoPackageCreationStep::executableFileName() const