const char * const QMAKE_BS_ID("QtProjectManager.QMakeBuildStep");
const char * const QMAKE_ARGUMENTS_KEY("QtProjectManager.QMakeBuildStep.QMakeArguments");
+const char * const QMAKE_FORCED_KEY("QtProjectManager.QMakeBuildStep.QMakeForced");
}
QMakeStep::QMakeStep(BuildStepList *bsl) :
QMakeStep::QMakeStep(BuildStepList *bsl, QMakeStep *bs) :
AbstractProcessStep(bsl, bs),
- m_forced(false),
+ m_forced(bs->m_forced),
m_userArgs(bs->m_userArgs)
{
ctor();
{
QVariantMap map(AbstractProcessStep::toMap());
map.insert(QLatin1String(QMAKE_ARGUMENTS_KEY), m_userArgs);
+ map.insert(QLatin1String(QMAKE_FORCED_KEY), m_forced);
return map;
}
bool QMakeStep::fromMap(const QVariantMap &map)
{
m_userArgs = map.value(QLatin1String(QMAKE_ARGUMENTS_KEY)).toStringList();
-
+ m_forced = map.value(QLatin1String(QMAKE_FORCED_KEY), false).toBool();
return BuildStep::fromMap(map);
}
contents.updateSubFolders(this, this);
m_project->updateFileList();
+
+ // The files to be packaged are listed inside the symbian build system.
+ // We need to regenerate that list by running qmake
+ // Other platforms do not have a explicit list of files to package, but package
+ // directories
+ foreach (ProjectExplorer::Target *target, m_project->targets()) {
+ if (target->id() == Constants::S60_DEVICE_TARGET_ID) {
+ foreach (ProjectExplorer::BuildConfiguration *bc, target->buildConfigurations()) {
+ Qt4BuildConfiguration *qt4bc = qobject_cast<Qt4BuildConfiguration *>(bc);
+ if (qt4bc) {
+ QMakeStep *qmakeStep = qt4bc->qmakeStep();
+ if (qmakeStep)
+ qmakeStep->setForced(true);
+ }
+ }
+ }
+ }
+
}
bool Qt4PriFileNode::deploysFolder(const QString &folder) const