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

fold m_qmakespecFull back into m_qmakespec

Browse Source 
the original value is not used any more after the final resolution.

Change-Id: Icadc219f045a1bbfd20506c4c72c53d1fb352969
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
This commit is contained in:
Oswald Buddenhagen 2012-09-18 10:54:52 +02:00 committed by The Qt Project
parent 514cdee46f
commit cc2cd0db5d
3 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
qmake/library/qmakeevaluator.cpp
View File

@ -211,7 +211,6 @@ void QMakeEvaluator::initFrom(const QMakeEvaluator &other)
m_valuemapStack = other.m_valuemapStack; m_valuemapStack = other.m_valuemapStack;
m_valuemapInited = true; m_valuemapInited = true;
m_qmakespec = other.m_qmakespec; m_qmakespec = other.m_qmakespec;
m_qmakespecFull = other.m_qmakespecFull;
m_qmakespecName = other.m_qmakespecName; m_qmakespecName = other.m_qmakespecName;
m_mkspecPaths = other.m_mkspecPaths; m_mkspecPaths = other.m_mkspecPaths;
m_featureRoots = other.m_featureRoots; m_featureRoots = other.m_featureRoots;
@ -1129,16 +1128,17 @@ bool QMakeEvaluator::loadSpecInternal()
return false; return false;
} }
#ifdef Q_OS_UNIX #ifdef Q_OS_UNIX
m_qmakespecFull = QFileInfo(m_qmakespec).canonicalFilePath(); m_qmakespec = QFileInfo(m_qmakespec).canonicalFilePath();
#else #else
// We can't resolve symlinks as they do on Unix, so configure.exe puts // 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 source of the qmake.conf at the end of the default/qmake.conf in
// the QMAKESPEC_ORIGINAL variable. // the QMAKESPEC_ORIGINAL variable.
const ProString &orig_spec = first(ProKey("QMAKESPEC_ORIGINAL")); const ProString &orig_spec = first(ProKey("QMAKESPEC_ORIGINAL"));
m_qmakespecFull = orig_spec.isEmpty() ? m_qmakespec : orig_spec.toQString(); if (!orig_spec.isEmpty())
m_qmakespec = orig_spec.toQString();
#endif #endif
valuesRef(ProKey("QMAKESPEC")) << ProString(m_qmakespecFull); valuesRef(ProKey("QMAKESPEC")) << ProString(m_qmakespec);
m_qmakespecName = IoUtils::fileName(m_qmakespecFull).toString(); m_qmakespecName = IoUtils::fileName(m_qmakespec).toString();
if (!evaluateFeatureFile(QLatin1String("spec_post.prf"))) if (!evaluateFeatureFile(QLatin1String("spec_post.prf")))
return false; return false;
// The MinGW and x-build specs may change the separator; $$shell_{path,quote}() need it // The MinGW and x-build specs may change the separator; $$shell_{path,quote}() need it
@ -1426,12 +1426,12 @@ void QMakeEvaluator::updateFeaturePaths()
foreach (const QString &item, m_qmakepath) foreach (const QString &item, m_qmakepath)
feature_bases << (item + mkspecs_concat); feature_bases << (item + mkspecs_concat);
if (!m_qmakespecFull.isEmpty()) { if (!m_qmakespec.isEmpty()) {
// The spec is already platform-dependent, so no subdirs here. // The spec is already platform-dependent, so no subdirs here.
feature_roots << (m_qmakespecFull + features_concat); feature_roots << (m_qmakespec + features_concat);
// Also check directly under the root directory of the mkspecs collection // Also check directly under the root directory of the mkspecs collection
QDir specdir(m_qmakespecFull); QDir specdir(m_qmakespec);
while (!specdir.isRoot() && specdir.cdUp()) { while (!specdir.isRoot() && specdir.cdUp()) {
const QString specpath = specdir.path(); const QString specpath = specdir.path();
if (specpath.endsWith(mkspecs_concat)) { if (specpath.endsWith(mkspecs_concat)) {

1
qmake/library/qmakeevaluator.h
View File

@ -278,7 +278,6 @@ public:
bool m_valuemapInited; bool m_valuemapInited;
bool m_hostBuild; bool m_hostBuild;
QString m_qmakespec; QString m_qmakespec;
QString m_qmakespecFull;
QString m_qmakespecName; QString m_qmakespecName;
QString m_superfile; QString m_superfile;
QString m_conffile; QString m_conffile;

2
qmake/project.h
View File

@ -60,7 +60,7 @@ public:
QString buildRoot() const { return m_buildRoot; } QString buildRoot() const { return m_buildRoot; }
QString confFile() const { return m_conffile; } QString confFile() const { return m_conffile; }
QString cacheFile() const { return m_cachefile; } QString cacheFile() const { return m_cachefile; }
QString specDir() const { return m_qmakespecFull; } QString specDir() const { return m_qmakespec; }
ProString expand(const QString &v, const QString &file, int line); ProString expand(const QString &v, const QString &file, int line);
QStringList expand(const ProKey &func, const QList<ProStringList> &args); QStringList expand(const ProKey &func, const QList<ProStringList> &args);