feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Find created sis files, even if DESTDIR is set.

Browse Source 
Symbian mkspec puts the package file into the build directory,
not the destination directory.
This commit is contained in:
con
2010-05-07 10:41:34 +02:00
parent 2e0b19c078
commit 7d88da6a32
3 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp
View File

@@ -247,7 +247,7 @@ QString S60DeviceRunConfiguration::packageFileNameWithTargetInfo() const
TargetInformation ti = qt4Target()->qt4Project()->rootProjectNode()->targetInformation(m_proFilePath); TargetInformation ti = qt4Target()->qt4Project()->rootProjectNode()->targetInformation(m_proFilePath);
if (!ti.valid) if (!ti.valid)
return QString(); return QString();
QString baseFileName = ti.workingDir + QLatin1Char('/') + ti.target; QString baseFileName = ti.buildDir + QLatin1Char('/') + ti.target;
baseFileName += QLatin1Char('_') baseFileName += QLatin1Char('_')
+ (isDebug() ? QLatin1String("debug") : QLatin1String("release")) + (isDebug() ? QLatin1String("debug") : QLatin1String("release"))
+ QLatin1Char('-') + symbianPlatform() + QLatin1String(".sis"); + QLatin1Char('-') + symbianPlatform() + QLatin1String(".sis");
@@ -284,7 +284,7 @@ QString S60DeviceRunConfiguration::packageTemplateFileName() const
TargetInformation ti = qt4Target()->qt4Project()->rootProjectNode()->targetInformation(m_proFilePath); TargetInformation ti = qt4Target()->qt4Project()->rootProjectNode()->targetInformation(m_proFilePath);
if (!ti.valid) if (!ti.valid)
return QString(); return QString();
return ti.workingDir + QLatin1Char('/') + ti.target + QLatin1String("_template.pkg"); return ti.buildDir + QLatin1Char('/') + ti.target + QLatin1String("_template.pkg");
} }
/* Grep a package file for the '.exe' file. Curently for use on Linux only /* Grep a package file for the '.exe' file. Curently for use on Linux only
@@ -351,7 +351,7 @@ QString S60DeviceRunConfiguration::signedPackage() const
TargetInformation ti = qt4Target()->qt4Project()->rootProjectNode()->targetInformation(m_proFilePath); TargetInformation ti = qt4Target()->qt4Project()->rootProjectNode()->targetInformation(m_proFilePath);
if (!ti.valid) if (!ti.valid)
return QString(); return QString();
return ti.workingDir + QLatin1Char('/') + ti.target + QLatin1String(".sis"); return ti.buildDir + QLatin1Char('/') + ti.target + QLatin1String(".sis");
} }
QStringList S60DeviceRunConfiguration::commandLineArguments() const QStringList S60DeviceRunConfiguration::commandLineArguments() const

3
src/plugins/qt4projectmanager/qt4nodes.cpp
View File

@@ -1428,7 +1428,8 @@ TargetInformation Qt4ProFileNode::targetInformation(ProFileReader *reader) const
if (!reader) if (!reader)
return result; return result;
const QString baseDir = buildDir(); result.buildDir = buildDir();
const QString baseDir = result.buildDir;
// qDebug() << "base build dir is:"<<baseDir; // qDebug() << "base build dir is:"<<baseDir;
// Working Directory // Working Directory

7
src/plugins/qt4projectmanager/qt4nodes.h
View File

@@ -196,12 +196,14 @@ struct TargetInformation
QString workingDir; QString workingDir;
QString target; QString target;
QString executable; QString executable;
QString buildDir;
bool operator==(const TargetInformation &other) const bool operator==(const TargetInformation &other) const
{ {
return workingDir == other.workingDir return workingDir == other.workingDir
&& target == other.target && target == other.target
&& executable == other.executable && executable == other.executable
&& valid == valid; && valid == valid
&& buildDir == buildDir;
} }
bool operator!=(const TargetInformation &other) const bool operator!=(const TargetInformation &other) const
{ {
@@ -216,7 +218,8 @@ struct TargetInformation
: valid(other.valid), : valid(other.valid),
workingDir(other.workingDir), workingDir(other.workingDir),
target(other.target), target(other.target),
executable(other.executable) executable(other.executable),
buildDir(other.buildDir)
{ {
} }