From fa76824aa9fcd6085d635770e9d728326bab75d3 Mon Sep 17 00:00:00 2001
From: kh1 <qt-info@nokia.com>
Date: Fri, 9 Apr 2010 11:54:57 +0200
Subject: [PATCH] Make sure we get the executable without debug/ release and
suffix on win.
---
.../qt-maemo/maemopackagecreationstep.cpp | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationstep.cpp b/src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationstep.cpp
index 715b806f9a6..0bd81474960 100644
--- 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
--
GitLab