AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

make $$TEMPLATE magic on write instead of on read

Browse Source 
Change-Id: I03a68993dd7d4488f8212132a9d492d135295b9e
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
This commit is contained in:
Oswald Buddenhagen 2012-04-23 14:13:07 +02:00
parent 602ef59e85
commit 075d4a6d5d
2 changed files with 27 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
qmake/project.cpp
View File

@ -639,6 +639,23 @@ QStringList qmake_mkspec_paths()
return ret;
}
static void
setTemplate(QStringList &varlist)
{
if (!Option::user_template.isEmpty()) { // Don't permit override
varlist = QStringList(Option::user_template);
} else {
if (varlist.isEmpty())
varlist << "app";
else
varlist.erase(varlist.begin() + 1, varlist.end());
}
if (!Option::user_template_prefix.isEmpty()
&& !varlist.first().startsWith(Option::user_template_prefix)) {
varlist.first().prepend(Option::user_template_prefix);
}
}
QMakeProject::~QMakeProject()
{
if(own_prop)
@ -1208,6 +1225,8 @@ QMakeProject::parse(const QString &t, QHash<QString, QStringList> &place, int nu
}
if(var == "REQUIRES") // special case to get communicated to backends!
doProjectCheckReqs(vallist, place);
else if (var == QLatin1String("TEMPLATE"))
setTemplate(varlist);
}
return true;
}
@ -1504,6 +1523,7 @@ QMakeProject::read(uchar cmd)
} else {
vars = base_vars; // start with the base
}
setupProject();
}
for (QHash<QString, QStringList>::ConstIterator it = extra_vars.constBegin();
@ -1607,6 +1627,12 @@ QMakeProject::read(uchar cmd)
return true;
}
void
QMakeProject::setupProject()
{
setTemplate(vars["TEMPLATE"]);
}
void
QMakeProject::loadDefaults()
{
@ -3751,22 +3777,6 @@ QStringList &QMakeProject::values(const QString &_var, QHash<QString, QStringLis
} else if(var == QLatin1String("_PRO_FILE_PWD_")) {
var = ".BUILTIN." + var;
place[var] = QStringList(pfile.isEmpty() ? qmake_getpwd() : QFileInfo(pfile).absolutePath());
} else if(var == QLatin1String("TEMPLATE")) {
if(!Option::user_template.isEmpty()) {
var = ".BUILTIN.USER." + var;
place[var] = QStringList(Option::user_template);
} else {
QString orig_template, real_template;
if(!place[var].isEmpty())
orig_template = place[var].first();
real_template = orig_template.isEmpty() ? "app" : orig_template;
if(!Option::user_template_prefix.isEmpty() && !orig_template.startsWith(Option::user_template_prefix))
real_template.prepend(Option::user_template_prefix);
if(real_template != orig_template) {
var = ".BUILTIN." + var;
place[var] = QStringList(real_template);
}
}
}
//qDebug("REPLACE [%s]->[%s]", qPrintable(var), qPrintable(place[var].join("::")));
return place[var];

1
qmake/project.h
View File

@ -115,6 +115,7 @@ class QMakeProject
void init(QMakeProperty *);
void cleanup();
void loadDefaults();
void setupProject();
QStringList &values(const QString &v, QHash<QString, QStringList> &place);
QStringList qmakeFeaturePaths();