1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

resolve real qmakespec name right after loading it

Browse Source 
this is cleaner than resolving it on-demand, as it avoids statics (with
potential side effects on dynamic spec switching).

Change-Id: I2bc15a4c3108376e1b4a01351875fe0c445ee5d5
Reviewed-by: Mark Brand <mabrand@mabrand.nl>
This commit is contained in:
Oswald Buddenhagen 2012-06-01 11:08:52 +02:00
parent 32bc46a90b
commit 30d1522b7a
2 changed files with 11 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
qmake/project.cpp
View File

@ -1474,6 +1474,15 @@ QMakeProject::read(uchar cmd)
fprintf(stderr, "Failure to read QMAKESPEC conf file %s.\n", spec.toLatin1().constData()); fprintf(stderr, "Failure to read QMAKESPEC conf file %s.\n", spec.toLatin1().constData());
return false; return false;
} }
#ifdef Q_OS_UNIX
real_spec = QFileInfo(qmakespec).canonicalFilePath();
#else
// We can't resolve symlinks as they do on Unix, so configure.exe puts the source of the
// qmake.conf at the end of the default/qmake.conf in the QMAKESPEC_ORG variable.
QString orig_spec = first(QLatin1String("QMAKESPEC_ORIGINAL"));
real_spec = orig_spec.isEmpty() ? qmakespec : orig_spec;
#endif
short_spec = QFileInfo(real_spec).fileName();
doProjectInclude("spec_post", IncludeFlagFeature, vars); doProjectInclude("spec_post", IncludeFlagFeature, vars);
// The spec extends the feature search path, so invalidate the cache. // The spec extends the feature search path, so invalidate the cache.
invalidateFeatureRoots(); invalidateFeatureRoots();
@ -1594,36 +1603,6 @@ QMakeProject::read(uchar cmd)
return true; return true;
} }
void
QMakeProject::resolveSpec(QString *spec, const QString &qmakespec)
{
if (spec->isEmpty()) {
*spec = QFileInfo(qmakespec).fileName();
if (*spec == "default" || *spec == "default-host") {
#ifdef Q_OS_UNIX
char buffer[1024];
int l = readlink(qmakespec.toLatin1().constData(), buffer, 1023);
if (l != -1) {
buffer[l] = '\0';
*spec = QString::fromLatin1(buffer);
#else
// We can't resolve symlinks as they do on Unix, so configure.exe puts the source of the
// qmake.conf at the end of the default/qmake.conf in the QMAKESPEC_ORG variable.
const QStringList &spec_org = vars["QMAKESPEC_ORIGINAL"];
if (spec_org.isEmpty()) {
// try again the next time around
*spec = QString();
} else {
*spec = spec_org.at(0);
#endif
int lastSlash = spec->lastIndexOf(QLatin1Char('/'));
if (lastSlash != -1)
spec->remove(0, lastSlash + 1);
}
}
}
}
bool bool
QMakeProject::isActiveConfig(const QString &x, bool regex, QHash<QString, QStringList> *place) QMakeProject::isActiveConfig(const QString &x, bool regex, QHash<QString, QStringList> *place)
{ {
@ -1640,12 +1619,8 @@ QMakeProject::isActiveConfig(const QString &x, bool regex, QHash<QString, QStrin
return host_build; return host_build;
//mkspecs //mkspecs
static QString hspec, xspec;
resolveSpec(&hspec, Option::mkfile::qmakespec);
resolveSpec(&xspec, Option::mkfile::xqmakespec);
const QString &spec = host_build ? hspec : xspec;
QRegExp re(x, Qt::CaseSensitive, QRegExp::Wildcard); QRegExp re(x, Qt::CaseSensitive, QRegExp::Wildcard);
if((regex && re.exactMatch(spec)) || (!regex && spec == x)) if ((regex && re.exactMatch(short_spec)) || (!regex && short_spec == x))
return true; return true;
//simple matching //simple matching

2
qmake/project.h
View File

@ -86,6 +86,7 @@ class QMakeProject
QString conffile; QString conffile;
QString superfile; QString superfile;
QString cachefile; QString cachefile;
QString real_spec, short_spec;
QString pfile; QString pfile;
QMakeProperty *prop; QMakeProperty *prop;
void reset(); void reset();
@ -114,7 +115,6 @@ class QMakeProject
void init(QMakeProperty *); void init(QMakeProperty *);
void cleanup(); void cleanup();
QStringList &values(const QString &v, QHash<QString, QStringList> &place); QStringList &values(const QString &v, QHash<QString, QStringList> &place);
void resolveSpec(QString *spec, const QString &qmakespec);
QStringList qmakeFeaturePaths(); QStringList qmakeFeaturePaths();
public: public: